From 66094f0aac284f26dba5ca4569381f44f442abc5 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 18 Jul 2018 15:13:28 +0200
Subject: [PATCH 001/229] Add style tester app

---
 src/main/java/org/jabref/JabRefGUI.java       |   2 +-
 .../jabref/gui/customjfx/CustomJFXPanel.java  |   2 +-
 .../java/org/jabref/gui/util/BaseDialog.java  |   2 +-
 .../java/org/jabref/gui/util/ThemeLoader.java |   6 +-
 .../org/jabref/styletester/StyleTester.fxml   | 312 ++++++++++++++++++
 .../jabref/styletester/StyleTesterMain.java   |  29 ++
 .../jabref/styletester/StyleTesterView.java   |  19 ++
 7 files changed, 366 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/org/jabref/styletester/StyleTester.fxml
 create mode 100644 src/main/java/org/jabref/styletester/StyleTesterMain.java
 create mode 100644 src/main/java/org/jabref/styletester/StyleTesterView.java

diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
index f6074c34725..dc03333b7bf 100644
--- a/src/main/java/org/jabref/JabRefGUI.java
+++ b/src/main/java/org/jabref/JabRefGUI.java
@@ -150,7 +150,7 @@ private void openWindow(Stage mainStage) {
         }
 
         Scene scene = new Scene(JabRefGUI.mainFrame, 800, 800);
-        Globals.getThemeLoader().installBaseCss(scene);
+        Globals.getThemeLoader().installBaseCss(scene, Globals.prefs);
         mainStage.setTitle(JabRefFrame.FRAME_TITLE);
         mainStage.getIcons().addAll(IconTheme.getLogoSetFX());
         mainStage.setScene(scene);
diff --git a/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java b/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java
index 1cb3e07b106..5cdafa593ce 100644
--- a/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java
+++ b/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java
@@ -13,7 +13,7 @@ public class CustomJFXPanel {
 
     public static JFXPanel wrap(Scene scene) {
         JFXPanel container = new JFXPanel();
-        Globals.getThemeLoader().installBaseCss(scene);
+        Globals.getThemeLoader().installBaseCss(scene, Globals.prefs);
         DefaultTaskExecutor.runInJavaFXThread(() -> container.setScene(scene));
         return container;
     }
diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index 98bb1f7ae15..73c157838df 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -21,7 +21,7 @@ protected BaseDialog() {
 
         setDialogIcon(IconTheme.getJabRefImageFX());
 
-        Globals.getThemeLoader().installBaseCss(getDialogPane().getScene());
+        Globals.getThemeLoader().installBaseCss(getDialogPane().getScene(), Globals.prefs);
     }
 
     private void setDialogIcon(Image image) {
diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 208b808ec31..31295289a14 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -11,10 +11,10 @@
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 
-import org.jabref.Globals;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.JabRefPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +49,7 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor) {
      * Installs the base css file as a stylesheet in the given scene.
      * Changes in the css file lead to a redraw of the scene using the new css file.
      */
-    public void installBaseCss(Scene scene) {
+    public void installBaseCss(Scene scene, JabRefPreferences preferences) {
         addAndWatchForChanges(scene, DEFAULT_PATH_MAIN_CSS, 0);
 
         if (StringUtil.isNotBlank(CSS_SYSTEM_PROPERTY)) {
@@ -60,7 +60,7 @@ public void installBaseCss(Scene scene) {
             }
         }
 
-        Globals.prefs.getFontSize().ifPresent(size -> scene.getRoot().setStyle("-fx-font-size: " + size + "pt;"));
+        preferences.getFontSize().ifPresent(size -> scene.getRoot().setStyle("-fx-font-size: " + size + "pt;"));
     }
 
     private void addAndWatchForChanges(Scene scene, String cssUrl, int index) {
diff --git a/src/main/java/org/jabref/styletester/StyleTester.fxml b/src/main/java/org/jabref/styletester/StyleTester.fxml
new file mode 100644
index 00000000000..abdc7415893
--- /dev/null
+++ b/src/main/java/org/jabref/styletester/StyleTester.fxml
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.String?>
+<?import javafx.collections.FXCollections?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.Menu?>
+<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.control.MenuButton?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.ProgressBar?>
+<?import javafx.scene.control.ProgressIndicator?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.Slider?>
+<?import javafx.scene.control.SplitMenuButton?>
+<?import javafx.scene.control.SplitPane?>
+<?import javafx.scene.control.Tab?>
+<?import javafx.scene.control.TabPane?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.input.KeyCodeCombination?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<AnchorPane xmlns:fx="http://javafx.com/fxml"
+            xmlns="http://javafx.com/javafx"
+            fx:controller="org.jabref.styletester.StyleTesterView"
+            prefHeight="400.0" prefWidth="600.0">
+    <children>
+        <VBox layoutX="194.0" layoutY="14.0" prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="0.0"
+              AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <children>
+                <MenuBar>
+                    <menus>
+                        <Menu mnemonicParsing="false" text="File">
+                            <items>
+                                <MenuItem mnemonicParsing="false" text="Load Stylesheet...">
+                                    <accelerator>
+                                        <KeyCodeCombination alt="UP" code="O" control="DOWN" meta="UP" shift="UP"
+                                                            shortcut="UP"/>
+                                    </accelerator>
+                                </MenuItem>
+                                <MenuItem mnemonicParsing="false" text="Reload Stylesheet">
+                                    <accelerator>
+                                        <KeyCodeCombination alt="UP" code="R" control="DOWN" meta="UP" shift="UP"
+                                                            shortcut="UP"/>
+                                    </accelerator>
+                                </MenuItem>
+                            </items>
+                        </Menu>
+                    </menus>
+                </MenuBar>
+                <HBox prefHeight="652.0" prefWidth="1124.0" spacing="5.0">
+                    <children>
+                        <VBox prefHeight="385.0" prefWidth="236.0" spacing="10.0" HBox.hgrow="ALWAYS">
+                            <children>
+                                <ComboBox maxWidth="1.7976931348623157E308" prefWidth="150.0" promptText="Combo Box">
+                                    <items>
+                                        <FXCollections fx:factory="observableArrayList">
+                                            <String fx:value="Apple"/>
+                                            <String fx:value="Orange"/>
+                                            <String fx:value="Pear"/>
+                                        </FXCollections>
+                                    </items>
+                                </ComboBox>
+                                <ComboBox disable="true" maxWidth="1.7976931348623157E308" prefWidth="150.0"
+                                          promptText="Combo Box (Disabled)">
+                                    <items>
+                                        <FXCollections fx:factory="observableArrayList">
+                                            <String fx:value="Apple"/>
+                                            <String fx:value="Orange"/>
+                                            <String fx:value="Pear"/>
+                                        </FXCollections>
+                                    </items>
+                                </ComboBox>
+                                <Separator prefWidth="200.0"/>
+                                <ComboBox editable="true" maxWidth="1.7976931348623157E308" prefWidth="150.0"
+                                          promptText="Combo Box">
+                                    <items>
+                                        <FXCollections fx:factory="observableArrayList">
+                                            <String fx:value="Apple"/>
+                                            <String fx:value="Orange"/>
+                                            <String fx:value="Pear"/>
+                                        </FXCollections>
+                                    </items>
+                                </ComboBox>
+                                <ComboBox disable="true" editable="true" maxWidth="1.7976931348623157E308"
+                                          prefWidth="150.0" promptText="Combo Box (Disabled)">
+                                    <items>
+                                        <FXCollections fx:factory="observableArrayList">
+                                            <String fx:value="Apple"/>
+                                            <String fx:value="Orange"/>
+                                            <String fx:value="Pear"/>
+                                        </FXCollections>
+                                    </items>
+                                </ComboBox>
+                                <Separator prefWidth="200.0"/>
+                                <ChoiceBox maxWidth="1.7976931348623157E308" prefWidth="150.0">
+                                    <items>
+                                        <FXCollections fx:factory="observableArrayList">
+                                            <String fx:value="Apple"/>
+                                            <String fx:value="Orange"/>
+                                            <String fx:value="Pear"/>
+                                        </FXCollections>
+                                    </items>
+                                </ChoiceBox>
+                                <ChoiceBox disable="true" maxWidth="1.7976931348623157E308" prefWidth="150.0">
+                                    <items>
+                                        <FXCollections fx:factory="observableArrayList">
+                                            <String fx:value="Apple"/>
+                                            <String fx:value="Orange"/>
+                                            <String fx:value="Pear"/>
+                                        </FXCollections>
+                                    </items>
+                                </ChoiceBox>
+                                <Separator prefWidth="200.0"/>
+                                <TextField promptText="Text Field"/>
+                                <TextField editable="false" text="Text Field (non-editable)"/>
+                                <TextField disable="true" text="Text Field (disabled)"/>
+                                <Separator prefWidth="200.0"/>
+                                <PasswordField promptText="Password"/>
+                                <PasswordField editable="false" promptText="Password (non-editable)"
+                                               text="Password (non-editable)"/>
+                                <PasswordField disable="true" text="Password (disabled)"/>
+                                <Separator prefWidth="200.0"/>
+                                <HBox prefHeight="100.0" prefWidth="200.0">
+                                    <children>
+                                        <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0"
+                                              HBox.hgrow="SOMETIMES">
+                                            <children>
+                                                <CheckBox allowIndeterminate="true" mnemonicParsing="false"
+                                                          text="CheckBox"/>
+                                                <CheckBox allowIndeterminate="true" mnemonicParsing="false"
+                                                          selected="true" text="CheckBox"/>
+                                                <CheckBox allowIndeterminate="true" disable="true"
+                                                          mnemonicParsing="false" text="CheckBox"/>
+                                                <CheckBox allowIndeterminate="true" disable="true"
+                                                          mnemonicParsing="false" selected="true" text="CheckBox"/>
+                                                <CheckBox allowIndeterminate="true" disable="true" indeterminate="true"
+                                                          mnemonicParsing="false" text="CheckBox"/>
+                                            </children>
+                                        </VBox>
+                                        <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0"
+                                              HBox.hgrow="SOMETIMES">
+                                            <children>
+                                                <RadioButton mnemonicParsing="false" text="RadioButton">
+                                                    <toggleGroup>
+                                                        <ToggleGroup fx:id="radios"/>
+                                                    </toggleGroup>
+                                                </RadioButton>
+                                                <RadioButton mnemonicParsing="false" selected="true" text="RadioButton"
+                                                             toggleGroup="$radios"/>
+                                                <RadioButton disable="true" mnemonicParsing="false" text="RadioButton"/>
+                                                <RadioButton disable="true" mnemonicParsing="false" selected="true"
+                                                             text="RadioButton"/>
+                                            </children>
+                                        </VBox>
+                                    </children>
+                                </HBox>
+                            </children>
+                        </VBox>
+                        <Separator orientation="VERTICAL" prefHeight="200.0"/>
+                        <VBox prefHeight="385.0" prefWidth="236.0" spacing="10.0" HBox.hgrow="ALWAYS">
+                            <children>
+                                <MenuButton maxWidth="1.7976931348623157E308" mnemonicParsing="false" text="MenuButton">
+                                    <items>
+                                        <MenuItem mnemonicParsing="false" text="Action 1"/>
+                                        <MenuItem mnemonicParsing="false" text="Action 2"/>
+                                    </items>
+                                </MenuButton>
+                                <MenuButton disable="true" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+                                            text="MenuButton (Disabled)">
+                                    <items>
+                                        <MenuItem mnemonicParsing="false" text="Action 1"/>
+                                        <MenuItem mnemonicParsing="false" text="Action 2"/>
+                                    </items>
+                                </MenuButton>
+                                <Separator prefWidth="200.0"/>
+                                <SplitMenuButton maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+                                                 text="SplitMenuButton">
+                                    <items>
+                                        <MenuItem mnemonicParsing="false" text="Action 1"/>
+                                        <MenuItem mnemonicParsing="false" text="Action 2"/>
+                                    </items>
+                                </SplitMenuButton>
+                                <SplitMenuButton disable="true" maxWidth="1.7976931348623157E308"
+                                                 mnemonicParsing="false" text="SplitMenuButton (Disabled)">
+                                    <items>
+                                        <MenuItem mnemonicParsing="false" text="Action 1"/>
+                                        <MenuItem mnemonicParsing="false" text="Action 2"/>
+                                    </items>
+                                </SplitMenuButton>
+                                <Separator prefWidth="200.0"/>
+                                <Button maxWidth="1.7976931348623157E308" mnemonicParsing="false" text="Button"/>
+                                <Button disable="true" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+                                        text="Button (Disabled)"/>
+                                <Button defaultButton="true" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+                                        text="Button (Default)"/>
+                                <Button cancelButton="true" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+                                        text="Button (Cancel)"/>
+                                <Separator prefWidth="200.0"/>
+                                <Hyperlink maxWidth="1.7976931348623157E308" text="Hyperlink"/>
+                                <Hyperlink maxWidth="1.7976931348623157E308" text="Hyperlink (Visited)" visited="true"/>
+                                <Separator prefWidth="200.0"/>
+                            </children>
+                        </VBox>
+                        <Separator orientation="VERTICAL" prefHeight="200.0"/>
+                        <VBox prefHeight="385.0" prefWidth="236.0" spacing="10.0" HBox.hgrow="ALWAYS">
+                            <children>
+                                <Slider value="35.0"/>
+                                <Slider showTickMarks="true" snapToTicks="true" value="35.0"/>
+                                <Slider showTickLabels="true" showTickMarks="true" snapToTicks="true" value="35.0"/>
+                                <FlowPane alignment="CENTER" columnHalignment="CENTER" hgap="10.0" prefHeight="200.0"
+                                          prefWidth="200.0" vgap="10.0">
+                                    <children>
+                                        <Slider orientation="VERTICAL"/>
+                                        <Slider orientation="VERTICAL" showTickMarks="true"/>
+                                        <Slider orientation="VERTICAL" showTickLabels="true" showTickMarks="true"/>
+                                    </children>
+                                </FlowPane>
+                                <Separator prefWidth="200.0"/>
+                                <ProgressBar maxWidth="1.7976931348623157E308" prefWidth="200.0" progress="0.3"/>
+                                <ProgressBar maxWidth="1.7976931348623157E308" prefWidth="200.0"/>
+                                <ProgressIndicator progress="0.3"/>
+                                <ProgressIndicator/>
+                            </children>
+                        </VBox>
+                        <Separator orientation="VERTICAL" prefHeight="200.0"/>
+                        <VBox prefHeight="385.0" prefWidth="236.0" HBox.hgrow="ALWAYS">
+                            <children>
+                                <TextArea prefHeight="71.0" prefWidth="268.0" promptText="Text Area" wrapText="true"/>
+                            </children>
+                        </VBox>
+                    </children>
+                    <padding>
+                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                    </padding>
+                </HBox>
+                <SplitPane dividerPositions="0.45566502463054187" prefHeight="160.0" prefWidth="200.0"
+                           VBox.vgrow="ALWAYS">
+                    <items>
+                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+                            <children>
+                                <TabPane prefHeight="173.0" prefWidth="259.0" side="BOTTOM"
+                                         AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                                         AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                    <tabs>
+                                        <Tab text="Lorem">
+                                            <content>
+                                                <AnchorPane/>
+                                            </content>
+                                        </Tab>
+                                        <Tab text="Ipsum">
+                                            <content>
+                                                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
+                                                            prefWidth="200.0"/>
+                                            </content>
+                                        </Tab>
+                                        <Tab text="Dolor">
+                                            <content>
+                                                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
+                                                            prefWidth="200.0"/>
+                                            </content>
+                                        </Tab>
+                                    </tabs>
+                                </TabPane>
+                            </children>
+                        </AnchorPane>
+                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+                            <children>
+                                <TabPane prefHeight="173.0" prefWidth="294.0" side="LEFT" AnchorPane.bottomAnchor="0.0"
+                                         AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+                                         AnchorPane.topAnchor="0.0">
+                                    <tabs>
+                                        <Tab text="Lorem">
+                                            <content>
+                                                <AnchorPane/>
+                                            </content>
+                                        </Tab>
+                                        <Tab text="Ipsum">
+                                            <content>
+                                                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
+                                                            prefWidth="200.0"/>
+                                            </content>
+                                        </Tab>
+                                        <Tab text="Dolor">
+                                            <content>
+                                                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
+                                                            prefWidth="200.0"/>
+                                            </content>
+                                        </Tab>
+                                    </tabs>
+                                </TabPane>
+                            </children>
+                        </AnchorPane>
+                    </items>
+                    <padding>
+                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                    </padding>
+                </SplitPane>
+            </children>
+        </VBox>
+    </children>
+</AnchorPane>
diff --git a/src/main/java/org/jabref/styletester/StyleTesterMain.java b/src/main/java/org/jabref/styletester/StyleTesterMain.java
new file mode 100644
index 00000000000..3945b4dad09
--- /dev/null
+++ b/src/main/java/org/jabref/styletester/StyleTesterMain.java
@@ -0,0 +1,29 @@
+package org.jabref.styletester;
+
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import org.jabref.gui.util.ThemeLoader;
+import org.jabref.model.util.DummyFileUpdateMonitor;
+import org.jabref.preferences.JabRefPreferences;
+
+/**
+ * Useful for checking the display of different controls. Not needed inside of JabRef.
+ */
+public class StyleTesterMain extends Application {
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+
+    @Override
+    public void start(Stage stage) throws Exception {
+        StyleTesterView view = new StyleTesterView();
+
+        Scene scene = new Scene(view.getContent());
+        new ThemeLoader(new DummyFileUpdateMonitor()).installBaseCss(scene, JabRefPreferences.getInstance());
+        stage.setScene(scene);
+        stage.show();
+    }
+}
diff --git a/src/main/java/org/jabref/styletester/StyleTesterView.java b/src/main/java/org/jabref/styletester/StyleTesterView.java
new file mode 100644
index 00000000000..29d225698b7
--- /dev/null
+++ b/src/main/java/org/jabref/styletester/StyleTesterView.java
@@ -0,0 +1,19 @@
+package org.jabref.styletester;
+
+import javafx.scene.Parent;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class StyleTesterView {
+    private Parent content;
+
+    public StyleTesterView() {
+        content = ViewLoader.view(this)
+                            .load()
+                            .getView();
+    }
+
+    public Parent getContent() {
+        return content;
+    }
+}

From 9f5da55417ede00c75d0f4f954061d3f44dff38e Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Sun, 22 Jul 2018 19:33:13 +0800
Subject: [PATCH 002/229] Fix#3861_Edit_ReplaceString

---
 src/main/java/org/jabref/gui/BasePanel.java   |  27 +--
 src/main/java/org/jabref/gui/JabRefFrame.java |   2 +
 .../java/org/jabref/gui/ReplaceString.fxml    |  27 +++
 .../org/jabref/gui/ReplaceStringAction.java   |  20 ++
 .../org/jabref/gui/ReplaceStringView.java     | 184 ++++++++++++++++++
 5 files changed, 234 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/ReplaceString.fxml
 create mode 100644 src/main/java/org/jabref/gui/ReplaceStringAction.java
 create mode 100644 src/main/java/org/jabref/gui/ReplaceStringView.java

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index e23a6a27e3f..e13c930e5cf 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -395,32 +395,7 @@ private void setupActions() {
 
         actions.put(Actions.MERGE_WITH_FETCHED_ENTRY, new MergeWithFetchedEntryAction(this, frame.getDialogService()));
 
-        actions.put(Actions.REPLACE_ALL, () -> {
-            final ReplaceStringDialog rsd = new ReplaceStringDialog(frame);
-            rsd.setVisible(true);
-            if (!rsd.okPressed()) {
-                return;
-            }
-            int counter = 0;
-            final NamedCompound ce = new NamedCompound(Localization.lang("Replace string"));
-            if (rsd.selOnly()) {
-                for (BibEntry be : mainTable.getSelectedEntries()) {
-                    counter += rsd.replace(be, ce);
-                }
-            } else {
-                for (BibEntry entry : bibDatabaseContext.getDatabase().getEntries()) {
-                    counter += rsd.replace(entry, ce);
-                }
-            }
-
-            output(Localization.lang("Replaced") + ' ' + counter + ' '
-                    + (counter == 1 ? Localization.lang("occurrence") : Localization.lang("occurrences")) + '.');
-            if (counter > 0) {
-                ce.end();
-                getUndoManager().addEdit(ce);
-                markBaseChanged();
-            }
-        });
+        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));
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 1eed35d9bfa..8cd33645028 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -75,6 +75,7 @@
 import org.jabref.gui.actions.NewEntryAction;
 import org.jabref.gui.actions.NewEntryFromPlainTextAction;
 import org.jabref.gui.actions.NewSubLibraryAction;
+import org.jabref.gui.actions.OldCommandWrapper;
 import org.jabref.gui.actions.OldDatabaseCommandWrapper;
 import org.jabref.gui.actions.OpenBrowserAction;
 import org.jabref.gui.actions.SearchForUpdateAction;
@@ -598,6 +599,7 @@ private Node createToolbar() {
                 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.REPLACE_ALL, new ReplaceStringAction(this.getCurrentBasePanel())),
 
                 factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new OldDatabaseCommandWrapper(Actions.CLEANUP, this, Globals.stateManager)),
                 factory.createIconButton(pushToExternal.getMenuAction(), pushToExternal),
diff --git a/src/main/java/org/jabref/gui/ReplaceString.fxml b/src/main/java/org/jabref/gui/ReplaceString.fxml
new file mode 100644
index 00000000000..ac797960c09
--- /dev/null
+++ b/src/main/java/org/jabref/gui/ReplaceString.fxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<DialogPane  maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="339.0" prefWidth="476.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="org.jabref.gui.ReplaceStringView" fx:id="pane">
+  <content>
+    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="376.0" prefWidth="552.0">
+         <children>
+            <Button fx:id="CancelButton" cancelButton="true" layoutX="386.0" layoutY="273.0" mnemonicParsing="false" onAction="#ButtonCancel" prefHeight="28.0" prefWidth="74.0" text="Cancel" userData="CANCEL"/>
+            <Button fx:id="ReplaceButton" defaultButton="true" layoutX="260.0" layoutY="275.0" mnemonicParsing="false" onAction="#ButtonReplace" prefHeight="25.0" prefWidth="76.0" text="Replace" textFill="#e46161" userData="OK_DONE"/>
+            <TextField fx:id="FindField" layoutX="107.0" layoutY="21.0" prefHeight="23.0" prefWidth="347.0" />
+            <TextField fx:id="ReplaceField" layoutX="107.0" layoutY="63.0" prefHeight="23.0" prefWidth="348.0" />
+            <Label layoutX="14.0" layoutY="21.0" prefHeight="23.0" prefWidth="75.0" text="Find:" />
+            <Label layoutX="11.0" layoutY="64.0" prefHeight="21.0" prefWidth="95.0" text="Replace with:" />
+            <CheckBox fx:id="checkLimit" layoutX="20.0" layoutY="134.0" mnemonicParsing="false" onAction="#selectOnly" onMouseReleased="#selectOnly" prefHeight="22.0" prefWidth="211.0" text="Limit to Selected Entries" />
+            <RadioButton layoutX="20.0" layoutY="188.0" mnemonicParsing="false" onAction="#RadioAll" onMouseReleased="#RadioAll" prefHeight="16.0" prefWidth="125.0" selected="true" text="All Field Replace">
+               <toggleGroup>
+                  <ToggleGroup fx:id="RadioGroup" />
+               </toggleGroup>
+            </RadioButton>
+            <RadioButton layoutX="20.0" layoutY="217.0" mnemonicParsing="false" onAction="#RadioLimit" onMouseReleased="#RadioLimit" prefHeight="29.0" prefWidth="121.0" text="Limit to Fields:" toggleGroup="$RadioGroup" />
+            <TextField fx:id="LimitFieldInput" layoutX="157.0" layoutY="220.0" prefHeight="23.0" prefWidth="283.0" />
+         </children></AnchorPane>
+  </content>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/ReplaceStringAction.java b/src/main/java/org/jabref/gui/ReplaceStringAction.java
new file mode 100644
index 00000000000..b1674b4886a
--- /dev/null
+++ b/src/main/java/org/jabref/gui/ReplaceStringAction.java
@@ -0,0 +1,20 @@
+package org.jabref.gui;
+
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.model.database.BibDatabase;
+
+public class ReplaceStringAction extends SimpleCommand
+{
+    private BasePanel basePanel;
+
+    public ReplaceStringAction(BasePanel bPanel) {
+        this.basePanel = bPanel;
+    }
+
+    @Override
+    public void execute() {
+        BibDatabase database = basePanel.getDatabase();
+        ReplaceStringView rsc = new ReplaceStringView(database, basePanel);
+        rsc.showAndWait().filter(response -> rsc.isExit());
+    }
+}
diff --git a/src/main/java/org/jabref/gui/ReplaceStringView.java b/src/main/java/org/jabref/gui/ReplaceStringView.java
new file mode 100644
index 00000000000..ecb6ae6b5d2
--- /dev/null
+++ b/src/main/java/org/jabref/gui/ReplaceStringView.java
@@ -0,0 +1,184 @@
+package org.jabref.gui;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.DialogPane;
+import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
+import javafx.stage.Stage;
+
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+public class ReplaceStringView extends BaseDialog<Void>
+{
+
+    @FXML public ToggleGroup RadioGroup;
+    @FXML public Button CancelButton;
+    @FXML public Button ReplaceButton;
+    @FXML private TextField LimitFieldInput;
+    @FXML private TextField FindField;
+    @FXML private TextField ReplaceField;
+    @FXML private CheckBox checkLimit;
+    @FXML private DialogPane pane;
+
+    private boolean AllFieldReplace;
+    private boolean selOnly;
+    private String findString;
+    private String replaceString;
+    private String[] fieldStrings;
+    private BibDatabase database;
+    private boolean exitSignal;
+    private BasePanel panel;
+    private Stage st;
+
+    private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
+
+    public ReplaceStringView(BibDatabase bibDatabase, BasePanel basePanel)  {
+        this.setTitle(Localization.lang("Replace String"));
+
+        database = bibDatabase;
+        AllFieldReplace = true;
+        exitSignal = false;
+        selOnly = false;
+        panel = basePanel;
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        st = (Stage) this.pane.getScene().getWindow();
+        st.setOnCloseRequest(event -> st.close());
+    }
+
+    @FXML
+    public void initialize() {
+        visualizer.setDecoration(new IconValidationDecorator());
+        LimitFieldInput.setEditable(true);
+        FindField.setEditable(true);
+        ReplaceField.setEditable(true);
+        checkLimit.setSelected(false);
+    }
+
+    /**
+     * FXML Message handler
+    */
+    @FXML
+    public void ButtonReplace() {
+        findString = FindField.getText();
+        replaceString = ReplaceField.getText();
+        fieldStrings = LimitFieldInput.getText().toLowerCase().split(";");
+        if("".equals(findString))
+        {
+            exitSignal = true;
+            st.close();
+            return;
+        }
+        replace();
+        exitSignal = true;
+        st.close();
+    }
+
+    @FXML
+    public void ButtonCancel() {
+        exitSignal = true;
+        st.close();
+    }
+
+    @FXML
+    public void RadioAll() {
+        AllFieldReplace = true;
+    }
+
+    @FXML
+    public void RadioLimit() {
+        AllFieldReplace = false;
+    }
+
+    @FXML
+    public void selectOnly() {
+        selOnly = !selOnly;
+    }
+
+    public boolean isExit() {
+        return this.exitSignal;
+    }
+
+    /**
+     *  General replacement, same as Action:Replace_All in BasePanel.java
+     *  Rep check: BasePanel == null
+     *  @return : replace count
+     */
+    public int replace() {
+        final NamedCompound ce = new NamedCompound(Localization.lang("Replace string"));
+        int counter = 0;
+        if(this.panel == null)
+            return 0;
+        if(this.selOnly) {
+            for(BibEntry bibEntry: this.panel.getSelectedEntries())
+            {
+                counter += replaceItem(bibEntry, ce);
+            }
+        }
+        else {
+            for(BibEntry bibEntry: this.panel.getDatabase().getEntries())
+            {
+                counter += replaceItem(bibEntry, ce);
+            }
+        }
+        return counter;
+    }
+
+    /**
+     * Does the actual operation on a Bibtex entry based on the
+     * settings specified in this same dialog. Returns the number of
+     * occurences replaced.
+     * Copied and Adapted from org.jabref.gui.ReplaceStringDialog.java
+     */
+    public int replaceItem(BibEntry be, NamedCompound ce) {
+        int counter = 0;
+        if (this.AllFieldReplace) {
+            for (String s : be.getFieldNames()) {
+                counter += replaceField(be, s, ce);
+            }
+        } else {
+            for (String fld : fieldStrings) {
+                counter += replaceField(be, fld, ce);
+            }
+        }
+        return counter;
+    }
+
+    private int replaceField(BibEntry be, String fieldname, NamedCompound ce) {
+        if (!be.hasField(fieldname)) {
+            return 0;
+        }
+        String txt = be.getField(fieldname).get();
+        StringBuilder sb = new StringBuilder();
+        int ind;
+        int piv = 0;
+        int counter = 0;
+        int len1 = this.findString.length();
+        while ((ind = txt.indexOf(this.findString, piv)) >= 0) {
+            counter++;
+            sb.append(txt, piv, ind); // Text leading up to s1
+            sb.append(this.replaceString); // Insert s2
+            piv = ind + len1;
+        }
+        sb.append(txt.substring(piv));
+        String newStr = sb.toString();
+        be.setField(fieldname, newStr);
+        ce.addEdit(new UndoableFieldChange(be, fieldname, txt, newStr));
+        return counter;
+    }
+
+}

From 44a8efd5984afdbd4e4e3c14db29b0d2894dad8b Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Sun, 22 Jul 2018 20:14:10 +0800
Subject: [PATCH 003/229] Fix#3861_Edit_ReplaceString_BUILD

---
 src/main/java/org/jabref/gui/JabRefFrame.java       |  1 -
 src/main/java/org/jabref/gui/ReplaceString.fxml     |  9 ++++-----
 src/main/java/org/jabref/gui/ReplaceStringView.java | 10 +++++-----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 8cd33645028..4968d31b5ab 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -75,7 +75,6 @@
 import org.jabref.gui.actions.NewEntryAction;
 import org.jabref.gui.actions.NewEntryFromPlainTextAction;
 import org.jabref.gui.actions.NewSubLibraryAction;
-import org.jabref.gui.actions.OldCommandWrapper;
 import org.jabref.gui.actions.OldDatabaseCommandWrapper;
 import org.jabref.gui.actions.OpenBrowserAction;
 import org.jabref.gui.actions.SearchForUpdateAction;
diff --git a/src/main/java/org/jabref/gui/ReplaceString.fxml b/src/main/java/org/jabref/gui/ReplaceString.fxml
index ac797960c09..a50aac367c9 100644
--- a/src/main/java/org/jabref/gui/ReplaceString.fxml
+++ b/src/main/java/org/jabref/gui/ReplaceString.fxml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
@@ -8,19 +7,19 @@
   <content>
     <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="376.0" prefWidth="552.0">
          <children>
-            <Button fx:id="CancelButton" cancelButton="true" layoutX="386.0" layoutY="273.0" mnemonicParsing="false" onAction="#ButtonCancel" prefHeight="28.0" prefWidth="74.0" text="Cancel" userData="CANCEL"/>
-            <Button fx:id="ReplaceButton" defaultButton="true" layoutX="260.0" layoutY="275.0" mnemonicParsing="false" onAction="#ButtonReplace" prefHeight="25.0" prefWidth="76.0" text="Replace" textFill="#e46161" userData="OK_DONE"/>
+            <Button fx:id="CancelButton" cancelButton="true" layoutX="386.0" layoutY="273.0" mnemonicParsing="false" onAction="#buttonCancel" prefHeight="28.0" prefWidth="74.0" text="Cancel" userData="CANCEL"/>
+            <Button fx:id="ReplaceButton" defaultButton="true" layoutX="260.0" layoutY="275.0" mnemonicParsing="false" onAction="#buttonReplace" prefHeight="25.0" prefWidth="76.0" text="Replace" textFill="#e46161" userData="OK_DONE"/>
             <TextField fx:id="FindField" layoutX="107.0" layoutY="21.0" prefHeight="23.0" prefWidth="347.0" />
             <TextField fx:id="ReplaceField" layoutX="107.0" layoutY="63.0" prefHeight="23.0" prefWidth="348.0" />
             <Label layoutX="14.0" layoutY="21.0" prefHeight="23.0" prefWidth="75.0" text="Find:" />
             <Label layoutX="11.0" layoutY="64.0" prefHeight="21.0" prefWidth="95.0" text="Replace with:" />
             <CheckBox fx:id="checkLimit" layoutX="20.0" layoutY="134.0" mnemonicParsing="false" onAction="#selectOnly" onMouseReleased="#selectOnly" prefHeight="22.0" prefWidth="211.0" text="Limit to Selected Entries" />
-            <RadioButton layoutX="20.0" layoutY="188.0" mnemonicParsing="false" onAction="#RadioAll" onMouseReleased="#RadioAll" prefHeight="16.0" prefWidth="125.0" selected="true" text="All Field Replace">
+            <RadioButton layoutX="20.0" layoutY="188.0" mnemonicParsing="false" onAction="#radioAll" onMouseReleased="#radioAll" prefHeight="16.0" prefWidth="125.0" selected="true" text="All Field Replace">
                <toggleGroup>
                   <ToggleGroup fx:id="RadioGroup" />
                </toggleGroup>
             </RadioButton>
-            <RadioButton layoutX="20.0" layoutY="217.0" mnemonicParsing="false" onAction="#RadioLimit" onMouseReleased="#RadioLimit" prefHeight="29.0" prefWidth="121.0" text="Limit to Fields:" toggleGroup="$RadioGroup" />
+            <RadioButton layoutX="20.0" layoutY="217.0" mnemonicParsing="false" onAction="#radioLimit" onMouseReleased="#radioLimit" prefHeight="29.0" prefWidth="121.0" text="Limit to Fields:" toggleGroup="$RadioGroup" />
             <TextField fx:id="LimitFieldInput" layoutX="157.0" layoutY="220.0" prefHeight="23.0" prefWidth="283.0" />
          </children></AnchorPane>
   </content>
diff --git a/src/main/java/org/jabref/gui/ReplaceStringView.java b/src/main/java/org/jabref/gui/ReplaceStringView.java
index ecb6ae6b5d2..aa373420689 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringView.java
+++ b/src/main/java/org/jabref/gui/ReplaceStringView.java
@@ -73,7 +73,7 @@ public void initialize() {
      * FXML Message handler
     */
     @FXML
-    public void ButtonReplace() {
+    public void buttonReplace() {
         findString = FindField.getText();
         replaceString = ReplaceField.getText();
         fieldStrings = LimitFieldInput.getText().toLowerCase().split(";");
@@ -89,18 +89,18 @@ public void ButtonReplace() {
     }
 
     @FXML
-    public void ButtonCancel() {
+    public void buttonCancel() {
         exitSignal = true;
         st.close();
     }
 
     @FXML
-    public void RadioAll() {
+    public void radioAll() {
         AllFieldReplace = true;
     }
 
     @FXML
-    public void RadioLimit() {
+    public void radioLimit() {
         AllFieldReplace = false;
     }
 
@@ -130,7 +130,7 @@ public int replace() {
             }
         }
         else {
-            for(BibEntry bibEntry: this.panel.getDatabase().getEntries())
+            for(BibEntry bibEntry: this.database.getEntries())
             {
                 counter += replaceItem(bibEntry, ce);
             }

From 90800c3649dc055ce71e4298cafae8a8aa934a3f Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Sun, 22 Jul 2018 20:21:23 +0800
Subject: [PATCH 004/229] Fix#3861_Edit_ReplaceString_BUILDS

---
 src/main/java/org/jabref/gui/ReplaceStringView.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/ReplaceStringView.java b/src/main/java/org/jabref/gui/ReplaceStringView.java
index aa373420689..fee7dee9574 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringView.java
+++ b/src/main/java/org/jabref/gui/ReplaceStringView.java
@@ -77,7 +77,7 @@ public void buttonReplace() {
         findString = FindField.getText();
         replaceString = ReplaceField.getText();
         fieldStrings = LimitFieldInput.getText().toLowerCase().split(";");
-        if("".equals(findString))
+        if ("".equals(findString))
         {
             exitSignal = true;
             st.close();
@@ -121,16 +121,16 @@ public boolean isExit() {
     public int replace() {
         final NamedCompound ce = new NamedCompound(Localization.lang("Replace string"));
         int counter = 0;
-        if(this.panel == null)
+        if (this.panel == null)
             return 0;
-        if(this.selOnly) {
-            for(BibEntry bibEntry: this.panel.getSelectedEntries())
+        if (this.selOnly) {
+            for (BibEntry bibEntry: this.panel.getSelectedEntries())
             {
                 counter += replaceItem(bibEntry, ce);
             }
         }
         else {
-            for(BibEntry bibEntry: this.database.getEntries())
+            for (BibEntry bibEntry: this.database.getEntries())
             {
                 counter += replaceItem(bibEntry, ce);
             }

From d5d67d70247b95af937c3e818dc7f1ae6dd484ee Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Mon, 23 Jul 2018 15:09:55 +0200
Subject: [PATCH 005/229] Fix fetcher tests (#4216)

* Fix fetcher tests

remove uncessary logging in l10n which makes fetcher test fail

ISBN tests still fail both
Fix arxiv tests, eprint now has url in front

* rework fetcher tests
Fix logging configuration
Fix eprint field of arxiv
Return empty results when 404 or 400 encountered
Add logging in that case

* fix checkstyle

* match both https and http prefixes in arxiv

* inline prefs in setup method

* fix ebook.de test record, as there is a new version of that book entry

* move comment
---
 .../jabref/logic/importer/fetcher/ArXiv.java  | 44 +++++++++++--------
 .../importer/fileformat/ModsImporter.java     |  2 +-
 .../jabref/logic/net/ProgressInputStream.java |  6 ++-
 .../org/jabref/logic/net/URLDownload.java     | 16 +++++--
 .../entry/identifier/ArXivIdentifier.java     | 13 +++++-
 .../logic/importer/fetcher/ACSTest.java       |  2 +-
 .../logic/importer/fetcher/ArXivTest.java     |  5 ++-
 .../fetcher/AstrophysicsDataSystemTest.java   |  3 +-
 .../logic/importer/fetcher/CrossRefTest.java  | 14 +++++-
 .../importer/fetcher/DBLPFetcherTest.java     | 11 +++--
 .../importer/fetcher/DOAJFetcherTest.java     | 12 ++---
 .../logic/importer/fetcher/DiVATest.java      |  7 ++-
 .../fetcher/IsbnViaEbookDeFetcherTest.java    | 14 +++---
 .../fetcher/LibraryOfCongressTest.java        | 24 ++++++++--
 .../importer/fetcher/MathSciNetTest.java      |  2 +-
 .../importer/fetcher/OpenAccessDoiTest.java   |  5 +--
 .../importer/fetcher/RfcFetcherTest.java      |  7 +--
 .../importer/fetcher/SpringerFetcherTest.java |  7 ++-
 .../resources/{log4j2.xml => log4j2-test.xml} |  2 +-
 19 files changed, 133 insertions(+), 63 deletions(-)
 rename src/test/resources/{log4j2.xml => log4j2-test.xml} (95%)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java b/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
index 7f7edf703ca..108820515c8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
@@ -10,6 +10,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -53,9 +55,12 @@
  * <a herf="https://gitlab.c3sl.ufpr.br/portalmec/dspace-portalmec/blob/aa209d15082a9870f9daac42c78a35490ce77b52/dspace-api/src/main/java/org/dspace/submit/lookup/ArXivService.java">dspace-portalmec</a>
  */
 public class ArXiv implements FulltextFetcher, SearchBasedFetcher, IdBasedFetcher, IdFetcher<ArXivIdentifier> {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(ArXiv.class);
 
     private static final String API_URL = "https://export.arxiv.org/api/query";
+    private static final String ARXIV_URL_PREFIX_FOR_ID = "(https?://arxiv.org/abs/)";
+    private static final Pattern URL_PATTERN = Pattern.compile(ARXIV_URL_PREFIX_FOR_ID);
 
     private final ImportFormatPreferences importFormatPreferences;
 
@@ -69,10 +74,10 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
 
         try {
             Optional<URL> pdfUrl = searchForEntries(entry).stream()
-                    .map(ArXivEntry::getPdfUrl)
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .findFirst();
+                                                          .map(ArXivEntry::getPdfUrl)
+                                                          .filter(Optional::isPresent)
+                                                          .map(Optional::get)
+                                                          .findFirst();
 
             if (pdfUrl.isPresent()) {
                 LOGGER.info("Fulltext PDF found @ arXiv.");
@@ -159,7 +164,7 @@ private List<ArXivEntry> searchForEntries(String searchQuery) throws FetcherExce
     }
 
     private List<ArXivEntry> queryApi(String searchQuery, List<ArXivIdentifier> ids, int start, int maxResults)
-            throws FetcherException {
+        throws FetcherException {
         Document result = callApi(searchQuery, ids, start, maxResults);
         List<Node> entries = XMLUtil.asList(result.getElementsByTagName("entry"));
 
@@ -195,7 +200,7 @@ private Document callApi(String searchQuery, List<ArXivIdentifier> ids, int star
             }
             if (!ids.isEmpty()) {
                 uriBuilder.addParameter("id_list",
-                        ids.stream().map(ArXivIdentifier::getNormalized).collect(Collectors.joining(",")));
+                                        ids.stream().map(ArXivIdentifier::getNormalized).collect(Collectors.joining(",")));
             }
             uriBuilder.addParameter("start", String.valueOf(start));
             uriBuilder.addParameter("max_results", String.valueOf(maxResults));
@@ -252,7 +257,8 @@ public HelpFile getHelpPage() {
     @Override
     public List<BibEntry> performSearch(String query) throws FetcherException {
         return searchForEntries(query).stream().map(
-                (arXivEntry) -> arXivEntry.toBibEntry(importFormatPreferences.getKeywordSeparator())).collect(Collectors.toList());
+                                                    (arXivEntry) -> arXivEntry.toBibEntry(importFormatPreferences.getKeywordSeparator()))
+                                      .collect(Collectors.toList());
     }
 
     @Override
@@ -266,10 +272,10 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
     @Override
     public Optional<ArXivIdentifier> findIdentifier(BibEntry entry) throws FetcherException {
         return searchForEntries(entry).stream()
-                .map(ArXivEntry::getId)
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .findFirst();
+                                      .map(ArXivEntry::getId)
+                                      .filter(Optional::isPresent)
+                                      .map(Optional::get)
+                                      .findFirst();
     }
 
     @Override
@@ -290,7 +296,6 @@ private static class ArXivEntry {
         private final Optional<String> journalReferenceText;
         private final Optional<String> primaryCategory;
 
-
         public ArXivEntry(Node item) {
             // see https://arxiv.org/help/api/user-manual#_details_of_atom_results_returned
 
@@ -347,7 +352,7 @@ public ArXivEntry(Node item) {
             // Primary category
             // Ex: <arxiv:primary_category xmlns:arxiv="https://arxiv.org/schemas/atom" term="math-ph" scheme="http://arxiv.org/schemas/atom"/>
             primaryCategory = XMLUtil.getNode(item, "arxiv:primary_category")
-                    .flatMap(node -> XMLUtil.getAttributeContent(node, "term"));
+                                     .flatMap(node -> XMLUtil.getAttributeContent(node, "term"));
         }
 
         public static String correctLineBreaks(String s) {
@@ -367,14 +372,16 @@ public Optional<URL> getPdfUrl() {
          * Returns the arXiv identifier
          */
         public Optional<String> getIdString() {
-            // remove leading https://arxiv.org/abs/ from abstract url to get arXiv ID
-            String prefix = "https://arxiv.org/abs/";
+
             return urlAbstractPage.map(abstractUrl -> {
-                if (abstractUrl.startsWith(prefix)) {
-                    return abstractUrl.substring(prefix.length());
+                Matcher matcher = URL_PATTERN.matcher(abstractUrl);
+                if (matcher.find()) {
+                    // remove leading http(s)://arxiv.org/abs/ from abstract url to get arXiv ID
+                    return abstractUrl.substring(matcher.group(1).length());
                 } else {
                     return abstractUrl;
                 }
+
             });
         }
 
@@ -409,8 +416,7 @@ public BibEntry toBibEntry(Character keywordDelimiter) {
             getDate().ifPresent(date -> bibEntry.setField(FieldName.DATE, date));
             primaryCategory.ifPresent(category -> bibEntry.setField(FieldName.EPRINTCLASS, category));
             journalReferenceText.ifPresent(journal -> bibEntry.setField(FieldName.JOURNALTITLE, journal));
-            getPdfUrl().ifPresent(url -> bibEntry
-                    .setFiles(Collections.singletonList(new LinkedFile(url, "PDF"))));
+            getPdfUrl().ifPresent(url -> bibEntry.setFiles(Collections.singletonList(new LinkedFile(url, "PDF"))));
             return bibEntry;
         }
     }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
index ffc3469a567..19f4f52b636 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
@@ -416,7 +416,7 @@ private void putDate(Map<String, String> fields, String elementName, DateDefinit
 
     private void putIfListIsNotEmpty(Map<String, String> fields, List<String> list, String key, String separator) {
         if (!list.isEmpty()) {
-            fields.put(key, Joiner.on(separator).join(list));
+            fields.put(key, list.stream().collect(Collectors.joining(separator)));
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/net/ProgressInputStream.java b/src/main/java/org/jabref/logic/net/ProgressInputStream.java
index 57d23907ff4..d114cbbe6cb 100644
--- a/src/main/java/org/jabref/logic/net/ProgressInputStream.java
+++ b/src/main/java/org/jabref/logic/net/ProgressInputStream.java
@@ -12,16 +12,18 @@
  * Code based on http://stackoverflow.com/a/1339589/873661, but converted to use JavaFX properties instead of listeners
  */
 public class ProgressInputStream extends FilterInputStream {
+
     private final long maxNumBytes;
     private final LongProperty totalNumBytesRead;
     private final LongProperty progress;
 
     public ProgressInputStream(InputStream in, long maxNumBytes) {
         super(in);
-        this.maxNumBytes = maxNumBytes;
         this.totalNumBytesRead = new SimpleLongProperty(0);
         this.progress = new SimpleLongProperty(0);
-        this.progress.bind(totalNumBytesRead.divide(maxNumBytes));
+
+        this.maxNumBytes = maxNumBytes <= 0 ? 1 : maxNumBytes;
+        this.progress.bind(totalNumBytesRead.divide(this.maxNumBytes));
     }
 
     public long getTotalNumBytesRead() {
diff --git a/src/main/java/org/jabref/logic/net/URLDownload.java b/src/main/java/org/jabref/logic/net/URLDownload.java
index 8219f0ebe0a..5ae3f915c02 100644
--- a/src/main/java/org/jabref/logic/net/URLDownload.java
+++ b/src/main/java/org/jabref/logic/net/URLDownload.java
@@ -2,6 +2,7 @@
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -96,6 +97,7 @@ public static void bypassSSLVerification() {
 
         // Create a trust manager that does not validate certificate chains
         TrustManager[] trustAllCerts = {new X509TrustManager() {
+
             @Override
             public void checkClientTrusted(X509Certificate[] chain, String authType) {
             }
@@ -249,8 +251,14 @@ public void toFile(Path destination) throws IOException {
      * Takes the web resource as the source for a monitored input stream.
      */
     public ProgressInputStream asInputStream() throws IOException {
-        URLConnection urlConnection = this.openConnection();
-        long fileSize = urlConnection.getContentLength();
+        HttpURLConnection urlConnection = (HttpURLConnection) this.openConnection();
+
+        if ((urlConnection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) || (urlConnection.getResponseCode() == HttpURLConnection.HTTP_BAD_REQUEST))
+        {
+            LOGGER.error("Response message {} returned for url {}", urlConnection.getResponseMessage(), urlConnection.getURL());
+            return new ProgressInputStream(new ByteArrayInputStream(new byte[0]), 0);
+        }
+        long fileSize = urlConnection.getContentLengthLong();
         return new ProgressInputStream(new BufferedInputStream(urlConnection.getInputStream()), fileSize);
     }
 
@@ -311,8 +319,8 @@ private URLConnection openConnection() throws IOException {
             int status = ((HttpURLConnection) connection).getResponseCode();
             if (status != HttpURLConnection.HTTP_OK) {
                 if ((status == HttpURLConnection.HTTP_MOVED_TEMP)
-                        || (status == HttpURLConnection.HTTP_MOVED_PERM)
-                        || (status == HttpURLConnection.HTTP_SEE_OTHER)) {
+                    || (status == HttpURLConnection.HTTP_MOVED_PERM)
+                    || (status == HttpURLConnection.HTTP_SEE_OTHER)) {
                     // get redirect url from "location" header field
                     String newUrl = connection.getHeaderField("Location");
                     // open the new connnection again
diff --git a/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java b/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
index ba3e428f9ca..8b9287d3e2b 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
@@ -22,8 +22,12 @@ public static Optional<ArXivIdentifier> parse(String value) {
 
     @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;
+        }
 
         ArXivIdentifier that = (ArXivIdentifier) o;
 
@@ -45,6 +49,11 @@ public String getNormalized() {
         return identifier;
     }
 
+    @Override
+    public String toString() {
+        return "ArXivIdentifier [identifier=" + identifier + "]";
+    }
+
     @Override
     public Optional<URI> getExternalURI() {
         try {
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
index 01d1f31bb77..c11b94cb2bb 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
@@ -31,7 +31,7 @@ void findByDOI() throws IOException {
         entry.setField("doi", "10.1021/bk-2006-STYG.ch014");
 
         assertEquals(
-                Optional.of(new URL("http://pubs.acs.org/doi/pdf/10.1021/bk-2006-STYG.ch014")),
+                     Optional.of(new URL("https://pubs.acs.org/doi/pdf/10.1021/bk-2006-STYG.ch014")),
                 finder.findFullText(entry)
         );
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
index 3a438659b31..4c3fd88b745 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
@@ -191,5 +191,8 @@ public void searchIdentifierForSlicePaper() throws Exception {
 
         assertEquals(ArXivIdentifier.parse("1405.2249v1"), finder.findIdentifier(sliceTheoremPaper));
     }
-
+    @Test
+    public void searchEmptyId() throws Exception {
+        assertEquals(Optional.empty(), finder.performSearchById(""));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
index 5afe8a6c208..ee5f4c4e2bd 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
@@ -176,8 +176,7 @@ public void testPerformSearchByIdEmptyDOI() throws Exception {
 
     @Test
     public void testPerformSearchByIdInvalidDoi() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("this.doi.will.fail");
-        assertEquals(Optional.empty(), fetchedEntry);
+        assertEquals(Optional.empty(), fetcher.performSearchById("this.doi.will.fail"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
index cb98379e242..6c9406e6e71 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
@@ -1,9 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
+import java.util.Collections;
 import java.util.Locale;
 import java.util.Optional;
 
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.testutils.category.FetcherTest;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -115,7 +117,7 @@ public void findByEntry() throws Exception {
 
     @Test
     public void performSearchByIdFindsPaperWithoutTitle() throws Exception {
-        BibEntry entry = new BibEntry("article");
+        BibEntry entry = new BibEntry(BibtexEntryTypes.ARTICLE);
         entry.setField("author", "Dominik Wujastyk");
         entry.setField("doi", "10.1023/a:1003473214310");
         entry.setField("issn", "0019-7246");
@@ -125,4 +127,14 @@ public void performSearchByIdFindsPaperWithoutTitle() throws Exception {
 
         assertEquals(Optional.of(entry), fetcher.performSearchById("10.1023/a:1003473214310"));
     }
+
+    @Test
+    public void performSearchByEmptyId() throws Exception {
+        assertEquals(Optional.empty(), fetcher.performSearchById(""));
+    }
+
+    @Test
+    public void performSearchByEmptyQuery() throws Exception {
+        assertEquals(Collections.emptyList(), fetcher.performSearch(""));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
index 1bbdb7eb249..51e1ba7ad97 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
@@ -28,21 +28,21 @@ public class DBLPFetcherTest {
     public void setUp() {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
         when(importFormatPreferences.getFieldContentParserPreferences())
-                .thenReturn(mock(FieldContentParserPreferences.class));
+                                                                        .thenReturn(mock(FieldContentParserPreferences.class));
         dblpFetcher = new DBLPFetcher(importFormatPreferences);
         entry = new BibEntry();
 
         entry.setType(BibtexEntryTypes.ARTICLE.getName());
         entry.setCiteKey("DBLP:journals/stt/GeigerHL16");
         entry.setField(FieldName.TITLE,
-                "Process Engine Benchmarking with Betsy in the Context of {ISO/IEC} Quality Standards");
+                       "Process Engine Benchmarking with Betsy in the Context of {ISO/IEC} Quality Standards");
         entry.setField(FieldName.AUTHOR, "Matthias Geiger and Simon Harrer and J{\\\"{o}}rg Lenhard");
         entry.setField(FieldName.JOURNAL, "Softwaretechnik-Trends");
         entry.setField(FieldName.VOLUME, "36");
         entry.setField(FieldName.NUMBER, "2");
         entry.setField(FieldName.YEAR, "2016");
         entry.setField(FieldName.URL,
-                "http://pi.informatik.uni-siegen.de/stt/36_2/./03_Technische_Beitraege/ZEUS2016/beitrag_2.pdf");
+                       "http://pi.informatik.uni-siegen.de/stt/36_2/./03_Technische_Beitraege/ZEUS2016/beitrag_2.pdf");
         entry.setField("biburl", "https://dblp.org/rec/bib/journals/stt/GeigerHL16");
         entry.setField("bibsource", "dblp computer science bibliography, https://dblp.org");
 
@@ -64,4 +64,9 @@ public void findSingleEntryUsingComplexOperators() throws FetcherException {
         assertEquals(Collections.singletonList(entry), result);
     }
 
+    @Test
+    public void findNothing() throws Exception {
+        assertEquals(Collections.emptyList(), dblpFetcher.performSearch(""));
+    }
+
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java
index 4fc62ebec0f..77a0a20b925 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java
@@ -31,7 +31,7 @@ void setUp() {
 
     @Test
     void searchByQueryFindsEntry() throws Exception {
-        BibEntry expected = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry expected = new BibEntry(BibtexEntryTypes.ARTICLE);
         expected.setField("author", "Wei Wang and Yun He and Tong Li and Jiajun Zhu and Jinzhuo Liu");
         expected.setField("doi", "10.1155/2018/5913634");
         expected.setField("issn", "1875-919X");
@@ -65,10 +65,12 @@ void testBibJSONConverter() {
         assertEquals(Optional.of("VLSI Design"), bibEntry.getField("journal"));
         assertEquals(Optional.of("10.1155/2014/217495"), bibEntry.getField("doi"));
         assertEquals(Optional.of("Syed Asad Alam and Oscar Gustafsson"), bibEntry.getField("author"));
-        assertEquals(
-                Optional.of(
-                        "Design of Finite Word Length Linear-Phase FIR Filters in the Logarithmic Number System Domain"),
-                bibEntry.getField("title"));
+        assertEquals(Optional.of("Design of Finite Word Length Linear-Phase FIR Filters in the Logarithmic Number System Domain"), bibEntry.getField("title"));
         assertEquals(Optional.of("2014"), bibEntry.getField("year"));
     }
+
+    @Test
+    public void searchByEmptyQuery() throws Exception {
+        assertEquals(Collections.emptyList(), fetcher.performSearch(""));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
index 9b7b6d2d86e..fa76e65b9b4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
@@ -44,7 +44,7 @@ public void testPerformSearchById() throws Exception {
         entry.setField("institution", "Linköping University, The Institute of Technology");
         entry.setCiteKey("Gustafsson260746");
         entry.setField("journal",
-                "IEEE transactions on circuits and systems. 2, Analog and digital signal processing (Print)");
+                       "IEEE transactions on circuits and systems. 2, Analog and digital signal processing (Print)");
         entry.setField("number", "11");
         entry.setField("pages", "974--978");
         entry.setField("title", "Lower bounds for constant multiplication problems");
@@ -65,4 +65,9 @@ public void testValidIdentifier() {
     public void testInvalidIdentifier() {
         assertFalse(fetcher.isValidId("banana"));
     }
+
+    @Test
+    public void testEmptyId() throws Exception {
+        assertEquals(Optional.empty(), fetcher.performSearchById(""));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
index cd88c970e6b..aafc965b53c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
@@ -66,18 +66,16 @@ public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
     public void authorsAreCorrectlyFormatted() throws Exception {
         BibEntry bibEntry = new BibEntry();
         bibEntry.setType(BiblatexEntryTypes.BOOK);
-        bibEntry.setField("bibtexkey", "9783642434730");
+        bibEntry.setField("bibtexkey", "9783662565094");
         bibEntry.setField("title", "Fundamentals of Business Process Management");
         bibEntry.setField("publisher", "Springer Berlin Heidelberg");
-        bibEntry.setField("year", "2015");
+        bibEntry.setField("year", "2018");
         bibEntry.setField("author", "Dumas, Marlon and Rosa, Marcello La and Mendling, Jan and Reijers, Hajo A.");
-        bibEntry.setField("date", "2015-04-12");
-        bibEntry.setField("ean", "9783642434730");
-        bibEntry.setField("isbn", "3642434738");
-        bibEntry.setField("pagetotal", "428");
-        bibEntry.setField("url", "https://www.ebook.de/de/product/23955263/marlon_dumas_marcello_la_rosa_jan_mendling_hajo_a_reijers_fundamentals_of_business_process_management.html");
+        bibEntry.setField("date", "2018-03-23");
+        bibEntry.setField("ean", "9783662565094");
+        bibEntry.setField("url", "https://www.ebook.de/de/product/33399253/marlon_dumas_marcello_la_rosa_jan_mendling_hajo_a_reijers_fundamentals_of_business_process_management.html");
 
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3642434738");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("978-3-662-56509-4");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java b/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
index 59f23a88b72..837e7607f6c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
@@ -6,16 +6,24 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.testutils.category.FetcherTest;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Answers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @FetcherTest
 public class LibraryOfCongressTest {
 
-    private final LibraryOfCongress fetcher = new LibraryOfCongress(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+    private LibraryOfCongress fetcher;
+
+    @BeforeEach
+    public void setUp() {
+        ImportFormatPreferences prefs = mock(ImportFormatPreferences.class);
+        when(prefs.getKeywordSeparator()).thenReturn(',');
+        fetcher = new LibraryOfCongress(prefs);
+    }
 
     @Test
     public void performSearchById() throws Exception {
@@ -24,7 +32,7 @@ public void performSearchById() throws Exception {
         expected.setField("author", "West, Matthew");
         expected.setField("isbn", "0123751063 (pbk.)");
         expected.setField("issuance", "monographic");
-        expected.setField("keywords", "Database design Data structures (Computer science)");
+        expected.setField("keywords", "Database design, Data structures (Computer science)");
         expected.setField("language", "eng");
         expected.setField("lccn", "2010045158");
         expected.setField("note", "Matthew West., Includes index.");
@@ -36,4 +44,14 @@ public void performSearchById() throws Exception {
 
         assertEquals(Optional.of(expected), fetcher.performSearchById("2010045158"));
     }
+
+    @Test
+    public void performSearchByEmptyId() throws Exception {
+        assertEquals(Optional.empty(), fetcher.performSearchById(""));
+    }
+
+    @Test
+    public void performSearchByInvalidId() throws Exception {
+        assertEquals(Optional.empty(), fetcher.performSearchById("xxx"));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
index e66d81f0948..5c2f2787854 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
@@ -28,7 +28,7 @@ class MathSciNetTest {
     void setUp() throws Exception {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
         when(importFormatPreferences.getFieldContentParserPreferences()).thenReturn(
-                mock(FieldContentParserPreferences.class));
+                                                                                    mock(FieldContentParserPreferences.class));
         fetcher = new MathSciNet(importFormatPreferences);
 
         ratiuEntry = new BibEntry();
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java b/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java
index 9bb675fb340..0e060cc825a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java
@@ -28,10 +28,7 @@ void setUp() {
     void findByDOI() throws IOException {
         entry.setField("doi", "10.1038/nature12373");
 
-        assertEquals(
-                Optional.of(new URL("https://dash.harvard.edu/bitstream/handle/1/12285462/Nanometer-Scale%20Thermometry.pdf?sequence=1")),
-                finder.findFullText(entry)
-        );
+        assertEquals(Optional.of(new URL("https://dash.harvard.edu/bitstream/handle/1/12285462/Nanometer-Scale%20Thermometry.pdf?sequence=1")), finder.findFullText(entry));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
index dbb02f25610..1ed849969ae 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
@@ -1,16 +1,17 @@
 package org.jabref.logic.importer.fetcher;
 
+import java.util.Optional;
+
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BiblatexEntryTypes;
 import org.jabref.testutils.category.FetcherTest;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
 @FetcherTest
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
index 7123d5c3e50..9c250666750 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
@@ -26,7 +26,7 @@ void setUp() {
 
     @Test
     void searchByQueryFindsEntry() throws Exception {
-        BibEntry expected = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry expected = new BibEntry(BibtexEntryTypes.ARTICLE);
         expected.setField("author", "Steinmacher, Igor and Gerosa, Marco and Conte, Tayana U. and Redmiles, David F.");
         expected.setField("date", "2018-06-14");
         expected.setField("doi", "10.1007/s10606-018-9335-z");
@@ -66,4 +66,9 @@ void testSpringerJSONToBibtex() {
         assertEquals(Optional.of("Springer"), bibEntry.getField("publisher"));
         assertEquals(Optional.of("1992-09-01"), bibEntry.getField("date"));
     }
+
+    @Test
+    void searchByEmptyQueryFindsNothing() throws Exception {
+        assertEquals(Collections.emptyList(), fetcher.performSearch(""));
+    }
 }
diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2-test.xml
similarity index 95%
rename from src/test/resources/log4j2.xml
rename to src/test/resources/log4j2-test.xml
index 8c6a336420a..0422d0bd80d 100644
--- a/src/test/resources/log4j2.xml
+++ b/src/test/resources/log4j2-test.xml
@@ -4,7 +4,7 @@
         <Console name="CONSOLE" target="SYSTEM_OUT">
             <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg - %ex{5} %n"/>
         </Console>
-    </Appenders>
+     </Appenders>
     <Loggers>
         <Root level="INFO">
             <AppenderRef ref="CONSOLE"/>

From dd4f043f1557abc4cef7a139751667355b87b850 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Tue, 24 Jul 2018 11:01:54 +0200
Subject: [PATCH 006/229] Update to latest release of richtextfx (#4213)

RichTextFX will no longer be maintained
https://github.com/FXMisc/RichTextFX/issues/768
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2bdc695491e..e738bf1944b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,7 +125,7 @@ dependencies {
     compile 'de.saxsys:mvvmfx:1.7.0'
     compile 'org.fxmisc.easybind:easybind:1.0.3'
     compile 'org.fxmisc.flowless:flowless:0.6.1'
-    compile 'org.fxmisc.richtext:richtextfx:0.9.0'
+    compile 'org.fxmisc.richtext:richtextfx:0.9.1'
     compile 'com.sibvisions.external.jvxfx:dndtabpane:0.1'
     compile 'javax.inject:javax.inject:1'
 

From 67474dc29882dfa567b203ff97495d06f016f80d Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Tue, 24 Jul 2018 11:36:23 +0200
Subject: [PATCH 007/229] Update dependencies (#4231)

* update mockito

* update archunit and errorprone

* fix typo
---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index e738bf1944b..2daa628c683 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ plugins {
     id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
     id "com.simonharrer.modernizer" version '1.6.0-1'
     id 'me.champeau.gradle.jmh' version '0.4.7'
-    id 'net.ltgt.errorprone' version '0.0.14'
+    id 'net.ltgt.errorprone' version '0.0.15'
     id 'com.github.ben-manes.versions' version '0.20.0'
 }
 
@@ -160,13 +160,13 @@ dependencies {
     testCompile 'org.junit-pioneer:junit-pioneer:0.1.2'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.0'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.0'
-    testCompile 'org.mockito:mockito-core:2.19.1'
+    testCompile 'org.mockito:mockito-core:2.20.0'
     testCompile 'com.github.tomakehurst:wiremock:2.18.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.6.0'
     testCompile 'org.xmlunit:xmlunit-matchers:2.6.0'
-    testCompile 'com.tngtech.archunit:archunit-junit:0.8.2'
+    testCompile 'com.tngtech.archunit:archunit-junit:0.8.3'
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 

From faef58ccd2b6d0e6f90643c8fcadee0325918a84 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 24 Jul 2018 16:36:52 +0200
Subject: [PATCH 008/229] Properly style normal buttons

---
 src/main/java/org/jabref/gui/Base.css         |  18 +
 .../gui/util/DefaultFileUpdateMonitor.java    |   4 +
 .../org/jabref/styletester/StyleTester.fxml   | 577 +++++++++---------
 .../jabref/styletester/StyleTesterMain.java   |  10 +-
 .../jabref/styletester/StyleTesterView.java   |  21 +-
 5 files changed, 348 insertions(+), 282 deletions(-)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 0032fb67f0b..09734d4ce53 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -335,6 +335,24 @@
     -fx-text-fill: -fx-text-base-color;
 }
 
+.button {
+    -fx-background-color: transparent;
+    -fx-border-color: rgba(0, 0, 0, 0.23);
+    -fx-border-width: 1px;
+    -fx-border-radius: 4px;
+    -fx-padding: 0.5em 1em 0.5em 1em;
+}
+
+.button:hover {
+    -fx-background-color: rgba(0, 0, 0, 0.12);
+}
+
+.button:focused,
+.button:pressed {
+    -fx-background-color: rgba(0, 0, 0, 0.3);
+}
+
+
 .menu-bar {
     -fx-background-color: -jr-menu-background;
     -fx-background-insets: 0;
diff --git a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java b/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
index a9ef705e068..28de7285f3f 100644
--- a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
@@ -69,6 +69,10 @@ private void notifyAboutChange(Path path) {
 
     @Override
     public void addListenerForFile(Path file, FileUpdateListener listener) throws IOException {
+        if (watcher == null) {
+            throw new IllegalStateException("You need to start the file monitor before watching files");
+        }
+
         // We can't watch files directly, so monitor their parent directory for updates
         Path directory = file.toAbsolutePath().getParent();
         directory.register(watcher, StandardWatchEventKinds.ENTRY_MODIFY);
diff --git a/src/main/java/org/jabref/styletester/StyleTester.fxml b/src/main/java/org/jabref/styletester/StyleTester.fxml
index abdc7415893..5cd720a3e7d 100644
--- a/src/main/java/org/jabref/styletester/StyleTester.fxml
+++ b/src/main/java/org/jabref/styletester/StyleTester.fxml
@@ -8,6 +8,7 @@
 <?import javafx.scene.control.ChoiceBox?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuButton?>
@@ -30,283 +31,303 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<AnchorPane xmlns:fx="http://javafx.com/fxml"
-            xmlns="http://javafx.com/javafx"
-            fx:controller="org.jabref.styletester.StyleTesterView"
-            prefHeight="400.0" prefWidth="600.0">
-    <children>
-        <VBox layoutX="194.0" layoutY="14.0" prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="0.0"
-              AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-            <children>
-                <MenuBar>
-                    <menus>
-                        <Menu mnemonicParsing="false" text="File">
-                            <items>
-                                <MenuItem mnemonicParsing="false" text="Load Stylesheet...">
-                                    <accelerator>
-                                        <KeyCodeCombination alt="UP" code="O" control="DOWN" meta="UP" shift="UP"
-                                                            shortcut="UP"/>
-                                    </accelerator>
-                                </MenuItem>
-                                <MenuItem mnemonicParsing="false" text="Reload Stylesheet">
-                                    <accelerator>
-                                        <KeyCodeCombination alt="UP" code="R" control="DOWN" meta="UP" shift="UP"
-                                                            shortcut="UP"/>
-                                    </accelerator>
-                                </MenuItem>
-                            </items>
-                        </Menu>
-                    </menus>
-                </MenuBar>
-                <HBox prefHeight="652.0" prefWidth="1124.0" spacing="5.0">
-                    <children>
-                        <VBox prefHeight="385.0" prefWidth="236.0" spacing="10.0" HBox.hgrow="ALWAYS">
-                            <children>
-                                <ComboBox maxWidth="1.7976931348623157E308" prefWidth="150.0" promptText="Combo Box">
-                                    <items>
-                                        <FXCollections fx:factory="observableArrayList">
-                                            <String fx:value="Apple"/>
-                                            <String fx:value="Orange"/>
-                                            <String fx:value="Pear"/>
-                                        </FXCollections>
-                                    </items>
-                                </ComboBox>
-                                <ComboBox disable="true" maxWidth="1.7976931348623157E308" prefWidth="150.0"
-                                          promptText="Combo Box (Disabled)">
-                                    <items>
-                                        <FXCollections fx:factory="observableArrayList">
-                                            <String fx:value="Apple"/>
-                                            <String fx:value="Orange"/>
-                                            <String fx:value="Pear"/>
-                                        </FXCollections>
-                                    </items>
-                                </ComboBox>
-                                <Separator prefWidth="200.0"/>
-                                <ComboBox editable="true" maxWidth="1.7976931348623157E308" prefWidth="150.0"
-                                          promptText="Combo Box">
-                                    <items>
-                                        <FXCollections fx:factory="observableArrayList">
-                                            <String fx:value="Apple"/>
-                                            <String fx:value="Orange"/>
-                                            <String fx:value="Pear"/>
-                                        </FXCollections>
-                                    </items>
-                                </ComboBox>
-                                <ComboBox disable="true" editable="true" maxWidth="1.7976931348623157E308"
-                                          prefWidth="150.0" promptText="Combo Box (Disabled)">
-                                    <items>
-                                        <FXCollections fx:factory="observableArrayList">
-                                            <String fx:value="Apple"/>
-                                            <String fx:value="Orange"/>
-                                            <String fx:value="Pear"/>
-                                        </FXCollections>
-                                    </items>
-                                </ComboBox>
-                                <Separator prefWidth="200.0"/>
-                                <ChoiceBox maxWidth="1.7976931348623157E308" prefWidth="150.0">
-                                    <items>
-                                        <FXCollections fx:factory="observableArrayList">
-                                            <String fx:value="Apple"/>
-                                            <String fx:value="Orange"/>
-                                            <String fx:value="Pear"/>
-                                        </FXCollections>
-                                    </items>
-                                </ChoiceBox>
-                                <ChoiceBox disable="true" maxWidth="1.7976931348623157E308" prefWidth="150.0">
-                                    <items>
-                                        <FXCollections fx:factory="observableArrayList">
-                                            <String fx:value="Apple"/>
-                                            <String fx:value="Orange"/>
-                                            <String fx:value="Pear"/>
-                                        </FXCollections>
-                                    </items>
-                                </ChoiceBox>
-                                <Separator prefWidth="200.0"/>
-                                <TextField promptText="Text Field"/>
-                                <TextField editable="false" text="Text Field (non-editable)"/>
-                                <TextField disable="true" text="Text Field (disabled)"/>
-                                <Separator prefWidth="200.0"/>
-                                <PasswordField promptText="Password"/>
-                                <PasswordField editable="false" promptText="Password (non-editable)"
-                                               text="Password (non-editable)"/>
-                                <PasswordField disable="true" text="Password (disabled)"/>
-                                <Separator prefWidth="200.0"/>
-                                <HBox prefHeight="100.0" prefWidth="200.0">
-                                    <children>
-                                        <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0"
-                                              HBox.hgrow="SOMETIMES">
-                                            <children>
-                                                <CheckBox allowIndeterminate="true" mnemonicParsing="false"
-                                                          text="CheckBox"/>
-                                                <CheckBox allowIndeterminate="true" mnemonicParsing="false"
-                                                          selected="true" text="CheckBox"/>
-                                                <CheckBox allowIndeterminate="true" disable="true"
-                                                          mnemonicParsing="false" text="CheckBox"/>
-                                                <CheckBox allowIndeterminate="true" disable="true"
-                                                          mnemonicParsing="false" selected="true" text="CheckBox"/>
-                                                <CheckBox allowIndeterminate="true" disable="true" indeterminate="true"
-                                                          mnemonicParsing="false" text="CheckBox"/>
-                                            </children>
-                                        </VBox>
-                                        <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0"
-                                              HBox.hgrow="SOMETIMES">
-                                            <children>
-                                                <RadioButton mnemonicParsing="false" text="RadioButton">
-                                                    <toggleGroup>
-                                                        <ToggleGroup fx:id="radios"/>
-                                                    </toggleGroup>
-                                                </RadioButton>
-                                                <RadioButton mnemonicParsing="false" selected="true" text="RadioButton"
-                                                             toggleGroup="$radios"/>
-                                                <RadioButton disable="true" mnemonicParsing="false" text="RadioButton"/>
-                                                <RadioButton disable="true" mnemonicParsing="false" selected="true"
-                                                             text="RadioButton"/>
-                                            </children>
-                                        </VBox>
-                                    </children>
-                                </HBox>
-                            </children>
-                        </VBox>
-                        <Separator orientation="VERTICAL" prefHeight="200.0"/>
-                        <VBox prefHeight="385.0" prefWidth="236.0" spacing="10.0" HBox.hgrow="ALWAYS">
-                            <children>
-                                <MenuButton maxWidth="1.7976931348623157E308" mnemonicParsing="false" text="MenuButton">
-                                    <items>
-                                        <MenuItem mnemonicParsing="false" text="Action 1"/>
-                                        <MenuItem mnemonicParsing="false" text="Action 2"/>
-                                    </items>
-                                </MenuButton>
-                                <MenuButton disable="true" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
-                                            text="MenuButton (Disabled)">
-                                    <items>
-                                        <MenuItem mnemonicParsing="false" text="Action 1"/>
-                                        <MenuItem mnemonicParsing="false" text="Action 2"/>
-                                    </items>
-                                </MenuButton>
-                                <Separator prefWidth="200.0"/>
-                                <SplitMenuButton maxWidth="1.7976931348623157E308" mnemonicParsing="false"
-                                                 text="SplitMenuButton">
-                                    <items>
-                                        <MenuItem mnemonicParsing="false" text="Action 1"/>
-                                        <MenuItem mnemonicParsing="false" text="Action 2"/>
-                                    </items>
-                                </SplitMenuButton>
-                                <SplitMenuButton disable="true" maxWidth="1.7976931348623157E308"
-                                                 mnemonicParsing="false" text="SplitMenuButton (Disabled)">
-                                    <items>
-                                        <MenuItem mnemonicParsing="false" text="Action 1"/>
-                                        <MenuItem mnemonicParsing="false" text="Action 2"/>
-                                    </items>
-                                </SplitMenuButton>
-                                <Separator prefWidth="200.0"/>
-                                <Button maxWidth="1.7976931348623157E308" mnemonicParsing="false" text="Button"/>
-                                <Button disable="true" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
-                                        text="Button (Disabled)"/>
-                                <Button defaultButton="true" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
-                                        text="Button (Default)"/>
-                                <Button cancelButton="true" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
-                                        text="Button (Cancel)"/>
-                                <Separator prefWidth="200.0"/>
-                                <Hyperlink maxWidth="1.7976931348623157E308" text="Hyperlink"/>
-                                <Hyperlink maxWidth="1.7976931348623157E308" text="Hyperlink (Visited)" visited="true"/>
-                                <Separator prefWidth="200.0"/>
-                            </children>
-                        </VBox>
-                        <Separator orientation="VERTICAL" prefHeight="200.0"/>
-                        <VBox prefHeight="385.0" prefWidth="236.0" spacing="10.0" HBox.hgrow="ALWAYS">
-                            <children>
-                                <Slider value="35.0"/>
-                                <Slider showTickMarks="true" snapToTicks="true" value="35.0"/>
-                                <Slider showTickLabels="true" showTickMarks="true" snapToTicks="true" value="35.0"/>
-                                <FlowPane alignment="CENTER" columnHalignment="CENTER" hgap="10.0" prefHeight="200.0"
-                                          prefWidth="200.0" vgap="10.0">
-                                    <children>
-                                        <Slider orientation="VERTICAL"/>
-                                        <Slider orientation="VERTICAL" showTickMarks="true"/>
-                                        <Slider orientation="VERTICAL" showTickLabels="true" showTickMarks="true"/>
-                                    </children>
-                                </FlowPane>
-                                <Separator prefWidth="200.0"/>
-                                <ProgressBar maxWidth="1.7976931348623157E308" prefWidth="200.0" progress="0.3"/>
-                                <ProgressBar maxWidth="1.7976931348623157E308" prefWidth="200.0"/>
-                                <ProgressIndicator progress="0.3"/>
-                                <ProgressIndicator/>
-                            </children>
-                        </VBox>
-                        <Separator orientation="VERTICAL" prefHeight="200.0"/>
-                        <VBox prefHeight="385.0" prefWidth="236.0" HBox.hgrow="ALWAYS">
-                            <children>
-                                <TextArea prefHeight="71.0" prefWidth="268.0" promptText="Text Area" wrapText="true"/>
-                            </children>
-                        </VBox>
-                    </children>
-                    <padding>
-                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                    </padding>
+<AnchorPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="400.0" prefWidth="600.0"
+            xmlns="http://javafx.com/javafx/8.0.121" fx:controller="org.jabref.styletester.StyleTesterView">
+    <TabPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+             AnchorPane.topAnchor="0.0">
+        <Tab text="Buttons">
+            <FlowPane>
+                <Label>Normal buttons:</Label>
+                <HBox spacing="16">
+                    <Button text="Normal"/>
+                    <Button text="Hover" fx:id="normalButtonHover"/>
+                    <Button text="Pressed" fx:id="normalButtonPressed"/>
+                    <Button text="Focused" fx:id="normalButtonFocused"/>
+                    <Button disable="true" text="Disabled"/>
+                    <Button defaultButton="true" text="Default"/>
+                    <Button cancelButton="true" text="Cancel"/>
                 </HBox>
-                <SplitPane dividerPositions="0.45566502463054187" prefHeight="160.0" prefWidth="200.0"
-                           VBox.vgrow="ALWAYS">
-                    <items>
-                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-                            <children>
-                                <TabPane prefHeight="173.0" prefWidth="259.0" side="BOTTOM"
-                                         AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                                         AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                    <tabs>
-                                        <Tab text="Lorem">
-                                            <content>
-                                                <AnchorPane/>
-                                            </content>
-                                        </Tab>
-                                        <Tab text="Ipsum">
-                                            <content>
-                                                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
-                                                            prefWidth="200.0"/>
-                                            </content>
-                                        </Tab>
-                                        <Tab text="Dolor">
-                                            <content>
-                                                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
-                                                            prefWidth="200.0"/>
-                                            </content>
-                                        </Tab>
-                                    </tabs>
-                                </TabPane>
-                            </children>
-                        </AnchorPane>
-                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-                            <children>
-                                <TabPane prefHeight="173.0" prefWidth="294.0" side="LEFT" AnchorPane.bottomAnchor="0.0"
-                                         AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
-                                         AnchorPane.topAnchor="0.0">
-                                    <tabs>
-                                        <Tab text="Lorem">
-                                            <content>
-                                                <AnchorPane/>
-                                            </content>
-                                        </Tab>
-                                        <Tab text="Ipsum">
-                                            <content>
-                                                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
-                                                            prefWidth="200.0"/>
-                                            </content>
-                                        </Tab>
-                                        <Tab text="Dolor">
-                                            <content>
-                                                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
-                                                            prefWidth="200.0"/>
-                                            </content>
-                                        </Tab>
-                                    </tabs>
-                                </TabPane>
-                            </children>
-                        </AnchorPane>
-                    </items>
-                    <padding>
-                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                    </padding>
-                </SplitPane>
-            </children>
-        </VBox>
-    </children>
+            </FlowPane>
+        </Tab>
+        <Tab>
+            <VBox layoutX="194.0" layoutY="14.0" prefHeight="200.0" prefWidth="100.0">
+                <children>
+                    <MenuBar>
+                        <menus>
+                            <Menu mnemonicParsing="false" text="File">
+                                <items>
+                                    <MenuItem mnemonicParsing="false" text="Load Stylesheet...">
+                                        <accelerator>
+                                            <KeyCodeCombination alt="UP" code="O" control="DOWN" meta="UP" shift="UP"
+                                                                shortcut="UP"/>
+                                        </accelerator>
+                                    </MenuItem>
+                                    <MenuItem mnemonicParsing="false" text="Reload Stylesheet">
+                                        <accelerator>
+                                            <KeyCodeCombination alt="UP" code="R" control="DOWN" meta="UP" shift="UP"
+                                                                shortcut="UP"/>
+                                        </accelerator>
+                                    </MenuItem>
+                                </items>
+                            </Menu>
+                        </menus>
+                    </MenuBar>
+                    <HBox prefHeight="652.0" prefWidth="1124.0" spacing="5.0">
+                        <children>
+                            <VBox prefHeight="385.0" prefWidth="236.0" spacing="10.0" HBox.hgrow="ALWAYS">
+                                <children>
+                                    <ComboBox maxWidth="1.7976931348623157E308" prefWidth="150.0"
+                                              promptText="Combo Box">
+                                        <items>
+                                            <FXCollections fx:factory="observableArrayList">
+                                                <String fx:value="Apple"/>
+                                                <String fx:value="Orange"/>
+                                                <String fx:value="Pear"/>
+                                            </FXCollections>
+                                        </items>
+                                    </ComboBox>
+                                    <ComboBox disable="true" maxWidth="1.7976931348623157E308" prefWidth="150.0"
+                                              promptText="Combo Box (Disabled)">
+                                        <items>
+                                            <FXCollections fx:factory="observableArrayList">
+                                                <String fx:value="Apple"/>
+                                                <String fx:value="Orange"/>
+                                                <String fx:value="Pear"/>
+                                            </FXCollections>
+                                        </items>
+                                    </ComboBox>
+                                    <Separator prefWidth="200.0"/>
+                                    <ComboBox editable="true" maxWidth="1.7976931348623157E308" prefWidth="150.0"
+                                              promptText="Combo Box">
+                                        <items>
+                                            <FXCollections fx:factory="observableArrayList">
+                                                <String fx:value="Apple"/>
+                                                <String fx:value="Orange"/>
+                                                <String fx:value="Pear"/>
+                                            </FXCollections>
+                                        </items>
+                                    </ComboBox>
+                                    <ComboBox disable="true" editable="true" maxWidth="1.7976931348623157E308"
+                                              prefWidth="150.0" promptText="Combo Box (Disabled)">
+                                        <items>
+                                            <FXCollections fx:factory="observableArrayList">
+                                                <String fx:value="Apple"/>
+                                                <String fx:value="Orange"/>
+                                                <String fx:value="Pear"/>
+                                            </FXCollections>
+                                        </items>
+                                    </ComboBox>
+                                    <Separator prefWidth="200.0"/>
+                                    <ChoiceBox maxWidth="1.7976931348623157E308" prefWidth="150.0">
+                                        <items>
+                                            <FXCollections fx:factory="observableArrayList">
+                                                <String fx:value="Apple"/>
+                                                <String fx:value="Orange"/>
+                                                <String fx:value="Pear"/>
+                                            </FXCollections>
+                                        </items>
+                                    </ChoiceBox>
+                                    <ChoiceBox disable="true" maxWidth="1.7976931348623157E308" prefWidth="150.0">
+                                        <items>
+                                            <FXCollections fx:factory="observableArrayList">
+                                                <String fx:value="Apple"/>
+                                                <String fx:value="Orange"/>
+                                                <String fx:value="Pear"/>
+                                            </FXCollections>
+                                        </items>
+                                    </ChoiceBox>
+                                    <Separator prefWidth="200.0"/>
+                                    <TextField promptText="Text Field"/>
+                                    <TextField editable="false" text="Text Field (non-editable)"/>
+                                    <TextField disable="true" text="Text Field (disabled)"/>
+                                    <Separator prefWidth="200.0"/>
+                                    <PasswordField promptText="Password"/>
+                                    <PasswordField editable="false" promptText="Password (non-editable)"
+                                                   text="Password (non-editable)"/>
+                                    <PasswordField disable="true" text="Password (disabled)"/>
+                                    <Separator prefWidth="200.0"/>
+                                    <HBox prefHeight="100.0" prefWidth="200.0">
+                                        <children>
+                                            <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0"
+                                                  HBox.hgrow="SOMETIMES">
+                                                <children>
+                                                    <CheckBox allowIndeterminate="true" mnemonicParsing="false"
+                                                              text="CheckBox"/>
+                                                    <CheckBox allowIndeterminate="true" mnemonicParsing="false"
+                                                              selected="true" text="CheckBox"/>
+                                                    <CheckBox allowIndeterminate="true" disable="true"
+                                                              mnemonicParsing="false" text="CheckBox"/>
+                                                    <CheckBox allowIndeterminate="true" disable="true"
+                                                              mnemonicParsing="false" selected="true" text="CheckBox"/>
+                                                    <CheckBox allowIndeterminate="true" disable="true"
+                                                              indeterminate="true" mnemonicParsing="false"
+                                                              text="CheckBox"/>
+                                                </children>
+                                            </VBox>
+                                            <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0"
+                                                  HBox.hgrow="SOMETIMES">
+                                                <children>
+                                                    <RadioButton mnemonicParsing="false" text="RadioButton">
+                                                        <toggleGroup>
+                                                            <ToggleGroup fx:id="radios"/>
+                                                        </toggleGroup>
+                                                    </RadioButton>
+                                                    <RadioButton mnemonicParsing="false" selected="true"
+                                                                 text="RadioButton" toggleGroup="$radios"/>
+                                                    <RadioButton disable="true" mnemonicParsing="false"
+                                                                 text="RadioButton"/>
+                                                    <RadioButton disable="true" mnemonicParsing="false" selected="true"
+                                                                 text="RadioButton"/>
+                                                </children>
+                                            </VBox>
+                                        </children>
+                                    </HBox>
+                                </children>
+                            </VBox>
+                            <Separator orientation="VERTICAL" prefHeight="200.0"/>
+                            <VBox prefHeight="385.0" prefWidth="236.0" spacing="10.0" HBox.hgrow="ALWAYS">
+                                <children>
+                                    <MenuButton maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+                                                text="MenuButton">
+                                        <items>
+                                            <MenuItem mnemonicParsing="false" text="Action 1"/>
+                                            <MenuItem mnemonicParsing="false" text="Action 2"/>
+                                        </items>
+                                    </MenuButton>
+                                    <MenuButton disable="true" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+                                                text="MenuButton (Disabled)">
+                                        <items>
+                                            <MenuItem mnemonicParsing="false" text="Action 1"/>
+                                            <MenuItem mnemonicParsing="false" text="Action 2"/>
+                                        </items>
+                                    </MenuButton>
+                                    <Separator prefWidth="200.0"/>
+                                    <SplitMenuButton maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+                                                     text="SplitMenuButton">
+                                        <items>
+                                            <MenuItem mnemonicParsing="false" text="Action 1"/>
+                                            <MenuItem mnemonicParsing="false" text="Action 2"/>
+                                        </items>
+                                    </SplitMenuButton>
+                                    <SplitMenuButton disable="true" maxWidth="1.7976931348623157E308"
+                                                     mnemonicParsing="false" text="SplitMenuButton (Disabled)">
+                                        <items>
+                                            <MenuItem mnemonicParsing="false" text="Action 1"/>
+                                            <MenuItem mnemonicParsing="false" text="Action 2"/>
+                                        </items>
+                                    </SplitMenuButton>
+                                    <Separator prefWidth="200.0"/>
+                                    <Button maxWidth="1.7976931348623157E308" mnemonicParsing="false" text="Button"/>
+                                    <Button disable="true" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+                                            text="Button (Disabled)"/>
+                                    <Button defaultButton="true" maxWidth="1.7976931348623157E308"
+                                            mnemonicParsing="false" text="Button (Default)"/>
+                                    <Button cancelButton="true" maxWidth="1.7976931348623157E308"
+                                            mnemonicParsing="false" text="Button (Cancel)"/>
+                                    <Separator prefWidth="200.0"/>
+                                    <Hyperlink maxWidth="1.7976931348623157E308" text="Hyperlink"/>
+                                    <Hyperlink maxWidth="1.7976931348623157E308" text="Hyperlink (Visited)"
+                                               visited="true"/>
+                                    <Separator prefWidth="200.0"/>
+                                </children>
+                            </VBox>
+                            <Separator orientation="VERTICAL" prefHeight="200.0"/>
+                            <VBox prefHeight="385.0" prefWidth="236.0" spacing="10.0" HBox.hgrow="ALWAYS">
+                                <children>
+                                    <Slider value="35.0"/>
+                                    <Slider showTickMarks="true" snapToTicks="true" value="35.0"/>
+                                    <Slider showTickLabels="true" showTickMarks="true" snapToTicks="true" value="35.0"/>
+                                    <FlowPane alignment="CENTER" columnHalignment="CENTER" hgap="10.0"
+                                              prefHeight="200.0" prefWidth="200.0" vgap="10.0">
+                                        <children>
+                                            <Slider orientation="VERTICAL"/>
+                                            <Slider orientation="VERTICAL" showTickMarks="true"/>
+                                            <Slider orientation="VERTICAL" showTickLabels="true" showTickMarks="true"/>
+                                        </children>
+                                    </FlowPane>
+                                    <Separator prefWidth="200.0"/>
+                                    <ProgressBar maxWidth="1.7976931348623157E308" prefWidth="200.0" progress="0.3"/>
+                                    <ProgressBar maxWidth="1.7976931348623157E308" prefWidth="200.0"/>
+                                    <ProgressIndicator progress="0.3"/>
+                                    <ProgressIndicator/>
+                                </children>
+                            </VBox>
+                            <Separator orientation="VERTICAL" prefHeight="200.0"/>
+                            <VBox prefHeight="385.0" prefWidth="236.0" HBox.hgrow="ALWAYS">
+                                <children>
+                                    <TextArea prefHeight="71.0" prefWidth="268.0" promptText="Text Area"
+                                              wrapText="true"/>
+                                </children>
+                            </VBox>
+                        </children>
+                        <padding>
+                            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                        </padding>
+                    </HBox>
+                    <SplitPane dividerPositions="0.45566502463054187" prefHeight="160.0" prefWidth="200.0"
+                               VBox.vgrow="ALWAYS">
+                        <items>
+                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+                                <children>
+                                    <TabPane prefHeight="173.0" prefWidth="259.0" side="BOTTOM"
+                                             AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                                             AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                        <tabs>
+                                            <Tab text="Lorem">
+                                                <content>
+                                                    <AnchorPane/>
+                                                </content>
+                                            </Tab>
+                                            <Tab text="Ipsum">
+                                                <content>
+                                                    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
+                                                                prefWidth="200.0"/>
+                                                </content>
+                                            </Tab>
+                                            <Tab text="Dolor">
+                                                <content>
+                                                    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
+                                                                prefWidth="200.0"/>
+                                                </content>
+                                            </Tab>
+                                        </tabs>
+                                    </TabPane>
+                                </children>
+                            </AnchorPane>
+                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+                                <children>
+                                    <TabPane prefHeight="173.0" prefWidth="294.0" side="LEFT"
+                                             AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                                             AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                        <tabs>
+                                            <Tab text="Lorem">
+                                                <content>
+                                                    <AnchorPane/>
+                                                </content>
+                                            </Tab>
+                                            <Tab text="Ipsum">
+                                                <content>
+                                                    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
+                                                                prefWidth="200.0"/>
+                                                </content>
+                                            </Tab>
+                                            <Tab text="Dolor">
+                                                <content>
+                                                    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0"
+                                                                prefWidth="200.0"/>
+                                                </content>
+                                            </Tab>
+                                        </tabs>
+                                    </TabPane>
+                                </children>
+                            </AnchorPane>
+                        </items>
+                        <padding>
+                            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                        </padding>
+                    </SplitPane>
+                </children>
+            </VBox>
+        </Tab>
+    </TabPane>
 </AnchorPane>
diff --git a/src/main/java/org/jabref/styletester/StyleTesterMain.java b/src/main/java/org/jabref/styletester/StyleTesterMain.java
index 3945b4dad09..e7468adffcd 100644
--- a/src/main/java/org/jabref/styletester/StyleTesterMain.java
+++ b/src/main/java/org/jabref/styletester/StyleTesterMain.java
@@ -4,8 +4,9 @@
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
+import org.jabref.JabRefExecutorService;
+import org.jabref.gui.util.DefaultFileUpdateMonitor;
 import org.jabref.gui.util.ThemeLoader;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.JabRefPreferences;
 
 /**
@@ -18,11 +19,14 @@ public static void main(String[] args) {
     }
 
     @Override
-    public void start(Stage stage) throws Exception {
+    public void start(Stage stage) {
         StyleTesterView view = new StyleTesterView();
 
+        DefaultFileUpdateMonitor fileUpdateMonitor = new DefaultFileUpdateMonitor();
+        JabRefExecutorService.INSTANCE.executeInterruptableTask(fileUpdateMonitor, "FileUpdateMonitor");
+
         Scene scene = new Scene(view.getContent());
-        new ThemeLoader(new DummyFileUpdateMonitor()).installBaseCss(scene, JabRefPreferences.getInstance());
+        new ThemeLoader(fileUpdateMonitor).installBaseCss(scene, JabRefPreferences.getInstance());
         stage.setScene(scene);
         stage.show();
     }
diff --git a/src/main/java/org/jabref/styletester/StyleTesterView.java b/src/main/java/org/jabref/styletester/StyleTesterView.java
index 29d225698b7..f77d03cc9d8 100644
--- a/src/main/java/org/jabref/styletester/StyleTesterView.java
+++ b/src/main/java/org/jabref/styletester/StyleTesterView.java
@@ -1,16 +1,35 @@
 package org.jabref.styletester;
 
+import javafx.css.PseudoClass;
+import javafx.fxml.FXML;
 import javafx.scene.Parent;
+import javafx.scene.control.Button;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
 public class StyleTesterView {
+    @FXML private Button normalButtonHover;
+    @FXML private Button normalButtonPressed;
+    @FXML private Button normalButtonFocused;
     private Parent content;
 
-    public StyleTesterView() {
+    StyleTesterView() {
         content = ViewLoader.view(this)
                             .load()
                             .getView();
+
+        setStates();
+    }
+
+    private void setStates() {
+        PseudoClass hover = PseudoClass.getPseudoClass("hover");
+        normalButtonHover.pseudoClassStateChanged(hover, true);
+
+        PseudoClass pressed = PseudoClass.getPseudoClass("pressed");
+        normalButtonPressed.pseudoClassStateChanged(pressed, true);
+
+        PseudoClass focused = PseudoClass.getPseudoClass("focused");
+        normalButtonFocused.pseudoClassStateChanged(focused, true);
     }
 
     public Parent getContent() {

From 1c915fe8f7bf9f4376c577ad435ec84fe5a9d58f Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 24 Jul 2018 16:45:12 +0200
Subject: [PATCH 009/229] Style default button

---
 src/main/java/org/jabref/gui/Base.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 09734d4ce53..5108b952ac2 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -352,6 +352,18 @@
     -fx-background-color: rgba(0, 0, 0, 0.3);
 }
 
+.button:default {
+    -fx-background-color: -jr-accent;
+}
+
+.button:default:hover {
+    -fx-background-color: derive(-jr-accent, -10%);
+}
+
+.button:default:focused,
+.button:default:pressed {
+    -fx-background-color: derive(-jr-accent, -20%);
+}
 
 .menu-bar {
     -fx-background-color: -jr-menu-background;

From 6d8b7d5408e5115f596b275f3a2f9b77ace6dd6a Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 24 Jul 2018 16:50:39 +0200
Subject: [PATCH 010/229] Use correct color for default button

---
 src/main/java/org/jabref/gui/Base.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 5108b952ac2..87e959645e1 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -353,16 +353,16 @@
 }
 
 .button:default {
-    -fx-background-color: -jr-accent;
+    -fx-background-color: -fx-default-button;
 }
 
 .button:default:hover {
-    -fx-background-color: derive(-jr-accent, -10%);
+    -fx-background-color: derive(-fx-default-button, -10%);
 }
 
 .button:default:focused,
 .button:default:pressed {
-    -fx-background-color: derive(-jr-accent, -20%);
+    -fx-background-color: derive(-fx-default-button, -20%);
 }
 
 .menu-bar {

From 7b784586364cd804110fa740125218a942ed7c5a Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 24 Jul 2018 17:04:03 +0200
Subject: [PATCH 011/229] Rewrite web search pane in JavaFX (#4203)

* Replace old fetcher stuff in command line interface

* Remove cli output

* Make help file optional

* Rework web search pane in javafx

* Show web search and group panes by default

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

* remove obsolete l10n keys
set search button to default so search can be executed by hitting enter

* fix wrong string util class
---
 .../org/jabref/cli/ArgumentProcessor.java     |  61 +++--
 .../cli/ImportInspectionCommandLine.java      |  38 ---
 .../java/org/jabref/gui/EntryTypeDialog.java  |   3 +-
 src/main/java/org/jabref/gui/JabRefFrame.java |   6 +-
 .../java/org/jabref/gui/SidePaneManager.java  |   8 +-
 .../java/org/jabref/gui/help/HelpAction.java  |  11 +-
 .../gui/importer/ImportInspectionDialog.java  |  37 +--
 .../gui/importer/fetcher/EntryFetcher.java    |  72 ------
 .../gui/importer/fetcher/EntryFetchers.java   |  24 --
 .../gui/importer/fetcher/GeneralFetcher.java  | 216 ------------------
 .../fetcher/SearchBasedEntryFetcher.java      |  67 ------
 .../gui/importer/fetcher/WebSearchPane.java   | 107 +++++++++
 .../fetcher/WebSearchPaneViewModel.java       | 114 +++++++++
 .../jabref/gui/search/SearchTextField.java    |   4 +-
 .../gui/util/ViewModelListCellFactory.java    |   6 +
 .../logic/importer/ImportInspector.java       |  36 ---
 .../org/jabref/logic/importer/WebFetcher.java |   6 +-
 .../importer/fetcher/ACMPortalFetcher.java    |   5 +-
 .../importer/fetcher/AbstractIsbnFetcher.java |   6 +-
 .../jabref/logic/importer/fetcher/ArXiv.java  |   4 +-
 .../fetcher/AstrophysicsDataSystem.java       |   5 +-
 .../logic/importer/fetcher/CiteSeer.java      |   5 +-
 .../logic/importer/fetcher/DBLPFetcher.java   |   5 +-
 .../logic/importer/fetcher/DOAJFetcher.java   |   5 +-
 .../jabref/logic/importer/fetcher/DiVA.java   |   5 +-
 .../logic/importer/fetcher/DoiFetcher.java    |   4 +-
 .../logic/importer/fetcher/GoogleScholar.java |   4 +-
 .../logic/importer/fetcher/GvkFetcher.java    |   5 +-
 .../jabref/logic/importer/fetcher/IEEE.java   |   4 +-
 .../importer/fetcher/INSPIREFetcher.java      |   5 +-
 .../importer/fetcher/MedlineFetcher.java      |   5 +-
 .../logic/importer/fetcher/RfcFetcher.java    |   5 +-
 .../importer/fetcher/SpringerFetcher.java     |   4 +-
 .../logic/importer/fetcher/TitleFetcher.java  |   4 +-
 .../jabref/preferences/JabRefPreferences.java |   8 +-
 src/main/resources/l10n/JabRef_en.properties  |   4 -
 .../fetcher/AstrophysicsDataSystemTest.java   |   2 +-
 .../importer/fetcher/DoiFetcherTest.java      |   2 +-
 .../importer/fetcher/GvkFetcherTest.java      |   2 +-
 .../importer/fetcher/IsbnFetcherTest.java     |   2 +-
 .../fetcher/IsbnViaChimboriFetcherTest.java   |   2 +-
 .../fetcher/IsbnViaEbookDeFetcherTest.java    |   2 +-
 .../importer/fetcher/MedlineFetcherTest.java  |   2 +-
 .../importer/fetcher/RfcFetcherTest.java      |   2 +-
 .../importer/fetcher/TitleFetcherTest.java    |   2 +-
 45 files changed, 343 insertions(+), 583 deletions(-)
 delete mode 100644 src/main/java/org/jabref/cli/ImportInspectionCommandLine.java
 delete mode 100644 src/main/java/org/jabref/gui/importer/fetcher/EntryFetcher.java
 delete mode 100644 src/main/java/org/jabref/gui/importer/fetcher/EntryFetchers.java
 delete mode 100644 src/main/java/org/jabref/gui/importer/fetcher/GeneralFetcher.java
 delete mode 100644 src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java
 create mode 100644 src/main/java/org/jabref/gui/importer/fetcher/WebSearchPane.java
 create mode 100644 src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
 delete mode 100644 src/main/java/org/jabref/logic/importer/ImportInspector.java

diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index 7df241a209d..4bf16b3fe85 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -5,7 +5,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -16,8 +15,6 @@
 import org.jabref.Globals;
 import org.jabref.JabRefException;
 import org.jabref.gui.externalfiles.AutoSetLinks;
-import org.jabref.gui.importer.fetcher.EntryFetcher;
-import org.jabref.gui.importer.fetcher.EntryFetchers;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
 import org.jabref.logic.exporter.BibDatabaseWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
@@ -28,12 +25,15 @@
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.exporter.SaveSession;
 import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportException;
 import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.OutputPrinter;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.SearchBasedFetcher;
+import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
@@ -538,15 +538,12 @@ private void regenerateBibtexKeys(List<ParserResult> loaded) {
 
     /**
      * Run an entry fetcher from the command line.
-     * <p>
-     * Note that this only works headlessly if the EntryFetcher does not show any GUI.
      *
-     * @param fetchCommand A string containing both the fetcher to use (id of EntryFetcherExtension minus Fetcher) and
+     * @param fetchCommand A string containing both the name of the fetcher to use and
      *                     the search query, separated by a :
      * @return A parser result containing the entries fetched or null if an error occurred.
      */
     private Optional<ParserResult> fetch(String fetchCommand) {
-
         if ((fetchCommand == null) || !fetchCommand.contains(":") || (fetchCommand.split(":").length != 2)) {
             System.out.println(Localization.lang("Expected syntax for --fetch='<name of fetcher>:<query>'"));
             System.out.println(Localization.lang("The following fetchers are available:"));
@@ -555,38 +552,36 @@ private Optional<ParserResult> fetch(String fetchCommand) {
 
         String[] split = fetchCommand.split(":");
         String engine = split[0];
+        String query = split[1];
 
-        EntryFetchers fetchers = new EntryFetchers(Globals.journalAbbreviationLoader);
-        EntryFetcher fetcher = null;
-        for (EntryFetcher e : fetchers.getEntryFetchers()) {
-            if (engine.equalsIgnoreCase(e.getClass().getSimpleName().replace("Fetcher", ""))) {
-                fetcher = e;
-            }
-        }
-
-        if (fetcher == null) {
+        List<SearchBasedFetcher> fetchers = WebFetchers.getSearchBasedFetchers(Globals.prefs.getImportFormatPreferences());
+        Optional<SearchBasedFetcher> selectedFetcher = fetchers.stream()
+                                                               .filter(fetcher -> fetcher.getName().equalsIgnoreCase(engine))
+                                                               .findFirst();
+        if (!selectedFetcher.isPresent()) {
             System.out.println(Localization.lang("Could not find fetcher '%0'", engine));
-            System.out.println(Localization.lang("The following fetchers are available:"));
-
-            for (EntryFetcher e : fetchers.getEntryFetchers()) {
-                System.out.println(
-                        "  " + e.getClass().getSimpleName().replace("Fetcher", "").toLowerCase(Locale.ENGLISH));
-            }
-            return Optional.empty();
-        }
 
-        String query = split[1];
-        System.out.println(Localization.lang("Running query '%0' with fetcher '%1'.", query, engine) + " "
-                + Localization.lang("Please wait..."));
-        Collection<BibEntry> result = new ImportInspectionCommandLine().query(query, fetcher);
+            System.out.println(Localization.lang("The following fetchers are available:"));
+            fetchers.forEach(fetcher -> System.out.println("  " + fetcher.getName()));
 
-        if (result.isEmpty()) {
-            System.out.println(
-                    Localization.lang("Query '%0' with fetcher '%1' did not return any results.", query, engine));
             return Optional.empty();
+        } else {
+            System.out.println(Localization.lang("Running query '%0' with fetcher '%1'.", query, engine));
+            System.out.print(Localization.lang("Please wait..."));
+            try {
+                List<BibEntry> matches = selectedFetcher.get().performSearch(query);
+                if (matches.isEmpty()) {
+                    System.out.println("\r" + Localization.lang("No results found."));
+                    return Optional.empty();
+                } else {
+                    System.out.println("\r" + Localization.lang("Found %0 results.", String.valueOf(matches.size())));
+                    return Optional.of(new ParserResult(matches));
+                }
+            } catch (FetcherException e) {
+                LOGGER.error("Error while fetching", e);
+                return Optional.empty();
+            }
         }
-
-        return Optional.of(new ParserResult(result));
     }
 
     public boolean isBlank() {
diff --git a/src/main/java/org/jabref/cli/ImportInspectionCommandLine.java b/src/main/java/org/jabref/cli/ImportInspectionCommandLine.java
deleted file mode 100644
index bf3d66ba544..00000000000
--- a/src/main/java/org/jabref/cli/ImportInspectionCommandLine.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.jabref.cli;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.jabref.gui.importer.fetcher.EntryFetcher;
-import org.jabref.logic.importer.ImportInspector;
-import org.jabref.logic.importer.OutputPrinter;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-
-public class ImportInspectionCommandLine implements ImportInspector {
-
-    private final List<BibEntry> entries = new LinkedList<>();
-
-    private final OutputPrinter status = new SystemOutputPrinter();
-
-    @Override
-    public void addEntry(BibEntry entry) {
-        entries.add(entry);
-    }
-
-    @Override
-    public void setProgress(int current, int max) {
-        status.setStatus(Localization.lang("Progress: %0 of %1", String.valueOf(current), String
-                .valueOf(max)));
-    }
-
-    public Collection<BibEntry> query(String query, EntryFetcher fetcher) {
-        entries.clear();
-        if (fetcher.processQuery(query, ImportInspectionCommandLine.this, status)) {
-            return entries;
-        }
-        return Collections.emptyList();
-    }
-}
diff --git a/src/main/java/org/jabref/gui/EntryTypeDialog.java b/src/main/java/org/jabref/gui/EntryTypeDialog.java
index b4cdc9a0abc..93cc5a73a3d 100644
--- a/src/main/java/org/jabref/gui/EntryTypeDialog.java
+++ b/src/main/java/org/jabref/gui/EntryTypeDialog.java
@@ -9,6 +9,7 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
@@ -316,7 +317,7 @@ protected void done() {
                         final BasePanel panel = frame.getCurrentBasePanel();
 
                         ImportInspectionDialog diag = new ImportInspectionDialog(frame, panel, Localization.lang("Import"), false);
-                        diag.addEntry(bibEntry);
+                        diag.addEntries(Collections.singletonList(bibEntry));
                         diag.entryListComplete();
                         diag.setVisible(true);
                         diag.toFront();
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 0cc4029ed91..2776ed0d70a 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -254,7 +254,7 @@ private void init() {
 
             // 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());
@@ -397,7 +397,7 @@ public void openAction(String filePath) {
      * 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() {
@@ -924,7 +924,7 @@ private MenuBar createMenu() {
         );
 
         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(),
diff --git a/src/main/java/org/jabref/gui/SidePaneManager.java b/src/main/java/org/jabref/gui/SidePaneManager.java
index ca122c86a71..5a09bdcd1ab 100644
--- a/src/main/java/org/jabref/gui/SidePaneManager.java
+++ b/src/main/java/org/jabref/gui/SidePaneManager.java
@@ -10,7 +10,7 @@
 import org.jabref.Globals;
 import org.jabref.gui.collab.FileUpdatePanel;
 import org.jabref.gui.groups.GroupSidePane;
-import org.jabref.gui.importer.fetcher.GeneralFetcher;
+import org.jabref.gui.importer.fetcher.WebSearchPane;
 import org.jabref.gui.openoffice.OpenOfficeSidePanel;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
 import org.jabref.preferences.JabRefPreferences;
@@ -33,7 +33,7 @@ public SidePaneManager(JabRefPreferences preferences, JabRefFrame frame) {
         Stream.of(
                   new FileUpdatePanel(this),
                   new GroupSidePane(this, preferences, frame.getDialogService()),
-                  new GeneralFetcher(this, preferences, frame),
+                new WebSearchPane(this, preferences, frame),
                   new OpenOfficeSidePanel(this, openOfficePreferences, frame))
               .forEach(pane -> components.put(pane.getType(), pane));
 
@@ -45,6 +45,10 @@ public SidePaneManager(JabRefPreferences preferences, JabRefFrame frame) {
             show(SidePaneType.OPEN_OFFICE);
         }
 
+        if (preferences.getBoolean(JabRefPreferences.WEB_SEARCH_VISIBLE)) {
+            show(SidePaneType.WEB_SEARCH);
+        }
+
         updateView();
     }
 
diff --git a/src/main/java/org/jabref/gui/help/HelpAction.java b/src/main/java/org/jabref/gui/help/HelpAction.java
index 402d8900a13..ab7ae84e027 100644
--- a/src/main/java/org/jabref/gui/help/HelpAction.java
+++ b/src/main/java/org/jabref/gui/help/HelpAction.java
@@ -110,7 +110,7 @@ public void actionPerformed(ActionEvent e) {
         openHelpPage(helpPage);
     }
 
-    public static SimpleCommand getCommand() {
+    public static SimpleCommand getMainHelpPageCommand() {
         return new SimpleCommand() {
             @Override
             public void execute() {
@@ -118,4 +118,13 @@ public void execute() {
             }
         };
     }
+
+    public SimpleCommand getCommand() {
+        return new SimpleCommand() {
+            @Override
+            public void execute() {
+                openHelpPage(helpPage);
+            }
+        };
+    }
 }
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
index 8b53cfd793b..84fcef65d67 100644
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
@@ -84,7 +84,6 @@
 import org.jabref.logic.bibtex.comparator.FieldComparator;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
 import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.importer.ImportInspector;
 import org.jabref.logic.importer.OutputPrinter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.UpdateField;
@@ -144,7 +143,7 @@
  * receiving this call).
  */
 
-public class ImportInspectionDialog extends JabRefDialog implements ImportInspector, OutputPrinter {
+public class ImportInspectionDialog extends JabRefDialog implements OutputPrinter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImportInspectionDialog.class);
     private static final List<String> INSPECTION_FIELDS = Arrays.asList(FieldName.AUTHOR, FieldName.TITLE, FieldName.YEAR, BibEntry.KEY_FIELD);
@@ -168,7 +167,6 @@ public class ImportInspectionDialog extends JabRefDialog implements ImportInspec
      */
     private final List<BibEntry> entriesToDelete = new ArrayList<>();
     private final String undoName;
-    private final List<CallBack> callBacks = new ArrayList<>();
     private final boolean newDatabase;
     private final JPopupMenu popup = new JPopupMenu();
     private final JButton deselectAllDuplicates = new JButton(Localization.lang("Deselect all duplicates"));
@@ -286,7 +284,6 @@ public ImportInspectionDialog(JabRefFrame frame, BasePanel panel, String undoNam
         generate.setEnabled(false);
         ok.addActionListener(new OkListener());
         cancel.addActionListener(e -> {
-            signalStopFetching();
             dispose();
             frame.output(Localization.lang("Import canceled by user"));
         });
@@ -297,7 +294,6 @@ public ImportInspectionDialog(JabRefFrame frame, BasePanel panel, String undoNam
             generateKeys(); // Generate the keys.
         });
         stop.addActionListener(e -> {
-            signalStopFetching();
             entryListComplete();
         });
         selectAll.addActionListener(new SelectionButton(true));
@@ -345,29 +341,6 @@ public void actionPerformed(ActionEvent e) {
 
     }
 
-    /* (non-Javadoc)
-     * @see package org.jabref.logic.importer.ImportInspector#setProgress(int, int)
-     */
-    @Override
-    public void setProgress(int current, int max) {
-        SwingUtilities.invokeLater(() -> {
-            progressBar.setIndeterminate(false);
-            progressBar.setMinimum(0);
-            progressBar.setMaximum(max);
-            progressBar.setValue(current);
-        });
-    }
-
-    /* (non-Javadoc)
-     * @see package org.jabref.logic.importer.ImportInspector#addEntry(org.jabref.model.entry.BibEntry)
-     */
-    @Override
-    public void addEntry(BibEntry entry) {
-        List<BibEntry> list = new ArrayList<>();
-        list.add(entry);
-        addEntries(list);
-    }
-
     public void addEntries(Collection<BibEntry> entriesToAdd) {
 
         for (BibEntry entry : entriesToAdd) {
@@ -559,14 +532,6 @@ private AbstractAction getAction(GroupTreeNode node) {
         return action;
     }
 
-    public void addCallBack(CallBack cb) {
-        callBacks.add(cb);
-    }
-
-    private void signalStopFetching() {
-        callBacks.forEach(CallBack::stopFetching);
-    }
-
     private void setWidths() {
         TableColumnModel cm = glTable.getColumnModel();
         cm.getColumn(0).setPreferredWidth(55);
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/EntryFetcher.java b/src/main/java/org/jabref/gui/importer/fetcher/EntryFetcher.java
deleted file mode 100644
index f2470d68fb3..00000000000
--- a/src/main/java/org/jabref/gui/importer/fetcher/EntryFetcher.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.jabref.gui.importer.fetcher;
-
-import javax.swing.JPanel;
-
-import org.jabref.gui.importer.ImportInspectionDialog;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.importer.ImportInspector;
-import org.jabref.logic.importer.OutputPrinter;
-
-/**
- * @Deprecated
- * Use {@link SearchBasedEntryFetcher} instead <br>
- * Implement this interface to add another activeFetcher (something that grabs records
- * from the Web for JabRef). Have a look at the existing implemenations
- * IEEEXploreFetcher, JStorFetcher and
- * CiteSeerEntryFetcher.
- *
- * Note: You also need to implement the method stopFetching from
- * ImportInspectionDialog.Callback
- *
- * A Fetcher should not execute any GUI Operations, because it might be run in
- * headless mode, but rather use the OutputPrinter for talking to the user.
- */
-@Deprecated
-public interface EntryFetcher extends ImportInspectionDialog.CallBack {
-
-    /**
-     * Handle a query entered by the user.
-     *
-     * The method is expected to block the caller until all entries have been
-     * reported to the inspector.
-     *
-     * @param query
-     *            The query text.
-     * @param inspector
-     *            The dialog to add imported entries to.
-     * @param status
-     *            An OutputPrinter passed to the activeFetcher for reporting about the
-     *            status of the fetching.
-     *
-     * @return True if the query was completed successfully, false if an error
-     *         occurred.
-     */
-    boolean processQuery(String query, ImportInspector inspector, OutputPrinter status);
-
-    /**
-     * The title for this activeFetcher, displayed in the menu and in the side pane.
-     *
-     * @return The title
-     */
-    String getTitle();
-
-    /**
-     * Get the name of the help page for this activeFetcher.
-     *
-     * If given, a question mark is displayed in the side pane which leads to
-     * the help page.
-     *
-     * @return The {@link HelpFile} enum constant for the help page
-     */
-    HelpFile getHelpPage();
-
-    /**
-     * If this activeFetcher requires additional options, a panel for setting up these
-     * should be returned in a JPanel by this method. This JPanel will be added
-     * to the side pane component automatically.
-     *
-     * @return Options panel for this activeFetcher or null if this activeFetcher does not
-     *         have any options.
-     */
-    JPanel getOptionsPanel();
-}
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/EntryFetchers.java b/src/main/java/org/jabref/gui/importer/fetcher/EntryFetchers.java
deleted file mode 100644
index 353eddde4ae..00000000000
--- a/src/main/java/org/jabref/gui/importer/fetcher/EntryFetchers.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.jabref.gui.importer.fetcher;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.jabref.Globals;
-import org.jabref.logic.importer.WebFetchers;
-import org.jabref.logic.journals.JournalAbbreviationLoader;
-
-public class EntryFetchers {
-
-    private final List<EntryFetcher> entryFetchers = new LinkedList<>();
-
-   public EntryFetchers(JournalAbbreviationLoader abbreviationLoader) {
-        WebFetchers.getSearchBasedFetchers(Globals.prefs.getImportFormatPreferences()).stream()
-                .map(SearchBasedEntryFetcher::new)
-                .forEach(entryFetchers::add);
-    }
-
-    public List<EntryFetcher> getEntryFetchers() {
-        return Collections.unmodifiableList(this.entryFetchers);
-    }
-}
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/GeneralFetcher.java b/src/main/java/org/jabref/gui/importer/fetcher/GeneralFetcher.java
deleted file mode 100644
index a5bdd0696e3..00000000000
--- a/src/main/java/org/jabref/gui/importer/fetcher/GeneralFetcher.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package org.jabref.gui.importer.fetcher;
-
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-
-import javafx.embed.swing.SwingNode;
-import javafx.scene.Node;
-import javafx.scene.layout.Priority;
-
-import org.jabref.Globals;
-import org.jabref.JabRefExecutorService;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.SidePaneComponent;
-import org.jabref.gui.SidePaneManager;
-import org.jabref.gui.SidePaneType;
-import org.jabref.gui.actions.Action;
-import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.importer.ImportInspectionDialog;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.OS;
-import org.jabref.preferences.JabRefPreferences;
-
-public class GeneralFetcher extends SidePaneComponent implements ActionListener {
-
-    private final JTextField tf = new JTextField();
-
-    private final CardLayout optionsCards = new CardLayout();
-    private final JPanel optionsPanel = new JPanel(optionsCards);
-    private final JPanel optPanel = new JPanel(new BorderLayout());
-
-    private final JabRefFrame frame;
-    private final JabRefPreferences preferences;
-    private EntryFetcher activeFetcher;
-
-    public GeneralFetcher(SidePaneManager sidePaneManager, JabRefPreferences preferences, JabRefFrame frame) {
-        super(sidePaneManager, IconTheme.JabRefIcons.WWW, Localization.lang("Web search"));
-        this.frame = frame;
-        this.preferences = preferences;
-    }
-
-    @Override
-    public Action getToggleAction() {
-        return StandardActions.TOGGLE_WEB_SEARCH;
-    }
-
-    @Override
-    protected Node createContentPane() {
-        List<EntryFetcher> fetchers = new EntryFetchers(Globals.journalAbbreviationLoader).getEntryFetchers();
-        EntryFetcher[] fetcherArray = fetchers.toArray(new EntryFetcher[fetchers.size()]);
-        Arrays.sort(fetcherArray, new EntryFetcherComparator());
-        String[] choices = new String[fetcherArray.length];
-        for (int i = 0; i < fetcherArray.length; i++) {
-            choices[i] = fetcherArray[i].getTitle();
-        }
-        JComboBox<String> fetcherChoice = new JComboBox<>(choices);
-        int defaultFetcher = preferences.getInt(JabRefPreferences.SELECTED_FETCHER_INDEX);
-        if (defaultFetcher >= fetcherArray.length) {
-            defaultFetcher = 0;
-        }
-        this.activeFetcher = fetcherArray[defaultFetcher];
-        fetcherChoice.setSelectedIndex(defaultFetcher);
-        if (this.activeFetcher.getOptionsPanel() != null) {
-            optPanel.add(this.activeFetcher.getOptionsPanel(), BorderLayout.CENTER);
-        }
-        HelpAction help = new HelpAction(activeFetcher.getHelpPage());
-        JButton helpBut = help.getHelpButton();
-        helpBut.setEnabled(activeFetcher.getHelpPage() != null);
-
-        fetcherChoice.addActionListener(actionEvent -> {
-            activeFetcher = fetcherArray[fetcherChoice.getSelectedIndex()];
-            preferences.putInt(JabRefPreferences.SELECTED_FETCHER_INDEX, fetcherChoice.getSelectedIndex());
-            if (activeFetcher.getHelpPage() == null) {
-                helpBut.setEnabled(false);
-            } else {
-                help.setHelpFile(activeFetcher.getHelpPage());
-                helpBut.setEnabled(true);
-            }
-            optionsCards.show(optionsPanel, String.valueOf(fetcherChoice.getSelectedIndex()));
-            optPanel.removeAll();
-            if (activeFetcher.getOptionsPanel() != null) {
-                optPanel.add(activeFetcher.getOptionsPanel(), BorderLayout.CENTER);
-            }
-        });
-
-        helpBut.setMargin(new Insets(0, 0, 0, 0));
-        tf.setPreferredSize(new Dimension(1, tf.getPreferredSize().height));
-        if (OS.OS_X) {
-            tf.putClientProperty("JTextField.variant", "search");
-        }
-
-        tf.setName("tf");
-        // add action to reset-button. resets tf and requests focus
-        JButton reset = new JButton(Localization.lang("Reset"));
-        reset.addActionListener(event -> {
-            tf.setText("");
-            tf.requestFocus();
-        });
-
-        JPanel main = new JPanel();
-        GridBagLayout gbl = new GridBagLayout();
-        main.setLayout(gbl);
-        GridBagConstraints con = new GridBagConstraints();
-        con.fill = GridBagConstraints.BOTH;
-        con.insets = new Insets(0, 0, 2, 0);
-        con.gridwidth = GridBagConstraints.REMAINDER;
-        con.weightx = 1;
-        con.weighty = 1;
-        con.insets = new Insets(1, 0, 1, 0);
-        con.fill = GridBagConstraints.BOTH;
-        gbl.setConstraints(fetcherChoice, con);
-        main.add(fetcherChoice);
-        con.insets = new Insets(0, 0, 0, 0);
-        gbl.setConstraints(tf, con);
-        main.add(tf);
-
-        // Go Button
-        con.weighty = 0;
-        con.gridwidth = 1;
-        JButton go = new JButton(Localization.lang("Fetch"));
-        gbl.setConstraints(go, con);
-        main.add(go);
-
-        // Reset Button
-        reset.setName("reset");
-        gbl.setConstraints(reset, con);
-        main.add(reset);
-
-        // Help Button
-        con.gridwidth = GridBagConstraints.REMAINDER;
-        gbl.setConstraints(helpBut, con);
-        main.add(helpBut);
-
-        gbl.setConstraints(optPanel, con);
-        main.add(optPanel);
-
-        main.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
-        go.addActionListener(this);
-        tf.addActionListener(this);
-
-        SwingNode swingNode = new SwingNode();
-        SwingUtilities.invokeLater(() -> swingNode.setContent(main));
-        return swingNode;
-    }
-
-    @Override
-    public SidePaneType getType() {
-        return SidePaneType.WEB_SEARCH;
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        if (tf.getText().trim().isEmpty()) {
-            frame.output(Localization.lang("Please enter a search string"));
-            return;
-        }
-
-        if (frame.getCurrentBasePanel() == null) {
-            frame.output(Localization.lang("Please open or start a new library before searching"));
-            return;
-        }
-
-        final ImportInspectionDialog dialog = new ImportInspectionDialog(frame, frame.getCurrentBasePanel(),
-                activeFetcher.getTitle(), false);
-        dialog.addCallBack(activeFetcher);
-        dialog.setVisible(true);
-
-        JabRefExecutorService.INSTANCE.execute(() -> {
-            if (activeFetcher.processQuery(tf.getText().trim(), dialog, dialog)) {
-                dialog.entryListComplete();
-            } else {
-                dialog.dispose();
-            }
-        });
-    }
-
-    @Override
-    public void beforeClosing() {
-        preferences.putBoolean(JabRefPreferences.WEB_SEARCH_VISIBLE, Boolean.FALSE);
-    }
-
-    @Override
-    public void afterOpening() {
-        preferences.putBoolean(JabRefPreferences.WEB_SEARCH_VISIBLE, Boolean.TRUE);
-    }
-
-    @Override
-    public Priority getResizePolicy() {
-        return Priority.NEVER;
-    }
-
-    private static class EntryFetcherComparator implements Comparator<EntryFetcher> {
-
-        @Override
-        public int compare(EntryFetcher entryFetcher, EntryFetcher entryFetcher1) {
-            return entryFetcher.getTitle().compareTo(entryFetcher1.getTitle());
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java b/src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java
deleted file mode 100644
index b5d3f398a28..00000000000
--- a/src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.jabref.gui.importer.fetcher;
-
-import java.util.List;
-import java.util.Objects;
-
-import javax.swing.JPanel;
-
-import org.jabref.gui.importer.ImportInspectionDialog;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.importer.FetcherException;
-import org.jabref.logic.importer.ImportInspector;
-import org.jabref.logic.importer.OutputPrinter;
-import org.jabref.logic.importer.SearchBasedFetcher;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Wrapper around {@link SearchBasedFetcher} which implements the old {@link EntryFetcher} interface.
- */
-public class SearchBasedEntryFetcher implements EntryFetcher {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(SearchBasedEntryFetcher.class);
-    private final SearchBasedFetcher fetcher;
-
-    public SearchBasedEntryFetcher(SearchBasedFetcher fetcher) {
-        this.fetcher = Objects.requireNonNull(fetcher);
-    }
-
-    @Override
-    public boolean processQuery(String query, ImportInspector inspector, OutputPrinter status) {
-        status.setStatus(Localization.lang("Processing %0", query));
-        try {
-            List<BibEntry> matches = fetcher.performSearch(query);
-            matches.forEach(inspector::addEntry);
-            return !matches.isEmpty();
-        } catch (FetcherException e) {
-            LOGGER.error("Error while fetching from " + getTitle(), e);
-            ((ImportInspectionDialog)inspector).showErrorMessage(this.getTitle(), e.getLocalizedMessage());
-        }
-
-        return false;
-    }
-
-    @Override
-    public String getTitle() {
-        return fetcher.getName();
-    }
-
-    @Override
-    public HelpFile getHelpPage() {
-        return fetcher.getHelpPage();
-    }
-
-    @Override
-    public JPanel getOptionsPanel() {
-        // not supported
-        return null;
-    }
-
-    @Override
-    public void stopFetching() {
-        // not supported
-    }
-}
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPane.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPane.java
new file mode 100644
index 00000000000..1f9c0d637d6
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPane.java
@@ -0,0 +1,107 @@
+package org.jabref.gui.importer.fetcher;
+
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.SidePaneComponent;
+import org.jabref.gui.SidePaneManager;
+import org.jabref.gui.SidePaneType;
+import org.jabref.gui.actions.Action;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.search.SearchTextField;
+import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.importer.SearchBasedFetcher;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.JabRefPreferences;
+
+import org.fxmisc.easybind.EasyBind;
+
+public class WebSearchPane extends SidePaneComponent {
+
+    private final JabRefPreferences preferences;
+    private final WebSearchPaneViewModel viewModel;
+
+    public WebSearchPane(SidePaneManager sidePaneManager, JabRefPreferences preferences, JabRefFrame frame) {
+        super(sidePaneManager, IconTheme.JabRefIcons.WWW, Localization.lang("Web search"));
+        this.preferences = preferences;
+        this.viewModel = new WebSearchPaneViewModel(preferences.getImportFormatPreferences(), frame, preferences);
+    }
+
+    @Override
+    public Action getToggleAction() {
+        return StandardActions.TOGGLE_WEB_SEARCH;
+    }
+
+    @Override
+    protected Node createContentPane() {
+        // Setup combo box for fetchers
+        ComboBox<SearchBasedFetcher> fetchers = new ComboBox<>();
+        new ViewModelListCellFactory<SearchBasedFetcher>()
+                .withText(SearchBasedFetcher::getName)
+                .install(fetchers);
+        fetchers.itemsProperty().bind(viewModel.fetchersProperty());
+        fetchers.valueProperty().bindBidirectional(viewModel.selectedFetcherProperty());
+        fetchers.setMaxWidth(Double.POSITIVE_INFINITY);
+
+        // Create help button for currently selected fetcher
+        StackPane helpButtonContainer = new StackPane();
+        ActionFactory factory = new ActionFactory(preferences.getKeyBindingRepository());
+        EasyBind.subscribe(viewModel.selectedFetcherProperty(), fetcher -> {
+            if ((fetcher != null) && fetcher.getHelpPage().isPresent()) {
+                HelpAction helpCommand = new HelpAction(fetcher.getHelpPage().get());
+                Button helpButton = factory.createIconButton(StandardActions.HELP, helpCommand.getCommand());
+                helpButtonContainer.getChildren().setAll(helpButton);
+            } else {
+                helpButtonContainer.getChildren().clear();
+            }
+        });
+        HBox fetcherContainer = new HBox(fetchers, helpButtonContainer);
+        HBox.setHgrow(fetchers, Priority.ALWAYS);
+
+        // Create text field for query input
+        TextField query = SearchTextField.create();
+        viewModel.queryProperty().bind(query.textProperty());
+
+        // Create button that triggers search
+        Button search = new Button(Localization.lang("Search"));
+        search.setDefaultButton(true);
+        search.setOnAction(event -> viewModel.search());
+
+        // Put everything together
+        VBox container = new VBox();
+        container.setAlignment(Pos.CENTER);
+        container.getChildren().addAll(fetcherContainer, query, search);
+        return container;
+    }
+
+    @Override
+    public SidePaneType getType() {
+        return SidePaneType.WEB_SEARCH;
+    }
+
+    @Override
+    public void beforeClosing() {
+        preferences.putBoolean(JabRefPreferences.WEB_SEARCH_VISIBLE, Boolean.FALSE);
+    }
+
+    @Override
+    public void afterOpening() {
+        preferences.putBoolean(JabRefPreferences.WEB_SEARCH_VISIBLE, Boolean.TRUE);
+    }
+
+    @Override
+    public Priority getResizePolicy() {
+        return Priority.NEVER;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
new file mode 100644
index 00000000000..c38e2c4c4b8
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -0,0 +1,114 @@
+package org.jabref.gui.importer.fetcher;
+
+import java.util.Comparator;
+import java.util.List;
+
+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 javafx.collections.ObservableList;
+
+import org.jabref.JabRefExecutorService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.importer.ImportInspectionDialog;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.SearchBasedFetcher;
+import org.jabref.logic.importer.WebFetcher;
+import org.jabref.logic.importer.WebFetchers;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.JabRefPreferences;
+
+import org.fxmisc.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class WebSearchPaneViewModel {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(WebSearchPaneViewModel.class);
+
+    private final ObjectProperty<SearchBasedFetcher> selectedFetcher = new SimpleObjectProperty<>();
+    private final ListProperty<SearchBasedFetcher> fetchers = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final StringProperty query = new SimpleStringProperty();
+    private final JabRefFrame frame;
+
+    public WebSearchPaneViewModel(ImportFormatPreferences importPreferences, JabRefFrame frame, JabRefPreferences preferences) {
+        // TODO: Rework so that we don't rely on JabRefFrame and not the complete preferences
+        this.frame = frame;
+
+        List<SearchBasedFetcher> allFetchers = WebFetchers.getSearchBasedFetchers(importPreferences);
+        allFetchers.sort(Comparator.comparing(WebFetcher::getName));
+        fetchers.setAll(allFetchers);
+
+        // Choose last-selected fetcher as default
+        int defaultFetcherIndex = preferences.getInt(JabRefPreferences.SELECTED_FETCHER_INDEX);
+        if ((defaultFetcherIndex <= 0) || (defaultFetcherIndex >= fetchers.size())) {
+            selectedFetcherProperty().setValue(fetchers.get(0));
+        } else {
+            selectedFetcherProperty().setValue(fetchers.get(defaultFetcherIndex));
+        }
+        EasyBind.subscribe(selectedFetcherProperty(), newFetcher -> {
+            int newIndex = fetchers.indexOf(newFetcher);
+            preferences.putInt(JabRefPreferences.SELECTED_FETCHER_INDEX, newIndex);
+        });
+    }
+
+    public ObservableList<SearchBasedFetcher> getFetchers() {
+        return fetchers.get();
+    }
+
+    public ListProperty<SearchBasedFetcher> fetchersProperty() {
+        return fetchers;
+    }
+
+    public SearchBasedFetcher getSelectedFetcher() {
+        return selectedFetcher.get();
+    }
+
+    public ObjectProperty<SearchBasedFetcher> selectedFetcherProperty() {
+        return selectedFetcher;
+    }
+
+    public String getQuery() {
+        return query.get();
+    }
+
+    public StringProperty queryProperty() {
+        return query;
+    }
+
+    public void search() {
+        if (StringUtil.isBlank(getQuery())) {
+            frame.output(Localization.lang("Please enter a search string"));
+            return;
+        }
+
+        if (frame.getCurrentBasePanel() == null) {
+            frame.output(Localization.lang("Please open or start a new library before searching"));
+            return;
+        }
+
+        SearchBasedFetcher activeFetcher = getSelectedFetcher();
+        final ImportInspectionDialog dialog = new ImportInspectionDialog(frame, frame.getCurrentBasePanel(),
+                activeFetcher.getName(), false);
+        dialog.setVisible(true);
+
+        JabRefExecutorService.INSTANCE.execute(() -> {
+            dialog.setStatus(Localization.lang("Processing %0", getQuery()));
+            try {
+                List<BibEntry> matches = activeFetcher.performSearch(getQuery().trim());
+                dialog.addEntries(matches);
+                dialog.entryListComplete();
+            } catch (FetcherException e) {
+                LOGGER.error("Error while fetching from " + activeFetcher.getName(), e);
+                dialog.showErrorMessage(activeFetcher.getName(), e.getLocalizedMessage());
+            }
+        });
+    }
+}
diff --git a/src/main/java/org/jabref/gui/search/SearchTextField.java b/src/main/java/org/jabref/gui/search/SearchTextField.java
index b752b744ccf..cbb8ef0e650 100644
--- a/src/main/java/org/jabref/gui/search/SearchTextField.java
+++ b/src/main/java/org/jabref/gui/search/SearchTextField.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.search;
 
-import javafx.scene.control.TextField;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.l10n.Localization;
 
@@ -10,7 +8,7 @@
 
 public class SearchTextField {
 
-    public static TextField create() {
+    public static CustomTextField create() {
         CustomTextField textField = (CustomTextField) TextFields.createClearableTextField();
         textField.setPromptText(Localization.lang("Search") + "...");
         textField.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
diff --git a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
index e33bd4cbccc..e628e1c371e 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
@@ -3,6 +3,7 @@
 import java.util.function.BiConsumer;
 
 import javafx.scene.Node;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
@@ -107,6 +108,11 @@ public ViewModelListCellFactory<T> setOnDragOver(BiConsumer<T, ? super DragEvent
         return this;
     }
 
+    public void install(ComboBox<T> comboBox) {
+        comboBox.setButtonCell(this.call(null));
+        comboBox.setCellFactory(this);
+    }
+
     @Override
     public ListCell<T> call(ListView<T> param) {
 
diff --git a/src/main/java/org/jabref/logic/importer/ImportInspector.java b/src/main/java/org/jabref/logic/importer/ImportInspector.java
deleted file mode 100644
index 80ec91e9bb5..00000000000
--- a/src/main/java/org/jabref/logic/importer/ImportInspector.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.jabref.logic.importer;
-
-import org.jabref.model.entry.BibEntry;
-
-/**
- * An ImportInspector can be passed to a EntryFetcher and will receive entries
- * as they are fetched from somewhere.
- *
- * Currently there are two implementations: ImportInspectionDialog and
- * ImportInspectionCommandLine
- *
- */
-public interface ImportInspector {
-
-    /**
-     * Notify the ImportInspector about the progress of the operation.
-     *
-     * The Inspector for instance could display a progress bar with the given
-     * values.
-     *
-     * @param current
-     *            A number that is related to the work already done.
-     *
-     * @param max
-     *            A current estimate for the total amount of work to be done.
-     */
-    void setProgress(int current, int max);
-
-    /**
-     * Add the given entry to the list of entries managed by the inspector.
-     *
-     * @param entry
-     *            The entry to add.
-     */
-    void addEntry(BibEntry entry);
-}
diff --git a/src/main/java/org/jabref/logic/importer/WebFetcher.java b/src/main/java/org/jabref/logic/importer/WebFetcher.java
index c33531ac5eb..6f300d67df2 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetcher.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.importer;
 
+import java.util.Optional;
+
 import org.jabref.logic.help.HelpFile;
 
 /**
@@ -20,7 +22,7 @@ public interface WebFetcher {
      *
      * @return the {@link HelpFile} enum constant for the help page
      */
-    default HelpFile getHelpPage() {
-        return null; // no help page by default
+    default Optional<HelpFile> getHelpPage() {
+        return Optional.empty(); // no help page by default
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
index 059fcbaff21..e36f730366b 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
@@ -4,6 +4,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
@@ -31,8 +32,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_ACM;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_ACM);
     }
 
     private static String createQueryString(String query) {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
index 52a252f69e2..c70a9e1b34f 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
+import java.util.Optional;
+
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.IdBasedParserFetcher;
@@ -19,8 +21,8 @@ public AbstractIsbnFetcher(ImportFormatPreferences importFormatPreferences) {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_ISBN;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_ISBN);
     }
 
     protected void ensureThatIsbnIsValid(String identifier) throws FetcherException {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java b/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
index 108820515c8..bab25ab4aa7 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
@@ -250,8 +250,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_OAI2_ARXIV;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_OAI2_ARXIV);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java b/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
index 1ff7a6d7c89..6b99f420526 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
@@ -9,6 +9,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.jabref.logic.cleanup.MoveFieldCleanup;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
@@ -115,8 +116,8 @@ public URL getURLForID(String identifier) throws URISyntaxException, MalformedUR
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_ADS;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_ADS);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java b/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
index 8d244b101f8..56777a8809c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
@@ -7,6 +7,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -37,8 +38,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_CITESEERX;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_CITESEERX);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
index c422a9c28ca..57937051561 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
@@ -4,6 +4,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.jabref.logic.cleanup.DoiCleanup;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
@@ -71,8 +72,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_DBLP;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_DBLP);
     }
 
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
index 981ab58ea52..67bc0dc97ac 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.jabref.logic.help.HelpFile;
@@ -157,8 +158,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_DOAJ;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_DOAJ);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java b/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
index d3c56712371..5a876fd9ff8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
@@ -3,6 +3,7 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.Optional;
 
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
@@ -32,8 +33,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_DIVA;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_DIVA);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
index 766f2570164..0deb118292e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
@@ -38,8 +38,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_DOI;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_DOI);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java b/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
index 466d0259f29..24a061a26b5 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
@@ -117,8 +117,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_GOOGLE_SCHOLAR;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_GOOGLE_SCHOLAR);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
index 963ff5ab5e4..67b9879ec35 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
@@ -8,6 +8,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.jabref.logic.help.HelpFile;
@@ -34,8 +35,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_GVK;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_GVK);
     }
 
     private String getSearchQueryStringForComplexQuery(List<String> queryList) {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
index dd9a00ceab2..ac8192a2360 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
@@ -228,7 +228,7 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_IEEEXPLORE;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_IEEEXPLORE);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
index 761a59e72ef..2229d752d66 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
@@ -7,6 +7,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -48,8 +49,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_INSPIRE;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_INSPIRE);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
index 11e8420955c..0b8ace85d7d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
@@ -12,6 +12,7 @@
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
@@ -127,8 +128,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_MEDLINE;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_MEDLINE);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
index 5840c25cc15..19f6128e708 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
@@ -3,6 +3,7 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.Optional;
 
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
@@ -33,8 +34,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_RFC;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_RFC);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
index 58471c00305..213fe7c79ac 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
@@ -147,8 +147,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_SPRINGER;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_SPRINGER);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java
index 881b738edde..5fea61c0e8f 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java
@@ -25,8 +25,8 @@ public String getName() {
     }
 
     @Override
-    public HelpFile getHelpPage() {
-        return HelpFile.FETCHER_TITLE;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_TITLE);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 6270350cc84..a6b4b65d800 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -702,8 +702,8 @@ private JabRefPreferences() {
         defaults.put(EMAIL_SUBJECT, Localization.lang("References"));
         defaults.put(OPEN_FOLDERS_OF_ATTACHED_FILES, Boolean.FALSE);
         defaults.put(ALLOW_FILE_AUTO_OPEN_BROWSE, Boolean.TRUE);
-        defaults.put(WEB_SEARCH_VISIBLE, Boolean.FALSE);
-        defaults.put(GROUP_SIDEPANE_VISIBLE, Boolean.FALSE);
+        defaults.put(WEB_SEARCH_VISIBLE, Boolean.TRUE);
+        defaults.put(GROUP_SIDEPANE_VISIBLE, Boolean.TRUE);
         defaults.put(SELECTED_FETCHER_INDEX, 0);
         defaults.put(BIB_LOC_AS_PRIMARY_DIR, Boolean.FALSE);
         defaults.put(DB_CONNECT_SERVER_TYPE, "MySQL");
@@ -1035,6 +1035,10 @@ public void putInt(String key, int value) {
         prefs.putInt(key, value);
     }
 
+    public void putInt(String key, Number value) {
+        prefs.putInt(key, value.intValue());
+    }
+
     public void putDouble(String key, double value) {
         prefs.putDouble(key, value);
     }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 55b6f2209de..d2de9afd87d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -416,8 +416,6 @@ External\ programs=External programs
 
 External\ viewer\ called=External viewer called
 
-Fetch=Fetch
-
 Field=Field
 
 field=field
@@ -1180,7 +1178,6 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Your new key bindings have been st
 The\ following\ fetchers\ are\ available\:=The following fetchers are available:
 Could\ not\ find\ fetcher\ '%0'=Could not find fetcher '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Running query '%0' with fetcher '%1'.
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=Query '%0' with fetcher '%1' did not return any results.
 
 Move\ file=Move file
 Rename\ file=Rename file
@@ -1192,7 +1189,6 @@ Could\ not\ move\ file\ '%0'.=Could not move file '%0'.
 Could\ not\ find\ file\ '%0'.=Could not find file '%0'.
 Number\ of\ entries\ successfully\ imported=Number of entries successfully imported
 Import\ canceled\ by\ user=Import canceled by user
-Progress\:\ %0\ of\ %1=Progress: %0 of %1
 Error\ while\ fetching\ from\ %0=Error while fetching from %0
 
 Show\ search\ results\ in\ a\ window=Show search results in a window
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
index ee5f4c4e2bd..2aedc5c0473 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
@@ -136,7 +136,7 @@ public void setUp() throws Exception {
 
     @Test
     public void testHelpPage() {
-        assertEquals("ADS", fetcher.getHelpPage().getPageName());
+        assertEquals("ADS", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
index 177d48b7123..d6411540e39 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
@@ -56,7 +56,7 @@ public void testGetName() {
 
     @Test
     public void testGetHelpPage() {
-        assertEquals("DOItoBibTeX", fetcher.getHelpPage().getPageName());
+        assertEquals("DOItoBibTeX", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
index 7701d92504d..fc8f1c7e12d 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
@@ -63,7 +63,7 @@ public void testGetName() {
 
     @Test
     public void testGetHelpPage() {
-        assertEquals("GVK", fetcher.getHelpPage().getPageName());
+        assertEquals("GVK", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
index 6567c692f96..a8a6f0fd40a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
@@ -48,7 +48,7 @@ public void testName() {
 
     @Test
     public void testHelpPage() {
-        assertEquals("ISBNtoBibTeX", fetcher.getHelpPage().getPageName());
+        assertEquals("ISBNtoBibTeX", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java
index 658099683a7..101df5f27ac 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java
@@ -44,7 +44,7 @@ public void testName() {
     @Test
     @Override
     public void testHelpPage() {
-        assertEquals("ISBNtoBibTeX", fetcher.getHelpPage().getPageName());
+        assertEquals("ISBNtoBibTeX", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
index aafc965b53c..a20318709b1 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
@@ -44,7 +44,7 @@ public void testName() {
     @Test
     @Override
     public void testHelpPage() {
-        assertEquals("ISBNtoBibTeX", fetcher.getHelpPage().getPageName());
+        assertEquals("ISBNtoBibTeX", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
index 289aeecf698..54e7ac3944a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
@@ -128,7 +128,7 @@ public void testGetName() {
 
     @Test
     public void testGetHelpPage() {
-        assertEquals("Medline", fetcher.getHelpPage().getPageName());
+        assertEquals("Medline", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
index 1ed849969ae..146be5a7e35 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
@@ -48,7 +48,7 @@ public void getNameReturnsEqualIdName() {
 
     @Test
     public void getHelpPageReturnsEqualHelpPage() {
-        assertEquals("RFCtoBibTeX", fetcher.getHelpPage().getPageName());
+        assertEquals("RFCtoBibTeX", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
index d4b37535b8f..728ef5de1b9 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
@@ -43,7 +43,7 @@ public void testGetName() {
 
     @Test
     public void testGetHelpPage() {
-        assertEquals("TitleToBibTeX", fetcher.getHelpPage().getPageName());
+        assertEquals("TitleToBibTeX", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test

From 07beeef44c84d5963f410aeb007fca0de563c8b4 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Wed, 25 Jul 2018 09:41:44 +0200
Subject: [PATCH 012/229] Fix isbn chimbori test (#4234)

Adapt the url of returned data
---
 .../logic/importer/fetcher/IsbnViaChimboriFetcherTest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java
index 101df5f27ac..7371043febc 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java
@@ -30,7 +30,7 @@ public void setUp() {
         bibEntry.setField("author", "Joshua Bloch");
         bibEntry.setField("isbn", "978-0321356680");
         bibEntry.setField("url",
-                "https://www.amazon.com/Effective-Java-2nd-Joshua-Bloch/dp/0321356683?SubscriptionId=0JYN1NVW651KCA56C102&tag=techkie-20&linkCode=xm2&camp=2025&creative=165953&creativeASIN=0321356683");
+                          "https://www.amazon.com/Effective-Java-2nd-Joshua-Bloch/dp/0321356683?SubscriptionId=AKIAIOBINVZYXZQZ2U3A&tag=chimbori05-20&linkCode=xm2&camp=2025&creative=165953&creativeASIN=0321356683");
 
         fetcher = new IsbnViaChimboriFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
     }
@@ -77,7 +77,7 @@ public void authorsAreCorrectlyFormatted() throws Exception {
         bibEntry.setField("author", "Marlon Dumas and Marcello La Rosa and Jan Mendling and Hajo A. Reijers");
         bibEntry.setField("isbn", "3642434738");
         bibEntry.setField("url",
-                "https://www.amazon.com/Fundamentals-Business-Process-Management-Marlon/dp/3642434738?SubscriptionId=0JYN1NVW651KCA56C102&tag=techkie-20&linkCode=xm2&camp=2025&creative=165953&creativeASIN=3642434738");
+                          "https://www.amazon.com/Fundamentals-Business-Process-Management-Marlon/dp/3642434738?SubscriptionId=AKIAIOBINVZYXZQZ2U3A&tag=chimbori05-20&linkCode=xm2&camp=2025&creative=165953&creativeASIN=3642434738");
 
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3642434738");
         assertEquals(Optional.of(bibEntry), fetchedEntry);

From b601ba6c170501225c261a7d6ce3bcf78348cffe Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Wed, 25 Jul 2018 16:21:10 +0800
Subject: [PATCH 013/229] FIX#3861ReplaceString_CheckStyle

---
 src/main/java/org/jabref/gui/JabRefFrame.java |   1 -
 .../java/org/jabref/gui/ReplaceString.fxml    |  72 ++++--
 .../org/jabref/gui/ReplaceStringAction.java   |  10 +-
 .../org/jabref/gui/ReplaceStringDialog.java   | 221 ------------------
 .../org/jabref/gui/ReplaceStringView.java     | 143 ++----------
 .../jabref/gui/ReplaceStringViewModel.java    |  90 +++++++
 6 files changed, 167 insertions(+), 370 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/ReplaceStringDialog.java
 create mode 100644 src/main/java/org/jabref/gui/ReplaceStringViewModel.java

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 4968d31b5ab..1eed35d9bfa 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -598,7 +598,6 @@ private Node createToolbar() {
                 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.REPLACE_ALL, new ReplaceStringAction(this.getCurrentBasePanel())),
 
                 factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new OldDatabaseCommandWrapper(Actions.CLEANUP, this, Globals.stateManager)),
                 factory.createIconButton(pushToExternal.getMenuAction(), pushToExternal),
diff --git a/src/main/java/org/jabref/gui/ReplaceString.fxml b/src/main/java/org/jabref/gui/ReplaceString.fxml
index a50aac367c9..b44b13b6268 100644
--- a/src/main/java/org/jabref/gui/ReplaceString.fxml
+++ b/src/main/java/org/jabref/gui/ReplaceString.fxml
@@ -3,24 +3,56 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<DialogPane  maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="339.0" prefWidth="476.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="org.jabref.gui.ReplaceStringView" fx:id="pane">
-  <content>
-    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="376.0" prefWidth="552.0">
-         <children>
-            <Button fx:id="CancelButton" cancelButton="true" layoutX="386.0" layoutY="273.0" mnemonicParsing="false" onAction="#buttonCancel" prefHeight="28.0" prefWidth="74.0" text="Cancel" userData="CANCEL"/>
-            <Button fx:id="ReplaceButton" defaultButton="true" layoutX="260.0" layoutY="275.0" mnemonicParsing="false" onAction="#buttonReplace" prefHeight="25.0" prefWidth="76.0" text="Replace" textFill="#e46161" userData="OK_DONE"/>
-            <TextField fx:id="FindField" layoutX="107.0" layoutY="21.0" prefHeight="23.0" prefWidth="347.0" />
-            <TextField fx:id="ReplaceField" layoutX="107.0" layoutY="63.0" prefHeight="23.0" prefWidth="348.0" />
-            <Label layoutX="14.0" layoutY="21.0" prefHeight="23.0" prefWidth="75.0" text="Find:" />
-            <Label layoutX="11.0" layoutY="64.0" prefHeight="21.0" prefWidth="95.0" text="Replace with:" />
-            <CheckBox fx:id="checkLimit" layoutX="20.0" layoutY="134.0" mnemonicParsing="false" onAction="#selectOnly" onMouseReleased="#selectOnly" prefHeight="22.0" prefWidth="211.0" text="Limit to Selected Entries" />
-            <RadioButton layoutX="20.0" layoutY="188.0" mnemonicParsing="false" onAction="#radioAll" onMouseReleased="#radioAll" prefHeight="16.0" prefWidth="125.0" selected="true" text="All Field Replace">
-               <toggleGroup>
-                  <ToggleGroup fx:id="RadioGroup" />
-               </toggleGroup>
-            </RadioButton>
-            <RadioButton layoutX="20.0" layoutY="217.0" mnemonicParsing="false" onAction="#radioLimit" onMouseReleased="#radioLimit" prefHeight="29.0" prefWidth="121.0" text="Limit to Fields:" toggleGroup="$RadioGroup" />
-            <TextField fx:id="LimitFieldInput" layoutX="157.0" layoutY="220.0" prefHeight="23.0" prefWidth="283.0" />
-         </children></AnchorPane>
-  </content>
+<DialogPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8"
+            fx:controller="org.jabref.gui.ReplaceStringView" fx:id="pane">
+    <content>
+        <BorderPane>
+            <center>
+                <BorderPane BorderPane.alignment="CENTER">
+                    <center>
+                        <GridPane>
+                            <columnConstraints>
+                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                            </columnConstraints>
+                            <rowConstraints>
+                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                            </rowConstraints>
+                            <Label text="Find and Replace"/>
+                            <Label text="Find: " GridPane.columnIndex="0" GridPane.rowIndex="1"/>
+                            <TextField fx:id="findField" GridPane.columnIndex="1" GridPane.rowIndex="1"
+                                       GridPane.columnSpan="4"/>
+                            <Label text="Replace With:" GridPane.columnIndex="0" GridPane.rowIndex="2"/>
+                            <TextField fx:id="replaceField" GridPane.columnIndex="1" GridPane.rowIndex="2"
+                                       GridPane.columnSpan="4"/>
+                            <CheckBox GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.columnSpan="2"
+                                      onAction="#selectOnly" text="Limit to Selected Entries"/>
+                            <RadioButton GridPane.columnIndex="0" GridPane.rowIndex="5" GridPane.columnSpan="2"
+                                         onAction="#radioAll" selected="true" text="All Field Replace">
+                                <toggleGroup>
+                                    <ToggleGroup fx:id="radioGroup"/>
+                                </toggleGroup>
+                            </RadioButton>
+                            <RadioButton GridPane.columnIndex="0" GridPane.rowIndex="6" GridPane.columnSpan="2"
+                                         onAction="#radioLimit" text="Limit to Fields:" toggleGroup="$radioGroup"/>
+                            <TextField fx:id="limitFieldInput" GridPane.columnIndex="2" GridPane.rowIndex="6"
+                                       GridPane.columnSpan="3"/>
+                        </GridPane>
+                    </center>
+                </BorderPane>
+            </center>
+        </BorderPane>
+    </content>
+    <ButtonType fx:id="replaceButton" text="Replace" buttonData="OK_DONE"/>
+    <ButtonType fx:constant="CANCEL"/>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/ReplaceStringAction.java b/src/main/java/org/jabref/gui/ReplaceStringAction.java
index b1674b4886a..e115e8f8377 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringAction.java
+++ b/src/main/java/org/jabref/gui/ReplaceStringAction.java
@@ -1,20 +1,18 @@
 package org.jabref.gui;
 
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.model.database.BibDatabase;
 
 public class ReplaceStringAction extends SimpleCommand
 {
     private BasePanel basePanel;
 
-    public ReplaceStringAction(BasePanel bPanel) {
-        this.basePanel = bPanel;
+    public ReplaceStringAction(BasePanel basePanel) {
+        this.basePanel = basePanel;
     }
 
     @Override
     public void execute() {
-        BibDatabase database = basePanel.getDatabase();
-        ReplaceStringView rsc = new ReplaceStringView(database, basePanel);
-        rsc.showAndWait().filter(response -> rsc.isExit());
+        ReplaceStringView dialog = new ReplaceStringView(basePanel);
+        dialog.showAndWait();
     }
 }
diff --git a/src/main/java/org/jabref/gui/ReplaceStringDialog.java b/src/main/java/org/jabref/gui/ReplaceStringDialog.java
deleted file mode 100644
index 10fd5ccc1cf..00000000000
--- a/src/main/java/org/jabref/gui/ReplaceStringDialog.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Locale;
-
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-
-import org.jabref.Globals;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableFieldChange;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-
-/**
- * Dialog for replacing strings.
- */
-class ReplaceStringDialog extends JabRefDialog {
-
-    private final JTextField fieldsField = new JTextField("", 30);
-    private final JTextField fromField = new JTextField("", 30);
-    private final JTextField toField = new JTextField("", 30);
-
-    private final JCheckBox selOnly = new JCheckBox(Localization.lang("Limit to selected entries"), false);
-    private final JRadioButton allFi = new JRadioButton(Localization.lang("All fields"), true);
-    private final JRadioButton field = new JRadioButton(Localization.lang("Limit to fields") + ":", false);
-    private boolean okPressed;
-    private String[] fieldStrings;
-    private String fromString;
-    private String toString;
-
-
-    public ReplaceStringDialog(JabRefFrame parent) {
-        super((JFrame) null, Localization.lang("Replace string"), true, ReplaceStringDialog.class);
-
-        ButtonGroup bg = new ButtonGroup();
-        bg.add(allFi);
-        bg.add(field);
-        ActionListener okListener = e -> {
-            fromString = fromField.getText();
-            toString = toField.getText();
-            if ("".equals(fromString)) {
-                return;
-            }
-            okPressed = true;
-            fieldStrings = fieldsField.getText().toLowerCase(Locale.ROOT).split(";");
-            dispose();
-        };
-        JButton ok = new JButton(Localization.lang("OK"));
-        ok.addActionListener(okListener);
-        toField.addActionListener(okListener);
-        fieldsField.addActionListener(okListener);
-        AbstractAction cancelAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        };
-        JButton cancel = new JButton(Localization.lang("Cancel"));
-        cancel.addActionListener(cancelAction);
-
-        // Key bindings:
-        JPanel settings = new JPanel();
-        ActionMap am = settings.getActionMap();
-        InputMap im = settings.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", cancelAction);
-
-        // Layout starts here.
-        GridBagLayout gbl = new GridBagLayout();
-        settings.setLayout(gbl);
-        JPanel opt = new JPanel();
-        opt.setLayout(gbl);
-        JPanel main = new JPanel();
-        main.setLayout(gbl);
-
-        settings.setBorder(BorderFactory.createTitledBorder
-                (BorderFactory.createEtchedBorder(),
-                        Localization.lang("Replace string")));
-        main.setBorder(BorderFactory.createTitledBorder
-                (BorderFactory.createEtchedBorder(),
-                        Localization.lang("Strings")));
-
-        // Settings panel:
-        GridBagConstraints con = new GridBagConstraints();
-        con.fill = GridBagConstraints.HORIZONTAL;
-        con.gridwidth = 2;
-        con.weightx = 0;
-        con.anchor = GridBagConstraints.WEST;
-        con.gridy = 0;
-        con.gridx = 0;
-        con.insets = new Insets(3, 5, 3, 5);
-        gbl.setConstraints(selOnly, con);
-        settings.add(selOnly);
-        con.gridy = 1;
-        con.insets = new Insets(13, 5, 3, 5);
-        gbl.setConstraints(allFi, con);
-        settings.add(allFi);
-        con.gridwidth = 1;
-        con.gridy = 2;
-        con.gridx = 0;
-        con.insets = new Insets(3, 5, 3, 5);
-        gbl.setConstraints(field, con);
-        settings.add(field);
-        con.gridx = 1;
-        con.weightx = 1;
-        gbl.setConstraints(fieldsField, con);
-        settings.add(fieldsField);
-
-        con.weightx = 0;
-        con.gridx = 0;
-        con.gridy = 0;
-        JLabel fl = new JLabel(Localization.lang("Search for") + ":");
-        gbl.setConstraints(fl, con);
-        main.add(fl);
-        con.gridy = 1;
-        JLabel tl = new JLabel(Localization.lang("Replace with") + ":");
-        gbl.setConstraints(tl, con);
-        main.add(tl);
-        con.weightx = 1;
-        con.gridx = 1;
-        con.gridy = 0;
-        gbl.setConstraints(fromField, con);
-        main.add(fromField);
-        con.gridy = 1;
-        gbl.setConstraints(toField, con);
-        main.add(toField);
-
-        // Option buttons:
-        con.gridx = GridBagConstraints.RELATIVE;
-        con.gridy = GridBagConstraints.RELATIVE;
-        con.weightx = 1;
-        con.gridwidth = 1;
-        con.anchor = GridBagConstraints.EAST;
-        con.fill = GridBagConstraints.NONE;
-        gbl.setConstraints(ok, con);
-        opt.add(ok);
-        con.anchor = GridBagConstraints.WEST;
-        con.gridwidth = GridBagConstraints.REMAINDER;
-        gbl.setConstraints(cancel, con);
-        opt.add(cancel);
-
-        getContentPane().add(main, BorderLayout.NORTH);
-        getContentPane().add(settings, BorderLayout.CENTER);
-        getContentPane().add(opt, BorderLayout.SOUTH);
-
-        pack();
-    }
-
-    public boolean okPressed() {
-        return okPressed;
-    }
-
-    private boolean allFields() {
-        return allFi.isSelected();
-    }
-
-    public boolean selOnly() {
-        return selOnly.isSelected();
-    }
-
-    /**
-     * Does the actual operation on a Bibtex entry based on the
-     * settings specified in this same dialog. Returns the number of
-     * occurences replaced.
-     */
-    public int replace(BibEntry be, NamedCompound ce) {
-        int counter = 0;
-        if (allFields()) {
-            for (String s : be.getFieldNames()) {
-                counter += replaceField(be, s, ce);
-            }
-        } else {
-            for (String fld : fieldStrings) {
-                    counter += replaceField(be, fld, ce);
-            }
-        }
-        return counter;
-    }
-
-    private int replaceField(BibEntry be, String fieldname, NamedCompound ce) {
-        if (!be.hasField(fieldname)) {
-            return 0;
-        }
-        String txt = be.getField(fieldname).get();
-        StringBuilder sb = new StringBuilder();
-        int ind;
-        int piv = 0;
-        int counter = 0;
-        int len1 = fromString.length();
-        while ((ind = txt.indexOf(fromString, piv)) >= 0) {
-            counter++;
-            sb.append(txt.substring(piv, ind)); // Text leading up to s1
-            sb.append(toString); // Insert s2
-            piv = ind + len1;
-        }
-        sb.append(txt.substring(piv));
-        String newStr = sb.toString();
-        be.setField(fieldname, newStr);
-        ce.addEdit(new UndoableFieldChange(be, fieldname, txt, newStr));
-        return counter;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/ReplaceStringView.java b/src/main/java/org/jabref/gui/ReplaceStringView.java
index fee7dee9574..599a21cb0a4 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringView.java
+++ b/src/main/java/org/jabref/gui/ReplaceStringView.java
@@ -1,20 +1,15 @@
 package org.jabref.gui;
 
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.TextField;
-import javafx.scene.control.ToggleGroup;
 import javafx.stage.Stage;
 
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibEntry;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
@@ -22,33 +17,23 @@
 public class ReplaceStringView extends BaseDialog<Void>
 {
 
-    @FXML public ToggleGroup RadioGroup;
-    @FXML public Button CancelButton;
-    @FXML public Button ReplaceButton;
-    @FXML private TextField LimitFieldInput;
-    @FXML private TextField FindField;
-    @FXML private TextField ReplaceField;
-    @FXML private CheckBox checkLimit;
+    @FXML private ButtonType replaceButton;
+    @FXML private TextField limitFieldInput;
+    @FXML private TextField findField;
+    @FXML private TextField replaceField;
     @FXML private DialogPane pane;
 
-    private boolean AllFieldReplace;
+    private boolean allFieldReplace;
     private boolean selOnly;
-    private String findString;
-    private String replaceString;
-    private String[] fieldStrings;
-    private BibDatabase database;
-    private boolean exitSignal;
     private BasePanel panel;
-    private Stage st;
+    private Stage stage;
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
-    public ReplaceStringView(BibDatabase bibDatabase, BasePanel basePanel)  {
+    public ReplaceStringView(BasePanel basePanel)  {
         this.setTitle(Localization.lang("Replace String"));
 
-        database = bibDatabase;
-        AllFieldReplace = true;
-        exitSignal = false;
+        allFieldReplace = true;
         selOnly = false;
         panel = basePanel;
 
@@ -56,52 +41,38 @@ public ReplaceStringView(BibDatabase bibDatabase, BasePanel basePanel)  {
                   .load()
                   .setAsDialogPane(this);
 
-        st = (Stage) this.pane.getScene().getWindow();
-        st.setOnCloseRequest(event -> st.close());
+        stage = (Stage) this.pane.getScene().getWindow();
+        ControlHelper.setAction(replaceButton, getDialogPane(), event -> buttonReplace());
     }
 
     @FXML
     public void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
-        LimitFieldInput.setEditable(true);
-        FindField.setEditable(true);
-        ReplaceField.setEditable(true);
-        checkLimit.setSelected(false);
     }
 
-    /**
-     * FXML Message handler
-    */
     @FXML
     public void buttonReplace() {
-        findString = FindField.getText();
-        replaceString = ReplaceField.getText();
-        fieldStrings = LimitFieldInput.getText().toLowerCase().split(";");
+        String findString = findField.getText();
+        String replaceString = replaceField.getText();
+        String[] fieldStrings = limitFieldInput.getText().toLowerCase().split(";");
         if ("".equals(findString))
         {
-            exitSignal = true;
-            st.close();
+            stage.close();
             return;
         }
-        replace();
-        exitSignal = true;
-        st.close();
-    }
-
-    @FXML
-    public void buttonCancel() {
-        exitSignal = true;
-        st.close();
+        ReplaceStringViewModel viewModel = new ReplaceStringViewModel(panel, fieldStrings, findString, replaceString, selOnly, allFieldReplace);
+        viewModel.replace();
+        stage.close();
     }
 
     @FXML
     public void radioAll() {
-        AllFieldReplace = true;
+        allFieldReplace = true;
     }
 
     @FXML
     public void radioLimit() {
-        AllFieldReplace = false;
+        allFieldReplace = false;
     }
 
     @FXML
@@ -109,76 +80,4 @@ public void selectOnly() {
         selOnly = !selOnly;
     }
 
-    public boolean isExit() {
-        return this.exitSignal;
-    }
-
-    /**
-     *  General replacement, same as Action:Replace_All in BasePanel.java
-     *  Rep check: BasePanel == null
-     *  @return : replace count
-     */
-    public int replace() {
-        final NamedCompound ce = new NamedCompound(Localization.lang("Replace string"));
-        int counter = 0;
-        if (this.panel == null)
-            return 0;
-        if (this.selOnly) {
-            for (BibEntry bibEntry: this.panel.getSelectedEntries())
-            {
-                counter += replaceItem(bibEntry, ce);
-            }
-        }
-        else {
-            for (BibEntry bibEntry: this.database.getEntries())
-            {
-                counter += replaceItem(bibEntry, ce);
-            }
-        }
-        return counter;
-    }
-
-    /**
-     * Does the actual operation on a Bibtex entry based on the
-     * settings specified in this same dialog. Returns the number of
-     * occurences replaced.
-     * Copied and Adapted from org.jabref.gui.ReplaceStringDialog.java
-     */
-    public int replaceItem(BibEntry be, NamedCompound ce) {
-        int counter = 0;
-        if (this.AllFieldReplace) {
-            for (String s : be.getFieldNames()) {
-                counter += replaceField(be, s, ce);
-            }
-        } else {
-            for (String fld : fieldStrings) {
-                counter += replaceField(be, fld, ce);
-            }
-        }
-        return counter;
-    }
-
-    private int replaceField(BibEntry be, String fieldname, NamedCompound ce) {
-        if (!be.hasField(fieldname)) {
-            return 0;
-        }
-        String txt = be.getField(fieldname).get();
-        StringBuilder sb = new StringBuilder();
-        int ind;
-        int piv = 0;
-        int counter = 0;
-        int len1 = this.findString.length();
-        while ((ind = txt.indexOf(this.findString, piv)) >= 0) {
-            counter++;
-            sb.append(txt, piv, ind); // Text leading up to s1
-            sb.append(this.replaceString); // Insert s2
-            piv = ind + len1;
-        }
-        sb.append(txt.substring(piv));
-        String newStr = sb.toString();
-        be.setField(fieldname, newStr);
-        ce.addEdit(new UndoableFieldChange(be, fieldname, txt, newStr));
-        return counter;
-    }
-
 }
diff --git a/src/main/java/org/jabref/gui/ReplaceStringViewModel.java b/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
new file mode 100644
index 00000000000..db0d3950c3d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
@@ -0,0 +1,90 @@
+package org.jabref.gui;
+
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+
+public class ReplaceStringViewModel extends AbstractViewModel
+{
+    private boolean allFieldReplace;
+    private boolean selOnly;
+    private String findString;
+    private String replaceString;
+    private String[] fieldStrings;
+    private BasePanel panel;
+
+    public ReplaceStringViewModel(BasePanel basePanel, String[] fields, String find, String replace, Boolean selectedOnly, Boolean allFieldReplace)
+    {
+        this.panel = basePanel;
+        this.fieldStrings = fields;
+        this.findString = find;
+        this.replaceString = replace;
+        this.selOnly = selectedOnly;
+        this.allFieldReplace = allFieldReplace;
+    }
+
+    public int replace() {
+        final NamedCompound compound = new NamedCompound(Localization.lang("Replace string"));
+        int counter = 0;
+        if (this.panel == null)
+            return 0;
+        if (this.selOnly) {
+            for (BibEntry bibEntry: this.panel.getSelectedEntries())
+            {
+                counter += replaceItem(bibEntry, compound);
+            }
+        }
+        else {
+            for (BibEntry bibEntry: this.panel.getDatabase().getEntries())
+            {
+                counter += replaceItem(bibEntry, compound);
+            }
+        }
+        return counter;
+    }
+
+    /**
+     * Does the actual operation on a Bibtex entry based on the
+     * settings specified in this same dialog. Returns the number of
+     * occurences replaced.
+     * Copied and Adapted from org.jabref.gui.ReplaceStringDialog.java
+     */
+    private int replaceItem(BibEntry entry, NamedCompound compound) {
+        int counter = 0;
+        if (this.allFieldReplace) {
+            for (String fieldName : entry.getFieldNames()) {
+                counter += replaceField(entry, fieldName, compound);
+            }
+        } else {
+            for (String espFieldName : fieldStrings) {
+                counter += replaceField(entry, espFieldName, compound);
+            }
+        }
+        return counter;
+    }
+
+    private int replaceField(BibEntry entry, String fieldname, NamedCompound compound) {
+        if (!entry.hasField(fieldname)) {
+            return 0;
+        }
+        String txt = entry.getField(fieldname).get();
+        StringBuilder stringBuilder = new StringBuilder();
+        int ind;
+        int piv = 0;
+        int counter = 0;
+        int len1 = this.findString.length();
+        while ((ind = txt.indexOf(this.findString, piv)) >= 0) {
+            counter++;
+            stringBuilder.append(txt, piv, ind); // Text leading up to s1
+            stringBuilder.append(this.replaceString); // Insert s2
+            piv = ind + len1;
+        }
+        stringBuilder.append(txt.substring(piv));
+        String newStr = stringBuilder.toString();
+        entry.setField(fieldname, newStr);
+        compound.addEdit(new UndoableFieldChange(entry, fieldname, txt, newStr));
+        return counter;
+    }
+
+}

From ce071c7c44d394ca8c936c1e1579521656094480 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Wed, 25 Jul 2018 13:30:49 +0200
Subject: [PATCH 014/229] execute set visible in swing thread to avoid blocking

---
 .../jabref/gui/importer/fetcher/WebSearchPaneViewModel.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
index c38e2c4c4b8..984b11025d9 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -3,6 +3,8 @@
 import java.util.Comparator;
 import java.util.List;
 
+import javax.swing.SwingUtilities;
+
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleListProperty;
@@ -97,7 +99,8 @@ public void search() {
         SearchBasedFetcher activeFetcher = getSelectedFetcher();
         final ImportInspectionDialog dialog = new ImportInspectionDialog(frame, frame.getCurrentBasePanel(),
                 activeFetcher.getName(), false);
-        dialog.setVisible(true);
+
+        SwingUtilities.invokeLater(() -> dialog.setVisible(true));
 
         JabRefExecutorService.INSTANCE.execute(() -> {
             dialog.setStatus(Localization.lang("Processing %0", getQuery()));

From 077fdacc2ddc7beb7d22ba96ead8b400c91b3631 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Wed, 25 Jul 2018 16:50:01 +0200
Subject: [PATCH 015/229] Make attached files relative to the file directory
 (#4212)

* Make attached files relative to the file directory

Fixes #4201
Open files with default OS application if no External file type is present

* add changelog

* use method from linked files view model for linked file

* fix opening of file from menu
add monadic binding

* fix variable name
---
 CHANGELOG.md                                      |  4 +++-
 src/main/java/org/jabref/gui/BasePanel.java       |  3 ++-
 .../org/jabref/gui/desktop/JabRefDesktop.java     | 15 +++++++--------
 .../org/jabref/gui/filelist/AttachFileAction.java | 10 ++++++----
 .../filelist/LinkedFilesEditDialogViewModel.java  |  9 +++++++--
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a8805404d5..36ef46b88be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We changed the default keyboard shortcuts for moving between entries when the entry editor is active to ̀<kbd>alt</kbd> + <kbd>up/down</kbd>.
 - Opening a new file now prompts the directory of the currently selected file, instead of the directory of the last opened file.
 - Window state is saved on close and restored on start.
+- Files without a defined external file type are now directly opened with the default aplication of the operating system
 - We streamlined the process to rename and move files by removing the confirmation dialogs.
 
 
@@ -32,6 +33,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 
 
 
+
 ### Fixed
 - We fixed an issue where custom exports could not be selected in the 'Export (selected) entries' dialog [#4013](https://github.com/JabRef/jabref/issues/4013)
 - Italic text is now rendered correctly. https://github.com/JabRef/jabref/issues/3356
@@ -58,7 +60,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where the "Convert to BibTeX-Cleanup" moved the content of the `file` field to the `pdf` field [#4120](https://github.com/JabRef/jabref/issues/4120)
 - We fixed an issue where the preview pane in entry preview in preferences wasn't showing the citation style selected [#3849](https://github.com/JabRef/jabref/issues/3849)
 - We fixed an issue where the default entry preview style still contained the field `review`. The field `review` in the style is now replaced with comment to be consistent with the entry editor [#4098](https://github.com/JabRef/jabref/issues/4098)
-
+- We fixed an issue where filles added via the "Attach file" contextmenu of an entry were not made relative. [#4201](https://github.com/JabRef/jabref/issues/4201)
 
 
 
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 54938361525..52167a8b624 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -62,6 +62,7 @@
 import org.jabref.gui.filelist.FileListEntry;
 import org.jabref.gui.filelist.FileListTableModel;
 import org.jabref.gui.groups.GroupAddRemoveDialog;
+import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.importer.actions.AppendDatabaseAction;
 import org.jabref.gui.journals.AbbreviateAction;
 import org.jabref.gui.journals.UnabbreviateAction;
@@ -674,7 +675,7 @@ private void openExternalFile() {
                 return;
             }
             FileListEntry flEntry = fileListTableModel.getEntry(0);
-            ExternalFileMenuItem item = new ExternalFileMenuItem(frame(), "", flEntry.getLink(), flEntry.getType().get().getIcon().getSmallIcon(), bibDatabaseContext, flEntry.getType());
+            ExternalFileMenuItem item = new ExternalFileMenuItem(frame(), "", flEntry.getLink(), flEntry.getType().map(ExternalFileType::getIcon).map(JabRefIcon::getSmallIcon).orElse(null), bibDatabaseContext, flEntry.getType());
             item.doClick();
         });
     }
diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
index cfff8fb441c..c9c1a515aa4 100644
--- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
@@ -129,20 +129,15 @@ public static boolean openExternalFileAnyFormat(final BibDatabaseContext databas
         }
 
         Optional<Path> file = FileHelper.expandFilename(databaseContext, link, Globals.prefs.getFileDirectoryPreferences());
-        if (file.isPresent() && Files.exists(file.get()) && (type.isPresent())) {
+        if (file.isPresent() && Files.exists(file.get())) {
             // Open the file:
             String filePath = file.get().toString();
             openExternalFilePlatformIndependent(type, filePath);
             return true;
         } else {
             // No file matched the name, try to open it directly using the given app
-            if (type.isPresent()) {
-                openExternalFilePlatformIndependent(type, link);
-                return true;
-            }
-
-            // Run out of ideas what to do...
-            return false;
+            openExternalFilePlatformIndependent(type, link);
+            return true;
         }
     }
 
@@ -160,6 +155,10 @@ private static void openExternalFilePlatformIndependent(Optional<ExternalFileTyp
             } else {
                 NATIVE_DESKTOP.openFileWithApplication(filePath, application);
             }
+        } else {
+            //File type is not given and therefore no application specified
+            //Let the OS handle the opening of the file
+            NATIVE_DESKTOP.openFile(filePath, "");
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index eac832389f7..47e89416858 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -6,6 +6,7 @@
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.fieldeditors.LinkedFilesEditorViewModel;
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
@@ -32,13 +33,14 @@ public void execute() {
         }
         BibEntry entry = panel.getSelectedEntries().get(0);
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-                .build();
+                                                                                               .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                               .build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
-            LinkedFile newLinkedFile = new LinkedFile("", newFile.toString(), "");
 
-            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(newLinkedFile);
+            LinkedFile linkedFile = LinkedFilesEditorViewModel.fromFile(newFile, panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()));
+
+            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(linkedFile);
 
             dialog.showAndWait()
                   .ifPresent(editedLinkedFile -> {
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 5a24ba38822..492cda62592 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -26,6 +26,9 @@
 import org.jabref.model.util.FileHelper;
 import org.jabref.preferences.PreferencesService;
 
+import org.fxmisc.easybind.EasyBind;
+import org.fxmisc.easybind.monadic.MonadicObservableValue;
+
 public class LinkedFilesEditDialogViewModel extends AbstractViewModel {
 
     private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
@@ -33,6 +36,7 @@ public class LinkedFilesEditDialogViewModel extends AbstractViewModel {
     private final StringProperty description = new SimpleStringProperty("");
     private final ListProperty<ExternalFileType> allExternalFileTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
     private final ObjectProperty<ExternalFileType> selectedExternalFileType = new SimpleObjectProperty<>();
+    private final MonadicObservableValue<ExternalFileType> monadicSelectedExternalFileType;
     private final BibDatabaseContext database;
     private final DialogService dialogService;
     private final PreferencesService preferences;
@@ -44,6 +48,8 @@ public LinkedFilesEditDialogViewModel(LinkedFile linkedFile, BibDatabaseContext
         this.preferences = preferences;
         this.externalFileTypes = externalFileTypes;
         allExternalFileTypes.set(FXCollections.observableArrayList(externalFileTypes.getExternalFileTypeSelection()));
+
+        monadicSelectedExternalFileType = EasyBind.monadic(selectedExternalFileType);
         setValues(linkedFile);
     }
 
@@ -119,8 +125,7 @@ public ObjectProperty<ExternalFileType> selectedExternalFileTypeProperty() {
     }
 
     public LinkedFile getNewLinkedFile() {
-        return new LinkedFile(description.getValue(), link.getValue(), selectedExternalFileType.getValue().toString());
-
+        return new LinkedFile(description.getValue(), link.getValue(), monadicSelectedExternalFileType.map(ExternalFileType::toString).getOrElse(""));
     }
 
 }

From 85acae3386569f2877ecb1c92cc0e0273a1eb55a Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 30 Jul 2018 14:27:59 +0200
Subject: [PATCH 016/229] Add text and contained buttons

---
 src/main/java/org/jabref/gui/Base.css         |   9 ++
 src/main/java/org/jabref/gui/GUIGlobals.java  |   2 +
 .../java/org/jabref/gui/icon/IconTheme.java   |   2 +-
 .../org/jabref/styletester/StyleTester.fxml   | 138 ++++++++++++++++--
 .../jabref/styletester/StyleTesterMain.java   |   3 +
 .../jabref/styletester/StyleTesterView.java   |  12 ++
 6 files changed, 152 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 87e959645e1..354985a4d07 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -365,6 +365,15 @@
     -fx-background-color: derive(-fx-default-button, -20%);
 }
 
+.text-button {
+    -fx-border-width: 0px;
+}
+
+.contained-button {
+    -fx-background-color: -jr-accent;
+    -fx-border-color: -jr-accent;
+}
+
 .menu-bar {
     -fx-background-color: -jr-menu-background;
     -fx-background-insets: 0;
diff --git a/src/main/java/org/jabref/gui/GUIGlobals.java b/src/main/java/org/jabref/gui/GUIGlobals.java
index 153018119e8..a8c25e50d94 100644
--- a/src/main/java/org/jabref/gui/GUIGlobals.java
+++ b/src/main/java/org/jabref/gui/GUIGlobals.java
@@ -4,6 +4,7 @@
 import java.awt.Font;
 
 import org.jabref.Globals;
+import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.EmacsKeyBindings;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
@@ -55,6 +56,7 @@ public static void init() {
         // Set up entry editor colors, first time:
         GUIGlobals.updateEntryEditorColors();
 
+        IconTheme.loadFonts();
         GUIGlobals.currentFont = new Font(Globals.prefs.get(JabRefPreferences.FONT_FAMILY),
                 Globals.prefs.getInt(JabRefPreferences.FONT_STYLE), Globals.prefs.getInt(JabRefPreferences.FONT_SIZE));
     }
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 73dcd876c75..0f9e4214e4e 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -50,7 +50,7 @@ public class IconTheme {
     private static final Map<String, String> KEY_TO_ICON = readIconThemeFile(
             IconTheme.class.getResource("/images/Icons.properties"), "/images/external/");
 
-    static {
+    public static void loadFonts() {
         try (InputStream stream = getMaterialDesignIconsStream()) {
             FONT = Font.createFont(Font.TRUETYPE_FONT, stream);
         } catch (FontFormatException | IOException e) {
diff --git a/src/main/java/org/jabref/styletester/StyleTester.fxml b/src/main/java/org/jabref/styletester/StyleTester.fxml
index 5cd720a3e7d..64f9bbe5624 100644
--- a/src/main/java/org/jabref/styletester/StyleTester.fxml
+++ b/src/main/java/org/jabref/styletester/StyleTester.fxml
@@ -29,25 +29,137 @@
 <?import javafx.scene.input.KeyCodeCombination?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<AnchorPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="400.0" prefWidth="600.0"
+<?import org.jabref.gui.icon.JabRefIconView?>
+<AnchorPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="400.0" prefWidth="700.0"
             xmlns="http://javafx.com/javafx/8.0.121" fx:controller="org.jabref.styletester.StyleTesterView">
     <TabPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
              AnchorPane.topAnchor="0.0">
         <Tab text="Buttons">
-            <FlowPane>
-                <Label>Normal buttons:</Label>
-                <HBox spacing="16">
-                    <Button text="Normal"/>
-                    <Button text="Hover" fx:id="normalButtonHover"/>
-                    <Button text="Pressed" fx:id="normalButtonPressed"/>
-                    <Button text="Focused" fx:id="normalButtonFocused"/>
-                    <Button disable="true" text="Disabled"/>
-                    <Button defaultButton="true" text="Default"/>
-                    <Button cancelButton="true" text="Cancel"/>
-                </HBox>
-            </FlowPane>
+            <GridPane vgap="16" hgap="32" style="-fx-padding: 20 30 20 30;">
+                <Label GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="6">Normal buttons:</Label>
+                <Button text="Normal" GridPane.rowIndex="1" GridPane.columnIndex="0">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button text="Hover" fx:id="normalButtonHover" GridPane.rowIndex="1" GridPane.columnIndex="1">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button text="Pressed" fx:id="normalButtonPressed" GridPane.rowIndex="1" GridPane.columnIndex="2">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button text="Focused" fx:id="normalButtonFocused" GridPane.rowIndex="1" GridPane.columnIndex="3">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button disable="true" text="Disabled" GridPane.rowIndex="1" GridPane.columnIndex="4">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button defaultButton="true" text="Default" GridPane.rowIndex="1" GridPane.columnIndex="5">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button cancelButton="true" text="Cancel" GridPane.rowIndex="1" GridPane.columnIndex="6">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Label GridPane.rowIndex="2" GridPane.columnIndex="0" GridPane.columnSpan="6">Text buttons:</Label>
+                <Button text="Normal" styleClass="text-button" GridPane.rowIndex="3" GridPane.columnIndex="0">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button text="Hover" fx:id="textButtonHover" styleClass="text-button" GridPane.rowIndex="3"
+                        GridPane.columnIndex="1">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button text="Pressed" fx:id="textButtonPressed" styleClass="text-button" GridPane.rowIndex="3"
+                        GridPane.columnIndex="2">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button text="Focused" fx:id="textButtonFocused" styleClass="text-button" GridPane.rowIndex="3"
+                        GridPane.columnIndex="3">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button disable="true" text="Disabled" styleClass="text-button" GridPane.rowIndex="3"
+                        GridPane.columnIndex="4">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button defaultButton="true" text="Default" styleClass="text-button" GridPane.rowIndex="3"
+                        GridPane.columnIndex="5">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button cancelButton="true" text="Cancel" styleClass="text-button" GridPane.rowIndex="3"
+                        GridPane.columnIndex="6">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Label GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="6">Contained buttons:</Label>
+                <Button text="Normal" styleClass="contained-button" GridPane.rowIndex="5" GridPane.columnIndex="0">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button text="Hover" fx:id="containedButtonHover" styleClass="contained-button" GridPane.rowIndex="5"
+                        GridPane.columnIndex="1">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button text="Pressed" fx:id="containedButtonPressed" styleClass="contained-button"
+                        GridPane.rowIndex="5" GridPane.columnIndex="2">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button text="Focused" fx:id="containedButtonFocused" styleClass="contained-button"
+                        GridPane.rowIndex="5" GridPane.columnIndex="3">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button disable="true" text="Disabled" styleClass="contained-button" GridPane.rowIndex="5"
+                        GridPane.columnIndex="4">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button defaultButton="true" text="Default" styleClass="contained-button" GridPane.rowIndex="5"
+                        GridPane.columnIndex="5">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+                <Button cancelButton="true" text="Cancel" styleClass="contained-button" GridPane.rowIndex="5"
+                        GridPane.columnIndex="6">
+                    <graphic>
+                        <JabRefIconView glyph="ADD_NOBOX"/>
+                    </graphic>
+                </Button>
+            </GridPane>
         </Tab>
         <Tab>
             <VBox layoutX="194.0" layoutY="14.0" prefHeight="200.0" prefWidth="100.0">
diff --git a/src/main/java/org/jabref/styletester/StyleTesterMain.java b/src/main/java/org/jabref/styletester/StyleTesterMain.java
index e7468adffcd..1db0f6e3048 100644
--- a/src/main/java/org/jabref/styletester/StyleTesterMain.java
+++ b/src/main/java/org/jabref/styletester/StyleTesterMain.java
@@ -5,6 +5,7 @@
 import javafx.stage.Stage;
 
 import org.jabref.JabRefExecutorService;
+import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
 import org.jabref.gui.util.ThemeLoader;
 import org.jabref.preferences.JabRefPreferences;
@@ -22,6 +23,8 @@ public static void main(String[] args) {
     public void start(Stage stage) {
         StyleTesterView view = new StyleTesterView();
 
+        IconTheme.loadFonts();
+
         DefaultFileUpdateMonitor fileUpdateMonitor = new DefaultFileUpdateMonitor();
         JabRefExecutorService.INSTANCE.executeInterruptableTask(fileUpdateMonitor, "FileUpdateMonitor");
 
diff --git a/src/main/java/org/jabref/styletester/StyleTesterView.java b/src/main/java/org/jabref/styletester/StyleTesterView.java
index f77d03cc9d8..eb2db094606 100644
--- a/src/main/java/org/jabref/styletester/StyleTesterView.java
+++ b/src/main/java/org/jabref/styletester/StyleTesterView.java
@@ -11,6 +11,12 @@ public class StyleTesterView {
     @FXML private Button normalButtonHover;
     @FXML private Button normalButtonPressed;
     @FXML private Button normalButtonFocused;
+    @FXML private Button textButtonHover;
+    @FXML private Button textButtonPressed;
+    @FXML private Button textButtonFocused;
+    @FXML private Button containedButtonHover;
+    @FXML private Button containedButtonPressed;
+    @FXML private Button containedButtonFocused;
     private Parent content;
 
     StyleTesterView() {
@@ -24,12 +30,18 @@ public class StyleTesterView {
     private void setStates() {
         PseudoClass hover = PseudoClass.getPseudoClass("hover");
         normalButtonHover.pseudoClassStateChanged(hover, true);
+        textButtonHover.pseudoClassStateChanged(hover, true);
+        containedButtonHover.pseudoClassStateChanged(hover, true);
 
         PseudoClass pressed = PseudoClass.getPseudoClass("pressed");
         normalButtonPressed.pseudoClassStateChanged(pressed, true);
+        textButtonPressed.pseudoClassStateChanged(pressed, true);
+        containedButtonPressed.pseudoClassStateChanged(pressed, true);
 
         PseudoClass focused = PseudoClass.getPseudoClass("focused");
         normalButtonFocused.pseudoClassStateChanged(focused, true);
+        textButtonFocused.pseudoClassStateChanged(focused, true);
+        containedButtonFocused.pseudoClassStateChanged(focused, true);
     }
 
     public Parent getContent() {

From f76f8524318763357d42d71967ca5404bb2f1fb8 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 30 Jul 2018 15:36:59 +0200
Subject: [PATCH 017/229] Fix about dialog

---
 .../java/org/jabref/gui/help/AboutDialog.css    |  9 ---------
 .../java/org/jabref/gui/help/AboutDialog.fxml   | 17 +++++++++--------
 .../org/jabref/gui/help/AboutDialogView.java    |  5 +++++
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/jabref/gui/help/AboutDialog.css b/src/main/java/org/jabref/gui/help/AboutDialog.css
index 836e89c4eb7..8406e6c9ddf 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialog.css
+++ b/src/main/java/org/jabref/gui/help/AboutDialog.css
@@ -36,15 +36,6 @@
 	-fx-padding: 5px;
 }
 
-.custom-buttons {
-	-fx-padding: 10 0 0 0;
-}
-
-.dialog-pane *.button-bar {
-	-fx-max-height: 0;
-	-fx-pref-height: 0;
-}
-
 .logo-pane {
     fx-fill: transparent;
 }
diff --git a/src/main/java/org/jabref/gui/help/AboutDialog.fxml b/src/main/java/org/jabref/gui/help/AboutDialog.fxml
index 45c3bf8135e..f920a896962 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialog.fxml
+++ b/src/main/java/org/jabref/gui/help/AboutDialog.fxml
@@ -28,7 +28,9 @@
                             <Tooltip text="%Copy Version" />
                         </tooltip>
                     </Label>
-                    <Label fx:id="devVersionLabel" managed="${controller.viewModel.isDevelopmentVersion}" styleClass="dev-heading" text="${controller.viewModel.developmentVersion}" visible="${controller.viewModel.isDevelopmentVersion}" />
+                    <Label managed="${controller.viewModel.isDevelopmentVersion}" styleClass="dev-heading"
+                           text="${controller.viewModel.developmentVersion}"
+                           visible="${controller.viewModel.isDevelopmentVersion}"/>
                     <Hyperlink onAction="#openChangeLog" styleClass="top-padding" text="%What's new in this version?" />
                     <Label styleClass="filler" />
                     <HBox alignment="CENTER_LEFT">
@@ -46,7 +48,8 @@
                 </VBox>
                 <BorderPane BorderPane.alignment="CENTER" HBox.hgrow="ALWAYS">
                     <center>
-                        <StackPane onMouseClicked="#openJabrefWebsite" scaleX="0.6" scaleY="0.6" prefWidth="140" prefHeight="140" BorderPane.alignment="CENTER">
+                        <StackPane onMouseClicked="#openJabrefWebsite" prefHeight="140" prefWidth="140" scaleX="0.6"
+                                   scaleY="0.6" BorderPane.alignment="CENTER">
                             <!-- SVGPaths need to be wrapped in a Pane to get them to the same size -->
                             <Pane prefHeight="350" prefWidth="350" styleClass="logo-pane">
                                 <SVGPath content="M97.2 87.1C93.2 33.8 18.4 14.6 18.2 15.6c-0.1 6.7-0.3 13.3-0.4 20 17.8 3.6 61.7 20.1 79.4 51.5" />
@@ -80,12 +83,10 @@
                     </bottom>
                 </BorderPane>
             </HBox>
-            <Label styleClass="sub-heading" text="%Developers">
-            </Label>
+            <Label styleClass="sub-heading" text="%Developers"/>
             <Label alignment="CENTER" styleClass="info-sections" text="${controller.viewModel.developers}" textAlignment="JUSTIFY" wrapText="true" />
-            <Label styleClass="sub-heading" text="%Authors">
-            </Label>
-            <HBox alignment="CENTER" VBox.vgrow="ALWAYS">
+            <Label styleClass="sub-heading" text="%Authors"/>
+            <HBox alignment="CENTER" VBox.vgrow="ALWAYS" prefHeight="100">
                 <ScrollPane fitToWidth="true">
                     <Label styleClass="info-sections" text="${controller.viewModel.authors}" textAlignment="JUSTIFY" wrapText="true" BorderPane.alignment="CENTER" />
                 </ScrollPane>
@@ -95,6 +96,6 @@
     </content>
     <header>
     </header>
-    <ButtonType fx:id="copyVersionButton" text="%Copy Version" />
+    <ButtonType fx:id="copyVersionButton" text="%Copy Version" buttonData="LEFT"/>
     <ButtonType fx:constant="CLOSE" />
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java
index a977446f7b7..5fbb6f857c7 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogView.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java
@@ -28,6 +28,7 @@ public class AboutDialogView extends BaseDialog<Void> {
 
     public AboutDialogView() {
         this.setTitle(Localization.lang("About JabRef"));
+        this.setResizable(true);
 
         ViewLoader.view(this)
                   .load()
@@ -36,6 +37,10 @@ public AboutDialogView() {
         ControlHelper.setAction(copyVersionButton, getDialogPane(), event -> copyVersionToClipboard());
     }
 
+    public AboutDialogViewModel getViewModel() {
+        return viewModel;
+    }
+
     @FXML
     private void initialize() {
         viewModel = new AboutDialogViewModel(dialogService, clipBoardManager, buildInfo);

From 89f855d76713b4cd25ac0830c719cd61c511851e Mon Sep 17 00:00:00 2001
From: Nick <nick.s.weatherley@protonmail.com>
Date: Mon, 30 Jul 2018 16:06:07 +0000
Subject: [PATCH 018/229] Fix importer vulnerability (#4240)

* Fix importer vulnerability
Fixed issue #4229  where importer was vulnerable to XXE attacks by
disabling DTDs along with adding warning to logger if features are
unavailable. fixes #4229

* Fix minor code errors and logger optimization
Removed author line in class comment. Reworded CHANGLOG.md. Set
DTD features to individual final static constants. Optimized
logger by parameterizing feature and error.

* Rearrange import statments for project compatibility

* Remove merge artefacts from changelog
---
 CHANGELOG.md                                  |  3 +-
 .../importer/fileformat/MsBibImporter.java    | 38 +++++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36ef46b88be..eac14594f4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,7 +60,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where the "Convert to BibTeX-Cleanup" moved the content of the `file` field to the `pdf` field [#4120](https://github.com/JabRef/jabref/issues/4120)
 - We fixed an issue where the preview pane in entry preview in preferences wasn't showing the citation style selected [#3849](https://github.com/JabRef/jabref/issues/3849)
 - We fixed an issue where the default entry preview style still contained the field `review`. The field `review` in the style is now replaced with comment to be consistent with the entry editor [#4098](https://github.com/JabRef/jabref/issues/4098)
-- We fixed an issue where filles added via the "Attach file" contextmenu of an entry were not made relative. [#4201](https://github.com/JabRef/jabref/issues/4201)
+- We fixed an issue where users were vulnerable to XXE attacks during parsing [#4229](https://github.com/JabRef/jabref/issues/4229)
+- We fixed an issue where files added via the "Attach file" contextmenu of an entry were not made relative. [#4201](https://github.com/JabRef/jabref/issues/4201)
 
 
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
index 500cec32b63..db68e7958b7 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
@@ -6,12 +6,15 @@
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.msbib.MSBibDatabase;
 import org.jabref.logic.util.StandardFileType;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
@@ -20,24 +23,27 @@
 
 /**
  * Importer for the MS Office 2007 XML bibliography format
- * By S. M. Mahbub Murshed
  *
  * ...
  */
 public class MsBibImporter extends Importer {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(MsBibImporter.class);
+    private static final String DISABLEDTD = "http://apache.org/xml/features/disallow-doctype-decl";
+    private static final String DISABLEEXTERNALDTD = "http://apache.org/xml/features/nonvalidating/load-external-dtd";
+
     @Override
     public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
 
         /*
-            The correct behaviour is to return false if it is certain that the file is
+            The correct behavior is to return false if it is certain that the file is
             not of the MsBib type, and true otherwise. Returning true is the safe choice
             if not certain.
          */
         Document docin;
         try {
-            DocumentBuilder dbuild = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+            DocumentBuilder dbuild = makeSafeDocBuilderFactory(DocumentBuilderFactory.newInstance()).newDocumentBuilder();
             dbuild.setErrorHandler(new ErrorHandler() {
 
                 @Override
@@ -55,6 +61,7 @@ public void error(SAXParseException exception) throws SAXException {
                     throw exception;
                 }
             });
+
             docin = dbuild.parse(new InputSource(reader));
         } catch (Exception e) {
             return false;
@@ -85,4 +92,29 @@ public String getDescription() {
         return "Importer for the MS Office 2007 XML bibliography format.";
     }
 
+    /**
+     * DocumentBuilderFactory makes a XXE safe Builder factory from dBuild. If not supported by current
+     * XML then returns original builder given and logs error.
+     * @param dBuild | DocumentBuilderFactory to be made XXE safe.
+     * @return If supported, XXE safe DocumentBuilderFactory. Else, returns original builder given
+     */
+    private DocumentBuilderFactory makeSafeDocBuilderFactory(DocumentBuilderFactory dBuild) {
+        String feature = null;
+
+        try {
+            feature = DISABLEDTD;
+            dBuild.setFeature(feature, true);
+
+            feature = DISABLEEXTERNALDTD;
+            dBuild.setFeature(feature, false);
+
+            dBuild.setXIncludeAware(false);
+            dBuild.setExpandEntityReferences(false);
+
+        } catch (ParserConfigurationException e) {
+            LOGGER.warn("Builder not fully configured. Feature:'{}' is probably not supported by current XML processor. {}", feature, e);
+        }
+
+        return dBuild;
+    }
 }

From f3c8afd9dad654a6fd470d93124a0a16da759ad3 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 1 Aug 2018 22:07:36 +0200
Subject: [PATCH 019/229] Rename flatButton to icon-button

---
 src/main/java/org/jabref/gui/Base.css         | 72 +++++++++----------
 .../org/jabref/gui/actions/ActionFactory.java |  4 +-
 .../gui/documentviewer/DocumentViewer.fxml    | 18 ++---
 .../jabref/gui/entryeditor/EntryEditor.css    |  6 +-
 .../jabref/gui/entryeditor/EntryEditor.fxml   | 12 ++--
 .../fileannotationtab/FileAnnotationTab.fxml  |  2 +-
 .../gui/fieldeditors/BibtexKeyEditor.fxml     |  2 +-
 .../gui/fieldeditors/IdentifierEditor.fxml    |  6 +-
 .../gui/fieldeditors/JournalEditor.fxml       |  2 +-
 .../gui/fieldeditors/LinkedFilesEditor.fxml   |  6 +-
 .../gui/fieldeditors/LinkedFilesEditor.java   |  4 +-
 .../jabref/gui/fieldeditors/OwnerEditor.fxml  |  2 +-
 .../jabref/gui/fieldeditors/UrlEditor.fxml    |  2 +-
 .../java/org/jabref/gui/groups/GroupTree.fxml |  2 +-
 .../java/org/jabref/gui/icon/IconTheme.java   |  4 +-
 .../org/jabref/gui/util/component/Tag.fxml    |  2 +-
 16 files changed, 71 insertions(+), 75 deletions(-)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 354985a4d07..c8f64693ba5 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -282,44 +282,6 @@
     -fx-font-family: monospace;
 }
 
-.flatButtonNoSpaceBottom,
-.flatButtonNoSpaceTop,
-.flatButton {
-    -fx-shadow-highlight-color: black;
-    -fx-outer-border: red;
-    -fx-inner-border: purple;
-    -fx-faint-focus-color: transparent;
-    -fx-background-color: -jr-icon-background;
-    -fx-text-background-color: blue;
-    -fx-padding: 0.5em;
-}
-
-.flatButtonNoSpaceBottom:hover,
-.flatButtonNoSpaceTop:hover,
-.flatButton:hover {
-    -fx-background-color: -jr-icon-background-active;
-}
-
-.flatButtonNoSpaceBottom:armed,
-.flatButtonNoSpaceTop:armed,
-.flatButton:armed {
-    -fx-background-color: -jr-icon-background-armed;
-}
-
-.flatButton:selected {
-    -fx-background-color: -jr-icon-background-active;
-    -fx-text-fill: white;
-    -fx-fill: white;
-}
-
-.flatButtonNoSpaceBottom {
-    -fx-padding: 0.5em 0.5em -0.1em 0.5em;
-}
-
-.flatButtonNoSpaceTop {
-    -fx-padding: -0.1em 0.5em 0.5em 0.5em;
-}
-
 .button,
 .toggle-button,
 .radio-button > .radio,
@@ -374,6 +336,40 @@
     -fx-border-color: -jr-accent;
 }
 
+.icon-buttonNoSpaceBottom,
+.icon-buttonNoSpaceTop,
+.icon-button {
+    -fx-border-width: 0px;
+    -fx-background-color: -jr-icon-background;
+    -fx-padding: 0.5em;
+}
+
+.icon-buttonNoSpaceBottom:hover,
+.icon-buttonNoSpaceTop:hover,
+.icon-button:hover {
+    -fx-background-color: -jr-icon-background-active;
+}
+
+.icon-buttonNoSpaceBottom:armed,
+.icon-buttonNoSpaceTop:armed,
+.icon-button:armed {
+    -fx-background-color: -jr-icon-background-armed;
+}
+
+.icon-button:selected {
+    -fx-background-color: -jr-icon-background-active;
+    -fx-text-fill: white;
+    -fx-fill: white;
+}
+
+.icon-buttonNoSpaceBottom {
+    -fx-padding: 0.5em 0.5em -0.1em 0.5em;
+}
+
+.icon-buttonNoSpaceTop {
+    -fx-padding: -0.1em 0.5em 0.5em 0.5em;
+}
+
 .menu-bar {
     -fx-background-color: -jr-menu-background;
     -fx-background-insets: 0;
diff --git a/src/main/java/org/jabref/gui/actions/ActionFactory.java b/src/main/java/org/jabref/gui/actions/ActionFactory.java
index a8337564b0f..51c77f1f8d2 100644
--- a/src/main/java/org/jabref/gui/actions/ActionFactory.java
+++ b/src/main/java/org/jabref/gui/actions/ActionFactory.java
@@ -60,7 +60,7 @@ public Menu createSubMenu(Action action, MenuItem... children) {
     public Button createIconButton(Action action, Command command) {
         Button button = ActionUtils.createButton(new JabRefAction(action, command, keyBindingRepository), ActionUtils.ActionTextBehavior.HIDE);
 
-        button.getStyleClass().setAll("flatButton");
+        button.getStyleClass().setAll("icon-button");
 
         // For some reason the graphic is not set correctly, so let's fix this
         button.graphicProperty().unbind();
@@ -75,7 +75,7 @@ public ButtonBase configureIconButton(Action action, Command command, ButtonBase
                 button,
                 ActionUtils.ActionTextBehavior.HIDE);
 
-        button.getStyleClass().add("flatButton");
+        button.getStyleClass().add("icon-button");
 
         // For some reason the graphic is not set correctly, so let's fix this
         button.graphicProperty().unbind();
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml b/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml
index ef5fe970736..2e4a18cdc04 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml
@@ -23,15 +23,15 @@
             </fx:define>
             <top>
                 <ToolBar fx:id="topPane" BorderPane.alignment="CENTER_RIGHT">
-                    <ComboBox fx:id="fileChoice" minWidth="200.0" styleClass="flatButton"/>
+                    <ComboBox fx:id="fileChoice" minWidth="200.0" styleClass="icon-button"/>
                     <HBox alignment="CENTER_RIGHT" spacing="10.0" HBox.hgrow="ALWAYS">
-                        <ToggleButton fx:id="modeLive" mnemonicParsing="false" selected="true" styleClass="flatButton"
+                        <ToggleButton fx:id="modeLive" mnemonicParsing="false" selected="true" styleClass="icon-button"
                                       text="%Live" toggleGroup="$toggleGroupMode">
                             <tooltip>
                                 <Tooltip text="%Show the document of the currently selected entry."/>
                             </tooltip>
                         </ToggleButton>
-                        <ToggleButton mnemonicParsing="false" styleClass="flatButton" text="%Locked"
+                        <ToggleButton mnemonicParsing="false" styleClass="icon-button" text="%Locked"
                                       toggleGroup="$toggleGroupMode">
                             <tooltip>
                                 <Tooltip text="%Show this document until unlocked."/>
@@ -46,7 +46,7 @@
             <bottom>
                 <ToolBar>
                     <HBox alignment="CENTER" spacing="5.0" HBox.hgrow="ALWAYS">
-                        <Button onAction="#previousPage" styleClass="flatButton">
+                        <Button onAction="#previousPage" styleClass="icon-button">
                             <graphic>
                                 <JabRefIconView glyph="PREVIOUS_LEFT"/>
                             </graphic>
@@ -57,7 +57,7 @@
                         <TextField fx:id="currentPage" minWidth="30.0" prefWidth="40.0"/>
                         <Label text="of"/>
                         <Label fx:id="maxPages"/>
-                        <Button onAction="#nextPage" styleClass="flatButton">
+                        <Button onAction="#nextPage" styleClass="icon-button">
                             <graphic>
                                 <JabRefIconView glyph="NEXT_RIGHT"/>
                             </graphic>
@@ -67,7 +67,7 @@
                         </Button>
                     </HBox>
                     <HBox fx:id="zoomBar" alignment="CENTER_RIGHT">
-                        <Button styleClass="flatButton" onAction="#fitWidth">
+                        <Button styleClass="icon-button" onAction="#fitWidth">
                             <graphic>
                                 <JabRefIconView glyph="FIT_WIDTH"/>
                             </graphic>
@@ -75,7 +75,7 @@
                                 <Tooltip text="%Fit width"/>
                             </tooltip>
                         </Button>
-                        <Button styleClass="flatButton" onAction="#fitSinglePage">
+                        <Button styleClass="icon-button" onAction="#fitSinglePage">
                             <graphic>
                                 <JabRefIconView glyph="FIT_SINGLE_PAGE"/>
                             </graphic>
@@ -83,7 +83,7 @@
                                 <Tooltip text="%Fit a single page"/>
                             </tooltip>
                         </Button>
-                        <Button styleClass="flatButton" onAction="#zoomOut">
+                        <Button styleClass="icon-button" onAction="#zoomOut">
                             <graphic>
                                 <JabRefIconView glyph="ZOOM_OUT"/>
                             </graphic>
@@ -91,7 +91,7 @@
                                 <Tooltip text="%Zoom out"/>
                             </tooltip>
                         </Button>
-                        <Button styleClass="flatButton" onAction="#zoomIn">
+                        <Button styleClass="icon-button" onAction="#zoomIn">
                             <graphic>
                                 <JabRefIconView glyph="ZOOM_IN"/>
                             </graphic>
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css
index 0889cccb90a..47eefbdde49 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css
@@ -31,15 +31,15 @@
     -fx-background-color: -jr-icon-background-active;
 }
 
-.flatButton.narrow {
+.icon-button.narrow {
     -fx-padding: 0.1em;
 }
 
-.flatButtonNoSpaceBottom.narrow {
+.icon-buttonNoSpaceBottom.narrow {
     -fx-padding: 0.1em 0.1em -0.2em 0.1em;
 }
 
-.flatButtonNoSpaceTop.narrow {
+.icon-buttonNoSpaceTop.narrow {
     -fx-padding: -0.2em 0.1em 0.1em 0.1em;
 }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml
index b9537eab2b5..c31e177399e 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml
@@ -15,7 +15,7 @@
          fx:controller="org.jabref.gui.entryeditor.EntryEditor">
     <left>
         <ToolBar orientation="VERTICAL">
-            <Button styleClass="flatButton,narrow" onAction="#close">
+            <Button styleClass="icon-button,narrow" onAction="#close">
                 <graphic>
                     <JabRefIconView glyph="CLOSE"/>
                 </graphic>
@@ -32,7 +32,7 @@
                 </Label>
             </Group>
             <Pane prefHeight="10" VBox.vgrow="ALWAYS"/>
-            <Button fx:id="typeChangeButton" styleClass="flatButton,narrow">
+            <Button fx:id="typeChangeButton" styleClass="icon-button,narrow">
                 <graphic>
                     <JabRefIconView glyph="ENTRY_TYPE"/>
                 </graphic>
@@ -41,7 +41,7 @@
                 </tooltip>
             </Button>
             <Button fx:id="generateCiteKeyButton" styleClass="narrow"/>
-            <Button fx:id="fetcherButton" styleClass="flatButton,narrow">
+            <Button fx:id="fetcherButton" styleClass="icon-button,narrow">
                 <graphic>
                     <JabRefIconView glyph="REFRESH"/>
                 </graphic>
@@ -49,7 +49,7 @@
                     <Tooltip text="%Update with bibliographic information from the web"/>
                 </tooltip>
             </Button>
-            <Button styleClass="flatButton,narrow" onAction="#deleteEntry">
+            <Button styleClass="icon-button,narrow" onAction="#deleteEntry">
                 <graphic>
                     <JabRefIconView glyph="DELETE_ENTRY"/>
                 </graphic>
@@ -58,7 +58,7 @@
                 </tooltip>
             </Button>
             <Separator/>
-            <Button styleClass="flatButtonNoSpaceBottom,narrow" onAction="#navigateToPreviousEntry">
+            <Button styleClass="icon-buttonNoSpaceBottom,narrow" onAction="#navigateToPreviousEntry">
                 <graphic>
                     <JabRefIconView glyph="PREVIOUS_UP"/>
                 </graphic>
@@ -66,7 +66,7 @@
                     <Tooltip text="%Previous entry"/>
                 </tooltip>
             </Button>
-            <Button styleClass="flatButtonNoSpaceTop,narrow" onAction="#navigateToNextEntry">
+            <Button styleClass="icon-buttonNoSpaceTop,narrow" onAction="#navigateToNextEntry">
                 <graphic>
                     <JabRefIconView glyph="NEXT_DOWN"/>
                 </graphic>
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml
index 104674c302e..9d51b2a4cc8 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.fxml
@@ -35,7 +35,7 @@
                 <HBox>
                     <Label fx:id="author" />
                     <Pane HBox.hgrow="ALWAYS" />
-                    <Button onAction="#copy" styleClass="flatButton">
+                    <Button onAction="#copy" styleClass="icon-button">
                         <graphic>
                             <JabRefIconView glyph="COPY"/>
                         </graphic>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
index 9bd4a11837c..211549c7ac5 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
@@ -6,5 +6,5 @@
 <fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112"
          fx:controller="org.jabref.gui.fieldeditors.BibtexKeyEditor">
     <EditorTextArea fx:id="textArea" prefHeight="0.0" HBox.hgrow="ALWAYS"/>
-    <Button fx:id="generateCiteKeyButton" styleClass="flatButton"/>
+    <Button fx:id="generateCiteKeyButton" styleClass="icon-button"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml
index da1c53e18ef..e7b03ca283e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.fxml
@@ -11,7 +11,7 @@
          fx:controller="org.jabref.gui.fieldeditors.IdentifierEditor">
     <EditorTextArea fx:id="textArea" prefHeight="0.0" HBox.hgrow="ALWAYS"/>
     <Button disable="${controller.viewModel.validIdentifierIsNotPresent}" onAction="#openExternalLink"
-            styleClass="flatButton">
+            styleClass="icon-button">
         <graphic>
             <JabRefIconView glyph="OPEN_LINK"/>
         </graphic>
@@ -19,7 +19,7 @@
             <Tooltip text="%Open" />
         </tooltip>
     </Button>
-    <Button fx:id="lookupIdentifierButton" onAction="#lookupIdentifier" styleClass="flatButton"
+    <Button fx:id="lookupIdentifierButton" onAction="#lookupIdentifier" styleClass="icon-button"
             visible="${controller.viewModel.idFetcherAvailable}" managed="${controller.viewModel.idFetcherAvailable}">
         <graphic>
             <StackPane>
@@ -32,7 +32,7 @@
     </Button>
     <Button fx:id="fetchInformationByIdentifierButton" disable="${controller.viewModel.validIdentifierIsNotPresent}"
             onAction="#fetchInformationByIdentifier"
-            styleClass="flatButton">
+            styleClass="icon-button">
         <graphic>
             <JabRefIconView glyph="FETCH_BY_IDENTIFIER"/>
         </graphic>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
index a678a7778c5..a2d74f56609 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
@@ -9,7 +9,7 @@
          fx:controller="org.jabref.gui.fieldeditors.JournalEditor">
     <EditorTextArea fx:id="textArea" prefHeight="0.0" HBox.hgrow="ALWAYS"/>
     <Button onAction="#toggleAbbreviation"
-            styleClass="flatButton">
+            styleClass="icon-button">
         <graphic>
             <JabRefIconView glyph="TOGGLE_ABBREVIATION"/>
         </graphic>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml
index 10717b120c5..a0d6fd60f6d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml
@@ -11,7 +11,7 @@
          fx:controller="org.jabref.gui.fieldeditors.LinkedFilesEditor">
     <ListView fx:id="listView" prefHeight="0" HBox.hgrow="ALWAYS" maxHeight="100"/>
     <Button onAction="#addNewFile"
-            styleClass="flatButton">
+            styleClass="icon-button">
         <graphic>
             <JabRefIconView glyph="NEW_FILE"/>
         </graphic>
@@ -19,7 +19,7 @@
             <Tooltip text="%Open"/>
         </tooltip>
     </Button>
-    <Button onAction="#fetchFulltext" styleClass="flatButton">
+    <Button onAction="#fetchFulltext" styleClass="icon-button">
         <graphic>
             <StackPane>
                 <JabRefIconView glyph="FETCH_FULLTEXT"
@@ -34,7 +34,7 @@
     </Button>
     <Button
             onAction="#addFromURL"
-            styleClass="flatButton">
+            styleClass="icon-button">
         <graphic>
             <JabRefIconView glyph="DOWNLOAD"/>
         </graphic>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
index 153caee75a1..d72f99ae657 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
@@ -172,13 +172,13 @@ private static Node createFileDisplay(LinkedFileViewModel linkedFile) {
         acceptAutoLinkedFile.setTooltip(new Tooltip(Localization.lang("This file was found automatically. Do you want to link it to this entry?")));
         acceptAutoLinkedFile.visibleProperty().bind(linkedFile.isAutomaticallyFoundProperty());
         acceptAutoLinkedFile.setOnAction(event -> linkedFile.acceptAsLinked());
-        acceptAutoLinkedFile.getStyleClass().setAll("flatButton");
+        acceptAutoLinkedFile.getStyleClass().setAll("icon-button");
 
         Button writeXMPMetadata = MaterialDesignIconFactory.get().createIconButton(MaterialDesignIcon.IMPORT);
         writeXMPMetadata.setTooltip(new Tooltip(Localization.lang("Write BibTeXEntry as XMP-metadata to PDF.")));
         writeXMPMetadata.visibleProperty().bind(linkedFile.canWriteXMPMetadataProperty());
         writeXMPMetadata.setOnAction(event -> linkedFile.writeXMPMetadata());
-        writeXMPMetadata.getStyleClass().setAll("flatButton");
+        writeXMPMetadata.getStyleClass().setAll("icon-button");
 
         HBox container = new HBox(10);
         container.setPrefHeight(Double.NEGATIVE_INFINITY);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml
index 30691598a17..87b4ead077c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.fxml
@@ -9,7 +9,7 @@
          fx:controller="org.jabref.gui.fieldeditors.OwnerEditor">
     <EditorTextArea fx:id="textArea" prefHeight="0.0" HBox.hgrow="ALWAYS"/>
     <Button onAction="#setOwner"
-            styleClass="flatButton">
+            styleClass="icon-button">
         <graphic>
             <JabRefIconView glyph="OWNER"/>
         </graphic>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml
index d61c333df0a..34194ff6c48 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.fxml
@@ -9,7 +9,7 @@
          fx:controller="org.jabref.gui.fieldeditors.UrlEditor">
     <EditorTextArea fx:id="textArea" prefHeight="0.0" HBox.hgrow="ALWAYS"/>
     <Button disable="${controller.viewModel.validUrlIsNotPresent}" onAction="#openExternalLink"
-            styleClass="flatButton">
+            styleClass="icon-button">
         <graphic>
             <JabRefIconView glyph="OPEN_LINK"/>
         </graphic>
diff --git a/src/main/java/org/jabref/gui/groups/GroupTree.fxml b/src/main/java/org/jabref/gui/groups/GroupTree.fxml
index 0c129da4e52..583d5c1cea1 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTree.fxml
+++ b/src/main/java/org/jabref/gui/groups/GroupTree.fxml
@@ -30,7 +30,7 @@
         <HBox fx:id="barBottom" alignment="CENTER">
             <ButtonBar fx:id="buttonBarBottom">
                 <buttons>
-                    <Button fx:id="newGroupButton" onAction="#addNewGroup" styleClass="flatButton"
+                    <Button fx:id="newGroupButton" onAction="#addNewGroup" styleClass="icon-button"
                             ButtonBar.buttonData="LEFT">
                         <graphic>
                             <JabRefIconView glyph="NEW_GROUP" glyphSize="18"/>
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 0f9e4214e4e..1191180aae7 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -362,14 +362,14 @@ public String fontFamily() {
         public Button asButton() {
             Button button = new Button();
             button.setGraphic(getGraphicNode());
-            button.getStyleClass().add("flatButton");
+            button.getStyleClass().add("icon-button");
             return button;
         }
 
         public ToggleButton asToggleButton() {
             ToggleButton button = new ToggleButton();
             button.setGraphic(getGraphicNode());
-            button.getStyleClass().add("flatButton");
+            button.getStyleClass().add("icon-button");
             return button;
         }
     }
diff --git a/src/main/java/org/jabref/gui/util/component/Tag.fxml b/src/main/java/org/jabref/gui/util/component/Tag.fxml
index b5543ec89eb..847c44e4060 100644
--- a/src/main/java/org/jabref/gui/util/component/Tag.fxml
+++ b/src/main/java/org/jabref/gui/util/component/Tag.fxml
@@ -14,7 +14,7 @@
         </HBox.margin>
     </Label>
     <Button
-            styleClass="flatButton"
+            styleClass="icon-button"
             onAction="#removeButtonClicked">
         <graphic>
             <JabRefIconView glyph="CLOSE"/>

From 611ac556408b23ce9426a290e83c7375a480a989 Mon Sep 17 00:00:00 2001
From: Li Yiming <upupming@gmail.com>
Date: Fri, 3 Aug 2018 18:06:58 +0800
Subject: [PATCH 020/229] Solved #3823 File annotation (#4246)

* Solved #3823 File annotation: delete hyphens and new lines & wrap summary

* Fixed: l10n for remove line breaks

* Fixed: final variable name

* Revert "Fixed: l10n for remove line breaks"

This reverts commit ae2956b7610ed1e0a5e4f9bdbf1b56debb2b8b93.

* Fixed: revert changed formatter & wrap marking tooltip

* Added: test for FileAnnotation

* Fixed: keep newline&hyphen formatter using `\R`
---
 CHANGELOG.md                                  |  3 +-
 .../FileAnnotationTabView.java                | 11 +++++-
 .../FileAnnotationViewModel.java              |  9 ++++-
 .../RemoveHyphenatedNewlinesFormatter.java    |  2 +-
 .../bibtexfields/RemoveNewlinesFormatter.java |  2 +-
 src/main/resources/l10n/JabRef_zh.properties  |  1 +
 .../FileAnnotationViewModelTest.java          | 37 +++++++++++++++++++
 ...RemoveHyphenatedNewlinesFormatterTest.java |  6 +++
 .../RemoveNewlinesFormatterTest.java          |  6 +++
 9 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eac14594f4e..1f5e07e9e7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,8 +25,9 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We changed the default keyboard shortcuts for moving between entries when the entry editor is active to ̀<kbd>alt</kbd> + <kbd>up/down</kbd>.
 - Opening a new file now prompts the directory of the currently selected file, instead of the directory of the last opened file.
 - Window state is saved on close and restored on start.
-- Files without a defined external file type are now directly opened with the default aplication of the operating system
+- Files without a defined external file type are now directly opened with the default application of the operating system
 - We streamlined the process to rename and move files by removing the confirmation dialogs.
+- We removed the redundant new lines of markings and wrapped the summary in the File annotation tab. [#3823](https://github.com/JabRef/jabref/issues/3823)
 
 
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
index f49edc1ace6..b95b1d36596 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
@@ -15,6 +15,7 @@
 import javafx.scene.control.ListView;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TextArea;
+import javafx.scene.control.Tooltip;
 import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.VBox;
@@ -63,7 +64,6 @@ public void initialize() {
         annotationList.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         annotationList.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> viewModel.notifyNewSelectedAnnotation(newValue));
         ViewModelListCellFactory<FileAnnotationViewModel> cellFactory = new ViewModelListCellFactory<FileAnnotationViewModel>()
-                .withTooltip(FileAnnotationViewModel::getMarking)
                 .withGraphic(this::createFileAnnotationNode);
         annotationList.setCellFactory(cellFactory);
         annotationList.setPlaceholder(new Label(Localization.lang("File has no attached annotations")));
@@ -94,12 +94,19 @@ private Node createFileAnnotationNode(FileAnnotationViewModel annotation) {
         Label date = new Label(annotation.getDate());
         Label page = new Label(Localization.lang("Page") + ": " + annotation.getPage());
 
-        marking.setStyle("-fx-font-weight: bold");
+        marking.setStyle("-fx-font-size: 0.75em; -fx-font-weight: bold");
         marking.setMaxHeight(30);
 
+        Tooltip markingTooltip = new Tooltip(annotation.getMarking());
+        markingTooltip.setMaxWidth(800);
+        markingTooltip.setWrapText(true);
+        marking.setTooltip(markingTooltip);
+
         // add alignment for text in the list
         marking.setTextAlignment(TextAlignment.LEFT);
         marking.setAlignment(Pos.TOP_LEFT);
+        marking.setMaxWidth(500);
+        marking.setWrapText(true);
         author.setTextAlignment(TextAlignment.LEFT);
         author.setAlignment(Pos.TOP_LEFT);
         date.setTextAlignment(TextAlignment.RIGHT);
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
index 85ae94d5b42..6f90512195a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
@@ -11,6 +11,7 @@
 
 public class FileAnnotationViewModel {
 
+    private static final String NEWLINE = String.format("%n");
     private final FileAnnotation annotation;
     private StringProperty author = new SimpleStringProperty();
     private StringProperty page = new SimpleStringProperty();
@@ -31,7 +32,13 @@ private void setupContentProperties(FileAnnotation annotation) {
             this.content.set(annotation.getLinkedFileAnnotation().getContent());
             String annotationContent = annotation.getContent();
             String illegibleTextMessage = Localization.lang("The marked area does not contain any legible text!");
-            this.marking.set(annotationContent.isEmpty() ? illegibleTextMessage : annotationContent);
+            String markingContent = (annotationContent.isEmpty() ? illegibleTextMessage : annotationContent);
+            // remove newlines && hyphens before linebreaks
+            markingContent = markingContent.replaceAll("-" + NEWLINE, "");
+            new RemoveHyphenatedNewlinesFormatter().format(markingContent);
+            // remove new lines not preceded by '.' or ':'
+            markingContent = markingContent.replaceAll("(?<![.|:])" + NEWLINE, " ");
+            this.marking.set(markingContent);
         } else {
             String content = annotation.getContent();
             // remove newlines && hyphens before linebreaks
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java
index 2356c02cab0..c05786154cc 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java
@@ -10,7 +10,7 @@
  * Removes all hyphenated line breaks in the string.
  */
 public class RemoveHyphenatedNewlinesFormatter extends Formatter {
-    private static final Pattern HYPHENATED_WORDS = Pattern.compile("(-\r\n|-\n|-\r)");
+    private static final Pattern HYPHENATED_WORDS = Pattern.compile("-\\R");
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java
index c6942bf51ea..b4a8dabc04f 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java
@@ -10,7 +10,7 @@
  * Removes all line breaks in the string.
  */
 public class RemoveNewlinesFormatter extends Formatter {
-    private static final Pattern LINEBREAKS = Pattern.compile("(\r?\n|\r)");
+    private static final Pattern LINEBREAKS = Pattern.compile("\\R");
 
     @Override
     public String getName() {
diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
index 0cefa1dd0a5..52fd0017aa7 100644
--- a/src/main/resources/l10n/JabRef_zh.properties
+++ b/src/main/resources/l10n/JabRef_zh.properties
@@ -1914,3 +1914,4 @@ View\ event\ log=查看事件日志
 Website=网站
 Write\ XMP-metadata\ to\ PDFs=将 XMP 元数据写入到 PDF 中
 
+Removes\ all\ line\ breaks\ in\ the\ field\ content.=删除字段内容中所有的换行。
\ No newline at end of file
diff --git a/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java b/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
new file mode 100644
index 00000000000..57279df9b55
--- /dev/null
+++ b/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
@@ -0,0 +1,37 @@
+package org.jabref.gui.entryeditor.fileannotationtab;
+
+import java.time.LocalDateTime;
+import java.util.Optional;
+
+import org.jabref.model.pdf.FileAnnotation;
+import org.jabref.model.pdf.FileAnnotationType;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class FileAnnotationViewModelTest {
+
+    @Test
+    public void removeOnlyLineBreaksNotPrecededByPeriodOrColon() {
+        String content = "This is content";
+        String marking = String.format("This is paragraph 1.%n" +
+                                       "This is paragr-%naph 2, and it crosses%nseveral lines,%nnow you can see next paragraph:%n"
+                                       + "This is paragraph%n3.");
+
+        FileAnnotation linkedFileAnnotation = new FileAnnotation("John", LocalDateTime.now(), 3, content, FileAnnotationType.FREETEXT, Optional.empty());
+        FileAnnotation annotation = new FileAnnotation("Jaroslav Kucha ˇr", LocalDateTime.parse("2017-07-20T10:11:30"), 1, marking, FileAnnotationType.HIGHLIGHT, Optional.of(linkedFileAnnotation));
+
+        FileAnnotationViewModel annotationViewModel = new FileAnnotationViewModel(annotation);
+
+        assertEquals("Jaroslav Kucha ˇr", annotationViewModel.getAuthor());
+        assertEquals(1, annotation.getPage());
+        assertEquals("2017-07-20 10:11:30", annotationViewModel.getDate());
+        assertEquals("This is content", annotationViewModel.getContent());
+
+        assertEquals(String.format("This is paragraph 1.%n" +
+                                   "This is paragraph 2, and it crosses several lines, now you can see next paragraph:%n"
+                                   + "This is paragraph 3."),
+                     annotationViewModel.getMarking());
+    }
+}
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java
index 207dc06b38b..86a65ceef0e 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java
@@ -19,4 +19,10 @@ public void removeHyphensBeforeNewlines() {
         assertEquals("water", formatter.format("wa-\r\nter"));
         assertEquals("water", formatter.format("wa-\rter"));
     }
+
+    @Test
+    public void removeHyphensBeforePlatformSpecificNewlines() {
+        String newLine = String.format("%n");
+        assertEquals("water", formatter.format("wa-" + newLine + "ter"));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java
index 96de03b1456..6bbc60e0154 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java
@@ -29,4 +29,10 @@ public void removeCarriageReturn() {
     public void removeLineFeed() {
         assertEquals("n linebreak", formatter.format("n\nlinebreak"));
     }
+
+    @Test
+    public void removePlatformSpecificNewLine() {
+        String newLine = String.format("%n");
+        assertEquals("linebreak on current platform", formatter.format("linebreak on" + newLine + "current platform"));
+    }
 }

From d4f00adc81898061c56db72bd19c406029be22e1 Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Tue, 7 Aug 2018 20:24:50 +0800
Subject: [PATCH 021/229] ReplaceStringMVVMPattern

---
 .../java/org/jabref/gui/ReplaceString.fxml    | 12 ++---
 .../org/jabref/gui/ReplaceStringView.java     | 48 ++++++-----------
 .../jabref/gui/ReplaceStringViewModel.java    | 51 ++++++++++++++-----
 3 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/src/main/java/org/jabref/gui/ReplaceString.fxml b/src/main/java/org/jabref/gui/ReplaceString.fxml
index b44b13b6268..6641a64c071 100644
--- a/src/main/java/org/jabref/gui/ReplaceString.fxml
+++ b/src/main/java/org/jabref/gui/ReplaceString.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.*?>
 
 <DialogPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8"
-            fx:controller="org.jabref.gui.ReplaceStringView" fx:id="pane">
+            fx:controller="org.jabref.gui.ReplaceStringView">
     <content>
         <BorderPane>
             <center>
@@ -35,16 +35,16 @@
                             <Label text="Replace With:" GridPane.columnIndex="0" GridPane.rowIndex="2"/>
                             <TextField fx:id="replaceField" GridPane.columnIndex="1" GridPane.rowIndex="2"
                                        GridPane.columnSpan="4"/>
-                            <CheckBox GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.columnSpan="2"
-                                      onAction="#selectOnly" text="Limit to Selected Entries"/>
-                            <RadioButton GridPane.columnIndex="0" GridPane.rowIndex="5" GridPane.columnSpan="2"
-                                         onAction="#radioAll" selected="true" text="All Field Replace">
+                            <CheckBox fx:id="selectFieldOnly" GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.columnSpan="2"
+                                     text="Limit to Selected Entries"/>
+                            <RadioButton fx:id="allReplace" GridPane.columnIndex="0" GridPane.rowIndex="5" GridPane.columnSpan="2"
+                                         selected="true" text="All Field Replace">
                                 <toggleGroup>
                                     <ToggleGroup fx:id="radioGroup"/>
                                 </toggleGroup>
                             </RadioButton>
                             <RadioButton GridPane.columnIndex="0" GridPane.rowIndex="6" GridPane.columnSpan="2"
-                                         onAction="#radioLimit" text="Limit to Fields:" toggleGroup="$radioGroup"/>
+                                         text="Limit to Fields:" toggleGroup="$radioGroup"/>
                             <TextField fx:id="limitFieldInput" GridPane.columnIndex="2" GridPane.rowIndex="6"
                                        GridPane.columnSpan="3"/>
                         </GridPane>
diff --git a/src/main/java/org/jabref/gui/ReplaceStringView.java b/src/main/java/org/jabref/gui/ReplaceStringView.java
index 599a21cb0a4..08bcf5708b2 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringView.java
+++ b/src/main/java/org/jabref/gui/ReplaceStringView.java
@@ -2,9 +2,9 @@
 
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
-import javafx.scene.control.DialogPane;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
-import javafx.stage.Stage;
 
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
@@ -17,67 +17,49 @@
 public class ReplaceStringView extends BaseDialog<Void>
 {
 
+    @FXML private RadioButton allReplace;
+    @FXML private CheckBox selectFieldOnly;
     @FXML private ButtonType replaceButton;
     @FXML private TextField limitFieldInput;
     @FXML private TextField findField;
     @FXML private TextField replaceField;
-    @FXML private DialogPane pane;
 
-    private boolean allFieldReplace;
-    private boolean selOnly;
-    private BasePanel panel;
-    private Stage stage;
+    private ReplaceStringViewModel viewModel;
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
     public ReplaceStringView(BasePanel basePanel)  {
         this.setTitle(Localization.lang("Replace String"));
 
-        allFieldReplace = true;
-        selOnly = false;
-        panel = basePanel;
+        viewModel = new ReplaceStringViewModel(basePanel);
 
         ViewLoader.view(this)
                   .load()
                   .setAsDialogPane(this);
 
-        stage = (Stage) this.pane.getScene().getWindow();
         ControlHelper.setAction(replaceButton, getDialogPane(), event -> buttonReplace());
     }
 
     @FXML
     public void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
+
+        viewModel.getFindStringProperty().bind(findField.textProperty());
+        viewModel.getReplaceStringProperty().bind(replaceField.textProperty());
+        viewModel.getFieldStringProperty().bind(limitFieldInput.textProperty());
+        viewModel.selectOnlyProperty().bind(selectFieldOnly.selectedProperty());
+        viewModel.allFieldReplaceProperty().bind(allReplace.selectedProperty());
     }
 
     @FXML
-    public void buttonReplace() {
+    private void buttonReplace() {
         String findString = findField.getText();
-        String replaceString = replaceField.getText();
-        String[] fieldStrings = limitFieldInput.getText().toLowerCase().split(";");
         if ("".equals(findString))
         {
-            stage.close();
+            this.close();
             return;
         }
-        ReplaceStringViewModel viewModel = new ReplaceStringViewModel(panel, fieldStrings, findString, replaceString, selOnly, allFieldReplace);
         viewModel.replace();
-        stage.close();
-    }
-
-    @FXML
-    public void radioAll() {
-        allFieldReplace = true;
+        this.close();
     }
-
-    @FXML
-    public void radioLimit() {
-        allFieldReplace = false;
-    }
-
-    @FXML
-    public void selectOnly() {
-        selOnly = !selOnly;
-    }
-
 }
diff --git a/src/main/java/org/jabref/gui/ReplaceStringViewModel.java b/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
index db0d3950c3d..acde33ee620 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
+++ b/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
@@ -1,5 +1,10 @@
 package org.jabref.gui;
 
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.l10n.Localization;
@@ -8,38 +13,41 @@
 public class ReplaceStringViewModel extends AbstractViewModel
 {
     private boolean allFieldReplace;
-    private boolean selOnly;
     private String findString;
     private String replaceString;
     private String[] fieldStrings;
     private BasePanel panel;
 
-    public ReplaceStringViewModel(BasePanel basePanel, String[] fields, String find, String replace, Boolean selectedOnly, Boolean allFieldReplace)
+    private StringProperty findStringProperty = new SimpleStringProperty();
+    private StringProperty replaceStringProperty = new SimpleStringProperty();
+    private StringProperty fieldStringProperty = new SimpleStringProperty();
+    private BooleanProperty allFieldReplaceProperty = new SimpleBooleanProperty();
+    private BooleanProperty selectOnlyProperty = new SimpleBooleanProperty();
+
+
+    public ReplaceStringViewModel(BasePanel basePanel)
     {
         this.panel = basePanel;
-        this.fieldStrings = fields;
-        this.findString = find;
-        this.replaceString = replace;
-        this.selOnly = selectedOnly;
-        this.allFieldReplace = allFieldReplace;
     }
 
     public int replace() {
+        findString = findStringProperty.getValue();
+        replaceString = replaceStringProperty.getValue();
+        fieldStrings = fieldStringProperty.getValue().split(";");
+        boolean selOnly = selectOnlyProperty.getValue();
+        allFieldReplace = allFieldReplaceProperty.getValue();
+
         final NamedCompound compound = new NamedCompound(Localization.lang("Replace string"));
         int counter = 0;
         if (this.panel == null)
             return 0;
-        if (this.selOnly) {
+        if (selOnly) {
             for (BibEntry bibEntry: this.panel.getSelectedEntries())
-            {
                 counter += replaceItem(bibEntry, compound);
-            }
         }
         else {
             for (BibEntry bibEntry: this.panel.getDatabase().getEntries())
-            {
                 counter += replaceItem(bibEntry, compound);
-            }
         }
         return counter;
     }
@@ -87,4 +95,23 @@ private int replaceField(BibEntry entry, String fieldname, NamedCompound compoun
         return counter;
     }
 
+    public BooleanProperty allFieldReplaceProperty() {
+        return allFieldReplaceProperty;
+    }
+
+    public BooleanProperty selectOnlyProperty() {
+        return selectOnlyProperty;
+    }
+
+    public StringProperty getFieldStringProperty() {
+        return fieldStringProperty;
+    }
+
+    public StringProperty getFindStringProperty() {
+        return findStringProperty;
+    }
+
+    public StringProperty getReplaceStringProperty() {
+        return replaceStringProperty;
+    }
 }

From 7b93f26bbea63c3dcf97e34bc4a5c3a20716ed63 Mon Sep 17 00:00:00 2001
From: Li Zhilin <34236718+1160300208@users.noreply.github.com>
Date: Wed, 8 Aug 2018 03:11:06 +0800
Subject: [PATCH 022/229] Fix author list parser (#4169) (#4248)

* Fix author list parser (#4169)

* remove the additional changelog entry
---
 CHANGELOG.md                                                 | 2 +-
 src/main/java/org/jabref/model/entry/AuthorListParser.java   | 5 +++--
 .../java/org/jabref/model/entry/AuthorListParameterTest.java | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f5e07e9e7c..f72c6a7fdfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,7 +63,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where the default entry preview style still contained the field `review`. The field `review` in the style is now replaced with comment to be consistent with the entry editor [#4098](https://github.com/JabRef/jabref/issues/4098)
 - We fixed an issue where users were vulnerable to XXE attacks during parsing [#4229](https://github.com/JabRef/jabref/issues/4229)
 - We fixed an issue where files added via the "Attach file" contextmenu of an entry were not made relative. [#4201](https://github.com/JabRef/jabref/issues/4201)
-
+- We fixed an issue where author list parser can't generate bibtex for Chinese author. [#4169](https://github.com/JabRef/jabref/issues/4169)
 
 
 
diff --git a/src/main/java/org/jabref/model/entry/AuthorListParser.java b/src/main/java/org/jabref/model/entry/AuthorListParser.java
index bd9093b348c..5ebca30a8a0 100644
--- a/src/main/java/org/jabref/model/entry/AuthorListParser.java
+++ b/src/main/java/org/jabref/model/entry/AuthorListParser.java
@@ -264,7 +264,8 @@ private Optional<Author> getAuthor() {
                 false);
         String jrPart = jrPartStart < 0 ? null : concatTokens(tokens, jrPartStart, jrPartEnd, OFFSET_TOKEN, false);
 
-        if ((firstPart != null) && (lastPart != null) && lastPart.equals(lastPart.toUpperCase(Locale.ROOT)) && (lastPart.length() < 5)) {
+        if ((firstPart != null) && (lastPart != null) && lastPart.equals(lastPart.toUpperCase(Locale.ROOT)) && (lastPart.length() < 5)
+            && (Character.UnicodeScript.of(lastPart.charAt(0)) != Character.UnicodeScript.HAN)) {
             // The last part is a small string in complete upper case, so interpret it as initial of the first name
             // This is the case for example in "Smith SH" which we think of as lastname=Smith and firstname=SH
             // The length < 5 constraint should allow for "Smith S.H." as input
@@ -378,7 +379,7 @@ private int getToken() {
             }
             if (!firstLetterIsFound && (currentBackslash < 0) && Character.isLetter(c)) {
                 if (bracesLevel == 0) {
-                    tokenCase = Character.isUpperCase(c);
+                    tokenCase = Character.isUpperCase(c) || (Character.UnicodeScript.of(c) == Character.UnicodeScript.HAN);
                 } else {
                     // If this is a particle in braces, always treat it as if it starts with
                     // an upper case letter. Otherwise a name such as "{van den Bergen}, Hans"
diff --git a/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java b/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java
index 81409b32bcc..328c1c37905 100644
--- a/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java
@@ -25,6 +25,7 @@ public class AuthorListParameterTest {
     public static Collection<Object[]> data() {
 
         return Arrays.asList(new Object[][] {
+            {"王, 军", authorList(new Author("军", "军.", null, "王", null))},
             { "Doe, John", authorList(new Author("John", "J.", null, "Doe", null)) },
             { "von Berlichingen zu Hornberg, Johann Gottfried",
                     authorList(new Author("Johann Gottfried", "J. G.", "von", "Berlichingen zu Hornberg", null)) },

From 5216aca3e27b9855f0907c4273cacd8a076f6ce3 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Wed, 8 Aug 2018 08:40:07 +0200
Subject: [PATCH 023/229] Update dependencies (#4251)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update dependencies

Application insights should now be compatible with java 9

* fix mocktito dep
fix guave CharMatcher.WHITESPACE is no longer a public static field but a method

* experiment with new jaxb

* revert to original xjc until moduöe confusion of jaxb is understandable
---
 build.gradle                                   | 18 +++++++++---------
 .../org/jabref/model/strings/StringUtil.java   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2daa628c683..b3c916a7e84 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ plugins {
     id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
     id "com.simonharrer.modernizer" version '1.6.0-1'
     id 'me.champeau.gradle.jmh' version '0.4.7'
-    id 'net.ltgt.errorprone' version '0.0.15'
+    id 'net.ltgt.errorprone' version '0.0.16'
     id 'com.github.ben-manes.versions' version '0.20.0'
 }
 
@@ -117,7 +117,7 @@ dependencies {
 
     compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
 
-    compile 'com.google.guava:guava:25.1-jre'
+    compile 'com.google.guava:guava:26.0-jre'
 
     // JavaFX stuff
     compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4'
@@ -137,10 +137,10 @@ dependencies {
 
     // >1.8.0-beta is required for java 9 compatibility
     compile 'org.slf4j:slf4j-api:1.8.0-beta2'
-    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.0'
-    compile 'org.apache.logging.log4j:log4j-jcl:2.11.0'
-    compile 'org.apache.logging.log4j:log4j-api:2.11.0'
-    compile 'org.apache.logging.log4j:log4j-core:2.11.0'
+    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1'
+    compile 'org.apache.logging.log4j:log4j-jcl:2.11.1'
+    compile 'org.apache.logging.log4j:log4j-api:2.11.1'
+    compile 'org.apache.logging.log4j:log4j-core:2.11.1'
 
     // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles
     compile 'org.citationstyles:styles:1.0.1-SNAPSHOT'
@@ -149,8 +149,8 @@ dependencies {
 
     compile 'com.github.tomtung:latex2unicode_2.12:0.2.2'
 
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.1.1'
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.1.1'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.1.2'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.1.2'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.2.0'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.2.0'
@@ -160,7 +160,7 @@ dependencies {
     testCompile 'org.junit-pioneer:junit-pioneer:0.1.2'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.0'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.0'
-    testCompile 'org.mockito:mockito-core:2.20.0'
+    testCompile 'org.mockito:mockito-core:2.21.0'
     testCompile 'com.github.tomakehurst:wiremock:2.18.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'
diff --git a/src/main/java/org/jabref/model/strings/StringUtil.java b/src/main/java/org/jabref/model/strings/StringUtil.java
index 75b9518ec32..05674f51a5a 100644
--- a/src/main/java/org/jabref/model/strings/StringUtil.java
+++ b/src/main/java/org/jabref/model/strings/StringUtil.java
@@ -197,7 +197,7 @@ public static String wrap(String in, int wrapAmount, String newline) {
         String[] lines = in.split("\n");
         StringBuilder result = new StringBuilder();
         // remove all whitespace at the end of the string, this especially includes \r created when the field content has \r\n as line separator
-        addWrappedLine(result, CharMatcher.WHITESPACE.trimTrailingFrom(lines[0]), wrapAmount, newline); // See
+        addWrappedLine(result, CharMatcher.whitespace().trimTrailingFrom(lines[0]), wrapAmount, newline); // See
         for (int i = 1; i < lines.length; i++) {
 
             if (lines[i].trim().isEmpty()) {
@@ -209,7 +209,7 @@ public static String wrap(String in, int wrapAmount, String newline) {
                 result.append(newline);
                 result.append('\t');
                 // remove all whitespace at the end of the string, this especially includes \r created when the field content has \r\n as line separator
-                String line = CharMatcher.WHITESPACE.trimTrailingFrom(lines[i]);
+                String line = CharMatcher.whitespace().trimTrailingFrom(lines[i]);
                 addWrappedLine(result, line, wrapAmount, newline);
             }
         }

From 2486f198c92feea6e47e7d7b88f0e48166f22e42 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Wed, 8 Aug 2018 12:02:28 +0200
Subject: [PATCH 024/229] fix log4j slf4j dependency

https://logging.apache.org/log4j/2.0/log4j-slf4j-impl/index.html
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b3c916a7e84..b1b4dd1e5b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -137,7 +137,7 @@ dependencies {
 
     // >1.8.0-beta is required for java 9 compatibility
     compile 'org.slf4j:slf4j-api:1.8.0-beta2'
-    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1'
+    compile 'org.apache.logging.log4j:log4j-slf4j18-impl:2.11.1'
     compile 'org.apache.logging.log4j:log4j-jcl:2.11.1'
     compile 'org.apache.logging.log4j:log4j-api:2.11.1'
     compile 'org.apache.logging.log4j:log4j-core:2.11.1'

From 91420f2ae2a1b7b67619c359f96c5fe5386341e5 Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Wed, 8 Aug 2018 18:44:14 +0800
Subject: [PATCH 025/229] Fix#3861ReplaceString_ContributeLog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61cf25bc5be..742ad95a53b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We changed the default keyboard shortcuts for moving between entries when the entry editor is active to ̀<kbd>alt</kbd> + <kbd>up/down</kbd>.
 - Opening a new file now prompts the directory of the currently selected file, instead of the directory of the last opened file.
 - Window state is saved on close and restored on start.
+- We added JavaFX Dialog to change Replace String dialog from swing to JavaFX, which is part of the issue[#3861](https://github.com/JabRef/jabref/issues/3861), with removing the old dialog logic.
 
 
 
@@ -78,6 +79,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
   - Set/clear/append/rename fields: available through Edit menu
   - Manage keywords: available through Edit menu
   - Copy linked files to folder: available through File menu
+- We removed the old logic of Replace String dialog (one file), instead, add JavaFX style dialog to cover the old function.
 
 
 

From 3300aa5725a2983fabc2902d8e8800dd07cb2bb6 Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Wed, 8 Aug 2018 19:25:04 +0800
Subject: [PATCH 026/229] Fix#3861ReplaceString_Improvements

---
 .../org/jabref/gui/ReplaceStringView.java     |  6 +++---
 .../jabref/gui/ReplaceStringViewModel.java    | 21 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/jabref/gui/ReplaceStringView.java b/src/main/java/org/jabref/gui/ReplaceStringView.java
index 08bcf5708b2..6f75f150f92 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringView.java
+++ b/src/main/java/org/jabref/gui/ReplaceStringView.java
@@ -44,9 +44,9 @@ public ReplaceStringView(BasePanel basePanel)  {
     public void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
 
-        viewModel.getFindStringProperty().bind(findField.textProperty());
-        viewModel.getReplaceStringProperty().bind(replaceField.textProperty());
-        viewModel.getFieldStringProperty().bind(limitFieldInput.textProperty());
+        viewModel.FindStringProperty().bind(findField.textProperty());
+        viewModel.ReplaceStringProperty().bind(replaceField.textProperty());
+        viewModel.FieldStringProperty().bind(limitFieldInput.textProperty());
         viewModel.selectOnlyProperty().bind(selectFieldOnly.selectedProperty());
         viewModel.allFieldReplaceProperty().bind(allReplace.selectedProperty());
     }
diff --git a/src/main/java/org/jabref/gui/ReplaceStringViewModel.java b/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
index acde33ee620..f5e9bc1782f 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
+++ b/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
@@ -1,5 +1,7 @@
 package org.jabref.gui;
 
+import java.util.Objects;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -27,6 +29,7 @@ public class ReplaceStringViewModel extends AbstractViewModel
 
     public ReplaceStringViewModel(BasePanel basePanel)
     {
+        Objects.requireNonNull(basePanel);
         this.panel = basePanel;
     }
 
@@ -39,8 +42,6 @@ public int replace() {
 
         final NamedCompound compound = new NamedCompound(Localization.lang("Replace string"));
         int counter = 0;
-        if (this.panel == null)
-            return 0;
         if (selOnly) {
             for (BibEntry bibEntry: this.panel.getSelectedEntries())
                 counter += replaceItem(bibEntry, compound);
@@ -72,11 +73,11 @@ private int replaceItem(BibEntry entry, NamedCompound compound) {
         return counter;
     }
 
-    private int replaceField(BibEntry entry, String fieldname, NamedCompound compound) {
-        if (!entry.hasField(fieldname)) {
+    private int replaceField(BibEntry entry, String fieldName, NamedCompound compound) {
+        if (!entry.hasField(fieldName)) {
             return 0;
         }
-        String txt = entry.getField(fieldname).get();
+        String txt = entry.getField(fieldName).get();
         StringBuilder stringBuilder = new StringBuilder();
         int ind;
         int piv = 0;
@@ -90,8 +91,8 @@ private int replaceField(BibEntry entry, String fieldname, NamedCompound compoun
         }
         stringBuilder.append(txt.substring(piv));
         String newStr = stringBuilder.toString();
-        entry.setField(fieldname, newStr);
-        compound.addEdit(new UndoableFieldChange(entry, fieldname, txt, newStr));
+        entry.setField(fieldName, newStr);
+        compound.addEdit(new UndoableFieldChange(entry, fieldName, txt, newStr));
         return counter;
     }
 
@@ -103,15 +104,15 @@ public BooleanProperty selectOnlyProperty() {
         return selectOnlyProperty;
     }
 
-    public StringProperty getFieldStringProperty() {
+    public StringProperty FieldStringProperty() {
         return fieldStringProperty;
     }
 
-    public StringProperty getFindStringProperty() {
+    public StringProperty FindStringProperty() {
         return findStringProperty;
     }
 
-    public StringProperty getReplaceStringProperty() {
+    public StringProperty ReplaceStringProperty() {
         return replaceStringProperty;
     }
 }

From 3c89dee4425d420d4ae934c41ae4c2a896bc9eb4 Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Wed, 8 Aug 2018 19:50:21 +0800
Subject: [PATCH 027/229] Fix#3861ReplaceString_checkStyle

---
 src/main/java/org/jabref/gui/ReplaceStringView.java      | 6 +++---
 src/main/java/org/jabref/gui/ReplaceStringViewModel.java | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/ReplaceStringView.java b/src/main/java/org/jabref/gui/ReplaceStringView.java
index 6f75f150f92..64c6950b024 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringView.java
+++ b/src/main/java/org/jabref/gui/ReplaceStringView.java
@@ -44,9 +44,9 @@ public ReplaceStringView(BasePanel basePanel)  {
     public void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
 
-        viewModel.FindStringProperty().bind(findField.textProperty());
-        viewModel.ReplaceStringProperty().bind(replaceField.textProperty());
-        viewModel.FieldStringProperty().bind(limitFieldInput.textProperty());
+        viewModel.findStringProperty().bind(findField.textProperty());
+        viewModel.replaceStringProperty().bind(replaceField.textProperty());
+        viewModel.fieldStringProperty().bind(limitFieldInput.textProperty());
         viewModel.selectOnlyProperty().bind(selectFieldOnly.selectedProperty());
         viewModel.allFieldReplaceProperty().bind(allReplace.selectedProperty());
     }
diff --git a/src/main/java/org/jabref/gui/ReplaceStringViewModel.java b/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
index f5e9bc1782f..624fbd4b43e 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
+++ b/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
@@ -104,15 +104,15 @@ public BooleanProperty selectOnlyProperty() {
         return selectOnlyProperty;
     }
 
-    public StringProperty FieldStringProperty() {
+    public StringProperty fieldStringProperty() {
         return fieldStringProperty;
     }
 
-    public StringProperty FindStringProperty() {
+    public StringProperty findStringProperty() {
         return findStringProperty;
     }
 
-    public StringProperty ReplaceStringProperty() {
+    public StringProperty replaceStringProperty() {
         return replaceStringProperty;
     }
 }

From 6dad44fcec7b1ac42b7efaa33c7235285cf9c5ca Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 8 Aug 2018 18:38:30 +0200
Subject: [PATCH 028/229] Remove changelog entries

---
 CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 742ad95a53b..61cf25bc5be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,6 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We changed the default keyboard shortcuts for moving between entries when the entry editor is active to ̀<kbd>alt</kbd> + <kbd>up/down</kbd>.
 - Opening a new file now prompts the directory of the currently selected file, instead of the directory of the last opened file.
 - Window state is saved on close and restored on start.
-- We added JavaFX Dialog to change Replace String dialog from swing to JavaFX, which is part of the issue[#3861](https://github.com/JabRef/jabref/issues/3861), with removing the old dialog logic.
 
 
 
@@ -79,7 +78,6 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
   - Set/clear/append/rename fields: available through Edit menu
   - Manage keywords: available through Edit menu
   - Copy linked files to folder: available through File menu
-- We removed the old logic of Replace String dialog (one file), instead, add JavaFX style dialog to cover the old function.
 
 
 

From cf7d6b8f9a9bbe48dfb4e42e5d24560ca72f3cb6 Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Thu, 9 Aug 2018 15:38:31 +0800
Subject: [PATCH 029/229] Fix#3861RS_conflicttest

---
 .../org/jabref/gui/ReplaceStringDialog.java   | 220 ++++++++++++++++++
 1 file changed, 220 insertions(+)
 create mode 100644 src/main/java/org/jabref/gui/ReplaceStringDialog.java

diff --git a/src/main/java/org/jabref/gui/ReplaceStringDialog.java b/src/main/java/org/jabref/gui/ReplaceStringDialog.java
new file mode 100644
index 00000000000..4c493260c00
--- /dev/null
+++ b/src/main/java/org/jabref/gui/ReplaceStringDialog.java
@@ -0,0 +1,220 @@
+package org.jabref.gui;
+
+import java.awt.BorderLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Locale;
+
+import javax.swing.AbstractAction;
+import javax.swing.ActionMap;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.InputMap;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+
+import org.jabref.Globals;
+import org.jabref.gui.keyboard.KeyBinding;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+
+/**
+ * Dialog for replacing strings.
+ */
+class ReplaceStringDialog extends JabRefDialog {
+
+    private final JTextField fieldsField = new JTextField("", 30);
+    private final JTextField fromField = new JTextField("", 30);
+    private final JTextField toField = new JTextField("", 30);
+
+    private final JCheckBox selOnly = new JCheckBox(Localization.lang("Limit to selected entries"), false);
+    private final JRadioButton allFi = new JRadioButton(Localization.lang("All fields"), true);
+    private final JRadioButton field = new JRadioButton(Localization.lang("Limit to fields") + ":", false);
+    private boolean okPressed;
+    private String[] fieldStrings;
+    private String fromString;
+    private String toString;
+
+
+    public ReplaceStringDialog(JabRefFrame parent) {
+        super(Localization.lang("Replace string"), true, ReplaceStringDialog.class);
+
+        ButtonGroup bg = new ButtonGroup();
+        bg.add(allFi);
+        bg.add(field);
+        ActionListener okListener = e -> {
+            fromString = fromField.getText();
+            toString = toField.getText();
+            if ("".equals(fromString)) {
+                return;
+            }
+            okPressed = true;
+            fieldStrings = fieldsField.getText().toLowerCase(Locale.ROOT).split(";");
+            dispose();
+        };
+        JButton ok = new JButton(Localization.lang("OK"));
+        ok.addActionListener(okListener);
+        toField.addActionListener(okListener);
+        fieldsField.addActionListener(okListener);
+        AbstractAction cancelAction = new AbstractAction() {
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                dispose();
+            }
+        };
+        JButton cancel = new JButton(Localization.lang("Cancel"));
+        cancel.addActionListener(cancelAction);
+
+        // Key bindings:
+        JPanel settings = new JPanel();
+        ActionMap am = settings.getActionMap();
+        InputMap im = settings.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
+        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
+        am.put("close", cancelAction);
+
+        // Layout starts here.
+        GridBagLayout gbl = new GridBagLayout();
+        settings.setLayout(gbl);
+        JPanel opt = new JPanel();
+        opt.setLayout(gbl);
+        JPanel main = new JPanel();
+        main.setLayout(gbl);
+
+        settings.setBorder(BorderFactory.createTitledBorder
+                (BorderFactory.createEtchedBorder(),
+                        Localization.lang("Replace string")));
+        main.setBorder(BorderFactory.createTitledBorder
+                (BorderFactory.createEtchedBorder(),
+                        Localization.lang("Strings")));
+
+        // Settings panel:
+        GridBagConstraints con = new GridBagConstraints();
+        con.fill = GridBagConstraints.HORIZONTAL;
+        con.gridwidth = 2;
+        con.weightx = 0;
+        con.anchor = GridBagConstraints.WEST;
+        con.gridy = 0;
+        con.gridx = 0;
+        con.insets = new Insets(3, 5, 3, 5);
+        gbl.setConstraints(selOnly, con);
+        settings.add(selOnly);
+        con.gridy = 1;
+        con.insets = new Insets(13, 5, 3, 5);
+        gbl.setConstraints(allFi, con);
+        settings.add(allFi);
+        con.gridwidth = 1;
+        con.gridy = 2;
+        con.gridx = 0;
+        con.insets = new Insets(3, 5, 3, 5);
+        gbl.setConstraints(field, con);
+        settings.add(field);
+        con.gridx = 1;
+        con.weightx = 1;
+        gbl.setConstraints(fieldsField, con);
+        settings.add(fieldsField);
+
+        con.weightx = 0;
+        con.gridx = 0;
+        con.gridy = 0;
+        JLabel fl = new JLabel(Localization.lang("Search for") + ":");
+        gbl.setConstraints(fl, con);
+        main.add(fl);
+        con.gridy = 1;
+        JLabel tl = new JLabel(Localization.lang("Replace with") + ":");
+        gbl.setConstraints(tl, con);
+        main.add(tl);
+        con.weightx = 1;
+        con.gridx = 1;
+        con.gridy = 0;
+        gbl.setConstraints(fromField, con);
+        main.add(fromField);
+        con.gridy = 1;
+        gbl.setConstraints(toField, con);
+        main.add(toField);
+
+        // Option buttons:
+        con.gridx = GridBagConstraints.RELATIVE;
+        con.gridy = GridBagConstraints.RELATIVE;
+        con.weightx = 1;
+        con.gridwidth = 1;
+        con.anchor = GridBagConstraints.EAST;
+        con.fill = GridBagConstraints.NONE;
+        gbl.setConstraints(ok, con);
+        opt.add(ok);
+        con.anchor = GridBagConstraints.WEST;
+        con.gridwidth = GridBagConstraints.REMAINDER;
+        gbl.setConstraints(cancel, con);
+        opt.add(cancel);
+
+        getContentPane().add(main, BorderLayout.NORTH);
+        getContentPane().add(settings, BorderLayout.CENTER);
+        getContentPane().add(opt, BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    public boolean okPressed() {
+        return okPressed;
+    }
+
+    private boolean allFields() {
+        return allFi.isSelected();
+    }
+
+    public boolean selOnly() {
+        return selOnly.isSelected();
+    }
+
+    /**
+     * Does the actual operation on a Bibtex entry based on the
+     * settings specified in this same dialog. Returns the number of
+     * occurences replaced.
+     */
+    public int replace(BibEntry be, NamedCompound ce) {
+        int counter = 0;
+        if (allFields()) {
+            for (String s : be.getFieldNames()) {
+                counter += replaceField(be, s, ce);
+            }
+        } else {
+            for (String fld : fieldStrings) {
+                    counter += replaceField(be, fld, ce);
+            }
+        }
+        return counter;
+    }
+
+    private int replaceField(BibEntry be, String fieldname, NamedCompound ce) {
+        if (!be.hasField(fieldname)) {
+            return 0;
+        }
+        String txt = be.getField(fieldname).get();
+        StringBuilder sb = new StringBuilder();
+        int ind;
+        int piv = 0;
+        int counter = 0;
+        int len1 = fromString.length();
+        while ((ind = txt.indexOf(fromString, piv)) >= 0) {
+            counter++;
+            sb.append(txt.substring(piv, ind)); // Text leading up to s1
+            sb.append(toString); // Insert s2
+            piv = ind + len1;
+        }
+        sb.append(txt.substring(piv));
+        String newStr = sb.toString();
+        be.setField(fieldname, newStr);
+        ce.addEdit(new UndoableFieldChange(be, fieldname, txt, newStr));
+        return counter;
+    }
+}

From 609a0658f0348f32ecb9ca875626dd6d069b052d Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Thu, 9 Aug 2018 15:43:00 +0800
Subject: [PATCH 030/229] Fix#3861RS_conflicttest

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 742ad95a53b..7461d2a1a55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We changed the default keyboard shortcuts for moving between entries when the entry editor is active to ̀<kbd>alt</kbd> + <kbd>up/down</kbd>.
 - Opening a new file now prompts the directory of the currently selected file, instead of the directory of the last opened file.
 - Window state is saved on close and restored on start.
-- We added JavaFX Dialog to change Replace String dialog from swing to JavaFX, which is part of the issue[#3861](https://github.com/JabRef/jabref/issues/3861), with removing the old dialog logic.
+
 
 
 
@@ -79,7 +79,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
   - Set/clear/append/rename fields: available through Edit menu
   - Manage keywords: available through Edit menu
   - Copy linked files to folder: available through File menu
-- We removed the old logic of Replace String dialog (one file), instead, add JavaFX style dialog to cover the old function.
+
 
 
 

From df86b62881290d21f5515b9eac7f87e931ef752b Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Thu, 9 Aug 2018 16:27:51 +0800
Subject: [PATCH 031/229] Fix#3861ReplaceString_solveConflict

---
 .../org/jabref/gui/ReplaceStringDialog.java   | 220 ------------------
 1 file changed, 220 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/ReplaceStringDialog.java

diff --git a/src/main/java/org/jabref/gui/ReplaceStringDialog.java b/src/main/java/org/jabref/gui/ReplaceStringDialog.java
deleted file mode 100644
index 4c493260c00..00000000000
--- a/src/main/java/org/jabref/gui/ReplaceStringDialog.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Locale;
-
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-
-import org.jabref.Globals;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableFieldChange;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-
-/**
- * Dialog for replacing strings.
- */
-class ReplaceStringDialog extends JabRefDialog {
-
-    private final JTextField fieldsField = new JTextField("", 30);
-    private final JTextField fromField = new JTextField("", 30);
-    private final JTextField toField = new JTextField("", 30);
-
-    private final JCheckBox selOnly = new JCheckBox(Localization.lang("Limit to selected entries"), false);
-    private final JRadioButton allFi = new JRadioButton(Localization.lang("All fields"), true);
-    private final JRadioButton field = new JRadioButton(Localization.lang("Limit to fields") + ":", false);
-    private boolean okPressed;
-    private String[] fieldStrings;
-    private String fromString;
-    private String toString;
-
-
-    public ReplaceStringDialog(JabRefFrame parent) {
-        super(Localization.lang("Replace string"), true, ReplaceStringDialog.class);
-
-        ButtonGroup bg = new ButtonGroup();
-        bg.add(allFi);
-        bg.add(field);
-        ActionListener okListener = e -> {
-            fromString = fromField.getText();
-            toString = toField.getText();
-            if ("".equals(fromString)) {
-                return;
-            }
-            okPressed = true;
-            fieldStrings = fieldsField.getText().toLowerCase(Locale.ROOT).split(";");
-            dispose();
-        };
-        JButton ok = new JButton(Localization.lang("OK"));
-        ok.addActionListener(okListener);
-        toField.addActionListener(okListener);
-        fieldsField.addActionListener(okListener);
-        AbstractAction cancelAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        };
-        JButton cancel = new JButton(Localization.lang("Cancel"));
-        cancel.addActionListener(cancelAction);
-
-        // Key bindings:
-        JPanel settings = new JPanel();
-        ActionMap am = settings.getActionMap();
-        InputMap im = settings.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", cancelAction);
-
-        // Layout starts here.
-        GridBagLayout gbl = new GridBagLayout();
-        settings.setLayout(gbl);
-        JPanel opt = new JPanel();
-        opt.setLayout(gbl);
-        JPanel main = new JPanel();
-        main.setLayout(gbl);
-
-        settings.setBorder(BorderFactory.createTitledBorder
-                (BorderFactory.createEtchedBorder(),
-                        Localization.lang("Replace string")));
-        main.setBorder(BorderFactory.createTitledBorder
-                (BorderFactory.createEtchedBorder(),
-                        Localization.lang("Strings")));
-
-        // Settings panel:
-        GridBagConstraints con = new GridBagConstraints();
-        con.fill = GridBagConstraints.HORIZONTAL;
-        con.gridwidth = 2;
-        con.weightx = 0;
-        con.anchor = GridBagConstraints.WEST;
-        con.gridy = 0;
-        con.gridx = 0;
-        con.insets = new Insets(3, 5, 3, 5);
-        gbl.setConstraints(selOnly, con);
-        settings.add(selOnly);
-        con.gridy = 1;
-        con.insets = new Insets(13, 5, 3, 5);
-        gbl.setConstraints(allFi, con);
-        settings.add(allFi);
-        con.gridwidth = 1;
-        con.gridy = 2;
-        con.gridx = 0;
-        con.insets = new Insets(3, 5, 3, 5);
-        gbl.setConstraints(field, con);
-        settings.add(field);
-        con.gridx = 1;
-        con.weightx = 1;
-        gbl.setConstraints(fieldsField, con);
-        settings.add(fieldsField);
-
-        con.weightx = 0;
-        con.gridx = 0;
-        con.gridy = 0;
-        JLabel fl = new JLabel(Localization.lang("Search for") + ":");
-        gbl.setConstraints(fl, con);
-        main.add(fl);
-        con.gridy = 1;
-        JLabel tl = new JLabel(Localization.lang("Replace with") + ":");
-        gbl.setConstraints(tl, con);
-        main.add(tl);
-        con.weightx = 1;
-        con.gridx = 1;
-        con.gridy = 0;
-        gbl.setConstraints(fromField, con);
-        main.add(fromField);
-        con.gridy = 1;
-        gbl.setConstraints(toField, con);
-        main.add(toField);
-
-        // Option buttons:
-        con.gridx = GridBagConstraints.RELATIVE;
-        con.gridy = GridBagConstraints.RELATIVE;
-        con.weightx = 1;
-        con.gridwidth = 1;
-        con.anchor = GridBagConstraints.EAST;
-        con.fill = GridBagConstraints.NONE;
-        gbl.setConstraints(ok, con);
-        opt.add(ok);
-        con.anchor = GridBagConstraints.WEST;
-        con.gridwidth = GridBagConstraints.REMAINDER;
-        gbl.setConstraints(cancel, con);
-        opt.add(cancel);
-
-        getContentPane().add(main, BorderLayout.NORTH);
-        getContentPane().add(settings, BorderLayout.CENTER);
-        getContentPane().add(opt, BorderLayout.SOUTH);
-
-        pack();
-    }
-
-    public boolean okPressed() {
-        return okPressed;
-    }
-
-    private boolean allFields() {
-        return allFi.isSelected();
-    }
-
-    public boolean selOnly() {
-        return selOnly.isSelected();
-    }
-
-    /**
-     * Does the actual operation on a Bibtex entry based on the
-     * settings specified in this same dialog. Returns the number of
-     * occurences replaced.
-     */
-    public int replace(BibEntry be, NamedCompound ce) {
-        int counter = 0;
-        if (allFields()) {
-            for (String s : be.getFieldNames()) {
-                counter += replaceField(be, s, ce);
-            }
-        } else {
-            for (String fld : fieldStrings) {
-                    counter += replaceField(be, fld, ce);
-            }
-        }
-        return counter;
-    }
-
-    private int replaceField(BibEntry be, String fieldname, NamedCompound ce) {
-        if (!be.hasField(fieldname)) {
-            return 0;
-        }
-        String txt = be.getField(fieldname).get();
-        StringBuilder sb = new StringBuilder();
-        int ind;
-        int piv = 0;
-        int counter = 0;
-        int len1 = fromString.length();
-        while ((ind = txt.indexOf(fromString, piv)) >= 0) {
-            counter++;
-            sb.append(txt.substring(piv, ind)); // Text leading up to s1
-            sb.append(toString); // Insert s2
-            piv = ind + len1;
-        }
-        sb.append(txt.substring(piv));
-        String newStr = sb.toString();
-        be.setField(fieldname, newStr);
-        ce.addEdit(new UndoableFieldChange(be, fieldname, txt, newStr));
-        return counter;
-    }
-}

From d055f98425f05d4e55ee7c23c4b4eccaea0263fd Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Thu, 9 Aug 2018 16:33:46 +0800
Subject: [PATCH 032/229] Fix#ReplaceString_ChangeConflict

---
 CHANGELOG.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb209c81e27..7461d2a1a55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,10 +24,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We changed the default keyboard shortcuts for moving between entries when the entry editor is active to ̀<kbd>alt</kbd> + <kbd>up/down</kbd>.
 - Opening a new file now prompts the directory of the currently selected file, instead of the directory of the last opened file.
 - Window state is saved on close and restored on start.
-<<<<<<< HEAD
 
-=======
->>>>>>> 6dad44fcec7b1ac42b7efaa33c7235285cf9c5ca
 
 
 
@@ -82,10 +79,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
   - Set/clear/append/rename fields: available through Edit menu
   - Manage keywords: available through Edit menu
   - Copy linked files to folder: available through File menu
-<<<<<<< HEAD
 
-=======
->>>>>>> 6dad44fcec7b1ac42b7efaa33c7235285cf9c5ca
 
 
 

From 89ee88513c0012a776afa5d7dc5af14e01e36852 Mon Sep 17 00:00:00 2001
From: Zeabin <2389513327@qq.com>
Date: Fri, 10 Aug 2018 00:25:55 +0800
Subject: [PATCH 033/229] Fix for issue koppor 254 (Auto cleanup url) (#4255)

* Add a unit test for CleanupURLFormatter

* Add CleanupURLFormatter

* Add Loalized value key in JabRef_en.properties

* Add CleanupURLFormatter to method getOthers() in class Formatters.java

* Add paste action handling in EditorTextArea

* Add cleanupURL menu item to EditorMenus

* Add cleanupURL menu to UrlEditor

* Add auto url cleanup on paste action for UrlEditor

* Update CHANGELOG.md

* fix misspelling of localization key --Cleanup URL Link

* Fix code style problems

* Remove EmptyPasteHandler

* Remove default Menus in url field

* Change word Link to link

* Set CleanupURL disable when url field is empty

* fix missed word Link to link

* Fix word misspelling
---
 CHANGELOG.md                                  |  1 +
 .../gui/fieldeditors/EditorTextArea.java      | 35 ++++++++++
 .../jabref/gui/fieldeditors/UrlEditor.java    | 14 +++-
 .../fieldeditors/contextmenu/EditorMenus.java | 19 ++++++
 .../jabref/logic/formatter/Formatters.java    |  2 +
 .../bibtexfields/CleanupURLFormatter.java     | 65 +++++++++++++++++++
 src/main/resources/l10n/JabRef_en.properties  |  2 +
 .../bibtexfields/CleanupUrlFormatterTest.java | 38 +++++++++++
 8 files changed, 175 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupURLFormatter.java
 create mode 100644 src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f72c6a7fdfa..76d2ecfa489 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - Files without a defined external file type are now directly opened with the default application of the operating system
 - We streamlined the process to rename and move files by removing the confirmation dialogs.
 - We removed the redundant new lines of markings and wrapped the summary in the File annotation tab. [#3823](https://github.com/JabRef/jabref/issues/3823)
+- We add auto url formatting when user paste link to URL field in Entry editor  [#254](https://github.com/koppor/jabref/issues/254)
 
 
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
index 1783e9f1396..1a5f7da082b 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
@@ -2,6 +2,7 @@
 
 import java.net.URL;
 import java.util.List;
+import java.util.Objects;
 import java.util.ResourceBundle;
 import java.util.function.Supplier;
 
@@ -15,6 +16,13 @@
 
 public class EditorTextArea extends javafx.scene.control.TextArea implements Initializable, ContextMenuAddable {
 
+    /**
+     *  Variable that contains user-defined behavior for paste action.
+     */
+    private PasteActionHandler pasteActionHandler = () -> {
+        // Set empty paste behavior by default
+    };
+
     public EditorTextArea() {
         this("");
     }
@@ -65,4 +73,31 @@ public void populateContextMenu(ContextMenu contextMenu) {
     public void initialize(URL location, ResourceBundle resources) {
         // not needed
     }
+
+    /**
+     * Set pasteActionHandler variable to passed handler
+     * @param  handler an instance of PasteActionHandler that describes paste behavior
+     */
+    public void setPasteActionHandler(PasteActionHandler handler) {
+        Objects.requireNonNull(handler);
+        this.pasteActionHandler = handler;
+    }
+  
+    /**
+     *  Override javafx TextArea method applying TextArea.paste() and pasteActionHandler after
+     */
+    @Override
+    public void paste() {
+        super.paste();
+        pasteActionHandler.handle();
+    }
+  
+    /**
+     *  Interface presents user-described paste behaviour applying to paste method
+     */
+    @FunctionalInterface
+    public interface PasteActionHandler {
+
+        void handle();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
index b074522f30d..36546d1baa5 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
@@ -1,12 +1,18 @@
 package org.jabref.gui.fieldeditors;
 
+import java.util.List;
+import java.util.function.Supplier;
+
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
+import javafx.scene.control.MenuItem;
 import javafx.scene.layout.HBox;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.fieldeditors.contextmenu.EditorMenus;
+import org.jabref.logic.formatter.bibtexfields.CleanupURLFormatter;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
@@ -15,7 +21,7 @@
 
 public class UrlEditor extends HBox implements FieldEditorFX {
 
-    @FXML private UrlEditorViewModel viewModel;
+    @FXML private final UrlEditorViewModel viewModel;
     @FXML private EditorTextArea textArea;
 
     public UrlEditor(String fieldName, DialogService dialogService, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, JabRefPreferences preferences) {
@@ -26,6 +32,12 @@ public UrlEditor(String fieldName, DialogService dialogService, AutoCompleteSugg
                   .load();
 
         textArea.textProperty().bindBidirectional(viewModel.textProperty());
+        Supplier<List<MenuItem>> contextMenuSupplier = EditorMenus.getCleanupURLMenu(textArea);
+        textArea.addToContextMenu(contextMenuSupplier);
+
+        // init paste handler for URLEditor to format pasted url link in textArea
+        textArea.setPasteActionHandler(()->
+          textArea.setText(new CleanupURLFormatter().format(textArea.getText())));
 
         new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
index 179a1cfb9b7..8068b8a3f4a 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
@@ -16,6 +16,7 @@
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.actions.CopyDoiUrlAction;
+import org.jabref.logic.formatter.bibtexfields.CleanupURLFormatter;
 import org.jabref.logic.formatter.bibtexfields.NormalizeNamesFormatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -84,4 +85,22 @@ public static Supplier<List<MenuItem>> getDOIMenu(TextArea textArea) {
             return menuItems;
         };
     }
+
+    /**
+     * The default context menu with a specific menu item to cleanup  URL.
+     *
+     * @param textArea text-area that this menu will be connected to
+     * @return menu containing items of the default menu and an item to cleanup a URL
+     */
+    public static Supplier<List<MenuItem>> getCleanupURLMenu(TextArea textArea) {
+        return () -> {
+            CustomMenuItem cleanupURL = new CustomMenuItem(new Label(Localization.lang("Cleanup URL link")));
+            cleanupURL.setDisable(textArea.textProperty().isEmpty().get());
+            cleanupURL.setOnAction(event -> textArea.setText(new CleanupURLFormatter().format(textArea.getText())));
+
+            List<MenuItem> menuItems = new ArrayList<>();
+            menuItems.add(cleanupURL);
+            return menuItems;
+        };
+    }
 }
diff --git a/src/main/java/org/jabref/logic/formatter/Formatters.java b/src/main/java/org/jabref/logic/formatter/Formatters.java
index d1cd14925bb..4e1d25f968f 100644
--- a/src/main/java/org/jabref/logic/formatter/Formatters.java
+++ b/src/main/java/org/jabref/logic/formatter/Formatters.java
@@ -6,6 +6,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import org.jabref.logic.formatter.bibtexfields.CleanupURLFormatter;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
 import org.jabref.logic.formatter.bibtexfields.EscapeUnderscoresFormatter;
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
@@ -56,6 +57,7 @@ public static List<Formatter> getCaseChangers() {
     public static List<Formatter> getOthers() {
         return Arrays.asList(
                 new ClearFormatter(),
+                new CleanupURLFormatter(),
                 new LatexCleanupFormatter(),
                 new MinifyNameListFormatter(),
                 new NormalizeDateFormatter(),
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupURLFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupURLFormatter.java
new file mode 100644
index 00000000000..87c2ecf1dd5
--- /dev/null
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupURLFormatter.java
@@ -0,0 +1,65 @@
+package org.jabref.logic.formatter.bibtexfields;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.cleanup.Formatter;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Cleanup URL link
+ */
+public class CleanupURLFormatter extends Formatter {
+
+    private static final Log LOGGER = LogFactory.getLog(CleanupURLFormatter.class);
+    // This regexp find "url=" or "to=" parameter in full link and get text after them
+    private static final Pattern PATTERN_URL = Pattern.compile("(?:url|to)=([^&]*)");
+
+    @Override
+    public String getName() {
+        return Localization.lang("Cleanup URL link");
+    }
+
+    @Override
+    public String getKey() {
+        return "cleanup_url";
+    }
+
+    @Override
+    public String format(String value) {
+        String decodedLink = value;
+        String toDecode = value;
+
+        Matcher matcher = PATTERN_URL.matcher(value);
+        if (matcher.find()) {
+          toDecode = matcher.group(1);
+        }
+        try {
+            decodedLink = URLDecoder.decode(toDecode, StandardCharsets.UTF_8.name());
+        }
+        catch (UnsupportedEncodingException e) {
+            LOGGER.warn("Used unsupported character encoding", e);
+        }
+        return decodedLink;
+    }
+
+    @Override
+    public String getDescription() {
+        return Localization.lang("Cleanup URL link by removing special symbols and extracting simple link");
+    }
+
+    @Override
+    public String getExampleInput() {
+        return "https://www.google.de/url?sa=t&rct=j&q=&esrc=s&source=web&cd=11&cad=" +
+                "rja&uact=8&ved=0ahUKEwjg3ZrB_ZPXAhVGuhoKHYdOBOg4ChAWCCYwAA&url=" +
+                "http%3A%2F%2Fwww.focus.de%2Fgesundheit%2Fratgeber%2Fherz%2Ftest%2" +
+                "Flebenserwartung-werden-sie-100-jahre-alt_aid_363828.html" + "&usg=AOvVaw1G6m2jf-pTHYkXceii4hXU";
+  }
+
+}
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index d2de9afd87d..8fee34e4680 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2227,6 +2227,8 @@ Abbreviate\ journal\ names\ (ISO)=Abbreviate journal names (ISO)
 Abbreviate\ journal\ names\ (MEDLINE)=Abbreviate journal names (MEDLINE)
 Blog=Blog
 Check\ integrity=Check integrity
+Cleanup\ URL\ link=Cleanup URL link
+Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=Cleanup URL link by removing special symbols and extracting simple link
 Copy\ DOI\ url=Copy DOI url
 Copy\ citation=Copy citation
 Development\ version=Development version
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
new file mode 100644
index 00000000000..7438c83269e
--- /dev/null
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
@@ -0,0 +1,38 @@
+package org.jabref.logic.formatter.bibtexfields;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ *  Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
+ */
+public class CleanupUrlFormatterTest {
+
+    private CleanupURLFormatter formatter;
+
+    @Before
+    public void setUp() {
+        formatter = new CleanupURLFormatter();
+    }
+
+    @Test
+    public void removeSpecialSymbolsFromURLLink() {
+        assertEquals("http://wikipedia.org",
+                formatter.format("http%3A%2F%2Fwikipedia.org"));
+    }
+
+    @Test
+    public void extractURLFormLink() {
+        assertEquals("http://wikipedia.org",
+                formatter.format("away.php?to=http%3A%2F%2Fwikipedia.org&a=snippet"));
+    }
+
+    @Test
+    public void formatExample() {
+        assertEquals("http://www.focus.de/" +
+                "gesundheit/ratgeber/herz/test/lebenserwartung-werden-sie-100-jahre-alt_aid_363828.html",
+                formatter.format(formatter.getExampleInput()));
+    }
+}

From 7b29fe39b63f6630b3e92bc67e5080531643a708 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Fri, 10 Aug 2018 11:46:38 +0200
Subject: [PATCH 034/229] Fix attach file does not relativize file path (#4252)

* attempt at attach file relative file making

* add method for making path relative

* set new path when chosing another file

* add changelog entry

* Return new relatizived path
---
 CHANGELOG.md                                      |  2 +-
 .../filelist/LinkedFilesEditDialogViewModel.java  | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76d2ecfa489..279bbd14875 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,7 +63,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where the preview pane in entry preview in preferences wasn't showing the citation style selected [#3849](https://github.com/JabRef/jabref/issues/3849)
 - We fixed an issue where the default entry preview style still contained the field `review`. The field `review` in the style is now replaced with comment to be consistent with the entry editor [#4098](https://github.com/JabRef/jabref/issues/4098)
 - We fixed an issue where users were vulnerable to XXE attacks during parsing [#4229](https://github.com/JabRef/jabref/issues/4229)
-- We fixed an issue where files added via the "Attach file" contextmenu of an entry were not made relative. [#4201](https://github.com/JabRef/jabref/issues/4201)
+- We fixed an issue where files added via the "Attach file" contextmenu of an entry were not made relative. [#4201](https://github.com/JabRef/jabref/issues/4201) and [#4241](https://github.com/JabRef/jabref/issues/4241)
 - We fixed an issue where author list parser can't generate bibtex for Chinese author. [#4169](https://github.com/JabRef/jabref/issues/4169)
 
 
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 492cda62592..1226082b3d8 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -83,19 +83,17 @@ public void openBrowseDialog() {
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> {
             // Store the directory for next time:
             preferences.setWorkingDir(path);
+            link.set(relativize(path));
 
-            // If the file is below the file directory, make the path relative:
-            List<Path> fileDirectories = database.getFileDirectoriesAsPaths(preferences.getFileDirectoryPreferences());
-            path = FileUtil.shortenFileName(path, fileDirectories);
-
-            link.set(path.toString());
             setExternalFileTypeByExtension(link.getValueSafe());
         });
     }
 
     public void setValues(LinkedFile linkedFile) {
         description.set(linkedFile.getDescription());
-        link.set(linkedFile.getLink());
+
+        Path linkPath = Paths.get(linkedFile.getLink());
+        link.set(relativize(linkPath));
 
         selectedExternalFileType.setValue(null);
 
@@ -128,4 +126,9 @@ public LinkedFile getNewLinkedFile() {
         return new LinkedFile(description.getValue(), link.getValue(), monadicSelectedExternalFileType.map(ExternalFileType::toString).getOrElse(""));
     }
 
+    private String relativize(Path filePath) {
+        List<Path> fileDirectories = database.getFileDirectoriesAsPaths(preferences.getFileDirectoryPreferences());
+        return FileUtil.shortenFileName(filePath, fileDirectories).toString();
+    }
+
 }

From 48a4c318a73a872ac71d44b50d09da25bb06279c Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Sat, 11 Aug 2018 14:30:39 +0800
Subject: [PATCH 035/229] Fix#3861_build

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

diff --git a/src/main/java/org/jabref/gui/ReplaceString.fxml b/src/main/java/org/jabref/gui/ReplaceString.fxml
index 6641a64c071..39cf4fddfa5 100644
--- a/src/main/java/org/jabref/gui/ReplaceString.fxml
+++ b/src/main/java/org/jabref/gui/ReplaceString.fxml
@@ -29,22 +29,22 @@
                                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                             </rowConstraints>
                             <Label text="Find and Replace"/>
-                            <Label text="Find: " GridPane.columnIndex="0" GridPane.rowIndex="1"/>
+                            <Label text="%Find:" GridPane.columnIndex="0" GridPane.rowIndex="1"/>
                             <TextField fx:id="findField" GridPane.columnIndex="1" GridPane.rowIndex="1"
                                        GridPane.columnSpan="4"/>
-                            <Label text="Replace With:" GridPane.columnIndex="0" GridPane.rowIndex="2"/>
+                            <Label text="%Replace With:" wrapText="true" GridPane.columnIndex="0" GridPane.rowIndex="2"/>
                             <TextField fx:id="replaceField" GridPane.columnIndex="1" GridPane.rowIndex="2"
                                        GridPane.columnSpan="4"/>
                             <CheckBox fx:id="selectFieldOnly" GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.columnSpan="2"
-                                     text="Limit to Selected Entries"/>
+                                     text="%Limit to Selected Entries"/>
                             <RadioButton fx:id="allReplace" GridPane.columnIndex="0" GridPane.rowIndex="5" GridPane.columnSpan="2"
-                                         selected="true" text="All Field Replace">
+                                         selected="true" text="%All Field Replace">
                                 <toggleGroup>
                                     <ToggleGroup fx:id="radioGroup"/>
                                 </toggleGroup>
                             </RadioButton>
                             <RadioButton GridPane.columnIndex="0" GridPane.rowIndex="6" GridPane.columnSpan="2"
-                                         text="Limit to Fields:" toggleGroup="$radioGroup"/>
+                                         text="%Limit to Fields" toggleGroup="$radioGroup"/>
                             <TextField fx:id="limitFieldInput" GridPane.columnIndex="2" GridPane.rowIndex="6"
                                        GridPane.columnSpan="3"/>
                         </GridPane>
@@ -53,6 +53,6 @@
             </center>
         </BorderPane>
     </content>
-    <ButtonType fx:id="replaceButton" text="Replace" buttonData="OK_DONE"/>
+    <ButtonType fx:id="replaceButton" text="%Replace" buttonData="OK_DONE"/>
     <ButtonType fx:constant="CANCEL"/>
 </DialogPane>
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 8fee34e4680..1ecc4adb9eb 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -897,6 +897,10 @@ Removed\ string=Removed string
 Renamed\ string=Renamed string
 
 Replace=Replace
+Replace\ With\:=Replace With:
+Limit\ to\ Selected\ Entries=Limit to Selected Entries
+Limit\ to\ Fields=Limit to Fields
+All\ Field\ Replace=All Field Replace
 
 Replace\ (regular\ expression)=Replace (regular expression)
 

From 6c65676f7b5eb567d3027c75f9209f99b077764b Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Sat, 11 Aug 2018 14:45:52 +0800
Subject: [PATCH 036/229] Fix#3861_build_addneeded/deleteobsoleteproperties

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

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 1ecc4adb9eb..c8916d12c33 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -71,8 +71,6 @@ Advanced=Advanced
 All\ entries=All entries
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=All entries of this type will be declared typeless. Continue?
 
-All\ fields=All fields
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Always reformat BIB file on save and export
 
 and=and
@@ -623,10 +621,6 @@ Leave\ file\ in\ its\ current\ directory=Leave file in its current directory
 
 Left=Left
 
-Limit\ to\ fields=Limit to fields
-
-Limit\ to\ selected\ entries=Limit to selected entries
-
 Link=Link
 Link\ local\ file=Link local file
 Link\ to\ file\ %0=Link to file %0
@@ -728,8 +722,6 @@ Nothing\ to\ redo=Nothing to redo
 
 Nothing\ to\ undo=Nothing to undo
 
-occurrences=occurrences
-
 OK=OK
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=One or more keys will be overwritten. Continue?
@@ -901,18 +893,15 @@ Replace\ With\:=Replace With:
 Limit\ to\ Selected\ Entries=Limit to Selected Entries
 Limit\ to\ Fields=Limit to Fields
 All\ Field\ Replace=All Field Replace
+Find\:=Find:
 
 Replace\ (regular\ expression)=Replace (regular expression)
 
-Replace\ string=Replace string
-
-Replace\ with=Replace with
+Replace\ String=Replace String
 
 Replace\ Unicode\ ligatures=Replace Unicode ligatures
 Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Replaces Unicode ligatures with their expanded form
 
-Replaced=Replaced
-
 Required\ fields=Required fields
 
 Reset\ all=Reset all
@@ -956,8 +945,6 @@ Search=Search
 
 Search\ expression=Search expression
 
-Search\ for=Search for
-
 Searching\ for\ duplicates...=Searching for duplicates...
 
 Searching\ for\ files=Searching for files
@@ -1033,8 +1020,6 @@ Status=Status
 
 Stop=Stop
 
-Strings=Strings
-
 Strings\ for\ library=Strings for library
 
 Sublibrary\ from\ AUX=Sublibrary from AUX
@@ -1619,7 +1604,6 @@ Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Please move the file ma
 Could\ not\ connect\ to\ %0=Could not connect to %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Warning: %0 out of %1 entries have undefined title.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Warning: %0 out of %1 entries have undefined BibTeX key.
-occurrence=occurrence
 Added\ new\ '%0'\ entry.=Added new '%0' entry.
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Multiple entries selected. Do you want to change the type of all these to '%0'?
 Changed\ type\ to\ '%0'\ for=Changed type to '%0' for

From 45152d57ec9bac46d1d409a39191dd8806523cd3 Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Sat, 11 Aug 2018 14:51:56 +0800
Subject: [PATCH 037/229] Fix#3861_build_addneeded/deleteobsoleteproperties2

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

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index c8916d12c33..77ac5aafa9d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -898,6 +898,7 @@ Find\:=Find:
 Replace\ (regular\ expression)=Replace (regular expression)
 
 Replace\ String=Replace String
+Replace\ string=Replace string
 
 Replace\ Unicode\ ligatures=Replace Unicode ligatures
 Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Replaces Unicode ligatures with their expanded form

From 909f67ce5fbd0193ceb0784a481e82c6228eb015 Mon Sep 17 00:00:00 2001
From: Florian Beetz <florian1.beetz@stud.uni-bamberg.de>
Date: Sat, 11 Aug 2018 12:10:21 +0200
Subject: [PATCH 038/229] Remove Spin comments

---
 external-libraries.txt                                    | 6 ------
 .../java/org/jabref/gui/exporter/SaveDatabaseAction.java  | 8 +++-----
 .../jabref/gui/importer/actions/GUIPostOpenAction.java    | 3 +--
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/external-libraries.txt b/external-libraries.txt
index f993a4713db..7688c032dc6 100644
--- a/external-libraries.txt
+++ b/external-libraries.txt
@@ -235,10 +235,4 @@ Project: XMLUnit
 URL:     http://www.xmlunit.org/
 License: Apache-2.0
 
-Id:      spin
-Path:    lib/spin.jar
-Project: Spin
-URL:     http://spin.sourceforge.net/
-License: LGPL-2.1+
-
 The last entry has to end with an empty line. Otherwise the entry is not present in About.html.
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 0278f8ea3b6..e0f27a1116d 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -51,7 +51,7 @@
  * Action for the "Save" and "Save as" operations called from BasePanel. This class is also used for
  * save operations when closing a database or quitting the applications.
  *
- * The operations run synchronously, but offload the save operation from the event thread using Spin.
+ * The save operation is loaded off of the GUI thread using {@link BackgroundTask}.
  * Callers can query whether the operation was canceled, or whether it was successful.
  */
 public class SaveDatabaseAction implements BaseAction {
@@ -271,8 +271,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset encoding)
     }
 
     /**
-     * Run the "Save" operation. This method offloads the actual save operation to a background thread, but
-     * still runs synchronously using Spin (the method returns only after completing the operation).
+     * Run the "Save" operation. This method offloads the actual save operation to a background thread.
      */
     public void runCommand() throws Exception {
         action();
@@ -301,8 +300,7 @@ public void saveAs() throws Exception {
     }
 
     /**
-     * Run the "Save as" operation. This method offloads the actual save operation to a background thread, but
-     * still runs synchronously using Spin (the method returns only after completing the operation).
+     * Run the "Save as" operation. This method offloads the actual save operation to a background thread.
      */
     public void saveAs(File file) throws Exception {
         BibDatabaseContext context = panel.getBibDatabaseContext();
diff --git a/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java b/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
index e6015fbb593..739c11305e4 100644
--- a/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
@@ -28,8 +28,7 @@ public interface GUIPostOpenAction {
      *
      * Note: if several such methods need to be called sequentially, it is
      *       important that all implementations of this method do not return
-     *       until the operation is finished. If work needs to be off-loaded
-     *       into a worker thread, use Spin to do this synchronously.
+     *       until the operation is finished.
      *
      * @param panel The BasePanel where the database is shown.
      * @param pr The result of the BIB parse operation.

From b2544877c0898de1532f7387e0672c1eac3492b5 Mon Sep 17 00:00:00 2001
From: marisuki <1539678784@qq.com>
Date: Sat, 11 Aug 2018 18:46:23 +0800
Subject: [PATCH 039/229] Fix

---
 src/main/java/org/jabref/gui/ReplaceString.fxml | 2 +-
 src/main/resources/l10n/JabRef_en.properties    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/ReplaceString.fxml b/src/main/java/org/jabref/gui/ReplaceString.fxml
index 39cf4fddfa5..3bf75a8f8a2 100644
--- a/src/main/java/org/jabref/gui/ReplaceString.fxml
+++ b/src/main/java/org/jabref/gui/ReplaceString.fxml
@@ -28,7 +28,7 @@
                                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                             </rowConstraints>
-                            <Label text="Find and Replace"/>
+                            <Label text="%Find and Replace"/>
                             <Label text="%Find:" GridPane.columnIndex="0" GridPane.rowIndex="1"/>
                             <TextField fx:id="findField" GridPane.columnIndex="1" GridPane.rowIndex="1"
                                        GridPane.columnSpan="4"/>
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 77ac5aafa9d..6c7e4ca7907 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -894,6 +894,7 @@ Limit\ to\ Selected\ Entries=Limit to Selected Entries
 Limit\ to\ Fields=Limit to Fields
 All\ Field\ Replace=All Field Replace
 Find\:=Find:
+Find\ and\ Replace=Find and Replace
 
 Replace\ (regular\ expression)=Replace (regular expression)
 

From 1b3f9ecd122d8c247a255fb3ee3d1e5d65f40dae Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sun, 12 Aug 2018 01:01:40 +0200
Subject: [PATCH 040/229] Fix display of checkboxes

---
 src/main/java/org/jabref/gui/Base.css         | 25 +++++++++++++++++++
 .../org/jabref/styletester/StyleTester.fxml   | 13 +++++++++-
 .../jabref/styletester/StyleTesterMain.java   |  5 ++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index c8f64693ba5..74e0df96bcb 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -10,6 +10,7 @@
     -jr-theme: #50618F;
     -jr-accent: #a3b7e6;
     -jr-selected: -jr-accent;
+    -jr-checked: -jr-theme;
     -jr-hover: #0002;
 
     /* The base gray. Most gray-tones in the application are derived from this color. */
@@ -370,6 +371,30 @@
     -fx-padding: -0.1em 0.5em 0.5em 0.5em;
 }
 
+.check-box {
+    -fx-label-padding: 0.0em 0.0em 0.0em 0.75em;
+    -fx-text-fill: -fx-text-background-color;
+}
+
+.check-box > .box {
+    -fx-border-color: rgba(0, 0, 0, 0.54);
+    -fx-border-width: 2px;
+    -fx-border-radius: 1px;
+    -fx-padding: 0.166667em 0.166667em 0.25em 0.25em;
+}
+
+.check-box:selected > .box {
+    -fx-background-insets: 2px;
+    -fx-border-color: -jr-checked;
+    -fx-background-color: -jr-checked;
+}
+
+.check-box > .box > .mark {
+    -fx-background-color: white;
+    -fx-padding: 0.166667em 0.166667em 0.166667em 0.166667 m;
+    -fx-shape: "M6.61 11.89L3.5 8.78 2.44 9.84 6.61 14l8.95-8.95L14.5 4z";
+}
+
 .menu-bar {
     -fx-background-color: -jr-menu-background;
     -fx-background-insets: 0;
diff --git a/src/main/java/org/jabref/styletester/StyleTester.fxml b/src/main/java/org/jabref/styletester/StyleTester.fxml
index 64f9bbe5624..8ace521ed71 100644
--- a/src/main/java/org/jabref/styletester/StyleTester.fxml
+++ b/src/main/java/org/jabref/styletester/StyleTester.fxml
@@ -33,7 +33,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-<AnchorPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="400.0" prefWidth="700.0"
+<AnchorPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="600.0" prefWidth="900.0"
             xmlns="http://javafx.com/javafx/8.0.121" fx:controller="org.jabref.styletester.StyleTesterView">
     <TabPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
              AnchorPane.topAnchor="0.0">
@@ -161,6 +161,17 @@
                 </Button>
             </GridPane>
         </Tab>
+        <Tab text="Switches">
+            <VBox style="-fx-padding: 1em" spacing="10">
+                <Label text="Checkboxes"/>
+                <VBox style="-fx-padding: 0em 0em 0em 1em" spacing="15">
+                    <CheckBox text="Unchecked"/>
+                    <CheckBox text="Checked" selected="true"/>
+                    <CheckBox text="Unchecked disabled" disable="true"/>
+                    <CheckBox text="Checked disabled" disable="true" selected="true"/>
+                </VBox>
+            </VBox>
+        </Tab>
         <Tab>
             <VBox layoutX="194.0" layoutY="14.0" prefHeight="200.0" prefWidth="100.0">
                 <children>
diff --git a/src/main/java/org/jabref/styletester/StyleTesterMain.java b/src/main/java/org/jabref/styletester/StyleTesterMain.java
index 1db0f6e3048..1bd2cc75d9c 100644
--- a/src/main/java/org/jabref/styletester/StyleTesterMain.java
+++ b/src/main/java/org/jabref/styletester/StyleTesterMain.java
@@ -33,4 +33,9 @@ public void start(Stage stage) {
         stage.setScene(scene);
         stage.show();
     }
+
+    @Override
+    public void stop() {
+        JabRefExecutorService.INSTANCE.shutdownEverything();
+    }
 }

From 7d4b2ae0f8b806a5a5de091380b1e1e2a356015a Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 14 Aug 2018 12:32:29 +0200
Subject: [PATCH 041/229] Fix "Manage journal abbreviations" dialog (#4263)

* Fix "Manage journal abbreviations" dialog

* Use task executor for async task
---
 .../journals/ManageJournalAbbreviations.css   | 10 ---
 .../journals/ManageJournalAbbreviations.fxml  | 74 +++++++++----------
 .../ManageJournalAbbreviationsView.java       | 32 ++------
 .../ManageJournalAbbreviationsViewModel.java  | 21 +++---
 4 files changed, 54 insertions(+), 83 deletions(-)

diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.css b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.css
index 8e2948e5f46..86fe501eb2e 100644
--- a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.css
+++ b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.css
@@ -1,8 +1,3 @@
-.custom-buttons {
-    -fx-margin-top: 10px;
-    -fx-padding: 5px;
-}
-
 .abbreviations-table {
 	-fx-table-cell-border-color: transparent;
 }
@@ -20,8 +15,3 @@
 .table-row-cell:selected > .table-cell > .icon, .table-row-cell:pressed > .table-cell > .icon {
    -fx-fill: white;
 }
-
-.dialog-pane *.button-bar {
-	-fx-max-height: 0;
-	-fx-pref-height: 0;
-}
\ No newline at end of file
diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.fxml b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.fxml
index 93115e01b8e..9044de941dc 100644
--- a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.fxml
+++ b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.fxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Label?>
@@ -9,57 +9,51 @@
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
 <DialogPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="400.0" prefWidth="600.0"
             xmlns="http://javafx.com/javafx/8.0.65"
             fx:controller="org.jabref.gui.journals.ManageJournalAbbreviationsView">
    <content>
-      <BorderPane prefHeight="200.0" prefWidth="200.0">
-         <center>
-            <TableView fx:id="journalAbbreviationsTable" editable="true" styleClass="abbreviations-table" BorderPane.alignment="CENTER">
+       <TableView fx:id="journalAbbreviationsTable" editable="true" styleClass="abbreviations-table">
               <columns>
-                <TableColumn fx:id="journalTableNameColumn" prefWidth="200.0" text="%Full journal name" />
-                <TableColumn fx:id="journalTableAbbreviationColumn" prefWidth="200.0" text="%Abbreviation name" />
-                  <TableColumn fx:id="journalTableEditColumn" maxWidth="40" minWidth="40.0" prefWidth="40.0" />
-                  <TableColumn fx:id="journalTableDeleteColumn" maxWidth="40" minWidth="40.0" prefWidth="40.0" />
+                  <TableColumn fx:id="journalTableNameColumn" prefWidth="200.0" text="%Full journal name"/>
+                  <TableColumn fx:id="journalTableAbbreviationColumn" prefWidth="200.0" text="%Abbreviation name"/>
+                  <TableColumn fx:id="journalTableEditColumn" maxWidth="40" minWidth="40.0" prefWidth="40.0"/>
+                  <TableColumn fx:id="journalTableDeleteColumn" maxWidth="40" minWidth="40.0" prefWidth="40.0"/>
               </columns>
-               <columnResizePolicy>
-                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-               </columnResizePolicy>
-            </TableView>
-         </center>
-         <bottom>
-            <ButtonBar prefHeight="40.0" styleClass="custom-buttons" BorderPane.alignment="CENTER">
-              <buttons>
-                  <Label fx:id="loadingLabel" maxHeight="30.0" text="%Loading built in lists" ButtonBar.buttonData="LEFT" ButtonBar.buttonUniformSize="false" />
-                  <ProgressIndicator fx:id="progressIndicator" maxHeight="30.0" opacity="0.4" ButtonBar.buttonData="LEFT" ButtonBar.buttonUniformSize="false" />
-                <Button fx:id="cancelButton" cancelButton="true" mnemonicParsing="false" onAction="#closeDialog" text="%Cancel" ButtonBar.buttonData="CANCEL_CLOSE" />
-                  <Button fx:id="saveButton" defaultButton="true" mnemonicParsing="false" onAction="#saveAbbreviationsAndCloseDialog" text="%Save changes" ButtonBar.buttonData="OK_DONE" />
-              </buttons>
-            </ButtonBar>
-         </bottom>
-      </BorderPane>
+           <columnResizePolicy>
+               <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+           </columnResizePolicy>
+           <placeholder>
+               <Label fx:id="loadingLabel" maxHeight="30.0" text="%Loading built in lists"/>
+               <ProgressIndicator fx:id="progressIndicator" maxHeight="30.0" opacity="0.4"/>
+           </placeholder>
+       </TableView>
    </content>
    <header>
-      <HBox spacing="10.0" styleClass="custom-header">
-         <children>
-            <ComboBox fx:id="journalFilesBox" minWidth="200.0" promptText="%No abbreviation files loaded" styleClass="journal-lists" HBox.hgrow="ALWAYS" />
-            <Pane HBox.hgrow="ALWAYS" />
-            <Button fx:id="addNewJournalFileButton" mnemonicParsing="false" onAction="#addNewFile" styleClass="icon">
+       <HBox spacing="10.0" styleClass="custom-header">
+           <ComboBox fx:id="journalFilesBox" minWidth="200.0" promptText="%No abbreviation files loaded"
+                     HBox.hgrow="ALWAYS"/>
+           <Pane HBox.hgrow="ALWAYS"/>
+           <Button fx:id="addNewJournalFileButton" mnemonicParsing="false" onAction="#addNewFile" styleClass="icon">
                <tooltip>
-                  <Tooltip autoHide="true" text="%Create new list" />
-               </tooltip></Button>
-          <Button fx:id="addJournalFileButton" mnemonicParsing="false" onAction="#openFile" styleClass="icon">
+                   <Tooltip autoHide="true" text="%Create new list"/>
+               </tooltip>
+           </Button>
+           <Button fx:id="addJournalFileButton" mnemonicParsing="false" onAction="#openFile" styleClass="icon">
                <tooltip>
-                  <Tooltip autoHide="true" text="%Add existing file" />
-               </tooltip></Button>
-            <Button fx:id="removeJournalAbbreviationsButton" mnemonicParsing="false" onAction="#removeList" styleClass="icon">
+                   <Tooltip autoHide="true" text="%Add existing file"/>
+               </tooltip>
+           </Button>
+           <Button fx:id="removeJournalAbbreviationsButton" mnemonicParsing="false" onAction="#removeList"
+                   styleClass="icon">
                <tooltip>
-                  <Tooltip autoHide="true" text="%Remove list" />
-               </tooltip></Button>
-         </children>
-      </HBox>
+                   <Tooltip autoHide="true" text="%Remove list"/>
+               </tooltip>
+           </Button>
+       </HBox>
    </header>
+    <ButtonType fx:id="saveButton" text="%Save changes" buttonData="OK_DONE"/>
+    <ButtonType fx:constant="CANCEL"/>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java
index c6ded9668f3..42611dccbed 100644
--- a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java
+++ b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java
@@ -2,9 +2,9 @@
 
 import javax.inject.Inject;
 
-import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressIndicator;
@@ -13,11 +13,11 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyCode;
-import javafx.stage.Stage;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
@@ -34,12 +34,12 @@ public class ManageJournalAbbreviationsView extends BaseDialog<Void> {
 
     @FXML public Label loadingLabel;
     @FXML public ProgressIndicator progressIndicator;
+    @FXML private ButtonType saveButton;
     @FXML private TableView<AbbreviationViewModel> journalAbbreviationsTable;
     @FXML private TableColumn<AbbreviationViewModel, String> journalTableNameColumn;
     @FXML private TableColumn<AbbreviationViewModel, String> journalTableAbbreviationColumn;
     @FXML private TableColumn<AbbreviationViewModel, Boolean> journalTableEditColumn;
     @FXML private TableColumn<AbbreviationViewModel, Boolean> journalTableDeleteColumn;
-    @FXML private Button cancelButton;
     @FXML private ComboBox<AbbreviationsFileViewModel> journalFilesBox;
     @FXML private Button addJournalFileButton;
     @FXML private Button addNewJournalFileButton;
@@ -57,6 +57,8 @@ public ManageJournalAbbreviationsView() {
         ViewLoader.view(this)
                   .load()
                   .setAsDialogPane(this);
+
+        ControlHelper.setAction(saveButton, getDialogPane(), event -> saveAbbreviationsAndCloseDialog());
     }
 
     @FXML
@@ -129,11 +131,7 @@ private void setUpTable() {
     private void setBindings() {
         journalAbbreviationsTable.itemsProperty().bindBidirectional(viewModel.abbreviationsProperty());
         journalFilesBox.itemsProperty().bindBidirectional(viewModel.journalFilesProperty());
-
-        viewModel.currentFileProperty().addListener((observable, oldvalue, newvalue) ->
-                journalFilesBox.getSelectionModel().select(newvalue));
-        journalFilesBox.getSelectionModel().selectedItemProperty()
-                .addListener((observable, oldvalue, newvalue) -> viewModel.currentFileProperty().set(newvalue));
+        journalFilesBox.valueProperty().bindBidirectional(viewModel.currentFileProperty());
 
         viewModel.currentAbbreviationProperty().addListener((observable, oldvalue, newvalue) ->
                 journalAbbreviationsTable.getSelectionModel().select(newvalue));
@@ -185,24 +183,10 @@ private void removeAbbreviation() {
         viewModel.deleteAbbreviation();
     }
 
-    @FXML
-    private void closeDialog() {
-        Stage stage = (Stage) cancelButton.getScene().getWindow();
-        stage.close();
-    }
-
     @FXML
     private void saveAbbreviationsAndCloseDialog() {
-        Task<Void> task = new Task<Void>() {
-
-            @Override
-            protected Void call() {
-                viewModel.saveEverythingAndUpdateAutoCompleter();
-                return null;
-            }
-        };
-        new Thread(task).start();
-        closeDialog();
+        viewModel.saveEverythingAndUpdateAutoCompleter();
+        close();
     }
 
 
diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java
index 46ceada6cfe..bce2327a58f 100644
--- a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java
+++ b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java
@@ -99,7 +99,7 @@ public ManageJournalAbbreviationsViewModel(PreferencesService preferences, Dialo
                 }
             }
         });
-        isLoading.bind(isLoadingBuiltIn.and(isLoadingBuiltIn));
+        isLoading.bind(isLoadingBuiltIn.or(isLoadingIeee));
     }
 
     public SimpleBooleanProperty isLoadingProperty() {
@@ -121,6 +121,7 @@ void addBuiltInLists() {
                 .onSuccess(result -> {
                     isLoadingBuiltIn.setValue(false);
                     addList(Localization.lang("JabRef built in list"), result);
+                    selectLastJournalFile();
                 })
                 .onFailure(dialogService::showErrorDialogAndWait)
                 .executeWith(taskExecutor);
@@ -350,17 +351,19 @@ public void selectLastJournalFile() {
      * {@link JournalAbbreviationLoader#update(JournalAbbreviationPreferences)}.
      */
     public void saveEverythingAndUpdateAutoCompleter() {
-        saveExternalFilesList();
+        BackgroundTask.wrap(() -> {
+            saveExternalFilesList();
 
-        if (shouldWriteLists) {
-            saveJournalAbbreviationFiles();
-            shouldWriteLists = false;
-        }
+            if (shouldWriteLists) {
+                saveJournalAbbreviationFiles();
+                shouldWriteLists = false;
+            }
 
-        // Update journal abbreviation loader
-        journalAbbreviationLoader.update(abbreviationsPreferences);
+            // Update journal abbreviation loader
+            journalAbbreviationLoader.update(abbreviationsPreferences);
 
-        preferences.storeJournalAbbreviationPreferences(abbreviationsPreferences);
+            preferences.storeJournalAbbreviationPreferences(abbreviationsPreferences);
+        }).executeWith(taskExecutor);
     }
 
     public SimpleListProperty<AbbreviationsFileViewModel> journalFilesProperty() {

From a880addc0b9a45ad4461cc46ed261ea7df9c812a Mon Sep 17 00:00:00 2001
From: Yichen Sun <Metatronwings@foxmail.com>
Date: Thu, 16 Aug 2018 15:17:32 +0800
Subject: [PATCH 042/229] Fix for issue 3959: migrate all tests to JUnit 5
 (#4260)

* Update migrate from JUnit 4 to JUnit 5

* Update migrate from JUnit 4 to JUnit 5

* Trying to change git accounts on my laptop

* Trying to change git accounts on my laptop

* Trying to change git accounts on my laptop

* Using static assert methods.

* Migrate from JUnit 4 to JUnit 5

*AuthorListParameterTest.java

* Migrate from JUnit 4 to JUnit 5

*XmpUtilWriterTest.java

* Migrate from JUnit 4 to JUnit 5

*XmpUtilReaderTest.java

* Migrate from JUnit 4 to JUnit 5

*SearchQueryHighlightObservableTest.java

    -did not use MockitoExtension.class as its official version has not been released yet.

* Migrate from JUnit 4 to JUnit 5

*CitationEntryTest.java

* Migrate from JUnit 4 to JUnit 5

*RTFCharsTest.java

* Migrate from JUnit 4 to JUnit 5

*ProtectedTermsLoaderTest.java

    -When running tests, outputs in command line are different. I don't know if this change is correct.

* Trying to change to a new branch.

* commit_test

* delete my meaningless txt

* Migrate from JUnit 4 to JUnit 5

*AuthorAndToSemicolonReplacerTest.java

* Migrate from JUnit 4 to JUnit 5

*FileDialogConfigurationTest.java

* Migrate from JUnit 4 to JUnit 5

*IntegrityCheckTest.java

* Migrate from JUnit 4 to JUnit 5

*ModsExportFormatTest.java

* Migrate from JUnit 4 to JUnit 5

*AutoSetFileLinksUtilTest.java

* Migrate from JUnit 4 to JUnit 5

*MsBibExportFormatTest.java

* Migrate from JUnit 4 to JUnit 5

*CsvExportFormatTest.java

* Migrate from JUnit 4 to JUnit 5

*HtmlExportFormatTest.java

* Migrate from JUnit 4 to JUnit 5

*HtmlExportFormatTest.java

* Migrate from JUnit 4 to JUnit 5

*RenamePdfCleanupTest.java

* Migrate from JUnit 4 to JUnit 5

*ProtectedTermsListTest.java

* Migrate from JUnit 4 to JUnit 5

*MoveFilesCleanupTest.java

* Migrate from JUnit 4 to JUnit 5

*ImporterTest.java

* Migrate from JUnit 4 to JUnit 5

    *ExporterTest.java

* Try to trigger the Travis CI build.

* Try to trigger the Travis CI build.

* Migrate from JUnit 4 to JUnit 5

* Try to migrate from JUnit 4 to JUnit 5
    *BibTeXMLExporterTestFiles.java
        *Test, not finished

* Roll back to earlier version.
    *BibTeXMLExporterTestFiles.java
    *CleanupWorkerTest.java

* Migrate from JUnit 4 to JUnit 5
    *ImportFormatReaderIntegrationTest.java

* Migrate from JUnit 4 to JUnit 5
    *MimeTypeDetectorTest.java

* failed to modify CleanupWorkerTest

* failed to modify cleanupWorkTest

* change cleanupWorkerTest to initial

* ***DatabaseTest***
Migrate from JUnit 4 to JUnit 5
    *DBMSProcessorTest.java
        *Wait for the Travis CI

* ***DatabaseTest***
Migrate from JUnit 4 to JUnit 5
    *DBMSProcessorTest.java
        *Wait for the Travis CI

* Migrate from JUnit 4 to JUnit 5
    *BibTeXMLExporterTestFiles.java
    *MSBibExportFormatTestFiles.java
    *All the GUI tests

* Migrate from JUnit 4 to JUnit 5
    *CleanupWorkerTest.java

    *It seems that worker doesn't work in cleanupRenamePdfRenamesRelativeFile() and cleanupRelativePathsConvertAbsoluteToRelativePath()

* Migrate JUnit 4 to JUnit 5.
    *AuthorListParameterTest.java
        -Follow up tp the newest.

* Migrate JUnit 4 to JUnit 5.
    *CleanupWorkerTest.java
        -Delete my sout.

* Migrate JUnit 4 to JUnit 5.
    *EntryTypesTest.java
        -Just some method name changes.

* Fix part of CleanupWorkerTest.
    -cleanupRelativePathsConvertAbsoluteToRelativePath() test passed.
    -The cleanupRenamePdfRenamesRelativeFile() test still failed.

* Migrate and sync.
    *CiteKeyBasedFileFinderTest.java

* Migrate.
    *FileUtilTest.java
Partly migrate.
    *ModsExportFormatTestFiles.java

* Fix CleanupWorkerTest.java

* Fix .travis.yml

* Remove unnecessary @Rule.
    *IntegrityCheckTest.java

* AuxParserTest.java

* BibtexParserTest.java

* EntryComparatorTest.java

* Migrate JUnit 4 to JUnit 5 -------by 1160300229

* Migrate. Some tasks by my team members.
    *LinkedFileViewModelTest.java
    *RecursiveTreeItemTest.java
    *UndoTest.java
    *EntryComparatorTest.java
    *MakeLabelWithDatabaseTest.java
    *MakeLabelWithoutDatabaseTest.java
    *CleanupUrlFormatterTest.java
    *BibtexParserTest.java
    *MedlinePlainImporterTest.java
    *SilverPlatterImporterTest.java
    *EntryLinkCheckerTest.java
    *LocalizationKeyTest.java
    *JabRefPreferencesTest.java

* Fix 1160300302's error.

* Remove unnecessary "public".
    *AuxParserTest.java

* fix architecture test by removing check for public make some classes default visibility level

* Fix "cannot find files" problem in JUnit 4.

* Migrate to JUnit 5.
    *BibTeXMLExporterTestFiles.java
    *ModsExportFormatTestFiles.java
    *MSBibExportFormatTestFiles.java

* Change the slash direction.
    *BibTeXMLExporterTestFiles.java
    *ModsExportFormatTestFiles.java
    *MSBibExportFormatTestFiles.java

* fix resolving of paths in msbibexporterpath update junit and correct resource dirs in gradle

* Fix the path issue in
    *BibTeXMLExporterTestFiles.java
    *ModsExportFormatTestFiles.java

* Disable the failing exporter tests and change the build.gradle

* Fix the parent folder issue by make every path to their child once.
    -You can see in the code. :)

* Fix some minor issues.
    -Use the NIO methods in MoveFilesCleanupTest.java

    -Use toAbsolutePath() method in RenamePdfCleanupTest.java

    -Rename "tempFilename" to "tempFilePath" in BibTeXMLExporterTestFiles.java

* include main/java in resources as well convert legalcy file methods to nio
---
 .travis.yml                                   |   1 +
 build.gradle                                  |  22 +-
 .../org/jabref/JabRefPreferencesTest.java     |   8 +-
 .../architecture/TestArchitectureTests.java   |   2 +-
 .../java/org/jabref/gui/AbstractUITest.java   |   9 +-
 src/test/java/org/jabref/gui/DialogTest.java  |   7 +-
 src/test/java/org/jabref/gui/DialogTest2.java |   9 +-
 .../java/org/jabref/gui/EntryTableTest.java   |  15 +-
 src/test/java/org/jabref/gui/GUITest.java     |   6 +-
 .../org/jabref/gui/IdFetcherDialogTest.java   |  39 +--
 .../gui/ParameterizedDialogNewEntryTest.java  |  67 ++---
 .../jabref/gui/ParameterizedDialogTest.java   |  42 +--
 .../gui/ParameterizedMenuNewEntryTest.java    |  33 +--
 src/test/java/org/jabref/gui/UndoTest.java    |  14 +-
 .../gui/UpdateTimestampListenerTest.java      |   8 +-
 .../AutoSetFileLinksUtilTest.java             |  23 +-
 .../IdentifierEditorViewModelTest.java        |   2 +-
 .../fieldeditors/LinkedFileViewModelTest.java |  10 +-
 .../jabref/gui/search/SearchResultsTest.java  |  11 +-
 .../gui/util/FileDialogConfigurationTest.java |  32 +--
 .../gui/util/RecursiveTreeItemTest.java       |  13 +-
 .../jabref/logic/auxparser/AuxParserTest.java |  24 +-
 .../comparator/EntryComparatorTest.java       |   6 +-
 .../MakeLabelWithDatabaseTest.java            | 107 ++++----
 .../MakeLabelWithoutDatabaseTest.java         |  11 +-
 .../logic/cleanup/CleanupWorkerTest.java      | 157 ++++++-----
 .../logic/cleanup/MoveFilesCleanupTest.java   |  85 +++---
 .../logic/cleanup/RenamePdfCleanupTest.java   |  65 +++--
 .../exporter/BibTeXMLExporterTestFiles.java   |  57 ++--
 .../logic/exporter/CsvExportFormatTest.java   |  66 ++---
 .../jabref/logic/exporter/ExporterTest.java   |  67 +++--
 .../logic/exporter/HtmlExportFormatTest.java  |  30 +-
 .../exporter/MSBibExportFormatTestFiles.java  |  55 ++--
 .../logic/exporter/ModsExportFormatTest.java  |  25 +-
 .../exporter/ModsExportFormatTestFiles.java   |  88 +++---
 .../logic/exporter/MsBibExportFormatTest.java |  27 +-
 .../logic/exporter/XmpExporterTest.java       |  28 +-
 .../bibtexfields/CleanupUrlFormatterTest.java |  18 +-
 .../ImportFormatReaderIntegrationTest.java    |  52 ++--
 .../jabref/logic/importer/ImporterTest.java   | 132 ++++-----
 .../importer/fileformat/BibtexParserTest.java | 258 +++++++++---------
 .../fileformat/MedlinePlainImporterTest.java  |  41 ++-
 .../fileformat/SilverPlatterImporterTest.java |  17 +-
 .../logic/integrity/EntryLinkCheckerTest.java |  26 +-
 .../logic/integrity/IntegrityCheckTest.java   |  29 +-
 .../logic/l10n/LocalizationKeyTest.java       |   8 +-
 .../AuthorAndToSemicolonReplacerTest.java     |  44 ++-
 .../logic/layout/format/RTFCharsTest.java     |  33 +--
 .../logic/net/MimeTypeDetectorTest.java       |  39 ++-
 .../logic/openoffice/CitationEntryTest.java   |  20 +-
 .../ProtectedTermsListTest.java               |  29 +-
 .../ProtectedTermsLoaderTest.java             |  78 +++---
 .../SearchQueryHighlightObservableTest.java   |  25 +-
 .../logic/shared/DBMSProcessorTest.java       | 157 ++++++-----
 .../util/io/CiteKeyBasedFileFinderTest.java   |  38 ++-
 .../jabref/logic/util/io/FileUtilTest.java    | 174 ++++++------
 .../jabref/logic/xmp/XmpUtilReaderTest.java   |  33 +--
 .../jabref/logic/xmp/XmpUtilWriterTest.java   |  48 ++--
 .../migrations/PreferencesMigrationsTest.java |  12 +-
 .../java/org/jabref/model/EntryTypesTest.java | 122 +++++----
 .../model/entry/AuthorListParameterTest.java  |  58 ++--
 61 files changed, 1372 insertions(+), 1390 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3a15e6569e2..e270879be38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,3 +71,4 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
+
diff --git a/build.gradle b/build.gradle
index b1b4dd1e5b6..5a5c8308e80 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,6 +65,14 @@ sourceSets {
             srcDirs = ["src/main/java", "src/main/resources"]
         }
     }
+    test{
+        java {
+            srcDirs = ["src/test/java"]
+        }
+        resources {
+            srcDirs = ["src/test/resources"]
+        }
+    }
 }
 
 repositories {
@@ -152,11 +160,11 @@ dependencies {
     compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.1.2'
     compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.1.2'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.2.0'
-    testCompile 'org.junit.jupiter:junit-jupiter-params:5.2.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.2.0'
-    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.2.0'
-    testCompile 'org.junit.platform:junit-platform-launcher:1.2.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.0-RC1'
+    testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.0-RC1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.0-RC1'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.0-RC1'
+    testCompile 'org.junit.platform:junit-platform-launcher:1.3.0-RC1'
     testCompile 'org.junit-pioneer:junit-pioneer:0.1.2'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.0'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.0'
@@ -197,7 +205,7 @@ dependencyUpdates.resolutionStrategy = {
                  selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9")
             }
         }
-		rules.withModule("com.github.tomtung:latex2unicode_2.12") { ComponentSelection selection ->
+        rules.withModule("com.github.tomtung:latex2unicode_2.12") { ComponentSelection selection ->
             if (selection.candidate.version ==~ /0.2.2/) { // Reject version higher than 2.0.2
                  selection.reject("Cannot be updated to 0.2.4 until JabRef is prepared for it")
             }
@@ -212,7 +220,7 @@ dependencyUpdates.resolutionStrategy = {
                 selection.reject("http://dev.mysql.com/downloads/connector/j/ lists the version 5.* as last stable version.")
             }
         }
-		
+        
     }
 }
 
diff --git a/src/test/java/org/jabref/JabRefPreferencesTest.java b/src/test/java/org/jabref/JabRefPreferencesTest.java
index 4a07bb58840..91f441936bf 100644
--- a/src/test/java/org/jabref/JabRefPreferencesTest.java
+++ b/src/test/java/org/jabref/JabRefPreferencesTest.java
@@ -7,22 +7,22 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class JabRefPreferencesTest {
+class JabRefPreferencesTest {
 
     private JabRefPreferences prefs;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         prefs = mock(JabRefPreferences.class);
         when(prefs.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
     }
 
     @Test
-    public void getDefaultEncodingReturnsPreviouslyStoredEncoding() {
+    void getDefaultEncodingReturnsPreviouslyStoredEncoding() {
         prefs.setDefaultEncoding(StandardCharsets.UTF_8);
         assertEquals(StandardCharsets.UTF_8, prefs.getDefaultEncoding());
     }
diff --git a/src/test/java/org/jabref/architecture/TestArchitectureTests.java b/src/test/java/org/jabref/architecture/TestArchitectureTests.java
index bacd49d4a31..1e98148ca4c 100644
--- a/src/test/java/org/jabref/architecture/TestArchitectureTests.java
+++ b/src/test/java/org/jabref/architecture/TestArchitectureTests.java
@@ -54,7 +54,7 @@ public static Stream<String[]> data() {
     @MethodSource("data")
     public void testsAreIndependent(String forbiddenPackage) throws IOException {
         Predicate<String> isForbiddenPackage = (s) -> s.startsWith("import " + forbiddenPackage);
-        Predicate<String> isExceptionClass = (s) -> exceptions.stream().anyMatch(exception -> s.startsWith("public class " + exception));
+        Predicate<String> isExceptionClass = (s) -> exceptions.stream().anyMatch(exception -> s.startsWith("class " + exception));
 
         try (Stream<Path> pathStream = Files.walk(Paths.get("src/test/"))) {
             List<Path> files = pathStream
diff --git a/src/test/java/org/jabref/gui/AbstractUITest.java b/src/test/java/org/jabref/gui/AbstractUITest.java
index 77c64d3e1bb..f5982cb4ff1 100644
--- a/src/test/java/org/jabref/gui/AbstractUITest.java
+++ b/src/test/java/org/jabref/gui/AbstractUITest.java
@@ -8,7 +8,6 @@
 import java.nio.file.Paths;
 
 import org.jabref.JabRefMain;
-import org.jabref.testutils.category.GUITest;
 
 import org.assertj.swing.fixture.AbstractWindowFixture;
 import org.assertj.swing.fixture.FrameFixture;
@@ -17,12 +16,12 @@
 import org.assertj.swing.image.ScreenshotTaker;
 import org.assertj.swing.junit.testcase.AssertJSwingJUnitTestCase;
 import org.assertj.swing.timing.Pause;
-import org.junit.Assert;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
 
 import static org.assertj.swing.launcher.ApplicationLauncher.application;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@Category(GUITest.class)
+@Tag("GUITest")
 public abstract class AbstractUITest extends AssertJSwingJUnitTestCase {
 
     protected final static int SPEED_NORMAL = 50;
@@ -105,6 +104,6 @@ protected void assertColumnValue(JTableFixture table, int rowIndex, int columnIn
         tableContent = table.contents();
 
         String value = tableContent[rowIndex][columnIndex];
-        Assert.assertEquals(value, selectionValue);
+        assertEquals(value, selectionValue);
     }
 }
diff --git a/src/test/java/org/jabref/gui/DialogTest.java b/src/test/java/org/jabref/gui/DialogTest.java
index a0c5c2d1156..fb038b8588b 100644
--- a/src/test/java/org/jabref/gui/DialogTest.java
+++ b/src/test/java/org/jabref/gui/DialogTest.java
@@ -3,18 +3,17 @@
 import javax.swing.JButton;
 import javax.swing.JDialog;
 
-import org.jabref.testutils.category.GUITest;
 
 import org.assertj.swing.core.GenericTypeMatcher;
 import org.assertj.swing.dependency.jsr305.Nonnull;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.swing.finder.WindowFinder.findDialog;
 /**
  * This test has been split to work, the other part can be found at DialogTest2
  */
-@Category(GUITest.class)
+@Tag("GUITest")
 public class DialogTest extends AbstractUITest {
 
     @Test
diff --git a/src/test/java/org/jabref/gui/DialogTest2.java b/src/test/java/org/jabref/gui/DialogTest2.java
index d1e6d1c1a3a..652532dd9bb 100644
--- a/src/test/java/org/jabref/gui/DialogTest2.java
+++ b/src/test/java/org/jabref/gui/DialogTest2.java
@@ -1,22 +1,19 @@
 package org.jabref.gui;
 
-
 import javax.swing.JButton;
 import javax.swing.JDialog;
 
-import org.jabref.testutils.category.GUITest;
-
 import org.assertj.swing.core.GenericTypeMatcher;
 import org.assertj.swing.dependency.jsr305.Nonnull;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.swing.finder.WindowFinder.findDialog;
 
 /**
  * Split of DialogTest, since the test cases were only running separately
  */
-@Category(GUITest.class)
+@Tag("GUITest")
 public class DialogTest2 extends AbstractUITest {
     @Test
     public void testCloseStyleSelectDialog() {
diff --git a/src/test/java/org/jabref/gui/EntryTableTest.java b/src/test/java/org/jabref/gui/EntryTableTest.java
index cf3cf12dd3b..61a4cd4ea91 100644
--- a/src/test/java/org/jabref/gui/EntryTableTest.java
+++ b/src/test/java/org/jabref/gui/EntryTableTest.java
@@ -3,13 +3,12 @@
 import java.awt.event.KeyEvent;
 import java.util.regex.Pattern;
 
-import org.jabref.testutils.category.GUITest;
-
 import org.assertj.swing.fixture.JTableCellFixture;
 import org.assertj.swing.fixture.JTableFixture;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * Specific Use-Case:
@@ -17,7 +16,7 @@
  * Then I click on the first entry again, and scroll through all of the lists entries, without having to click
  * on the table again.
  */
-@Category(GUITest.class)
+@Tag("GUITest")
 public class EntryTableTest extends AbstractUITest{
 
     private final static int SCROLL_ACTION_EXECUTION = 5;
@@ -51,13 +50,13 @@ public void scrollThroughEntryList() {
         //go throught the table and check if the entry with the correct index is selected
         for (int i=0; i < SCROLL_ACTION_EXECUTION; i++) {
             robot().pressAndReleaseKey(DOWN);
-            Assert.assertTrue(entryTable.selectionValue() != null);
+            assertNotNull(entryTable.selectionValue());
             assertColumnValue(entryTable, i+1, TITLE_COLUMN_INDEX, entryTable.selectionValue());
         }
         //do the same going up again
         for (int i = SCROLL_ACTION_EXECUTION; i > 0; i--) {
             robot().pressAndReleaseKey(UP);
-            Assert.assertTrue(entryTable.selectionValue() != null);
+            assertNotNull(entryTable.selectionValue());
             assertColumnValue(entryTable, i-1, TITLE_COLUMN_INDEX, entryTable.selectionValue());
         }
 
diff --git a/src/test/java/org/jabref/gui/GUITest.java b/src/test/java/org/jabref/gui/GUITest.java
index 5e8472d4330..92f93eaca61 100644
--- a/src/test/java/org/jabref/gui/GUITest.java
+++ b/src/test/java/org/jabref/gui/GUITest.java
@@ -9,12 +9,12 @@
 import org.assertj.swing.core.GenericTypeMatcher;
 import org.assertj.swing.dependency.jsr305.Nonnull;
 import org.assertj.swing.fixture.DialogFixture;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.swing.finder.WindowFinder.findDialog;
 
-@Category(org.jabref.testutils.category.GUITest.class)
+@Tag("GUITest")
 public class GUITest extends AbstractUITest {
 
     @Test
diff --git a/src/test/java/org/jabref/gui/IdFetcherDialogTest.java b/src/test/java/org/jabref/gui/IdFetcherDialogTest.java
index a326d6d382c..023d2c5f0fa 100644
--- a/src/test/java/org/jabref/gui/IdFetcherDialogTest.java
+++ b/src/test/java/org/jabref/gui/IdFetcherDialogTest.java
@@ -1,42 +1,29 @@
 package org.jabref.gui;
 
-
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.text.JTextComponent;
 
-import org.jabref.testutils.category.GUITest;
-
 import org.assertj.swing.core.GenericTypeMatcher;
 import org.assertj.swing.dependency.jsr305.Nonnull;
 import org.assertj.swing.fixture.JTableFixture;
 import org.assertj.swing.timing.Condition;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.assertj.swing.finder.WindowFinder.findDialog;
 import static org.assertj.swing.timing.Pause.pause;
 
-@RunWith(Parameterized.class)
-@Category(GUITest.class)
+@Tag("GUITest")
 public class IdFetcherDialogTest extends AbstractUITest {
 
-    private final String databaseMode, fetcherType, fetchID;
-
-    public IdFetcherDialogTest(String databaseMode, String fetcherType, String fetchID) {
-        this.databaseMode = databaseMode;
-        this.fetcherType = fetcherType;
-        this.fetchID = fetchID;
-    }
-
-    @Test
-    public void insertEmptySearchID() {
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void insertEmptySearchID(String databaseMode, String fetcherType, String fetchID) {
         mainFrame.menuItemWithPath("File", "New " + databaseMode + " database").click();
         JTableFixture entryTable = mainFrame.table();
 
@@ -76,8 +63,9 @@ protected boolean isMatching(@Nonnull JButton jButton) {
         entryTable.requireRowCount(0);
     }
 
-    @Test
-    public void testFetcherDialog() {
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void testFetcherDialog(String databaseMode, String fetcherType, String fetchID) {
         mainFrame.menuItemWithPath("File", "New " + databaseMode + " database").click();
         JTableFixture entryTable = mainFrame.table();
 
@@ -123,9 +111,8 @@ public boolean test() {
     }
 
 
-    @Parameterized.Parameters(name = "{index}: {0} : {1} : {2}")
-    public static Collection<Object[]> instancesToTest() {
-        return Arrays.asList(
+    public static Stream<Object[]> instancesToTest() {
+        return Stream.of(
                 new Object[]{"BibTeX", "DOI", "10.1002/9781118257517"},
                 new Object[]{"biblatex", "DOI", "10.1002/9781118257517"},
                 new Object[]{"BibTeX", "ISBN", "9780321356680"},
diff --git a/src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java b/src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java
index a67fab78cd7..6ce2bb71083 100644
--- a/src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java
+++ b/src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java
@@ -1,51 +1,38 @@
 package org.jabref.gui;
 
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Locale;
+import java.util.stream.Stream;
 
 import javax.swing.JButton;
 import javax.swing.JDialog;
 
-import org.jabref.testutils.category.GUITest;
-
 import org.assertj.swing.core.GenericTypeMatcher;
 import org.assertj.swing.dependency.jsr305.Nonnull;
 import org.assertj.swing.fixture.JTableFixture;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.assertj.swing.finder.WindowFinder.findDialog;
 
-@RunWith(Parameterized.class)
-@Category(GUITest.class)
+@Tag("GUITest")
 public class ParameterizedDialogNewEntryTest extends AbstractUITest {
 
-    private final String databaseMode;
-    private final String entryType;
-
-
-    public ParameterizedDialogNewEntryTest(String databaseMode, String entryType) {
-        this.databaseMode = databaseMode;
-        this.entryType = entryType;
-    }
-
-    @Test
-    public void addEntryOfGivenType() {
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void addEntryOfGivenType(String databaseMode, String entryType) {
         mainFrame.menuItemWithPath("File", "New " + databaseMode + " database").click();
         JTableFixture entryTable = mainFrame.table();
 
         entryTable.requireRowCount(0);
         mainFrame.menuItemWithPath("BibTeX", "New entry...").click();
 
-        selectEntryType();
+        selectEntryType(entryType);
 
         entryTable.requireRowCount(1);
     }
 
-    private void selectEntryType() {
+    private void selectEntryType(String entryType) {
         GenericTypeMatcher<JDialog> matcher = new GenericTypeMatcher<JDialog>(JDialog.class) {
 
             @Override
@@ -63,17 +50,18 @@ protected boolean isMatching(@Nonnull JButton jButton) {
         }).click();
     }
 
-    @Test
-    public void addEntryPlainTextOfGivenType() {
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void addEntryPlainTextOfGivenType(String databaseMode, String entryType) {
         mainFrame.menuItemWithPath("File", "New " + databaseMode + " database").click();
         JTableFixture entryTable = mainFrame.table();
 
         entryTable.requireRowCount(0);
         mainFrame.menuItemWithPath("BibTeX", "New entry from plain text...").click();
 
-        selectEntryType();
+        selectEntryType(entryType);
 
-        GenericTypeMatcher<JDialog> matcher2 = plainTextMatcher();
+        GenericTypeMatcher<JDialog> matcher2 = plainTextMatcher(entryType);
 
         findDialog(matcher2).withTimeout(10_000).using(robot()).button(new GenericTypeMatcher<JButton>(JButton.class) {
 
@@ -86,33 +74,35 @@ protected boolean isMatching(@Nonnull JButton jButton) {
         entryTable.requireRowCount(1);
     }
 
-    @Test
-    public void closeAddingEntryPlainTextOfGivenType() {
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void closeAddingEntryPlainTextOfGivenType(String databaseMode, String entryType) {
         mainFrame.menuItemWithPath("File", "New " + databaseMode + " database").click();
         JTableFixture entryTable = mainFrame.table();
 
         entryTable.requireRowCount(0);
         mainFrame.menuItemWithPath("BibTeX", "New entry from plain text...").click();
 
-        selectEntryType();
+        selectEntryType(entryType);
 
-        GenericTypeMatcher<JDialog> matcher2 = plainTextMatcher();
+        GenericTypeMatcher<JDialog> matcher2 = plainTextMatcher(entryType);
 
         findDialog(matcher2).withTimeout(10_000).using(robot()).close();
         entryTable.requireRowCount(0);
     }
 
-    @Test
-    public void cancelAddingEntryPlainTextOfGivenType() {
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void cancelAddingEntryPlainTextOfGivenType(String databaseMode, String entryType) {
         mainFrame.menuItemWithPath("File", "New " + databaseMode + " database").click();
         JTableFixture entryTable = mainFrame.table();
 
         entryTable.requireRowCount(0);
         mainFrame.menuItemWithPath("BibTeX", "New entry from plain text...").click();
 
-        selectEntryType();
+        selectEntryType(entryType);
 
-        GenericTypeMatcher<JDialog> matcher2 = plainTextMatcher();
+        GenericTypeMatcher<JDialog> matcher2 = plainTextMatcher(entryType);
 
         findDialog(matcher2).withTimeout(10_000).using(robot()).button(new GenericTypeMatcher<JButton>(JButton.class) {
 
@@ -125,7 +115,7 @@ protected boolean isMatching(@Nonnull JButton jButton) {
         entryTable.requireRowCount(0);
     }
 
-    private GenericTypeMatcher<JDialog> plainTextMatcher() {
+    private GenericTypeMatcher<JDialog> plainTextMatcher(String entryType) {
         GenericTypeMatcher<JDialog> matcher2 = new GenericTypeMatcher<JDialog>(JDialog.class) {
 
             @Override
@@ -136,13 +126,12 @@ protected boolean isMatching(JDialog dialog) {
         return matcher2;
     }
 
-    @Parameterized.Parameters(name = "{index}: {0} : {1}")
-    public static Collection<Object[]> instancesToTest() {
+    public static Stream<Object[]> instancesToTest() {
         // Create entry from menu
         // Structure:
         // {"BibTeX"/"biblatex", "type"}
         // @formatter:off
-        return Arrays.asList(
+        return Stream.of(
                 new Object[]{"BibTeX", "Article"},
 /*                new Object[]{"BibTeX", "InBook"},
                 new Object[]{"BibTeX", "Book"},
diff --git a/src/test/java/org/jabref/gui/ParameterizedDialogTest.java b/src/test/java/org/jabref/gui/ParameterizedDialogTest.java
index 1b54b602169..07d1f0a63e8 100644
--- a/src/test/java/org/jabref/gui/ParameterizedDialogTest.java
+++ b/src/test/java/org/jabref/gui/ParameterizedDialogTest.java
@@ -1,44 +1,25 @@
 package org.jabref.gui;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import javax.swing.JButton;
 import javax.swing.JDialog;
 
-import org.jabref.testutils.category.GUITest;
-
 import org.assertj.swing.core.GenericTypeMatcher;
 import org.assertj.swing.dependency.jsr305.Nonnull;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.assertj.swing.finder.WindowFinder.findDialog;
 
-@RunWith(Parameterized.class)
-@Category(GUITest.class)
+@Tag("GUITest")
 public class ParameterizedDialogTest extends AbstractUITest {
 
-    private final boolean createDatabase;
-    private final String[] menuPath;
-    private final String dialogTitle;
-    private final String buttonName;
-    private final boolean closeButton;
-
-
-    public ParameterizedDialogTest(boolean createDatabase, String[] menuPath, String dialogTitle, String buttonName,
-            boolean closeButton) {
-        this.createDatabase = createDatabase;
-        this.menuPath = menuPath;
-        this.dialogTitle = dialogTitle;
-        this.buttonName = buttonName;
-        this.closeButton = closeButton;
-    }
-
-    @Test
-    public void openAndExitDialog() {
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void openAndExitDialog(boolean createDatabase, String[] menuPath, String dialogTitle, String buttonName,
+                                  boolean closeButton) {
         if (createDatabase) {
             newDatabase();
         }
@@ -69,13 +50,12 @@ protected boolean isMatching(@Nonnull JButton jButton) {
         exitJabRef();
     }
 
-    @Parameterized.Parameters(name = "{index}: {1} -> {2} : {3}")
-    public static Collection<Object[]> instancesToTest() {
+    public static Stream<Object[]> instancesToTest() {
         // Opening and closing (in different ways) the dialogs accessible from the menus without doing anything else
         // Structure:
         // {create new database, {"Menu", "Submenu", "Sub-sub-menu"}, "Dialog title", "Button name", use close button}
         // @formatter:off
-        return Arrays.asList(
+        return Stream.of(
                 new Object[]{false, new String[]{"File", "Open library"}, "Open", "Cancel", false},
                 new Object[]{false, new String[]{"File", "Open library"}, "Open", "Close button", true},
                 new Object[]{true, new String[]{"File", "Append library"}, "Append library", "Cancel", false},
diff --git a/src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java b/src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java
index a709aa56b8a..31a66bb3b6c 100644
--- a/src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java
+++ b/src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java
@@ -1,33 +1,21 @@
 package org.jabref.gui;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import org.jabref.model.strings.StringUtil;
-import org.jabref.testutils.category.GUITest;
 
 import org.assertj.swing.fixture.JTableFixture;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@RunWith(Parameterized.class)
-@Category(GUITest.class)
+@Tag("GUITest")
 public class ParameterizedMenuNewEntryTest extends AbstractUITest {
 
-    private final String databaseMode;
-    private final String entryType;
-
-
-    public ParameterizedMenuNewEntryTest(String databaseMode, String entryType) {
-        this.databaseMode = databaseMode;
-        this.entryType = entryType;
-    }
-
     // Not working on Travis
-    @Test
-    public void addEntryOfGivenType() {
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void addEntryOfGivenType(String databaseMode, String entryType) {
         mainFrame.menuItemWithPath("File", "New " + databaseMode + " database").click();
         JTableFixture entryTable = mainFrame.table();
 
@@ -36,13 +24,12 @@ public void addEntryOfGivenType() {
         entryTable.requireRowCount(1);
     }
 
-    @Parameterized.Parameters(name = "{index}: {0} : {1}")
-    public static Collection<Object[]> instancesToTest() {
+    public static Stream<Object[]> instancesToTest() {
         // Create entry from menu
         // Structure:
         // {"BibTeX"/"biblatex", "type"}
         // @formatter:off
-        return Arrays.asList(
+        return Stream.of(
                 new Object[]{"BibTeX", "article"},
                 new Object[]{"BibTeX", "inbook"},
                 new Object[]{"BibTeX", "book"},
diff --git a/src/test/java/org/jabref/gui/UndoTest.java b/src/test/java/org/jabref/gui/UndoTest.java
index eb39452a5f1..b8b2fb3eb18 100644
--- a/src/test/java/org/jabref/gui/UndoTest.java
+++ b/src/test/java/org/jabref/gui/UndoTest.java
@@ -2,19 +2,17 @@
 
 import javax.swing.JButton;
 
-import org.jabref.testutils.category.GUITest;
-
 import org.assertj.swing.core.GenericTypeMatcher;
 import org.assertj.swing.dependency.jsr305.Nonnull;
 import org.assertj.swing.fixture.JTableFixture;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.swing.finder.WindowFinder.findDialog;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@Category(GUITest.class)
+@Tag("GUITest")
 public class UndoTest extends AbstractUITest {
 
     @Test
@@ -23,7 +21,7 @@ public void undoCutOfMultipleEntries() {
 
         JTableFixture entryTable = mainFrame.table();
 
-        assertTrue("The database must have at least 2 entries for the test to begin!", entryTable.rowCount() >= 2);
+        assertTrue(entryTable.rowCount() >= 2, "The database must have at least 2 entries for the test to begin!");
         entryTable.selectRows(0, 1);
         entryTable.requireSelectedRows(0, 1);
 
diff --git a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
index 664b78590bd..099058f40f1 100644
--- a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
+++ b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
@@ -14,7 +14,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class UpdateTimestampListenerTest {
+class UpdateTimestampListenerTest {
 
     private BibDatabase database;
     private BibEntry bibEntry;
@@ -23,7 +23,7 @@ public class UpdateTimestampListenerTest {
     private TimestampPreferences timestampPreferencesMock;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         database = new BibDatabase();
         bibEntry = new BibEntry();
 
@@ -36,7 +36,7 @@ public void setUp() {
     }
 
     @Test
-    public void updateTimestampEnabled() {
+    void updateTimestampEnabled() {
         final String timestampField = "timestamp";
         final String baseDate = "2000-1-1";
         final String newDate = "2000-1-2";
@@ -59,7 +59,7 @@ public void updateTimestampEnabled() {
     }
 
     @Test
-    public void updateTimestampDisabled() {
+    void updateTimestampDisabled() {
         final String timestampField = "timestamp";
         final String baseDate = "2000-1-1";
         final String newDate = "2000-1-2";
diff --git a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
index f1d590445b2..6b97ff2965a 100644
--- a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.externalfiles;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
 import java.util.TreeSet;
@@ -11,16 +13,17 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.metadata.FileDirectoryPreferences;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@ExtendWith(TempDirectory.class)
 public class AutoSetFileLinksUtilTest {
 
     private final FileDirectoryPreferences fileDirPrefs = mock(FileDirectoryPreferences.class);
@@ -28,13 +31,13 @@ public class AutoSetFileLinksUtilTest {
     private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
     private final ExternalFileTypes externalFileTypes = mock(ExternalFileTypes.class);
     private final BibEntry entry = new BibEntry("article");
-    @Rule public TemporaryFolder folder = new TemporaryFolder();
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeEach
+    public void setUp(@TempDirectory.TempDir Path folder) throws Exception {
+        Path path = folder.resolve("CiteKey.pdf");
+        Files.createFile(path);
         entry.setCiteKey("CiteKey");
-        folder.newFile("CiteKey.pdf");
-        when(databaseContext.getFileDirectoriesAsPaths(any())).thenReturn(Collections.singletonList(folder.getRoot().toPath()));
+        when(databaseContext.getFileDirectoriesAsPaths(any())).thenReturn(Collections.singletonList(path.getParent()));
         when(externalFileTypes.getExternalFileTypeSelection()).thenReturn(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes()));
     }
 
diff --git a/src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java
index 80fde0cb66c..e228b13f7b9 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java
@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
 public class IdentifierEditorViewModelTest {
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
index 52fa4d54c32..3bf8d043435 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
@@ -20,8 +20,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.TempDirectory;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
@@ -32,11 +32,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(TempDirectory.class)
-/**
- * Must be public because otherwise @TestArchitectureTests fails!
- *
-*/
-public class LinkedFileViewModelTest {
+class LinkedFileViewModelTest {
 
     private Path tempFile;
     private final JabRefPreferences preferences = mock(JabRefPreferences.class);
diff --git a/src/test/java/org/jabref/gui/search/SearchResultsTest.java b/src/test/java/org/jabref/gui/search/SearchResultsTest.java
index 33def0c2c4e..6daafde1f70 100644
--- a/src/test/java/org/jabref/gui/search/SearchResultsTest.java
+++ b/src/test/java/org/jabref/gui/search/SearchResultsTest.java
@@ -5,7 +5,6 @@
 import javax.swing.JFrame;
 
 import org.jabref.testutils.TestUtils;
-import org.jabref.testutils.category.GUITest;
 
 import org.assertj.swing.core.ComponentFinder;
 import org.assertj.swing.edt.FailOnThreadViolationRepaintManager;
@@ -13,17 +12,17 @@
 import org.assertj.swing.fixture.FrameFixture;
 import org.assertj.swing.fixture.JTextComponentFixture;
 import org.assertj.swing.junit.testcase.AssertJSwingJUnitTestCase;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
-@Category(GUITest.class)
+@Tag("GUITest")
 public class SearchResultsTest extends AssertJSwingJUnitTestCase {
 
     private FrameFixture frameFixture;
 
 
-    @BeforeClass
+    @BeforeAll
     public static void before() {
         FailOnThreadViolationRepaintManager.uninstall();
     }
diff --git a/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java b/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
index 6b96cf2855f..74c90fd5f9b 100644
--- a/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
+++ b/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.util;
 
-import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Optional;
@@ -12,19 +11,18 @@
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.StandardFileType;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class FileDialogConfigurationTest {
-
-    @Rule public TemporaryFolder folder = new TemporaryFolder();
+@ExtendWith(TempDirectory.class)
+class FileDialogConfigurationTest {
 
     @Test
-    public void testWithValidDirectoryString() throws IOException {
-        String tempFolder = folder.newFolder().toString();
+    void testWithValidDirectoryString(@TempDirectory.TempDir Path folder) {
+        String tempFolder = folder.toAbsolutePath().toString();
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .withInitialDirectory(tempFolder).build();
@@ -32,10 +30,9 @@ public void testWithValidDirectoryString() throws IOException {
         assertEquals(Optional.of(Paths.get(tempFolder)), fileDialogConfiguration.getInitialDirectory());
     }
 
-    @Test
-    public void testWithValidDirectoryPath() throws IOException {
-        Path tempFolder = folder.newFolder().toPath();
 
+    @Test
+    void testWithValidDirectoryPath(@TempDirectory.TempDir Path tempFolder) {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .withInitialDirectory(tempFolder).build();
 
@@ -43,7 +40,7 @@ public void testWithValidDirectoryPath() throws IOException {
     }
 
     @Test
-    public void testWithNullStringDirectory() {
+    void testWithNullStringDirectory() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .withInitialDirectory((String) null).build();
 
@@ -51,7 +48,7 @@ public void testWithNullStringDirectory() {
     }
 
     @Test
-    public void testWithNullPathDirectory() {
+    void testWithNullPathDirectory() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .withInitialDirectory((Path) null).build();
 
@@ -59,7 +56,7 @@ public void testWithNullPathDirectory() {
     }
 
     @Test
-    public void testWithNonExistingDirectoryAndParentNull() {
+    void testWithNonExistingDirectoryAndParentNull() {
         String tempFolder = "workingDirectory";
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .withInitialDirectory(tempFolder).build();
@@ -68,7 +65,7 @@ public void testWithNonExistingDirectoryAndParentNull() {
     }
 
     @Test
-    public void testSingleExtension() {
+    void testSingleExtension() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .withDefaultExtension(StandardFileType.BIBTEX_DB).build();
 
@@ -77,6 +74,7 @@ public void testSingleExtension() {
         assertEquals(filter.getExtensions(), fileDialogConfiguration.getDefaultExtension().getExtensions());
     }
 
+
     private FileChooser.ExtensionFilter toFilter(String description, FileType extension) {
         return new FileChooser.ExtensionFilter(description,
                 extension.getExtensions().stream().map(ending -> "*." + ending).collect(Collectors.toList()));
diff --git a/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java b/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
index 7fb07169950..912ad78feb7 100644
--- a/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
+++ b/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
@@ -14,9 +14,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class RecursiveTreeItemTest {
+
+class RecursiveTreeItemTest {
 
     private RecursiveTreeItem<TreeNodeTestData.TreeNodeMock> rootTreeItem;
     private TreeNodeTestData.TreeNodeMock root;
@@ -24,7 +25,7 @@ public class RecursiveTreeItemTest {
     private TreeNodeTestData.TreeNodeMock node;
 
     @BeforeEach
-    public void setUp() throws Exception {
+    void setUp() throws Exception {
         root = new TreeNodeTestData.TreeNodeMock();
         node = TreeNodeTestData.getNodeInSimpleTree(root);
         node.setName("test node");
@@ -35,19 +36,19 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void addsAllChildrenNodes() throws Exception {
+    void addsAllChildrenNodes() throws Exception {
         assertEquals(root.getChildren(), rootTreeItem.getChildren().stream().map(TreeItem::getValue).collect(Collectors.toList()));
     }
 
     @Test
-    public void addsAllChildrenOfChildNode() throws Exception {
+    void addsAllChildrenOfChildNode() throws Exception {
         assertEquals(
                 root.getChildAt(1).get().getChildren(),
                 rootTreeItem.getChildren().get(1).getChildren().stream().map(TreeItem::getValue).collect(Collectors.toList()));
     }
 
     @Test
-    public void respectsFilter() throws Exception {
+    void respectsFilter() throws Exception {
         filterPredicate.setValue(item -> item.getName().contains("test"));
 
         assertEquals(Collections.singletonList(node.getParent().get()), rootTreeItem.getChildren().stream().map(TreeItem::getValue).collect(Collectors.toList()));
diff --git a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
index 4945c9e74c4..b43c5796706 100644
--- a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
+++ b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
@@ -22,26 +22,26 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
-public class AuxParserTest {
+class AuxParserTest {
     private ImportFormatPreferences importFormatPreferences;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @AfterEach
-    public void tearDown() {
+    void tearDown() {
         importFormatPreferences = null;
     }
 
     @Test
-    public void testNormal() throws URISyntaxException, IOException {
+    void testNormal() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Paths.get(AuxParserTest.class.getResource("paper.aux").toURI());
         try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
@@ -63,7 +63,7 @@ public void testNormal() throws URISyntaxException, IOException {
     }
 
     @Test
-    public void testNotAllFound() throws URISyntaxException, IOException {
+    void testNotAllFound() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Paths.get(AuxParserTest.class.getResource("badpaper.aux").toURI());
         try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
@@ -85,7 +85,7 @@ public void testNotAllFound() throws URISyntaxException, IOException {
     }
 
     @Test
-    public void duplicateBibDatabaseConfiguration() throws URISyntaxException, IOException {
+    void duplicateBibDatabaseConfiguration() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("config.bib");
         Path auxFile = Paths.get(AuxParserTest.class.getResource("paper.aux").toURI());
         try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
@@ -101,7 +101,7 @@ public void duplicateBibDatabaseConfiguration() throws URISyntaxException, IOExc
     }
 
     @Test
-    public void testNestedAux() throws URISyntaxException, IOException {
+    void testNestedAux() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Paths.get(AuxParserTest.class.getResource("nested.aux").toURI());
         try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
@@ -123,7 +123,7 @@ public void testNestedAux() throws URISyntaxException, IOException {
     }
 
     @Test
-    public void testCrossRef() throws URISyntaxException, IOException {
+    void testCrossRef() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Paths.get(AuxParserTest.class.getResource("crossref.aux").toURI());
         try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
@@ -145,7 +145,7 @@ public void testCrossRef() throws URISyntaxException, IOException {
     }
 
     @Test
-    public void testFileNotFound() {
+    void testFileNotFound() {
         AuxParser auxParser = new DefaultAuxParser(new BibDatabase());
         AuxParserResult auxResult = auxParser.parse(Paths.get("unknownfile.aux"));
 
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
index 3e7dbd346da..50906ad78cf 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
@@ -4,11 +4,11 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class EntryComparatorTest {
+class EntryComparatorTest {
     @Test
-    public void recognizeIdenticObjectsAsEqual() {
+    void recognizeIdenticObjectsAsEqual() {
         BibEntry e1 = new BibEntry();
         BibEntry e2 = e1;
         assertEquals(0, new EntryComparator(false, false, "").compare(e1, e2));
diff --git a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
index 46bea56b6ea..20f7c634dcf 100644
--- a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
@@ -10,9 +10,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class MakeLabelWithDatabaseTest {
+
+class MakeLabelWithDatabaseTest {
 
     private BibDatabase database;
     private BibtexKeyPatternPreferences preferences;
@@ -21,7 +22,7 @@ public class MakeLabelWithDatabaseTest {
     private BibEntry entry;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         database = new BibDatabase();
 
         entry = new BibEntry();
@@ -35,13 +36,13 @@ public void setUp() {
     }
 
     @Test
-    public void generateDefaultKey() {
+    void generateDefaultKey() {
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateDefaultKeyAlreadyExistsDuplicatesStartAtA() {
+    void generateDefaultKeyAlreadyExistsDuplicatesStartAtA() {
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
         BibEntry entry2 = new BibEntry();
@@ -52,14 +53,14 @@ public void generateDefaultKeyAlreadyExistsDuplicatesStartAtA() {
     }
 
     @Test
-    public void generateDefaultKeyAlwaysLetter() {
+    void generateDefaultKeyAlwaysLetter() {
         preferences = new BibtexKeyPatternPreferences("", "", true, true, true, pattern, ',');
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016a"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
+    void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
         preferences = new BibtexKeyPatternPreferences("", "", true, true, true, pattern, ',');
 
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibtexKeyPattern, database, preferences);
@@ -72,14 +73,14 @@ public void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
     }
 
     @Test
-    public void generateDefaultKeyStartDuplicatesAtB() {
+    void generateDefaultKeyStartDuplicatesAtB() {
         preferences = new BibtexKeyPatternPreferences("", "", false, false, true, pattern, ',');
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateDefaultKeyAlreadyExistsDuplicatesStartAtB() {
+    void generateDefaultKeyAlreadyExistsDuplicatesStartAtB() {
         preferences = new BibtexKeyPatternPreferences("", "", false, false, true, pattern, ',');
 
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibtexKeyPattern, database, preferences);
@@ -92,7 +93,7 @@ public void generateDefaultKeyAlreadyExistsDuplicatesStartAtB() {
     }
 
     @Test
-    public void generateDefaultKeyAlreadyExistsManyDuplicates() {
+    void generateDefaultKeyAlreadyExistsManyDuplicates() {
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
         BibEntry entry2 = new BibEntry();
@@ -110,7 +111,7 @@ public void generateDefaultKeyAlreadyExistsManyDuplicates() {
     }
 
     @Test
-    public void generateDefaultKeyFirstTwoAlreadyExists() {
+    void generateDefaultKeyFirstTwoAlreadyExists() {
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
         BibEntry entry2 = new BibEntry();
@@ -128,77 +129,77 @@ public void generateDefaultKeyFirstTwoAlreadyExists() {
     }
 
     @Test
-    public void generateKeyAuthLowerModified() {
+    void generateKeyAuthLowerModified() {
         bibtexKeyPattern.setDefaultValue("[auth:lower][year]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("doe2016"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyAuthUpperModified() {
+    void generateKeyAuthUpperModified() {
         bibtexKeyPattern.setDefaultValue("[auth:upper][year]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("DOE2016"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyAuthTitleCaseModified() {
+    void generateKeyAuthTitleCaseModified() {
         bibtexKeyPattern.setDefaultValue("[auth:title_case][year]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyAuthSentenceCaseModified() {
+    void generateKeyAuthSentenceCaseModified() {
         bibtexKeyPattern.setDefaultValue("[auth:sentence_case][year]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyAuthCapitalizeModified() {
+    void generateKeyAuthCapitalizeModified() {
         bibtexKeyPattern.setDefaultValue("[auth:capitalize][year]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateDefaultKeyFixedValue() {
+    void generateDefaultKeyFixedValue() {
         bibtexKeyPattern.setDefaultValue("[auth]Test[year]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("DoeTest2016"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyShortYear() {
+    void generateKeyShortYear() {
         bibtexKeyPattern.setDefaultValue("[shortyear]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("16"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyAuthN() {
+    void generateKeyAuthN() {
         bibtexKeyPattern.setDefaultValue("[auth2]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Do"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyAuthNShortName() {
+    void generateKeyAuthNShortName() {
         bibtexKeyPattern.setDefaultValue("[auth10]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyEmptyField() {
+    void generateKeyEmptyField() {
         entry = new BibEntry();
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.empty(), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyEmptyFieldDefaultText() {
+    void generateKeyEmptyFieldDefaultText() {
         bibtexKeyPattern.setDefaultValue("[author:(No Author Provided)]");
         entry.clearField("author");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -206,7 +207,7 @@ public void generateKeyEmptyFieldDefaultText() {
     }
 
     @Test
-    public void generateKeyEmptyFieldNoColonInDefaultText() {
+    void generateKeyEmptyFieldNoColonInDefaultText() {
         bibtexKeyPattern.setDefaultValue("[author:(Problem:No Author Provided)]");
         entry.clearField("author");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -214,28 +215,28 @@ public void generateKeyEmptyFieldNoColonInDefaultText() {
     }
 
     @Test
-    public void generateKeyTitle() {
+    void generateKeyTitle() {
         bibtexKeyPattern.setDefaultValue("[title]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AnAwesomePaperonJabRef"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyTitleAbbr() {
+    void generateKeyTitleAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:abbr]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AAPoJ"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyShorttitle() {
+    void generateKeyShorttitle() {
         bibtexKeyPattern.setDefaultValue("[shorttitle]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("awesomepaperJabRef"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyShorttitleLowerModified() {
+    void generateKeyShorttitleLowerModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:lower]");
         entry.setField("title", "An aweSOme Paper on JabRef");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -243,7 +244,7 @@ public void generateKeyShorttitleLowerModified() {
     }
 
     @Test
-    public void generateKeyShorttitleUpperModified() {
+    void generateKeyShorttitleUpperModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:upper]");
         entry.setField("title", "An aweSOme Paper on JabRef");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -251,7 +252,7 @@ public void generateKeyShorttitleUpperModified() {
     }
 
     @Test
-    public void generateKeyShorttitleTitleCaseModified() {
+    void generateKeyShorttitleTitleCaseModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:title_case]");
         entry.setField("title", "An aweSOme Paper on JabRef");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -259,7 +260,7 @@ public void generateKeyShorttitleTitleCaseModified() {
     }
 
     @Test
-    public void generateKeyShorttitleSentenceCaseModified() {
+    void generateKeyShorttitleSentenceCaseModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:sentence_case]");
         entry.setField("title", "An aweSOme Paper on JabRef");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -267,7 +268,7 @@ public void generateKeyShorttitleSentenceCaseModified() {
     }
 
     @Test
-    public void generateKeyShorttitleCapitalizeModified() {
+    void generateKeyShorttitleCapitalizeModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:capitalize]");
         entry.setField("title", "An aweSOme Paper on JabRef");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -275,14 +276,14 @@ public void generateKeyShorttitleCapitalizeModified() {
     }
 
     @Test
-    public void generateKeyVeryshorttitle() {
+    void generateKeyVeryshorttitle() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("awesome"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyVeryshorttitleLowerModified() {
+    void generateKeyVeryshorttitleLowerModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:lower]");
         entry.setField("title", "An aweSOme Paper on JabRef");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -290,7 +291,7 @@ public void generateKeyVeryshorttitleLowerModified() {
     }
 
     @Test
-    public void generateKeyVeryshorttitleUpperModified() {
+    void generateKeyVeryshorttitleUpperModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:upper]");
         entry.setField("title", "An aweSOme Paper on JabRef");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -298,7 +299,7 @@ public void generateKeyVeryshorttitleUpperModified() {
     }
 
     @Test
-    public void generateKeyVeryshorttitleTitleCaseModified() {
+    void generateKeyVeryshorttitleTitleCaseModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:title_case]");
         entry.setField("title", "An aweSOme Paper on JabRef");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -306,7 +307,7 @@ public void generateKeyVeryshorttitleTitleCaseModified() {
     }
 
     @Test
-    public void generateKeyVeryshorttitleSentenceCaseModified() {
+    void generateKeyVeryshorttitleSentenceCaseModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:sentence_case]");
         entry.setField("title", "An aweSOme Paper on JabRef");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -314,7 +315,7 @@ public void generateKeyVeryshorttitleSentenceCaseModified() {
     }
 
     @Test
-    public void generateKeyVeryshorttitleCapitalizeModified() {
+    void generateKeyVeryshorttitleCapitalizeModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:capitalize]");
         entry.setField("title", "An aweSOme Paper on JabRef");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -322,21 +323,21 @@ public void generateKeyVeryshorttitleCapitalizeModified() {
     }
 
     @Test
-    public void generateKeyShorttitleINI() {
+    void generateKeyShorttitleINI() {
         bibtexKeyPattern.setDefaultValue("[shorttitleINI]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Aap"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyCamel() {
+    void generateKeyCamel() {
         bibtexKeyPattern.setDefaultValue("[camel]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AnAwesomePaperOnJabRef"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyAuthNM() {
+    void generateKeyAuthNM() {
         bibtexKeyPattern.setDefaultValue("[auth4_3]");
         entry.setField("author", "John Doe and Donald Smith and Will Wonder");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -344,7 +345,7 @@ public void generateKeyAuthNM() {
     }
 
     @Test
-    public void generateKeyAuthNMLargeN() {
+    void generateKeyAuthNMLargeN() {
         bibtexKeyPattern.setDefaultValue("[auth20_3]");
         entry.setField("author", "John Doe and Donald Smith and Will Wonder");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -352,7 +353,7 @@ public void generateKeyAuthNMLargeN() {
     }
 
     @Test
-    public void generateKeyAuthNMLargeM() {
+    void generateKeyAuthNMLargeM() {
         bibtexKeyPattern.setDefaultValue("[auth2_4]");
         entry.setField("author", "John Doe and Donald Smith and Will Wonder");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -360,7 +361,7 @@ public void generateKeyAuthNMLargeM() {
     }
 
     @Test
-    public void generateKeyAuthNMLargeMReallyReturnsEmptyString() {
+    void generateKeyAuthNMLargeMReallyReturnsEmptyString() {
         bibtexKeyPattern.setDefaultValue("[auth2_4][year]");
         entry.setField("author", "John Doe and Donald Smith and Will Wonder");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -368,7 +369,7 @@ public void generateKeyAuthNMLargeMReallyReturnsEmptyString() {
     }
 
     @Test
-    public void generateKeyRegExReplace() {
+    void generateKeyRegExReplace() {
         preferences = new BibtexKeyPatternPreferences("2", "3", false, true, true, pattern, ',');
         bibtexKeyPattern.setDefaultValue("[auth][year]");
         entry.setField("author", "John Doe and Donald Smith and Will Wonder");
@@ -377,7 +378,7 @@ public void generateKeyRegExReplace() {
     }
 
     @Test
-    public void generateKeyAuthIni() {
+    void generateKeyAuthIni() {
         bibtexKeyPattern.setDefaultValue("[authIni2]");
         entry.setField("author", "John Doe and Donald Smith and Will Wonder");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -385,7 +386,7 @@ public void generateKeyAuthIni() {
     }
 
     @Test
-    public void generateKeyAuthIniMany() {
+    void generateKeyAuthIniMany() {
         bibtexKeyPattern.setDefaultValue("[authIni10]");
         entry.setField("author", "John Doe and Donald Smith and Will Wonder");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -393,7 +394,7 @@ public void generateKeyAuthIniMany() {
     }
 
     @Test
-    public void generateKeyTitleRegexe() {
+    void generateKeyTitleRegexe() {
         bibtexKeyPattern.setDefaultValue("[title:regex(\" \",\"-\")]");
         entry.setField("title", "Please replace the spaces");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
@@ -401,42 +402,42 @@ public void generateKeyTitleRegexe() {
     }
 
     @Test
-    public void generateKeyTitleTitleCase() {
+    void generateKeyTitleTitleCase() {
         bibtexKeyPattern.setDefaultValue("[title:title_case]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AnAwesomePaperonJabref"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyTitleCapitalize() {
+    void generateKeyTitleCapitalize() {
         bibtexKeyPattern.setDefaultValue("[title:capitalize]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AnAwesomePaperOnJabref"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyTitleSentenceCase() {
+    void generateKeyTitleSentenceCase() {
         bibtexKeyPattern.setDefaultValue("[title:sentence_case]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Anawesomepaperonjabref"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyTitleTitleCaseAbbr() {
+    void generateKeyTitleTitleCaseAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:title_case:abbr]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AAPoJ"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyTitleCapitalizeAbbr() {
+    void generateKeyTitleCapitalizeAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:capitalize:abbr]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AAPOJ"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void generateKeyTitleSentenceCaseAbbr() {
+    void generateKeyTitleSentenceCaseAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:sentence_case:abbr]");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Aapoj"), entry.getCiteKeyOptional());
diff --git a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java
index 72d9d0d3dcc..3ca979b9be3 100644
--- a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java
@@ -5,14 +5,15 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class MakeLabelWithoutDatabaseTest {
+
+class MakeLabelWithoutDatabaseTest {
 
     private BibEntry entry;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         entry = new BibEntry();
         entry.setField("author", "John Doe");
         entry.setField("year", "2016");
@@ -20,13 +21,13 @@ public void setUp() {
     }
 
     @Test
-    public void makeLabelForFileSearch() {
+    void makeLabelForFileSearch() {
         String label = BibtexKeyGenerator.generateKey(entry, "auth");
         assertEquals("Doe", label);
     }
 
     @Test
-    public void makeEditorLabelForFileSearch() {
+    void makeEditorLabelForFileSearch() {
         BibEntry localEntry = new BibEntry();
         localEntry.setField("editor", "John Doe");
         localEntry.setField("year", "2016");
diff --git a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
index 429997e4840..4dab917f68c 100644
--- a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
@@ -7,6 +7,8 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
+import java.nio.file.Path;
+import java.nio.file.Files;
 
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
 import org.jabref.logic.formatter.bibtexfields.LatexCleanupFormatter;
@@ -30,32 +32,35 @@
 import org.jabref.model.metadata.FileDirectoryPreferences;
 import org.jabref.model.metadata.MetaData;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
+import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class CleanupWorkerTest {
-
-    @Rule
-    public TemporaryFolder bibFolder = new TemporaryFolder();
+@ExtendWith(TempDirectory.class)
+class CleanupWorkerTest {
 
     private final CleanupPreset emptyPreset = new CleanupPreset(EnumSet.noneOf(CleanupPreset.CleanupStep.class));
     private CleanupWorker worker;
-    private File pdfFolder;
 
-    @Before
-    public void setUp() throws IOException {
-        pdfFolder = bibFolder.newFolder();
+    @BeforeEach
+    void setUp(@TempDirectory.TempDir Path bibFolder) throws IOException {
+
+        Path path = bibFolder.resolve("ARandomlyNamedFolder");
+        Files.createDirectory(path);
+        File pdfFolder = path.toFile();
 
         MetaData metaData = new MetaData();
         metaData.setDefaultFileDirectory(pdfFolder.getAbsolutePath());
         BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(), metaData, new Defaults());
-        context.setDatabaseFile(bibFolder.newFile("test.bib"));
+        Files.createFile(bibFolder.resolve("test.bib"));
+        context.setDatabaseFile(bibFolder.resolve("test.bib").toFile());
 
         FileDirectoryPreferences fileDirPrefs = mock(FileDirectoryPreferences.class);
         //Biblocation as Primary overwrites all other dirs
@@ -70,18 +75,18 @@ public void setUp() throws IOException {
 
     }
 
-    @Test(expected = NullPointerException.class)
-    public void cleanupWithNullPresetThrowsException() {
-        worker.cleanup(null, new BibEntry());
+    @Test
+    void cleanupWithNullPresetThrowsException() {
+        assertThrows(NullPointerException.class, () -> worker.cleanup(null, new BibEntry()));
     }
 
-    @Test(expected = NullPointerException.class)
-    public void cleanupNullEntryThrowsException() {
-        worker.cleanup(emptyPreset, null);
+    @Test
+    void cleanupNullEntryThrowsException() {
+        assertThrows(NullPointerException.class, () -> worker.cleanup(emptyPreset, null));
     }
 
     @Test
-    public void cleanupDoesNothingByDefault() throws IOException {
+    void cleanupDoesNothingByDefault(@TempDirectory.TempDir Path bibFolder) throws IOException {
         BibEntry entry = new BibEntry();
         entry.setCiteKey("Toot");
         entry.setField("pdf", "aPdfFile");
@@ -96,48 +101,50 @@ public void cleanupDoesNothingByDefault() throws IOException {
         entry.setField("journal", "test");
         entry.setField("title", "<b>hallo</b> units 1 A case AlGaAs and latex $\\alpha$$\\beta$");
         entry.setField("abstract", "Réflexions");
-        File tempFile = bibFolder.newFile();
+        Path path = bibFolder.resolve("ARandomlyNamedFile");
+        Files.createFile(path);
+        File tempFile = path.toFile();
         LinkedFile fileField = new LinkedFile("", tempFile.getAbsolutePath(), "");
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
 
         List<FieldChange> changes = worker.cleanup(emptyPreset, entry);
-        Assert.assertEquals(Collections.emptyList(), changes);
+        assertEquals(Collections.emptyList(), changes);
     }
 
     @Test
-    public void upgradeExternalLinksMoveFromPdfToFile() {
+    void upgradeExternalLinksMoveFromPdfToFile() {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS);
         BibEntry entry = new BibEntry();
         entry.setField("pdf", "aPdfFile");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.empty(), entry.getField("pdf"));
-        Assert.assertEquals(Optional.of("aPdfFile:aPdfFile:PDF"), entry.getField("file"));
+        assertEquals(Optional.empty(), entry.getField("pdf"));
+        assertEquals(Optional.of("aPdfFile:aPdfFile:PDF"), entry.getField("file"));
     }
 
     @Test
-    public void upgradeExternalLinksMoveFromPsToFile() {
+    void upgradeExternalLinksMoveFromPsToFile() {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS);
         BibEntry entry = new BibEntry();
         entry.setField("ps", "aPsFile");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.empty(), entry.getField("pdf"));
-        Assert.assertEquals(Optional.of("aPsFile:aPsFile:PostScript"), entry.getField("file"));
+        assertEquals(Optional.empty(), entry.getField("pdf"));
+        assertEquals(Optional.of("aPsFile:aPsFile:PostScript"), entry.getField("file"));
     }
 
     @Test
-    public void cleanupDoiRemovesLeadingHttp() {
+    void cleanupDoiRemovesLeadingHttp() {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.CLEAN_UP_DOI);
         BibEntry entry = new BibEntry();
         entry.setField("doi", "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.of("10.1016/0001-8708(80)90035-3"), entry.getField("doi"));
+        assertEquals(Optional.of("10.1016/0001-8708(80)90035-3"), entry.getField("doi"));
     }
 
     @Test
-    public void cleanupDoiReturnsChanges() {
+    void cleanupDoiReturnsChanges() {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.CLEAN_UP_DOI);
         BibEntry entry = new BibEntry();
         entry.setField("doi", "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
@@ -146,22 +153,22 @@ public void cleanupDoiReturnsChanges() {
 
         FieldChange expectedChange = new FieldChange(entry, "doi", "http://dx.doi.org/10.1016/0001-8708(80)90035-3",
                 "10.1016/0001-8708(80)90035-3");
-        Assert.assertEquals(Collections.singletonList(expectedChange), changes);
+        assertEquals(Collections.singletonList(expectedChange), changes);
     }
 
     @Test
-    public void cleanupDoiFindsDoiInURLFieldAndMoveItToDOIField() {
+    void cleanupDoiFindsDoiInURLFieldAndMoveItToDOIField() {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.CLEAN_UP_DOI);
         BibEntry entry = new BibEntry();
         entry.setField("url", "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.of("10.1016/0001-8708(80)90035-3"), entry.getField("doi"));
-        Assert.assertEquals(Optional.empty(), entry.getField("url"));
+        assertEquals(Optional.of("10.1016/0001-8708(80)90035-3"), entry.getField("doi"));
+        assertEquals(Optional.empty(), entry.getField("url"));
     }
 
     @Test
-    public void cleanupDoiReturnsChangeWhenDoiInURLField() {
+    void cleanupDoiReturnsChangeWhenDoiInURLField() {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.CLEAN_UP_DOI);
         BibEntry entry = new BibEntry();
         entry.setField("url", "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
@@ -170,57 +177,59 @@ public void cleanupDoiReturnsChangeWhenDoiInURLField() {
         List<FieldChange> changeList = new ArrayList<>();
         changeList.add(new FieldChange(entry, "doi", null, "10.1016/0001-8708(80)90035-3"));
         changeList.add(new FieldChange(entry, "url", "http://dx.doi.org/10.1016/0001-8708(80)90035-3", null));
-        Assert.assertEquals(changeList, changes);
+        assertEquals(changeList, changes);
     }
 
     @Test
-    public void cleanupMonthChangesNumberToBibtex() {
+    void cleanupMonthChangesNumberToBibtex() {
         CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true,
                 Collections.singletonList(new FieldFormatterCleanup("month", new NormalizeMonthFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField("month", "01");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.of("#jan#"), entry.getField("month"));
+        assertEquals(Optional.of("#jan#"), entry.getField("month"));
     }
 
     @Test
-    public void cleanupPageNumbersConvertsSingleDashToDouble() {
+    void cleanupPageNumbersConvertsSingleDashToDouble() {
         CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true,
                 Collections.singletonList(new FieldFormatterCleanup("pages", new NormalizePagesFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField("pages", "1-2");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.of("1--2"), entry.getField("pages"));
+        assertEquals(Optional.of("1--2"), entry.getField("pages"));
     }
 
     @Test
-    public void cleanupDatesConvertsToCorrectFormat() {
+    void cleanupDatesConvertsToCorrectFormat() {
         CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true,
                 Collections.singletonList(new FieldFormatterCleanup("date", new NormalizeDateFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField("date", "01/1999");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.of("1999-01"), entry.getField("date"));
+        assertEquals(Optional.of("1999-01"), entry.getField("date"));
     }
 
     @Test
-    public void cleanupFixFileLinksMovesSingleDescriptionToLink() {
+    void cleanupFixFileLinksMovesSingleDescriptionToLink() {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.FIX_FILE_LINKS);
         BibEntry entry = new BibEntry();
         entry.setField("file", "link::");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.of(":link:"), entry.getField("file"));
+        assertEquals(Optional.of(":link:"), entry.getField("file"));
     }
 
     @Test
-    public void cleanupMoveFilesMovesFileFromSubfolder() throws IOException {
+    void cleanupMoveFilesMovesFileFromSubfolder(@TempDirectory.TempDir Path bibFolder) throws IOException {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.MOVE_PDF);
 
-        File subfolder = bibFolder.newFolder();
+        Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
+        Files.createDirectory(path);
+        File subfolder = path.toFile();
         File tempFile = new File(subfolder, "test.pdf");
         tempFile.createNewFile();
         BibEntry entry = new BibEntry();
@@ -229,28 +238,32 @@ public void cleanupMoveFilesMovesFileFromSubfolder() throws IOException {
 
         worker.cleanup(preset, entry);
         LinkedFile newFileField = new LinkedFile("", tempFile.getName(), "");
-        Assert.assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField("file"));
+        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField("file"));
     }
 
     @Test
-    public void cleanupRelativePathsConvertAbsoluteToRelativePath() throws IOException {
+    void cleanupRelativePathsConvertAbsoluteToRelativePath(@TempDirectory.TempDir Path bibFolder) throws IOException {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.MAKE_PATHS_RELATIVE);
 
-        File tempFile = bibFolder.newFile();
+        Path path = bibFolder.resolve("AnotherRandomlyNamedFile");
+        Files.createFile(path);
+        File tempFile = path.toFile();
         BibEntry entry = new BibEntry();
         LinkedFile fileField = new LinkedFile("", tempFile.getAbsolutePath(), "");
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
 
         worker.cleanup(preset, entry);
         LinkedFile newFileField = new LinkedFile("", tempFile.getName(), "");
-        Assert.assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField("file"));
+        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField("file"));
     }
 
     @Test
-    public void cleanupRenamePdfRenamesRelativeFile() throws IOException {
+    void cleanupRenamePdfRenamesRelativeFile(@TempDirectory.TempDir Path bibFolder) throws IOException {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.RENAME_PDF);
 
-        File tempFile = bibFolder.newFile();
+        Path path = bibFolder.resolve("AnotherRandomlyNamedFile.tmp");
+        Files.createFile(path);
+        File tempFile = path.toFile();
         BibEntry entry = new BibEntry();
         entry.setCiteKey("Toot");
         LinkedFile fileField = new LinkedFile("", tempFile.getAbsolutePath(), "");
@@ -258,88 +271,88 @@ public void cleanupRenamePdfRenamesRelativeFile() throws IOException {
 
         worker.cleanup(preset, entry);
         LinkedFile newFileField = new LinkedFile("", "Toot.tmp", "");
-        Assert.assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField("file"));
+        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField("file"));
     }
 
     @Test
-    public void cleanupHtmlToLatexConvertsEpsilonToLatex() {
+    void cleanupHtmlToLatexConvertsEpsilonToLatex() {
         CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true,
                 Collections.singletonList(new FieldFormatterCleanup("title", new HtmlToLatexFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField("title", "&Epsilon;");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.of("{{$\\Epsilon$}}"), entry.getField("title"));
+        assertEquals(Optional.of("{{$\\Epsilon$}}"), entry.getField("title"));
     }
 
     @Test
-    public void cleanupUnitsConvertsOneAmpereToLatex() {
+    void cleanupUnitsConvertsOneAmpereToLatex() {
         CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true,
                 Collections.singletonList(new FieldFormatterCleanup("title", new UnitsToLatexFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField("title", "1 A");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.of("1~{A}"), entry.getField("title"));
+        assertEquals(Optional.of("1~{A}"), entry.getField("title"));
     }
 
     @Test
-    public void cleanupCasesAddsBracketAroundAluminiumGalliumArsenid() {
+    void cleanupCasesAddsBracketAroundAluminiumGalliumArsenid() {
         ProtectedTermsLoader protectedTermsLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(), Collections.emptyList(),
                         Collections.emptyList(), Collections.emptyList()));
-        Assert.assertNotEquals(Collections.emptyList(), protectedTermsLoader.getProtectedTerms());
+        assertNotEquals(Collections.emptyList(), protectedTermsLoader.getProtectedTerms());
         CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, Collections
                 .singletonList(new FieldFormatterCleanup("title", new ProtectTermsFormatter(protectedTermsLoader)))));
         BibEntry entry = new BibEntry();
         entry.setField("title", "AlGaAs");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.of("{AlGaAs}"), entry.getField("title"));
+        assertEquals(Optional.of("{AlGaAs}"), entry.getField("title"));
     }
 
     @Test
-    public void cleanupLatexMergesTwoLatexMathEnvironments() {
+    void cleanupLatexMergesTwoLatexMathEnvironments() {
         CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true,
                 Collections.singletonList(new FieldFormatterCleanup("title", new LatexCleanupFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField("title", "$\\alpha$$\\beta$");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.of("$\\alpha\\beta$"), entry.getField("title"));
+        assertEquals(Optional.of("$\\alpha\\beta$"), entry.getField("title"));
     }
 
     @Test
-    public void convertToBiblatexMovesAddressToLocation() {
+    void convertToBiblatexMovesAddressToLocation() {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.CONVERT_TO_BIBLATEX);
         BibEntry entry = new BibEntry();
         entry.setField("address", "test");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.empty(), entry.getField("address"));
-        Assert.assertEquals(Optional.of("test"), entry.getField("location"));
+        assertEquals(Optional.empty(), entry.getField("address"));
+        assertEquals(Optional.of("test"), entry.getField("location"));
     }
 
     @Test
-    public void convertToBiblatexMovesJournalToJournalTitle() {
+    void convertToBiblatexMovesJournalToJournalTitle() {
         CleanupPreset preset = new CleanupPreset(CleanupPreset.CleanupStep.CONVERT_TO_BIBLATEX);
         BibEntry entry = new BibEntry();
         entry.setField("journal", "test");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.empty(), entry.getField("journal"));
-        Assert.assertEquals(Optional.of("test"), entry.getField("journaltitle"));
+        assertEquals(Optional.empty(), entry.getField("journal"));
+        assertEquals(Optional.of("test"), entry.getField("journaltitle"));
     }
 
     @Test
-    public void cleanupWithDisabledFieldFormatterChangesNothing() {
+    void cleanupWithDisabledFieldFormatterChangesNothing() {
         CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(false,
                 Collections.singletonList(new FieldFormatterCleanup("month", new NormalizeMonthFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField("month", "01");
 
         worker.cleanup(preset, entry);
-        Assert.assertEquals(Optional.of("01"), entry.getField("month"));
+        assertEquals(Optional.of("01"), entry.getField("month"));
     }
 
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
index 7dcb8e77167..1d54e86a199 100644
--- a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
@@ -16,20 +16,19 @@
 import org.jabref.model.metadata.FileDirectoryPreferences;
 import org.jabref.model.metadata.MetaData;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class MoveFilesCleanupTest {
-
-    @Rule public TemporaryFolder bibFolder = new TemporaryFolder();
+@ExtendWith(TempDirectory.class)
+class MoveFilesCleanupTest {
 
     private File pdfFolder;
     private BibDatabaseContext databaseContext;
@@ -37,13 +36,16 @@ public class MoveFilesCleanupTest {
     private BibEntry entry;
     private FileDirectoryPreferences fileDirPrefs;
 
-    @Before
-    public void setUp() throws IOException {
+    @BeforeEach
+    void setUp(@TempDirectory.TempDir Path bibFolder) throws IOException {
         MetaData metaData = new MetaData();
-        pdfFolder = bibFolder.newFolder();
+        Path path = bibFolder.resolve("ARandomlyNamedFolder");
+        Files.createDirectory(path);
+        pdfFolder = path.toFile();
         metaData.setDefaultFileDirectory(pdfFolder.getAbsolutePath());
         databaseContext = new BibDatabaseContext(new BibDatabase(), metaData, new Defaults());
-        databaseContext.setDatabaseFile(bibFolder.newFile("test.bib"));
+        Files.createFile(path.resolve("test.bib"));
+        databaseContext.setDatabaseFile(path.resolve("test.bib").toFile());
         entry = new BibEntry();
         entry.setCiteKey("Toot");
         entry.setField("title", "test title");
@@ -53,11 +55,12 @@ public void setUp() throws IOException {
     }
 
     @Test
-    public void movesFileFromSubfolder() throws IOException {
-        File subfolder = bibFolder.newFolder();
-        File fileBefore = new File(subfolder, "test.pdf");
+    void movesFileFromSubfolder(@TempDirectory.TempDir Path bibFolder) throws IOException {
+        Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
+        Files.createDirectory(path);
+        File fileBefore = path.resolve("test.pdf").toFile();
         assertTrue(fileBefore.createNewFile());
-        assertTrue(new File(subfolder, "test.pdf").exists());
+        assertTrue(fileBefore.exists());
 
         LinkedFile fileField = new LinkedFile("", fileBefore.getAbsolutePath(), "");
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
@@ -66,7 +69,7 @@ public void movesFileFromSubfolder() throws IOException {
         cleanup.cleanup(entry);
 
         assertFalse(fileBefore.exists());
-        File fileAfter = new File(pdfFolder, "test.pdf");
+        File fileAfter = pdfFolder.toPath().resolve("test.pdf").toFile();
         assertTrue(fileAfter.exists());
 
         assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", fileAfter.getName(), ""))),
@@ -74,9 +77,10 @@ public void movesFileFromSubfolder() throws IOException {
     }
 
     @Test
-    public void movesFileFromSubfolderMultiple() throws IOException {
-        File subfolder = bibFolder.newFolder();
-        File fileBefore = new File(subfolder, "test.pdf");
+    void movesFileFromSubfolderMultiple(@TempDirectory.TempDir Path bibFolder) throws IOException {
+        Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
+        Files.createDirectory(path);
+        File fileBefore = path.resolve("test.pdf").toFile();
         assertTrue(fileBefore.createNewFile());
         assertTrue(fileBefore.exists());
 
@@ -88,7 +92,7 @@ public void movesFileFromSubfolderMultiple() throws IOException {
         cleanup.cleanup(entry);
 
         assertFalse(fileBefore.exists());
-        File fileAfter = new File(pdfFolder, "test.pdf");
+        File fileAfter = pdfFolder.toPath().resolve("test.pdf").toFile();
         assertTrue(fileAfter.exists());
 
         assertEquals(
@@ -97,12 +101,13 @@ public void movesFileFromSubfolderMultiple() throws IOException {
     }
 
     @Test
-    public void movesFileFromSubfolderWithFileDirPattern() throws IOException {
-        File subfolder = bibFolder.newFolder();
-        File fileBefore = new File(subfolder, "test.pdf");
+    void movesFileFromSubfolderWithFileDirPattern(@TempDirectory.TempDir Path bibFolder) throws IOException {
+        Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
+        Files.createDirectory(path);
+        File fileBefore = path.resolve("test.pdf").toFile();
 
         assertTrue(fileBefore.createNewFile());
-        assertTrue(new File(subfolder, "test.pdf").exists());
+        assertTrue(fileBefore.exists());
 
         LinkedFile fileField = new LinkedFile("", fileBefore.getAbsolutePath(), "");
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
@@ -117,19 +122,20 @@ public void movesFileFromSubfolderWithFileDirPattern() throws IOException {
         assertTrue(Files.exists(after));
 
         assertEquals(Optional
-                .of(FileFieldWriter.getStringRepresentation(new LinkedFile("", relativefileDir.toString(), ""))),
+                        .of(FileFieldWriter.getStringRepresentation(new LinkedFile("", relativefileDir.toString(), ""))),
                 entry.getField("file"));
     }
 
     @Test
-    public void movesFileFromSubfolderWithSubdirPattern() throws IOException {
+    void movesFileFromSubfolderWithSubdirPattern(@TempDirectory.TempDir Path bibFolder) throws IOException {
         BibEntry local_entry = (BibEntry) entry.clone();
         local_entry.setField("year", "1989");
-        File subfolder = bibFolder.newFolder();
-        File fileBefore = new File(subfolder, "test.pdf");
+        Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
+        Files.createDirectory(path);
+        File fileBefore = path.resolve("test.pdf").toFile();
 
         assertTrue(fileBefore.createNewFile());
-        assertTrue(new File(subfolder, "test.pdf").exists());
+        assertTrue(fileBefore.exists());
 
         LinkedFile fileField = new LinkedFile("", fileBefore.getAbsolutePath(), "");
         local_entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
@@ -143,20 +149,21 @@ public void movesFileFromSubfolderWithSubdirPattern() throws IOException {
         assertTrue(Files.exists(after));
 
         assertEquals(Optional
-                .of(FileFieldWriter.getStringRepresentation(new LinkedFile("", relativefileDir.toString(), ""))),
+                        .of(FileFieldWriter.getStringRepresentation(new LinkedFile("", relativefileDir.toString(), ""))),
                 local_entry.getField("file"));
     }
 
     @Test
-    public void movesFileFromSubfolderWithDeepSubdirPattern() throws IOException {
+    void movesFileFromSubfolderWithDeepSubdirPattern(@TempDirectory.TempDir Path bibFolder) throws IOException {
         BibEntry local_entry = (BibEntry) entry.clone();
         local_entry.setField("year", "1989");
         local_entry.setField("author", "O. Kitsune");
-        File subfolder = bibFolder.newFolder();
-        File fileBefore = new File(subfolder, "test.pdf");
+        Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
+        Files.createDirectory(path);
+        File fileBefore = path.resolve("test.pdf").toFile();
 
         assertTrue(fileBefore.createNewFile());
-        assertTrue(new File(subfolder, "test.pdf").exists());
+        assertTrue(fileBefore.exists());
 
         LinkedFile fileField = new LinkedFile("", fileBefore.getAbsolutePath(), "");
         local_entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
@@ -171,7 +178,7 @@ public void movesFileFromSubfolderWithDeepSubdirPattern() throws IOException {
         assertTrue(Files.exists(after));
 
         assertEquals(Optional
-                .of(FileFieldWriter.getStringRepresentation(new LinkedFile("", relativefileDir.toString(), ""))),
+                        .of(FileFieldWriter.getStringRepresentation(new LinkedFile("", relativefileDir.toString(), ""))),
                 local_entry.getField("file"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
index e169ef43c0f..9c3ad79cb91 100644
--- a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
@@ -2,6 +2,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Optional;
 
@@ -15,30 +17,31 @@
 import org.jabref.model.metadata.FileDirectoryPreferences;
 import org.jabref.model.metadata.MetaData;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class RenamePdfCleanupTest {
+@ExtendWith(TempDirectory.class)
+class RenamePdfCleanupTest {
 
-    @Rule public TemporaryFolder testFolder = new TemporaryFolder();
     private BibDatabaseContext context;
     private BibEntry entry;
 
     private FileDirectoryPreferences fileDirPrefs;
     private LayoutFormatterPreferences layoutFormatterPreferences;
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeEach
+    void setUp(@TempDirectory.TempDir Path testFolder) {
+        Path path = testFolder.resolve("test.bib");
         MetaData metaData = new MetaData();
         context = new BibDatabaseContext(new BibDatabase(), metaData, new Defaults());
-        context.setDatabaseFile(testFolder.newFile("test.bib"));
+        context.setDatabaseFile(path.toFile());
 
         fileDirPrefs = mock(FileDirectoryPreferences.class);
         when(fileDirPrefs.isBibLocationAsPrimary()).thenReturn(true); //Set Biblocation as Primary Directory, otherwise the tmp folders won't be cleaned up correctly
@@ -51,14 +54,16 @@ public void setUp() throws Exception {
      * Test for #466
      */
     @Test
-    public void cleanupRenamePdfRenamesFileEvenIfOnlyDifferenceIsCase() throws IOException {
+    void cleanupRenamePdfRenamesFileEvenIfOnlyDifferenceIsCase(@TempDirectory.TempDir Path testFolder) throws IOException {
         String fileNamePattern = "[bibtexkey]";
-        File tempFile = testFolder.newFile("toot.tmp");
-        LinkedFile fileField = new LinkedFile("", tempFile.getAbsolutePath(), "");
+        Path path = testFolder.resolve("toot.tmp");
+        Files.createFile(path);
+
+        LinkedFile fileField = new LinkedFile("", path.toAbsolutePath().toString(), "");
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
 
         RenamePdfCleanup cleanup = new RenamePdfCleanup(false, context, fileNamePattern,
-                                                        fileDirPrefs);
+                fileDirPrefs);
         cleanup.cleanup(entry);
 
         LinkedFile newFileField = new LinkedFile("", "Toot.tmp", "");
@@ -66,16 +71,18 @@ public void cleanupRenamePdfRenamesFileEvenIfOnlyDifferenceIsCase() throws IOExc
     }
 
     @Test
-    public void cleanupRenamePdfRenamesWithMultipleFiles() throws IOException {
+    void cleanupRenamePdfRenamesWithMultipleFiles(@TempDirectory.TempDir Path testFolder) throws IOException {
         String fileNamePattern = "[bibtexkey] - [fulltitle]";
-        File tempFile = testFolder.newFile("Toot.tmp");
+        Path path = testFolder.resolve("Toot.tmp");
+        Files.createFile(path);
+        File tempFile = path.toFile();
 
         entry.setField("title", "test title");
         entry.setField("file", FileFieldWriter.getStringRepresentation(Arrays.asList(new LinkedFile("", "", ""),
                 new LinkedFile("", tempFile.getAbsolutePath(), ""), new LinkedFile("", "", ""))));
 
         RenamePdfCleanup cleanup = new RenamePdfCleanup(false, context, fileNamePattern,
-                                                        fileDirPrefs);
+                fileDirPrefs);
         cleanup.cleanup(entry);
 
         assertEquals(
@@ -84,16 +91,17 @@ public void cleanupRenamePdfRenamesWithMultipleFiles() throws IOException {
     }
 
     @Test
-    public void cleanupRenamePdfRenamesFileStartingWithBibtexKey() throws IOException {
+    void cleanupRenamePdfRenamesFileStartingWithBibtexKey(@TempDirectory.TempDir Path testFolder) throws IOException {
         String fileNamePattern = "[bibtexkey] - [fulltitle]";
+        Path path = testFolder.resolve("Toot.tmp");
+        Files.createFile(path);
 
-        File tempFile = testFolder.newFile("Toot.tmp");
-        LinkedFile fileField = new LinkedFile("", tempFile.getAbsolutePath(), "");
+        LinkedFile fileField = new LinkedFile("", path.toAbsolutePath().toString(), "");
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
         entry.setField("title", "test title");
 
         RenamePdfCleanup cleanup = new RenamePdfCleanup(false, context, fileNamePattern,
-                                                        fileDirPrefs);
+                fileDirPrefs);
         cleanup.cleanup(entry);
 
         LinkedFile newFileField = new LinkedFile("", "Toot - test title.tmp", "");
@@ -101,9 +109,10 @@ public void cleanupRenamePdfRenamesFileStartingWithBibtexKey() throws IOExceptio
     }
 
     @Test
-    public void cleanupRenamePdfRenamesFileInSameFolder() throws IOException {
+    void cleanupRenamePdfRenamesFileInSameFolder(@TempDirectory.TempDir Path testFolder) throws IOException {
         String fileNamePattern = "[bibtexkey] - [fulltitle]";
-        testFolder.newFile("Toot.pdf");
+        Path path = testFolder.resolve("Toot.pdf");
+        Files.createFile(path);
         LinkedFile fileField = new LinkedFile("", "Toot.pdf", "PDF");
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
         entry.setField("title", "test title");
@@ -116,9 +125,10 @@ public void cleanupRenamePdfRenamesFileInSameFolder() throws IOException {
     }
 
     @Test
-    public void cleanupSingleField() throws IOException {
+    void cleanupSingleField(@TempDirectory.TempDir Path testFolder) throws IOException {
         String fileNamePattern = "[bibtexkey] - [fulltitle]";
-        testFolder.newFile("Toot.pdf");
+        Path path = testFolder.resolve("Toot.pdf");
+        Files.createFile(path);
         LinkedFile fileField = new LinkedFile("", "Toot.pdf", "PDF");
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
         entry.setField("title", "test title");
@@ -133,9 +143,10 @@ public void cleanupSingleField() throws IOException {
     }
 
     @Test
-    public void cleanupGetTargetFilename() throws IOException {
+    void cleanupGetTargetFilename(@TempDirectory.TempDir Path testFolder) throws IOException {
         String fileNamePattern = "[bibtexkey] - [fulltitle]";
-        testFolder.newFile("Toot.pdf");
+        Path path = testFolder.resolve("Toot.pdf");
+        Files.createFile(path);
         LinkedFile fileField = new LinkedFile("", "Toot.pdf", "PDF");
         RenamePdfCleanup cleanup = new RenamePdfCleanup(false, context, fileNamePattern, fileDirPrefs);
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
diff --git a/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java b/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java
index 6be9c501a00..a683dd2bff5 100644
--- a/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
@@ -8,7 +7,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -19,15 +17,11 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
 import org.xmlunit.builder.Input;
 import org.xmlunit.builder.Input.Builder;
@@ -35,57 +29,56 @@
 import org.xmlunit.diff.ElementSelectors;
 import org.xmlunit.matchers.CompareMatcher;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 
-@RunWith(Parameterized.class)
+@ExtendWith(TempDirectory.class)
 public class BibTeXMLExporterTestFiles {
 
     public BibDatabaseContext databaseContext;
     public Charset charset;
-    public File tempFile;
+    public Path tempFile;
     public BibTeXMLExporter bibtexmlExportFormat;
     public BibtexImporter testImporter;
 
-    @Parameter
-    public String filename;
-    public Path resourceDir;
+    private static Path resourceDir;
 
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
+    public static Stream<String> fileNames() throws IOException, URISyntaxException {
+        resourceDir = Paths.get(MSBibExportFormatTestFiles.class.getResource("BibTeXMLExporterTestArticle.bib").toURI()).getParent();
+//        System.out.println(resourceDir);
 
-    @Parameters(name = "{0}")
-    public static Collection<String> fileNames() throws IOException, URISyntaxException {
-        try (Stream<Path> stream = Files.list(Paths.get(BibTeXMLExporterTestFiles.class.getResource("").toURI()))) {
+        try (Stream<Path> stream = Files.list(resourceDir)) {
             return stream.map(n -> n.getFileName().toString()).filter(n -> n.endsWith(".bib"))
-                    .filter(n -> n.startsWith("BibTeXML")).collect(Collectors.toList());
+                    .filter(n -> n.startsWith("BibTeXML")).collect(Collectors.toList()).stream();
         }
     }
 
-    @Before
-    public void setUp() throws Exception {
-        resourceDir = Paths.get(BibTeXMLExporterTestFiles.class.getResource("").toURI());
+    @BeforeEach
+    public void setUp(@TempDirectory.TempDir Path testFolder) throws Exception {
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
         bibtexmlExportFormat = new BibTeXMLExporter();
-        tempFile = testFolder.newFile();
+        Files.createFile(testFolder.resolve("ARandomlyNamedFile.tmp"));
+        tempFile = testFolder.resolve("ARandomlyNamedFile.tmp");
         testImporter = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
     }
 
-    @Test
-    public final void testPerformExport() throws IOException, SaveException {
+    @ParameterizedTest
+    @MethodSource("fileNames")
+    public final void testPerformExport(String filename) throws IOException, SaveException {
         String xmlFileName = filename.replace(".bib", ".xml");
         Path importFile = resourceDir.resolve(filename);
-        String tempFilename = tempFile.getCanonicalPath();
+        String tempFilePath = tempFile.toAbsolutePath().toString();
 
         List<BibEntry> entries = testImporter.importDatabase(importFile, StandardCharsets.UTF_8).getDatabase()
                 .getEntries();
 
-        bibtexmlExportFormat.export(databaseContext, tempFile.toPath(), charset, entries);
+        bibtexmlExportFormat.export(databaseContext, tempFile, charset, entries);
 
         Builder control = Input.from(Files.newInputStream(resourceDir.resolve(xmlFileName)));
-        Builder test = Input.from(Files.newInputStream(Paths.get(tempFilename)));
+        Builder test = Input.from(Files.newInputStream(Paths.get(tempFilePath)));
 
-        Assert.assertThat(test, CompareMatcher.isSimilarTo(control)
+        assertThat(test, CompareMatcher.isSimilarTo(control)
                 .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
index ce7d1058d25..776b1d84235 100644
--- a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
@@ -4,6 +4,7 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -14,25 +15,24 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
+@ExtendWith(TempDirectory.class)
 public class CsvExportFormatTest {
+
     private Exporter exportFormat;
     public BibDatabaseContext databaseContext;
     public Charset charset;
 
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
-
-    @Before
+    @BeforeEach
     public void setUp() {
         Map<String, TemplateExporter> customFormats = new HashMap<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
@@ -46,46 +46,49 @@ public void setUp() {
         charset = StandardCharsets.UTF_8;
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         exportFormat = null;
     }
 
     @Test
-    public void testPerformExportForSingleAuthor() throws Exception {
-        File tmpFile = testFolder.newFile();
+    public void testPerformExportForSingleAuthor(@TempDirectory.TempDir Path testFolder) throws Exception {
+        Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
+
         BibEntry entry = new BibEntry();
         entry.setField("author", "Someone, Van Something");
         List<BibEntry> entries = Arrays.asList(entry);
 
-        exportFormat.export(databaseContext, tmpFile.toPath(), charset, entries);
+        exportFormat.export(databaseContext, path, charset, entries);
 
-        List<String> lines = Files.readAllLines(tmpFile.toPath());
+        List<String> lines = Files.readAllLines(path);
         assertEquals(2, lines.size());
         assertEquals(
-                "10,\"\",\"\",\"Someone, Van Something\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                lines.get(1));
+                     "10,\"\",\"\",\"Someone, Van Something\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+                     lines.get(1));
     }
 
     @Test
-    public void testPerformExportForMultipleAuthors() throws Exception {
-        File tmpFile = testFolder.newFile();
+    public void testPerformExportForMultipleAuthors(@TempDirectory.TempDir Path testFolder) throws Exception {
+        Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
+
         BibEntry entry = new BibEntry();
         entry.setField("author", "von Neumann, John and Smith, John and Black Brown, Peter");
         List<BibEntry> entries = Arrays.asList(entry);
 
-        exportFormat.export(databaseContext, tmpFile.toPath(), charset, entries);
+        exportFormat.export(databaseContext, path, charset, entries);
 
-        List<String> lines = Files.readAllLines(tmpFile.toPath());
+        List<String> lines = Files.readAllLines(path);
         assertEquals(2, lines.size());
         assertEquals(
-                "10,\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                lines.get(1));
+                     "10,\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+                     lines.get(1));
     }
 
     @Test
-    public void testPerformExportForSingleEditor() throws Exception {
-        File tmpFile = testFolder.newFile();
+    public void testPerformExportForSingleEditor(@TempDirectory.TempDir Path testFolder) throws Exception {
+        Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
+        File tmpFile = path.toFile();
         BibEntry entry = new BibEntry();
         entry.setField("editor", "Someone, Van Something");
         List<BibEntry> entries = Arrays.asList(entry);
@@ -95,13 +98,14 @@ public void testPerformExportForSingleEditor() throws Exception {
         List<String> lines = Files.readAllLines(tmpFile.toPath());
         assertEquals(2, lines.size());
         assertEquals(
-                "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"Someone, Van Something\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                lines.get(1));
+                     "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"Someone, Van Something\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+                     lines.get(1));
     }
 
     @Test
-    public void testPerformExportForMultipleEditors() throws Exception {
-        File tmpFile = testFolder.newFile();
+    public void testPerformExportForMultipleEditors(@TempDirectory.TempDir Path testFolder) throws Exception {
+        Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
+        File tmpFile = path.toFile();
         BibEntry entry = new BibEntry();
         entry.setField("editor", "von Neumann, John and Smith, John and Black Brown, Peter");
         List<BibEntry> entries = Arrays.asList(entry);
@@ -111,8 +115,8 @@ public void testPerformExportForMultipleEditors() throws Exception {
         List<String> lines = Files.readAllLines(tmpFile.toPath());
         assertEquals(2, lines.size());
         assertEquals(
-                "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                lines.get(1));
+                     "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+                     lines.get(1));
     }
 
 }
diff --git a/src/test/java/org/jabref/logic/exporter/ExporterTest.java b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
index 9904a36ccd0..e5978b76343 100644
--- a/src/test/java/org/jabref/logic/exporter/ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
@@ -10,49 +10,38 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junitpioneer.jupiter.TempDirectory;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 
-@RunWith(Parameterized.class)
+@ExtendWith(TempDirectory.class)
 public class ExporterTest {
 
-    public Exporter exportFormat;
-    public String exportFormatName;
     public BibDatabaseContext databaseContext;
     public Charset charset;
     public List<BibEntry> entries;
 
-    public ExporterTest(Exporter format, String name) {
-        exportFormat = format;
-        exportFormatName = name;
-    }
-
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
-
-
-    @Before
+    @BeforeEach
     public void setUp() {
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
         entries = Collections.emptyList();
     }
 
-    @Parameterized.Parameters(name = "{index}: {1}")
-    public static Collection<Object[]> exportFormats() {
+    private static Stream<Object[]> exportFormats() {
         Collection<Object[]> result = new ArrayList<>();
 
         Map<String, TemplateExporter> customFormats = new HashMap<>();
@@ -64,25 +53,35 @@ public static Collection<Object[]> exportFormats() {
         for (Exporter format : exporterFactory.getExporters()) {
             result.add(new Object[]{format, format.getName()});
         }
-        return result;
+        return result.stream();
     }
 
-    @Test
-    public void testExportingEmptyDatabaseYieldsEmptyFile() throws Exception {
-        Path tmpFile = testFolder.newFile().toPath();
+    @ParameterizedTest
+    @MethodSource("exportFormats")
+    public void testExportingEmptyDatabaseYieldsEmptyFile(Exporter exportFormat, String name, @TempDirectory.TempDir Path testFolder) throws Exception {
+        Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
+        Files.createFile(tmpFile);
         exportFormat.export(databaseContext, tmpFile, charset, entries);
         assertEquals(Collections.emptyList(), Files.readAllLines(tmpFile));
     }
 
-    @Test(expected = NullPointerException.class)
-    public void testExportingNullDatabaseThrowsNPE() throws Exception {
-        Path tmpFile = testFolder.newFile().toPath();
-        exportFormat.export(null, tmpFile, charset, entries);
+    @ParameterizedTest
+    @MethodSource("exportFormats")
+    public void testExportingNullDatabaseThrowsNPE(Exporter exportFormat, String name, @TempDirectory.TempDir Path testFolder) {
+        assertThrows(NullPointerException.class, ()->{
+            Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
+            Files.createFile(tmpFile);
+            exportFormat.export(null, tmpFile, charset, entries);
+        });
     }
 
-    @Test(expected = NullPointerException.class)
-    public void testExportingNullEntriesThrowsNPE() throws Exception {
-        Path tmpFile = testFolder.newFile().toPath();
-        exportFormat.export(databaseContext, tmpFile, charset, null);
+    @ParameterizedTest
+    @MethodSource("exportFormats")
+    public void testExportingNullEntriesThrowsNPE(Exporter exportFormat, String name, @TempDirectory.TempDir Path testFolder) {
+        assertThrows(NullPointerException.class, ()->{
+            Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
+            Files.createFile(tmpFile);
+            exportFormat.export(databaseContext, tmpFile, charset, null);
+        });
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
index 053f16f935a..87433f65fb6 100644
--- a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.exporter;
 
-import java.io.File;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -14,26 +14,24 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
+@ExtendWith(TempDirectory.class)
 public class HtmlExportFormatTest {
     private Exporter exportFormat;
     public BibDatabaseContext databaseContext;
     public Charset charset;
     public List<BibEntry> entries;
 
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
-
-    @Before
+    @BeforeEach
     public void setUp() {
         Map<String, TemplateExporter> customFormats = new HashMap<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
@@ -52,16 +50,16 @@ public void setUp() {
         entries = Arrays.asList(entry);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         exportFormat = null;
     }
 
     @Test
-    public void emitWellFormedHtml() throws Exception {
-        File tmpFile = testFolder.newFile();
-        exportFormat.export(databaseContext, tmpFile.toPath(), charset, entries);
-        List<String> lines = Files.readAllLines(tmpFile.toPath());
+    public void emitWellFormedHtml(@TempDirectory.TempDir Path testFolder) throws Exception {
+        Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
+        exportFormat.export(databaseContext, path, charset, entries);
+        List<String> lines = Files.readAllLines(path);
         assertEquals("</html>", lines.get(lines.size() - 1));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
index c078e3e4b2b..f6775762982 100644
--- a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
@@ -7,7 +7,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -18,14 +17,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
 import org.xmlunit.builder.Input;
 import org.xmlunit.builder.Input.Builder;
@@ -33,10 +30,10 @@
 import org.xmlunit.diff.ElementSelectors;
 import org.xmlunit.matchers.CompareMatcher;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 
-@RunWith(Parameterized.class)
+@ExtendWith(TempDirectory.class)
 public class MSBibExportFormatTestFiles {
 
     public BibDatabaseContext databaseContext;
@@ -45,39 +42,37 @@ public class MSBibExportFormatTestFiles {
     public MSBibExporter msBibExportFormat;
     public BibtexImporter testImporter;
 
-    @Parameter
-    public String filename;
-    public Path resourceDir;
+    private static Path resourceDir;
 
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
-
-
-    @Parameters(name = "{0}")
-    public static Collection<String> fileNames() throws IOException, URISyntaxException {
-        try (Stream<Path> stream = Files.list(Paths.get(MSBibExportFormatTestFiles.class.getResource("").toURI()))) {
+    static Stream<String> fileNames() throws IOException, URISyntaxException {
+        //we have to point it to one existing file, otherwise it will return the default class path
+        resourceDir = Paths.get(MSBibExportFormatTestFiles.class.getResource("MsBibExportFormatTest1.bib").toURI()).getParent();
+        System.out.println(resourceDir);
+        try (Stream<Path> stream = Files.list(resourceDir)) {
             return stream.map(n -> n.getFileName().toString()).filter(n -> n.endsWith(".bib"))
-                    .filter(n -> n.startsWith("MsBib")).collect(Collectors.toList());
+                         .filter(n -> n.startsWith("MsBib")).collect(Collectors.toList()).stream();
         }
     }
 
-    @Before
-    public void setUp() throws Exception {
-        resourceDir = Paths.get(MSBibExportFormatTestFiles.class.getResource("").toURI());
+    @BeforeEach
+    void setUp(@TempDirectory.TempDir Path testFolder) throws Exception {
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
         msBibExportFormat = new MSBibExporter();
-        tempFile = testFolder.newFile().toPath();
+        Path path = testFolder.resolve("ARandomlyNamedFile.tmp");
+        tempFile = Files.createFile(path);
         testImporter = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
     }
 
-    @Test
-    public final void testPerformExport() throws IOException, SaveException {
+    @Disabled
+    @ParameterizedTest
+    @MethodSource("fileNames")
+    void testPerformExport(String filename) throws IOException, SaveException {
         String xmlFileName = filename.replace(".bib", ".xml");
         Path importFile = resourceDir.resolve(filename);
 
         List<BibEntry> entries = testImporter.importDatabase(importFile, StandardCharsets.UTF_8).getDatabase()
-                .getEntries();
+                                             .getEntries();
 
         msBibExportFormat.export(databaseContext, tempFile, charset, entries);
 
@@ -85,6 +80,6 @@ public final void testPerformExport() throws IOException, SaveException {
         Builder test = Input.from(Files.newInputStream(tempFile));
 
         assertThat(test, CompareMatcher.isSimilarTo(control)
-                .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
+                                       .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
index 017cc32cabc..2d797d4e8de 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
@@ -12,39 +12,36 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
-
+@ExtendWith(TempDirectory.class)
 public class ModsExportFormatTest {
 
     public Charset charset;
     private ModsExporter modsExportFormat;
     private BibDatabaseContext databaseContext;
-    private Path tempFile;
-
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
         modsExportFormat = new ModsExporter();
         new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
-        tempFile = testFolder.newFile().toPath();
         Paths.get(ModsExportFormatTest.class.getResource("ModsExportFormatTestAllFields.bib").toURI());
     }
 
     @Test
-    public final void exportForNoEntriesWritesNothing() throws Exception {
+    public final void exportForNoEntriesWritesNothing(@TempDirectory.TempDir Path tempFile) throws Exception {
+        Path file = tempFile.resolve("ThisIsARandomlyNamedFile");
+        Files.createFile(file);
         modsExportFormat.export(databaseContext, tempFile, charset, Collections.emptyList());
-        Assert.assertEquals(Collections.emptyList(), Files.readAllLines(tempFile));
+        assertEquals(Collections.emptyList(), Files.readAllLines(file));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
index 3faf73dd291..dfce7d716e1 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
@@ -1,12 +1,10 @@
 package org.jabref.logic.exporter;
 
-import java.io.File;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -19,15 +17,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
 import org.xmlunit.builder.Input;
 import org.xmlunit.builder.Input.Builder;
@@ -35,85 +30,92 @@
 import org.xmlunit.diff.ElementSelectors;
 import org.xmlunit.matchers.CompareMatcher;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 
-@RunWith(Parameterized.class)
+@ExtendWith(TempDirectory.class)
 public class ModsExportFormatTestFiles {
 
     public Charset charset;
     private BibDatabaseContext databaseContext;
-    private File tempFile;
+    private Path tempFile;
     private ModsExporter modsExportFormat;
     private BibtexImporter bibtexImporter;
     private ModsImporter modsImporter;
     private Path importFile;
 
+    private static Path resourceDir;
 
-    @Parameter
-    public String filename;
+    public static Stream<String> fileNames() throws Exception {
+        resourceDir = Paths.get(MSBibExportFormatTestFiles.class.getResource("ModsExportFormatTestAllFields.bib").toURI()).getParent();
+        System.out.println(resourceDir);
 
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
-
-
-    @Parameters(name = "{0}")
-    public static Collection<String> fileNames() throws Exception {
-        try (Stream<Path> stream = Files.list(Paths.get(ModsExportFormatTestFiles.class.getResource("").toURI()))) {
+        try (Stream<Path> stream = Files.list(resourceDir)) {
             //            stream.forEach(n -> System.out.println(n));
             return stream.map(n -> n.getFileName().toString()).filter(n -> n.endsWith(".bib"))
-                    .filter(n -> n.startsWith("Mods")).collect(Collectors.toList());
+                    .filter(n -> n.startsWith("Mods")).collect(Collectors.toList()).stream();
         }
     }
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeEach
+    public void setUp(@TempDirectory.TempDir Path testFolder) throws Exception {
         databaseContext = new BibDatabaseContext();
-        importFile = Paths.get(ModsExportFormatTestFiles.class.getResource(filename).toURI());
         charset = StandardCharsets.UTF_8;
         modsExportFormat = new ModsExporter();
-        tempFile = testFolder.newFile();
+        Path path = testFolder.resolve("ARandomlyNamedFile.tmp");
+        Files.createFile(path);
+        tempFile = path.toAbsolutePath();
         bibtexImporter = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
         modsImporter = new ModsImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
     }
 
-    @Test
-    public final void testPerformExport() throws Exception {
+    @Disabled
+    @ParameterizedTest
+    @MethodSource("fileNames")
+    public final void testPerformExport(String filename) throws Exception {
+        importFile = Paths.get(ModsExportFormatTestFiles.class.getResource(filename).toURI());
         String xmlFileName = filename.replace(".bib", ".xml");
-        String tempFilename = tempFile.getCanonicalPath();
+        Path tempFilename = tempFile.toAbsolutePath();
         List<BibEntry> entries = bibtexImporter.importDatabase(importFile, charset).getDatabase().getEntries();
         Path xmlFile = Paths.get(ModsExportFormatTestFiles.class.getResource(xmlFileName).toURI());
 
-        modsExportFormat.export(databaseContext, tempFile.toPath(), charset, entries);
+        modsExportFormat.export(databaseContext, tempFile, charset, entries);
 
         Builder control = Input.from(Files.newInputStream(xmlFile));
-        Builder test = Input.from(Files.newInputStream(Paths.get(tempFilename)));
+        Builder test = Input.from(Files.newInputStream(tempFilename));
 
-        Assert.assertThat(test, CompareMatcher.isSimilarTo(control)
+        assertThat(test, CompareMatcher.isSimilarTo(control)
                 .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
     }
 
-    @Test
-    public final void testExportAsModsAndThenImportAsMods() throws Exception {
+    @Disabled
+    @ParameterizedTest
+    @MethodSource("fileNames")
+    public final void testExportAsModsAndThenImportAsMods(String filename) throws Exception {
+        importFile = Paths.get(ModsExportFormatTestFiles.class.getResource(filename).toURI());
         List<BibEntry> entries = bibtexImporter.importDatabase(importFile, charset).getDatabase().getEntries();
 
-        modsExportFormat.export(databaseContext, tempFile.toPath(), charset, entries);
-        BibEntryAssert.assertEquals(entries, Paths.get(tempFile.getPath()), modsImporter);
+        modsExportFormat.export(databaseContext, tempFile, charset, entries);
+        BibEntryAssert.assertEquals(entries, tempFile, modsImporter);
     }
 
-    @Test
-    public final void testImportAsModsAndExportAsMods() throws Exception {
+    @Disabled
+    @ParameterizedTest
+    @MethodSource("fileNames")
+    public final void testImportAsModsAndExportAsMods(String filename) throws Exception {
+        importFile = Paths.get(ModsExportFormatTestFiles.class.getResource(filename).toURI());
         String xmlFileName = filename.replace(".bib", ".xml");
-        String tempFilename = tempFile.getCanonicalPath();
+        Path tempFilename = tempFile.toAbsolutePath();
         Path xmlFile = Paths.get(ModsExportFormatTestFiles.class.getResource(xmlFileName).toURI());
 
         List<BibEntry> entries = modsImporter.importDatabase(xmlFile, charset).getDatabase().getEntries();
 
-        modsExportFormat.export(databaseContext, tempFile.toPath(), charset, entries);
+        modsExportFormat.export(databaseContext, tempFile, charset, entries);
 
         Builder control = Input.from(Files.newInputStream(xmlFile));
-        Builder test = Input.from(Files.newInputStream(Paths.get(tempFilename)));
+        Builder test = Input.from(Files.newInputStream(tempFilename));
 
-        Assert.assertThat(test, CompareMatcher.isSimilarTo(control)
+        assertThat(test, CompareMatcher.isSimilarTo(control)
                 .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
     }
 
diff --git a/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
index ff291531f94..103d7c4996b 100644
--- a/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
@@ -11,36 +11,33 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@ExtendWith(TempDirectory.class)
 public class MsBibExportFormatTest {
 
     public BibDatabaseContext databaseContext;
     public Charset charset;
-    public Path tempFile;
     public MSBibExporter msBibExportFormat;
 
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
-
-
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
         msBibExportFormat = new MSBibExporter();
-        tempFile = testFolder.newFile().toPath();
     }
 
     @Test
-    public final void testPerformExportWithNoEntry() throws IOException, SaveException {
+    public final void testPerformExportWithNoEntry(@TempDirectory.TempDir Path tempFile) throws IOException, SaveException {
+        Path path = tempFile.resolve("ThisIsARandomlyNamedFile");
+        Files.createFile(path);
         List<BibEntry> entries = Collections.emptyList();
-        msBibExportFormat.export(databaseContext, tempFile, charset, entries);
-        assertEquals(Collections.emptyList(), Files.readAllLines(tempFile));
+        msBibExportFormat.export(databaseContext, path, charset, entries);
+        assertEquals(Collections.emptyList(), Files.readAllLines(path));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
index 6fc1542c9be..3ea662508e6 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
@@ -16,24 +16,23 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
+@ExtendWith(TempDirectory.class)
 public class XmpExporterTest {
 
     private Exporter exporter;
     private BibDatabaseContext databaseContext;
     private Charset encoding;
 
-    @Rule public TemporaryFolder testFolder = new TemporaryFolder();
-
-    @Before
+    @BeforeEach
     public void setUp() {
         Map<String, TemplateExporter> customFormats = new HashMap<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
@@ -48,8 +47,9 @@ public void setUp() {
     }
 
     @Test
-    public void exportSingleEntry() throws Exception {
-        Path file = testFolder.newFile().toPath();
+    public void exportSingleEntry(@TempDirectory.TempDir Path testFolder) throws Exception {
+        Path file = testFolder.resolve("ThisIsARandomlyNamedFile");
+        Files.createFile(file);
 
         BibEntry entry = new BibEntry();
         entry.setField("author", "Alan Turing");
@@ -62,8 +62,9 @@ public void exportSingleEntry() throws Exception {
     }
 
     @Test
-    public void writeMultipleEntriesInASingleFile() throws Exception {
-        Path file = testFolder.newFile().toPath();
+    public void writeMultipleEntriesInASingleFile(@TempDirectory.TempDir Path testFolder) throws Exception {
+        Path file = testFolder.resolve("ThisIsARandomlyNamedFile");
+        Files.createFile(file);
 
         BibEntry entryTuring = new BibEntry();
         entryTuring.setField("author", "Alan Turing");
@@ -81,8 +82,9 @@ public void writeMultipleEntriesInASingleFile() throws Exception {
     }
 
     @Test
-    public void writeMultipleEntriesInDifferentFiles() throws Exception {
-        Path file = testFolder.newFile("split").toPath();
+    public void writeMultipleEntriesInDifferentFiles(@TempDirectory.TempDir Path testFolder) throws Exception {
+        Path file = testFolder.resolve("split");
+        Files.createFile(file);
 
         BibEntry entryTuring = new BibEntry();
         entryTuring.setField("author", "Alan Turing");
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
index 7438c83269e..f6bd4e789fa 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
@@ -1,36 +1,36 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *  Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
-public class CleanupUrlFormatterTest {
+class CleanupUrlFormatterTest {
 
     private CleanupURLFormatter formatter;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         formatter = new CleanupURLFormatter();
     }
 
     @Test
-    public void removeSpecialSymbolsFromURLLink() {
+    void removeSpecialSymbolsFromURLLink() {
         assertEquals("http://wikipedia.org",
                 formatter.format("http%3A%2F%2Fwikipedia.org"));
     }
 
     @Test
-    public void extractURLFormLink() {
+    void extractURLFormLink() {
         assertEquals("http://wikipedia.org",
                 formatter.format("away.php?to=http%3A%2F%2Fwikipedia.org&a=snippet"));
     }
 
     @Test
-    public void formatExample() {
+    void formatExample() {
         assertEquals("http://www.focus.de/" +
                 "gesundheit/ratgeber/herz/test/lebenserwartung-werden-sie-100-jahre-alt_aid_363828.html",
                 formatter.format(formatter.getExampleInput()));
diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
index 09f4dd4ddcd..e861f07b999 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
@@ -1,69 +1,61 @@
 package org.jabref.logic.importer;
 
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.stream.Stream;
 
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(Parameterized.class)
-public class ImportFormatReaderIntegrationTest {
+class ImportFormatReaderIntegrationTest {
 
     private ImportFormatReader reader;
 
-    private final int count;
-    public final String format;
-    private final Path file;
-
-    public ImportFormatReaderIntegrationTest(String resource, String format, int count) throws URISyntaxException {
-        this.format = format;
-        this.count = count;
-        this.file = Paths.get(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
-
-    }
-
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         reader = new ImportFormatReader();
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.getEncoding()).thenReturn(StandardCharsets.UTF_8);
         reader.resetImportFormats(importFormatPreferences, mock(XmpPreferences.class), new DummyFileUpdateMonitor());
     }
 
-    @Test
-    public void testImportUnknownFormat() throws Exception {
+    @ParameterizedTest
+    @MethodSource("importFormats")
+    void testImportUnknownFormat(String resource, String format, int count) throws Exception {
+        Path file = Paths.get(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
         ImportFormatReader.UnknownFormatImport unknownFormat = reader.importUnknownFormat(file, new DummyFileUpdateMonitor());
         assertEquals(count, unknownFormat.parserResult.getDatabase().getEntryCount());
     }
 
-    @Test
-    public void testImportFormatFromFile() throws Exception {
+    @ParameterizedTest
+    @MethodSource("importFormats")
+    void testImportFormatFromFile(String resource, String format, int count) throws Exception {
+        Path file = Paths.get(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
         assertEquals(count, reader.importFromFile(format, file).getDatabase().getEntries().size());
     }
 
-    @Test
-    public void testImportUnknownFormatFromString() throws Exception {
+    @ParameterizedTest
+    @MethodSource("importFormats")
+    void testImportUnknownFormatFromString(String resource, String format, int count) throws Exception {
+        Path file = Paths.get(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
         String data = new String(Files.readAllBytes(file), StandardCharsets.UTF_8);
         assertEquals(count, reader.importUnknownFormat(data).parserResult.getDatabase().getEntries().size());
     }
 
-    @Parameterized.Parameters(name = "{index}: {1}")
-    public static Collection<Object[]> importFormats() {
+    private static Stream<Object[]> importFormats() {
         Collection<Object[]> result = new ArrayList<>();
         result.add(new Object[] {"fileformat/RisImporterTest1.ris", "ris", 1});
         result.add(new Object[] {"fileformat/IsiImporterTest1.isi", "isi", 1});
@@ -73,7 +65,7 @@ public static Collection<Object[]> importFormats() {
         result.add(new Object[] {"fileformat/Endnote.entries.enw", "refer", 5});
         result.add(new Object[] {"fileformat/MsBibImporterTest4.xml", "msbib", 1});
         result.add(new Object[] {"fileformat/MsBibImporterTest4.bib", "bibtex", 1});
-        return result;
+        return result.stream();
     }
 
 }
diff --git a/src/test/java/org/jabref/logic/importer/ImporterTest.java b/src/test/java/org/jabref/logic/importer/ImporterTest.java
index 1efd2cc9f20..c16eb4a2fb2 100644
--- a/src/test/java/org/jabref/logic/importer/ImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImporterTest.java
@@ -1,10 +1,8 @@
 package org.jabref.logic.importer;
 
 import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.jabref.logic.importer.fileformat.BibTeXMLImporter;
 import org.jabref.logic.importer.fileformat.BiblioscapeImporter;
@@ -27,103 +25,111 @@
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(Parameterized.class)
 public class ImporterTest {
 
-    @Parameter public Importer format;
-
-    @Test(expected = NullPointerException.class)
-    public void isRecognizedFormatWithNullForBufferedReaderThrowsException() throws IOException {
-        format.isRecognizedFormat((BufferedReader) null);
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void isRecognizedFormatWithNullForBufferedReaderThrowsException(Importer format) {
+        assertThrows(NullPointerException.class, ()-> format.isRecognizedFormat((BufferedReader) null));
     }
 
-    @Test(expected = NullPointerException.class)
-    public void isRecognizedFormatWithNullForStringThrowsException() throws IOException {
-        format.isRecognizedFormat((String) null);
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void isRecognizedFormatWithNullForStringThrowsException(Importer format) {
+        assertThrows(NullPointerException.class, ()-> format.isRecognizedFormat((String) null));
     }
 
-    @Test(expected = NullPointerException.class)
-    public void importDatabaseWithNullForBufferedReaderThrowsException() throws IOException {
-        format.importDatabase((BufferedReader) null);
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void importDatabaseWithNullForBufferedReaderThrowsException(Importer format) {
+        assertThrows(NullPointerException.class, ()-> format.importDatabase((BufferedReader) null));
     }
 
-    @Test(expected = NullPointerException.class)
-    public void importDatabaseWithNullForStringThrowsException() throws IOException {
-        format.importDatabase((String) null);
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void importDatabaseWithNullForStringThrowsException(Importer format) {
+        assertThrows(NullPointerException.class, ()-> format.importDatabase((String) null));
     }
 
-    @Test
-    public void getFormatterNameDoesNotReturnNull() {
-        Assert.assertNotNull(format.getName());
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void getFormatterNameDoesNotReturnNull(Importer format) {
+         assertNotNull(format.getName());
     }
 
-    @Test
-    public void getFileTypeDoesNotReturnNull() {
-        Assert.assertNotNull(format.getFileType());
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void getFileTypeDoesNotReturnNull(Importer format) {
+         assertNotNull(format.getFileType());
     }
 
-    @Test
-    public void getIdDoesNotReturnNull() {
-        Assert.assertNotNull(format.getId());
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void getIdDoesNotReturnNull(Importer format) {
+         assertNotNull(format.getId());
     }
 
-    @Test
-    public void getIdDoesNotContainWhitespace() {
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void getIdDoesNotContainWhitespace(Importer format) {
         Pattern whitespacePattern = Pattern.compile("\\s");
-        Assert.assertFalse(whitespacePattern.matcher(format.getId()).find());
+         assertFalse(whitespacePattern.matcher(format.getId()).find());
     }
 
-    @Test
-    public void getIdStripsSpecialCharactersAndConvertsToLowercase() {
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void getIdStripsSpecialCharactersAndConvertsToLowercase(Importer format) {
         Importer importer = mock(Importer.class, Mockito.CALLS_REAL_METHODS);
         when(importer.getName()).thenReturn("*Test-Importer");
-        Assert.assertEquals("testimporter", importer.getId());
+         assertEquals("testimporter", importer.getId());
     }
 
-    @Test
-    public void getDescriptionDoesNotReturnNull() {
-        Assert.assertNotNull(format.getDescription());
+    @ParameterizedTest
+    @MethodSource("instancesToTest")
+    public void getDescriptionDoesNotReturnNull(Importer format) {
+         assertNotNull(format.getDescription());
     }
 
-    @Parameters(name = "{index}: {0}")
-    public static Collection<Object[]> instancesToTest() {
+
+    public static Stream<Importer> instancesToTest() {
         // all classes implementing {@link Importer}
         // sorted alphabetically
 
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
         // @formatter:off
-        return Arrays.asList(
-                new Object[]{new BiblioscapeImporter()},
-                new Object[]{new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor())},
-                new Object[]{new BibTeXMLImporter()},
-                new Object[]{new CopacImporter()},
-                new Object[]{new EndnoteImporter(importFormatPreferences)},
-                new Object[]{new FreeCiteImporter(importFormatPreferences)},
-                new Object[]{new InspecImporter()},
-                new Object[]{new IsiImporter()},
-                new Object[]{new MedlineImporter()},
-                new Object[]{new MedlinePlainImporter()},
-                new Object[]{new ModsImporter(importFormatPreferences)},
-                new Object[]{new MsBibImporter()},
-                new Object[]{new OvidImporter()},
-                new Object[]{new PdfContentImporter(importFormatPreferences)},
-                new Object[]{new PdfXmpImporter(xmpPreferences)},
-                new Object[]{new RepecNepImporter(importFormatPreferences)},
-                new Object[]{new RisImporter()},
-                new Object[]{new SilverPlatterImporter()}
+        return Stream.of(
+                new BiblioscapeImporter(),
+                new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor()),
+                new BibTeXMLImporter(),
+                new CopacImporter(),
+                new EndnoteImporter(importFormatPreferences),
+                new FreeCiteImporter(importFormatPreferences),
+                new InspecImporter(),
+                new IsiImporter(),
+                new MedlineImporter(),
+                new MedlinePlainImporter(),
+                new ModsImporter(importFormatPreferences),
+                new MsBibImporter(),
+                new OvidImporter(),
+                new PdfContentImporter(importFormatPreferences),
+                new PdfXmpImporter(xmpPreferences),
+                new RepecNepImporter(importFormatPreferences),
+                new RisImporter(),
+                new SilverPlatterImporter()
         );
         // @formatter:on
     }
+
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index d6e3b0689db..3ff1092b631 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -44,10 +44,10 @@
 import org.junit.jupiter.api.function.Executable;
 import org.mockito.Answers;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -55,28 +55,28 @@
 /**
  * Test the BibtexParser
  */
-public class BibtexParserTest {
+class BibtexParserTest {
 
     private ImportFormatPreferences importFormatPreferences;
     private BibtexParser parser;
     private FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.getKeywordSeparator()).thenReturn(',');
         parser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
     }
 
     @Test
-    public void parseWithNullThrowsNullPointerException() throws Exception {
+    void parseWithNullThrowsNullPointerException() throws Exception {
         Executable toBeTested = () -> parser.parse(null);
 
         assertThrows(NullPointerException.class, toBeTested);
     }
 
     @Test
-    public void fromStringRecognizesEntry() throws ParseException {
+    void fromStringRecognizesEntry() throws ParseException {
         List<BibEntry> parsed = parser
                 .parseEntries("@article{test,author={Ed von Test}}");
 
@@ -89,7 +89,7 @@ public void fromStringRecognizesEntry() throws ParseException {
     }
 
     @Test
-    public void fromStringReturnsEmptyListFromEmptyString() throws ParseException {
+    void fromStringReturnsEmptyListFromEmptyString() throws ParseException {
         Collection<BibEntry> parsed = parser.parseEntries("");
 
         assertNotNull(parsed);
@@ -97,7 +97,7 @@ public void fromStringReturnsEmptyListFromEmptyString() throws ParseException {
     }
 
     @Test
-    public void fromStringReturnsEmptyListIfNoEntryRecognized() throws ParseException {
+    void fromStringReturnsEmptyListIfNoEntryRecognized() throws ParseException {
         Collection<BibEntry> parsed = parser
                 .parseEntries("@@article@@{{{{{{}");
 
@@ -106,7 +106,7 @@ public void fromStringReturnsEmptyListIfNoEntryRecognized() throws ParseExceptio
     }
 
     @Test
-    public void singleFromStringRecognizesEntry() throws ParseException {
+    void singleFromStringRecognizesEntry() throws ParseException {
         Optional<BibEntry> parsed = BibtexParser.singleFromString(
                 "@article{canh05," + "  author = {Crowston, K. and Annabi, H.},\n" + "  title = {Title A}}\n",
                 importFormatPreferences, fileMonitor);
@@ -121,7 +121,7 @@ public void singleFromStringRecognizesEntry() throws ParseException {
     }
 
     @Test
-    public void singleFromStringRecognizesEntryInMultiple() throws ParseException {
+    void singleFromStringRecognizesEntryInMultiple() throws ParseException {
         Optional<BibEntry> parsed = BibtexParser.singleFromString(
                 "@article{canh05," + "  author = {Crowston, K. and Annabi, H.},\n" + "  title = {Title A}}\n"
                         + "@inProceedings{foo," + "  author={Norton Bar}}",
@@ -132,21 +132,21 @@ public void singleFromStringRecognizesEntryInMultiple() throws ParseException {
     }
 
     @Test
-    public void singleFromStringReturnsEmptyFromEmptyString() throws ParseException {
+    void singleFromStringReturnsEmptyFromEmptyString() throws ParseException {
         Optional<BibEntry> parsed = BibtexParser.singleFromString("", importFormatPreferences, fileMonitor);
 
         assertEquals(Optional.empty(), parsed);
     }
 
     @Test
-    public void singleFromStringReturnsEmptyIfNoEntryRecognized() throws ParseException {
+    void singleFromStringReturnsEmptyIfNoEntryRecognized() throws ParseException {
         Optional<BibEntry> parsed = BibtexParser.singleFromString("@@article@@{{{{{{}", importFormatPreferences, fileMonitor);
 
         assertEquals(Optional.empty(), parsed);
     }
 
     @Test
-    public void parseRecognizesEntry() throws IOException {
+    void parseRecognizesEntry() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={Ed von Test}}"));
 
@@ -161,7 +161,7 @@ public void parseRecognizesEntry() throws IOException {
     }
 
     @Test
-    public void parseQuotedEntries() throws IOException {
+    void parseQuotedEntries() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author=\"Ed von Test\"}"));
 
@@ -176,7 +176,7 @@ public void parseQuotedEntries() throws IOException {
     }
 
     @Test
-    public void parseRecognizesEntryOnlyWithKey() throws IOException {
+    void parseRecognizesEntryOnlyWithKey() throws IOException {
         ParserResult result = parser.parse(new StringReader("@article{test}"));
 
         List<BibEntry> parsed = result.getDatabase().getEntries();
@@ -188,7 +188,7 @@ public void parseRecognizesEntryOnlyWithKey() throws IOException {
     }
 
     @Test
-    public void parseRecognizesEntryWithWhitespaceAtBegining() throws IOException {
+    void parseRecognizesEntryWithWhitespaceAtBegining() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader(" @article{test,author={Ed von Test}}"));
 
@@ -203,7 +203,7 @@ public void parseRecognizesEntryWithWhitespaceAtBegining() throws IOException {
     }
 
     @Test
-    public void parseRecognizesEntryWithWhitespace() throws IOException {
+    void parseRecognizesEntryWithWhitespace() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article { test,author={Ed von Test}}"));
 
@@ -218,7 +218,7 @@ public void parseRecognizesEntryWithWhitespace() throws IOException {
     }
 
     @Test
-    public void parseRecognizesEntryWithNewlines() throws IOException {
+    void parseRecognizesEntryWithNewlines() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article\n{\ntest,author={Ed von Test}}"));
 
@@ -233,7 +233,7 @@ public void parseRecognizesEntryWithNewlines() throws IOException {
     }
 
     @Test
-    public void parseRecognizesEntryWithUnknownType() throws IOException {
+    void parseRecognizesEntryWithUnknownType() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@unknown{test,author={Ed von Test}}"));
 
@@ -248,7 +248,7 @@ public void parseRecognizesEntryWithUnknownType() throws IOException {
     }
 
     @Test
-    public void parseRecognizesEntryWithVeryLongType() throws IOException {
+    void parseRecognizesEntryWithVeryLongType() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@thisIsALongStringToTestMaybeItIsToLongWhoKnowsNOTme{test,author={Ed von Test}}"));
 
@@ -263,7 +263,7 @@ public void parseRecognizesEntryWithVeryLongType() throws IOException {
     }
 
     @Test
-    public void parseRecognizesEntryInParenthesis() throws IOException {
+    void parseRecognizesEntryInParenthesis() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article(test,author={Ed von Test})"));
 
@@ -278,7 +278,7 @@ public void parseRecognizesEntryInParenthesis() throws IOException {
     }
 
     @Test
-    public void parseRecognizesEntryWithBigNumbers() throws IOException {
+    void parseRecognizesEntryWithBigNumbers() throws IOException {
         ParserResult result = parser.parse(new StringReader("@article{canh05," + "isbn = 1234567890123456789,\n"
                 + "isbn2 = {1234567890123456789},\n" + "small = 1234,\n" + "}"));
 
@@ -293,7 +293,7 @@ public void parseRecognizesEntryWithBigNumbers() throws IOException {
     }
 
     @Test
-    public void parseRecognizesBibtexKeyWithSpecialCharacters() throws IOException {
+    void parseRecognizesBibtexKeyWithSpecialCharacters() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{te_st:with-special(characters),author={Ed von Test}}"));
 
@@ -307,7 +307,7 @@ public void parseRecognizesBibtexKeyWithSpecialCharacters() throws IOException {
     }
 
     @Test
-    public void parseRecognizesEntryWhereLastFieldIsFinishedWithComma() throws IOException {
+    void parseRecognizesEntryWhereLastFieldIsFinishedWithComma() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={Ed von Test},}"));
 
@@ -322,7 +322,7 @@ public void parseRecognizesEntryWhereLastFieldIsFinishedWithComma() throws IOExc
     }
 
     @Test
-    public void parseRecognizesEntryWithAtInField() throws IOException {
+    void parseRecognizesEntryWithAtInField() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={Ed von T@st}}"));
 
@@ -335,7 +335,7 @@ public void parseRecognizesEntryWithAtInField() throws IOException {
     }
 
     @Test
-    public void parseRecognizesEntryPrecedingComment() throws IOException {
+    void parseRecognizesEntryPrecedingComment() throws IOException {
         String comment = "@Comment{@article{myarticle,}" + OS.NEWLINE
                 + "@inproceedings{blabla, title={the proceedings of bl@bl@}; }" + OS.NEWLINE + "}";
         String entryWithComment = comment + OS.NEWLINE + "@article{test,author={Ed von T@st}}";
@@ -352,7 +352,7 @@ public void parseRecognizesEntryPrecedingComment() throws IOException {
     }
 
     @Test
-    public void parseRecognizesMultipleEntries() throws IOException {
+    void parseRecognizesMultipleEntries() throws IOException {
         List<BibEntry> expected = new ArrayList<>();
         BibEntry firstEntry = new BibEntry();
         firstEntry.setType("article");
@@ -376,7 +376,7 @@ public void parseRecognizesMultipleEntries() throws IOException {
     }
 
     @Test
-    public void parseSetsParsedSerialization() throws IOException {
+    void parseSetsParsedSerialization() throws IOException {
         String firstEntry = "@article{canh05," + "  author = {Crowston, K. and Annabi, H.}," + OS.NEWLINE
                 + "  title = {Title A}}" + OS.NEWLINE;
         String secondEntry = "@inProceedings{foo," + "  author={Norton Bar}}";
@@ -394,7 +394,7 @@ public void parseSetsParsedSerialization() throws IOException {
     }
 
     @Test
-    public void parseRecognizesMultipleEntriesOnSameLine() throws IOException {
+    void parseRecognizesMultipleEntriesOnSameLine() throws IOException {
         List<BibEntry> expected = new ArrayList<>();
         BibEntry firstEntry = new BibEntry();
         firstEntry.setType("article");
@@ -414,7 +414,7 @@ public void parseRecognizesMultipleEntriesOnSameLine() throws IOException {
     }
 
     @Test
-    public void parseCombinesMultipleAuthorFields() throws IOException {
+    void parseCombinesMultipleAuthorFields() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@article{test,author={Ed von Test},author={Second Author},author={Third Author}}"));
 
@@ -429,7 +429,7 @@ public void parseCombinesMultipleAuthorFields() throws IOException {
     }
 
     @Test
-    public void parseCombinesMultipleEditorFields() throws IOException {
+    void parseCombinesMultipleEditorFields() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@article{test,editor={Ed von Test},editor={Second Author},editor={Third Author}}"));
 
@@ -444,7 +444,7 @@ public void parseCombinesMultipleEditorFields() throws IOException {
     }
 
     @Test
-    public void parseCombinesMultipleKeywordsFields() throws IOException {
+    void parseCombinesMultipleKeywordsFields() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@article{test,Keywords={Test},Keywords={Second Keyword},Keywords={Third Keyword}}"));
 
@@ -459,7 +459,7 @@ public void parseCombinesMultipleKeywordsFields() throws IOException {
     }
 
     @Test
-    public void parseRecognizesHeaderButIgnoresEncoding() throws IOException {
+    void parseRecognizesHeaderButIgnoresEncoding() throws IOException {
         ParserResult result = parser.parse(new StringReader("This file was created with JabRef 2.1 beta 2." + "\n"
                 + "Encoding: Cp1252" + "\n" + "" + "\n" + "@INPROCEEDINGS{CroAnnHow05," + "\n"
                 + "  author = {Crowston, K. and Annabi, H. and Howison, J. and Masango, C.}," + "\n"
@@ -488,7 +488,7 @@ public void parseRecognizesHeaderButIgnoresEncoding() throws IOException {
     }
 
     @Test
-    public void parseRecognizesFormatedEntry() throws IOException {
+    void parseRecognizesFormatedEntry() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("" + "@INPROCEEDINGS{CroAnnHow05," + "\n"
                         + "  author = {Crowston, K. and Annabi, H. and Howison, J. and Masango, C.}," + "\n"
@@ -516,7 +516,7 @@ public void parseRecognizesFormatedEntry() throws IOException {
     }
 
     @Test
-    public void parseRecognizesFieldValuesInQuotationMarks() throws IOException {
+    void parseRecognizesFieldValuesInQuotationMarks() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author=\"Ed von Test\"}"));
 
@@ -531,7 +531,7 @@ public void parseRecognizesFieldValuesInQuotationMarks() throws IOException {
     }
 
     @Test
-    public void parseRecognizesNumbersWithoutBracketsOrQuotationMarks() throws IOException {
+    void parseRecognizesNumbersWithoutBracketsOrQuotationMarks() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,year = 2005}"));
 
@@ -546,7 +546,7 @@ public void parseRecognizesNumbersWithoutBracketsOrQuotationMarks() throws IOExc
     }
 
     @Test
-    public void parseRecognizesUppercaseFields() throws IOException {
+    void parseRecognizesUppercaseFields() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,AUTHOR={Ed von Test}}"));
 
@@ -561,7 +561,7 @@ public void parseRecognizesUppercaseFields() throws IOException {
     }
 
     @Test
-    public void parseRecognizesAbsoluteFile() throws IOException {
+    void parseRecognizesAbsoluteFile() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,file = {D:\\Documents\\literature\\Tansel-PRL2006.pdf}}"));
 
@@ -576,7 +576,7 @@ public void parseRecognizesAbsoluteFile() throws IOException {
     }
 
     @Test
-    public void parseRecognizesDateFieldWithConcatenation() throws IOException {
+    void parseRecognizesDateFieldWithConcatenation() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,date = {1-4~} # nov}"));
 
@@ -591,7 +591,7 @@ public void parseRecognizesDateFieldWithConcatenation() throws IOException {
     }
 
     @Test
-    public void parseReturnsEmptyListIfNoEntryRecognized() throws IOException {
+    void parseReturnsEmptyListIfNoEntryRecognized() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("  author = {Crowston, K. and Annabi, H. and Howison, J. and Masango, C.}," + "\n"
                         + "  title = {Effective work practices for floss development: A model and propositions}," + "\n"
@@ -605,7 +605,7 @@ public void parseReturnsEmptyListIfNoEntryRecognized() throws IOException {
     }
 
     @Test
-    public void parseReturnsEmptyListIfNoEntryExistent() throws IOException {
+    void parseReturnsEmptyListIfNoEntryExistent() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("This was created with JabRef 2.1 beta 2." + "\n" + "Encoding: Cp1252" + "\n"));
 
@@ -615,7 +615,7 @@ public void parseReturnsEmptyListIfNoEntryExistent() throws IOException {
     }
 
     @Test
-    public void parseRecognizesDuplicateBibtexKeys() throws IOException {
+    void parseRecognizesDuplicateBibtexKeys() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{canh05," + "  author = {Crowston, K. and Annabi, H.},\n"
                         + "  title = {Title A}}\n" + "@inProceedings{canh05," + "  author={Norton Bar}}"));
@@ -627,7 +627,7 @@ public void parseRecognizesDuplicateBibtexKeys() throws IOException {
     }
 
     @Test
-    public void parseNotWarnsAboutEntryWithoutBibtexKey() throws IOException {
+    void parseNotWarnsAboutEntryWithoutBibtexKey() throws IOException {
         BibEntry expected = new BibEntry();
         expected.setField("author", "Ed von Test");
         expected.setType("article");
@@ -641,7 +641,7 @@ public void parseNotWarnsAboutEntryWithoutBibtexKey() throws IOException {
     }
 
     @Test
-    public void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracket() throws IOException {
+    void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracket() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={author missing bracket}"));
 
@@ -652,7 +652,7 @@ public void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracket() throws IOEx
     }
 
     @Test
-    public void parseAddsEscapedOpenBracketToFieldValue() throws IOException {
+    void parseAddsEscapedOpenBracketToFieldValue() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,review={escaped \\{ bracket}}"));
 
@@ -667,7 +667,7 @@ public void parseAddsEscapedOpenBracketToFieldValue() throws IOException {
     }
 
     @Test
-    public void parseAddsEscapedClosingBracketToFieldValue() throws IOException {
+    void parseAddsEscapedClosingBracketToFieldValue() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,review={escaped \\} bracket}}"));
 
@@ -682,7 +682,7 @@ public void parseAddsEscapedClosingBracketToFieldValue() throws IOException {
     }
 
     @Test
-    public void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracketInQuotationMarks() throws IOException {
+    void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracketInQuotationMarks() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author=\"author {missing bracket\"}"));
 
@@ -693,18 +693,18 @@ public void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracketInQuotationMar
     }
 
     @Test
-    public void parseIgnoresArbitraryContentAfterEntry() throws IOException {
+    void parseIgnoresArbitraryContentAfterEntry() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={author bracket }}}"));
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
 
-        assertEquals("Size should be one, but was " + parsed.size(), 1, parsed.size());
-        assertEquals("Epilog should be preserved", "}", result.getDatabase().getEpilog());
+        assertEquals(1, parsed.size(), "Size should be one, but was " + parsed.size());
+        assertEquals("}", result.getDatabase().getEpilog(), "Epilog should be preserved");
     }
 
     @Test
-    public void parseWarnsAboutUnmatchedContentInEntryWithoutComma() throws IOException {
+    void parseWarnsAboutUnmatchedContentInEntryWithoutComma() throws IOException {
         ParserResult result = parser.parse(new StringReader("@article{test,author={author bracket } too much}"));
 
         List<BibEntry> entries = result.getDatabase().getEntries();
@@ -713,17 +713,17 @@ public void parseWarnsAboutUnmatchedContentInEntryWithoutComma() throws IOExcept
     }
 
     @Test
-    public void parseWarnsAboutUnmatchedContentInEntry() throws IOException {
+    void parseWarnsAboutUnmatchedContentInEntry() throws IOException {
         ParserResult result = parser.parse(new StringReader("@article{test,author={author bracket }, too much}"));
 
         List<BibEntry> entries = result.getDatabase().getEntries();
 
-        assertTrue("There should be warnings", result.hasWarnings());
-        assertEquals("Size should be zero, but was " + entries.size(), 0, entries.size());
+        assertTrue(result.hasWarnings(), "There should be warnings");
+        assertEquals(0, entries.size(), "Size should be zero, but was " + entries.size());
     }
 
     @Test
-    public void parseAcceptsEntryWithAtSymbolInBrackets() throws IOException {
+    void parseAcceptsEntryWithAtSymbolInBrackets() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={author @ good}}"));
 
@@ -734,7 +734,7 @@ public void parseAcceptsEntryWithAtSymbolInBrackets() throws IOException {
     }
 
     @Test
-    public void parseRecognizesEntryWithAtSymbolInQuotationMarks() throws IOException {
+    void parseRecognizesEntryWithAtSymbolInQuotationMarks() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author=\"author @ good\"}"));
 
@@ -749,7 +749,7 @@ public void parseRecognizesEntryWithAtSymbolInQuotationMarks() throws IOExceptio
     }
 
     @Test
-    public void parseRecognizesFieldsWithBracketsEnclosedInQuotationMarks() throws IOException {
+    void parseRecognizesFieldsWithBracketsEnclosedInQuotationMarks() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author=\"Test {Ed {von} Test}\"}"));
 
@@ -764,7 +764,7 @@ public void parseRecognizesFieldsWithBracketsEnclosedInQuotationMarks() throws I
     }
 
     @Test
-    public void parseRecognizesFieldsWithEscapedQuotationMarks() throws IOException {
+    void parseRecognizesFieldsWithEscapedQuotationMarks() throws IOException {
         // Quotes in fields of the form key = "value" have to be escaped by putting them into braces
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author=\"Test {\" Test}\"}"));
@@ -780,7 +780,7 @@ public void parseRecognizesFieldsWithEscapedQuotationMarks() throws IOException
     }
 
     @Test
-    public void parseIgnoresAndWarnsAboutEntryWithFieldsThatAreNotSeperatedByComma() throws IOException {
+    void parseIgnoresAndWarnsAboutEntryWithFieldsThatAreNotSeperatedByComma() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={Ed von Test} year=2005}"));
 
@@ -791,7 +791,7 @@ public void parseIgnoresAndWarnsAboutEntryWithFieldsThatAreNotSeperatedByComma()
     }
 
     @Test
-    public void parseIgnoresAndWarnsAboutCorruptedEntryButRecognizeOthers() throws IOException {
+    void parseIgnoresAndWarnsAboutCorruptedEntryButRecognizeOthers() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader(
                         "@article{test,author={author missing bracket}" + "@article{test,author={Ed von Test}}"));
@@ -808,7 +808,7 @@ public void parseIgnoresAndWarnsAboutCorruptedEntryButRecognizeOthers() throws I
     }
 
     @Test
-    public void parseRecognizesMonthFieldsWithFollowingComma() throws IOException {
+    void parseRecognizesMonthFieldsWithFollowingComma() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={Ed von Test},month={8,}},"));
 
@@ -824,7 +824,7 @@ public void parseRecognizesMonthFieldsWithFollowingComma() throws IOException {
     }
 
     @Test
-    public void parseRecognizesPreamble() throws IOException {
+    void parseRecognizesPreamble() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@preamble{some text and \\latex}"));
 
@@ -832,7 +832,7 @@ public void parseRecognizesPreamble() throws IOException {
     }
 
     @Test
-    public void parseRecognizesUppercasePreamble() throws IOException {
+    void parseRecognizesUppercasePreamble() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@PREAMBLE{some text and \\latex}"));
 
@@ -840,7 +840,7 @@ public void parseRecognizesUppercasePreamble() throws IOException {
     }
 
     @Test
-    public void parseRecognizesPreambleWithWhitespace() throws IOException {
+    void parseRecognizesPreambleWithWhitespace() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@preamble {some text and \\latex}"));
 
@@ -848,7 +848,7 @@ public void parseRecognizesPreambleWithWhitespace() throws IOException {
     }
 
     @Test
-    public void parseRecognizesPreambleInParenthesis() throws IOException {
+    void parseRecognizesPreambleInParenthesis() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@preamble(some text and \\latex)"));
 
@@ -856,7 +856,7 @@ public void parseRecognizesPreambleInParenthesis() throws IOException {
     }
 
     @Test
-    public void parseRecognizesPreambleWithConcatenation() throws IOException {
+    void parseRecognizesPreambleWithConcatenation() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@preamble{\"some text\" # \"and \\latex\"}"));
 
@@ -864,7 +864,7 @@ public void parseRecognizesPreambleWithConcatenation() throws IOException {
     }
 
     @Test
-    public void parseRecognizesString() throws IOException {
+    void parseRecognizesString() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@string{bourdieu = {Bourdieu, Pierre}}"));
 
@@ -876,7 +876,7 @@ public void parseRecognizesString() throws IOException {
     }
 
     @Test
-    public void parseSavesOneNewlineAfterStringInParsedSerialization() throws IOException {
+    void parseSavesOneNewlineAfterStringInParsedSerialization() throws IOException {
         String string = "@string{bourdieu = {Bourdieu, Pierre}}" + OS.NEWLINE;
         ParserResult result = parser
                 .parse(new StringReader(string + OS.NEWLINE + OS.NEWLINE));
@@ -888,7 +888,7 @@ public void parseSavesOneNewlineAfterStringInParsedSerialization() throws IOExce
     }
 
     @Test
-    public void parseRecognizesStringWithWhitespace() throws IOException {
+    void parseRecognizesStringWithWhitespace() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@string {bourdieu = {Bourdieu, Pierre}}"));
 
@@ -900,7 +900,7 @@ public void parseRecognizesStringWithWhitespace() throws IOException {
     }
 
     @Test
-    public void parseRecognizesStringInParenthesis() throws IOException {
+    void parseRecognizesStringInParenthesis() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@string(bourdieu = {Bourdieu, Pierre})"));
 
@@ -912,7 +912,7 @@ public void parseRecognizesStringInParenthesis() throws IOException {
     }
 
     @Test
-    public void parseRecognizesMultipleStrings() throws IOException {
+    void parseRecognizesMultipleStrings() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@string{bourdieu = {Bourdieu, Pierre}}" + "@string{adieu = {Adieu, Pierre}}"));
 
@@ -934,7 +934,7 @@ public void parseRecognizesMultipleStrings() throws IOException {
     }
 
     @Test
-    public void parseRecognizesStringAndEntry() throws IOException {
+    void parseRecognizesStringAndEntry() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("" + "@string{bourdieu = {Bourdieu, Pierre}}"
                         + "@book{bourdieu-2002-questions-sociologie, " + "	Address = {Paris}," + "	Author = bourdieu,"
@@ -961,7 +961,7 @@ public void parseRecognizesStringAndEntry() throws IOException {
     }
 
     @Test
-    public void parseWarnsAboutStringsWithSameNameAndOnlyKeepsOne() throws IOException {
+    void parseWarnsAboutStringsWithSameNameAndOnlyKeepsOne() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@string{bourdieu = {Bourdieu, Pierre}}" + "@string{bourdieu = {Other}}"));
 
@@ -970,7 +970,7 @@ public void parseWarnsAboutStringsWithSameNameAndOnlyKeepsOne() throws IOExcepti
     }
 
     @Test
-    public void parseIgnoresComments() throws IOException {
+    void parseIgnoresComments() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@comment{some text and \\latex}"));
 
@@ -978,7 +978,7 @@ public void parseIgnoresComments() throws IOException {
     }
 
     @Test
-    public void parseIgnoresUpercaseComments() throws IOException {
+    void parseIgnoresUpercaseComments() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@COMMENT{some text and \\latex}"));
 
@@ -986,7 +986,7 @@ public void parseIgnoresUpercaseComments() throws IOException {
     }
 
     @Test
-    public void parseIgnoresCommentsBeforeEntry() throws IOException {
+    void parseIgnoresCommentsBeforeEntry() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@comment{some text and \\latex}" + "@article{test,author={Ed von Test}}"));
 
@@ -1001,7 +1001,7 @@ public void parseIgnoresCommentsBeforeEntry() throws IOException {
     }
 
     @Test
-    public void parseIgnoresCommentsAfterEntry() throws IOException {
+    void parseIgnoresCommentsAfterEntry() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={Ed von Test}}" + "@comment{some text and \\latex}"));
 
@@ -1016,7 +1016,7 @@ public void parseIgnoresCommentsAfterEntry() throws IOException {
     }
 
     @Test
-    public void parseIgnoresText() throws IOException {
+    void parseIgnoresText() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("comment{some text and \\latex"));
 
@@ -1024,7 +1024,7 @@ public void parseIgnoresText() throws IOException {
     }
 
     @Test
-    public void parseIgnoresTextBeforeEntry() throws IOException {
+    void parseIgnoresTextBeforeEntry() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("comment{some text and \\latex" + "@article{test,author={Ed von Test}}"));
 
@@ -1039,7 +1039,7 @@ public void parseIgnoresTextBeforeEntry() throws IOException {
     }
 
     @Test
-    public void parseIgnoresTextAfterEntry() throws IOException {
+    void parseIgnoresTextAfterEntry() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={Ed von Test}}" + "comment{some text and \\latex"));
 
@@ -1054,7 +1054,7 @@ public void parseIgnoresTextAfterEntry() throws IOException {
     }
 
     @Test
-    public void parseConvertsNewlineToSpace() throws IOException {
+    void parseConvertsNewlineToSpace() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,a = {a\nb}}"));
 
@@ -1065,7 +1065,7 @@ public void parseConvertsNewlineToSpace() throws IOException {
     }
 
     @Test
-    public void parseConvertsMultipleNewlinesToSpace() throws IOException {
+    void parseConvertsMultipleNewlinesToSpace() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,a = {a\n\nb}," + "b = {a\n \nb}," + "c = {a \n \n b}}"));
 
@@ -1078,7 +1078,7 @@ public void parseConvertsMultipleNewlinesToSpace() throws IOException {
     }
 
     @Test
-    public void parseConvertsTabToSpace() throws IOException {
+    void parseConvertsTabToSpace() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,a = {a\tb}}"));
 
@@ -1089,7 +1089,7 @@ public void parseConvertsTabToSpace() throws IOException {
     }
 
     @Test
-    public void parseConvertsMultipleTabsToSpace() throws IOException {
+    void parseConvertsMultipleTabsToSpace() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,a = {a\t\tb}," + "b = {a\t \tb}," + "c = {a \t \t b}}"));
 
@@ -1102,7 +1102,7 @@ public void parseConvertsMultipleTabsToSpace() throws IOException {
     }
 
     @Test
-    public void parsePreservesMultipleSpacesInNonWrappableField() throws IOException {
+    void parsePreservesMultipleSpacesInNonWrappableField() throws IOException {
         when(importFormatPreferences.getFieldContentParserPreferences().getNonWrappableFields())
                 .thenReturn(Collections.singletonList("file"));
         BibtexParser parser = new BibtexParser(importFormatPreferences, fileMonitor);
@@ -1116,7 +1116,7 @@ public void parsePreservesMultipleSpacesInNonWrappableField() throws IOException
     }
 
     @Test
-    public void parsePreservesTabsInAbstractField() throws IOException {
+    void parsePreservesTabsInAbstractField() throws IOException {
         ParserResult result = parser.parse(new StringReader("@article{canh05,abstract = {ups  \tsala}}"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
@@ -1126,7 +1126,7 @@ public void parsePreservesTabsInAbstractField() throws IOException {
     }
 
     @Test
-    public void parsePreservesNewlineInAbstractField() throws IOException {
+    void parsePreservesNewlineInAbstractField() throws IOException {
         ParserResult result = parser.parse(new StringReader("@article{canh05,abstract = {ups \nsala}}"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
@@ -1136,7 +1136,7 @@ public void parsePreservesNewlineInAbstractField() throws IOException {
     }
 
     @Test
-    public void parseHandlesAccentsCorrectly() throws IOException {
+    void parseHandlesAccentsCorrectly() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author = {H\'{e}lne Fiaux}}"));
 
@@ -1154,7 +1154,7 @@ public void parseHandlesAccentsCorrectly() throws IOException {
      * Test for #669
      */
     @Test
-    public void parsePreambleAndEntryWithoutNewLine() throws IOException {
+    void parsePreambleAndEntryWithoutNewLine() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@preamble{some text and \\latex}@article{test,author = {H\'{e}lne Fiaux}}"));
 
@@ -1170,7 +1170,7 @@ public void parsePreambleAndEntryWithoutNewLine() throws IOException {
     }
 
     @Test
-    public void parseFileHeaderAndPreambleWithoutNewLine() throws IOException {
+    void parseFileHeaderAndPreambleWithoutNewLine() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("% Encoding: US-ASCII@preamble{some text and \\latex}"));
 
@@ -1179,7 +1179,7 @@ public void parseFileHeaderAndPreambleWithoutNewLine() throws IOException {
     }
 
     @Test
-    public void parseSavesEntryInParsedSerialization() throws IOException {
+    void parseSavesEntryInParsedSerialization() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
         ParserResult result = parser.parse(new StringReader(testEntry));
 
@@ -1191,7 +1191,7 @@ public void parseSavesEntryInParsedSerialization() throws IOException {
     }
 
     @Test
-    public void parseSavesOneNewlineAfterEntryInParsedSerialization() throws IOException {
+    void parseSavesOneNewlineAfterEntryInParsedSerialization() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
         ParserResult result = parser
                 .parse(new StringReader(testEntry + OS.NEWLINE + OS.NEWLINE));
@@ -1204,7 +1204,7 @@ public void parseSavesOneNewlineAfterEntryInParsedSerialization() throws IOExcep
     }
 
     @Test
-    public void parseSavesNewlinesBeforeEntryInParsedSerialization() throws IOException {
+    void parseSavesNewlinesBeforeEntryInParsedSerialization() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
         ParserResult result = parser
                 .parse(new StringReader(OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + testEntry));
@@ -1217,7 +1217,7 @@ public void parseSavesNewlinesBeforeEntryInParsedSerialization() throws IOExcept
     }
 
     @Test
-    public void parseRemovesEncodingLineInParsedSerialization() throws IOException {
+    void parseRemovesEncodingLineInParsedSerialization() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
         ParserResult result = parser.parse(
                 new StringReader(SavePreferences.ENCODING_PREFIX + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + testEntry));
@@ -1230,7 +1230,7 @@ public void parseRemovesEncodingLineInParsedSerialization() throws IOException {
     }
 
     @Test
-    public void parseSavesNewlinesBetweenEntriesInParsedSerialization() throws IOException {
+    void parseSavesNewlinesBetweenEntriesInParsedSerialization() throws IOException {
         String testEntryOne = "@article{test1,author={Ed von Test}}";
         String testEntryTwo = "@article{test2,author={Ed von Test}}";
         ParserResult result = parser
@@ -1253,14 +1253,14 @@ public void parseSavesNewlinesBetweenEntriesInParsedSerialization() throws IOExc
     }
 
     @Test
-    public void parseIgnoresWhitespaceInEpilogue() throws IOException {
+    void parseIgnoresWhitespaceInEpilogue() throws IOException {
         ParserResult result = parser.parse(new StringReader("   " + OS.NEWLINE));
 
         assertEquals("", result.getDatabase().getEpilog());
     }
 
     @Test
-    public void parseIgnoresWhitespaceInEpilogueAfterEntry() throws IOException {
+    void parseIgnoresWhitespaceInEpilogueAfterEntry() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
         ParserResult result = parser
                 .parse(new StringReader(testEntry + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + "  " + OS.NEWLINE));
@@ -1274,7 +1274,7 @@ public void parseIgnoresWhitespaceInEpilogueAfterEntry() throws IOException {
     }
 
     @Test
-    public void parseTrimsWhitespaceInEpilogueAfterEntry() throws IOException {
+    void parseTrimsWhitespaceInEpilogueAfterEntry() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
         ParserResult result = parser
                 .parse(new StringReader(testEntry + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + " epilogue " + OS.NEWLINE));
@@ -1288,7 +1288,7 @@ public void parseTrimsWhitespaceInEpilogueAfterEntry() throws IOException {
     }
 
     @Test
-    public void parseRecognizesSaveActionsAfterEntry() throws IOException {
+    void parseRecognizesSaveActionsAfterEntry() throws IOException {
         ParserResult parserResult = parser.parse(
                 new StringReader("@InProceedings{6055279,\n" + "  Title                    = {Educational session 1},\n"
                         + "  Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},\n"
@@ -1307,7 +1307,7 @@ public void parseRecognizesSaveActionsAfterEntry() throws IOException {
     }
 
     @Test
-    public void integrationTestSaveActions() throws IOException {
+    void integrationTestSaveActions() throws IOException {
         ParserResult parserResult = parser
                 .parse(new StringReader("@comment{jabref-meta: saveActions:enabled;title[lower_case]}"));
 
@@ -1319,7 +1319,7 @@ public void integrationTestSaveActions() throws IOException {
     }
 
     @Test
-    public void integrationTestCustomEntryType() throws IOException {
+    void integrationTestCustomEntryType() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@comment{jabref-entrytype: Lecturenotes: req[author;title] opt[language;url]}"));
 
@@ -1334,7 +1334,7 @@ public void integrationTestCustomEntryType() throws IOException {
     }
 
     @Test
-    public void integrationTestSaveOrderConfig() throws IOException {
+    void integrationTestSaveOrderConfig() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader(
                         "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}"));
@@ -1347,7 +1347,7 @@ public void integrationTestSaveOrderConfig() throws IOException {
     }
 
     @Test
-    public void integrationTestCustomKeyPattern() throws IOException {
+    void integrationTestCustomKeyPattern() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@comment{jabref-meta: keypattern_article:articleTest;}" + OS.NEWLINE
                         + "@comment{jabref-meta: keypatterndefault:test;}"));
@@ -1362,7 +1362,7 @@ public void integrationTestCustomKeyPattern() throws IOException {
     }
 
     @Test
-    public void integrationTestBiblatexMode() throws IOException {
+    void integrationTestBiblatexMode() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@comment{jabref-meta: databaseType:biblatex;}"));
 
@@ -1372,7 +1372,7 @@ public void integrationTestBiblatexMode() throws IOException {
     }
 
     @Test
-    public void integrationTestGroupTree() throws IOException, ParseException {
+    void integrationTestGroupTree() throws IOException, ParseException {
         ParserResult result = parser.parse(new StringReader("@comment{jabref-meta: groupsversion:3;}" + OS.NEWLINE
                 + "@comment{jabref-meta: groupstree:" + OS.NEWLINE + "0 AllEntriesGroup:;" + OS.NEWLINE
                 + "1 KeywordGroup:Fréchet\\;0\\;keywords\\;FrechetSpace\\;0\\;1\\;;" + OS.NEWLINE
@@ -1394,7 +1394,7 @@ public void integrationTestGroupTree() throws IOException, ParseException {
     }
 
     @Test
-    public void integrationTestProtectedFlag() throws IOException {
+    void integrationTestProtectedFlag() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@comment{jabref-meta: protectedFlag:true;}"));
 
@@ -1402,7 +1402,7 @@ public void integrationTestProtectedFlag() throws IOException {
     }
 
     @Test
-    public void integrationTestContentSelectors() throws IOException {
+    void integrationTestContentSelectors() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@Comment{jabref-meta: selector_status:approved;captured;received;status;}"));
 
@@ -1416,7 +1416,7 @@ public void integrationTestContentSelectors() throws IOException {
     }
 
     @Test
-    public void parseReallyUnknownType() throws Exception {
+    void parseReallyUnknownType() throws Exception {
         String bibtexEntry = "@ReallyUnknownType{test," + OS.NEWLINE +
                 " Comment                  = {testentry}" + OS.NEWLINE +
                 "}";
@@ -1431,7 +1431,7 @@ public void parseReallyUnknownType() throws Exception {
     }
 
     @Test
-    public void parseOtherTypeTest() throws Exception {
+    void parseOtherTypeTest() throws Exception {
         String bibtexEntry = "@Other{test," + OS.NEWLINE +
                 " Comment                  = {testentry}" + OS.NEWLINE +
                 "}";
@@ -1447,7 +1447,7 @@ public void parseOtherTypeTest() throws Exception {
 
 
     @Test
-    public void parseRecognizesDatabaseID() throws Exception {
+    void parseRecognizesDatabaseID() throws Exception {
         String expectedDatabaseID = "q1w2e3r4t5z6";
         StringBuilder sharedDatabaseFileContent = new StringBuilder()
                 .append("% DBID: ").append(expectedDatabaseID)
@@ -1461,7 +1461,7 @@ public void parseRecognizesDatabaseID() throws Exception {
     }
 
     @Test
-    public void parseDoesNotRecognizeDatabaseIDasUserComment() throws Exception {
+    void parseDoesNotRecognizeDatabaseIDasUserComment() throws Exception {
         StringBuilder sharedDatabaseFileContent = new StringBuilder()
                 .append("% Encoding: UTF-8").append(OS.NEWLINE)
                 .append("% DBID: q1w2e3r4t5z6").append(OS.NEWLINE)
@@ -1475,7 +1475,7 @@ public void parseDoesNotRecognizeDatabaseIDasUserComment() throws Exception {
     }
 
     @Test
-    public void integrationTestFileDirectories() throws IOException {
+    void integrationTestFileDirectories() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}"
                         + "@comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"));
@@ -1485,7 +1485,7 @@ public void integrationTestFileDirectories() throws IOException {
     }
 
     @Test
-    public void parseReturnsEntriesInSameOrder() throws IOException {
+    void parseReturnsEntriesInSameOrder() throws IOException {
         List<BibEntry> expected = new ArrayList<>();
         BibEntry first = new BibEntry();
         first.setType("article");
@@ -1509,7 +1509,7 @@ public void parseReturnsEntriesInSameOrder() throws IOException {
     }
 
     @Test
-    public void parsePrecedingComment() throws IOException {
+    void parsePrecedingComment() throws IOException {
         // @formatter:off
         String bibtexEntry = "% Some random comment that should stay here" + OS.NEWLINE +
                 "@Article{test," + OS.NEWLINE +
@@ -1534,7 +1534,7 @@ public void parsePrecedingComment() throws IOException {
     }
 
     @Test
-    public void parseCommentAndEntryInOneLine() throws IOException {
+    void parseCommentAndEntryInOneLine() throws IOException {
         // @formatter:off
         String bibtexEntry = "Some random comment that should stay here @Article{test," + OS.NEWLINE +
                 "  Author                   = {Foo Bar}," + OS.NEWLINE +
@@ -1558,7 +1558,7 @@ public void parseCommentAndEntryInOneLine() throws IOException {
     }
 
     @Test
-    public void preserveEncodingPrefixInsideEntry() throws ParseException {
+    void preserveEncodingPrefixInsideEntry() throws ParseException {
         BibEntry expected = new BibEntry();
         expected.setType("article");
         expected.setCiteKey("test");
@@ -1571,7 +1571,7 @@ public void preserveEncodingPrefixInsideEntry() throws ParseException {
     }
 
     @Test
-    public void parseBracketedComment() throws IOException {
+    void parseBracketedComment() throws IOException {
         String commentText = "@Comment{someComment}";
 
         ParserResult result = parser.parse(new StringReader(commentText));
@@ -1580,7 +1580,7 @@ public void parseBracketedComment() throws IOException {
     }
 
     @Test
-    public void parseRegularCommentBeforeEntry() throws IOException {
+    void parseRegularCommentBeforeEntry() throws IOException {
         // @formatter:off
         String bibtexEntry = "@Comment{someComment} " + OS.NEWLINE +
                 "@Article{test," + OS.NEWLINE +
@@ -1599,7 +1599,7 @@ public void parseRegularCommentBeforeEntry() throws IOException {
     }
 
     @Test
-    public void parseCommentWithoutBrackets() throws IOException {
+    void parseCommentWithoutBrackets() throws IOException {
         String commentText = "@Comment someComment";
 
         ParserResult result = parser.parse(new StringReader(commentText));
@@ -1608,7 +1608,7 @@ public void parseCommentWithoutBrackets() throws IOException {
     }
 
     @Test
-    public void parseCommentWithoutBracketsBeforeEntry() throws IOException {
+    void parseCommentWithoutBracketsBeforeEntry() throws IOException {
         // @formatter:off
         String bibtexEntry = "@Comment someComment  " + OS.NEWLINE +
                 "@Article{test," + OS.NEWLINE +
@@ -1627,7 +1627,7 @@ public void parseCommentWithoutBracketsBeforeEntry() throws IOException {
     }
 
     @Test
-    public void parseCommentContainingEntries() throws IOException {
+    void parseCommentContainingEntries() throws IOException {
         // @formatter:off
         String bibtexEntry = "@Comment{@article{myarticle,}" + OS.NEWLINE +
                 "@inproceedings{blabla, title={the proceedings of blabla}; }" + OS.NEWLINE +
@@ -1648,7 +1648,7 @@ public void parseCommentContainingEntries() throws IOException {
     }
 
     @Test
-    public void parseCommentContainingEntriesAndAtSymbols() throws IOException {
+    void parseCommentContainingEntriesAndAtSymbols() throws IOException {
         // @formatter:off
         String bibtexEntry = "@Comment{@article{myarticle,}" + OS.NEWLINE +
                 "@inproceedings{blabla, title={the proceedings of bl@bl@}; }" + OS.NEWLINE +
@@ -1669,7 +1669,7 @@ public void parseCommentContainingEntriesAndAtSymbols() throws IOException {
     }
 
     @Test
-    public void parseEmptyPreambleLeadsToEmpty() throws IOException {
+    void parseEmptyPreambleLeadsToEmpty() throws IOException {
         ParserResult result = parser.parse(new StringReader("@preamble{}"));
 
         assertFalse(result.hasWarnings());
@@ -1677,7 +1677,7 @@ public void parseEmptyPreambleLeadsToEmpty() throws IOException {
     }
 
     @Test
-    public void parseEmptyFileLeadsToPreamble() throws IOException {
+    void parseEmptyFileLeadsToPreamble() throws IOException {
         ParserResult result = parser.parse(new StringReader(""));
 
         assertFalse(result.hasWarnings());
@@ -1685,21 +1685,21 @@ public void parseEmptyFileLeadsToPreamble() throws IOException {
     }
 
     @Test
-    public void parseYearWithMonthString() throws Exception {
+    void parseYearWithMonthString() throws Exception {
         Optional<BibEntry> result = parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003}, month = #FEB# }");
 
         assertEquals(new Date(2003, 2), result.get().getPublicationDate().get());
     }
 
     @Test
-    public void parseYearWithMonthNumber() throws Exception {
+    void parseYearWithMonthNumber() throws Exception {
         Optional<BibEntry> result = parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003}, month = 2 }");
 
         assertEquals(new Date(2003, 2), result.get().getPublicationDate().get());
     }
 
     @Test
-    public void parseYear() throws Exception {
+    void parseYear() throws Exception {
         Optional<BibEntry> result = parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003} }");
 
         assertEquals(new Date(2003), result.get().getPublicationDate().get());
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
index b483b172330..2d66b44a0c5 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
@@ -27,12 +27,9 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class MedlinePlainImporterTest {
+class MedlinePlainImporterTest {
 
     private MedlinePlainImporter importer;
 
@@ -49,33 +46,33 @@ private BufferedReader readerForString(String string) {
     }
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         importer = new MedlinePlainImporter();
     }
 
     @Test
-    public void testsGetExtensions() {
+    void testsGetExtensions() {
         assertEquals(StandardFileType.MEDLINE_PLAIN, importer.getFileType());
     }
 
     @Test
-    public void testGetDescription() {
+    void testGetDescription() {
         assertEquals("Importer for the MedlinePlain format.", importer.getDescription());
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public void testIsRecognizedFormat(String fileName) throws Exception {
+    void testIsRecognizedFormat(String fileName) throws Exception {
         ImporterTestEngine.testIsRecognizedFormat(importer, fileName);
     }
 
     @Test
-    public void doesNotRecognizeEmptyFiles() throws IOException {
+    void doesNotRecognizeEmptyFiles() throws IOException {
         assertFalse(importer.isRecognizedFormat(readerForString("")));
     }
 
     @Test
-    public void testImportMultipleEntriesInSingleFile() throws IOException, URISyntaxException {
+    void testImportMultipleEntriesInSingleFile() throws IOException, URISyntaxException {
         Path inputFile = Paths
                 .get(MedlinePlainImporter.class.getResource("MedlinePlainImporterTestMultipleEntries.txt").toURI());
 
@@ -125,14 +122,14 @@ public void testImportMultipleEntriesInSingleFile() throws IOException, URISynta
     }
 
     @Test
-    public void testEmptyFileImport() throws IOException {
+    void testEmptyFileImport() throws IOException {
         List<BibEntry> emptyEntries = importer.importDatabase(readerForString("")).getDatabase().getEntries();
 
         assertEquals(Collections.emptyList(), emptyEntries);
     }
 
     @Test
-    public void testImportSingleEntriesInSingleFiles() throws IOException, URISyntaxException {
+    void testImportSingleEntriesInSingleFiles() throws IOException, URISyntaxException {
         List<String> testFiles = Arrays.asList("MedlinePlainImporterTestCompleteEntry",
                 "MedlinePlainImporterTestMultiAbstract", "MedlinePlainImporterTestMultiTitle",
                 "MedlinePlainImporterTestDOI", "MedlinePlainImporterTestInproceeding");
@@ -157,7 +154,7 @@ private void assertImportOfMedlineFileEqualsBibtexFile(String medlineFile, Strin
     }
 
     @Test
-    public void testMultiLineComments() throws IOException {
+    void testMultiLineComments() throws IOException {
         try (BufferedReader reader = readerForString("PMID-22664220" + "\n" + "CON - Comment1" + "\n" + "CIN - Comment2"
                 + "\n" + "EIN - Comment3" + "\n" + "EFR - Comment4" + "\n" + "CRI - Comment5" + "\n" + "CRF - Comment6"
                 + "\n" + "PRIN- Comment7" + "\n" + "PROF- Comment8" + "\n" + "RPI - Comment9" + "\n" + "RPF - Comment10"
@@ -176,7 +173,7 @@ public void testMultiLineComments() throws IOException {
     }
 
     @Test
-    public void testKeyWords() throws IOException {
+    void testKeyWords() throws IOException {
         try (BufferedReader reader = readerForString("PMID-22664795" + "\n" + "MH  - Female" + "\n" + "OT  - Male")) {
             List<BibEntry> actualEntries = importer.importDatabase(reader).getDatabase().getEntries();
 
@@ -188,7 +185,7 @@ public void testKeyWords() throws IOException {
     }
 
     @Test
-    public void testWithNbibFile() throws IOException, URISyntaxException {
+    void testWithNbibFile() throws IOException, URISyntaxException {
         Path file = Paths.get(MedlinePlainImporter.class.getResource("NbibImporterTest.nbib").toURI());
 
         List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
@@ -197,7 +194,7 @@ public void testWithNbibFile() throws IOException, URISyntaxException {
     }
 
     @Test
-    public void testWithMultipleEntries() throws IOException, URISyntaxException {
+    void testWithMultipleEntries() throws IOException, URISyntaxException {
         Path file = Paths
                 .get(MedlinePlainImporter.class.getResource("MedlinePlainImporterStringOutOfBounds.txt").toURI());
 
@@ -207,7 +204,7 @@ public void testWithMultipleEntries() throws IOException, URISyntaxException {
     }
 
     @Test
-    public void testInvalidFormat() throws URISyntaxException, IOException {
+    void testInvalidFormat() throws URISyntaxException, IOException {
         Path file = Paths
                 .get(MedlinePlainImporter.class.getResource("MedlinePlainImporterTestInvalidFormat.xml").toURI());
 
@@ -217,7 +214,7 @@ public void testInvalidFormat() throws URISyntaxException, IOException {
     }
 
     @Test
-    public void testNullReader() throws IOException {
+    void testNullReader() throws IOException {
         Executable fail = () -> {
             try (BufferedReader reader = null) {
                 importer.importDatabase(reader);
@@ -227,7 +224,7 @@ public void testNullReader() throws IOException {
     }
 
     @Test
-    public void testAllArticleTypes() throws IOException {
+    void testAllArticleTypes() throws IOException {
         try (BufferedReader reader = readerForString("PMID-22664795" + "\n" + "MH  - Female\n" + "PT  - journal article"
                 + "\n" + "PT  - classical article" + "\n" + "PT  - corrected and republished article" + "\n"
                 + "PT  - introductory journal article" + "\n" + "PT  - newspaper article")) {
@@ -242,12 +239,12 @@ public void testAllArticleTypes() throws IOException {
     }
 
     @Test
-    public void testGetFormatName() {
+    void testGetFormatName() {
         assertEquals("Medline/PubMed Plain", importer.getName());
     }
 
     @Test
-    public void testGetCLIId() {
+    void testGetCLIId() {
         assertEquals("medlineplain", importer.getId());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
index 88cb76025e4..3ecffde377f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
@@ -12,16 +12,17 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class SilverPlatterImporterTest {
+
+class SilverPlatterImporterTest {
 
     private static final String FILE_ENDING = ".txt";
 
     private Importer testImporter;
 
     @BeforeEach
-    public void setUp() throws Exception {
+    void setUp() throws Exception {
         testImporter = new SilverPlatterImporter();
     }
 
@@ -37,29 +38,29 @@ private static Stream<String> invalidFileNames() throws IOException {
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public void testIsRecognizedFormat(String fileName) throws IOException {
+    void testIsRecognizedFormat(String fileName) throws IOException {
         ImporterTestEngine.testIsRecognizedFormat(testImporter, fileName);
     }
 
     @ParameterizedTest
     @MethodSource("invalidFileNames")
-    public void testIsNotRecognizedFormat(String fileName) throws IOException {
+    void testIsNotRecognizedFormat(String fileName) throws IOException {
         ImporterTestEngine.testIsNotRecognizedFormat(testImporter, fileName);
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public void testImportEntries(String fileName) throws Exception {
+    void testImportEntries(String fileName) throws Exception {
         ImporterTestEngine.testImportEntries(testImporter, fileName, FILE_ENDING);
     }
 
     @Test
-    public void testsGetExtensions() {
+    void testsGetExtensions() {
         assertEquals(StandardFileType.SILVER_PLATTER, testImporter.getFileType());
     }
 
     @Test
-    public void testGetDescription() {
+    void testGetDescription() {
         assertEquals("Imports a SilverPlatter exported file.", testImporter.getDescription());
     }
 
diff --git a/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java b/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java
index 81c8680abd0..39fb0d7d977 100644
--- a/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java
@@ -9,18 +9,18 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class EntryLinkCheckerTest {
+class EntryLinkCheckerTest {
 
     private BibDatabase database;
     private EntryLinkChecker checker;
     private BibEntry entry;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         database = new BibDatabase();
         checker = new EntryLinkChecker(database);
         entry = new BibEntry();
@@ -28,31 +28,31 @@ public void setUp() {
     }
 
     @Test
-    public void testEntryLinkChecker() {
+    void testEntryLinkChecker() {
         assertThrows(NullPointerException.class, () -> new EntryLinkChecker(null));
     }
 
     @Test
-    public void testCheckNoFields() {
+    void testCheckNoFields() {
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void testCheckNonRelatedFieldsOnly() {
+    void testCheckNonRelatedFieldsOnly() {
         entry.setField("year", "2016");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void testCheckNonExistingCrossref() {
+    void testCheckNonExistingCrossref() {
         entry.setField("crossref", "banana");
 
         List<IntegrityMessage> message = checker.check(entry);
-        assertFalse(message.toString(), message.isEmpty());
+        assertFalse(message.isEmpty(), message.toString());
     }
 
     @Test
-    public void testCheckExistingCrossref() {
+    void testCheckExistingCrossref() {
         entry.setField("crossref", "banana");
 
         BibEntry entry2 = new BibEntry();
@@ -64,7 +64,7 @@ public void testCheckExistingCrossref() {
     }
 
     @Test
-    public void testCheckExistingRelated() {
+    void testCheckExistingRelated() {
         entry.setField("related", "banana,pineapple");
 
         BibEntry entry2 = new BibEntry();
@@ -80,7 +80,7 @@ public void testCheckExistingRelated() {
     }
 
     @Test
-    public void testCheckNonExistingRelated() {
+    void testCheckNonExistingRelated() {
         BibEntry entry1 = new BibEntry();
         entry1.setField("related", "banana,pineapple,strawberry");
         database.insertEntry(entry1);
@@ -94,6 +94,6 @@ public void testCheckNonExistingRelated() {
         database.insertEntry(entry3);
 
         List<IntegrityMessage> message = checker.check(entry1);
-        assertFalse(message.toString(), message.isEmpty());
+        assertFalse(message.isEmpty(), message.toString());
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index 9b9d0fa4a37..04f687f6666 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -1,7 +1,8 @@
 package org.jabref.logic.integrity;
 
-import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -21,21 +22,19 @@
 import org.jabref.model.metadata.FileDirectoryPreferences;
 import org.jabref.model.metadata.MetaData;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Mockito;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 
+@ExtendWith(TempDirectory.class)
 public class IntegrityCheckTest {
 
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
-
     @Test
     public void testEntryTypeChecks() {
         assertCorrect(withMode(createContext("title", "sometitle", "article"), BibDatabaseMode.BIBTEX));
@@ -221,12 +220,14 @@ public void testFileChecks() {
     }
 
     @Test
-    public void fileCheckFindsFilesRelativeToBibFile() throws IOException {
-        File bibFile = testFolder.newFile("lit.bib");
-        testFolder.newFile("file.pdf");
+    public void fileCheckFindsFilesRelativeToBibFile(@TempDirectory.TempDir Path testFolder) throws IOException {
+        Path bibFile = testFolder.resolve("lit.bib");
+        Files.createFile(bibFile);
+        Path pdfFile = testFolder.resolve("file.pdf");
+        Files.createFile(pdfFile);
 
         BibDatabaseContext databaseContext = createContext("file", ":file.pdf:PDF");
-        databaseContext.setDatabaseFile(bibFile);
+        databaseContext.setDatabaseFile(bibFile.toFile());
 
         assertCorrect(databaseContext);
     }
@@ -381,7 +382,7 @@ private void assertWrong(BibDatabaseContext context) {
                 createBibtexKeyPatternPreferences(),
                 new JournalAbbreviationRepository(new Abbreviation("IEEE Software", "IEEE SW")), true)
                 .checkBibtexDatabase();
-        assertFalse(messages.toString(), messages.isEmpty());
+        assertFalse(messages.isEmpty(), messages.toString());
     }
 
     private void assertCorrect(BibDatabaseContext context) {
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
index 2350512b37b..42a492d44fa 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.l10n;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class LocalizationKeyTest {
+class LocalizationKeyTest {
 
     @Test
-    public void testConversionToPropertiesKey() {
+    void testConversionToPropertiesKey() {
         LocalizationKey localizationKey = new LocalizationKey("#test! : =");
         assertEquals("\\#test\\!\\ \\:\\ \\=", localizationKey.getPropertiesKey());
         assertEquals("#test! : =", localizationKey.getPropertiesKeyUnescaped());
@@ -15,7 +15,7 @@ public void testConversionToPropertiesKey() {
     }
 
     @Test
-    public void underscoreIsPreserved() {
+    void underscoreIsPreserved() {
         LocalizationKey localizationKey = new LocalizationKey("test_with_underscore");
         assertEquals("test_with_underscore", localizationKey.getPropertiesKey());
     }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
index 6b77da669cd..94b37737595 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
@@ -1,41 +1,29 @@
 package org.jabref.logic.layout.format;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@RunWith(Parameterized.class)
-public class AuthorAndToSemicolonReplacerTest {
+class AuthorAndToSemicolonReplacerTest {
 
-    @Parameter(value = 0)
-    public String input;
-
-    @Parameter(value = 1)
-    public String expected;
-
-    @Parameters(name = "{index}: format(\"{0}\")=\"{1}\"")
-    public static Collection<Object[]> data() {
-
-        return Arrays.asList(new Object[][] {
-            {"",""},
-            {"Someone, Van Something", "Someone, Van Something"},
-            {"John Smith and Black Brown, Peter", "John Smith; Black Brown, Peter"},
-            {"von Neumann, John and Smith, John and Black Brown, Peter", "von Neumann, John; Smith, John; Black Brown, Peter"},
-            {"John von Neumann and John Smith and Peter Black Brown","John von Neumann; John Smith; Peter Black Brown"},
-        });
+    private static Stream<Arguments> data() {
+        return Stream.of(
+                Arguments.of("",""),
+                Arguments.of("Someone, Van Something", "Someone, Van Something"),
+                Arguments.of("John Smith and Black Brown, Peter", "John Smith; Black Brown, Peter"),
+                Arguments.of("von Neumann, John and Smith, John and Black Brown, Peter", "von Neumann, John; Smith, John; Black Brown, Peter"),
+                Arguments.of("John von Neumann and John Smith and Peter Black Brown","John von Neumann; John Smith; Peter Black Brown"));
     }
 
-    @Test
-    public void testFormat() {
+    @ParameterizedTest
+    @MethodSource("data")
+    void testFormat(String input, String expected) {
         LayoutFormatter a = new AuthorAndToSemicolonReplacer();
 
         assertEquals(expected, a.format(input));
diff --git a/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java b/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
index bda54482342..3e1f6e972b1 100644
--- a/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
@@ -2,26 +2,27 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import org.junit.After;
 import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class RTFCharsTest {
+class RTFCharsTest {
     private LayoutFormatter formatter;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         formatter = new RTFChars();
     }
 
-    @After
-    public void tearDown() {
+    @AfterEach
+    void tearDown() {
         formatter = null;
     }
 
     @Test
-    public void testBasicFormat() {
+    void testBasicFormat() {
         assertEquals("", formatter.format(""));
 
         assertEquals("hallo", formatter.format("hallo"));
@@ -34,7 +35,7 @@ public void testBasicFormat() {
     }
 
     @Test
-    public void testLaTeXHighlighting() {
+    void testLaTeXHighlighting() {
         assertEquals("{\\i hallo}", formatter.format("\\emph{hallo}"));
         assertEquals("{\\i hallo}", formatter.format("{\\emph hallo}"));
         assertEquals("An article title with {\\i a book title} emphasized", formatter.format("An article title with \\emph{a book title} emphasized"));
@@ -47,18 +48,18 @@ public void testLaTeXHighlighting() {
     }
 
     @Test
-    public void testComplicated() {
+    void testComplicated() {
         assertEquals("R\\u233eflexions sur le timing de la quantit\\u233e {\\u230ae} should be \\u230ae",
                 formatter.format("Réflexions sur le timing de la quantité {\\ae} should be æ"));
     }
 
     @Test
-    public void  testComplicated2() {
+    void testComplicated2() {
         assertEquals("h\\'e1ll{\\u339oe}", formatter.format("h\\'all{\\oe}"));
     }
 
     @Test
-    public void testComplicated3() {
+    void testComplicated3() {
         assertEquals("Le c\\u339oeur d\\u233e\\u231cu mais l'\\u226ame plut\\u244ot na\\u239ive, Lou\\u255ys r" +
                 "\\u234eva de crapa\\u252?ter en cano\\u235e au del\\u224a des \\u238iles, pr\\u232es du m\\u228alstr" +
                 "\\u246om o\\u249u br\\u251ulent les nov\\u230ae.", formatter.format("Le cœur déçu mais l'âme plutôt " +
@@ -66,7 +67,7 @@ public void testComplicated3() {
     }
 
     @Test
-    public void testComplicated4() {
+    void testComplicated4() {
         assertEquals("l'\\u238ile exigu\\u235e\n" +
                 "  O\\u249u l'ob\\u232ese jury m\\u251ur\n" +
                 "  F\\u234ete l'ha\\u239i volap\\u252?k,\n" +
@@ -79,19 +80,19 @@ public void testComplicated4() {
     }
 
     @Test
-    public void testComplicated5() {
+    void testComplicated5() {
         assertEquals("\\u193Arv\\u237izt\\u369?r\\u337? t\\u252?k\\u246orf\\u250ur\\u243og\\u233ep",
                 formatter.format("Árvíztűrő tükörfúrógép"));
     }
 
     @Test
-    public void testComplicated6() {
+    void testComplicated6() {
         assertEquals("Pchn\\u261a\\u263c w t\\u281e \\u322l\\u243od\\u378z je\\u380za lub o\\u347sm skrzy\\u324n fig"
                 ,formatter.format("Pchnąć w tę łódź jeża lub ośm skrzyń fig"));
     }
 
     @Test
-    public void testSpecialCharacters() {
+    void testSpecialCharacters() {
         assertEquals("\\'f3", formatter.format("\\'{o}")); // ó
         assertEquals("\\'f2", formatter.format("\\`{o}")); // ò
         assertEquals("\\'f4", formatter.format("\\^{o}")); // ô
@@ -130,7 +131,7 @@ public void testSpecialCharacters() {
     }
 
     @Test
-    public void testRTFCharacters(){
+    void testRTFCharacters(){
         assertEquals("\\'e0",formatter.format("\\`{a}"));
         assertEquals("\\'e8",formatter.format("\\`{e}"));
         assertEquals("\\'ec",formatter.format("\\`{i}"));
@@ -159,7 +160,7 @@ public void testRTFCharacters(){
     }
 
     @Test
-    public void testRTFCharactersCapital() {
+    void testRTFCharactersCapital() {
         assertEquals("\\'c0",formatter.format("\\`A"));
         assertEquals("\\'c8",formatter.format("\\`E"));
         assertEquals("\\'cc",formatter.format("\\`I"));
diff --git a/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java b/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java
index 225808a91ee..7aa369aec07 100644
--- a/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java
+++ b/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java
@@ -3,9 +3,10 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import org.junit.Rule;
-import org.junit.Test;
+import com.github.tomakehurst.wiremock.WireMockServer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.any;
@@ -13,15 +14,25 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.head;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class MimeTypeDetectorTest {
+class MimeTypeDetectorTest {
 
-    @Rule public WireMockRule wireMockRule = new WireMockRule();
+    private WireMockServer wireMockServer = new WireMockServer();
+
+    @BeforeEach
+    void before() {
+        wireMockServer.start();
+    }
+
+    @AfterEach
+    void after() {
+        wireMockServer.stop();
+    }
 
     @Test
-    public void handlePermanentRedirections() throws IOException {
+    void handlePermanentRedirections() throws IOException {
         String redirectedUrl = "http://localhost:8080/redirection";
 
         stubFor(any(urlEqualTo("/redirection"))
@@ -36,25 +47,25 @@ public void handlePermanentRedirections() throws IOException {
     }
 
     @Test
-    public void beFalseForUnreachableUrl() throws IOException {
+    void beFalseForUnreachableUrl() throws IOException {
         String invalidUrl = "http://idontknowthisurlforsure.de";
         assertFalse(new URLDownload(invalidUrl).isMimeType("application/pdf"));
     }
 
     @Test
-    public void beTrueForPdfMimeType() throws IOException {
+    void beTrueForPdfMimeType() throws IOException {
         String pdfUrl = "http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf";
         assertTrue(new URLDownload(pdfUrl).isMimeType("application/pdf"));
     }
 
     @Test
-    public void beTrueForLocalPdfUri() throws URISyntaxException, IOException {
+    void beTrueForLocalPdfUri() throws URISyntaxException, IOException {
         String localPath = MimeTypeDetectorTest.class.getResource("empty.pdf").toURI().toASCIIString();
         assertTrue(new URLDownload(localPath).isMimeType("application/pdf"));
     }
 
     @Test
-    public void beTrueForPDFMimeTypeVariations() throws IOException {
+    void beTrueForPDFMimeTypeVariations() throws IOException {
         String mimeTypeVariation = "http://localhost:8080/mimevariation";
 
         stubFor(any(urlEqualTo("/mimevariation"))
@@ -67,7 +78,7 @@ public void beTrueForPDFMimeTypeVariations() throws IOException {
     }
 
     @Test
-    public void beAbleToUseHeadRequest() throws IOException {
+    void beAbleToUseHeadRequest() throws IOException {
         String mimeTypeVariation = "http://localhost:8080/mimevariation";
 
         stubFor(head(urlEqualTo("/mimevariation"))
@@ -80,7 +91,7 @@ public void beAbleToUseHeadRequest() throws IOException {
     }
 
     @Test
-    public void beAbleToUseGetRequest() throws IOException {
+    void beAbleToUseGetRequest() throws IOException {
         String mimeTypeVariation = "http://localhost:8080/mimevariation";
 
         stubFor(head(urlEqualTo("/mimevariation"))
diff --git a/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java b/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java
index 3a9e7dc5050..877109eb6ea 100644
--- a/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java
@@ -2,17 +2,17 @@
 
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class CitationEntryTest {
+class CitationEntryTest {
 
     @Test
-    public void testCitationEntryInitalPageInfo() {
+    void testCitationEntryInitalPageInfo() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context", "Info");
         assertFalse(citationEntry.pageInfoChanged());
         assertTrue(citationEntry.getPageInfo().isPresent());
@@ -22,7 +22,7 @@ public void testCitationEntryInitalPageInfo() {
     }
 
     @Test
-    public void testCitationEntryOptionalInitalPageInfo() {
+    void testCitationEntryOptionalInitalPageInfo() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context", Optional.of("Info"));
         assertFalse(citationEntry.pageInfoChanged());
         assertTrue(citationEntry.getPageInfo().isPresent());
@@ -32,7 +32,7 @@ public void testCitationEntryOptionalInitalPageInfo() {
     }
 
     @Test
-    public void testCitationEntryInitalPageInfoChanged() {
+    void testCitationEntryInitalPageInfoChanged() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context", "Info");
         citationEntry.setPageInfo("Other info");
         assertTrue(citationEntry.pageInfoChanged());
@@ -41,7 +41,7 @@ public void testCitationEntryInitalPageInfoChanged() {
     }
 
     @Test
-    public void testCitationEntryInitalPageInfoRemoved() {
+    void testCitationEntryInitalPageInfoRemoved() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context", "Info");
         citationEntry.setPageInfo(null);
         assertTrue(citationEntry.pageInfoChanged());
@@ -49,14 +49,14 @@ public void testCitationEntryInitalPageInfoRemoved() {
     }
 
     @Test
-    public void testCitationEntryNoInitalPageInfo() {
+    void testCitationEntryNoInitalPageInfo() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context");
         assertFalse(citationEntry.pageInfoChanged());
         assertFalse(citationEntry.getPageInfo().isPresent());
     }
 
     @Test
-    public void testCitationEntryNoInitalPageInfoChanged() {
+    void testCitationEntryNoInitalPageInfoChanged() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context");
         citationEntry.setPageInfo("Other info");
         assertTrue(citationEntry.pageInfoChanged());
@@ -65,7 +65,7 @@ public void testCitationEntryNoInitalPageInfoChanged() {
     }
 
     @Test
-    public void testCitationEntryEquals() {
+    void testCitationEntryEquals() {
         CitationEntry citationEntry1 = new CitationEntry("RefMark", "Context", "Info");
         CitationEntry citationEntry2 = new CitationEntry("RefMark2", "Context", "Info");
         CitationEntry citationEntry3 = new CitationEntry("RefMark", "Other Context", "Other Info");
@@ -76,7 +76,7 @@ public void testCitationEntryEquals() {
     }
 
     @Test
-    public void testCitationEntryCompareTo() {
+    void testCitationEntryCompareTo() {
         CitationEntry citationEntry1 = new CitationEntry("RefMark", "Context", "Info");
         CitationEntry citationEntry2 = new CitationEntry("RefMark2", "Context", "Info");
         CitationEntry citationEntry3 = new CitationEntry("RefMark", "Other Context", "Other Info");
diff --git a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
index 071e73b5748..da3b4ddf5f1 100644
--- a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
+++ b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
@@ -1,30 +1,31 @@
 package org.jabref.logic.protectedterms;
 
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@ExtendWith(TempDirectory.class)
 public class ProtectedTermsListTest {
 
     private ProtectedTermsList internalList;
     private ProtectedTermsList externalList;
 
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-    @Before
-    public void setUp() throws IOException {
-        String tempFileName = temporaryFolder.newFile().getAbsolutePath();
+    @BeforeEach
+    public void setUp(@TempDirectory.TempDir Path temporaryFolder) throws IOException {
+        Path path = temporaryFolder.resolve("ThisIsARandomlyNamedFile");
+        Files.createFile(path);
+        String tempFileName = path.toString();
 
         internalList = new ProtectedTermsList("Name", new ArrayList<>(Arrays.asList("AAA", "BBB")), "location", true);
         externalList = new ProtectedTermsList("Namely", new ArrayList<>(Arrays.asList("AAA", "BBB")), tempFileName);
diff --git a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
index 4939933626b..f73da3e5b45 100644
--- a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
+++ b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
@@ -2,8 +2,8 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.net.URISyntaxException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -12,33 +12,29 @@
 
 import org.jabref.logic.l10n.Localization;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
-public class ProtectedTermsLoaderTest {
+@ExtendWith(TempDirectory.class)
+class ProtectedTermsLoaderTest {
 
     private ProtectedTermsLoader loader;
 
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         loader = new ProtectedTermsLoader(new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(),
                 Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
 
     }
 
     @Test
-    public void testGetProtectedTerms() throws URISyntaxException {
+    void testGetProtectedTerms() throws URISyntaxException {
         List<ProtectedTermsList> backupList = new ArrayList<>(loader.getProtectedTermsLists());
 
         for (ProtectedTermsList list : backupList) {
@@ -53,7 +49,7 @@ public void testGetProtectedTerms() throws URISyntaxException {
     }
 
     @Test
-    public void testAddProtectedTermsListFromFile() throws URISyntaxException {
+    void testAddProtectedTermsListFromFile() throws URISyntaxException {
         String filename = Paths
                 .get(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
                         .toURI())
@@ -64,7 +60,7 @@ public void testAddProtectedTermsListFromFile() throws URISyntaxException {
     }
 
     @Test
-    public void testReadProtectedTermsListFromFileReadsDescription() throws URISyntaxException, FileNotFoundException {
+    void testReadProtectedTermsListFromFileReadsDescription() throws URISyntaxException, FileNotFoundException {
         File file = Paths.get(
                 ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms").toURI())
                 .toFile();
@@ -73,7 +69,7 @@ public void testReadProtectedTermsListFromFileReadsDescription() throws URISynta
     }
 
     @Test
-    public void testReadProtectedTermsListFromFileDisabledWorks() throws URISyntaxException, FileNotFoundException {
+    void testReadProtectedTermsListFromFileDisabledWorks() throws URISyntaxException, FileNotFoundException {
         File file = Paths.get(
                 ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms").toURI())
                 .toFile();
@@ -82,7 +78,7 @@ public void testReadProtectedTermsListFromFileDisabledWorks() throws URISyntaxEx
     }
 
     @Test
-    public void testReadProtectedTermsListFromFileEnabledWorks() throws URISyntaxException, FileNotFoundException {
+    void testReadProtectedTermsListFromFileEnabledWorks() throws URISyntaxException, FileNotFoundException {
         File file = Paths.get(
                 ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms").toURI())
                 .toFile();
@@ -91,7 +87,7 @@ public void testReadProtectedTermsListFromFileEnabledWorks() throws URISyntaxExc
     }
 
     @Test
-    public void testReadProtectedTermsListFromFileIsNotInternalList() throws URISyntaxException, FileNotFoundException {
+    void testReadProtectedTermsListFromFileIsNotInternalList() throws URISyntaxException, FileNotFoundException {
         File file = Paths.get(
                 ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms").toURI())
                 .toFile();
@@ -100,7 +96,7 @@ public void testReadProtectedTermsListFromFileIsNotInternalList() throws URISynt
     }
 
     @Test
-    public void testReadProtectedTermsListFromFileNoDescriptionGivesDefaultDescription()
+    void testReadProtectedTermsListFromFileNoDescriptionGivesDefaultDescription()
             throws URISyntaxException, FileNotFoundException {
         File file = Paths.get(
                 ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/unnamedterms.terms")
@@ -112,27 +108,27 @@ public void testReadProtectedTermsListFromFileNoDescriptionGivesDefaultDescripti
     }
 
     @Test
-    public void testNewListsAreIncluded() {
+    void testNewListsAreIncluded() {
 
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(),
-                Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
+                        Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
         assertEquals(ProtectedTermsLoader.getInternalLists().size(), localLoader.getProtectedTermsLists().size());
     }
 
     @Test
-    public void testNewListsAreEnabled() {
+    void testNewListsAreEnabled() {
 
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(),
-                Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
+                        Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
         for (ProtectedTermsList list : localLoader.getProtectedTermsLists()) {
             assertTrue(list.isEnabled());
         }
     }
 
     @Test
-    public void testInitalizedAllInternalDisabled() {
+    void testInitalizedAllInternalDisabled() {
 
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
@@ -143,7 +139,7 @@ public void testInitalizedAllInternalDisabled() {
     }
 
     @Test
-    public void testUnknownExternalFileWillNotLoad() {
+    void testUnknownExternalFileWillNotLoad() {
 
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(),
@@ -153,7 +149,7 @@ public void testUnknownExternalFileWillNotLoad() {
     }
 
     @Test
-    public void testAllDisabledNoWords() {
+    void testAllDisabledNoWords() {
 
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
@@ -162,7 +158,7 @@ public void testAllDisabledNoWords() {
     }
 
     @Test
-    public void testDoNotLoadTheSameInternalListTwice() {
+    void testDoNotLoadTheSameInternalListTwice() {
 
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(), Collections.emptyList(),
@@ -171,56 +167,56 @@ public void testDoNotLoadTheSameInternalListTwice() {
     }
 
     @Test
-    public void testAddNewTermListAddsList() throws IOException {
+    void testAddNewTermListAddsList(@TempDirectory.TempDir Path tempDir) {
 
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
-        localLoader.addNewProtectedTermsList("My new list", temporaryFolder.newFile().getAbsolutePath());
+        localLoader.addNewProtectedTermsList("My new list", tempDir.toFile().getAbsolutePath());
         assertEquals(ProtectedTermsLoader.getInternalLists().size() + 1, localLoader.getProtectedTermsLists().size());
     }
 
     @Test
-    public void testAddNewTermListNewListInList() throws IOException {
+    void testAddNewTermListNewListInList(@TempDirectory.TempDir Path tempDir) {
 
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
         ProtectedTermsList newList = localLoader.addNewProtectedTermsList("My new list",
-                temporaryFolder.newFile().getAbsolutePath());
+                tempDir.toFile().getAbsolutePath());
         assertTrue(localLoader.getProtectedTermsLists().contains(newList));
     }
 
     @Test
-    public void testRemoveTermList() throws IOException {
+    void testRemoveTermList(@TempDirectory.TempDir Path tempDir) {
 
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
-        ProtectedTermsList newList = localLoader.addNewProtectedTermsList("My new list", temporaryFolder.newFile().getAbsolutePath());
+        ProtectedTermsList newList = localLoader.addNewProtectedTermsList("My new list", tempDir.toFile().getAbsolutePath());
         assertTrue(localLoader.removeProtectedTermsList(newList));
     }
 
     @Test
-    public void testRemoveTermListReduceTheCount() throws IOException {
+    void testRemoveTermListReduceTheCount(@TempDirectory.TempDir Path tempDir) {
 
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
         ProtectedTermsList newList = localLoader.addNewProtectedTermsList("My new list",
-                temporaryFolder.newFile().getAbsolutePath());
+                tempDir.toFile().getAbsolutePath());
         localLoader.removeProtectedTermsList(newList);
         assertEquals(ProtectedTermsLoader.getInternalLists().size(), localLoader.getProtectedTermsLists().size());
     }
 
     @Test
-    public void testAddNewTermListSetsCorrectDescription() throws IOException {
+    void testAddNewTermListSetsCorrectDescription(@TempDirectory.TempDir Path tempDir) {
 
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
         ProtectedTermsList newList = localLoader.addNewProtectedTermsList("My new list",
-                temporaryFolder.newFile().getAbsolutePath());
+                tempDir.toFile().getAbsolutePath());
         assertEquals("My new list", newList.getDescription());
     }
 }
diff --git a/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java b/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java
index 42cb7fe7612..33011ec476a 100644
--- a/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java
+++ b/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java
@@ -3,32 +3,33 @@
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.verify;
 
-@RunWith(MockitoJUnitRunner.class)
-public class SearchQueryHighlightObservableTest {
+
+class SearchQueryHighlightObservableTest {
 
     @Captor ArgumentCaptor<Optional<Pattern>> captor;
     @Mock private SearchQueryHighlightListener listener;
     private SearchQueryHighlightObservable observable;
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeEach
+    void setUp() throws Exception {
         observable = new SearchQueryHighlightObservable();
+        MockitoAnnotations.initMocks(this);
     }
 
     @Test
-    public void addSearchListenerNotifiesListenerAboutPreviousPattern() throws Exception {
+    void addSearchListenerNotifiesListenerAboutPreviousPattern() throws Exception {
         observable.fireSearchlistenerEvent(new SearchQuery("test", false, false));
 
         observable.addSearchListener(listener);
@@ -38,7 +39,7 @@ public void addSearchListenerNotifiesListenerAboutPreviousPattern() throws Excep
     }
 
     @Test
-    public void addSearchListenerNotifiesRegisteredListener() throws Exception {
+    void addSearchListenerNotifiesRegisteredListener() throws Exception {
         observable.addSearchListener(listener);
 
         observable.fireSearchlistenerEvent(new SearchQuery("test", false, false));
@@ -48,7 +49,7 @@ public void addSearchListenerNotifiesRegisteredListener() throws Exception {
     }
 
     @Test
-    public void addSearchListenerNotifiesRegisteredListenerAboutGrammarBasedSearches() throws Exception {
+    void addSearchListenerNotifiesRegisteredListenerAboutGrammarBasedSearches() throws Exception {
         observable.addSearchListener(listener);
 
         observable.fireSearchlistenerEvent(new SearchQuery("author=harrer", false, false));
diff --git a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
index fa6ccbe25f7..c099ace2c7c 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
@@ -2,12 +2,8 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Stream;
 
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.logic.shared.exception.OfflineLockException;
@@ -16,10 +12,8 @@
 import org.jabref.testutils.category.DatabaseTest;
 
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -28,41 +22,46 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 @DatabaseTest
-public class DBMSProcessorTest {
-
-    private DBMSConnection dbmsConnection;
-    private DBMSProcessor dbmsProcessor;
-
-    @Parameter public DBMSType dbmsType;
-
-    @BeforeEach
-    public void setUp() throws SQLException, InvalidDBMSConnectionPropertiesException {
-        dbmsConnection = TestConnector.getTestDBMSConnection(dbmsType);
-        dbmsProcessor = DBMSProcessor.getProcessorInstance(dbmsConnection);
-        dbmsProcessor.setupSharedDatabase();
-    }
-
-    @Parameters(name = "Test with {0} database system")
-    public static Collection<DBMSType> getTestingDatabaseSystems() {
-        return TestManager.getDBMSTypeTestParameter();
+class DBMSProcessorTest {
+
+    private static Stream<Object[]> getTestingDatabaseSystems() {
+        Stream<DBMSType> dbmsTypeStream = TestManager.getDBMSTypeTestParameter().stream();
+        Collection<Object[]> result = new ArrayList<>();
+        dbmsTypeStream.forEach(dbmsType -> {
+            try {
+                result.add(new Object[] {
+                        dbmsType,
+                        TestConnector.getTestDBMSConnection(dbmsType),
+                        DBMSProcessor.getProcessorInstance(TestConnector.getTestDBMSConnection(dbmsType))});
+            } catch (SQLException | InvalidDBMSConnectionPropertiesException e) {
+                e.printStackTrace();
+            }
+        });
+        return result.stream();
     }
 
-    @Test
-    public void testCheckBaseIntegrity() throws SQLException {
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testCheckBaseIntegrity(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws SQLException {
+        dbmsProcessor.setupSharedDatabase();
         assertTrue(dbmsProcessor.checkBaseIntegrity());
-        clear();
+        clear(dbmsConnection);
         assertFalse(dbmsProcessor.checkBaseIntegrity());
     }
 
-    @Test
-    public void testSetUpSharedDatabase() throws SQLException {
-        clear();
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testSetUpSharedDatabase(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws SQLException {
+        dbmsProcessor.setupSharedDatabase();
+        clear(dbmsConnection);
         dbmsProcessor.setupSharedDatabase();
         assertTrue(dbmsProcessor.checkBaseIntegrity());
     }
 
-    @Test
-    public void testInsertEntry() throws SQLException {
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testInsertEntry(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws SQLException {
+        dbmsProcessor.setupSharedDatabase();
         BibEntry expectedEntry = getBibEntryExample();
 
         dbmsProcessor.insertEntry(expectedEntry);
@@ -73,14 +72,14 @@ public void testInsertEntry() throws SQLException {
 
         Map<String, String> actualFieldMap = new HashMap<>();
 
-        try (ResultSet entryResultSet = selectFrom("ENTRY")) {
+        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
             assertTrue(entryResultSet.next());
             assertEquals(1, entryResultSet.getInt("SHARED_ID"));
             assertEquals("inproceedings", entryResultSet.getString("TYPE"));
             assertEquals(1, entryResultSet.getInt("VERSION"));
             assertFalse(entryResultSet.next());
 
-            try (ResultSet fieldResultSet = selectFrom("FIELD")) {
+            try (ResultSet fieldResultSet = selectFrom("FIELD", dbmsConnection, dbmsProcessor)) {
                 while (fieldResultSet.next()) {
                     actualFieldMap.put(fieldResultSet.getString("NAME"), fieldResultSet.getString("VALUE"));
                 }
@@ -92,8 +91,10 @@ public void testInsertEntry() throws SQLException {
         assertEquals(expectedFieldMap, actualFieldMap);
     }
 
-    @Test
-    public void testUpdateEntry() throws OfflineLockException, SQLException {
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testUpdateEntry(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws OfflineLockException, SQLException {
+        dbmsProcessor.setupSharedDatabase();
         BibEntry expectedEntry = getBibEntryExample();
 
         dbmsProcessor.insertEntry(expectedEntry);
@@ -111,8 +112,10 @@ public void testUpdateEntry() throws OfflineLockException, SQLException {
         assertEquals(expectedEntry, actualEntryOptional.get());
     }
 
-    @Test
-    public void testUpdateNewerEntry() throws OfflineLockException, SQLException {
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testUpdateNewerEntry(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws OfflineLockException, SQLException {
+        dbmsProcessor.setupSharedDatabase();
         BibEntry bibEntry = getBibEntryExample();
 
         dbmsProcessor.insertEntry(bibEntry);
@@ -124,8 +127,10 @@ public void testUpdateNewerEntry() throws OfflineLockException, SQLException {
         assertThrows(OfflineLockException.class, () -> dbmsProcessor.updateEntry(bibEntry));
     }
 
-    @Test
-    public void testUpdateEqualEntry() throws OfflineLockException, SQLException {
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testUpdateEqualEntry(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws OfflineLockException, SQLException {
+        dbmsProcessor.setupSharedDatabase();
         BibEntry expectedBibEntry = getBibEntryExample();
 
         dbmsProcessor.insertEntry(expectedBibEntry);
@@ -139,19 +144,23 @@ public void testUpdateEqualEntry() throws OfflineLockException, SQLException {
         assertEquals(expectedBibEntry, actualBibEntryOptional.get());
     }
 
-    @Test
-    public void testRemoveEntry() throws SQLException {
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testRemoveEntry(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws SQLException {
+        dbmsProcessor.setupSharedDatabase();
         BibEntry bibEntry = getBibEntryExample();
         dbmsProcessor.insertEntry(bibEntry);
         dbmsProcessor.removeEntry(bibEntry);
 
-        try (ResultSet resultSet = selectFrom("ENTRY")) {
+        try (ResultSet resultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
             assertFalse(resultSet.next());
         }
     }
 
-    @Test
-    public void testGetSharedEntries() {
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testGetSharedEntries(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws SQLException {
+        dbmsProcessor.setupSharedDatabase();
         BibEntry bibEntry = getBibEntryExampleWithEmptyFields();
 
         dbmsProcessor.insertEntry(bibEntry);
@@ -162,8 +171,10 @@ public void testGetSharedEntries() {
         assertEquals(expectedEntries, actualEntries);
     }
 
-    @Test
-    public void testGetSharedEntry() {
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testGetSharedEntry(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws SQLException {
+        dbmsProcessor.setupSharedDatabase();
         BibEntry expectedBibEntry = getBibEntryExampleWithEmptyFields();
 
         dbmsProcessor.insertEntry(expectedBibEntry);
@@ -174,14 +185,18 @@ public void testGetSharedEntry() {
         assertEquals(expectedBibEntry, actualBibEntryOptional.get());
     }
 
-    @Test
-    public void testGetNotExistingSharedEntry() {
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testGetNotExistingSharedEntry(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws SQLException {
+        dbmsProcessor.setupSharedDatabase();
         Optional<BibEntry> actualBibEntryOptional = dbmsProcessor.getSharedEntry(1);
         assertFalse(actualBibEntryOptional.isPresent());
     }
 
-    @Test
-    public void testGetSharedIDVersionMapping() throws OfflineLockException, SQLException {
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testGetSharedIDVersionMapping(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws OfflineLockException, SQLException {
+        dbmsProcessor.setupSharedDatabase();
         BibEntry firstEntry = getBibEntryExample();
         BibEntry secondEntry = getBibEntryExample();
 
@@ -198,12 +213,14 @@ public void testGetSharedIDVersionMapping() throws OfflineLockException, SQLExce
         assertEquals(expectedIDVersionMap, actualIDVersionMap);
     }
 
-    @Test
-    public void testGetSharedMetaData() {
-        insertMetaData("databaseType", "bibtex;");
-        insertMetaData("protectedFlag", "true;");
-        insertMetaData("saveActions", "enabled;\nauthor[capitalize,html_to_latex]\ntitle[title_case]\n;");
-        insertMetaData("saveOrderConfig", "specified;author;false;title;false;year;true;");
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testGetSharedMetaData(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws SQLException {
+        dbmsProcessor.setupSharedDatabase();
+        insertMetaData("databaseType", "bibtex;", dbmsConnection, dbmsProcessor);
+        insertMetaData("protectedFlag", "true;", dbmsConnection, dbmsProcessor);
+        insertMetaData("saveActions", "enabled;\nauthor[capitalize,html_to_latex]\ntitle[title_case]\n;", dbmsConnection, dbmsProcessor);
+        insertMetaData("saveOrderConfig", "specified;author;false;title;false;year;true;", dbmsConnection, dbmsProcessor);
 
         Map<String, String> expectedMetaData = getMetaDataExample();
         Map<String, String> actualMetaData = dbmsProcessor.getSharedMetaData();
@@ -211,8 +228,10 @@ public void testGetSharedMetaData() {
         assertEquals(expectedMetaData, actualMetaData);
     }
 
-    @Test
-    public void testSetSharedMetaData() throws SQLException {
+    @ParameterizedTest
+    @MethodSource("getTestingDatabaseSystems")
+    void testSetSharedMetaData(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws SQLException {
+        dbmsProcessor.setupSharedDatabase();
         Map<String, String> expectedMetaData = getMetaDataExample();
         dbmsProcessor.setSharedMetaData(expectedMetaData);
 
@@ -252,9 +271,9 @@ private BibEntry getBibEntryExample() {
         return bibEntry;
     }
 
-    private ResultSet selectFrom(String table) {
+    private ResultSet selectFrom(String table, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) {
         try {
-            return dbmsConnection.getConnection().createStatement().executeQuery("SELECT * FROM " + escape(table));
+            return dbmsConnection.getConnection().createStatement().executeQuery("SELECT * FROM " + escape(table, dbmsProcessor));
         } catch (SQLException e) {
             fail(e.getMessage());
             return null;
@@ -263,17 +282,17 @@ private ResultSet selectFrom(String table) {
 
     // Oracle does not support multiple tuple insertion in one INSERT INTO command.
     // Therefore this function was defined to improve the readability and to keep the code short.
-    private void insertMetaData(String key, String value) {
+    private void insertMetaData(String key, String value, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) {
         try {
-            dbmsConnection.getConnection().createStatement().executeUpdate("INSERT INTO " + escape("METADATA") + "("
-                    + escape("KEY") + ", " + escape("VALUE") + ") VALUES("
+            dbmsConnection.getConnection().createStatement().executeUpdate("INSERT INTO " + escape("METADATA", dbmsProcessor) + "("
+                    + escape("KEY", dbmsProcessor) + ", " + escape("VALUE", dbmsProcessor) + ") VALUES("
                     + escapeValue(key) + ", " + escapeValue(value) + ")");
         } catch (SQLException e) {
             fail(e.getMessage());
         }
     }
 
-    private String escape(String expression) {
+    private String escape(String expression, DBMSProcessor dbmsProcessor) {
         return dbmsProcessor.escape(expression);
     }
 
@@ -282,7 +301,7 @@ private String escapeValue(String value) {
     }
 
     @AfterEach
-    public void clear() throws SQLException {
+    void clear(DBMSConnection dbmsConnection) throws SQLException {
         TestManager.clearTables(dbmsConnection);
     }
 }
diff --git a/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java b/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java
index 07c74a173a4..9d3a8374416 100644
--- a/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java
+++ b/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java
@@ -1,8 +1,8 @@
 package org.jabref.logic.util.io;
 
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -10,20 +10,17 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibtexEntryTypes;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@RunWith(MockitoJUnitRunner.class)
-public class CiteKeyBasedFileFinderTest {
+@ExtendWith(TempDirectory.class)
+class CiteKeyBasedFileFinderTest {
 
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder();
     private BibEntry entry;
     private Path rootDir;
     private Path graphicsDir;
@@ -31,12 +28,12 @@ public class CiteKeyBasedFileFinderTest {
     private Path jpgFile;
     private Path pdfFile;
 
-    @Before
-    public void setUp() throws IOException {
+    @BeforeEach
+    void setUp(@TempDirectory.TempDir Path temporaryFolder) throws IOException {
         entry = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
         entry.setCiteKey("HipKro03");
 
-        rootDir = temporaryFolder.getRoot().toPath();
+        rootDir = temporaryFolder;
 
         Path subDir = Files.createDirectory(rootDir.resolve("Organization Science"));
         pdfsDir = Files.createDirectory(rootDir.resolve("pdfs"));
@@ -65,7 +62,7 @@ public void setUp() throws IOException {
     }
 
     @Test
-    public void findAssociatedFilesInSubDirectories() throws Exception {
+    void findAssociatedFilesInSubDirectories() throws Exception {
         List<String> extensions = Arrays.asList("jpg", "pdf");
         List<Path> dirs = Arrays.asList(graphicsDir, pdfsDir);
         FileFinder fileFinder = new CiteKeyBasedFileFinder(false);
@@ -76,7 +73,7 @@ public void findAssociatedFilesInSubDirectories() throws Exception {
     }
 
     @Test
-    public void findAssociatedFilesIgnoresFilesStartingWithKeyButContinueWithText() throws Exception {
+    void findAssociatedFilesIgnoresFilesStartingWithKeyButContinueWithText() throws Exception {
         Files.createFile(pdfsDir.resolve("HipKro03a - Hello second paper.pdf"));
         FileFinder fileFinder = new CiteKeyBasedFileFinder(false);
 
@@ -86,7 +83,7 @@ public void findAssociatedFilesIgnoresFilesStartingWithKeyButContinueWithText()
     }
 
     @Test
-    public void findAssociatedFilesFindsFilesStartingWithKey() throws Exception {
+    void findAssociatedFilesFindsFilesStartingWithKey() throws Exception {
         Path secondPdfFile = Files.createFile(pdfsDir.resolve("HipKro03_Hello second paper.pdf"));
         FileFinder fileFinder = new CiteKeyBasedFileFinder(false);
 
@@ -96,7 +93,7 @@ public void findAssociatedFilesFindsFilesStartingWithKey() throws Exception {
     }
 
     @Test
-    public void findAssociatedFilesInNonExistingDirectoryFindsNothing() throws Exception {
+    void findAssociatedFilesInNonExistingDirectoryFindsNothing() throws Exception {
         List<String> extensions = Arrays.asList("jpg", "pdf");
         List<Path> dirs = Collections.singletonList(rootDir.resolve("asdfasdf/asdfasdf"));
         CiteKeyBasedFileFinder fileFinder = new CiteKeyBasedFileFinder(false);
@@ -105,5 +102,4 @@ public void findAssociatedFilesInNonExistingDirectoryFindsNothing() throws Excep
 
         assertEquals(Collections.emptyList(), results);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index 57b36d3c38c..28c764a024f 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -1,12 +1,9 @@
 package org.jabref.logic.util.io;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -17,49 +14,54 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileHelper;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 
-public class FileUtilTest {
+@ExtendWith(TempDirectory.class)
+class FileUtilTest {
     private final Path nonExistingTestPath = Paths.get("nonExistingTestPath");
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder();
-    public TemporaryFolder otherTemporaryFolder = new TemporaryFolder();
     private Path existingTestFile;
     private Path otherExistingTestFile;
     private LayoutFormatterPreferences layoutFormatterPreferences;
+    private Path rootDir;
 
-    @Before
-    public void setUpViewModel() throws IOException {
-        existingTestFile = createTemporaryTestFile("existingTestFile.txt");
-        otherExistingTestFile = createTemporaryTestFile("otherExistingTestFile.txt");
-        otherTemporaryFolder.create();
+    @BeforeEach
+    void setUpViewModel(@TempDirectory.TempDir Path temporaryFolder) throws IOException {
+        rootDir = temporaryFolder;
+        Path subDir = rootDir.resolve("1");
+        Files.createDirectory(subDir);
+
+        existingTestFile = subDir.resolve("existingTestFile.txt");
+        Files.createFile(existingTestFile);
+        Files.write(existingTestFile, "existingTestFile.txt".getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND);
+
+        otherExistingTestFile = subDir.resolve("otherExistingTestFile.txt");
+        Files.createFile(otherExistingTestFile);
+        Files.write(otherExistingTestFile, "otherExistingTestFile.txt".getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND);
         layoutFormatterPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @Test
-    public void extensionBakAddedCorrectly() {
+    void extensionBakAddedCorrectly() {
         assertEquals(Paths.get("demo.bib.bak"),
                 FileUtil.addExtension(Paths.get("demo.bib"), ".bak"));
     }
 
     @Test
-    public void extensionBakAddedCorrectlyToAFileContainedInTmpDirectory() {
+    void extensionBakAddedCorrectlyToAFileContainedInTmpDirectory() {
         assertEquals(Paths.get("tmp", "demo.bib.bak"),
                 FileUtil.addExtension(Paths.get("tmp", "demo.bib"), ".bak"));
     }
 
     @Test
-    public void testGetLinkedFileNameDefaultFullTitle() {
+    void testGetLinkedFileNameDefaultFullTitle() {
         // bibkey - title
         String fileNamePattern = "[bibtexkey] - [fulltitle]";
         BibEntry entry = new BibEntry();
@@ -71,7 +73,7 @@ public void testGetLinkedFileNameDefaultFullTitle() {
     }
 
     @Test
-    public void testGetLinkedFileNameDefaultWithLowercaseTitle() {
+    void testGetLinkedFileNameDefaultWithLowercaseTitle() {
         // bibkey - title
         String fileNamePattern = "[bibtexkey] - [title:lower]";
         BibEntry entry = new BibEntry();
@@ -83,7 +85,7 @@ public void testGetLinkedFileNameDefaultWithLowercaseTitle() {
     }
 
     @Test
-    public void testGetLinkedFileNameBibTeXKey() {
+    void testGetLinkedFileNameBibTeXKey() {
         // bibkey
         String fileNamePattern = "[bibtexkey]";
         BibEntry entry = new BibEntry();
@@ -95,7 +97,7 @@ public void testGetLinkedFileNameBibTeXKey() {
     }
 
     @Test
-    public void testGetLinkedFileNameNoPattern() {
+    void testGetLinkedFileNameNoPattern() {
         String fileNamePattern = "";
         BibEntry entry = new BibEntry();
         entry.setCiteKey("1234");
@@ -105,7 +107,7 @@ public void testGetLinkedFileNameNoPattern() {
     }
 
     @Test
-    public void testGetDefaultFileNameNoPatternNoBibTeXKey() {
+    void testGetDefaultFileNameNoPatternNoBibTeXKey() {
         String fileNamePattern = "";
         BibEntry entry = new BibEntry();
         entry.setField("title", "mytitle");
@@ -114,7 +116,7 @@ public void testGetDefaultFileNameNoPatternNoBibTeXKey() {
     }
 
     @Test
-    public void testGetLinkedFileNameGetKeyIfEmptyField() {
+    void testGetLinkedFileNameGetKeyIfEmptyField() {
         // bibkey - title
         String fileNamePattern = "[title]";
         BibEntry entry = new BibEntry();
@@ -124,7 +126,7 @@ public void testGetLinkedFileNameGetKeyIfEmptyField() {
     }
 
     @Test
-    public void testGetLinkedFileNameGetDefaultIfEmptyFieldNoKey() {
+    void testGetLinkedFileNameGetDefaultIfEmptyFieldNoKey() {
         // bibkey - title
         String fileNamePattern = "[title]";
         BibEntry entry = new BibEntry();
@@ -133,7 +135,7 @@ public void testGetLinkedFileNameGetDefaultIfEmptyFieldNoKey() {
     }
 
     @Test
-    public void testGetLinkedFileNameByYearAuthorFirstpage() {
+    void testGetLinkedFileNameByYearAuthorFirstpage() {
         // bibkey - title
         String fileNamePattern = "[year]_[auth]_[firstpage]";
         BibEntry entry = new BibEntry();
@@ -145,62 +147,62 @@ public void testGetLinkedFileNameByYearAuthorFirstpage() {
     }
 
     @Test
-    public void testGetFileExtensionSimpleFile() {
+    void testGetFileExtensionSimpleFile() {
         assertEquals("pdf", FileHelper.getFileExtension(Paths.get("test.pdf")).get());
     }
 
     @Test
-    public void testGetFileExtensionMultipleDotsFile() {
+    void testGetFileExtensionMultipleDotsFile() {
         assertEquals("pdf", FileHelper.getFileExtension(Paths.get("te.st.PdF")).get());
     }
 
     @Test
-    public void testGetFileExtensionNoExtensionFile() {
+    void testGetFileExtensionNoExtensionFile() {
         assertFalse(FileHelper.getFileExtension(Paths.get("JustTextNotASingleDot")).isPresent());
     }
 
     @Test
-    public void testGetFileExtensionNoExtension2File() {
+    void testGetFileExtensionNoExtension2File() {
         assertFalse(FileHelper.getFileExtension(Paths.get(".StartsWithADotIsNotAnExtension")).isPresent());
     }
 
     @Test
-    public void getFileExtensionWithSimpleString() {
+    void getFileExtensionWithSimpleString() {
         assertEquals("pdf", FileHelper.getFileExtension("test.pdf").get());
     }
 
     @Test
-    public void getFileExtensionTrimsAndReturnsInLowercase() {
+    void getFileExtensionTrimsAndReturnsInLowercase() {
         assertEquals("pdf", FileHelper.getFileExtension("test.PdF  ").get());
     }
 
     @Test
-    public void getFileExtensionWithMultipleDotsString() {
+    void getFileExtensionWithMultipleDotsString() {
         assertEquals("pdf", FileHelper.getFileExtension("te.st.PdF  ").get());
     }
 
     @Test
-    public void getFileExtensionWithNoDotReturnsEmptyExtension() {
+    void getFileExtensionWithNoDotReturnsEmptyExtension() {
         assertEquals(Optional.empty(), FileHelper.getFileExtension("JustTextNotASingleDot"));
     }
 
     @Test
-    public void getFileExtensionWithDotAtStartReturnsEmptyExtension() {
+    void getFileExtensionWithDotAtStartReturnsEmptyExtension() {
         assertEquals(Optional.empty(), FileHelper.getFileExtension(".StartsWithADotIsNotAnExtension"));
     }
 
     @Test
-    public void getFileNameWithSimpleString() {
+    void getFileNameWithSimpleString() {
         assertEquals("test", FileUtil.getBaseName("test.pdf"));
     }
 
     @Test
-    public void getFileNameWithMultipleDotsString() {
+    void getFileNameWithMultipleDotsString() {
         assertEquals("te.st", FileUtil.getBaseName("te.st.PdF  "));
     }
 
     @Test
-    public void uniquePathSubstrings() {
+    void uniquePathSubstrings() {
         String[] pathArr = {Paths.get("C:/uniquefile.bib").toString(),
                 Paths.get("C:/downloads/filename.bib").toString(), Paths.get("C:/mypaper/bib/filename.bib").toString(),
                 Paths.get("C:/external/mypaper/bib/filename.bib").toString(), ""};
@@ -215,102 +217,110 @@ public void uniquePathSubstrings() {
     }
 
     @Test
-    public void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithOverrideExistFile(){
+    void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithOverrideExistFile(){
         assertFalse(FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, true));
     }
 
     @Test
-    public void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithoutOverrideExistFile(){
+    void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithoutOverrideExistFile(){
         assertFalse(FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, false));
     }
 
     @Test
-    public void testCopyFileFromEmptySourcePathToExistDestinationPathWithOverrideExistFile(){
+    void testCopyFileFromEmptySourcePathToExistDestinationPathWithOverrideExistFile(){
         assertFalse(FileUtil.copyFile(nonExistingTestPath, existingTestFile, true));
     }
 
     @Test
-    public void testCopyFileFromEmptySourcePathToExistDestinationPathWithoutOverrideExistFile(){
+    void testCopyFileFromEmptySourcePathToExistDestinationPathWithoutOverrideExistFile(){
         assertFalse(FileUtil.copyFile(nonExistingTestPath, existingTestFile, false));
     }
 
     @Test
-    public void testCopyFileFromExistSourcePathToExistDestinationPathWithOverrideExistFile(){
+    void testCopyFileFromExistSourcePathToExistDestinationPathWithOverrideExistFile(){
         assertTrue(FileUtil.copyFile(existingTestFile, existingTestFile, true));
     }
 
     @Test
-    public void testCopyFileFromExistSourcePathToExistDestinationPathWithoutOverrideExistFile(){
+    void testCopyFileFromExistSourcePathToExistDestinationPathWithoutOverrideExistFile(){
         assertFalse(FileUtil.copyFile(existingTestFile, existingTestFile, false));
     }
 
     @Test
-    public void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithOverrideExistFile(){
+    void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithOverrideExistFile(){
         assertTrue(FileUtil.copyFile(existingTestFile, otherExistingTestFile, true));
     }
 
     @Test
-    public void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithoutOverrideExistFile(){
+    void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithoutOverrideExistFile(){
         assertFalse(FileUtil.copyFile(existingTestFile, otherExistingTestFile, false));
     }
 
     @Test
-    public void testCopyFileSuccessfulWithOverrideExistFile() throws IOException {
-        Path temp = otherTemporaryFolder.newFile("existingTestFile.txt").toPath();
+    void testCopyFileSuccessfulWithOverrideExistFile() throws IOException {
+        Path subDir = rootDir.resolve("2");
+        Files.createDirectory(subDir);
+        Path temp = subDir.resolve("existingTestFile.txt");
+        Files.createFile(temp);
         FileUtil.copyFile(existingTestFile, temp, true);
-        assertEquals(Files.readAllLines(existingTestFile, StandardCharsets.UTF_8),Files.readAllLines(temp, StandardCharsets.UTF_8));
+        assertEquals(Files.readAllLines(existingTestFile, StandardCharsets.UTF_8), Files.readAllLines(temp, StandardCharsets.UTF_8));
     }
 
     @Test
-    public void testCopyFileSuccessfulWithoutOverrideExistFile() throws IOException {
-        Path temp = otherTemporaryFolder.newFile("existingTestFile.txt").toPath();
+    void testCopyFileSuccessfulWithoutOverrideExistFile() throws IOException {
+        Path subDir = rootDir.resolve("2");
+        Files.createDirectory(subDir);
+        Path temp = subDir.resolve("existingTestFile.txt");
+        Files.createFile(temp);
         FileUtil.copyFile(existingTestFile, temp, false);
-        assertNotEquals(Files.readAllLines(existingTestFile, StandardCharsets.UTF_8),Files.readAllLines(temp, StandardCharsets.UTF_8));
+        assertNotEquals(Files.readAllLines(existingTestFile, StandardCharsets.UTF_8), Files.readAllLines(temp, StandardCharsets.UTF_8));
     }
 
-    @Test (expected = NullPointerException.class)
-    public void testRenameFileWithFromFileIsNullAndToFileIsNull() {
-        FileUtil.renameFile(null, null);
+    @Test
+    void testRenameFileWithFromFileIsNullAndToFileIsNull() {
+        assertThrows(NullPointerException.class, () -> FileUtil.renameFile(null, null));
     }
 
-    @Test (expected = NullPointerException.class)
-    public void testRenameFileWithFromFileExistAndToFileIsNull() {
-        FileUtil.renameFile(existingTestFile, null);
+    @Test
+    void testRenameFileWithFromFileExistAndToFileIsNull() {
+        assertThrows(NullPointerException.class, () -> FileUtil.renameFile(existingTestFile, null));
     }
 
-    @Test (expected = NullPointerException.class)
-    public void testRenameFileWithFromFileIsNullAndToFileExist() {
-        FileUtil.renameFile(null, existingTestFile);
+    @Test
+    void testRenameFileWithFromFileIsNullAndToFileExist() {
+        assertThrows(NullPointerException.class, () -> FileUtil.renameFile(null, existingTestFile));
     }
 
     @Test
-    public void testRenameFileWithFromFileNotExistAndToFileNotExist(){
+    void testRenameFileWithFromFileNotExistAndToFileNotExist(){
         assertFalse(FileUtil.renameFile(nonExistingTestPath, nonExistingTestPath));
     }
 
     @Test
-    public void testRenameFileWithFromFileNotExistAndToFileExist(){
+    void testRenameFileWithFromFileNotExistAndToFileExist(){
         assertFalse(FileUtil.renameFile(nonExistingTestPath, existingTestFile));
     }
 
     @Test
-    public void testRenameFileWithFromFileExistAndToFileNotExist(){
+    void testRenameFileWithFromFileExistAndToFileNotExist(){
         assertTrue(FileUtil.renameFile(existingTestFile, nonExistingTestPath));
     }
 
     @Test
-    public void testRenameFileWithFromFileExistAndToFileExist(){
+    void testRenameFileWithFromFileExistAndToFileExist(){
         assertTrue(FileUtil.renameFile(existingTestFile, existingTestFile));
     }
 
     @Test
-    public void testRenameFileWithFromFileExistAndOtherToFileExist(){
+    void testRenameFileWithFromFileExistAndOtherToFileExist(){
         assertFalse(FileUtil.renameFile(existingTestFile, otherExistingTestFile));
     }
 
     @Test
-    public void testRenameFileSuccessful() {
-        Path temp = Paths.get(otherTemporaryFolder.toString());
+    void testRenameFileSuccessful(@TempDirectory.TempDir Path otherTemporaryFolder) {
+        // Be careful. This "otherTemporaryFolder" is the same as the "temporaryFolder"
+        // in the @BeforeEach method.
+        Path temp = Paths.get(otherTemporaryFolder.resolve("123").toString());
 
         System.out.println(temp);
         FileUtil.renameFile(existingTestFile, temp);
@@ -318,31 +328,31 @@ public void testRenameFileSuccessful() {
     }
 
     @Test
-    public void validFilenameShouldNotAlterValidFilename() {
+    void validFilenameShouldNotAlterValidFilename() {
         assertEquals("somename.pdf", FileUtil.getValidFileName("somename.pdf"));
     }
 
     @Test
-    public void validFilenameWithoutExtension() {
+    void validFilenameWithoutExtension() {
         assertEquals("somename", FileUtil.getValidFileName("somename"));
     }
 
     @Test
-    public void validFilenameShouldBeMaximum255Chars() {
+    void validFilenameShouldBeMaximum255Chars() {
         String longestValidFilename = Stream.generate(() -> String.valueOf('1')).limit(FileUtil.MAXIMUM_FILE_NAME_LENGTH).collect(Collectors.joining()) + ".pdf";
         String longerFilename = Stream.generate(() -> String.valueOf('1')).limit(260).collect(Collectors.joining()) + ".pdf";
         assertEquals(longestValidFilename, FileUtil.getValidFileName(longerFilename));
     }
 
     @Test
-    public void invalidFilenameWithoutExtension() {
+    void invalidFilenameWithoutExtension() {
         String longestValidFilename = Stream.generate(() -> String.valueOf('1')).limit(FileUtil.MAXIMUM_FILE_NAME_LENGTH).collect(Collectors.joining());
         String longerFilename = Stream.generate(() -> String.valueOf('1')).limit(260).collect(Collectors.joining());
         assertEquals(longestValidFilename, FileUtil.getValidFileName(longerFilename));
     }
 
     @Test
-    public void testGetLinkedDirNameDefaultFullTitle() {
+    void testGetLinkedDirNameDefaultFullTitle() {
         // bibkey - title
         String fileNamePattern = "PDF/[year]/[auth]/[bibtexkey] - [fulltitle]";
         BibEntry entry = new BibEntry();
@@ -354,10 +364,4 @@ public void testGetLinkedDirNameDefaultFullTitle() {
         assertEquals("PDF/1998/Åuthör/1234 - mytitle",
                 FileUtil.createDirNameFromPattern(null, entry, fileNamePattern));
     }
-
-    private Path createTemporaryTestFile(String name) throws IOException {
-        File testFile = temporaryFolder.newFile(name);
-        Files.write(testFile.toPath(), name.getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND);
-        return testFile.toPath();
-    }
 }
diff --git a/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java b/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
index 629d6982466..ea5dfe702c1 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
@@ -19,19 +19,16 @@
 import com.google.common.io.Resources;
 import org.apache.xmpbox.XMPMetadata;
 import org.apache.xmpbox.schema.DublinCoreSchema;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class XmpUtilReaderTest {
-
-    @Rule public TemporaryFolder tempFolder = new TemporaryFolder();
+class XmpUtilReaderTest {
 
     private static final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
 
@@ -42,8 +39,8 @@ public class XmpUtilReaderTest {
     /**
      * Create a temporary PDF-file with a single empty page.
      */
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.getEncoding()).thenReturn(StandardCharsets.UTF_8);
         xmpPreferences = mock(XmpPreferences.class);
@@ -59,7 +56,7 @@ public void setUp() {
      * Tests reading of dublinCore metadata.
      */
     @Test
-    public void testReadArticleDublinCoreReadRawXmp() throws IOException, URISyntaxException, ParseException {
+    void testReadArticleDublinCoreReadRawXmp() throws IOException, URISyntaxException, ParseException {
         Path path = Paths.get(XmpUtilShared.class.getResource("article_dublinCore.pdf").toURI());
         List<XMPMetadata> meta = XmpUtilReader.readRawXmp(path);
 
@@ -69,43 +66,43 @@ public void testReadArticleDublinCoreReadRawXmp() throws IOException, URISyntaxE
         String bibString = Resources.toString(XmpUtilShared.class.getResource("article_dublinCore.bib"), StandardCharsets.UTF_8);
         Optional<BibEntry> entryFromBibFile = parser.parseSingleEntry(bibString);
 
-        Assert.assertEquals(entryFromBibFile.get(), entry.get());
+        assertEquals(entryFromBibFile.get(), entry.get());
     }
 
     /**
      * Tests reading of dublinCore metadata.
      */
     @Test
-    public void testReadArticleDublinCoreReadXmp() throws IOException, URISyntaxException, ParseException {
+    void testReadArticleDublinCoreReadXmp() throws IOException, URISyntaxException, ParseException {
         List<BibEntry> entries = XmpUtilReader.readXmp(Paths.get(XmpUtilShared.class.getResource("article_dublinCore.pdf").toURI()), xmpPreferences);
         BibEntry entry = entries.get(0);
 
         String bibString = Resources.toString(XmpUtilShared.class.getResource("article_dublinCore.bib"), StandardCharsets.UTF_8);
         Optional<BibEntry> entryFromBibFile = parser.parseSingleEntry(bibString);
 
-        Assert.assertEquals(entryFromBibFile.get(), entry);
+        assertEquals(entryFromBibFile.get(), entry);
     }
 
     /**
      * Tests an pdf file with an empty metadata section.
      */
     @Test
-    public void testReadEmtpyMetadata() throws IOException, URISyntaxException {
+    void testReadEmtpyMetadata() throws IOException, URISyntaxException {
         List<BibEntry> entries = XmpUtilReader.readXmp(Paths.get(XmpUtilShared.class.getResource("empty_metadata.pdf").toURI()), xmpPreferences);
-        Assert.assertEquals(Collections.EMPTY_LIST, entries);
+        assertEquals(Collections.EMPTY_LIST, entries);
     }
 
     /**
      * Test non XMP metadata. Metadata are included in the PDInformation
      */
     @Test
-    public void testReadPDMetadata() throws IOException, URISyntaxException, ParseException {
+    void testReadPDMetadata() throws IOException, URISyntaxException, ParseException {
         List<BibEntry> entries = XmpUtilReader.readXmp(Paths.get(XmpUtilShared.class.getResource("PD_metadata.pdf").toURI()), xmpPreferences);
 
         String bibString = Resources.toString(XmpUtilShared.class.getResource("PD_metadata.bib"), StandardCharsets.UTF_8);
         Optional<BibEntry> entryFromBibFile = parser.parseSingleEntry(bibString);
 
-        Assert.assertEquals(entryFromBibFile.get(), entries.get(0));
+        assertEquals(entryFromBibFile.get(), entries.get(0));
     }
 
 }
diff --git a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
index 7037c2a57b1..bad198f9d0f 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
@@ -1,7 +1,7 @@
 package org.jabref.logic.xmp;
 
-import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
@@ -13,17 +13,17 @@
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class XmpUtilWriterTest {
-
-    @Rule public TemporaryFolder tempFolder = new TemporaryFolder();
+@ExtendWith(TempDirectory.class)
+class XmpUtilWriterTest {
 
     private XmpPreferences xmpPreferences;
 
@@ -79,8 +79,8 @@ private void initBibEntries() {
     /**
      * Create a temporary PDF-file with a single empty page.
      */
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
 
         xmpPreferences = mock(XmpPreferences.class);
         // The code assumes privacy filters to be off
@@ -95,9 +95,9 @@ public void setUp() {
      * Test for writing a PDF file with a single DublinCore metadata entry.
      */
     @Test
-    public void testWriteXmp() throws IOException, TransformerException {
+    void testWriteXmp(@TempDirectory.TempDir Path tempDir) throws IOException, TransformerException {
 
-        File pdfFile = this.createDefaultFile("JabRef_writeSingle.pdf");
+        Path pdfFile = this.createDefaultFile("JabRef_writeSingle.pdf", tempDir);
 
         // read a bib entry from the tests before
         BibEntry entry = vapnik2000;
@@ -105,14 +105,14 @@ public void testWriteXmp() throws IOException, TransformerException {
         entry.setId("ID4711");
 
         // write the changed bib entry to the create PDF
-        XmpUtilWriter.writeXmp(pdfFile.getAbsolutePath(), entry, null, xmpPreferences);
+        XmpUtilWriter.writeXmp(pdfFile.toAbsolutePath().toString(), entry, null, xmpPreferences);
 
         // read entry again
-        List<BibEntry> entriesWritten = XmpUtilReader.readXmp(pdfFile.getPath(), xmpPreferences);
+        List<BibEntry> entriesWritten = XmpUtilReader.readXmp(pdfFile.toAbsolutePath().toString(), xmpPreferences);
         BibEntry entryWritten = entriesWritten.get(0);
 
         // compare the two entries
-        Assert.assertEquals(entry, entryWritten);
+        assertEquals(entry, entryWritten);
 
     }
 
@@ -120,26 +120,26 @@ public void testWriteXmp() throws IOException, TransformerException {
      * Test, which writes multiple metadata entries to a PDF and reads them again to test the size.
      */
     @Test
-    public void testWriteMultipleBibEntries() throws IOException, TransformerException {
+    void testWriteMultipleBibEntries(@TempDirectory.TempDir Path tempDir) throws IOException, TransformerException {
 
-        File pdfFile = this.createDefaultFile("JabRef_writeMultiple.pdf");
+        Path pdfFile = this.createDefaultFile("JabRef_writeMultiple.pdf", tempDir);
 
         List<BibEntry> entries = Arrays.asList(olly2018, vapnik2000, toral2006);
 
-        XmpUtilWriter.writeXmp(Paths.get(pdfFile.getAbsolutePath()), entries, null, xmpPreferences);
+        XmpUtilWriter.writeXmp(Paths.get(pdfFile.toAbsolutePath().toString()), entries, null, xmpPreferences);
 
-        List<BibEntry> entryList = XmpUtilReader.readXmp(Paths.get(pdfFile.getAbsolutePath()), xmpPreferences);
-        Assert.assertEquals(3, entryList.size());
+        List<BibEntry> entryList = XmpUtilReader.readXmp(Paths.get(pdfFile.toAbsolutePath().toString()), xmpPreferences);
+        assertEquals(3, entryList.size());
 
     }
 
-    private File createDefaultFile(String fileName) throws IOException {
+    private Path createDefaultFile(String fileName, Path tempDir) throws IOException {
         // create a default PDF
-        File pdfFile = tempFolder.newFile(fileName);
+        Path pdfFile = tempDir.resolve(fileName);
         try (PDDocument pdf = new PDDocument()) {
             // Need a single page to open in Acrobat
             pdf.addPage(new PDPage());
-            pdf.save(pdfFile.getPath());
+            pdf.save(pdfFile.toAbsolutePath().toString());
         }
 
         return pdfFile;
diff --git a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
index be1d34e8f39..0b7128da0da 100644
--- a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
+++ b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
@@ -12,7 +12,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class PreferencesMigrationsTest {
+class PreferencesMigrationsTest {
 
     private JabRefPreferences prefs;
     private Preferences mainPrefsNode;
@@ -23,14 +23,14 @@ public class PreferencesMigrationsTest {
                                                             "[bibtexkey] - [fulltitle]"};
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         prefs = mock(JabRefPreferences.class);
         mainPrefsNode = mock(Preferences.class);
 
     }
 
     @Test
-    public void testOldStyleBibtexkeyPattern0() {
+    void testOldStyleBibtexkeyPattern0() {
         when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(oldStylePatterns[0]);
         when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null)).thenReturn(oldStylePatterns[0]);
         when(prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(true);
@@ -43,7 +43,7 @@ public void testOldStyleBibtexkeyPattern0() {
     }
 
     @Test
-    public void testOldStyleBibtexkeyPattern1() {
+    void testOldStyleBibtexkeyPattern1() {
 
         when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(oldStylePatterns[1]);
         when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null)).thenReturn(oldStylePatterns[1]);
@@ -57,7 +57,7 @@ public void testOldStyleBibtexkeyPattern1() {
     }
 
     @Test
-    public void testArbitraryBibtexkeyPattern() {
+    void testArbitraryBibtexkeyPattern() {
         String arbitraryPattern = "[anyUserPrividedString]";
 
         when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(arbitraryPattern);
@@ -71,7 +71,7 @@ public void testArbitraryBibtexkeyPattern() {
     }
 
     @Test
-    public void testPreviewStyle() {
+    void testPreviewStyle() {
         String oldPreviewStyle = "<font face=\"sans-serif\">"
                                  + "<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>"
                                  + "\\end{bibtexkey}</b><br>__NEWLINE__"
diff --git a/src/test/java/org/jabref/model/EntryTypesTest.java b/src/test/java/org/jabref/model/EntryTypesTest.java
index 019ca85d04d..d58cc7ff904 100644
--- a/src/test/java/org/jabref/model/EntryTypesTest.java
+++ b/src/test/java/org/jabref/model/EntryTypesTest.java
@@ -5,6 +5,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BiblatexEntryTypes;
@@ -14,40 +15,46 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.IEEETranEntryTypes;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@RunWith(Parameterized.class)
-public class EntryTypesTest {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
-    private final BibDatabaseMode mode;
-    private final BibDatabaseMode otherMode;
-    private final EntryType standardArticleType;
-    private final EntryType defaultType;
+class EntryTypesTest {
 
     private CustomEntryType newCustomType;
     private CustomEntryType overwrittenStandardType;
 
-    public EntryTypesTest(BibDatabaseMode mode) {
-        this.mode = mode;
-        this.otherMode = (mode == BibDatabaseMode.BIBLATEX) ? BibDatabaseMode.BIBTEX : BibDatabaseMode.BIBLATEX;
-        this.standardArticleType = (mode == BibDatabaseMode.BIBLATEX) ? BiblatexEntryTypes.ARTICLE : BibtexEntryTypes.ARTICLE;
-        this.defaultType = (mode == BibDatabaseMode.BIBLATEX) ? BiblatexEntryTypes.MISC : BibtexEntryTypes.MISC;
+    private static Stream<Object> mode() {
+        return Stream.of(BibDatabaseMode.BIBTEX, BibDatabaseMode.BIBLATEX);
     }
 
-    @Parameterized.Parameters
-    public static Object[] data() {
-        return new Object[] {BibDatabaseMode.BIBTEX, BibDatabaseMode.BIBLATEX};
+    private static Stream<Arguments> defaultTypeAndMode() {
+        return Stream.of(
+                Arguments.of(BiblatexEntryTypes.MISC, BibDatabaseMode.BIBLATEX),
+                Arguments.of(BibtexEntryTypes.MISC, BibDatabaseMode.BIBTEX));
     }
 
-    @Before
-    public void setUp() {
+    private static Stream<Arguments> modeAndOtherMode() {
+        return Stream.of(
+                Arguments.of(BibDatabaseMode.BIBTEX, BibDatabaseMode.BIBLATEX),
+                Arguments.of(BibDatabaseMode.BIBLATEX, BibDatabaseMode.BIBTEX));
+    }
+
+    private static Stream<Arguments> standardArticleTypeAndMode() {
+        return Stream.of(
+                Arguments.of(BiblatexEntryTypes.ARTICLE, BibDatabaseMode.BIBLATEX),
+                Arguments.of(BibtexEntryTypes.ARTICLE, BibDatabaseMode.BIBTEX));
+    }
+
+    @BeforeEach
+    void setUp() {
         newCustomType = new CustomEntryType("customType", "required", "optional");
         List<String> newRequiredFields = new ArrayList<>(BibtexEntryTypes.ARTICLE.getRequiredFields());
         newRequiredFields.add("additional");
@@ -55,13 +62,13 @@ public void setUp() {
                 Collections.singletonList("optional"));
     }
 
-    @After
-    public void tearDown() {
+    @AfterEach
+    void tearDown() {
         EntryTypes.removeAllCustomEntryTypes();
     }
 
     @Test
-    public void assertDefaultValuesBibtex() {
+    void assertDefaultValuesBibtex() {
         List<EntryType> sortedDefaultType = new ArrayList<>(BibtexEntryTypes.ALL);
         sortedDefaultType.addAll(IEEETranEntryTypes.ALL);
         Collections.sort(sortedDefaultType);
@@ -73,7 +80,7 @@ public void assertDefaultValuesBibtex() {
     }
 
     @Test
-    public void assertDefaultValuesBiblatex() {
+    void assertDefaultValuesBiblatex() {
         List<EntryType> sortedDefaultType = new ArrayList<>(BiblatexEntryTypes.ALL);
         Collections.sort(sortedDefaultType);
 
@@ -83,78 +90,91 @@ public void assertDefaultValuesBiblatex() {
         assertEquals(sortedDefaultType, sortedEntryTypes);
     }
 
-    @Test
-    public void unknownTypeIsNotFound() {
+    @ParameterizedTest
+    @MethodSource("mode")
+    void unknownTypeIsNotFound(BibDatabaseMode mode) {
         assertEquals(Optional.empty(), EntryTypes.getType("aaaaarticle", mode));
         assertEquals(Optional.empty(), EntryTypes.getStandardType("aaaaarticle", mode));
     }
 
-    @Test
-    public void unknownTypeIsConvertedToMiscByGetTypeOrDefault() {
+    @ParameterizedTest
+    @MethodSource("defaultTypeAndMode")
+    void unknownTypeIsConvertedToMiscByGetTypeOrDefault(EntryType defaultType, BibDatabaseMode mode) {
         assertEquals(defaultType, EntryTypes.getTypeOrDefault("unknowntype", mode));
     }
 
-    @Test
-    public void registerCustomEntryType() {
+    @ParameterizedTest
+    @MethodSource("mode")
+    void registerCustomEntryType(BibDatabaseMode mode) {
         EntryTypes.addOrModifyCustomEntryType(newCustomType, mode);
         assertEquals(Optional.of(newCustomType), EntryTypes.getType("customType", mode));
     }
 
-    @Test
-    public void registeredCustomEntryTypeIsContainedInListOfCustomizedEntryTypes() {
+    @ParameterizedTest
+    @MethodSource("mode")
+    void registeredCustomEntryTypeIsContainedInListOfCustomizedEntryTypes(BibDatabaseMode mode) {
         EntryTypes.addOrModifyCustomEntryType(newCustomType, mode);
         assertEquals(Arrays.asList(newCustomType), EntryTypes.getAllCustomTypes(mode));
     }
 
-    @Test
-    public void registerCustomEntryTypeDoesNotAffectOtherMode() {
+    @ParameterizedTest
+    @MethodSource("modeAndOtherMode")
+    void registerCustomEntryTypeDoesNotAffectOtherMode(BibDatabaseMode mode, BibDatabaseMode otherMode) {
         EntryTypes.addOrModifyCustomEntryType(newCustomType, mode);
         assertFalse(EntryTypes.getAllValues(otherMode).contains(newCustomType));
     }
 
-    @Test
-    public void overwriteCustomEntryTypeFields() {
+    @ParameterizedTest
+    @MethodSource("mode")
+    void overwriteCustomEntryTypeFields(BibDatabaseMode mode) {
         EntryTypes.addOrModifyCustomEntryType(newCustomType, mode);
         CustomEntryType newCustomEntryTypeAuthorRequired = new CustomEntryType("customType", FieldName.AUTHOR, "optional");
         EntryTypes.addOrModifyCustomEntryType(newCustomEntryTypeAuthorRequired, mode);
         assertEquals(Optional.of(newCustomEntryTypeAuthorRequired), EntryTypes.getType("customType", mode));
     }
 
-    @Test
-    public void overwriteStandardTypeRequiredFields() {
+    @ParameterizedTest
+    @MethodSource("mode")
+    void overwriteStandardTypeRequiredFields(BibDatabaseMode mode) {
         EntryTypes.addOrModifyCustomEntryType(overwrittenStandardType, mode);
         assertEquals(Optional.of(overwrittenStandardType), EntryTypes.getType(overwrittenStandardType.getName(), mode));
     }
 
-    @Test
-    public void registeredCustomizedStandardEntryTypeIsContainedInListOfCustomizedEntryTypes() {
+    @ParameterizedTest
+    @MethodSource("mode")
+    void registeredCustomizedStandardEntryTypeIsContainedInListOfCustomizedEntryTypes(BibDatabaseMode mode) {
         EntryTypes.addOrModifyCustomEntryType(overwrittenStandardType, mode);
         assertEquals(Arrays.asList(overwrittenStandardType), EntryTypes.getAllModifiedStandardTypes(mode));
     }
 
 
-    @Test
-    public void standardTypeIsStillAcessibleIfOverwritten() {
+    @ParameterizedTest
+    @MethodSource("standardArticleTypeAndMode")
+    void standardTypeIsStillAcessibleIfOverwritten(EntryType standardArticleType, BibDatabaseMode mode) {
         EntryTypes.addOrModifyCustomEntryType(overwrittenStandardType, mode);
         assertEquals(Optional.of(standardArticleType), EntryTypes.getStandardType(overwrittenStandardType.getName(), mode));
     }
 
-    @Test
-    public void standardTypeIsRestoredAfterDeletionOfOverwrittenType() {
+    @ParameterizedTest
+    @MethodSource("standardArticleTypeAndMode")
+    void standardTypeIsRestoredAfterDeletionOfOverwrittenType(EntryType standardArticleType, BibDatabaseMode mode) {
         EntryTypes.addOrModifyCustomEntryType(overwrittenStandardType, mode);
         EntryTypes.removeType(overwrittenStandardType.getName(), mode);
         assertEquals(Optional.of(standardArticleType), EntryTypes.getType(overwrittenStandardType.getName(), mode));
     }
 
-    @Test
-    public void standardTypeCannotBeRemoved() {
+    @ParameterizedTest
+    @MethodSource("standardArticleTypeAndMode")
+    void standardTypeCannotBeRemoved(EntryType standardArticleType, BibDatabaseMode mode) {
         EntryTypes.removeType(standardArticleType.getName(), mode);
         assertEquals(Optional.of(standardArticleType), EntryTypes.getType(standardArticleType.getName(), mode));
     }
 
-    @Test
-    public void overwriteStandardTypeRequiredFieldsDoesNotAffectOtherMode() {
+    @ParameterizedTest
+    @MethodSource("modeAndOtherMode")
+    void overwriteStandardTypeRequiredFieldsDoesNotAffectOtherMode(BibDatabaseMode mode, BibDatabaseMode otherMode) {
         EntryTypes.addOrModifyCustomEntryType(overwrittenStandardType, mode);
         assertFalse(EntryTypes.getAllValues(otherMode).contains(overwrittenStandardType));
     }
+
 }
diff --git a/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java b/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java
index 328c1c37905..ee1d3d5defc 100644
--- a/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java
@@ -1,50 +1,40 @@
 package org.jabref.model.entry;
 
 import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import static org.junit.Assert.assertEquals;
 
-@RunWith(Parameterized.class)
 public class AuthorListParameterTest {
 
-    @Parameter(value = 0)
-    public String authorsString;
-
-    @Parameter(value = 1)
-    public AuthorList authorsParsed;
-
-
-    @Parameters(name = "{index}: parse({0})={1}")
-    public static Collection<Object[]> data() {
-
-        return Arrays.asList(new Object[][] {
-            {"王, 军", authorList(new Author("军", "军.", null, "王", null))},
-            { "Doe, John", authorList(new Author("John", "J.", null, "Doe", null)) },
-            { "von Berlichingen zu Hornberg, Johann Gottfried",
-                    authorList(new Author("Johann Gottfried", "J. G.", "von", "Berlichingen zu Hornberg", null)) },
-            //{ "Robert and Sons, Inc.", authorList(new Author(null, null, null, "Robert and Sons, Inc.", null)) },
-                //{ "al-Ṣāliḥ, Abdallāh", authorList(new Author("Abdallāh", "A.", null, "al-Ṣāliḥ", null)) },
-                {"de la Vallée Poussin, Jean Charles Gabriel",
-                        authorList(new Author("Jean Charles Gabriel", "J. C. G.", "de la", "Vallée Poussin", null))},
-                {"de la Vallée Poussin, J. C. G.",
-                        authorList(new Author("J. C. G.", "J. C. G.", "de la", "Vallée Poussin", null))},
-            { "{K}ent-{B}oswell, E. S.", authorList(new Author("E. S.", "E. S.", null, "{K}ent-{B}oswell", null)) },
-        });
+    private static Stream<Arguments> data() {
+
+        return Stream.of(
+                Arguments.of("王, 军", authorList(new Author("军", "军.", null, "王", null))),
+                Arguments.of("Doe, John", authorList(new Author("John", "J.", null, "Doe", null))),
+                Arguments.of("von Berlichingen zu Hornberg, Johann Gottfried",
+                        authorList(new Author("Johann Gottfried", "J. G.", "von", "Berlichingen zu Hornberg", null))),
+                //Arguments.of("Robert and Sons, Inc.", authorList(new Author(null, null, null, "Robert and Sons, Inc.", null))),
+                //Arguments.of("al-Ṣāliḥ, Abdallāh", authorList(new Author("Abdallāh", "A.", null, "al-Ṣāliḥ", null))),
+                Arguments.of("de la Vallée Poussin, Jean Charles Gabriel",
+                        authorList(new Author("Jean Charles Gabriel", "J. C. G.", "de la", "Vallée Poussin", null))),
+                Arguments.of("de la Vallée Poussin, J. C. G.",
+                        authorList(new Author("J. C. G.", "J. C. G.", "de la", "Vallée Poussin", null))),
+                Arguments.of("{K}ent-{B}oswell, E. S.", authorList(new Author("E. S.", "E. S.", null, "{K}ent-{B}oswell", null))));
     }
 
-    public static AuthorList authorList(Author author) {
+    private static AuthorList authorList(Author author) {
         return new AuthorList(Arrays.asList(author));
     }
 
-    @Test
-    public void parseCorrectly() {
+    @ParameterizedTest
+    @MethodSource("data")
+    void parseCorrectly(String authorsString, AuthorList authorsParsed) {
         AuthorListParser parser = new AuthorListParser();
         assertEquals(authorsParsed, parser.parse(authorsString));
     }

From 14d45cee2e53af1a55935e8e87f23784bcb0fa08 Mon Sep 17 00:00:00 2001
From: Abraham Polk <abepolk@gmail.com>
Date: Fri, 17 Aug 2018 11:31:11 -0400
Subject: [PATCH 043/229] Pin errorprone dependency to specific version

---
 build.gradle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5a5c8308e80..a2bb79c7f76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -86,6 +86,7 @@ repositories {
 configurations {
     antlr3
     antlr4
+    errorprone
 }
 
 dependencies {
@@ -157,6 +158,8 @@ dependencies {
 
     compile 'com.github.tomtung:latex2unicode_2.12:0.2.2'
 
+    errorprone 'com.google.errorprone:error_prone_core:2.3.1'
+
     compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.1.2'
     compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.1.2'
 
@@ -220,7 +223,7 @@ dependencyUpdates.resolutionStrategy = {
                 selection.reject("http://dev.mysql.com/downloads/connector/j/ lists the version 5.* as last stable version.")
             }
         }
-        
+
     }
 }
 

From 6e279228bad2fbe54f20a8fcebf2a8b7cb9415ef Mon Sep 17 00:00:00 2001
From: Super-Tang <36810099+Super-Tang@users.noreply.github.com>
Date: Mon, 20 Aug 2018 04:06:50 +0800
Subject: [PATCH 044/229] Fix for issue 3861 : Preferences Dialog to javafx
 (#4253)

* Convert swing dialog to JavaFx

* convert the swing dialog to javafx

* Change the code style to meet the standard

* Update CHANGELOG.md

* Update SaveOrderConfigDisplay.java

* Merge the latest commits

* Merge the latest commits

* merge the latest commits

* Polish the code style

* resolve the conficts

* polish the code style

* reslove the conflicts

* resolve the conflict

* Change the CHANGELOG.md

* polish the code style

* polish the code style

* Modify the code to make test-suite pass

* polish the code style

* Beautify the option panes

* Polish the code style

* Merge the latest commits

* merge the latest commits

* Merge the latest commits

* Polish the code style

* Polish the code style

* Polish the code style

* Polish the code style

* Beautify the dialog

* Simplify the long method in PreferencesDialog.java

* Polish the code style

* Polish the code style

* Merge the latest commits

* Change Integer.parseInt to Double.parseDouble

* Change the font size of several labels

* fix a bug regarding the storeing of settings

* fix the code style

* Fix NullPointerException in settings for External Applications

* Polish code style

* Add a row

* Fix NullPointerException in settings for External Application

* push again to make test pass

* Push again to make test pass

* push again to make test pass

* Push again to make test pass

* Push again to make test pass

* Update JabRefGUI.java

* Update JabRefGUI.java

* correct the wrong label name in settings for external Application

* remove the duplicates and cleanup the code

* remove unused imports

* remove the duplicates in SaveOrderConfigDisplay.java

* remove the unused imports in SaveOrderConfigDisplay.java

* Change the return type to Interface Type

* Change to lambda expression

* cleanup the code

* Merge latest commits

* remove the Swing contron in BibtexKeyPatternPanel

* Code style :(
---
 CHANGELOG.md                                  |   1 +
 build.gradle                                  |  26 +-
 src/main/java/org/jabref/JabRefGUI.java       |  20 +-
 src/main/java/org/jabref/gui/BasePanel.java   |  82 +-
 .../java/org/jabref/gui/ReplaceString.fxml    |   2 +-
 .../jabref/gui/SaveOrderConfigDisplay.java    | 103 +--
 .../BibtexKeyPatternDialog.java               |   7 +-
 .../BibtexKeyPatternPanel.java                | 207 ++---
 .../DatabasePropertiesDialog.java             |   8 +-
 .../gui/exporter/SaveDatabaseAction.java      |  14 +-
 .../gui/fieldeditors/EditorTextArea.java      |   4 +-
 .../jabref/gui/fieldeditors/UrlEditor.java    |   7 +-
 .../LinkedFilesEditDialogViewModel.java       |   6 +-
 .../org/jabref/gui/preftabs/AdvancedTab.java  | 153 ++--
 .../gui/preftabs/AppearancePrefsTab.java      |  29 +-
 .../gui/preftabs/BibtexKeyPatternPrefTab.java | 121 ++-
 .../gui/preftabs/EntryEditorPrefsTab.java     | 227 +++---
 .../gui/preftabs/ExportSortingPrefsTab.java   |  95 ++-
 .../org/jabref/gui/preftabs/ExternalTab.java  | 295 ++++----
 .../java/org/jabref/gui/preftabs/FileTab.java | 279 ++++---
 .../org/jabref/gui/preftabs/FontSize.java     |  11 +
 .../org/jabref/gui/preftabs/GeneralTab.java   | 272 ++++---
 .../jabref/gui/preftabs/GroupsPrefsTab.java   | 137 ++--
 .../gui/preftabs/ImportSettingsTab.java       | 196 +++--
 .../jabref/gui/preftabs/NameFormatterTab.java | 330 +++-----
 .../org/jabref/gui/preftabs/NetworkTab.java   | 149 ++--
 .../gui/preftabs/PreferencesDialog.java       | 314 ++++----
 .../jabref/gui/preftabs/PreviewPrefsTab.java  | 196 +++--
 .../jabref/gui/preftabs/TableColumnsTab.java  | 711 +++++++-----------
 .../jabref/gui/preftabs/TablePrefsTab.java    | 297 ++++----
 .../org/jabref/gui/preftabs/XmpPrefsTab.java  | 274 +++----
 .../gui/push/PushToApplicationSettings.java   |  59 +-
 .../push/PushToApplicationSettingsDialog.java |   4 +-
 .../jabref/gui/push/PushToApplications.java   |   1 -
 .../jabref/gui/push/PushToEmacsSettings.java  |  12 +-
 .../jabref/gui/push/PushToVimSettings.java    |   4 +-
 .../java/org/jabref/gui/util/ThemeLoader.java |   2 +-
 .../bibtexfields/CleanupURLFormatter.java     |   3 +-
 src/main/resources/l10n/JabRef_zh.properties  |   2 -
 src/test/resources/log4j2-test.xml            |   2 +-
 40 files changed, 2087 insertions(+), 2575 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/preftabs/FontSize.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d5bd75123e..2c74df57dea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -132,3 +132,4 @@ The changelog of JabRef 2.11 and all previous versions is available as [text fil
 [4.0-beta]: https://github.com/JabRef/jabref/compare/v3.8.2...v4.0-beta
 [2.11.1]: https://github.com/JabRef/jabref/compare/v2.11...v2.11.1
 [JavaFX]: https://en.wikipedia.org/wiki/JavaFX
+
diff --git a/build.gradle b/build.gradle
index a2bb79c7f76..a493ae0bca1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -205,12 +205,12 @@ dependencyUpdates.resolutionStrategy = {
         }
         rules.withModule("org.controlsfx:controlsfx") { ComponentSelection selection ->
             if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher
-                 selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9")
+                selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9")
             }
         }
         rules.withModule("com.github.tomtung:latex2unicode_2.12") { ComponentSelection selection ->
             if (selection.candidate.version ==~ /0.2.2/) { // Reject version higher than 2.0.2
-                 selection.reject("Cannot be updated to 0.2.4 until JabRef is prepared for it")
+                selection.reject("Cannot be updated to 0.2.4 until JabRef is prepared for it")
             }
         }
         rules.withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection ->
@@ -505,16 +505,16 @@ jmh {
 
 // Source: https://stackoverflow.com/a/44168582/873282
 task downloadDependencies {
-  description "Pre-downloads *most* dependencies"
-  doLast {
-    configurations.getAsMap().each { name, config ->
-      println "Retrieving dependencies for $name"
-      try {
-        config.files
-      } catch (e) {
-        // some cannot be resolved, just log them
-        project.logger.info e.message
-      }
+    description "Pre-downloads *most* dependencies"
+    doLast {
+        configurations.getAsMap().each { name, config ->
+            println "Retrieving dependencies for $name"
+            try {
+                config.files
+            } catch (e) {
+                // some cannot be resolved, just log them
+                project.logger.info e.message
+            }
+        }
     }
-  }
 }
diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
index dc03333b7bf..84ea60e87cb 100644
--- a/src/main/java/org/jabref/JabRefGUI.java
+++ b/src/main/java/org/jabref/JabRefGUI.java
@@ -54,10 +54,10 @@ public JabRefGUI(Stage mainStage, List<ParserResult> argsDatabases, boolean isBl
 
         // passed file (we take the first one) should be focused
         focusedFile = argsDatabases.stream()
-                                   .findFirst()
-                                   .flatMap(ParserResult::getFile)
-                                   .map(File::getAbsolutePath)
-                                   .orElse(Globals.prefs.get(JabRefPreferences.LAST_FOCUSED));
+                                    .findFirst()
+                                    .flatMap(ParserResult::getFile)
+                                    .map(File::getAbsolutePath)
+                                    .orElse(Globals.prefs.get(JabRefPreferences.LAST_FOCUSED));
 
         openWindow(mainStage);
         JabRefGUI.checkForNewVersion(false);
@@ -109,15 +109,15 @@ private void openWindow(Stage mainStage) {
                     try {
                         new SharedDatabaseUIManager(mainFrame).openSharedDatabaseFromParserResult(pr);
                     } catch (SQLException | DatabaseNotSupportedException | InvalidDBMSConnectionPropertiesException |
-                             NotASharedDatabaseException e) {
+                            NotASharedDatabaseException e) {
                         pr.getDatabaseContext().clearDatabaseFile(); // do not open the original file
                         pr.getDatabase().clearSharedDatabaseID();
 
                         LOGGER.error("Connection error", e);
                         dialogService.showErrorDialogAndWait(
-                                                             Localization.lang("Connection error"),
-                                                             Localization.lang("A local copy will be opened."),
-                                                             e);
+                                Localization.lang("Connection error"),
+                                Localization.lang("A local copy will be opened."),
+                                e);
                     }
                     toOpenTab.add(pr);
                 } else if (pr.toOpenTab()) {
@@ -166,7 +166,7 @@ private void openWindow(Stage mainStage) {
 
         for (ParserResult pr : failed) {
             String message = Localization.lang("Error opening file '%0'.", pr.getFile().get().getName()) + "\n"
-                             + pr.getErrorMessage();
+                    + pr.getErrorMessage();
 
             dialogService.showErrorDialogAndWait(Localization.lang("Error opening file"), message);
 
@@ -223,7 +223,7 @@ private void openLastEditedDatabases() {
             }
 
             ParserResult parsedDatabase = OpenDatabase.loadDatabase(fileName,
-                                                                    Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
+                    Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
 
             if (parsedDatabase.isEmpty()) {
                 LOGGER.error(Localization.lang("Error opening file") + " '" + dbFile.getPath() + "'");
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 3ed33579d80..306939d3ace 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -396,33 +396,33 @@ private void setupActions() {
         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));
         });
@@ -516,9 +516,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."));
@@ -550,8 +550,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()) {
@@ -595,7 +595,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;
@@ -685,7 +685,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset encoding,
         final String SAVE_DATABASE = Localization.lang("Save library");
         try {
             SavePreferences prefs = Globals.prefs.loadForSaveFromPreferences()
-                                                 .withEncoding(encoding)
+                    .withEncoding(encoding)
                     .withSaveType(saveType);
             BibtexDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(
                     FileSaveSession::new);
@@ -718,7 +718,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset encoding,
         boolean commit = true;
         if (!session.getWriter().couldEncodeAll()) {
             FormBuilder builder = FormBuilder.create()
-                                             .layout(new FormLayout("left:pref, 4dlu, fill:pref", "pref, 4dlu, pref"));
+                    .layout(new FormLayout("left:pref, 4dlu, fill:pref", "pref, 4dlu, pref"));
             JTextArea ta = new JTextArea(session.getWriter().getProblemCharacters());
             ta.setEditable(false);
             builder.add(Localization.lang("The chosen encoding '%0' could not encode the following characters:", session.getEncoding().displayName())).xy(1, 1);
@@ -867,12 +867,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
         /*
@@ -962,8 +962,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));
     }
 
     /**
@@ -1093,9 +1093,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);
@@ -1259,11 +1259,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;
         }
@@ -1303,9 +1303,9 @@ 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());
@@ -1600,18 +1600,18 @@ public void action() {
                     List<LinkedFile> files = bes.get(0).getFiles();
 
                     Optional<LinkedFile> linkedFile = files.stream()
-                                                           .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
-                                                                   || FieldName.PS.equalsIgnoreCase(file.getFileType())
-                                                                   || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
-                                                           .findFirst();
+                            .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
+                                    || FieldName.PS.equalsIgnoreCase(file.getFileType())
+                                    || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
+                            .findFirst();
 
                     if (linkedFile.isPresent()) {
 
                         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/ReplaceString.fxml b/src/main/java/org/jabref/gui/ReplaceString.fxml
index 3bf75a8f8a2..7d1c6a3488b 100644
--- a/src/main/java/org/jabref/gui/ReplaceString.fxml
+++ b/src/main/java/org/jabref/gui/ReplaceString.fxml
@@ -36,7 +36,7 @@
                             <TextField fx:id="replaceField" GridPane.columnIndex="1" GridPane.rowIndex="2"
                                        GridPane.columnSpan="4"/>
                             <CheckBox fx:id="selectFieldOnly" GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.columnSpan="2"
-                                     text="%Limit to Selected Entries"/>
+                                      text="%Limit to Selected Entries"/>
                             <RadioButton fx:id="allReplace" GridPane.columnIndex="0" GridPane.rowIndex="5" GridPane.columnSpan="2"
                                          selected="true" text="%All Field Replace">
                                 <toggleGroup>
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
index a2d8d023174..c55dd92fd35 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
@@ -1,32 +1,32 @@
 package org.jabref.gui;
 
-import java.awt.Component;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JPanel;
+import javafx.collections.FXCollections;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.layout.GridPane;
+import javafx.scene.text.Font;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.model.metadata.SaveOrderConfig;
 
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
 public class SaveOrderConfigDisplay {
 
-    private JPanel panel;
-    private JComboBox<String> savePriSort;
-    private JComboBox<String> saveSecSort;
-    private JComboBox<String> saveTerSort;
-    private JCheckBox savePriDesc;
-    private JCheckBox saveSecDesc;
-    private JCheckBox saveTerDesc;
+    private GridPane panel;
+    private ComboBox<String> savePriSort;
+    private ComboBox<String> saveSecSort;
+    private ComboBox<String> saveTerSort;
+    private CheckBox savePriDesc;
+    private CheckBox saveSecDesc;
+    private CheckBox saveTerDesc;
 
 
     public SaveOrderConfigDisplay() {
@@ -37,57 +37,60 @@ private void init() {
         List<String> fieldNames = InternalBibtexFields.getAllPublicFieldNames();
         fieldNames.add(BibEntry.KEY_FIELD);
         Collections.sort(fieldNames);
-        String[] allPlusKey = fieldNames.toArray(new String[fieldNames.size()]);
-        savePriSort = new JComboBox<>(allPlusKey);
+        savePriSort = new ComboBox<>(FXCollections.observableArrayList(fieldNames));
         savePriSort.setEditable(true);
-        saveSecSort = new JComboBox<>(allPlusKey);
+        saveSecSort = new ComboBox<>(FXCollections.observableArrayList(fieldNames));
         saveSecSort.setEditable(true);
-        saveTerSort = new JComboBox<>(allPlusKey);
+        saveTerSort = new ComboBox<>(FXCollections.observableArrayList(fieldNames));
         saveTerSort.setEditable(true);
 
-        savePriDesc = new JCheckBox(Localization.lang("Descending"));
-        saveSecDesc = new JCheckBox(Localization.lang("Descending"));
-        saveTerDesc = new JCheckBox(Localization.lang("Descending"));
-
-        FormLayout layout = new FormLayout("right:pref, 8dlu, fill:pref, 4dlu, fill:60dlu, 4dlu, left:pref",
-                "pref, 2dlu, pref, 2dlu, pref");
-        FormBuilder builder = FormBuilder.create().layout(layout);
-        builder.add(Localization.lang("Primary sort criterion")).xy(1, 1);
-        builder.add(savePriSort).xy(3, 1);
-        builder.add(savePriDesc).xy(5, 1);
-
-        builder.add(Localization.lang("Secondary sort criterion")).xy(1, 3);
-        builder.add(saveSecSort).xy(3, 3);
-        builder.add(saveSecDesc).xy(5, 3);
-
-        builder.add(Localization.lang("Tertiary sort criterion")).xy(1, 5);
-        builder.add(saveTerSort).xy(3, 5);
-        builder.add(saveTerDesc).xy(5, 5);
-
-        panel = builder.build();
+        savePriDesc = new CheckBox(Localization.lang("Descending"));
+        saveSecDesc = new CheckBox(Localization.lang("Descending"));
+        saveTerDesc = new CheckBox(Localization.lang("Descending"));
+
+        Font font = new Font(10);
+        GridPane builder = new GridPane();
+        Label primarySortCriterion = new Label(Localization.lang("Primary sort criterion"));
+        primarySortCriterion.setFont(font);
+        builder.add(primarySortCriterion, 1, 1);
+        builder.add(savePriSort, 2, 1);
+        builder.add(savePriDesc, 3, 1);
+
+        Label secondarySortCriterion = new Label(Localization.lang("Secondary sort criterion"));
+        secondarySortCriterion.setFont(font);
+        builder.add(secondarySortCriterion, 1, 2);
+        builder.add(saveSecSort, 2, 2);
+        builder.add(saveSecDesc, 3, 2);
+
+        Label tertiarySortCriterion = new Label(Localization.lang("Tertiary sort criterion"));
+        tertiarySortCriterion.setFont(font);
+        builder.add(tertiarySortCriterion, 1, 3);
+        builder.add(saveTerSort, 2, 3);
+        builder.add(saveTerDesc, 3, 3);
+        panel = builder;
     }
 
-    public Component getPanel() {
+    public Node getJFXPanel() {
         return panel;
     }
 
     public void setEnabled(boolean enabled) {
-        savePriSort.setEnabled(enabled);
-        savePriDesc.setEnabled(enabled);
-        saveSecSort.setEnabled(enabled);
-        saveSecDesc.setEnabled(enabled);
-        saveTerSort.setEnabled(enabled);
-        saveTerDesc.setEnabled(enabled);
+        savePriSort.setDisable(!enabled);
+        savePriDesc.setDisable(!enabled);
+        saveSecSort.setDisable(!enabled);
+        saveSecDesc.setDisable(!enabled);
+        saveTerSort.setDisable(!enabled);
+        saveTerDesc.setDisable(!enabled);
     }
 
     public void setSaveOrderConfig(SaveOrderConfig saveOrderConfig) {
         Objects.requireNonNull(saveOrderConfig);
 
-        savePriSort.setSelectedItem(saveOrderConfig.sortCriteria[0].field);
+        savePriSort.setValue(saveOrderConfig.sortCriteria[0].field);
         savePriDesc.setSelected(saveOrderConfig.sortCriteria[0].descending);
-        saveSecSort.setSelectedItem(saveOrderConfig.sortCriteria[1].field);
+        saveSecSort.setValue(saveOrderConfig.sortCriteria[1].field);
         saveSecDesc.setSelected(saveOrderConfig.sortCriteria[1].descending);
-        saveTerSort.setSelectedItem(saveOrderConfig.sortCriteria[2].field);
+        saveTerSort.setValue(saveOrderConfig.sortCriteria[2].field);
         saveTerDesc.setSelected(saveOrderConfig.sortCriteria[2].descending);
 
     }
@@ -104,7 +107,7 @@ public SaveOrderConfig getSaveOrderConfig() {
         return saveOrderConfig;
     }
 
-    private String getSelectedItemAsLowerCaseTrim(JComboBox<String> sortBox) {
-        return sortBox.getSelectedItem().toString().toLowerCase(Locale.ROOT).trim();
+    private String getSelectedItemAsLowerCaseTrim(ComboBox<String> sortBox) {
+        return sortBox.getValue().toLowerCase(Locale.ROOT).trim();
     }
 }
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java
index 9b04361a327..7fc92b94f67 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java
@@ -13,9 +13,13 @@
 import javax.swing.JPanel;
 import javax.swing.WindowConstants;
 
+import javafx.embed.swing.JFXPanel;
+import javafx.scene.Scene;
+
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.JabRefDialog;
+import org.jabref.gui.customjfx.CustomJFXPanel;
 import org.jabref.gui.keyboard.KeyBinder;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.bibtexkeypattern.AbstractBibtexKeyPattern;
@@ -41,7 +45,8 @@ public BibtexKeyPatternDialog(BasePanel panel) {
 
     private void init() {
         getContentPane().setLayout(new BorderLayout());
-        getContentPane().add(bibtexKeyPatternPanel, BorderLayout.CENTER);
+        JFXPanel bibPanel = CustomJFXPanel.wrap(new Scene(bibtexKeyPatternPanel));
+        getContentPane().add(bibPanel, BorderLayout.CENTER);
 
         JButton ok = new JButton(Localization.lang("OK"));
         JButton cancel = new JButton(); // label of "cancel" is set later as the label is overwritten by assigning an action to the button
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
index 5d92dce5e62..35ce60b3592 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
@@ -1,26 +1,21 @@
 package org.jabref.gui.bibtexkeypattern;
 
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Font;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.Insets;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.preftabs.FontSize;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.EntryTypes;
@@ -31,21 +26,21 @@
 import org.jabref.model.entry.EntryType;
 import org.jabref.preferences.JabRefPreferences;
 
-public class BibtexKeyPatternPanel extends JPanel {
+public class BibtexKeyPatternPanel extends Pane {
 
     // used by both BibtexKeyPatternPanel and TabLabelPAttern
     protected final GridBagLayout gbl = new GridBagLayout();
     protected final GridBagConstraints con = new GridBagConstraints();
 
     // default pattern
-    protected final JTextField defaultPat = new JTextField();
-
+    protected final TextField defaultPat = new TextField();
     private final HelpAction help;
 
     // one field for each type
-    private final Map<String, JTextField> textFields = new HashMap<>();
+    private final Map<String, TextField> textFields = new HashMap<>();
+    private final TextField[] textFieldArray = new TextField[19];
     private final BasePanel panel;
-
+    private final GridPane gridPane = new GridPane();
 
     public BibtexKeyPatternPanel(BasePanel panel) {
         this.panel = panel;
@@ -54,53 +49,24 @@ public BibtexKeyPatternPanel(BasePanel panel) {
     }
 
     private void buildGUI() {
-        JPanel pan = new JPanel();
-        JScrollPane sp = new JScrollPane(pan);
-        sp.setPreferredSize(new Dimension(100, 100));
-        sp.setBorder(BorderFactory.createEmptyBorder());
-        pan.setLayout(gbl);
-        setLayout(gbl);
         // The header - can be removed
-        JLabel lblEntryType = new JLabel(Localization.lang("Entry type"));
-        Font f = new Font("plain", Font.BOLD, 12);
-        lblEntryType.setFont(f);
-        con.gridx = 0;
-        con.gridy = 0;
-        con.gridwidth = 1;
-        con.gridheight = 1;
-        con.fill = GridBagConstraints.VERTICAL;
-        con.anchor = GridBagConstraints.WEST;
-        con.insets = new Insets(5, 5, 10, 0);
-        gbl.setConstraints(lblEntryType, con);
-        pan.add(lblEntryType);
+        Label label = new Label(Localization.lang("Entry type"));
+        label.setFont(FontSize.smallFont);
+        gridPane.add(label, 1, 1);
 
-        JLabel lblKeyPattern = new JLabel(Localization.lang("Key pattern"));
-        lblKeyPattern.setFont(f);
-        con.gridx = 1;
-        con.gridy = 0;
-        con.gridheight = 1;
-        con.fill = GridBagConstraints.HORIZONTAL;
-        con.anchor = GridBagConstraints.WEST;
-        con.insets = new Insets(5, 5, 10, 5);
-        gbl.setConstraints(lblKeyPattern, con);
-        pan.add(lblKeyPattern);
+        Label keyPattern = new Label(Localization.lang("Key pattern"));
+        keyPattern.setFont(FontSize.smallFont);
+        gridPane.add(keyPattern, 3, 1);
 
-        con.gridy = 1;
-        con.gridx = 0;
-        JLabel lab = new JLabel(Localization.lang("Default pattern"));
-        gbl.setConstraints(lab, con);
-        pan.add(lab);
-        con.gridx = 1;
-        gbl.setConstraints(defaultPat, con);
-        pan.add(defaultPat);
-        con.insets = new Insets(5, 5, 10, 5);
-        JButton btnDefault = new JButton(Localization.lang("Default"));
-        btnDefault.addActionListener(
-                e -> defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
-        con.gridx = 2;
-        int y = 2;
-        gbl.setConstraints(btnDefault, con);
-        pan.add(btnDefault);
+        Label defaultPattern = new Label(Localization.lang("Default pattern"));
+        defaultPattern.setFont(FontSize.smallFont);
+        gridPane.add(defaultPattern, 1, 2);
+        gridPane.add(defaultPat, 3, 2);
+
+        Button button = new Button("Default");
+        button.setFont(FontSize.smallFont);
+        button.setOnAction(e-> defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
+        gridPane.add(button, 4, 2);
 
         BibDatabaseMode mode;
         // check mode of currently used DB
@@ -111,98 +77,50 @@ private void buildGUI() {
             mode = Globals.prefs.getDefaultBibDatabaseMode();
         }
 
+        addExtraText(mode);
+        int y = 0;
         for (EntryType type : EntryTypes.getAllValues(mode)) {
-            textFields.put(type.getName().toLowerCase(Locale.ROOT), addEntryType(pan, type, y));
+            textFields.put(type.getName().toLowerCase(Locale.ROOT), textFieldArray[y]);
             y++;
         }
 
-        con.fill = GridBagConstraints.BOTH;
-        con.gridx = 0;
-        con.gridy = 1;
-        con.gridwidth = 3;
-        con.weightx = 1;
-        con.weighty = 1;
-        gbl.setConstraints(sp, con);
-        add(sp);
-
-        // A help button
-        con.gridwidth = 1;
-        con.gridx = 1;
-        con.gridy = 2;
-        con.fill = GridBagConstraints.HORIZONTAL;
-        //
-        con.weightx = 0;
-        con.weighty = 0;
-        con.anchor = GridBagConstraints.SOUTHEAST;
-        con.insets = new Insets(0, 5, 0, 5);
-        JButton hlb = new JButton(IconTheme.JabRefIcons.HELP.getSmallIcon());
-        hlb.setToolTipText(Localization.lang("Help on key patterns"));
-        gbl.setConstraints(hlb, con);
-        add(hlb);
-        hlb.addActionListener(help);
+        Button help1 = new Button("?");
+        help1.setOnAction(e->new HelpAction(Localization.lang("Help on key patterns"), HelpFile.BIBTEX_KEY_PATTERN).getHelpButton().doClick());
+        gridPane.add(help1, 1, 24);
 
-        // And finally a button to reset everything
-        JButton btnDefaultAll = new JButton(Localization.lang("Reset all"));
-        con.gridx = 2;
-        con.gridy = 2;
-
-        con.weightx = 1;
-        con.weighty = 0;
-        con.anchor = GridBagConstraints.SOUTHEAST;
-        con.insets = new Insets(20, 5, 0, 5);
-        gbl.setConstraints(btnDefaultAll, con);
-        btnDefaultAll.addActionListener(e -> {
+        Button btnDefaultAll1 = new Button(Localization.lang("Reset all"));
+        btnDefaultAll1.setFont(FontSize.smallFont);
+        btnDefaultAll1.setOnAction(e-> {
             // reset all fields
-            for (JTextField field : textFields.values()) {
+            for (TextField field : textFieldArray) {
                 field.setText("");
             }
-
-            // also reset the default pattern
             defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN));
         });
-        add(btnDefaultAll);
+        gridPane.add(btnDefaultAll1, 3, 24);
     }
 
-    private JTextField addEntryType(Container c, EntryType type, int y) {
-
-        JLabel lab = new JLabel(type.getName());
-        con.gridx = 0;
-        con.gridy = y;
-        con.fill = GridBagConstraints.BOTH;
-        con.weightx = 0;
-        con.weighty = 0;
-        con.anchor = GridBagConstraints.WEST;
-        con.insets = new Insets(0, 5, 0, 5);
-        gbl.setConstraints(lab, con);
-        c.add(lab);
-
-        JTextField tf = new JTextField();
-        tf.setColumns(15);
-        con.gridx = 1;
-        con.fill = GridBagConstraints.HORIZONTAL;
-        con.weightx = 1;
-        con.weighty = 0;
-        con.anchor = GridBagConstraints.CENTER;
-        con.insets = new Insets(0, 5, 0, 5);
-        gbl.setConstraints(tf, con);
-        c.add(tf);
-
-        JButton but = new JButton(Localization.lang("Default"));
-        con.gridx = 2;
-        con.fill = GridBagConstraints.BOTH;
-        con.weightx = 0;
-        con.weighty = 0;
-        con.anchor = GridBagConstraints.CENTER;
-        con.insets = new Insets(0, 5, 0, 5);
-        gbl.setConstraints(but, con);
-        but.setActionCommand(type.getName().toLowerCase(Locale.ROOT));
-        but.addActionListener(e -> {
-            JTextField tField = textFields.get(e.getActionCommand());
-            tField.setText("");
-        });
-        c.add(but);
-
-        return tf;
+    private void addExtraText(BibDatabaseMode mode) {
+        Label []label = new Label[19];
+        Button []button = new Button[19];
+        int i = 0;
+        for (i = 0; i <= 18; i++) {
+            textFieldArray[i] = new TextField();
+            button[i] = new Button("Default");
+            button[i].setFont(new javafx.scene.text.Font(10));
+            button[i].setOnAction(e-> defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
+        }
+        i = 0;
+        for (EntryType type : EntryTypes.getAllValues(mode)) {
+            label[i] = new Label(type.getName());
+            i ++;
+        }
+        for (i = 0; i <= 18; i++) {
+            label[i].setFont(FontSize.smallFont);
+            gridPane.add(label[i], 1, i + 3);
+            gridPane.add(textFieldArray[i], 3, i + 3);
+            gridPane.add(button[i], 4, i + 3);
+        }
     }
 
     /**
@@ -210,7 +128,7 @@ private JTextField addEntryType(Container c, EntryType type, int y) {
      */
     private void fillPatternUsingPanelData(AbstractBibtexKeyPattern keypatterns) {
         // each entry type
-        for (Map.Entry<String, JTextField> entry : textFields.entrySet()) {
+        for (Map.Entry<String, TextField> entry : textFields.entrySet()) {
             String text = entry.getValue().getText();
             if (!text.trim().isEmpty()) {
                 keypatterns.addBibtexKeyPattern(entry.getKey(), text);
@@ -244,7 +162,7 @@ public DatabaseBibtexKeyPattern getKeyPatternAsDatabaseBibtexKeyPattern() {
      * @param keyPattern the BibtexKeyPattern to use as initial value
      */
     public void setValues(AbstractBibtexKeyPattern keyPattern) {
-        for (Map.Entry<String, JTextField> entry : textFields.entrySet()) {
+        for (Map.Entry<String, TextField> entry : textFields.entrySet()) {
             setValue(entry.getValue(), entry.getKey(), keyPattern);
         }
 
@@ -255,7 +173,7 @@ public void setValues(AbstractBibtexKeyPattern keyPattern) {
         }
     }
 
-    private static void setValue(JTextField tf, String fieldName, AbstractBibtexKeyPattern keyPattern) {
+    private static void setValue(TextField tf, String fieldName, AbstractBibtexKeyPattern keyPattern) {
         if (keyPattern.isDefaultValue(fieldName)) {
             tf.setText("");
         } else {
@@ -263,4 +181,7 @@ private static void setValue(JTextField tf, String fieldName, AbstractBibtexKeyP
         }
     }
 
+    public GridPane getPanel() {
+        return gridPane;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
index 24cdaae3aee..3199b30b423 100644
--- a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
+++ b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
@@ -19,6 +19,10 @@
 import javax.swing.JRadioButton;
 import javax.swing.JTextField;
 
+import javafx.embed.swing.JFXPanel;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
@@ -26,6 +30,7 @@
 import org.jabref.gui.JabRefDialog;
 import org.jabref.gui.SaveOrderConfigDisplay;
 import org.jabref.gui.cleanup.FieldFormatterCleanupsPanel;
+import org.jabref.gui.customjfx.CustomJFXPanel;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -127,7 +132,8 @@ private void init() {
         builder.add(saveInSpecifiedOrder).xyw(1, 17, 5);
 
         saveOrderPanel = new SaveOrderConfigDisplay();
-        builder.add(saveOrderPanel.getPanel()).xyw(1, 21, 5);
+        JFXPanel panel = CustomJFXPanel.wrap(new Scene((Parent) saveOrderPanel.getJFXPanel()));
+        builder.add(panel).xyw(1, 21, 5);
 
         builder.addSeparator(Localization.lang("Library protection")).xyw(1, 23, 5);
         builder.add(protect).xyw(1, 25, 5);
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index e0f27a1116d..a5a99090927 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -121,9 +121,9 @@ private void doSave() {
                 // Save the database
                 success = saveDatabase(panel.getBibDatabaseContext().getDatabaseFile().get(), false,
                         panel.getBibDatabaseContext()
-                             .getMetaData()
-                             .getEncoding()
-                             .orElse(Globals.prefs.getDefaultEncoding()));
+                                .getMetaData()
+                                .getEncoding()
+                                .orElse(Globals.prefs.getDefaultEncoding()));
 
                 panel.updateTimeStamp();
             } else {
@@ -393,10 +393,10 @@ private boolean checkExternalModification() {
             ButtonType reviewChanges = new ButtonType(Localization.lang("Review changes"));
 
             Optional<ButtonType> buttonPressed = DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showCustomButtonDialogAndWait(AlertType.CONFIRMATION, Localization.lang("File updated externally"),
-                                                                                                                                                    Localization.lang("File has been updated externally. " + "What do you want to do?"),
-                                                                                                                                                    reviewChanges,
-                                                                                                                                                    save,
-                                                                                                                                                    ButtonType.CANCEL));
+                    Localization.lang("File has been updated externally. " + "What do you want to do?"),
+                    reviewChanges,
+                    save,
+                    ButtonType.CANCEL));
 
             if (buttonPressed.isPresent()) {
                 if (buttonPressed.get() == ButtonType.CANCEL) {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
index 1a5f7da082b..a718e408252 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
@@ -82,7 +82,7 @@ public void setPasteActionHandler(PasteActionHandler handler) {
         Objects.requireNonNull(handler);
         this.pasteActionHandler = handler;
     }
-  
+
     /**
      *  Override javafx TextArea method applying TextArea.paste() and pasteActionHandler after
      */
@@ -91,7 +91,7 @@ public void paste() {
         super.paste();
         pasteActionHandler.handle();
     }
-  
+
     /**
      *  Interface presents user-described paste behaviour applying to paste method
      */
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
index 36546d1baa5..f004099dd00 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
@@ -28,8 +28,8 @@ public UrlEditor(String fieldName, DialogService dialogService, AutoCompleteSugg
         this.viewModel = new UrlEditorViewModel(fieldName, suggestionProvider, dialogService, fieldCheckers);
 
         ViewLoader.view(this)
-                  .root(this)
-                  .load();
+                .root(this)
+                .load();
 
         textArea.textProperty().bindBidirectional(viewModel.textProperty());
         Supplier<List<MenuItem>> contextMenuSupplier = EditorMenus.getCleanupURLMenu(textArea);
@@ -37,7 +37,8 @@ public UrlEditor(String fieldName, DialogService dialogService, AutoCompleteSugg
 
         // init paste handler for URLEditor to format pasted url link in textArea
         textArea.setPasteActionHandler(()->
-          textArea.setText(new CleanupURLFormatter().format(textArea.getText())));
+        textArea.setText(new CleanupURLFormatter().format(textArea.getText())));
+
 
         new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
     }
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 1226082b3d8..94c534381c1 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -76,9 +76,9 @@ public void openBrowseDialog() {
         String fileName = Paths.get(fileText).getFileName().toString();
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                                                                                               .withInitialDirectory(workingDir)
-                                                                                               .withInitialFileName(fileName)
-                                                                                               .build();
+                .withInitialDirectory(workingDir)
+                .withInitialFileName(fileName)
+                .build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> {
             // Store the directory for next time:
diff --git a/src/main/java/org/jabref/gui/preftabs/AdvancedTab.java b/src/main/java/org/jabref/gui/preftabs/AdvancedTab.java
index ba94be7d18c..b63ed0850b4 100644
--- a/src/main/java/org/jabref/gui/preftabs/AdvancedTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/AdvancedTab.java
@@ -1,13 +1,17 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
 import java.util.Optional;
 
-import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.Separator;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.shape.Line;
 
 import org.jabref.Globals;
 import org.jabref.gui.DialogService;
@@ -21,18 +25,16 @@
 import org.jabref.logic.remote.RemoteUtil;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-class AdvancedTab extends JPanel implements PrefsTab {
+class AdvancedTab extends Pane implements PrefsTab {
 
     private final JabRefPreferences preferences;
-    private final JCheckBox useRemoteServer;
-    private final JCheckBox useIEEEAbrv;
-    private final JTextField remoteServerPort;
+    private final CheckBox useRemoteServer;
+    private final CheckBox useIEEEAbrv;
+    private final TextField remoteServerPort;
+    private final CheckBox useCaseKeeperOnSearch;
+    private final CheckBox useUnitFormatterOnSearch;
+    private final GridPane builder = new GridPane();
 
-    private final JCheckBox useCaseKeeperOnSearch;
-    private final JCheckBox useUnitFormatterOnSearch;
     private final RemotePreferences remotePreferences;
     private final DialogService dialogService;
 
@@ -41,56 +43,76 @@ public AdvancedTab(DialogService dialogService, JabRefPreferences prefs) {
         preferences = prefs;
         remotePreferences = prefs.getRemotePreferences();
 
-        useRemoteServer = new JCheckBox(Localization.lang("Listen for remote operation on port") + ':');
-        useIEEEAbrv = new JCheckBox(Localization.lang("Use IEEE LaTeX abbreviations"));
-        remoteServerPort = new JTextField();
-        useCaseKeeperOnSearch = new JCheckBox(Localization.lang("Add {} to specified title words on search to keep the correct case"));
-        useUnitFormatterOnSearch = new JCheckBox(Localization.lang("Format units by adding non-breaking separators and keeping the correct case on search"));
-
-        FormLayout layout = new FormLayout("1dlu, 8dlu, left:pref, 4dlu, fill:3dlu", //, 4dlu, fill:pref",// 4dlu, left:pref, 4dlu",
-                "");
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        JPanel pan = new JPanel();
-
-        builder.appendSeparator(Localization.lang("Remote operation"));
-        builder.nextLine();
-        builder.append(new JPanel());
-        builder.append(new JLabel("<html>"
-                + Localization.lang("This feature lets new files be opened or imported into an "
-                        + "already running instance of JabRef<BR>instead of opening a new instance. For instance, this "
-                        + "is useful when you open a file in JabRef<br>from your web browser."
-                        + "<BR>Note that this will prevent you from running more than one instance of JabRef at a time.")
-                + "</html>"));
-        builder.nextLine();
-        builder.append(new JPanel());
-
-        JPanel p = new JPanel();
-        p.add(useRemoteServer);
-        p.add(remoteServerPort);
-        p.add(new HelpAction(HelpFile.REMOTE).getHelpButton());
-        builder.append(p);
-
-        // IEEE
-        builder.nextLine();
-        builder.appendSeparator(Localization.lang("Search %0", "IEEEXplore"));
-        builder.nextLine();
-        builder.append(new JPanel());
-        builder.append(useIEEEAbrv);
-
-        builder.nextLine();
-        builder.appendSeparator(Localization.lang("Import conversions"));
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(useCaseKeeperOnSearch);
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(useUnitFormatterOnSearch);
-
-        pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        setLayout(new BorderLayout());
-        add(pan, BorderLayout.CENTER);
+        useRemoteServer = new CheckBox(Localization.lang("Listen for remote operation on port") + ':');
+        useRemoteServer.setFont(FontSize.smallFont);
+        useIEEEAbrv = new CheckBox(Localization.lang("Use IEEE LaTeX abbreviations"));
+        useIEEEAbrv.setFont(FontSize.smallFont);
+        remoteServerPort = new TextField();
+        useCaseKeeperOnSearch = new CheckBox(Localization.lang("Add {} to specified title words on search to keep the correct case"));
+        useCaseKeeperOnSearch.setFont(FontSize.smallFont);
+        useUnitFormatterOnSearch = new CheckBox(Localization.lang("Format units by adding non-breaking separators and keeping the correct case on search"));
+        useUnitFormatterOnSearch.setFont(FontSize.smallFont);
+
+        Label remoteOperation = new Label(Localization.lang("Remote operation") + "  -----------------------------");
+        remoteOperation.setFont(FontSize.bigFont);
+        builder.add(remoteOperation, 2, 1);
+        builder.add(new Separator(), 2, 1);
+        builder.add(new Pane(), 1, 2);
+        Label label1 = new Label(Localization.lang("This feature lets new files be opened or imported into an "
+
+                + "already running instance of JabRef<BR>instead of opening a new instance. For instance, this "
+
+                + "is useful when you open a file in JabRef<br>from your web browser."
+
+                + "<BR>Note that this will prevent you from running more than one instance of JabRef at a time."));
+        label1.setVisible(false);
+        builder.add(label1, 2, 22);
+
+        Label textLabel1 = new Label("    This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For");
+        textLabel1.setFont(FontSize.smallFont);
+        builder.add(textLabel1, 2, 3);
+        Label textLabel2 = new Label("instance, this is useful when you open a file in JabRef from your web browser. ");
+        textLabel2.setFont(FontSize.smallFont);
+        builder.add(textLabel2, 2, 4);
+        Label textLabel3 = new Label("    Note that this will prevent you from running more than one instance of JabRef at a time.");
+        textLabel3.setFont(FontSize.smallFont);
+        builder.add(textLabel3, 2, 5);
+        builder.add(new Line(), 2, 6);
+        builder.add(new Pane(), 2, 7);
+
+        HBox p = new HBox();
+        p.getChildren().add(useRemoteServer);
+        p.getChildren().add(remoteServerPort);
+        Button helpButton = new Button("?");
+        helpButton.setFont(FontSize.smallFont);
+        helpButton.setOnAction(event -> new HelpAction(HelpFile.REMOTE).getHelpButton().doClick());
+        p.getChildren().add(helpButton);
+
+        builder.add(p, 2, 9);
+        builder.add(new Label(""), 1, 10);
+
+        Label explore = new Label(Localization.lang("Search %0", "IEEEXplore") + "  -----------------------------");
+        explore.setFont(FontSize.bigFont);
+        builder.add(explore, 2, 11);
+        builder.add(new Separator(), 2, 11);
+        builder.add(new Pane(), 2, 12);
+        builder.add(useIEEEAbrv, 2, 13);
+
+        builder.add(new Line(), 2, 16);
+        builder.add(new Label(""), 1, 17);
+
+        Label importConversions = new Label(Localization.lang("Import conversions") + "  ----------------------------");
+        importConversions.setFont(FontSize.bigFont);
+        builder.add(importConversions, 2, 18);
+
+        builder.add(useCaseKeeperOnSearch, 2, 19);
+        builder.add(new Pane(), 2, 20);
+        builder.add(useUnitFormatterOnSearch, 2, 21);
+
+    }
 
+    public Node getBuilder() {
+        return builder;
     }
 
     @Override
@@ -160,7 +182,7 @@ public boolean validateSettings() {
             }
         } catch (NumberFormatException ex) {
 
-           DefaultTaskExecutor.runInJavaFXThread(()-> dialogService.showErrorDialogAndWait(Localization.lang("Remote server port"),
+            DefaultTaskExecutor.runInJavaFXThread(()-> dialogService.showErrorDialogAndWait(Localization.lang("Remote server port"),
                     Localization.lang("You must enter an integer value in the interval 1025-65535 in the text field for")
                             + " '" + Localization.lang("Remote server port") + '\''));
 
@@ -172,5 +194,4 @@ public boolean validateSettings() {
     public String getTabName() {
         return Localization.lang("Advanced");
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java b/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
index 9f65eb85c3c..6defa3209b9 100644
--- a/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
@@ -1,38 +1,26 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-
-import javafx.embed.swing.JFXPanel;
 import javafx.geometry.Insets;
-import javafx.scene.Scene;
+import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.customjfx.CustomJFXPanel;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class AppearancePrefsTab extends JPanel implements PrefsTab {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AppearancePrefsTab.class);
+class AppearancePrefsTab extends Pane implements PrefsTab {
 
     private final JabRefPreferences prefs;
-
     private final CheckBox fontTweaksLAF;
     private final TextField fontSize;
     private final CheckBox overrideFonts;
-
+    private final VBox container = new VBox();
     private final DialogService dialogService;
 
     /**
@@ -43,7 +31,6 @@ class AppearancePrefsTab extends JPanel implements PrefsTab {
     public AppearancePrefsTab(DialogService dialogService, JabRefPreferences prefs) {
         this.dialogService = dialogService;
         this.prefs = prefs;
-        setLayout(new BorderLayout());
 
         overrideFonts = new CheckBox(Localization.lang("Override default font settings"));
         fontSize = new TextField();
@@ -54,12 +41,12 @@ public AppearancePrefsTab(DialogService dialogService, JabRefPreferences prefs)
         fontSizeContainer.disableProperty().bind(overrideFonts.selectedProperty().not());
         fontTweaksLAF = new CheckBox(Localization.lang("Tweak font rendering for entry editor on Linux"));
 
-        VBox container = new VBox();
         container.getChildren().addAll(overrideFonts, fontSizeContainer, fontTweaksLAF);
 
-        JFXPanel panel = CustomJFXPanel.wrap(new Scene(container));
-        panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        add(panel, BorderLayout.CENTER);
+    }
+
+    public Node getContainer() {
+        return container;
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java b/src/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java
index 1d353967c07..194adda61b0 100644
--- a/src/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java
@@ -1,13 +1,11 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.GridBagConstraints;
-
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JCheckBox;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
@@ -16,35 +14,35 @@
 import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
 /**
  * The Preferences panel for key generation.
  */
 class BibtexKeyPatternPrefTab extends BibtexKeyPatternPanel implements PrefsTab {
 
     private final JabRefPreferences prefs;
+    private final GridPane builder = new GridPane();
+    private final CheckBox dontOverwrite = new CheckBox(Localization.lang("Do not overwrite existing keys"));
+    private final CheckBox warnBeforeOverwriting = new CheckBox(Localization.lang("Warn before overwriting existing keys"));
+    private final CheckBox generateOnSave = new CheckBox(Localization.lang("Generate keys before saving (for entries without a key)"));
+    private final CheckBox autoGenerateOnImport = new CheckBox(Localization.lang("Generate keys for imported entries"));
 
-    private final JCheckBox dontOverwrite = new JCheckBox(Localization.lang("Do not overwrite existing keys"));
-    private final JCheckBox warnBeforeOverwriting = new JCheckBox(Localization.lang("Warn before overwriting existing keys"));
-    private final JCheckBox generateOnSave = new JCheckBox(Localization.lang("Generate keys before saving (for entries without a key)"));
-    private final JCheckBox autoGenerateOnImport = new JCheckBox(Localization.lang("Generate keys for imported entries"));
+    private final RadioButton letterStartA = new RadioButton(Localization.lang("Ensure unique keys using letters (a, b, ...)"));
+    private final RadioButton letterStartB = new RadioButton(Localization.lang("Ensure unique keys using letters (b, c, ...)"));
+    private final RadioButton alwaysAddLetter = new RadioButton(Localization.lang("Always add letter (a, b, ...) to generated keys"));
 
-    private final JRadioButton letterStartA = new JRadioButton(Localization.lang("Ensure unique keys using letters (a, b, ...)"));
-    private final JRadioButton letterStartB = new JRadioButton(Localization.lang("Ensure unique keys using letters (b, c, ...)"));
-    private final JRadioButton alwaysAddLetter = new JRadioButton(Localization.lang("Always add letter (a, b, ...) to generated keys"));
-
-    private final JTextField keyPatternRegex = new JTextField(20);
-    private final JTextField keyPatternReplacement = new JTextField(20);
+    private final TextField keyPatternRegex = new TextField();
+    private final TextField keyPatternReplacement = new TextField();
 
 
     public BibtexKeyPatternPrefTab(JabRefPreferences prefs, BasePanel panel) {
         super(panel);
+        builder.add(super.getPanel(), 1, 1);
+        builder.add(new Label(""), 1, 2);
         this.prefs = prefs;
         appendKeyGeneratorSettings();
     }
 
+
     /**
      * Store changes to table preferences. This method is called when the user clicks Ok.
      *
@@ -54,7 +52,6 @@ public void storeSettings() {
 
         // Set the default value:
         Globals.prefs.put(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN, defaultPat.getText());
-
         Globals.prefs.putBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY, warnBeforeOverwriting.isSelected());
         Globals.prefs.putBoolean(JabRefPreferences.AVOID_OVERWRITING_KEY, dontOverwrite.isSelected());
 
@@ -81,55 +78,39 @@ public void storeSettings() {
     }
 
     private void appendKeyGeneratorSettings() {
-        ButtonGroup bg = new ButtonGroup();
-        bg.add(letterStartA);
-        bg.add(letterStartB);
-        bg.add(alwaysAddLetter);
-
         // Build a panel for checkbox settings:
-        FormLayout layout = new FormLayout
-                ("1dlu, 8dlu, left:pref, 8dlu, left:pref", "");
-        JPanel pan = new JPanel();
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.appendSeparator(Localization.lang("Key generator settings"));
-
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(autoGenerateOnImport);
-        builder.append(letterStartA);
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(warnBeforeOverwriting);
-        builder.append(letterStartB);
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(dontOverwrite);
-        builder.append(alwaysAddLetter);
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(generateOnSave);
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(Localization.lang("Replace (regular expression)") + ':');
-        builder.append(Localization.lang("by") + ':');
-
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(keyPatternRegex);
-        builder.append(keyPatternReplacement);
-
-        builder.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        con.gridx = 1;
-        con.gridy = 3;
-        con.gridwidth = GridBagConstraints.REMAINDER;
-        con.weightx = 1;
-        con.fill = GridBagConstraints.BOTH;
-        gbl.setConstraints(builder.getPanel(), con);
-        add(builder.getPanel());
-
-        dontOverwrite.addChangeListener(e ->
+        autoGenerateOnImport.setFont(FontSize.smallFont);
+        letterStartA.setFont(FontSize.smallFont);
+        warnBeforeOverwriting.setFont(FontSize.smallFont);
+        letterStartB.setFont(FontSize.smallFont);
+        dontOverwrite.setFont(FontSize.smallFont);
+        alwaysAddLetter.setFont(FontSize.smallFont);
+        generateOnSave.setFont(FontSize.smallFont);
+
+        Label keyGeneratorSettings = new Label(Localization.lang("Key generator settings") + "  --------------------------");
+        keyGeneratorSettings.setFont(FontSize.bigFont);
+        builder.add(keyGeneratorSettings, 1, 10);
+        builder.add(autoGenerateOnImport, 1, 11);
+        builder.add(letterStartA, 2, 11);
+        builder.add(warnBeforeOverwriting, 1, 12);
+        builder.add(letterStartB, 2, 12);
+        builder.add(dontOverwrite, 1, 13);
+        builder.add(alwaysAddLetter, 2, 13);
+        builder.add(generateOnSave, 1, 14);
+
+        builder.add((new Label(Localization.lang("Replace (regular expression)") + ':')), 1, 15);
+        builder.add(new Label(Localization.lang("by") + ':'), 2, 15);
+
+        builder.add(keyPatternRegex, 1, 16);
+        builder.add(keyPatternReplacement, 2, 16);
+
+        dontOverwrite.setOnAction(e ->
         // Warning before overwriting is only relevant if overwriting can happen:
-        warnBeforeOverwriting.setEnabled(!dontOverwrite.isSelected()));
+        warnBeforeOverwriting.setDisable(dontOverwrite.isSelected()));
+    }
+
+    public Node getBuilder() {
+        return builder;
     }
 
     @Override
@@ -157,7 +138,7 @@ public void setValues() {
         }
 
         // Warning before overwriting is only relevant if overwriting can happen:
-        warnBeforeOverwriting.setEnabled(!dontOverwrite.isSelected());
+        warnBeforeOverwriting.setDisable(dontOverwrite.isSelected());
 
         keyPatternRegex.setText(Globals.prefs.get(JabRefPreferences.KEY_PATTERN_REGEX));
         keyPatternReplacement.setText(Globals.prefs.get(JabRefPreferences.KEY_PATTERN_REPLACEMENT));
diff --git a/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java b/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java
index 332ebc84de6..9d753245bde 100644
--- a/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java
@@ -1,15 +1,13 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
-import java.awt.Insets;
-
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.Separator;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
 
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
@@ -17,31 +15,28 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-
 import static org.jabref.gui.autocompleter.AutoCompleteFirstNameMode.ONLY_ABBREVIATED;
 import static org.jabref.gui.autocompleter.AutoCompleteFirstNameMode.ONLY_FULL;
 
-class EntryEditorPrefsTab extends JPanel implements PrefsTab {
-
-    private final JCheckBox autoOpenForm;
-    private final JCheckBox defSource;
-    private final JCheckBox emacsMode;
-    private final JCheckBox emacsRebindCtrlA;
-    private final JCheckBox emacsRebindCtrlF;
-    private final JCheckBox autoComplete;
-    private final JCheckBox recommendations;
-    private final JCheckBox validation;
-    private final JRadioButton autoCompBoth;
-    private final JRadioButton autoCompFF;
-    private final JRadioButton autoCompLF;
-    private final JRadioButton firstNameModeFull;
-    private final JRadioButton firstNameModeAbbr;
-    private final JRadioButton firstNameModeBoth;
-
-    private final JTextField autoCompFields;
+class EntryEditorPrefsTab extends Pane implements PrefsTab {
+
+    private final CheckBox autoOpenForm;
+    private final CheckBox defSource;
+    private final CheckBox emacsMode;
+    private final CheckBox emacsRebindCtrlA;
+    private final CheckBox emacsRebindCtrlF;
+    private final CheckBox autoComplete;
+    private final CheckBox recommendations;
+    private final CheckBox validation;
+    private final RadioButton autoCompBoth;
+    private final RadioButton autoCompFF;
+    private final RadioButton autoCompLF;
+    private final RadioButton firstNameModeFull;
+    private final RadioButton firstNameModeAbbr;
+    private final RadioButton firstNameModeBoth;
+    private final GridPane builder = new GridPane();
+
+    private final TextField autoCompFields;
     private final JabRefPreferences prefs;
     private final AutoCompletePreferences autoCompletePreferences;
 
@@ -49,104 +44,102 @@ class EntryEditorPrefsTab extends JPanel implements PrefsTab {
     public EntryEditorPrefsTab(JabRefPreferences prefs) {
         this.prefs = prefs;
         autoCompletePreferences = prefs.getAutoCompletePreferences();
-        setLayout(new BorderLayout());
-
-        autoOpenForm = new JCheckBox(Localization.lang("Open editor when a new entry is created"));
-        defSource = new JCheckBox(Localization.lang("Show BibTeX source by default"));
-        emacsMode = new JCheckBox(Localization.lang("Use Emacs key bindings"));
-        emacsRebindCtrlA = new JCheckBox(Localization.lang("Rebind C-a, too"));
-        emacsRebindCtrlF = new JCheckBox(Localization.lang("Rebind C-f, too"));
-        autoComplete = new JCheckBox(Localization.lang("Enable word/name autocompletion"));
-        recommendations = new JCheckBox(Localization.lang("Show 'Related Articles' tab"));
-        validation = new JCheckBox(Localization.lang("Show validation messages"));
+        autoOpenForm = new CheckBox(Localization.lang("Open editor when a new entry is created"));
+        autoOpenForm.setFont(FontSize.smallFont);
+        defSource = new CheckBox(Localization.lang("Show BibTeX source by default"));
+        defSource.setFont(FontSize.smallFont);
+        emacsMode = new CheckBox(Localization.lang("Use Emacs key bindings"));
+        emacsMode.setFont(FontSize.smallFont);
+        emacsRebindCtrlA = new CheckBox(Localization.lang("Rebind C-a, too"));
+        emacsRebindCtrlA.setFont(FontSize.smallFont);
+        emacsRebindCtrlF = new CheckBox(Localization.lang("Rebind C-f, too"));
+        emacsRebindCtrlF.setFont(FontSize.smallFont);
+        autoComplete = new CheckBox(Localization.lang("Enable word/name autocompletion"));
+        autoComplete.setFont(FontSize.smallFont);
+        recommendations = new CheckBox(Localization.lang("Show 'Related Articles' tab"));
+        recommendations.setFont(FontSize.smallFont);
+        validation = new CheckBox(Localization.lang("Show validation messages"));
+        validation.setFont(FontSize.smallFont);
 
         // allowed name formats
-        autoCompFF = new JRadioButton(Localization.lang("Autocomplete names in 'Firstname Lastname' format only"));
-        autoCompLF = new JRadioButton(Localization.lang("Autocomplete names in 'Lastname, Firstname' format only"));
-        autoCompBoth = new JRadioButton(Localization.lang("Autocomplete names in both formats"));
-        ButtonGroup buttonGroup = new ButtonGroup();
-        buttonGroup.add(autoCompLF);
-        buttonGroup.add(autoCompFF);
-        buttonGroup.add(autoCompBoth);
+        autoCompFF = new RadioButton(Localization.lang("Autocomplete names in 'Firstname Lastname' format only"));
+        autoCompFF.setFont(FontSize.smallFont);
+        autoCompLF = new RadioButton(Localization.lang("Autocomplete names in 'Lastname, Firstname' format only"));
+        autoCompLF.setFont(FontSize.smallFont);
+        autoCompBoth = new RadioButton(Localization.lang("Autocomplete names in both formats"));
+        autoCompBoth.setFont(FontSize.smallFont);
 
         // treatment of first name
-        firstNameModeFull = new JRadioButton(Localization.lang("Use full firstname whenever possible"));
-        firstNameModeAbbr = new JRadioButton(Localization.lang("Use abbreviated firstname whenever possible"));
-        firstNameModeBoth = new JRadioButton(Localization.lang("Use abbreviated and full firstname"));
-        ButtonGroup firstNameModeButtonGroup = new ButtonGroup();
-        firstNameModeButtonGroup.add(firstNameModeFull);
-        firstNameModeButtonGroup.add(firstNameModeAbbr);
-        firstNameModeButtonGroup.add(firstNameModeBoth);
-
-        Insets marg = new Insets(0, 20, 3, 0);
+        firstNameModeFull = new RadioButton(Localization.lang("Use full firstname whenever possible"));
+        firstNameModeFull.setFont(FontSize.smallFont);
+        firstNameModeAbbr = new RadioButton(Localization.lang("Use abbreviated firstname whenever possible"));
+        firstNameModeAbbr.setFont(FontSize.smallFont);
+        firstNameModeBoth = new RadioButton(Localization.lang("Use abbreviated and full firstname"));
+        firstNameModeBoth.setFont(FontSize.smallFont);
 
-        emacsRebindCtrlA.setMargin(marg);
         // We need a listener on showSource to enable and disable the source panel-related choices:
-        emacsMode.addChangeListener(event -> emacsRebindCtrlA.setEnabled(emacsMode.isSelected()));
+        emacsMode.setOnAction(event -> emacsRebindCtrlA.setDisable(!emacsMode.isSelected()));
 
-        emacsRebindCtrlF.setMargin(marg);
         // We need a listener on showSource to enable and disable the source panel-related choices:
-        emacsMode.addChangeListener(event -> emacsRebindCtrlF.setEnabled(emacsMode.isSelected()));
+        emacsMode.setOnAction(event -> emacsRebindCtrlF.setDisable(!emacsMode.isSelected()));
 
-
-        autoCompFields = new JTextField(40);
+        autoCompFields = new TextField();
         // We need a listener on autoComplete to enable and disable the
         // autoCompFields text field:
-        autoComplete.addChangeListener(event -> setAutoCompleteElementsEnabled(autoComplete.isSelected()));
-
-        FormLayout layout = new FormLayout
-                (// columns
-                 "8dlu, left:pref, 8dlu, fill:150dlu, 4dlu, fill:pref", // 4dlu, left:pref, 4dlu",
-                 // rows  1 to 10
-                 "pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu," +
-                // rows 11 to 16
-                        "pref, 6dlu, pref, 6dlu, pref, 6dlu, " +
-                        // rows 17 to 27
-                 "pref, 6dlu, pref, pref, pref, pref, 6dlu, pref, pref, pref, pref, pref");
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        CellConstraints cc = new CellConstraints();
-        builder.addSeparator(Localization.lang("Editor options"), cc.xyw(1, 1, 5));
-        builder.add(autoOpenForm, cc.xy(2, 3));
-        builder.add(defSource, cc.xy(2, 5));
-        builder.add(emacsMode, cc.xy(2, 7));
-        builder.add(emacsRebindCtrlA, cc.xy(2, 9));
-        builder.add(emacsRebindCtrlF, cc.xy(2, 11));
-        builder.add(recommendations, cc.xy(2,13));
-        builder.add(validation, cc.xy(2,15));
-
-        builder.addSeparator(Localization.lang("Autocompletion options"), cc.xyw(1, 17, 5));
-        builder.add(autoComplete, cc.xy(2, 19));
-
-        DefaultFormBuilder builder3 = new DefaultFormBuilder(new FormLayout("left:pref, 4dlu, fill:150dlu",""));
-        JLabel label = new JLabel(Localization.lang("Use autocompletion for the following fields") + ":");
-
-        builder3.append(label);
-        builder3.append(autoCompFields);
-        builder.add(builder3.getPanel(), cc.xyw(2, 21, 3));
-
-        builder.addSeparator(Localization.lang("Name format used for autocompletion"), cc.xyw(2, 23, 4));
-        builder.add(autoCompFF, cc.xy(2, 24));
-        builder.add(autoCompLF, cc.xy(2, 25));
-        builder.add(autoCompBoth, cc.xy(2, 26));
-
-        builder.addSeparator(Localization.lang("Treatment of first names"), cc.xyw(2, 29, 4));
-        builder.add(firstNameModeAbbr, cc.xy(2, 30));
-        builder.add(firstNameModeFull, cc.xy(2, 31));
-        builder.add(firstNameModeBoth, cc.xy(2, 32));
-
-        JPanel pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        add(pan, BorderLayout.CENTER);
+        autoComplete.setOnAction(event -> setAutoCompleteElementsEnabled(autoComplete.isSelected()));
+
+        Label editorOptions = new Label(Localization.lang("Editor options") + "  -------------------------------------");
+        editorOptions.setFont(FontSize.bigFont);
+        builder.add(editorOptions, 1, 1);
+        builder.add(new Separator(), 2, 1);
+        builder.add(autoOpenForm,  1, 2);
+        builder.add(defSource,  1, 3);
+        builder.add(emacsMode, 1, 4);
+        builder.add(emacsRebindCtrlA, 1, 5);
+        builder.add(emacsRebindCtrlF, 1, 6);
+        builder.add(recommendations, 1, 7);
+        builder.add(validation, 1, 8);
+        builder.add(new Label(""), 1, 9);
+
+        Label autocompletionOptions = new Label(Localization.lang("Autocompletion options") + "  --------------------------");
+        autocompletionOptions.setFont(FontSize.bigFont);
+        builder.add(autocompletionOptions, 1, 10);
+        builder.add(autoComplete,   1, 11);
+
+        Label useFields = new Label("       " + Localization.lang("Use autocompletion for the following fields") + ":");
+        useFields.setFont(FontSize.smallFont);
+        builder.add(useFields, 1, 12);
+        builder.add(autoCompFields, 2, 12);
+        builder.add(new Label(""), 1, 13);
+
+        Label nameFormat = new Label(Localization.lang("Name format used for autocompletion") + "  ----------");
+        nameFormat.setFont(FontSize.bigFont);
+        builder.add(nameFormat, 1, 14);
+        builder.add(autoCompFF, 1, 15);
+        builder.add(autoCompLF,  1, 16);
+        builder.add(autoCompBoth,  1, 17);
+        builder.add(new Label(""), 1, 18);
+
+        Label treatment = new Label(Localization.lang("Treatment of first names") + "  --------------------------");
+        treatment.setFont(FontSize.bigFont);
+        builder.add(treatment, 1, 19);
+        builder.add(firstNameModeAbbr,  1, 20);
+        builder.add(firstNameModeFull, 1, 21);
+        builder.add(firstNameModeBoth,  1, 22);
+    }
+
+    public Node getBuilder() {
+        return builder;
     }
 
     private void setAutoCompleteElementsEnabled(boolean enabled) {
-        autoCompFields.setEnabled(enabled);
-        autoCompLF.setEnabled(enabled);
-        autoCompFF.setEnabled(enabled);
-        autoCompBoth.setEnabled(enabled);
-        firstNameModeAbbr.setEnabled(enabled);
-        firstNameModeFull.setEnabled(enabled);
-        firstNameModeBoth.setEnabled(enabled);
+        autoCompFields.setDisable(!enabled);
+        autoCompLF.setDisable(!enabled);
+        autoCompFF.setDisable(!enabled);
+        autoCompBoth.setDisable(!enabled);
+        firstNameModeAbbr.setDisable(!enabled);
+        firstNameModeFull.setDisable(!enabled);
+        firstNameModeBoth.setDisable(!enabled);
     }
 
     @Override
@@ -181,7 +174,7 @@ public void setValues() {
         }
 
         // similar for emacs CTRL-a and emacs mode
-        emacsRebindCtrlA.setEnabled(emacsMode.isSelected());
+        emacsRebindCtrlA.setDisable(!emacsMode.isSelected());
         // Autocomplete fields is only enabled when autocompletion is selected
         setAutoCompleteElementsEnabled(autoComplete.isSelected());
 
diff --git a/src/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java
index 9fa67b99c12..aab52671263 100644
--- a/src/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java
@@ -1,81 +1,74 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.Separator;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
+import javafx.scene.shape.Line;
 
 import org.jabref.gui.SaveOrderConfigDisplay;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
 
 /**
  * Preference tab for file sorting options.
  */
-class ExportSortingPrefsTab extends JPanel implements PrefsTab {
+class ExportSortingPrefsTab extends Pane implements PrefsTab {
 
     private final JabRefPreferences prefs;
 
-    private final JRadioButton exportInOriginalOrder;
-    private final JRadioButton exportInTableOrder;
-    private final JRadioButton exportInSpecifiedOrder;
+    private final RadioButton exportInOriginalOrder;
+    private final RadioButton exportInTableOrder;
+    private final RadioButton exportInSpecifiedOrder;
     private final SaveOrderConfigDisplay exportOrderPanel;
-
+    private final  GridPane builder = new GridPane();
 
     public ExportSortingPrefsTab(JabRefPreferences prefs) {
         this.prefs = prefs;
-        FormLayout layout = new FormLayout("4dlu, left:pref, 4dlu, fill:pref", "");
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.leadingColumnOffset(1);
-
         // EXPORT SORT ORDER
         // create Components
-        exportInOriginalOrder = new JRadioButton(Localization.lang("Export entries in their original order"));
-        exportInTableOrder = new JRadioButton(Localization.lang("Export in current table sort order"));
-        exportInSpecifiedOrder = new JRadioButton(Localization.lang("Export entries ordered as specified"));
+        exportInOriginalOrder = new RadioButton(Localization.lang("Export entries in their original order"));
+        exportInOriginalOrder.setFont(FontSize.smallFont);
+        exportInTableOrder = new RadioButton(Localization.lang("Export in current table sort order"));
+        exportInTableOrder.setFont(FontSize.smallFont);
+        exportInSpecifiedOrder = new RadioButton(Localization.lang("Export entries ordered as specified"));
+        exportInSpecifiedOrder.setFont(FontSize.smallFont);
 
-        ButtonGroup buttonGroup = new ButtonGroup();
-        buttonGroup.add(exportInOriginalOrder);
-        buttonGroup.add(exportInTableOrder);
-        buttonGroup.add(exportInSpecifiedOrder);
-
-        ActionListener listener = new ActionListener() {
+        exportOrderPanel = new SaveOrderConfigDisplay();
 
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                boolean selected = e.getSource() == exportInSpecifiedOrder;
+        EventHandler<ActionEvent> listener =  (event) -> {
+                boolean selected = event.getSource() == exportInSpecifiedOrder;
                 exportOrderPanel.setEnabled(selected);
-            }
         };
-        exportInOriginalOrder.addActionListener(listener);
-        exportInTableOrder.addActionListener(listener);
-        exportInSpecifiedOrder.addActionListener(listener);
 
+        exportInOriginalOrder.setOnAction(listener);
+        exportInTableOrder.setOnAction(listener);
+        exportInSpecifiedOrder.setOnAction(listener);
+
+        Label exportSortOrder = new Label(Localization.lang("Export sort order") + "  ------------------------");
+        exportSortOrder.setFont(FontSize.bigFont);
         // create GUI
-        builder.appendSeparator(Localization.lang("Export sort order"));
-        builder.append(exportInOriginalOrder, 1);
-        builder.nextLine();
-        builder.append(exportInTableOrder, 1);
-        builder.nextLine();
-        builder.append(exportInSpecifiedOrder, 1);
-        builder.nextLine();
+        builder.add(exportSortOrder, 1, 1);
+        builder.add(new Separator(), 2, 1);
+        builder.add(exportInOriginalOrder,  1, 2);
+        builder.add(new Line(), 2, 3);
+        builder.add(exportInTableOrder,  1, 4);
+        builder.add(new Line(), 2, 5);
+        builder.add(exportInSpecifiedOrder, 1, 6);
+        builder.add(new Line(), 2, 7);
+
+        builder.add(exportOrderPanel.getJFXPanel(), 1, 8);
+        builder.add(new Line(), 2, 9);
 
-        exportOrderPanel = new SaveOrderConfigDisplay();
-        builder.append(exportOrderPanel.getPanel());
-        builder.nextLine();
-
-        // COMBINE EVERYTHING
-        JPanel pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        setLayout(new BorderLayout());
-        add(pan, BorderLayout.CENTER);
+    }
+
+    public Node getBuilder() {
+        return builder;
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preftabs/ExternalTab.java b/src/main/java/org/jabref/gui/preftabs/ExternalTab.java
index b8cab7e7e72..ffc193c0c05 100644
--- a/src/main/java/org/jabref/gui/preftabs/ExternalTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/ExternalTab.java
@@ -1,23 +1,23 @@
 package org.jabref.gui.preftabs;
 
 import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Insets;
-
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
+
 import javax.swing.JFileChooser;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
+
+import javafx.embed.swing.JFXPanel;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
 
 import org.jabref.Globals;
 import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.customjfx.CustomJFXPanel;
 import org.jabref.gui.externalfiletype.ExternalFileTypeEditor;
 import org.jabref.gui.push.PushToApplication;
 import org.jabref.gui.push.PushToApplicationSettings;
@@ -27,182 +27,139 @@
 import org.jabref.logic.util.OS;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
 class ExternalTab extends JPanel implements PrefsTab {
 
     private final JabRefPreferences prefs;
+    private final TextField emailSubject;
+    private final TextField citeCommand;
+    private final CheckBox openFoldersOfAttachedFiles;
 
-    private final JTextField emailSubject;
-    private final JTextField citeCommand;
-    private final JCheckBox openFoldersOfAttachedFiles;
+    private final RadioButton defaultConsole;
+    private final RadioButton executeConsole;
+    private final TextField consoleCommand;
+    private final Button browseButton;
 
-    private final JRadioButton defaultConsole;
-    private final JRadioButton executeConsole;
-    private final JTextField consoleCommand;
-    private final JButton browseButton;
-
-    private final JRadioButton adobeAcrobatReader;
-    private final JRadioButton sumatraReader;
-    private final JTextField adobeAcrobatReaderPath;
-    private final JTextField sumatraReaderPath;
-    private final JButton browseAdobeAcrobatReader;
-    private final JButton browseSumatraReader;
+    private final RadioButton adobeAcrobatReader;
+    private final RadioButton sumatraReader;
+    private final TextField adobeAcrobatReaderPath;
+    private final TextField sumatraReaderPath;
+    private final GridPane builder = new GridPane();
 
     public ExternalTab(JabRefFrame frame, PreferencesDialog prefsDiag, JabRefPreferences prefs) {
         this.prefs = prefs;
-
-        setLayout(new BorderLayout());
-
-        JButton editFileTypes = new JButton(Localization.lang("Manage external file types"));
-        citeCommand = new JTextField(25);
-        editFileTypes.addActionListener(ExternalFileTypeEditor.getAction());
-
-        defaultConsole = new JRadioButton(Localization.lang("Use default terminal emulator"));
-        executeConsole = new JRadioButton(Localization.lang("Execute command") + ":");
-        consoleCommand = new JTextField();
-        browseButton = new JButton(Localization.lang("Browse"));
-
-        adobeAcrobatReader = new JRadioButton(Localization.lang("Adobe Acrobat Reader"));
-        adobeAcrobatReaderPath = new JTextField();
-        browseAdobeAcrobatReader = new JButton(Localization.lang("Browse"));
-
-        sumatraReader = new JRadioButton(Localization.lang("Sumatra Reader"));
-        sumatraReaderPath = new JTextField();
-        browseSumatraReader = new JButton(Localization.lang("Browse"));
-
-        JLabel commandDescription = new JLabel(Localization.lang("Note: Use the placeholder %0 for the location of the opened library file.", "%DIR"));
-
-        ButtonGroup consoleOptions = new ButtonGroup();
-        consoleOptions.add(defaultConsole);
-        consoleOptions.add(executeConsole);
-
-        ButtonGroup readerOptions = new ButtonGroup();
-        readerOptions.add(adobeAcrobatReader);
-
-        JPanel pdfOptionPanel = new JPanel(new GridBagLayout());
-        GridBagConstraints pdfLayoutConstrains = new GridBagConstraints();
-
-        JPanel consoleOptionPanel = new JPanel(new GridBagLayout());
-        GridBagConstraints layoutConstraints = new GridBagConstraints();
-
-        defaultConsole.addActionListener(e -> updateExecuteConsoleButtonAndFieldEnabledState());
-        executeConsole.addActionListener(e -> updateExecuteConsoleButtonAndFieldEnabledState());
-        browseButton.addActionListener(e -> showConsoleChooser());
-
-        browseAdobeAcrobatReader.addActionListener(e -> showAdobeChooser());
-
-        layoutConstraints.fill = GridBagConstraints.HORIZONTAL;
-
-        pdfLayoutConstrains.fill = GridBagConstraints.HORIZONTAL;
-
-        layoutConstraints.gridx = 0;
-        layoutConstraints.gridy = 0;
-        layoutConstraints.insets = new Insets(0, 0, 6, 0);
-        consoleOptionPanel.add(defaultConsole, layoutConstraints);
-
-        layoutConstraints.gridy = 1;
-        consoleOptionPanel.add(executeConsole, layoutConstraints);
-
-        layoutConstraints.gridx = 1;
-        consoleOptionPanel.add(consoleCommand, layoutConstraints);
-
-        layoutConstraints.gridx = 2;
-        layoutConstraints.insets = new Insets(0, 4, 6, 0);
-        consoleOptionPanel.add(browseButton, layoutConstraints);
-
-        layoutConstraints.gridx = 1;
-        layoutConstraints.gridy = 2;
-        consoleOptionPanel.add(commandDescription, layoutConstraints);
-
-        pdfLayoutConstrains.gridx = 0;
-        pdfLayoutConstrains.gridy = 0;
-        pdfLayoutConstrains.insets = new Insets(0, 0, 6, 0);
-        pdfOptionPanel.add(adobeAcrobatReader, pdfLayoutConstrains);
-
-        pdfLayoutConstrains.gridx = 1;
-        pdfOptionPanel.add(adobeAcrobatReaderPath, pdfLayoutConstrains);
-
-        pdfLayoutConstrains.gridx = 2;
-        pdfOptionPanel.add(browseAdobeAcrobatReader, pdfLayoutConstrains);
+        Button editFileTypes = new Button(Localization.lang("Manage external file types"));
+        editFileTypes.setFont(FontSize.smallFont);
+        citeCommand = new TextField();
+        editFileTypes.setOnAction(e->ExternalFileTypeEditor.getAction());
+        defaultConsole = new RadioButton(Localization.lang("Use default terminal emulator"));
+        defaultConsole.setFont(FontSize.smallFont);
+        executeConsole = new RadioButton(Localization.lang("Execute command") + ":");
+        executeConsole.setFont(FontSize.smallFont);
+        consoleCommand = new TextField();
+        browseButton = new Button(Localization.lang("Browse"));
+        browseButton.setFont(FontSize.smallFont);
+        adobeAcrobatReader = new RadioButton(Localization.lang("Adobe Acrobat Reader"));
+        adobeAcrobatReader.setFont(FontSize.smallFont);
+        adobeAcrobatReaderPath = new TextField();
+        Button browseAdobeAcrobatReader = new Button(Localization.lang("Browse"));
+        browseAdobeAcrobatReader.setFont(FontSize.smallFont);
+        sumatraReader = new RadioButton(Localization.lang("Sumatra Reader"));
+        sumatraReader.setFont(FontSize.smallFont);
+        sumatraReaderPath = new TextField();
+        Button browseSumatraReader = new Button(Localization.lang("Browse"));
+        browseSumatraReader.setFont(FontSize.smallFont);
+
+        Label commandDescription = new Label(Localization.lang("Note: Use the placeholder %0 for the location of the opened library file.", "%DIR"));
+        commandDescription.setFont(FontSize.smallFont);
+        defaultConsole.setOnAction(e -> updateExecuteConsoleButtonAndFieldEnabledState());
+        executeConsole.setOnAction(e -> updateExecuteConsoleButtonAndFieldEnabledState());
+        browseButton.setOnAction(e -> showConsoleChooser());
+
+        browseAdobeAcrobatReader.setOnAction(e -> showAdobeChooser());
+
+        GridPane consoleOptionPanel = new GridPane();
+        consoleOptionPanel.add(defaultConsole,  1, 1);
+        consoleOptionPanel.add(executeConsole,  1, 2);
+        consoleOptionPanel.add(consoleCommand,  2, 2);
+        consoleOptionPanel.add(browseButton,  3, 2);
+        consoleOptionPanel.add(commandDescription,  2, 3);
+
+        GridPane pdfOptionPanel = new GridPane();
+        pdfOptionPanel.add(adobeAcrobatReader,  1, 1);
+        pdfOptionPanel.add(adobeAcrobatReaderPath,  2, 1);
+        pdfOptionPanel.add(browseAdobeAcrobatReader,  3, 1);
 
         if (OS.WINDOWS) {
-            readerOptions.add(sumatraReader);
-            browseSumatraReader.addActionListener(e -> showSumatraChooser());
-            pdfLayoutConstrains.gridy = 1;
-            pdfLayoutConstrains.gridx = 0;
-            pdfOptionPanel.add(sumatraReader, pdfLayoutConstrains);
-
-            pdfLayoutConstrains.gridx = 1;
-            pdfOptionPanel.add(sumatraReaderPath, pdfLayoutConstrains);
+            browseSumatraReader.setOnAction(e -> showSumatraChooser());
+            pdfOptionPanel.add(sumatraReader,  1, 2);
+            pdfOptionPanel.add(sumatraReaderPath,  2, 2);
+            pdfOptionPanel.add(browseSumatraReader,  3, 2);
+        }
 
-            pdfLayoutConstrains.gridx = 2;
-            pdfOptionPanel.add(browseSumatraReader, pdfLayoutConstrains);
+        Label sendingOfEmails = new Label(Localization.lang("Sending of emails") + "  ----------------------------");
+        sendingOfEmails.setFont(FontSize.bigFont);
+        builder.add(sendingOfEmails, 1, 1);
+        Label subject = new Label(Localization.lang("Subject for sending an email with references").concat(":"));
+        subject.setFont(FontSize.smallFont);
+        builder.add(subject, 1, 2);
+        emailSubject = new TextField();
+        builder.add(emailSubject, 2, 2);
+        openFoldersOfAttachedFiles = new CheckBox(Localization.lang("Automatically open folders of attached files"));
+        openFoldersOfAttachedFiles.setFont(FontSize.smallFont);
+        builder.add(openFoldersOfAttachedFiles, 1, 3);
+
+        builder.add(new Label(""), 1, 4);
+        Label externalPrograms = new Label(Localization.lang("External programs") + "  ----------------------------");
+        externalPrograms.setFont(FontSize.bigFont);
+        builder.add(externalPrograms, 1, 5);
+
+        GridPane butpan = new GridPane();
+        int index = 0;
+        for (PushToApplication pushToApplication : frame.getPushApplications().getApplications()) {
+            addSettingsButton(pushToApplication, butpan, index);
+            index++;
         }
 
-        FormLayout layout = new FormLayout(
-                "1dlu, 8dlu, left:pref, 4dlu, fill:150dlu, 4dlu, fill:pref", "");
+        builder.add(butpan, 1, 6);
 
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
+        Label citeCommandLabel = new Label(Localization.lang("Cite command") + ':');
+        citeCommandLabel.setFont(FontSize.smallFont);
+        builder.add(citeCommandLabel, 1, 7);
+        builder.add(citeCommand, 2, 7);
+        builder.add(editFileTypes, 1, 8);
+        builder.add(new Label(""), 1, 9);
+        Label openConsole = new Label(Localization.lang("Open console") + "  ---------------------------------");
+        openConsole.setFont(FontSize.bigFont);
+        builder.add(openConsole, 1, 10);
 
-        builder.appendSeparator(Localization.lang("Sending of emails"));
-        builder.append(new JPanel());
-        JLabel lab = new JLabel(Localization.lang("Subject for sending an email with references").concat(":"));
-        builder.append(lab);
-        emailSubject = new JTextField(25);
-        builder.append(emailSubject);
-        builder.nextLine();
-        builder.append(new JPanel());
-        openFoldersOfAttachedFiles = new JCheckBox(Localization.lang("Automatically open folders of attached files"));
-        builder.append(openFoldersOfAttachedFiles);
-        builder.nextLine();
+        builder.add(consoleOptionPanel, 1, 11);
+        builder.add(new Label(""), 1, 12);
 
-        builder.appendSeparator(Localization.lang("External programs"));
-        builder.nextLine();
+        Label openPdf = new Label(Localization.lang("Open PDF") + "  -------------------------------------");
+        openPdf.setFont(FontSize.bigFont);
+        builder.add(openPdf,  1, 12);
 
-        JPanel butpan = new JPanel();
-        butpan.setLayout(new GridLayout(3, 3));
-        for (PushToApplication pushToApplication : frame.getPushApplications().getApplications()) {
-            addSettingsButton(pushToApplication, butpan);
-        }
-        builder.append(new JPanel());
-        builder.append(butpan, 3);
-
-        builder.nextLine();
-        lab = new JLabel(Localization.lang("Cite command") + ':');
-        JPanel pan = new JPanel();
-        builder.append(pan);
-        builder.append(lab);
-        builder.append(citeCommand);
-
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(editFileTypes);
-        builder.nextLine();
-
-        builder.appendSeparator(Localization.lang("Open console"));
-        builder.nextLine();
-        builder.append(new JPanel());
-        builder.append(consoleOptionPanel);
-        builder.nextLine();
-
-        builder.appendSeparator(Localization.lang("Open PDF"));
-        builder.nextLine();
-        builder.append(new JPanel());
-        builder.append(pdfOptionPanel);
-
-        pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        add(pan, BorderLayout.CENTER);
+        builder.add(pdfOptionPanel, 1, 13);
+        JFXPanel panel = CustomJFXPanel.wrap(new Scene(builder));
+        setLayout(new BorderLayout());
+        add(panel, BorderLayout.CENTER);
+    }
 
+    public Node getBuilder() {
+        return builder;
     }
 
-    private void addSettingsButton(final PushToApplication application, JPanel panel) {
+    private void addSettingsButton(final PushToApplication application, GridPane panel, int index) {
         PushToApplicationSettings settings = PushToApplications.getSettings(application);
-        JButton button = new JButton(Localization.lang("Settings for %0", application.getApplicationName()), application.getIcon().getIcon());
-        button.addActionListener(e -> PushToApplicationSettingsDialog.showSettingsDialog(null, settings));
-        panel.add(button);
+        Button button = new Button(Localization.lang("Settings for %0", application.getApplicationName()));
+        button.setFont(FontSize.smallFont);
+        button.setPrefSize(150, 20);
+        button.setOnAction(e -> PushToApplicationSettingsDialog.showSettingsDialog(null, settings, index));
+        if (index % 2 == 0) {
+            panel.add(button, 1, index / 2 + 1);
+        } else {
+            panel.add(button, 2, index / 2 + 1);
+        }
     }
 
     @Override
@@ -257,8 +214,8 @@ public String getTabName() {
     }
 
     private void updateExecuteConsoleButtonAndFieldEnabledState() {
-        browseButton.setEnabled(executeConsole.isSelected());
-        consoleCommand.setEnabled(executeConsole.isSelected());
+        browseButton.setDisable(!executeConsole.isSelected());
+        consoleCommand.setDisable(!executeConsole.isSelected());
     }
 
     private void showConsoleChooser() {
diff --git a/src/main/java/org/jabref/gui/preftabs/FileTab.java b/src/main/java/org/jabref/gui/preftabs/FileTab.java
index 7bee312c92e..0e1ede1e543 100644
--- a/src/main/java/org/jabref/gui/preftabs/FileTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/FileTab.java
@@ -1,21 +1,19 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ItemListener;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
+import javafx.collections.FXCollections;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.help.HelpAction;
@@ -28,156 +26,145 @@
 import org.jabref.model.metadata.FileDirectoryPreferences;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
 /**
  * Preferences tab for file options. These options were moved out from GeneralTab to
  * resolve the space issue.
  */
-class FileTab extends JPanel implements PrefsTab {
+class FileTab extends Pane implements PrefsTab {
 
     private final DialogService dialogService;
     private final JabRefPreferences prefs;
 
-    private final JCheckBox backup;
-    private final JCheckBox localAutoSave;
-    private final JCheckBox openLast;
-    private final JComboBox<String> newlineSeparator;
-    private final JCheckBox reformatFileOnSaveAndExport;
-    private final JRadioButton resolveStringsStandard;
-    private final JRadioButton resolveStringsAll;
-    private final JTextField nonWrappableFields;
-    private final JTextField doNotResolveStringsFor;
-
-    private final JTextField fileDir;
-    private final JCheckBox bibLocAsPrimaryDir;
-    private final JCheckBox runAutoFileSearch;
-    private final JCheckBox allowFileAutoOpenBrowse;
-    private final JRadioButton useRegExpComboBox;
-    private final JRadioButton matchExactKeyOnly = new JRadioButton(
+    private final CheckBox backup;
+    private final CheckBox localAutoSave;
+    private final CheckBox openLast;
+    private final ComboBox newlineSeparator;
+    private final CheckBox reformatFileOnSaveAndExport;
+    private final RadioButton resolveStringsStandard;
+    private final RadioButton resolveStringsAll;
+    private final TextField nonWrappableFields;
+    private final TextField doNotResolveStringsFor;
+    private final GridPane builder = new GridPane();
+
+    private final TextField fileDir;
+    private final CheckBox bibLocAsPrimaryDir;
+    private final CheckBox runAutoFileSearch;
+    private final CheckBox allowFileAutoOpenBrowse;
+    private final RadioButton useRegExpComboBox;
+    private final RadioButton matchExactKeyOnly = new RadioButton(
             Localization.lang("Autolink only files that match the BibTeX key"));
-    private final JRadioButton matchStartsWithKey = new JRadioButton(
+    private final RadioButton matchStartsWithKey = new RadioButton(
             Localization.lang("Autolink files with names starting with the BibTeX key"));
-    private final JTextField regExpTextField;
+    private final TextField regExpTextField;
 
     public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         this.dialogService = dialogService;
         this.prefs = prefs;
-
-        fileDir = new JTextField(25);
-        bibLocAsPrimaryDir = new JCheckBox(Localization.lang("Use the BIB file location as primary file directory"));
-        bibLocAsPrimaryDir.setToolTipText(Localization.lang("When downloading files, or moving linked files to the "
+        fileDir = new TextField();
+        bibLocAsPrimaryDir = new CheckBox(Localization.lang("Use the BIB file location as primary file directory"));
+        bibLocAsPrimaryDir.setFont(FontSize.smallFont);
+        bibLocAsPrimaryDir.setAccessibleText(Localization.lang("When downloading files, or moving linked files to the "
                 + "file directory, prefer the BIB file location rather than the file directory set above"));
-        runAutoFileSearch = new JCheckBox(
+        runAutoFileSearch = new CheckBox(
                 Localization.lang("When opening file link, search for matching file if no link is defined"));
-        allowFileAutoOpenBrowse = new JCheckBox(
+        runAutoFileSearch.setFont(FontSize.smallFont);
+        allowFileAutoOpenBrowse = new CheckBox(
                 Localization.lang("Automatically open browse dialog when creating new file link"));
-        regExpTextField = new JTextField(25);
-        useRegExpComboBox = new JRadioButton(Localization.lang("Use regular expression search"));
-        ItemListener regExpListener = e -> regExpTextField.setEditable(useRegExpComboBox.isSelected());
-        useRegExpComboBox.addItemListener(regExpListener);
-        ButtonGroup buttonGroup = new ButtonGroup();
-        buttonGroup.add(matchExactKeyOnly);
-        buttonGroup.add(matchStartsWithKey);
-        buttonGroup.add(useRegExpComboBox);
-
-        openLast = new JCheckBox(Localization.lang("Open last edited libraries at startup"));
-        backup = new JCheckBox(Localization.lang("Backup old file when saving"));
-        localAutoSave = new JCheckBox(Localization.lang("Autosave local libraries"));
-        resolveStringsAll = new JRadioButton(Localization.lang("Resolve strings for all fields except") + ":");
-        resolveStringsStandard = new JRadioButton(Localization.lang("Resolve strings for standard BibTeX fields only"));
-        ButtonGroup bg = new ButtonGroup();
-        bg.add(resolveStringsAll);
-        bg.add(resolveStringsStandard);
+        allowFileAutoOpenBrowse.setFont(FontSize.smallFont);
+        regExpTextField = new TextField();
+        useRegExpComboBox = new RadioButton(Localization.lang("Use regular expression search"));
+        useRegExpComboBox.setFont(FontSize.smallFont);
+        useRegExpComboBox.setOnAction(e -> regExpTextField.setEditable(useRegExpComboBox.isSelected()));
+
+        openLast = new CheckBox(Localization.lang("Open last edited libraries at startup"));
+        openLast.setFont(FontSize.smallFont);
+        backup = new CheckBox(Localization.lang("Backup old file when saving"));
+        backup.setFont(FontSize.smallFont);
+        localAutoSave = new CheckBox(Localization.lang("Autosave local libraries"));
+        localAutoSave.setFont(FontSize.smallFont);
+        resolveStringsAll = new RadioButton(Localization.lang("Resolve strings for all fields except") + ":");
+        resolveStringsAll.setFont(FontSize.smallFont);
+        resolveStringsStandard = new RadioButton(Localization.lang("Resolve strings for standard BibTeX fields only"));
+        resolveStringsStandard.setFont(FontSize.smallFont);
 
         // This is sort of a quick hack
-        newlineSeparator = new JComboBox<>(new String[] {"CR", "CR/LF", "LF"});
-
-        reformatFileOnSaveAndExport = new JCheckBox(Localization.lang("Always reformat BIB file on save and export"));
-
-        nonWrappableFields = new JTextField(25);
-        doNotResolveStringsFor = new JTextField(30);
-
-        FormLayout layout = new FormLayout("left:pref, 4dlu, fill:150dlu, 4dlu, fill:pref", ""); // left:pref, 4dlu, fill:pref
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-
-        builder.appendSeparator(Localization.lang("General"));
-        builder.nextLine();
-        builder.append(openLast, 3);
-        builder.nextLine();
-        builder.append(backup, 3);
-        builder.nextLine();
-
-        JLabel label = new JLabel(Localization.lang("Do not wrap the following fields when saving") + ":");
-        builder.append(label);
-        builder.append(nonWrappableFields);
-        builder.nextLine();
-        builder.append(resolveStringsStandard, 3);
-        builder.nextLine();
-        builder.append(resolveStringsAll);
-        builder.append(doNotResolveStringsFor);
-        builder.nextLine();
-
-        JLabel lab = new JLabel(Localization.lang("Newline separator") + ":");
-        builder.append(lab);
-        builder.append(newlineSeparator);
-        builder.nextLine();
-
-        builder.append(reformatFileOnSaveAndExport, 3);
-        builder.nextLine();
-
-        builder.appendSeparator(Localization.lang("External file links"));
-        builder.nextLine();
-        lab = new JLabel(Localization.lang("Main file directory") + ':');
-        builder.append(lab);
-        builder.append(fileDir);
-
-        JButton browse = new JButton(Localization.lang("Browse"));
-        browse.addActionListener(e -> {
-
+        newlineSeparator = new ComboBox<>(FXCollections.observableArrayList("CR", "CR/LF", "LF"));
+
+        reformatFileOnSaveAndExport = new CheckBox(Localization.lang("Always reformat BIB file on save and export"));
+        reformatFileOnSaveAndExport.setFont(FontSize.smallFont);
+
+        nonWrappableFields = new TextField();
+        doNotResolveStringsFor = new TextField();
+        nonWrappableFields.setPrefSize(80, 25);
+        doNotResolveStringsFor.setPrefSize(80, 25);
+        builder.setPrefSize(800, 600);
+
+        Label general = new Label(Localization.lang("General") + "  ----------------------------------------------");
+        general.setFont(FontSize.bigFont);
+        builder.add(general, 1, 1);
+        builder.add(openLast,  1, 2);
+        builder.add(backup, 1, 3);
+        Label label = new Label(Localization.lang("Do not wrap the following fields when saving") + ":");
+        label.setFont(FontSize.smallFont);
+        builder.add(label, 1, 4);
+        builder.add(nonWrappableFields, 2, 4);
+        builder.add(resolveStringsStandard,  1, 5);
+        builder.add(resolveStringsAll, 1, 6);
+        builder.add(doNotResolveStringsFor, 2, 6);
+
+        Label newlineSeparatorLabel = new Label(Localization.lang("Newline separator") + ":");
+        newlineSeparatorLabel.setFont(FontSize.smallFont);
+        builder.add(newlineSeparatorLabel, 1, 7);
+        builder.add(newlineSeparator, 2, 7);
+        builder.add(reformatFileOnSaveAndExport, 1, 8);
+        Label invisible = new Label("");
+        builder.add(invisible, 1, 9);
+
+        Label externalFileLinks = new Label(Localization.lang("External file links") + "  ------------------------------------");
+        externalFileLinks.setFont(FontSize.bigFont);
+        builder.add(externalFileLinks, 1, 11);
+
+        label = new Label(Localization.lang("Main file directory") + ':');
+        label.setFont(FontSize.smallFont);
+        builder.add(label, 1, 12);
+        builder.add(fileDir, 2, 12);
+
+        Button browse = new Button(Localization.lang("Browse"));
+        browse.setPrefSize(80, 20);
+        browse.setFont(FontSize.smallFont);
+        browse.setOnAction(e -> {
             DirectoryDialogConfiguration dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
                     .withInitialDirectory(Paths.get(fileDir.getText())).build();
-
             DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showDirectorySelectionDialog(dirDialogConfiguration))
                     .ifPresent(f -> fileDir.setText(f.toString()));
-
         });
-        builder.append(browse);
-
-        builder.nextLine();
-        builder.append(bibLocAsPrimaryDir, 3);
-        builder.nextLine();
-        builder.append(matchStartsWithKey, 3);
-        builder.nextLine();
-        builder.append(matchExactKeyOnly, 3);
-        builder.nextLine();
-        builder.append(useRegExpComboBox);
-        builder.append(regExpTextField);
-
-        builder.append(new HelpAction(Localization.lang("Help on regular expression search"),
-                HelpFile.REGEX_SEARCH)
-                        .getHelpButton());
-        builder.nextLine();
-        builder.append(runAutoFileSearch, 3);
-        builder.nextLine();
-        builder.append(allowFileAutoOpenBrowse);
-        builder.nextLine();
-
-        builder.appendSeparator(Localization.lang("Autosave"));
-        builder.append(localAutoSave, 1);
-        JButton help = new HelpAction(HelpFile.AUTOSAVE).getHelpButton();
-        help.setPreferredSize(new Dimension(24, 24));
-        JPanel hPan = new JPanel();
-        hPan.setLayout(new BorderLayout());
-        hPan.add(help, BorderLayout.EAST);
-        builder.append(hPan);
-        builder.nextLine();
-
-        JPanel pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        setLayout(new BorderLayout());
-        add(pan, BorderLayout.CENTER);
+        builder.add(browse, 3, 12);
+        builder.add(bibLocAsPrimaryDir, 1, 13);
+        builder.add(matchStartsWithKey,  1, 14);
+        builder.add(matchExactKeyOnly,  1, 15);
+        builder.add(useRegExpComboBox, 1, 16);
+        builder.add(regExpTextField, 2, 16);
+
+        Button help = new Button("?");
+        help.setFont(FontSize.smallFont);
+        help.setOnAction(event -> new HelpAction(Localization.lang("Help on regular expression search"),
+                HelpFile.REGEX_SEARCH).getHelpButton().doClick());
+
+        builder.add(help, 3, 16);
+        builder.add(runAutoFileSearch, 1, 17);
+        builder.add(allowFileAutoOpenBrowse, 1, 18);
+
+        Label invisible1 = new Label("");
+        builder.add(invisible1, 1, 19);
+
+        Label autosave = new Label(Localization.lang("Autosave") + "  ---------------------------------------------");
+        autosave.setFont(FontSize.bigFont);
+        builder.add(autosave, 1, 20);
+        builder.add(localAutoSave,  1, 21);
+        Button help1 = new Button("?");
+        help1.setFont(FontSize.smallFont);
+        help1.setOnAction(event -> new HelpAction(HelpFile.AUTOSAVE).getHelpButton().doClick());
+        builder.add(help1, 2, 21);
     }
 
     @Override
@@ -200,12 +187,12 @@ public void setValues() {
 
         String newline = prefs.get(JabRefPreferences.NEWLINE);
         if ("\r".equals(newline)) {
-            newlineSeparator.setSelectedIndex(0);
+            newlineSeparator.setValue("CR");
         } else if ("\n".equals(newline)) {
-            newlineSeparator.setSelectedIndex(2);
+            newlineSeparator.setValue("LF");
         } else {
             // fallback: windows standard
-            newlineSeparator.setSelectedIndex(1);
+            newlineSeparator.setValue("CR/LF");
         }
         reformatFileOnSaveAndExport.setSelected(prefs.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT));
 
@@ -217,6 +204,10 @@ public void setValues() {
         localAutoSave.setSelected(prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE));
     }
 
+    public Node getBuilder() {
+        return builder;
+    }
+
     @Override
     public void storeSettings() {
         prefs.put(FieldName.FILE + FileDirectoryPreferences.DIR_SUFFIX, fileDir.getText());
@@ -230,11 +221,11 @@ public void storeSettings() {
         }
 
         String newline;
-        switch (newlineSeparator.getSelectedIndex()) {
-            case 0:
+        switch (newlineSeparator.getPromptText()) {
+            case "CR":
                 newline = "\r";
                 break;
-            case 2:
+            case "LF":
                 newline = "\n";
                 break;
             default:
diff --git a/src/main/java/org/jabref/gui/preftabs/FontSize.java b/src/main/java/org/jabref/gui/preftabs/FontSize.java
new file mode 100644
index 00000000000..3c6e45c5046
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preftabs/FontSize.java
@@ -0,0 +1,11 @@
+package org.jabref.gui.preftabs;
+
+import javafx.scene.text.Font;
+
+/**
+ *   This class is used to save the font size of all the controls in the preferences dialog
+ */
+public class FontSize {
+    public static Font bigFont = new Font(14);
+    public static Font smallFont = new Font(10);
+}
diff --git a/src/main/java/org/jabref/gui/preftabs/GeneralTab.java b/src/main/java/org/jabref/gui/preftabs/GeneralTab.java
index 705b35a7de5..f7d0653a616 100644
--- a/src/main/java/org/jabref/gui/preftabs/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/GeneralTab.java
@@ -1,20 +1,19 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
 import java.nio.charset.Charset;
 import java.time.format.DateTimeFormatter;
 
-import javax.swing.BorderFactory;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
+import javafx.scene.shape.Line;
 
 import org.jabref.Globals;
 import org.jabref.gui.DialogService;
@@ -27,136 +26,129 @@
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
 import static org.jabref.logic.l10n.Languages.LANGUAGES;
 
-class GeneralTab extends JPanel implements PrefsTab {
-
-    private final JCheckBox useOwner;
-    private final JCheckBox overwriteOwner;
-    private final JCheckBox enforceLegalKeys;
-    private final JCheckBox shouldCollectTelemetry;
-    private final JCheckBox confirmDelete;
-    private final JCheckBox memoryStick;
-    private final JCheckBox inspectionWarnDupli;
-    private final JCheckBox useTimeStamp;
-    private final JCheckBox updateTimeStamp;
-    private final JCheckBox overwriteTimeStamp;
-    private final JTextField defOwnerField;
-
-    private final JTextField timeStampFormat;
-    private final JTextField timeStampField;
+class GeneralTab extends Pane implements PrefsTab {
+
+    private final CheckBox useOwner;
+    private final CheckBox overwriteOwner;
+    private final CheckBox enforceLegalKeys;
+    private final CheckBox shouldCollectTelemetry;
+    private final CheckBox confirmDelete;
+    private final CheckBox memoryStick;
+    private final CheckBox inspectionWarnDupli;
+    private final CheckBox useTimeStamp;
+    private final CheckBox updateTimeStamp;
+    private final CheckBox overwriteTimeStamp;
+    private final TextField defOwnerField;
+    private final GridPane builder = new GridPane();
+
+    private final TextField timeStampFormat;
+    private final TextField timeStampField;
     private final JabRefPreferences prefs;
-    private final JComboBox<String> language = new JComboBox<>(LANGUAGES.keySet().toArray(new String[LANGUAGES.keySet().size()]));
-    private final JComboBox<Charset> encodings;
-    private final JComboBox<BibDatabaseMode> biblatexMode;
-    private final DialogService dialogService;
-
-    public class DefaultBibModeRenderer extends DefaultListCellRenderer {
 
-        @Override
-        public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected,
-                boolean cellHasFocus) {
-            super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            setText(((BibDatabaseMode) value).getFormattedName());
-            return this;
-        }
-    }
+    private final ObservableList<String> options = FXCollections.observableArrayList(LANGUAGES.keySet().toArray(new String[LANGUAGES.keySet().size()]));
+    private final ComboBox<String> language = new ComboBox<>(options);
+    private final ComboBox<Charset> encodings;
+    private final ComboBox<BibDatabaseMode> biblatexMode;
+    private final DialogService dialogService;
 
     public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         this.prefs = prefs;
         this.dialogService = dialogService;
-        setLayout(new BorderLayout());
-
-        biblatexMode = new JComboBox<>(BibDatabaseMode.values());
-        biblatexMode.setRenderer(new DefaultBibModeRenderer());
-
-        memoryStick = new JCheckBox(Localization.lang("Load and Save preferences from/to jabref.xml on start-up (memory stick mode)"));
-        useOwner = new JCheckBox(Localization.lang("Mark new entries with owner name") + ':');
-        updateTimeStamp = new JCheckBox(Localization.lang("Update timestamp on modification"));
-        useTimeStamp = new JCheckBox(Localization.lang("Mark new entries with addition date") + ". "
+        biblatexMode = new ComboBox<>(FXCollections.observableArrayList(BibDatabaseMode.values()));
+
+        memoryStick = new CheckBox(Localization.lang("Load and Save preferences from/to jabref.xml on start-up (memory stick mode)"));
+        memoryStick.setFont(FontSize.smallFont);
+        useOwner = new CheckBox(Localization.lang("Mark new entries with owner name") + ':');
+        useOwner.setFont(FontSize.smallFont);
+        updateTimeStamp = new CheckBox(Localization.lang("Update timestamp on modification"));
+        updateTimeStamp.setFont(FontSize.smallFont);
+        useTimeStamp = new CheckBox(Localization.lang("Mark new entries with addition date") + ". "
                 + Localization.lang("Date format") + ':');
-        useTimeStamp.addChangeListener(e -> updateTimeStamp.setEnabled(useTimeStamp.isSelected()));
-        overwriteOwner = new JCheckBox(Localization.lang("Overwrite"));
-        overwriteTimeStamp = new JCheckBox(Localization.lang("Overwrite"));
-        overwriteOwner.setToolTipText(Localization.lang("If a pasted or imported entry already has "
-                + "the field set, overwrite."));
-        overwriteTimeStamp.setToolTipText(Localization.lang("If a pasted or imported entry already has "
-                + "the field set, overwrite."));
-        enforceLegalKeys = new JCheckBox(Localization.lang("Enforce legal characters in BibTeX keys"));
-        confirmDelete = new JCheckBox(Localization.lang("Show confirmation dialog when deleting entries"));
-
-        defOwnerField = new JTextField();
-        timeStampFormat = new JTextField();
-        timeStampField = new JTextField();
-        inspectionWarnDupli = new JCheckBox(Localization.lang("Warn about unresolved duplicates when closing inspection window"));
-
-        shouldCollectTelemetry = new JCheckBox(Localization.lang("Collect and share telemetry data to help improve JabRef."));
-
-        encodings = new JComboBox<>();
-        encodings.setModel(new DefaultComboBoxModel<>(Encodings.ENCODINGS));
-
-        FormLayout layout = new FormLayout(
-                "8dlu, 1dlu, left:pref:grow, 4dlu, fill:pref, 4dlu, fill:pref, 4dlu, left:pref, 1dlu, left:pref, 4dlu, left:pref",
-                "");
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-
-        builder.appendSeparator(Localization.lang("General"));
-        builder.nextLine();
-        builder.append(inspectionWarnDupli, 13);
-        builder.nextLine();
-        builder.append(confirmDelete, 13);
-        builder.nextLine();
-        builder.append(enforceLegalKeys, 13);
-        builder.nextLine();
-        builder.append(memoryStick, 13);
+        useTimeStamp.setFont(FontSize.smallFont);
+        if (!useTimeStamp.isSelected()) {
+            updateTimeStamp.setDisable(true);
+        }
+        useTimeStamp.setOnAction(e->updateTimeStamp.setDisable(!useTimeStamp.isSelected()));
+        overwriteOwner = new CheckBox(Localization.lang("Overwrite"));
+        overwriteOwner.setFont(FontSize.smallFont);
+        overwriteTimeStamp = new CheckBox(Localization.lang("If a pasted or imported entry already has the field set, overwrite."));
+        overwriteTimeStamp.setFont(FontSize.smallFont);
+        enforceLegalKeys = new CheckBox(Localization.lang("Enforce legal characters in BibTeX keys"));
+        enforceLegalKeys.setFont(FontSize.smallFont);
+        confirmDelete = new CheckBox(Localization.lang("Show confirmation dialog when deleting entries"));
+        confirmDelete.setFont(FontSize.smallFont);
+        defOwnerField = new TextField();
+        defOwnerField.setPrefSize(80, 20);
+        timeStampFormat = new TextField();
+        timeStampFormat.setPrefSize(80, 20);
+        timeStampField = new TextField();
+        timeStampField.setPrefSize(80, 20);
+        inspectionWarnDupli = new CheckBox(Localization.lang("Warn about unresolved duplicates when closing inspection window"));
+        inspectionWarnDupli.setFont(FontSize.smallFont);
+        shouldCollectTelemetry = new CheckBox(Localization.lang("Collect and share telemetry data to help improve JabRef."));
+        shouldCollectTelemetry.setFont(FontSize.smallFont);
+        encodings = new ComboBox<>(FXCollections.observableArrayList(Encodings.ENCODINGS));
+
+        Label general = new Label(Localization.lang("General") + "  -----------------------------------------------");
+        general.setFont(FontSize.bigFont);
+        builder.add(general, 1, 1);
+        builder.add(new Line(), 1, 2);
+        builder.add(inspectionWarnDupli, 1, 3);
+        builder.add(new Line(), 1, 4);
+        builder.add(confirmDelete, 1, 5);
+        builder.add(new Line(), 1, 6);
+        builder.add(enforceLegalKeys, 1, 7);
+        builder.add(new Line(), 1, 8);
+        builder.add(memoryStick, 1, 9);
 
         // Create a new panel with its own FormLayout for the last items:
-        builder.append(useOwner, 3);
-        builder.append(defOwnerField);
-        builder.append(overwriteOwner);
-        builder.append(new JPanel(), 3);
-
-        JButton help = new HelpAction(HelpFile.OWNER).getHelpButton();
-        builder.append(help);
-        builder.nextLine();
-
-        builder.append(useTimeStamp, 3);
-        builder.append(timeStampFormat);
-        builder.append(overwriteTimeStamp);
-        builder.append(Localization.lang("Field name") + ':');
-        builder.append(timeStampField);
-
-        help = new HelpAction(HelpFile.TIMESTAMP).getHelpButton();
-        builder.append(help);
-        builder.nextLine();
-
-        builder.append(new JPanel());
-        builder.append(updateTimeStamp, 11);
-        builder.nextLine();
-
-        builder.append(shouldCollectTelemetry, 13);
-        builder.nextLine();
-        JLabel lab;
-        lab = new JLabel(Localization.lang("Language") + ':');
-        builder.append(lab, 3);
-        builder.append(language);
-        builder.nextLine();
-        lab = new JLabel(Localization.lang("Default encoding") + ':');
-        builder.append(lab, 3);
-        builder.append(encodings);
-
-        builder.nextLine();
-        builder.appendSeparator(Localization.lang("Default bibliography mode"));
-        builder.append(new JPanel());
-        builder.append(biblatexMode);
-
-        JPanel pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        add(pan, BorderLayout.CENTER);
+        builder.add(useOwner, 1, 10);
+        builder.add(defOwnerField, 2, 10);
+        builder.add(overwriteOwner, 3, 10);
+
+        Button help = new Button("?");
+        help.setFont(FontSize.smallFont);
+        help.setPrefSize(10, 10);
+        help.setOnAction(event -> new HelpAction(HelpFile.OWNER).getHelpButton().doClick());
+        builder.add(help, 4, 10);
+
+        builder.add(useTimeStamp, 1, 13);
+        builder.add(timeStampFormat, 2, 13);
+        builder.add(overwriteTimeStamp, 3, 13);
+        Label fieldName = new Label(Localization.lang("Field name") + ':');
+        fieldName.setFont(FontSize.smallFont);
+        builder.add(fieldName, 4, 13);
+        builder.add(timeStampField, 5, 13);
+
+        Button help1 = new Button("?");
+        help1.setFont(FontSize.smallFont);
+        help1.setOnAction(event -> new HelpAction(HelpFile.TIMESTAMP).getHelpButton().doClick());
+        builder.add(help1, 6, 13);
+
+        builder.add(updateTimeStamp, 1, 14);
+        builder.add(new Line(), 1, 15);
+
+        builder.add(shouldCollectTelemetry, 1, 15);
+        builder.add(new Line(), 1, 16);
+        Label languageLabel = new Label(Localization.lang("Language") + ':');
+        languageLabel.setFont(FontSize.smallFont);
+        builder.add(languageLabel, 1, 17);
+        builder.add(language, 2, 17);
+        builder.add(new Line(), 2, 18);
+        Label defaultEncoding = new Label(Localization.lang("Default encoding") + ':');
+        defaultEncoding.setFont(FontSize.smallFont);
+        builder.add(defaultEncoding, 1, 19);
+        builder.add(encodings, 2, 19);
+        Label defaultBibliographyMode = new Label(Localization.lang("Default bibliography mode"));
+        defaultBibliographyMode.setFont(FontSize.smallFont);
+        builder.add(defaultBibliographyMode, 1, 20);
+        builder.add(biblatexMode, 2, 20);
+    }
 
+    public Node getBuilder() {
+        return builder;
     }
 
     @Override
@@ -166,7 +158,7 @@ public void setValues() {
         useTimeStamp.setSelected(prefs.getBoolean(JabRefPreferences.USE_TIME_STAMP));
         overwriteTimeStamp.setSelected(prefs.getBoolean(JabRefPreferences.OVERWRITE_TIME_STAMP));
         updateTimeStamp.setSelected(prefs.getBoolean(JabRefPreferences.UPDATE_TIMESTAMP));
-        updateTimeStamp.setEnabled(useTimeStamp.isSelected());
+        updateTimeStamp.setSelected(useTimeStamp.isSelected());
         enforceLegalKeys.setSelected(prefs.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
         shouldCollectTelemetry.setSelected(prefs.shouldCollectTelemetry());
         memoryStick.setSelected(prefs.getBoolean(JabRefPreferences.MEMORY_STICK_MODE));
@@ -176,13 +168,13 @@ public void setValues() {
         timeStampField.setText(prefs.get(JabRefPreferences.TIME_STAMP_FIELD));
         inspectionWarnDupli.setSelected(prefs.getBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION));
         if (Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE)) {
-            biblatexMode.setSelectedItem(BibDatabaseMode.BIBLATEX);
+            biblatexMode.setValue(BibDatabaseMode.BIBLATEX);
         } else {
-            biblatexMode.setSelectedItem(BibDatabaseMode.BIBTEX);
+            biblatexMode.setValue(BibDatabaseMode.BIBTEX);
         }
 
         Charset enc = Globals.prefs.getDefaultEncoding();
-        encodings.setSelectedItem(enc);
+        encodings.setValue(enc);
 
         String oldLan = prefs.get(JabRefPreferences.LANGUAGE);
 
@@ -190,7 +182,7 @@ public void setValues() {
         int ilk = 0;
         for (String lan : LANGUAGES.values()) {
             if (lan.equals(oldLan)) {
-                language.setSelectedIndex(ilk);
+                language.setVisibleRowCount(ilk);
             }
             ilk++;
         }
@@ -221,12 +213,12 @@ public void storeSettings() {
         prefs.put(JabRefPreferences.TIME_STAMP_FIELD, timeStampField.getText().trim());
         // Update name of the time stamp field based on preferences
         InternalBibtexFields.updateTimeStampField(Globals.prefs.get(JabRefPreferences.TIME_STAMP_FIELD));
-        prefs.setDefaultEncoding((Charset) encodings.getSelectedItem());
-        prefs.putBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE, biblatexMode.getSelectedItem() == BibDatabaseMode.BIBLATEX);
+        prefs.setDefaultEncoding(encodings.getValue());
+        prefs.putBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE, biblatexMode.getValue().equals(BibDatabaseMode.BIBLATEX));
 
-        if (!LANGUAGES.get(language.getSelectedItem()).equals(prefs.get(JabRefPreferences.LANGUAGE))) {
-            prefs.put(JabRefPreferences.LANGUAGE, LANGUAGES.get(language.getSelectedItem()));
-            Localization.setLanguage(LANGUAGES.get(language.getSelectedItem()));
+        if (!LANGUAGES.get(language.getValue()).equals(prefs.get(JabRefPreferences.LANGUAGE))) {
+            prefs.put(JabRefPreferences.LANGUAGE, LANGUAGES.get(language.getValue()));
+            Localization.setLanguage(LANGUAGES.get(language.getValue()));
             // Update any defaults that might be language dependent:
             Globals.prefs.setLanguageDependentDefaultValues();
             // Warn about restart needed:
diff --git a/src/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java b/src/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java
index aa071674220..38af586d31c 100644
--- a/src/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java
@@ -1,108 +1,73 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
 
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
+class GroupsPrefsTab extends Pane implements PrefsTab {
 
-class GroupsPrefsTab extends JPanel implements PrefsTab {
-
-    private final JCheckBox hideNonHits = new JCheckBox(Localization.lang("Hide non-hits"));
-    private final JCheckBox grayOut = new JCheckBox(Localization.lang("Gray out non-hits"));
-    private final JCheckBox autoAssignGroup = new JCheckBox(Localization.lang("Automatically assign new entry to selected groups"));
-    private final JRadioButton multiSelectionModeIntersection = new JRadioButton(Localization.lang("Intersection"));
-    private final JRadioButton multiSelectionModeUnion = new JRadioButton(Localization.lang("Union"));
-
-    private final JTextField groupingField = new JTextField(20);
-    private final JTextField keywordSeparator = new JTextField(2);
+    private final CheckBox hideNonHits = new CheckBox(Localization.lang("Hide non-hits"));
+    private final CheckBox grayOut = new CheckBox(Localization.lang("Gray out non-hits"));
+    private final CheckBox autoAssignGroup = new CheckBox(Localization.lang("Automatically assign new entry to selected groups"));
+    private final RadioButton multiSelectionModeIntersection = new RadioButton(Localization.lang("Intersection"));
+    private final RadioButton multiSelectionModeUnion = new RadioButton(Localization.lang("Union"));
 
+    private final TextField groupingField = new TextField();
+    private final TextField keywordSeparator = new TextField();
+    private final GridPane builder = new GridPane();
     private final JabRefPreferences prefs;
 
     public GroupsPrefsTab(JabRefPreferences prefs) {
         this.prefs = prefs;
 
-        keywordSeparator.addFocusListener(new FocusListener() {
-
+        keywordSeparator.setOnAction(new EventHandler<ActionEvent>() {
             @Override
-            public void focusGained(FocusEvent e) {
+            public void handle(ActionEvent event) {
                 keywordSeparator.selectAll();
             }
-
-            @Override
-            public void focusLost(FocusEvent e) {
-                // deselection is automatic
-            }
         });
 
-        ButtonGroup hideMode = new ButtonGroup();
-        hideMode.add(grayOut);
-        hideMode.add(hideNonHits);
-
-        ButtonGroup multiSelectionMode = new ButtonGroup();
-        multiSelectionMode.add(multiSelectionModeIntersection);
-        multiSelectionMode.add(multiSelectionModeUnion);
-        multiSelectionModeIntersection.setToolTipText(Localization.lang("Display only entries belonging to all selected groups."));
-        multiSelectionModeUnion.setToolTipText(Localization.lang("Display all entries belonging to one or more of the selected groups."));
-
-        FormLayout layout = new FormLayout("9dlu, pref", //500px",
-                                           "p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p");
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.appendSeparator(Localization.lang("View"));
-        builder.nextLine();
-        builder.nextLine();
-        builder.nextColumn();
-        builder.append(hideNonHits);
-        builder.nextLine();
-        builder.nextLine();
-        builder.nextColumn();
-        builder.append(grayOut);
-        builder.nextLine();
-        builder.nextLine();
-        builder.nextColumn();
-        builder.append(multiSelectionModeIntersection);
-        builder.nextLine();
-        builder.nextLine();
-        builder.nextColumn();
-        builder.append(multiSelectionModeUnion);
-        builder.nextLine();
-        builder.nextLine();
-        builder.nextColumn();
-        builder.append(autoAssignGroup);
-        builder.nextLine();
-        builder.nextLine();
-        builder.appendSeparator(Localization.lang("Dynamic groups"));
-        builder.nextLine();
-        builder.nextLine();
-        builder.nextColumn();
-        // build subcomponent
-        FormLayout layout2 = new FormLayout("left:pref, 2dlu, left:pref", "p, 3dlu, p");
-        DefaultFormBuilder builder2 = new DefaultFormBuilder(layout2);
-        builder2.append(new JLabel(Localization.lang("Default grouping field") + ":"));
-        builder2.append(groupingField);
-        builder2.nextLine();
-        builder2.nextLine();
-        builder2.append(new JLabel(Localization.lang("When adding/removing keywords, separate them by") + ":"));
-        builder2.append(keywordSeparator);
-        builder.append(builder2.getPanel());
-
-        setLayout(new BorderLayout());
-        JPanel panel = builder.getPanel();
-        panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        add(panel, BorderLayout.CENTER);
+        multiSelectionModeIntersection.setText(Localization.lang("Display only entries belonging to all selected groups."));
+        multiSelectionModeIntersection.setFont(FontSize.smallFont);
+        multiSelectionModeUnion.setText(Localization.lang("Display all entries belonging to one or more of the selected groups."));
+        multiSelectionModeUnion.setFont(FontSize.smallFont);
+
+        Label view = new Label(Localization.lang("View") + "  ---------------------------------------");
+        view.setFont(FontSize.bigFont);
+        builder.add(view, 1, 1);
+        builder.add(hideNonHits, 2, 2);
+        builder.add(grayOut, 2, 3);
+        builder.add(multiSelectionModeIntersection, 2, 4);
+        builder.add(multiSelectionModeUnion, 2, 5);
+        builder.add(autoAssignGroup, 2, 6);
+        builder.add(new Label(""), 1, 7);
+
+        Label dynamicGroups = new Label(Localization.lang("Dynamic groups") + "  --------------------------");
+        dynamicGroups.setFont(FontSize.bigFont);
+        builder.add(dynamicGroups, 1, 8);
+
+        Label defaultGrouping = new Label(Localization.lang("Default grouping field") + ":");
+        defaultGrouping.setFont(FontSize.smallFont);
+        builder.add(defaultGrouping, 1, 9);
+        builder.add(groupingField, 2, 9);
+        Label label = new Label(Localization.lang("When adding/removing keywords, separate them by") + ":");
+        label.setFont(FontSize.smallFont);
+        builder.add(label, 1, 10);
+        builder.add(keywordSeparator, 2, 10);
+    }
+
+    public Node getBuilder() {
+        return builder;
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java b/src/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java
index 1aea509991f..a47bf24ce17 100644
--- a/src/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java
@@ -1,27 +1,23 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
 import java.util.Objects;
 
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
+import javafx.collections.FXCollections;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.Separator;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.pdfimport.ImportDialog;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-public class ImportSettingsTab extends JPanel implements PrefsTab {
+public class ImportSettingsTab extends Pane implements PrefsTab {
 
     public static final String[] DEFAULT_FILENAMEPATTERNS = new String[] {"[bibtexkey]",
             "[bibtexkey] - [title]"};
@@ -30,84 +26,70 @@ public class ImportSettingsTab extends JPanel implements PrefsTab {
     private static final String[] DEFAULT_FILENAMEPATTERNS_DISPLAY = new String[] {"bibtexkey", "bibtexkey - title",};
 
     private final JabRefPreferences prefs;
-    private final JRadioButton radioButtonXmp;
-    private final JRadioButton radioButtonPDFcontent;
-    private final JRadioButton radioButtonNoMeta;
-    private final JRadioButton radioButtononlyAttachPDF;
-    private final JCheckBox useDefaultPDFImportStyle;
+    private final RadioButton radioButtonXmp;
+    private final RadioButton radioButtonPDFcontent;
+    private final RadioButton radioButtonNoMeta;
+    private final RadioButton radioButtononlyAttachPDF;
+    private final CheckBox useDefaultPDFImportStyle;
+    private final GridPane builder = new GridPane();
+    private final TextField fileNamePattern;
+    private final ComboBox<String> selectFileNamePattern;
 
-    private final JTextField fileNamePattern;
-    private final JButton selectFileNamePattern;
 
-    private final JTextField fileDirPattern;
+    private final TextField fileDirPattern;
 
     public ImportSettingsTab(JabRefPreferences prefs) {
         this.prefs = Objects.requireNonNull(prefs);
-
-        setLayout(new BorderLayout());
-        FormLayout layout = new FormLayout("1dlu, 8dlu, left:pref, 4dlu, fill:3dlu");
-        radioButtonNoMeta = new JRadioButton(Localization.lang("Create blank entry linking the PDF"));
-        radioButtonXmp = new JRadioButton(Localization.lang("Create entry based on XMP-metadata"));
-        radioButtonPDFcontent = new JRadioButton(Localization.lang("Create entry based on content"));
-        radioButtononlyAttachPDF = new JRadioButton(Localization.lang("Only attach PDF"));
-        ButtonGroup bg = new ButtonGroup();
-        bg.add(radioButtonNoMeta);
-        bg.add(radioButtonXmp);
-        bg.add(radioButtonPDFcontent);
-        bg.add(radioButtononlyAttachPDF);
-
-        useDefaultPDFImportStyle = new JCheckBox(
+        radioButtonNoMeta = new RadioButton(Localization.lang("Create blank entry linking the PDF"));
+        radioButtonNoMeta.setFont(FontSize.smallFont);
+        radioButtonXmp = new RadioButton(Localization.lang("Create entry based on XMP-metadata"));
+        radioButtonXmp.setFont(FontSize.smallFont);
+        radioButtonPDFcontent = new RadioButton(Localization.lang("Create entry based on content"));
+        radioButtonPDFcontent.setFont(FontSize.smallFont);
+        radioButtononlyAttachPDF = new RadioButton(Localization.lang("Only attach PDF"));
+        radioButtononlyAttachPDF.setFont(FontSize.smallFont);
+
+        useDefaultPDFImportStyle = new CheckBox(
                 Localization.lang("Always use this PDF import style (and do not ask for each import)"));
+        useDefaultPDFImportStyle.setFont(FontSize.smallFont);
+
+        fileNamePattern = new TextField();
+        fileDirPattern = new TextField();
+        selectFileNamePattern = new ComboBox<>();
+        selectFileNamePattern.getItems().addAll(FXCollections.observableArrayList(DEFAULT_FILENAMEPATTERNS_DISPLAY));
+        selectFileNamePattern.setValue(Localization.lang("Choose pattern"));
+        selectFileNamePattern.setOnAction(e -> {
+            fileNamePattern.setText(selectFileNamePattern.getValue());
+        });
+
+        Label defaultImportStyle = new Label(Localization.lang("Default import style for drag and drop of PDFs"));
+        defaultImportStyle.setFont(FontSize.bigFont);
+        builder.add(defaultImportStyle, 1, 1);
+        builder.add(new Separator(), 2, 1);
+        builder.add(radioButtonNoMeta, 2, 2);
+        builder.add(radioButtonXmp, 2, 3);
+        builder.add(radioButtonPDFcontent, 2, 4);
+        builder.add(radioButtononlyAttachPDF, 2, 5);
+        builder.add(useDefaultPDFImportStyle, 2, 6);
+        builder.add(new Label(""), 1, 7);
+
+        Label defaultPdfFileLinkAction = new Label(Localization.lang("Default PDF file link action") + "  ------------------------");
+        defaultPdfFileLinkAction.setFont(FontSize.bigFont);
+        builder.add(defaultPdfFileLinkAction, 1, 8);
+        Label filenameFormatPattern = new Label(Localization.lang("Filename format pattern").concat(":"));
+        filenameFormatPattern.setFont(FontSize.smallFont);
+        builder.add(filenameFormatPattern, 1, 9);
+        builder.add(fileNamePattern, 2, 9);
+        builder.add(selectFileNamePattern, 3, 9);
+
+        Label lbfileDirPattern = new Label(Localization.lang("File directory pattern").concat(":"));
+        lbfileDirPattern.setFont(FontSize.smallFont);
+        builder.add(lbfileDirPattern, 1, 10);
+        builder.add(fileDirPattern, 2, 10);
+    }
 
-        fileNamePattern = new JTextField(50);
-        fileDirPattern = new JTextField(50);
-        selectFileNamePattern = new JButton(Localization.lang("Choose pattern"));
-        selectFileNamePattern.addActionListener(e -> openFilePatternMenu());
-
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        JPanel pan = new JPanel();
-
-        builder.appendSeparator(Localization.lang("Default import style for drag and drop of PDFs"));
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(radioButtonNoMeta);
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(radioButtonXmp);
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(radioButtonPDFcontent);
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(radioButtononlyAttachPDF);
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(useDefaultPDFImportStyle);
-        builder.nextLine();
-
-        builder.appendSeparator(Localization.lang("Default PDF file link action"));
-        builder.nextLine();
-        builder.append(pan);
-
-        JPanel pan2 = new JPanel();
-        JLabel lab = new JLabel(Localization.lang("Filename format pattern").concat(":"));
-        pan2.add(lab);
-        pan2.add(fileNamePattern);
-        pan2.add(selectFileNamePattern);
-        builder.append(pan2);
-
-        JPanel pan3 = new JPanel();
-        JLabel lbfileDirPattern = new JLabel(Localization.lang("File directory pattern").concat(":"));
-        pan3.add(lbfileDirPattern);
-        pan3.add(fileDirPattern);
-
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(pan3);
-
-        pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        add(pan, BorderLayout.CENTER);
+    public Node getBuilder() {
+        return builder;
     }
 
     @Override
@@ -116,22 +98,22 @@ public void setValues() {
         useDefaultPDFImportStyle.setSelected(prefs.getBoolean(JabRefPreferences.IMPORT_ALWAYSUSE));
         int style = prefs.getInt(JabRefPreferences.IMPORT_DEFAULT_PDF_IMPORT_STYLE);
         switch (style) {
-        case ImportDialog.NOMETA:
-            radioButtonNoMeta.setSelected(true);
-            break;
-        case ImportDialog.XMP:
-            radioButtonXmp.setSelected(true);
-            break;
-        case ImportDialog.CONTENT:
-            radioButtonPDFcontent.setSelected(true);
-            break;
-        case ImportDialog.ONLYATTACH:
-            radioButtononlyAttachPDF.setSelected(true);
-            break;
-        default:
-            // fallback
-            radioButtonPDFcontent.setSelected(true);
-            break;
+            case ImportDialog.NOMETA:
+                radioButtonNoMeta.setSelected(true);
+                break;
+            case ImportDialog.XMP:
+                radioButtonXmp.setSelected(true);
+                break;
+            case ImportDialog.CONTENT:
+                radioButtonPDFcontent.setSelected(true);
+                break;
+            case ImportDialog.ONLYATTACH:
+                radioButtononlyAttachPDF.setSelected(true);
+                break;
+            default:
+                // fallback
+                radioButtonPDFcontent.setSelected(true);
+                break;
         }
         fileNamePattern.setText(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
         fileDirPattern.setText(prefs.get(JabRefPreferences.IMPORT_FILEDIRPATTERN));
@@ -165,14 +147,4 @@ public String getTabName() {
         return Localization.lang("Import");
     }
 
-    private void openFilePatternMenu() {
-        JPopupMenu popup = new JPopupMenu();
-        for (int i = 0; i < ImportSettingsTab.DEFAULT_FILENAMEPATTERNS.length; i++) {
-            final JMenuItem item = new JMenuItem(ImportSettingsTab.DEFAULT_FILENAMEPATTERNS_DISPLAY[i]);
-            final String toSet = ImportSettingsTab.DEFAULT_FILENAMEPATTERNS[i];
-            item.addActionListener(e -> fileNamePattern.setText(toSet));
-            popup.add(item);
-        }
-        popup.show(selectFileNamePattern, 0, selectFileNamePattern.getHeight());
-    }
 }
diff --git a/src/main/java/org/jabref/gui/preftabs/NameFormatterTab.java b/src/main/java/org/jabref/gui/preftabs/NameFormatterTab.java
index 21491994a99..3a91d0ad879 100644
--- a/src/main/java/org/jabref/gui/preftabs/NameFormatterTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/NameFormatterTab.java
@@ -1,197 +1,166 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JToolBar;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingConstants;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableColumnModel;
-import javax.swing.table.TableModel;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.control.cell.TextFieldTableCell;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
 
-import org.jabref.gui.OSXCompatibleToolbar;
 import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.format.NameFormatter;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-public class NameFormatterTab extends JPanel implements PrefsTab {
+public class NameFormatterTab extends Pane implements PrefsTab {
 
     private final JabRefPreferences prefs;
     private boolean tableChanged;
-
-    private final JTable table;
-
-    private int rowCount = -1;
-
+    private final TableView table;
+    private final GridPane builder = new GridPane();
     private final List<TableRow> tableRows = new ArrayList<>(10);
+    private final ObservableList<TableRow> data = FXCollections.observableArrayList();
 
-    static class TableRow {
-
-        private String name;
+    public static class TableRow {
+        private SimpleStringProperty name;
+        private SimpleStringProperty format;
 
-        private String format;
-
-
-        public TableRow() {
+        TableRow() {
             this("");
         }
 
-        public TableRow(String name) {
+        TableRow(String name) {
             this(name, NameFormatter.DEFAULT_FORMAT);
         }
 
-        public TableRow(String name, String format) {
-            this.name = name;
-            this.format = format;
+        TableRow(String name, String format) {
+            this.name = new SimpleStringProperty(name);
+            this.format = new SimpleStringProperty(format);
         }
 
         public String getName() {
-            return name;
+            return name.get();
         }
 
         public void setName(String name) {
-            this.name = name;
+            this.name.set(name);
         }
 
         public String getFormat() {
-            return format;
+            return format.get();
         }
 
         public void setFormat(String format) {
-            this.format = format;
+            this.format.set(format);
         }
     }
 
-
     /**
      * Tab to create custom Name Formatters
      *
      */
     public NameFormatterTab(JabRefPreferences prefs) {
         this.prefs = Objects.requireNonNull(prefs);
-        setLayout(new BorderLayout());
-
-        TableModel tableModel = new AbstractTableModel() {
 
-            @Override
-            public int getRowCount() {
-                return rowCount;
-            }
-
-            @Override
-            public int getColumnCount() {
-                return 2;
-            }
-
-            @Override
-            public Object getValueAt(int row, int column) {
-                if (row >= tableRows.size()) {
-                    return "";
-                }
-                TableRow tr = tableRows.get(row);
-                if (tr == null) {
-                    return "";
-                }
-                // Only two columns
-                if (column == 0) {
-                    return tr.getName();
-                } else {
-                    return tr.getFormat();
-                }
-            }
-
-            @Override
-            public String getColumnName(int col) {
-                return col == 0 ? Localization.lang("Formatter name") :
-                    Localization.lang("Format string");
-            }
-
-            @Override
-            public Class<String> getColumnClass(int column) {
-                return String.class;
-            }
-
-            @Override
-            public boolean isCellEditable(int row, int col) {
-                return true;
-            }
-
-            @Override
-            public void setValueAt(Object value, int row, int col) {
+        TableColumn<TableRow,String> firstCol = new TableColumn<>(Localization.lang("Formatter name"));
+        TableColumn<TableRow,String> lastCol = new TableColumn<>(Localization.lang("Format string"));
+        table = new TableView();
+        table.setEditable(true);
+        firstCol.setCellValueFactory(new PropertyValueFactory<>("name"));
+        firstCol.setCellFactory(TextFieldTableCell.<TableRow>forTableColumn());
+        firstCol.setOnEditCommit(
+                (TableColumn.CellEditEvent<TableRow, String> t) -> {
+                    ((TableRow) t.getTableView().getItems().get(
+                            t.getTablePosition().getRow())
+                    ).setName(t.getNewValue());
+                });
+        lastCol.setCellValueFactory(new PropertyValueFactory<>("format"));
+        lastCol.setCellFactory(TextFieldTableCell.<TableRow>forTableColumn());
+        lastCol.setOnEditCommit(
+                (TableColumn.CellEditEvent<TableRow, String> t) -> {
+                    ((TableRow) t.getTableView().getItems().get(
+                            t.getTablePosition().getRow())
+                    ).setFormat(t.getNewValue());
+                });
+        firstCol.setPrefWidth(140);
+        lastCol.setPrefWidth(200);
+        table.setItems(data);
+        table.getColumns().addAll(firstCol, lastCol);
+        final TextField addName = new TextField();
+        addName.setPromptText("name");
+        addName.setMaxWidth(100);
+        final TextField addLast = new TextField();
+        addLast.setMaxWidth(100);
+        addLast.setPromptText("format");
+
+        BorderPane tabPanel = new BorderPane();
+        ScrollPane scrollPane = new ScrollPane();
+        scrollPane.setMaxHeight(400);
+        scrollPane.setMaxWidth(360);
+        scrollPane.setContent(table);
+        tabPanel.setCenter(scrollPane);
+
+        Label insertRows = new Label(Localization.lang("Insert rows"));
+        insertRows.setVisible(false);
+        Button add = new Button("Insert");
+        add.setFont(FontSize.smallFont);
+        add.setOnAction(e-> {
+            if (!addName.getText().isEmpty() && !addLast.getText().isEmpty()) {
+                TableRow tableRow = new TableRow(addName.getText(), addLast.getText());
+                addName.clear();
+                addLast.clear();
+                data.add(tableRow);
+                tableRows.add(tableRow);
+                table.setItems(data);
                 tableChanged = true;
-
-                // Make sure the vector is long enough.
-                while (row >= tableRows.size()) {
-                    tableRows.add(new TableRow());
-                }
-
-                TableRow rowContent = tableRows.get(row);
-
-                if (col == 0) {
-                    rowContent.setName(value.toString());
-                } else {
-                    rowContent.setFormat(value.toString());
-                }
+                table.refresh();
             }
-        };
-
-        table = new JTable(tableModel);
-
-        TableColumnModel columnModel = table.getColumnModel();
-        columnModel.getColumn(0).setPreferredWidth(140);
-        columnModel.getColumn(1).setPreferredWidth(400);
-
-        FormLayout layout = new FormLayout("1dlu, 8dlu, left:pref, 4dlu, fill:pref", "");
-
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-
-        JPanel pan = new JPanel();
-
-        JPanel tabPanel = new JPanel();
-        tabPanel.setLayout(new BorderLayout());
-        JScrollPane scrollPane = new JScrollPane(table, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        table.setPreferredScrollableViewportSize(new Dimension(250, 200));
-        scrollPane.setMinimumSize(new Dimension(250, 300));
-        scrollPane.setPreferredSize(new Dimension(600, 300));
-        tabPanel.add(scrollPane, BorderLayout.CENTER);
-
-        JToolBar toolBar = new OSXCompatibleToolbar(SwingConstants.VERTICAL);
-        toolBar.setFloatable(false);
-        toolBar.setBorder(null);
-        toolBar.add(new AddRowAction());
-        toolBar.add(new DeleteRowAction());
-        toolBar.add(new HelpAction(Localization.lang("Help on Name Formatting"),
-                HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER).getHelpButton());
-
-        tabPanel.add(toolBar, BorderLayout.EAST);
-
-        builder.appendSeparator(Localization.lang("Special name formatters"));
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(tabPanel);
-        builder.nextLine();
+        });
+        Label deleteRows = new Label(Localization.lang("Delete rows"));
+        deleteRows.setVisible(false);
+        Button delete = new Button("Delete");
+        delete.setFont(FontSize.smallFont);
+        delete.setOnAction(e-> {
+            if (table.getFocusModel() != null && table.getFocusModel().getFocusedIndex() != -1) {
+                tableChanged = true;
+                int row = table.getFocusModel().getFocusedIndex();
+                TableRow tableRow = tableRows.get(row);
+                tableRows.remove(tableRow);
+                data.remove(tableRow);
+                table.setItems(data);
+                table.refresh();
+            }});
+        Button help = new Button("?");
+        help.setFont(FontSize.smallFont);
+        help.setOnAction(e-> new HelpAction(Localization.lang("Help on Name Formatting"),
+                HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER).getHelpButton().doClick());
+        HBox toolbar = new HBox();
+        toolbar.getChildren().addAll(addName, addLast,add,delete,help);
+        tabPanel.setBottom(toolbar);
+
+        Label specialNameFormatters = new Label(Localization.lang("Special name formatters") + "  ------------------------------------");
+        specialNameFormatters.setFont(FontSize.bigFont);
+        builder.add(specialNameFormatters, 1, 1);
+        builder.add(tabPanel, 1, 2);
+    }
 
-        pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        add(pan, BorderLayout.CENTER);
+    public Node getBuilder() {
+        return builder;
     }
 
     @Override
@@ -207,75 +176,8 @@ public void setValues() {
                 tableRows.add(new TableRow(names.get(i)));
             }
         }
-        rowCount = tableRows.size() + 5;
     }
 
-    class DeleteRowAction extends AbstractAction {
-
-        public DeleteRowAction() {
-            super("Delete row", IconTheme.JabRefIcons.REMOVE_NOBOX.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Delete rows"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            tableChanged = true;
-
-            int[] selectedRows = table.getSelectedRows();
-
-            int numberDeleted = 0;
-
-            for (int i = selectedRows.length - 1; i >= 0; i--) {
-                if (selectedRows[i] < tableRows.size()) {
-                    tableRows.remove(selectedRows[i]);
-                    numberDeleted++;
-                }
-            }
-
-            rowCount -= numberDeleted;
-
-            if (selectedRows.length > 1) {
-                table.clearSelection();
-            }
-
-            table.revalidate();
-            table.repaint();
-        }
-    }
-
-    class AddRowAction extends AbstractAction {
-
-        public AddRowAction() {
-            super("Add row", IconTheme.JabRefIcons.ADD_NOBOX.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Insert rows"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int[] rows = table.getSelectedRows();
-            if (rows.length == 0) {
-                // No rows selected, so we just add one at the end.
-                rowCount++;
-                table.revalidate();
-                table.repaint();
-                return;
-            }
-            for (int i = 0; i < rows.length; i++) {
-                if (((rows[i] + i) - 1) < tableRows.size()) {
-                    tableRows.add(Math.max(0, (rows[i] + i) - 1), new TableRow());
-                }
-            }
-            rowCount += rows.length;
-            if (rows.length > 1) {
-                table.clearSelection();
-            }
-            table.revalidate();
-            table.repaint();
-            tableChanged = true;
-        }
-    }
-
-
     /**
      * Store changes to table preferences. This method is called when the user
      * clicks Ok.
@@ -284,12 +186,6 @@ public void actionPerformed(ActionEvent e) {
     @Override
     public void storeSettings() {
 
-        if (table.isEditing()) {
-            int col = table.getEditingColumn();
-            int row = table.getEditingRow();
-            table.getCellEditor(row, col).stopCellEditing();
-        }
-
         // Now we need to make sense of the contents the user has made to the
         // table setup table.
         if (tableChanged) {
diff --git a/src/main/java/org/jabref/gui/preftabs/NetworkTab.java b/src/main/java/org/jabref/gui/preftabs/NetworkTab.java
index fbff70a1b18..860b8b2af37 100644
--- a/src/main/java/org/jabref/gui/preftabs/NetworkTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/NetworkTab.java
@@ -1,15 +1,14 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Insets;
-
-import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.Separator;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
+import javafx.scene.paint.Paint;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -18,83 +17,83 @@
 import org.jabref.logic.net.ProxyRegisterer;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-public class NetworkTab extends JPanel implements PrefsTab {
+public class NetworkTab extends Pane implements PrefsTab {
 
-    private final JCheckBox useProxyCheckBox;
-    private final JTextField hostnameTextField;
-    private final JTextField portTextField;
-    private final JCheckBox useAuthenticationCheckBox;
-    private final JTextField usernameTextField;
-    private final JPasswordField passwordTextField;
+    private final CheckBox useProxyCheckBox;
+    private final TextField hostnameTextField;
+    private final TextField portTextField;
+    private final CheckBox useAuthenticationCheckBox;
+    private final TextField usernameTextField;
+    private final PasswordField passwordTextField;
     private final JabRefPreferences preferences;
     private ProxyPreferences oldProxyPreferences;
     private final DialogService dialogService;
+    private final GridPane builder = new GridPane();
 
     public NetworkTab(DialogService dialogService, JabRefPreferences preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
 
-        setLayout(new BorderLayout());
-
-        useProxyCheckBox = new JCheckBox(Localization.lang("Use custom proxy configuration"));
-
-        hostnameTextField = new JTextField();
-        hostnameTextField.setEnabled(false);
-        portTextField = new JTextField();
-        portTextField.setEnabled(false);
-
-        useAuthenticationCheckBox = new JCheckBox(Localization.lang("Proxy requires authentication"));
-        useAuthenticationCheckBox.setEnabled(false);
-
-        usernameTextField = new JTextField();
-        usernameTextField.setEnabled(false);
-        passwordTextField = new JPasswordField();
-        passwordTextField.setEnabled(false);
-        JLabel passwordWarningLabel = new JLabel(Localization.lang("Attention: Password is stored in plain text!"));
-        passwordWarningLabel.setEnabled(false);
-        passwordWarningLabel.setForeground(Color.RED);
-
-        Insets margin = new Insets(0, 12, 3, 0);
-        useProxyCheckBox.setMargin(margin);
-        portTextField.setMargin(margin);
-        useAuthenticationCheckBox.setMargin(margin);
+        useProxyCheckBox = new CheckBox(Localization.lang("Use custom proxy configuration"));
+        useProxyCheckBox.setFont(FontSize.smallFont);
+        hostnameTextField = new TextField();
+        hostnameTextField.setDisable(true);
+        portTextField = new TextField();
+        portTextField.setDisable(true);
+
+        useAuthenticationCheckBox = new CheckBox(Localization.lang("Proxy requires authentication"));
+        useAuthenticationCheckBox.setFont(FontSize.smallFont);
+        useAuthenticationCheckBox.setDisable(true);
+
+        usernameTextField = new TextField();
+        usernameTextField.setDisable(true);
+        passwordTextField = new PasswordField();
+        passwordTextField.setDisable(true);
+        Label passwordWarningLabel = new Label(Localization.lang("Attention: Password is stored in plain text!"));
+        passwordWarningLabel.setFont(FontSize.smallFont);
+        passwordWarningLabel.setDisable(true);
+        passwordWarningLabel.setTextFill(Paint.valueOf("Red"));
 
         // Listener on useProxyCheckBox to enable and disable the proxy related settings;
-        useProxyCheckBox.addChangeListener(event -> {
-            hostnameTextField.setEnabled(useProxyCheckBox.isSelected());
-            portTextField.setEnabled(useProxyCheckBox.isSelected());
-            useAuthenticationCheckBox.setEnabled(useProxyCheckBox.isSelected());
+        useProxyCheckBox.setOnAction(event -> {
+            hostnameTextField.setDisable(!useProxyCheckBox.isSelected());
+            portTextField.setDisable(!useProxyCheckBox.isSelected());
+            useAuthenticationCheckBox.setDisable(!useProxyCheckBox.isSelected());
         });
 
-        useAuthenticationCheckBox.addChangeListener(event -> {
-            usernameTextField.setEnabled(useProxyCheckBox.isSelected() && useAuthenticationCheckBox.isSelected());
-            passwordTextField.setEnabled(useProxyCheckBox.isSelected() && useAuthenticationCheckBox.isSelected());
-            passwordWarningLabel.setEnabled(useProxyCheckBox.isSelected() && useAuthenticationCheckBox.isSelected());
+        useAuthenticationCheckBox.setOnAction(event -> {
+            usernameTextField.setDisable(!useProxyCheckBox.isSelected() || !useAuthenticationCheckBox.isSelected());
+            passwordTextField.setDisable(!useProxyCheckBox.isSelected() || !useAuthenticationCheckBox.isSelected());
+            passwordWarningLabel.setDisable(!useProxyCheckBox.isSelected() || !useAuthenticationCheckBox.isSelected());
         });
 
-        FormLayout layout = new FormLayout("8dlu, left:pref, 4dlu, left:pref, 4dlu, fill:150dlu",
-                "p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, p");
-        FormBuilder builder = FormBuilder.create().layout(layout);
-
-        builder.addSeparator(Localization.lang("Network")).xyw(1, 1, 6);
-        builder.add(useProxyCheckBox).xyw(2, 3, 5);
-        builder.add(Localization.lang("Hostname") + ':').xy(2, 5);
-        builder.add(hostnameTextField).xyw(4, 5, 3);
-        builder.add(Localization.lang("Port") + ':').xy(2, 7);
-        builder.add(portTextField).xyw(4, 7, 3);
-        builder.add(useAuthenticationCheckBox).xyw(4, 9, 3);
-        builder.add(Localization.lang("Username") + ':').xy(4, 11);
-        builder.add(usernameTextField).xy(6, 11);
-        builder.add(Localization.lang("Password") + ':').xy(4, 13);
-        builder.add(passwordTextField).xy(6, 13);
-        builder.add(passwordWarningLabel).xy(6, 14);
-
-        JPanel pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        add(pan, BorderLayout.CENTER);
+        Label network = new Label(Localization.lang("Network") + "  ---------------------------------");
+        network.setFont(FontSize.bigFont);
+        builder.add(network, 1, 1);
+        builder.add(new Separator(), 2, 1);
+        builder.add(useProxyCheckBox, 2, 2);
+        Label hostname = new Label(Localization.lang("Hostname") + ':');
+        hostname.setFont(FontSize.smallFont);
+        builder.add(hostname, 1, 3);
+        builder.add(hostnameTextField, 2, 3);
+        Label port = new Label(Localization.lang("Port") + ':');
+        port.setFont(FontSize.smallFont);
+        builder.add(port, 1, 4);
+        builder.add(portTextField, 2, 4);
+        builder.add(useAuthenticationCheckBox, 2, 5);
+        Label username = new Label(Localization.lang("Username") + ':');
+        username.setFont(FontSize.smallFont);
+        builder.add(username, 2, 6);
+        builder.add(usernameTextField, 3, 6);
+        Label password = new Label(Localization.lang("Password") + ':');
+        password.setFont(FontSize.smallFont);
+        builder.add(password, 2, 7);
+        builder.add(passwordTextField, 3, 7);
+        builder.add(passwordWarningLabel, 3, 8);
+    }
+
+    public Node getBuilder() {
+        return builder;
     }
 
     @Override
@@ -118,7 +117,7 @@ public void storeSettings() {
         String port = portTextField.getText().trim();
         Boolean useAuthentication = useAuthenticationCheckBox.isSelected();
         String username = usernameTextField.getText().trim();
-        String password = new String(passwordTextField.getPassword());
+        String password = passwordTextField.getText();
         ProxyPreferences proxyPreferences = new ProxyPreferences(useProxy, hostname, port, useAuthentication, username,
                 password);
         if (!proxyPreferences.equals(oldProxyPreferences)) {
@@ -147,9 +146,9 @@ public boolean validateSettings() {
             }
             if (useAuthenticationCheckBox.isSelected()) {
                 String userName = usernameTextField.getText();
-                char[] password = passwordTextField.getPassword();
+                char[] password = passwordTextField.getText().toCharArray();
                 // no empty proxy passwords currently supported (they make no sense in this case anyway)
-                if ((userName == null) || userName.trim().isEmpty() || (password == null) || (password.length == 0)) {
+                if ((userName == null) || userName.trim().isEmpty()  || (password.length == 0)) {
                     validAuthenticationSetting = false;
                     validSetting = false;
                 } else {
diff --git a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
index 61b497f8c8d..5596f47920a 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
@@ -1,29 +1,22 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Component;
-import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.prefs.BackingStoreException;
 
 import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
 
+import javafx.geometry.Pos;
+import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Region;
+import javafx.scene.layout.VBox;
 
 import org.jabref.Globals;
 import org.jabref.JabRefException;
@@ -61,166 +54,201 @@ public class PreferencesDialog extends BaseDialog<Void> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesDialog.class);
 
-    private final JPanel main;
+    private final BorderPane main;
 
     private final DialogService dialogService;
     private final JabRefFrame frame;
     private final JabRefPreferences prefs;
+    private final AdvancedTab advancedTab;
+    private final AppearancePrefsTab appearancePrefsTab;
+    private final BibtexKeyPatternPrefTab bibtexKeyPatternPrefTab;
+    private final EntryEditorPrefsTab entryEditorPrefsTab;
+    private final ExportSortingPrefsTab exportSortingPrefsTab;
+    private final ExternalTab externalTab;
+    private final FileTab fileTab;
+    private final GeneralTab generalTab;
+    private final GroupsPrefsTab groupsPrefsTab;
+    private final ImportSettingsTab importSettingsTab;
+    private final NameFormatterTab nameFormatterTab;
+    private final NetworkTab networkTab;
+    private final PreviewPrefsTab previewPrefsTab;
+    private final TableColumnsTab tableColumnsTab;
+    private final TablePrefsTab tablePrefsTab;
+    private final XmpPrefsTab xmpPrefsTab;
+    private ArrayList<PrefsTab> arrayList = new ArrayList<>();
 
     public PreferencesDialog(JabRefFrame parent) {
         setTitle(Localization.lang("JabRef preferences"));
-        getDialogPane().setPrefSize(1000, 800);
+        getDialogPane().setPrefSize(1250, 800);
         getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
         setResizable(true);
-
         ButtonType save = new ButtonType(Localization.lang("Save"), ButtonData.OK_DONE);
-
         getDialogPane().getButtonTypes().addAll(save, ButtonType.CANCEL);
         ControlHelper.setAction(save, getDialogPane(), event -> {
-            storeAllSettings();
+           storeAllSettings();
             close();
         });
 
         prefs = JabRefPreferences.getInstance();
         frame = parent;
         dialogService = frame.getDialogService();
+        advancedTab = new AdvancedTab(dialogService,prefs);
+        appearancePrefsTab = new AppearancePrefsTab(dialogService,prefs);
+        bibtexKeyPatternPrefTab = new BibtexKeyPatternPrefTab(prefs,frame.getCurrentBasePanel());
+        entryEditorPrefsTab = new EntryEditorPrefsTab(prefs);
+        exportSortingPrefsTab = new ExportSortingPrefsTab(prefs);
+        externalTab = new ExternalTab(frame,this,prefs);
+        fileTab = new FileTab(dialogService,prefs);
+        generalTab = new GeneralTab(dialogService,prefs);
+        groupsPrefsTab = new GroupsPrefsTab(prefs);
+        importSettingsTab = new ImportSettingsTab(prefs);
+        nameFormatterTab = new NameFormatterTab(prefs);
+        networkTab = new NetworkTab(dialogService,prefs);
+        previewPrefsTab = new PreviewPrefsTab(dialogService);
+        tableColumnsTab = new TableColumnsTab(prefs,frame);
+        tablePrefsTab = new TablePrefsTab(prefs);
+        xmpPrefsTab = new XmpPrefsTab(prefs);
+
+        if (arrayList.isEmpty()) {
+            arrayList.add(advancedTab);
+            arrayList.add(appearancePrefsTab);
+            arrayList.add(bibtexKeyPatternPrefTab);
+            arrayList.add(entryEditorPrefsTab);
+            arrayList.add(exportSortingPrefsTab);
+            arrayList.add(externalTab);
+            arrayList.add(fileTab);
+            arrayList.add(generalTab);
+            arrayList.add(groupsPrefsTab);
+            arrayList.add(importSettingsTab);
+            arrayList.add(nameFormatterTab);
+            arrayList.add(networkTab);
+            arrayList.add(previewPrefsTab);
+            arrayList.add(tableColumnsTab);
+            arrayList.add(tablePrefsTab);
+            arrayList.add(xmpPrefsTab);
+        }
 
-        main = new JPanel();
-
-        ControlHelper.setSwingContent(getDialogPane(), constructSwingContent());
+        main = new BorderPane();
+        main.setCenter(generalTab.getBuilder());
+        getDialogPane().setContent(main);
+        construct();
     }
 
-    private JComponent constructSwingContent() {
-        JPanel mainPanel = new JPanel();
-        final CardLayout cardLayout = new CardLayout();
-        main.setLayout(cardLayout);
-
-        List<PrefsTab> tabs = new ArrayList<>();
-        tabs.add(new GeneralTab(dialogService, prefs));
-        tabs.add(new FileTab(dialogService, prefs));
-        tabs.add(new TablePrefsTab(prefs));
-        tabs.add(new TableColumnsTab(prefs, frame));
-        tabs.add(new PreviewPrefsTab(dialogService));
-        tabs.add(new ExternalTab(frame, this, prefs));
-        tabs.add(new GroupsPrefsTab(prefs));
-        tabs.add(new EntryEditorPrefsTab(prefs));
-        tabs.add(new BibtexKeyPatternPrefTab(prefs, frame.getCurrentBasePanel()));
-        tabs.add(new ImportSettingsTab(prefs));
-        tabs.add(new ExportSortingPrefsTab(prefs));
-        tabs.add(new NameFormatterTab(prefs));
-        tabs.add(new XmpPrefsTab(prefs));
-        tabs.add(new NetworkTab(dialogService, prefs));
-        tabs.add(new AdvancedTab(dialogService, prefs));
-        tabs.add(new AppearancePrefsTab(dialogService, prefs));
-
-        // add all tabs
-        tabs.forEach(tab -> main.add((Component) tab, tab.getTabName()));
-
-        mainPanel.setBorder(BorderFactory.createEtchedBorder());
-
-        String[] tabNames = tabs.stream().map(PrefsTab::getTabName).toArray(String[]::new);
-        JList<String> chooser = new JList<>(tabNames);
-        chooser.setBorder(BorderFactory.createEtchedBorder());
-        // Set a prototype value to control the width of the list:
-        chooser.setPrototypeCellValue("This should be wide enough");
-        chooser.setSelectedIndex(0);
-        chooser.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
-        // Add the selection listener that will show the correct panel when
-        // selection changes:
-        chooser.addListSelectionListener(e -> {
-            if (e.getValueIsAdjusting()) {
-                return;
-            }
-            String o = chooser.getSelectedValue();
-            cardLayout.show(main, o);
-        });
+    private void construct() {
+        VBox vBox = new VBox();
+        vBox.setPrefSize(160,800);
+        Button []button = new Button[20];
+
+        button[0] = new Button(Localization.lang("General"));
+        button[0].setOnAction( e -> main.setCenter(generalTab.getBuilder()));
+        button[1] = new Button(Localization.lang("File"));
+        button[1].setOnAction( e-> main.setCenter(fileTab.getBuilder()));
+        button[2] = new Button(Localization.lang("Entry table"));
+        button[2].setOnAction(e -> main.setCenter(tablePrefsTab.getBuilder()));
+        button[3] = new Button(Localization.lang("Entry table columns"));
+        button[3].setOnAction( e -> main.setCenter(tableColumnsTab.getBuilder()));
+        button[4] = new Button(Localization.lang("Entry preview"));
+        button[4].setOnAction( e -> main.setCenter(previewPrefsTab.getGridPane()));
+        button[5] = new Button(Localization.lang("External programs"));
+        button[5].setOnAction(e -> main.setCenter(externalTab.getBuilder()));
+        button[6] = new Button(Localization.lang("Groups"));
+        button[6].setOnAction( e -> main.setCenter(groupsPrefsTab.getBuilder()));
+        button[7] = new Button(Localization.lang("Entry editor"));
+        button[7].setOnAction( e -> main.setCenter(entryEditorPrefsTab.getBuilder()));
+        button[8] = new Button(Localization.lang("BibTeX key generator"));
+        button[8].setOnAction( e -> main.setCenter(bibtexKeyPatternPrefTab.getBuilder()));
+        button[9] = new Button(Localization.lang("Import"));
+        button[9].setOnAction( e -> main.setCenter(importSettingsTab.getBuilder()));
+        button[10] = new Button(Localization.lang("Export sorting"));
+        button[10].setOnAction( e -> main.setCenter(exportSortingPrefsTab.getBuilder()));
+        button[11] = new Button(Localization.lang("Name formatter"));
+        button[11].setOnAction( e -> main.setCenter(nameFormatterTab.getBuilder()));
+        button[12] = new Button(Localization.lang("XMP-metadata"));
+        button[12].setOnAction( e -> main.setCenter(xmpPrefsTab.getBuilder()));
+        button[13] = new Button(Localization.lang("Network"));
+        button[13].setOnAction(e -> main.setCenter(networkTab.getBuilder()));
+        button[14] = new Button(Localization.lang("Advanced"));
+        button[14].setOnAction( e -> main.setCenter(advancedTab.getBuilder()));
+        button[15] = new Button(Localization.lang("Appearance"));
+        button[15].setOnAction( e -> main.setCenter(appearancePrefsTab.getContainer()));
+        button[16] = new Button(Localization.lang("Import preferences"));
+        button[17] = new Button(Localization.lang("Export preferences"));
+        button[18] = new Button(Localization.lang("Show preferences"));
+        button[19] = new Button(Localization.lang("Reset preferences"));
+        for (int i = 0; i < button.length; i++) {
+            button[i].setFont(FontSize.smallFont);
+            button[i].setEffect(null);
+            button[i].setAlignment(Pos.BASELINE_LEFT);
+            button[i].setPrefSize(130,20);
+        }
+
+        for (int i = 0; i < 16; i++) {
+            vBox.getChildren().add(button[i]);
+        }
+        for (int i = 0; i < 12; i++) {
+            vBox.getChildren().add(new Label(""));
+        }
 
-        JPanel buttons = new JPanel();
-        buttons.setLayout(new GridLayout(4, 1));
-        JButton importPreferences = new JButton(Localization.lang("Import preferences"));
-        buttons.add(importPreferences, 0);
-        JButton exportPreferences = new JButton(Localization.lang("Export preferences"));
-        buttons.add(exportPreferences, 1);
-        JButton showPreferences = new JButton(Localization.lang("Show preferences"));
-        buttons.add(showPreferences, 2);
-        JButton resetPreferences = new JButton(Localization.lang("Reset preferences"));
-        buttons.add(resetPreferences, 3);
-
-        JPanel westPanel = new JPanel();
-        westPanel.setLayout(new BorderLayout());
-        westPanel.add(chooser, BorderLayout.CENTER);
-        westPanel.add(buttons, BorderLayout.SOUTH);
-        mainPanel.setLayout(new BorderLayout());
-        mainPanel.add(putPanelInScrollPane(main), BorderLayout.CENTER);
-        mainPanel.add(putPanelInScrollPane(westPanel), BorderLayout.WEST);
+        vBox.getChildren().addAll(button[16], button[17], button[18], button[19]);
+        main.setLeft(vBox);
 
         // TODO: Key bindings:
         // KeyBinder.bindCloseDialogKeyToCancelAction(this.getRootPane(), cancelAction);
-
         // Import and export actions:
-        exportPreferences.setToolTipText(Localization.lang("Export preferences to file"));
-        exportPreferences.addActionListener(new ExportAction());
+        button[17].setAccessibleText(Localization.lang("Export preferences to file"));
+        button[17].setOnAction( e -> new ExportAction());
 
-        importPreferences.setToolTipText(Localization.lang("Import preferences from file"));
-        importPreferences.addActionListener(e -> {
+        button[16].setAccessibleText(Localization.lang("Import preferences from file"));
+        button[16].setOnAction(e -> importPreferences());
 
-            FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                    .addExtensionFilter(StandardFileType.XML)
-                    .withDefaultExtension(StandardFileType.XML)
-                    .withInitialDirectory(getPrefsExportPath()).build();
+        button[18].setOnAction(
+                e -> new PreferencesFilterDialog(new JabRefPreferencesFilter(prefs)).setVisible(true));
+        button[19].setOnAction(e -> resetPreferences());
 
-            Optional<Path> fileName = DefaultTaskExecutor
-                                                         .runInJavaFXThread(() -> dialogService.showFileOpenDialog(fileDialogConfiguration));
+        setValues();
 
-            if (fileName.isPresent()) {
-                try {
-                    prefs.importPreferences(fileName.get().toString());
-                    updateAfterPreferenceChanges();
+    }
 
-                    DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showWarningDialogAndWait(Localization.lang("Import preferences"),
-                                                                                                       Localization.lang("You must restart JabRef for this to come into effect.")));
-                } catch (JabRefException ex) {
-                    LOGGER.warn(ex.getMessage(), ex);
-                    DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Import preferences"), ex));
-                }
+    private void resetPreferences() {
+        boolean resetPreferencesClicked = DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showConfirmationDialogAndWait(Localization.lang("Reset preferences"),
+                Localization.lang("Are you sure you want to reset all settings to default values?"),
+                Localization.lang("Reset preferences"), Localization.lang("Cancel")));
+        if (resetPreferencesClicked) {
+            try {
+                prefs.clear();
+                new SharedDatabasePreferences().clear();
+
+                DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showWarningDialogAndWait(Localization.lang("Reset preferences"),
+                        Localization.lang("You must restart JabRef for this to come into effect.")));
+            } catch (BackingStoreException ex) {
+                LOGGER.warn(ex.getMessage(), ex);
+                DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Reset preferences"), ex));
             }
-        });
-
-        showPreferences.addActionListener(
-                e -> new PreferencesFilterDialog(new JabRefPreferencesFilter(prefs)).setVisible(true));
-        resetPreferences.addActionListener(e -> {
+            updateAfterPreferenceChanges();
+        }
+    }
 
-            boolean resetPreferencesClicked = DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showConfirmationDialogAndWait(Localization.lang("Reset preferences"),
-                                                                                                                                      Localization.lang("Are you sure you want to reset all settings to default values?"),
-                                                                                                                                      Localization.lang("Reset preferences"), Localization.lang("Cancel")));
+    private void importPreferences() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(StandardFileType.XML)
+                .withDefaultExtension(StandardFileType.XML)
+                .withInitialDirectory(getPrefsExportPath()).build();
 
-            if (resetPreferencesClicked) {
-                try {
-                    prefs.clear();
-                    new SharedDatabasePreferences().clear();
+        Optional<Path> fileName = DefaultTaskExecutor
+                .runInJavaFXThread(() -> dialogService.showFileOpenDialog(fileDialogConfiguration));
 
-                    DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showWarningDialogAndWait(Localization.lang("Reset preferences"),
-                                                                                                       Localization.lang("You must restart JabRef for this to come into effect.")));
-                } catch (BackingStoreException ex) {
-                    LOGGER.warn(ex.getMessage(), ex);
-                    DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Reset preferences"), ex));
-                }
+        if (fileName.isPresent()) {
+            try {
+                prefs.importPreferences(fileName.get().toString());
                 updateAfterPreferenceChanges();
-            }
-        });
 
-        setValues();
-
-        return mainPanel;
-    }
-
-    private JScrollPane putPanelInScrollPane(JPanel panel) {
-        JScrollPane scrollPane = new JScrollPane(panel);
-        scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-        scrollPane.setBorder(null);
-        return scrollPane;
+                DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showWarningDialogAndWait(Localization.lang("Import preferences"),
+                        Localization.lang("You must restart JabRef for this to come into effect.")));
+            } catch (JabRefException ex) {
+                LOGGER.warn(ex.getMessage(), ex);
+                DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Import preferences"), ex));
+            }
+        }
     }
 
     private String getPrefsExportPath() {
@@ -229,7 +257,6 @@ private String getPrefsExportPath() {
 
     private void updateAfterPreferenceChanges() {
         setValues();
-
         Map<String, TemplateExporter> customExporters = prefs.customExports.getCustomExportFormats(prefs, Globals.journalAbbreviationLoader);
         LayoutFormatterPreferences layoutPreferences = prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
         SavePreferences savePreferences = prefs.loadForExportFromPreferences();
@@ -240,15 +267,14 @@ private void updateAfterPreferenceChanges() {
 
     private void storeAllSettings() {
         // First check that all tabs are ready to close:
-        Component[] preferenceTabs = main.getComponents();
-        for (Component tab : preferenceTabs) {
-            if (!((PrefsTab) tab).validateSettings()) {
+        for (PrefsTab tab : arrayList) {
+            if (!tab.validateSettings()) {
                 return; // If not, break off.
             }
         }
         // Then store settings and close:
-        for (Component tab : preferenceTabs) {
-            ((PrefsTab) tab).storeSettings();
+        for (PrefsTab tab : arrayList) {
+            tab.storeSettings();
         }
         prefs.flush();
 
@@ -259,10 +285,8 @@ private void storeAllSettings() {
 
     public void setValues() {
         // Update all field values in the tabs:
-        int count = main.getComponentCount();
-        Component[] comps = main.getComponents();
-        for (int i = 0; i < count; i++) {
-            ((PrefsTab) comps[i]).setValues();
+        for (PrefsTab prefsTab : arrayList) {
+            prefsTab.setValues();
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java b/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
index 1b1c1bbcf68..b639c4a952f 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
@@ -1,25 +1,26 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.Enumeration;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 
-import javax.swing.BoxLayout;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JList;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.ListSelectionModel;
 import javax.swing.SwingWorker;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.DialogPane;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextArea;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
 
 import org.jabref.Globals;
 import org.jabref.JabRefGUI;
@@ -33,9 +34,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreviewPreferences;
 
-import com.google.common.primitives.Ints;
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.factories.Paddings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,22 +43,21 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab {
 
     private SwingWorker<List<CitationStyle>, Void> discoverCitationStyleWorker;
 
-    private final DefaultListModel<Object> availableModel = new DefaultListModel<>();
-    private final DefaultListModel<Object> chosenModel = new DefaultListModel<>();
-
-    private final JList<Object> available = new JList<>(availableModel);
-    private final JList<Object> chosen = new JList<>(chosenModel);
-
-    private final JButton btnRight = new JButton("»");
-    private final JButton btnLeft = new JButton("«");
-    private final JButton btnUp = new JButton(Localization.lang("Up"));
-    private final JButton btnDown = new JButton(Localization.lang("Down"));
-
-    private final JTextArea layout = new JTextArea("", 1, 1);
-    private final JButton btnTest = new JButton(Localization.lang("Test"));
-    private final JButton btnDefault = new JButton(Localization.lang("Default"));
-    private final JScrollPane scrollPane = new JScrollPane(layout);
-
+    private final ObservableList<Object> availableModel = FXCollections.observableArrayList();
+    private final ObservableList<Object> chosenModel = FXCollections.observableArrayList();
+
+    private final ListView<Object> available = new ListView<>(availableModel);
+    private final ListView<Object> chosen = new ListView<>(chosenModel);
+
+    private final Button btnRight = new Button("»");
+    private final Button btnLeft = new Button("«");
+    private final Button btnUp = new Button(Localization.lang("Up"));
+    private final Button btnDown = new Button(Localization.lang("Down"));
+    private final GridPane gridPane = new GridPane();
+    private final TextArea layout = new TextArea();
+    private final Button btnTest = new Button(Localization.lang("Test"));
+    private final Button btnDefault = new Button(Localization.lang("Default"));
+    private final ScrollPane scrollPane = new ScrollPane(layout);
     private final DialogService dialogService;
 
     public PreviewPrefsTab(DialogService dialogService) {
@@ -70,73 +67,71 @@ public PreviewPrefsTab(DialogService dialogService) {
     }
 
     private void setupLogic() {
-        chosen.getSelectionModel().addListSelectionListener(event -> {
-            boolean selectionEmpty = ((ListSelectionModel) event.getSource()).isSelectionEmpty();
-            btnLeft.setEnabled(!selectionEmpty);
-            btnDown.setEnabled(!selectionEmpty);
-            btnUp.setEnabled(!selectionEmpty);
+        chosen.getSelectionModel().selectedItemProperty().addListener(event -> {
+            if (chosen.getSelectionModel().getSelectedIndices().isEmpty()) {
+                btnLeft.setDisable(true);
+                btnDown.setDisable(true);
+                btnUp.setDisable(true);
+            }
         });
 
-        available.getSelectionModel()
-                .addListSelectionListener(e -> btnRight.setEnabled(!((ListSelectionModel) e.getSource()).isSelectionEmpty()));
+        available.getSelectionModel().selectedItemProperty().addListener(
+                e -> btnRight.setDisable(available.getSelectionModel().getSelectedIndices().isEmpty()));
 
-        btnRight.addActionListener(event -> {
-            for (Object object : available.getSelectedValuesList()) {
-                availableModel.removeElement(object);
-                chosenModel.addElement(object);
+        btnRight.setOnAction(event -> {
+            for (Object object : available.getSelectionModel().getSelectedItems()) {
+                availableModel.remove(object);
+                chosenModel.add(object);
             }
             storeSettings();
         });
 
-        btnLeft.addActionListener(event -> {
-            for (Object object : chosen.getSelectedValuesList()) {
-                availableModel.addElement(object);
-                chosenModel.removeElement(object);
+        btnLeft.setOnAction(event -> {
+            for (Object object : chosen.getSelectionModel().getSelectedItems()) {
+                availableModel.add(object);
+                chosenModel.remove(object);
             }
             storeSettings();
         });
 
-        btnUp.addActionListener(event -> {
+        btnUp.setOnAction(event -> {
             List<Integer> newSelectedIndices = new ArrayList<>();
-            for (int oldIndex : chosen.getSelectedIndices()) {
+            for (int oldIndex : chosen.getSelectionModel().getSelectedIndices()) {
                 boolean alreadyTaken = newSelectedIndices.contains(oldIndex - 1);
                 int newIndex = ((oldIndex > 0) && !alreadyTaken) ? oldIndex - 1 : oldIndex;
                 chosenModel.add(newIndex, chosenModel.remove(oldIndex));
-                newSelectedIndices.add(newIndex);
+                chosen.getSelectionModel().select(newIndex);
             }
-            chosen.setSelectedIndices(Ints.toArray(newSelectedIndices));
             storeSettings();
         });
 
-        btnDown.addActionListener(event -> {
+        btnDown.setOnAction(event -> {
             List<Integer> newSelectedIndices = new ArrayList<>();
-            int[] selectedIndices = chosen.getSelectedIndices();
-            for (int i = selectedIndices.length - 1; i >= 0; i--) {
-                int oldIndex = selectedIndices[i];
+            ObservableList selectedIndices = chosen.getSelectionModel().getSelectedIndices();
+            for (int i = selectedIndices.size() - 1; i >= 0; i--) {
+                int oldIndex = (int)selectedIndices.get(i);
                 boolean alreadyTaken = newSelectedIndices.contains(oldIndex + 1);
-                int newIndex = ((oldIndex < (chosenModel.getSize() - 1)) && !alreadyTaken) ? oldIndex + 1 : oldIndex;
+                int newIndex = ((oldIndex < (chosenModel.size() - 1)) && !alreadyTaken) ? oldIndex + 1 : oldIndex;
                 chosenModel.add(newIndex, chosenModel.remove(oldIndex));
-                newSelectedIndices.add(newIndex);
+                chosen.getSelectionModel().select(newIndex);
             }
-            chosen.setSelectedIndices(Ints.toArray(newSelectedIndices));
             storeSettings();
         });
 
-        btnDefault.addActionListener(event -> layout.setText(Globals.prefs.getPreviewPreferences()
+        btnDefault.setOnAction(event -> layout.setText(Globals.prefs.getPreviewPreferences()
                 .getPreviewStyleDefault()
                 .replace("__NEWLINE__", "\n")));
 
-        btnTest.addActionListener(event -> {
+        btnTest.setOnAction(event -> {
             try {
                 DefaultTaskExecutor.runInJavaFXThread(() -> {
-
                     PreviewPanel testPane = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService);
-                    if (chosen.isSelectionEmpty()) {
+                    if (chosen.getSelectionModel().getSelectedItems().isEmpty()) {
                         testPane.setFixedLayout(layout.getText());
                         testPane.setEntry(TestEntry.getTestEntry());
                     }
                     else {
-                        int indexStyle = chosen.getSelectedIndex();
+                        int indexStyle = chosen.getSelectionModel().getSelectedIndex();
                         PreviewPreferences preferences = Globals.prefs.getPreviewPreferences();
                         preferences = new PreviewPreferences(preferences.getPreviewCycle(),indexStyle,preferences.getPreviewPanelDividerPosition(),preferences.isPreviewPanelEnabled(), preferences.getPreviewStyle(),preferences.getPreviewStyleDefault());
 
@@ -164,46 +159,28 @@ private void setupLogic() {
     }
 
     private void setupGui() {
-        JPanel chooseStyle = FormBuilder.create()
-                .columns("0:grow, $lcgap, pref, $lcgap, 0:grow")
-                .rows("pref, $lg, fill:pref:grow, $lg, pref:grow, $lg, pref:grow, $lg, pref:grow")
-                .padding(Paddings.DIALOG)
-
-                .addSeparator(Localization.lang("Current Preview"))
-                .xyw(1, 1, 5)
-                .add(available)
-                .xywh(1, 3, 1, 7)
-                .add(chosen)
-                .xywh(5, 3, 1, 7)
-
-                .add(btnRight)
-                .xy(3, 3, "fill, bottom")
-                .add(btnLeft)
-                .xy(3, 5, "fill, top")
-                .add(btnUp)
-                .xy(3, 7, "fill, bottom")
-                .add(btnDown)
-                .xy(3, 9, "fill, top")
-                .build();
-
-        JPanel preview = FormBuilder.create()
-                .columns("pref:grow, $lcgap, pref, $lcgap, pref")
-                .rows("pref, $lg, fill:pref:grow")
-                .padding(Paddings.DIALOG)
-
-                .addSeparator(Localization.lang("Preview"))
-                .xy(1, 1)
-                .add(btnTest)
-                .xy(3, 1)
-                .add(btnDefault)
-                .xy(5, 1)
-                .add(scrollPane)
-                .xyw(1, 3, 5)
-                .build();
+        VBox vBox = new VBox();
+        btnRight.setPrefSize(80, 20);
+        btnLeft.setPrefSize(80, 20);
+        btnUp.setPrefSize(80, 20);
+        btnDown.setPrefSize(80, 20);
+        vBox.getChildren().addAll(new Label(""),  new Label(""), new Label(""), new Label(""), new Label(""),
+                new Label(""), new Label(""), btnRight, btnLeft, new Label(""), new Label(""), new Label(""),
+                btnUp, btnDown);
+        Label currentPreview = new Label(Localization.lang("Current Preview") + "  ------------------------------------------");
+        currentPreview.setFont(FontSize.bigFont);
+        gridPane.add(currentPreview, 1, 1);
+        gridPane.add(available, 1, 2);
+        gridPane.add(vBox, 2, 2);
+        gridPane.add(chosen, 3, 2);
+        gridPane.add(btnTest, 2, 6);
+        gridPane.add(btnDefault, 3, 6);
+        layout.setPrefSize(600, 300);
+        gridPane.add(scrollPane, 1, 9);
+    }
 
-        setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-        add(chooseStyle, BorderLayout.CENTER);
-        add(preview, BorderLayout.PAGE_END);
+    public Node getGridPane() {
+        return gridPane;
     }
 
     @Override
@@ -216,33 +193,32 @@ public void setValues() {
             // in case the style is not a valid citation style file, an empty Optional is returned
             Optional<CitationStyle> citationStyle = CitationStyle.createCitationStyleFromFile(style);
             if (citationStyle.isPresent()) {
-                chosenModel.addElement(citationStyle.get());
+                chosenModel.add(citationStyle.get());
             } else {
                 if (isPreviewChosen) {
                     LOGGER.error("Preview is already in the list, something went wrong");
                     continue;
                 }
                 isPreviewChosen = true;
-                chosenModel.addElement(Localization.lang("Preview"));
+                chosenModel.add(Localization.lang("Preview"));
             }
         }
 
         availableModel.clear();
         if (!isPreviewChosen) {
-            availableModel.addElement(Localization.lang("Preview"));
+            availableModel.add(Localization.lang("Preview"));
         }
 
-        btnLeft.setEnabled(!chosen.isSelectionEmpty());
-        btnRight.setEnabled(!available.isSelectionEmpty());
-        btnUp.setEnabled(!chosen.isSelectionEmpty());
-        btnDown.setEnabled(!chosen.isSelectionEmpty());
+        btnLeft.setDisable(!chosen.getSelectionModel().getSelectedItems().isEmpty());
+        btnRight.setDisable(available.getSelectionModel().getSelectedIndices().isEmpty());
+        btnUp.setDisable(!chosen.getSelectionModel().getSelectedIndices().isEmpty());
+        btnDown.setDisable(!chosen.getSelectionModel().getSelectedIndices().isEmpty());
 
         if (discoverCitationStyleWorker != null) {
             discoverCitationStyleWorker.cancel(true);
         }
 
         discoverCitationStyleWorker = new SwingWorker<List<CitationStyle>, Void>() {
-
             @Override
             protected List<CitationStyle> doInBackground() throws Exception {
                 return CitationStyle.discoverCitationStyles();
@@ -257,9 +233,9 @@ public void done() {
                     get().stream()
                             .filter(style -> !previewPreferences.getPreviewCycle().contains(style.getFilePath()))
                             .sorted(Comparator.comparing(CitationStyle::getTitle))
-                            .forEach(availableModel::addElement);
+                            .forEach(availableModel::add);
 
-                    btnRight.setEnabled(!availableModel.isEmpty());
+                    btnRight.setDisable(availableModel.isEmpty());
                 } catch (InterruptedException | ExecutionException e) {
                     LOGGER.error("something went wrong while adding the discovered CitationStyles to the list ");
                 }
@@ -273,9 +249,7 @@ public void done() {
     @Override
     public void storeSettings() {
         List<String> styles = new ArrayList<>();
-        Enumeration<Object> elements = chosenModel.elements();
-        while (elements.hasMoreElements()) {
-            Object obj = elements.nextElement();
+        for (Object obj : chosenModel) {
             if (obj instanceof CitationStyle) {
                 styles.add(((CitationStyle) obj).getFilePath());
             } else if (obj instanceof String) {
diff --git a/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java b/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java
index b68b94710fe..8f0c1eec7c4 100644
--- a/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java
@@ -1,10 +1,7 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -12,74 +9,72 @@
 import java.util.Locale;
 
 import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.Icon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JToolBar;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingConstants;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableColumnModel;
-import javax.swing.table.TableModel;
+
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.control.cell.TextFieldTableCell;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
 
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.OSXCompatibleToolbar;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibtexSingleField;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class TableColumnsTab extends JPanel implements PrefsTab {
+class TableColumnsTab extends Pane implements PrefsTab {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TableColumnsTab.class);
 
     private final JabRefPreferences prefs;
     private boolean tableChanged;
-    private final JTable colSetup;
-    private int rowCount = -1;
+    private final TableView colSetup;
     private final List<TableRow> tableRows = new ArrayList<>(10);
     private final JabRefFrame frame;
 
-    private final JCheckBox urlColumn;
-    private final JCheckBox fileColumn;
-    private final JCheckBox arxivColumn;
-
-    private final JCheckBox extraFileColumns;
-    private final JList<String> listOfFileColumns;
+    private final CheckBox urlColumn;
+    private final CheckBox fileColumn;
+    private final CheckBox arxivColumn;
 
-    private final JRadioButton preferUrl;
-    private final JRadioButton preferDoi;
+    private final CheckBox extraFileColumns;
+    private final ListView listOfFileColumns;
 
+    private final RadioButton preferUrl;
+    private final RadioButton preferDoi;
     /*** begin: special fields ***/
-    private final JCheckBox specialFieldsEnabled;
-    private final JCheckBox rankingColumn;
-    private final JCheckBox qualityColumn;
-    private final JCheckBox priorityColumn;
-    private final JCheckBox relevanceColumn;
-    private final JCheckBox printedColumn;
-    private final JCheckBox readStatusColumn;
-    private final JRadioButton syncKeywords;
-    private final JRadioButton writeSpecialFields;
+    private final CheckBox specialFieldsEnabled;
+    private final CheckBox rankingColumn;
+    private final CheckBox qualityColumn;
+    private final CheckBox priorityColumn;
+    private final CheckBox relevanceColumn;
+    private final CheckBox printedColumn;
+    private final CheckBox readStatusColumn;
+    private final RadioButton syncKeywords;
+    private final RadioButton writeSpecialFields;
     private boolean oldSpecialFieldsEnabled;
     private boolean oldRankingColumn;
     private boolean oldQualityColumn;
@@ -89,7 +84,9 @@ class TableColumnsTab extends JPanel implements PrefsTab {
     private boolean oldReadStatusColumn;
     private boolean oldSyncKeyWords;
     private boolean oldWriteSpecialFields;
-
+    private final VBox listOfFileColumnsVBox;
+    private final ObservableList<TableRow> data;
+    private final GridPane builder = new GridPane();
     /**
      * Customization of external program paths.
      *
@@ -98,126 +95,138 @@ class TableColumnsTab extends JPanel implements PrefsTab {
     public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
         this.prefs = prefs;
         this.frame = frame;
-        setLayout(new BorderLayout());
-
-        TableModel tm = new AbstractTableModel() {
-
-            @Override
-            public int getRowCount() {
-                return rowCount;
-            }
-
-            @Override
-            public int getColumnCount() {
-                return 2;
-            }
-
-            @Override
-            public Object getValueAt(int row, int column) {
-                int internalRow = row;
-                internalRow--;
-                if ((internalRow == -1) || (internalRow >= tableRows.size())) {
-                    return "";
-                }
-
-                TableRow rowContent = tableRows.get(internalRow);
-                if (rowContent == null) {
-                    return "";
-                }
-                // Only two columns
-                if (column == 0) {
-                    return rowContent.getName();
-                } else {
-                    return rowContent.getLength() > 0 ? Double.toString(rowContent.getLength()) : "";
-                }
-            }
-
-            @Override
-            public String getColumnName(int col) {
-                return col == 0 ? Localization.lang("Field name") : Localization.lang("Column width");
+        this.data = FXCollections.observableArrayList(
+                new TableRow("entrytype",75),
+                new TableRow("author/editor",300),
+                new TableRow("title",470),
+                new TableRow("year",60),
+                new TableRow("journal",130),
+                new TableRow("bibtexkey",100));
+
+        colSetup = new TableView<>();
+        TableColumn<TableRow,String> field = new TableColumn<>(Localization.lang("Field name"));
+        TableColumn<TableRow,Double> column = new TableColumn<>(Localization.lang("Column width"));
+        field.setPrefWidth(400);
+        column.setPrefWidth(240);
+        field.setCellValueFactory(new PropertyValueFactory<>("name"));
+        field.setCellFactory(TextFieldTableCell.<TableRow>forTableColumn());
+        field.setOnEditCommit(
+                (TableColumn.CellEditEvent<TableRow, String> t) -> {
+                    ((TableRow) t.getTableView().getItems().get(
+                            t.getTablePosition().getRow())
+                    ).setName(t.getNewValue());
+                });
+        column.setCellValueFactory(new PropertyValueFactory<>("length"));
+        column.setOnEditCommit(
+                (TableColumn.CellEditEvent<TableRow, Double> t) -> {
+                    ((TableRow) t.getTableView().getItems().get(
+                            t.getTablePosition().getRow())
+                    ).setLength(t.getNewValue());
+                });
+
+        colSetup.setItems(data);
+        colSetup.getColumns().addAll(field,column);
+        final TextField addName = new TextField();
+        addName.setPromptText("name");
+        addName.setMaxWidth(field.getPrefWidth());
+        addName.setPrefHeight(30);
+        final TextField addLast = new TextField();
+        addLast.setMaxWidth(column.getPrefWidth());
+        addLast.setPromptText("width");
+        addLast.setPrefHeight(30);
+        BorderPane tabPanel = new BorderPane();
+        ScrollPane sp = new ScrollPane();
+        sp.setContent(colSetup);
+        tabPanel.setCenter(sp);
+
+        HBox toolBar = new HBox();
+        Button addRow = new Button("Add");
+        addRow.setPrefSize(80, 20);
+        addRow.setOnAction( e -> {
+            if (!addLast.getText().isEmpty()) {
+                TableRow tableRow = addLast.getText().matches("[1-9][0-9]") ? new TableRow(addName.getText(), Integer.valueOf(addLast.getText())) : new TableRow(addName.getText());
+                addName.clear();
+                addLast.clear();
+                data.add(tableRow);
+                tableRows.clear();
+                tableRows.addAll(data);
+                colSetup.setItems(data);
+                tableChanged = true;
+                colSetup.refresh();
             }
+        });
 
-            @Override
-            public Class<?> getColumnClass(int column) {
-                if (column == 0) {
-                    return String.class;
+        Button deleteRow = new Button("Delete");
+        deleteRow.setPrefSize(80, 20);
+        deleteRow.setOnAction(e -> {
+            if (colSetup.getFocusModel() != null && colSetup.getFocusModel().getFocusedIndex() != -1) {
+            tableChanged = true;
+            int row = colSetup.getFocusModel().getFocusedIndex();
+            TableRow tableRow = data.get(row);
+            data.remove(tableRow);
+            tableRows.clear();
+            tableRows.addAll(data);
+            colSetup.setItems(data);
+            colSetup.refresh();
+        }});
+        Button up = new Button("Up");
+        up.setPrefSize(80, 20);
+        up.setOnAction(e-> {
+            if (colSetup.getFocusModel() != null) {
+                int row = colSetup.getFocusModel().getFocusedIndex();
+                if (row > data.size() || row == 0) {
+                    return;
                 }
-                return Integer.class;
-            }
-
-            @Override
-            public boolean isCellEditable(int row, int col) {
-                return !((row == 0) && (col == 0));
+                TableRow tableRow1 = data.get(row);
+                TableRow tableRow2 = data.get(row - 1);
+                data.set(row - 1, tableRow1);
+                data.set(row, tableRow2);
+                tableRows.clear();
+                tableRows.addAll(data);
+                colSetup.setItems(data);
+                colSetup.refresh();
+            } else {
+                return;
             }
-
-            @Override
-            public void setValueAt(Object value, int row, int col) {
-                tableChanged = true;
-                // Make sure the vector is long enough.
-                while (row >= tableRows.size()) {
-                    tableRows.add(new TableRow("", -1));
-                }
-
-                TableRow rowContent = tableRows.get(row - 1);
-
-                if (col == 0) {
-                    rowContent.setName(value.toString());
-                    if ("".equals(getValueAt(row, 1))) {
-                        setValueAt(String.valueOf(BibtexSingleField.DEFAULT_FIELD_LENGTH), row, 1);
-                    }
-                } else {
-                    if (value == null) {
-                        rowContent.setLength(-1);
-                    } else {
-                        rowContent.setLength(Integer.parseInt(value.toString()));
-                    }
+        });
+        Button down = new Button("Down");
+        down.setPrefSize(80, 20);
+        down.setOnAction(e-> {
+            if (colSetup.getFocusModel() != null) {
+                int row = colSetup.getFocusModel().getFocusedIndex();
+                if (row + 1 > data.size()) {
+                    return;
                 }
+                TableRow tableRow1 = data.get(row);
+                TableRow tableRow2 = data.get(row + 1);
+                data.set(row + 1, tableRow1);
+                data.set(row, tableRow2);
+                tableRows.clear();
+                tableRows.addAll(data);
+                colSetup.setItems(data);
+                colSetup.refresh();
+            } else {
+                return;
             }
-
-        };
-
-        colSetup = new JTable(tm);
-        TableColumnModel cm = colSetup.getColumnModel();
-        cm.getColumn(0).setPreferredWidth(140);
-        cm.getColumn(1).setPreferredWidth(80);
-
-        FormLayout layout = new FormLayout("1dlu, 8dlu, left:pref, 4dlu, fill:pref", "");
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        JPanel pan = new JPanel();
-        JPanel tabPanel = new JPanel();
-        tabPanel.setLayout(new BorderLayout());
-        JScrollPane sp = new JScrollPane(colSetup, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        colSetup.setPreferredScrollableViewportSize(new Dimension(250, 200));
-        sp.setMinimumSize(new Dimension(250, 300));
-        tabPanel.add(sp, BorderLayout.CENTER);
-        JToolBar toolBar = new OSXCompatibleToolbar(SwingConstants.VERTICAL);
-        toolBar.setFloatable(false);
-        AddRowAction addRow = new AddRowAction();
-        DeleteRowAction deleteRow = new DeleteRowAction();
-        MoveRowUpAction moveUp = new MoveRowUpAction();
-        MoveRowDownAction moveDown = new MoveRowDownAction();
-        toolBar.setBorder(null);
-        toolBar.add(addRow);
-        toolBar.add(deleteRow);
-        toolBar.addSeparator();
-        toolBar.add(moveUp);
-        toolBar.add(moveDown);
-        tabPanel.add(toolBar, BorderLayout.EAST);
-
-        fileColumn = new JCheckBox(Localization.lang("Show file column"));
-        urlColumn = new JCheckBox(Localization.lang("Show URL/DOI column"));
-        preferUrl = new JRadioButton(Localization.lang("Show URL first"));
-        preferDoi = new JRadioButton(Localization.lang("Show DOI first"));
-        ButtonGroup preferUrlDoiGroup = new ButtonGroup();
-        preferUrlDoiGroup.add(preferUrl);
-        preferUrlDoiGroup.add(preferDoi);
-
-        urlColumn.addChangeListener(arg0 -> {
-            preferUrl.setEnabled(urlColumn.isSelected());
-            preferDoi.setEnabled(urlColumn.isSelected());
         });
-        arxivColumn = new JCheckBox(Localization.lang("Show ArXiv column"));
+        toolBar.getChildren().addAll(addName, addLast, addRow, deleteRow, up, down);
+        tabPanel.setBottom(toolBar);
+
+        fileColumn = new CheckBox(Localization.lang("Show file column"));
+        fileColumn.setFont(FontSize.smallFont);
+        urlColumn = new CheckBox(Localization.lang("Show URL/DOI column"));
+        urlColumn.setFont(FontSize.smallFont);
+        preferUrl = new RadioButton(Localization.lang("Show URL first"));
+        preferUrl.setFont(FontSize.smallFont);
+        preferDoi = new RadioButton(Localization.lang("Show DOI first"));
+        preferDoi.setFont(FontSize.smallFont);
+
+        urlColumn.setOnAction(arg0 -> {
+            preferUrl.setDisable(!urlColumn.isSelected());
+            preferDoi.setDisable(!urlColumn.isSelected());
+        });
+        arxivColumn = new CheckBox(Localization.lang("Show ArXiv column"));
+        arxivColumn.setFont(FontSize.smallFont);
 
         Collection<ExternalFileType> fileTypes = ExternalFileTypes.getInstance().getExternalFileTypeSelection();
         String[] fileTypeNames = new String[fileTypes.size()];
@@ -225,97 +234,109 @@ public void setValueAt(Object value, int row, int col) {
         for (ExternalFileType fileType : fileTypes) {
             fileTypeNames[i++] = fileType.getName();
         }
-        listOfFileColumns = new JList<>(fileTypeNames);
-        JScrollPane listOfFileColumnsScrollPane = new JScrollPane(listOfFileColumns);
-        listOfFileColumns.setVisibleRowCount(3);
-        extraFileColumns = new JCheckBox(Localization.lang("Show extra columns"));
-        extraFileColumns.addChangeListener(arg0 -> listOfFileColumns.setEnabled(extraFileColumns.isSelected()));
-
-        /*** begin: special table columns and special fields ***/
-
-        JButton helpButton = new HelpAction(Localization.lang("Help on special fields"),
-                HelpFile.SPECIAL_FIELDS).getHelpButton();
-
-        rankingColumn = new JCheckBox(Localization.lang("Show rank"));
-        qualityColumn = new JCheckBox(Localization.lang("Show quality"));
-        priorityColumn = new JCheckBox(Localization.lang("Show priority"));
-        relevanceColumn = new JCheckBox(Localization.lang("Show relevance"));
-        printedColumn = new JCheckBox(Localization.lang("Show printed status"));
-        readStatusColumn = new JCheckBox(Localization.lang("Show read status"));
+        listOfFileColumns = new ListView<>(FXCollections.observableArrayList(fileTypeNames));
+        listOfFileColumnsVBox = new VBox();
+        listOfFileColumnsVBox.getChildren().add(listOfFileColumns);
+        ScrollPane listOfFileColumnsScrollPane = new ScrollPane();
+        listOfFileColumnsScrollPane.setMaxHeight(80);
+        listOfFileColumnsScrollPane.setContent(listOfFileColumnsVBox);
+        extraFileColumns = new CheckBox(Localization.lang("Show extra columns"));
+        extraFileColumns.setFont(FontSize.smallFont);
+        if (!extraFileColumns.isSelected()) {
+            listOfFileColumnsVBox.setDisable(true);
+        }
+        extraFileColumns.setOnAction(arg0 -> listOfFileColumnsVBox.setDisable(!extraFileColumns.isSelected()));
+
+        /** begin: special table columns and special fields ***/
+
+        Button helpButton = new Button("?");
+        helpButton.setPrefSize(20, 20);
+        helpButton.setOnAction(e->new HelpAction(Localization.lang("Help on special fields"),
+                HelpFile.SPECIAL_FIELDS).getHelpButton().doClick());
+
+        rankingColumn = new CheckBox(Localization.lang("Show rank"));
+        rankingColumn.setFont(FontSize.smallFont);
+        qualityColumn = new CheckBox(Localization.lang("Show quality"));
+        qualityColumn.setFont(FontSize.smallFont);
+        priorityColumn = new CheckBox(Localization.lang("Show priority"));
+        priorityColumn.setFont(FontSize.smallFont);
+        relevanceColumn = new CheckBox(Localization.lang("Show relevance"));
+        relevanceColumn.setFont(FontSize.smallFont);
+        printedColumn = new CheckBox(Localization.lang("Show printed status"));
+        printedColumn.setFont(FontSize.smallFont);
+        readStatusColumn = new CheckBox(Localization.lang("Show read status"));
+        readStatusColumn.setFont(FontSize.smallFont);
 
         // "sync keywords" and "write special" fields may be configured mutually exclusive only
         // The implementation supports all combinations (TRUE+TRUE and FALSE+FALSE, even if the latter does not make sense)
         // To avoid confusion, we opted to make the setting mutually exclusive
-        syncKeywords = new JRadioButton(Localization.lang("Synchronize with keywords"));
-        writeSpecialFields = new JRadioButton(Localization.lang("Write values of special fields as separate fields to BibTeX"));
-        ButtonGroup group = new ButtonGroup();
-        group.add(syncKeywords);
-        group.add(writeSpecialFields);
-
-        specialFieldsEnabled = new JCheckBox(Localization.lang("Enable special fields"));
-        specialFieldsEnabled.addChangeListener(event -> {
+        syncKeywords = new RadioButton(Localization.lang("Synchronize with keywords"));
+        syncKeywords.setFont(FontSize.smallFont);
+        writeSpecialFields = new RadioButton(Localization.lang("Write values of special fields as separate fields to BibTeX"));
+        writeSpecialFields.setFont(FontSize.smallFont);
+
+        specialFieldsEnabled = new CheckBox(Localization.lang("Enable special fields"));
+        specialFieldsEnabled.setFont(FontSize.smallFont);
+        specialFieldsEnabled.setOnAction(event -> {
             boolean isEnabled = specialFieldsEnabled.isSelected();
-            rankingColumn.setEnabled(isEnabled);
-            qualityColumn.setEnabled(isEnabled);
-            priorityColumn.setEnabled(isEnabled);
-            relevanceColumn.setEnabled(isEnabled);
-            printedColumn.setEnabled(isEnabled);
-            readStatusColumn.setEnabled(isEnabled);
-            syncKeywords.setEnabled(isEnabled);
-            writeSpecialFields.setEnabled(isEnabled);
+            rankingColumn.setDisable(!isEnabled);
+            qualityColumn.setDisable(!isEnabled);
+            priorityColumn.setDisable(!isEnabled);
+            relevanceColumn.setDisable(!isEnabled);
+            printedColumn.setDisable(!isEnabled);
+            readStatusColumn.setDisable(!isEnabled);
+            syncKeywords.setDisable(!isEnabled);
+            writeSpecialFields.setDisable(!isEnabled);
         });
 
-        builder.appendSeparator(Localization.lang("Special table columns"));
-        builder.nextLine();
-        builder.append(pan);
-
-        DefaultFormBuilder specialTableColumnsBuilder = new DefaultFormBuilder(new FormLayout(
-                "8dlu, 8dlu, 8cm, 8dlu, 8dlu, left:pref:grow", "pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref"));
-        CellConstraints cc = new CellConstraints();
-
-        specialTableColumnsBuilder.add(specialFieldsEnabled, cc.xyw(1, 1, 3));
-        specialTableColumnsBuilder.add(rankingColumn, cc.xyw(2, 2, 2));
-        specialTableColumnsBuilder.add(relevanceColumn, cc.xyw(2, 3, 2));
-        specialTableColumnsBuilder.add(qualityColumn, cc.xyw(2, 4, 2));
-        specialTableColumnsBuilder.add(priorityColumn, cc.xyw(2, 5, 2));
-        specialTableColumnsBuilder.add(printedColumn, cc.xyw(2, 6, 2));
-        specialTableColumnsBuilder.add(readStatusColumn, cc.xyw(2, 7, 2));
-        specialTableColumnsBuilder.add(syncKeywords, cc.xyw(2, 10, 2));
-        specialTableColumnsBuilder.add(writeSpecialFields, cc.xyw(2, 11, 2));
-        specialTableColumnsBuilder.add(helpButton, cc.xyw(1, 12, 2));
-
-        specialTableColumnsBuilder.add(fileColumn, cc.xyw(5, 1, 2));
-        specialTableColumnsBuilder.add(urlColumn, cc.xyw(5, 2, 2));
-        specialTableColumnsBuilder.add(preferUrl, cc.xy(6, 3));
-        specialTableColumnsBuilder.add(preferDoi, cc.xy(6, 4));
-        specialTableColumnsBuilder.add(arxivColumn, cc.xyw(5, 5, 2));
-
-        specialTableColumnsBuilder.add(extraFileColumns, cc.xyw(5, 6, 2));
-        specialTableColumnsBuilder.add(listOfFileColumnsScrollPane, cc.xywh(5, 7, 2, 6));
-
-        builder.append(specialTableColumnsBuilder.getPanel());
-        builder.nextLine();
+        Label specialTableColumns = new Label(Localization.lang("Special table columns") + "  ------------------------------------");
+        specialTableColumns.setFont(FontSize.bigFont);
+        builder.add(specialTableColumns, 1, 1);
+
+        GridPane specialTableColumnsBuilder = new GridPane();
+        specialTableColumnsBuilder.add(specialFieldsEnabled, 1, 1);
+        specialTableColumnsBuilder.add(rankingColumn, 1, 2);
+        specialTableColumnsBuilder.add(relevanceColumn,  1, 3);
+        specialTableColumnsBuilder.add(qualityColumn, 1, 4);
+        specialTableColumnsBuilder.add(priorityColumn, 1, 5);
+        specialTableColumnsBuilder.add(printedColumn, 1, 6);
+        specialTableColumnsBuilder.add(readStatusColumn, 1, 7);
+        specialTableColumnsBuilder.add(syncKeywords, 1, 8);
+        specialTableColumnsBuilder.add(writeSpecialFields, 1, 9);
+        specialTableColumnsBuilder.add(helpButton, 1, 10);
+
+        specialTableColumnsBuilder.add(fileColumn, 2, 1);
+        specialTableColumnsBuilder.add(urlColumn, 2, 2);
+        specialTableColumnsBuilder.add(preferUrl, 2 ,3);
+        specialTableColumnsBuilder.add(preferDoi, 2, 4);
+        specialTableColumnsBuilder.add(arxivColumn, 2, 5);
+
+        specialTableColumnsBuilder.add(extraFileColumns,2, 6);
+        specialTableColumnsBuilder.add(listOfFileColumnsScrollPane, 2, 10);
+
+        builder.add(specialTableColumnsBuilder, 1, 2);
 
         /*** end: special table columns and special fields ***/
+        builder.add(new Label(""), 1, 3);
+        Label entryTableColumns = new Label(Localization.lang("Entry table columns") + "  --------------------------------------");
+        entryTableColumns.setFont(FontSize.bigFont);
+        builder.add(entryTableColumns, 1, 4);
+        builder.add(tabPanel, 1, 5);
+
+        Button buttonWidth = new Button("Update to current column widths");
+        buttonWidth.setPrefSize(200, 30);
+        buttonWidth.setFont(FontSize.smallFont);
+        buttonWidth.setOnAction(e->new UpdateWidthsAction());
+        Button buttonOrder = new Button("Update to current column order");
+        buttonOrder.setPrefSize(200, 30);
+        buttonOrder.setFont(FontSize.smallFont);
+        buttonOrder.setOnAction(e->new UpdateOrderAction());
+        builder.add(buttonWidth, 1, 6);
+        builder.add(buttonOrder, 1, 7);
+    }
 
-        builder.appendSeparator(Localization.lang("Entry table columns"));
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(tabPanel);
-        builder.nextLine();
-        builder.append(pan);
-        JButton buttonWidth = new JButton(new UpdateWidthsAction());
-        JButton buttonOrder = new JButton(new UpdateOrderAction());
-        builder.append(buttonWidth);
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(buttonOrder);
-        builder.nextLine();
-        builder.append(pan);
-        builder.nextLine();
-        pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        add(pan, BorderLayout.CENTER);
+    public Node getBuilder() {
+        return builder;
     }
 
     @Override
@@ -330,20 +351,22 @@ public void setValues() {
         extraFileColumns.setSelected(prefs.getBoolean(JabRefPreferences.EXTRA_FILE_COLUMNS));
         if (extraFileColumns.isSelected()) {
             List<String> desiredColumns = prefs.getStringList(JabRefPreferences.LIST_OF_FILE_COLUMNS);
-            int listSize = listOfFileColumns.getModel().getSize();
+            int listSize = listOfFileColumns.getSelectionModel().getSelectedIndex();
             int[] indicesToSelect = new int[listSize];
             for (int i = 0; i < listSize; i++) {
                 indicesToSelect[i] = listSize + 1;
                 for (String desiredColumn : desiredColumns) {
-                    if (listOfFileColumns.getModel().getElementAt(i).equals(desiredColumn)) {
+                    if (listOfFileColumns.getAccessibleText().equals(desiredColumn)) {
                         indicesToSelect[i] = i;
                         break;
                     }
                 }
             }
-            listOfFileColumns.setSelectedIndices(indicesToSelect);
+            for (int i = 0; i < listSize; i++) {
+                listOfFileColumns.getSelectionModel().select(indicesToSelect[i]);
+            }
         } else {
-            listOfFileColumns.setSelectedIndices(new int[] {});
+            listOfFileColumns.getSelectionModel().select(new int[] {});
         }
 
         /*** begin: special fields ***/
@@ -389,192 +412,44 @@ public void setValues() {
                 tableRows.add(new TableRow(names.get(i)));
             }
         }
-        rowCount = tableRows.size() + 5;
     }
 
     /*** end: special fields ***/
 
-    static class TableRow {
+    public static class TableRow {
 
-        private String name;
-        private double length;
+        private SimpleStringProperty name;
+        private SimpleDoubleProperty length;
 
         public TableRow() {
-            name = "";
-            length = BibtexSingleField.DEFAULT_FIELD_LENGTH;
+            name = new SimpleStringProperty("");
+            length = new SimpleDoubleProperty(BibtexSingleField.DEFAULT_FIELD_LENGTH);
         }
 
         public TableRow(String name) {
-            this.name = name;
-            length = BibtexSingleField.DEFAULT_FIELD_LENGTH;
+            this.name = new SimpleStringProperty(name);
+            length = new SimpleDoubleProperty(BibtexSingleField.DEFAULT_FIELD_LENGTH);
         }
 
         public TableRow(String name, double length) {
-            this.name = name;
-            this.length = length;
+            this.name = new SimpleStringProperty(name);
+            this.length = new SimpleDoubleProperty(length);
         }
 
         public String getName() {
-            return name;
+            return name.get();
         }
 
         public void setName(String name) {
-            this.name = name;
+            this.name.set(name);
         }
 
         public double getLength() {
-            return length;
-        }
-
-        public void setLength(int length) {
-            this.length = length;
-        }
-    }
-
-    class DeleteRowAction extends AbstractAction {
-
-        public DeleteRowAction() {
-            super("Delete row", IconTheme.JabRefIcons.REMOVE_NOBOX.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Delete rows"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int[] rows = colSetup.getSelectedRows();
-            if (rows.length == 0) {
-                return;
-            }
-            int offs = 0;
-            for (int i = rows.length - 1; i >= 0; i--) {
-                if ((rows[i] <= tableRows.size()) && (rows[i] != 0)) {
-                    tableRows.remove(rows[i] - 1);
-                    offs++;
-                }
-            }
-            rowCount -= offs;
-            if (rows.length > 1) {
-                colSetup.clearSelection();
-            }
-            colSetup.revalidate();
-            colSetup.repaint();
-            tableChanged = true;
-        }
-    }
-
-    class AddRowAction extends AbstractAction {
-
-        public AddRowAction() {
-            super("Add row", IconTheme.JabRefIcons.ADD_NOBOX.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Insert rows"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int[] rows = colSetup.getSelectedRows();
-            if (rows.length == 0) {
-                // No rows selected, so we just add one at the end.
-                rowCount++;
-                colSetup.revalidate();
-                colSetup.repaint();
-                return;
-            }
-            for (int i = 0; i < rows.length; i++) {
-                if (((rows[i] + i) - 1) < tableRows.size()) {
-                    tableRows.add(Math.max(0, (rows[i] + i) - 1), new TableRow());
-                }
-            }
-            rowCount += rows.length;
-            if (rows.length > 1) {
-                colSetup.clearSelection();
-            }
-            colSetup.revalidate();
-            colSetup.repaint();
-            tableChanged = true;
-        }
-    }
-
-    abstract class AbstractMoveRowAction extends AbstractAction {
-
-        public AbstractMoveRowAction(String string, Icon image) {
-            super(string, image);
-        }
-
-        public void swap(int i, int j) {
-            if ((i < 0) || (i >= tableRows.size())) {
-                return;
-            }
-            if ((j < 0) || (j >= tableRows.size())) {
-                return;
-            }
-            TableRow tmp = tableRows.get(i);
-            tableRows.set(i, tableRows.get(j));
-            tableRows.set(j, tmp);
-        }
-    }
-
-    class MoveRowUpAction extends AbstractMoveRowAction {
-
-        public MoveRowUpAction() {
-            super("Up", IconTheme.JabRefIcons.UP.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Move up"));
+            return length.get();
         }
 
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int[] selected = colSetup.getSelectedRows();
-            Arrays.sort(selected);
-            // first element (#) not inside tableRows
-            // don't move if a selected element is at bounce
-            if ((selected.length > 0) && (selected[0] > 1)) {
-                boolean[] newSelected = new boolean[colSetup.getRowCount()];
-                for (int i : selected) {
-                    swap(i - 1, i - 2);
-                    newSelected[i - 1] = true;
-                }
-                // select all and remove unselected
-                colSetup.setRowSelectionInterval(0, colSetup.getRowCount() - 1);
-                for (int i = 0; i < colSetup.getRowCount(); i++) {
-                    if (!newSelected[i]) {
-                        colSetup.removeRowSelectionInterval(i, i);
-                    }
-                }
-                colSetup.revalidate();
-                colSetup.repaint();
-                tableChanged = true;
-            }
-        }
-    }
-
-    class MoveRowDownAction extends AbstractMoveRowAction {
-
-        public MoveRowDownAction() {
-            super("Down", IconTheme.JabRefIcons.DOWN.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Down"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int[] selected = colSetup.getSelectedRows();
-            Arrays.sort(selected);
-            final int last = selected.length - 1;
-            boolean[] newSelected = new boolean[colSetup.getRowCount()];
-            // don't move if a selected element is at bounce
-            if ((selected.length > 0) && (selected[last] < tableRows.size())) {
-                for (int i = last; i >= 0; i--) {
-                    swap(selected[i] - 1, selected[i]);
-                    newSelected[selected[i] + 1] = true;
-                }
-                // select all and remove unselected
-                colSetup.setRowSelectionInterval(0, colSetup.getRowCount() - 1);
-                for (int i = 0; i < colSetup.getRowCount(); i++) {
-                    if (!newSelected[i]) {
-                        colSetup.removeRowSelectionInterval(i, i);
-                    }
-                }
-                colSetup.revalidate();
-                colSetup.repaint();
-                tableChanged = true;
-            }
+        public void setLength(double length) {
+            this.length.set(length);
         }
     }
 
@@ -612,8 +487,10 @@ public void actionPerformed(ActionEvent e) {
                 return n1.compareTo(n2);
             });
 
-            colSetup.revalidate();
-            colSetup.repaint();
+            data.clear();
+            data.addAll(tableRows);
+            colSetup.setItems(data);
+            colSetup.refresh();
             tableChanged = true;
         }
     }
@@ -671,12 +548,8 @@ public void storeSettings() {
         prefs.putBoolean(JabRefPreferences.ARXIV_COLUMN, arxivColumn.isSelected());
 
         prefs.putBoolean(JabRefPreferences.EXTRA_FILE_COLUMNS, extraFileColumns.isSelected());
-        if (extraFileColumns.isSelected() && !listOfFileColumns.isSelectionEmpty()) {
-            int numberSelected = listOfFileColumns.getSelectedIndices().length;
-            List<String> selections = new ArrayList<>(numberSelected);
-            for (int i = 0; i < numberSelected; i++) {
-                selections.add(listOfFileColumns.getModel().getElementAt(listOfFileColumns.getSelectedIndices()[i]));
-            }
+        if (extraFileColumns.isSelected() && !listOfFileColumns.getSelectionModel().isEmpty()) {
+            ObservableList selections = listOfFileColumns.getSelectionModel().getSelectedItems();
             prefs.putStringList(JabRefPreferences.LIST_OF_FILE_COLUMNS, selections);
         } else {
             prefs.putStringList(JabRefPreferences.LIST_OF_FILE_COLUMNS, new ArrayList<>());
@@ -728,11 +601,11 @@ public void storeSettings() {
 
         /*** end: special fields ***/
 
-        if (colSetup.isEditing()) {
-            int col = colSetup.getEditingColumn();
-            int row = colSetup.getEditingRow();
-            colSetup.getCellEditor(row, col).stopCellEditing();
-        }
+//        if (colSetup.isEditing()) {
+//            int col = colSetup.getEditingColumn();
+//            int row = colSetup.getEditingRow();
+//            colSetup.getCellEditor(row, col).stopCellEditing();
+//        }
 
         // Now we need to make sense of the contents the user has made to the
         // table setup table.
diff --git a/src/main/java/org/jabref/gui/preftabs/TablePrefsTab.java b/src/main/java/org/jabref/gui/preftabs/TablePrefsTab.java
index acbee5be563..c563b75848d 100644
--- a/src/main/java/org/jabref/gui/preftabs/TablePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/TablePrefsTab.java
@@ -1,19 +1,19 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
+import javafx.collections.FXCollections;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
 
 import org.jabref.Globals;
 import org.jabref.logic.l10n.Localization;
@@ -21,34 +21,31 @@
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-class TablePrefsTab extends JPanel implements PrefsTab {
+class TablePrefsTab extends Pane implements PrefsTab {
 
     private final JabRefPreferences prefs;
 
-    private final JCheckBox autoResizeMode;
-    private final JCheckBox priDesc;
-    private final JCheckBox secDesc;
-    private final JCheckBox terDesc;
-
-    private final JRadioButton namesAsIs;
-    private final JRadioButton namesFf;
-    private final JRadioButton namesFl;
-    private final JRadioButton namesNatbib;
-    private final JRadioButton abbrNames;
-    private final JRadioButton noAbbrNames;
-    private final JRadioButton lastNamesOnly;
-
-    private final JTextField priField;
-    private final JTextField secField;
-    private final JTextField terField;
-    private final JTextField numericFields;
-    private final JComboBox<String> priSort;
-    private final JComboBox<String> secSort;
-    private final JComboBox<String> terSort;
-
+    private final CheckBox autoResizeMode;
+    private final CheckBox priDesc;
+    private final CheckBox secDesc;
+    private final CheckBox terDesc;
+
+    private final RadioButton namesAsIs;
+    private final RadioButton namesFf;
+    private final RadioButton namesFl;
+    private final RadioButton namesNatbib;
+    private final RadioButton abbrNames;
+    private final RadioButton noAbbrNames;
+    private final RadioButton lastNamesOnly;
+
+    private final TextField priField;
+    private final TextField secField;
+    private final TextField terField;
+    private final TextField numericFields;
+    private final ComboBox priSort;
+    private final ComboBox secSort;
+    private final ComboBox terSort;
+    private final GridPane builder = new GridPane();
 
     /**
      * Customization of external program paths.
@@ -58,8 +55,6 @@ class TablePrefsTab extends JPanel implements PrefsTab {
      */
     public TablePrefsTab(JabRefPreferences prefs) {
         this.prefs = prefs;
-        setLayout(new BorderLayout());
-
         /**
          * Added Bibtexkey to combobox.
          *
@@ -71,134 +66,121 @@ public TablePrefsTab(JabRefPreferences prefs) {
         fieldNames.add(BibEntry.KEY_FIELD);
         Collections.sort(fieldNames);
         String[] allPlusKey = fieldNames.toArray(new String[fieldNames.size()]);
-        priSort = new JComboBox<>(allPlusKey);
-        secSort = new JComboBox<>(allPlusKey);
-        terSort = new JComboBox<>(allPlusKey);
-
-        autoResizeMode = new JCheckBox(Localization.lang("Fit table horizontally on screen"));
-
-        namesAsIs = new JRadioButton(Localization.lang("Show names unchanged"));
-        namesFf = new JRadioButton(Localization.lang("Show 'Firstname Lastname'"));
-        namesFl = new JRadioButton(Localization.lang("Show 'Lastname, Firstname'"));
-        namesNatbib = new JRadioButton(Localization.lang("Natbib style"));
-        noAbbrNames = new JRadioButton(Localization.lang("Do not abbreviate names"));
-        abbrNames = new JRadioButton(Localization.lang("Abbreviate names"));
-        lastNamesOnly = new JRadioButton(Localization.lang("Show last names only"));
-
-        priField = new JTextField(10);
-        secField = new JTextField(10);
-        terField = new JTextField(10);
-
-        numericFields = new JTextField(30);
-
-        priSort.insertItemAt(Localization.lang("<select>"), 0);
-        secSort.insertItemAt(Localization.lang("<select>"), 0);
-        terSort.insertItemAt(Localization.lang("<select>"), 0);
-
-        priSort.addActionListener(e -> {
-            if (priSort.getSelectedIndex() > 0) {
-                priField.setText(priSort.getSelectedItem().toString());
-                priSort.setSelectedIndex(0);
+        priSort = new ComboBox<>(FXCollections.observableArrayList(allPlusKey));
+        secSort = new ComboBox<>(FXCollections.observableArrayList(allPlusKey));
+        terSort = new ComboBox<>(FXCollections.observableArrayList(allPlusKey));
+
+        autoResizeMode = new CheckBox(Localization.lang("Fit table horizontally on screen"));
+        autoResizeMode.setFont(FontSize.smallFont);
+        namesAsIs = new RadioButton(Localization.lang("Show names unchanged"));
+        namesAsIs.setFont(FontSize.smallFont);
+        namesFf = new RadioButton(Localization.lang("Show 'Firstname Lastname'"));
+        namesFf.setFont(FontSize.smallFont);
+        namesFl = new RadioButton(Localization.lang("Show 'Lastname, Firstname'"));
+        namesFl.setFont(FontSize.smallFont);
+        namesNatbib = new RadioButton(Localization.lang("Natbib style"));
+        namesNatbib.setFont(FontSize.smallFont);
+        noAbbrNames = new RadioButton(Localization.lang("Do not abbreviate names"));
+        noAbbrNames.setFont(FontSize.smallFont);
+        abbrNames = new RadioButton(Localization.lang("Abbreviate names"));
+        abbrNames.setFont(FontSize.smallFont);
+        lastNamesOnly = new RadioButton(Localization.lang("Show last names only"));
+        lastNamesOnly.setFont(FontSize.smallFont);
+
+        priField = new TextField();
+        secField = new TextField();
+        terField = new TextField();
+
+        numericFields = new TextField();
+
+        priSort.setValue(Localization.lang("<select>"));
+        secSort.setValue(Localization.lang("<select>"));
+        terSort.setValue(Localization.lang("<select>"));
+
+        priSort.setOnAction(e -> {
+            if (priSort.getBaselineOffset() > 0) {
+                priField.setText(priSort.getItems().toString());
             }
         });
-        secSort.addActionListener(e -> {
-            if (secSort.getSelectedIndex() > 0) {
-                secField.setText(secSort.getSelectedItem().toString());
-                secSort.setSelectedIndex(0);
+        secSort.setOnAction(e -> {
+            if (secSort.getBaselineOffset() > 0) {
+                secField.setText(secSort.getItems().toString());
             }
         });
-        terSort.addActionListener(e -> {
-            if (terSort.getSelectedIndex() > 0) {
-                terField.setText(terSort.getSelectedItem().toString());
-                terSort.setSelectedIndex(0);
+        terSort.setOnAction(e -> {
+            if (terSort.getBaselineOffset() > 0) {
+                terField.setText(terSort.getItems().toString());
             }
         });
 
-        ButtonGroup nameStyle = new ButtonGroup();
-        nameStyle.add(namesAsIs);
-        nameStyle.add(namesNatbib);
-        nameStyle.add(namesFf);
-        nameStyle.add(namesFl);
-        ButtonGroup nameAbbrev = new ButtonGroup();
-        nameAbbrev.add(lastNamesOnly);
-        nameAbbrev.add(abbrNames);
-        nameAbbrev.add(noAbbrNames);
-        priDesc = new JCheckBox(Localization.lang("Descending"));
-        secDesc = new JCheckBox(Localization.lang("Descending"));
-        terDesc = new JCheckBox(Localization.lang("Descending"));
-
-        FormLayout layout = new FormLayout(
-                "1dlu, 8dlu, left:pref, 4dlu, fill:pref, 4dlu, fill:60dlu, 4dlu, fill:pref", "");
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        JLabel lab;
-        JPanel pan = new JPanel();
-
-        builder.appendSeparator(Localization.lang("Format of author and editor names"));
-        DefaultFormBuilder nameBuilder = new DefaultFormBuilder(new FormLayout(
-                "left:pref, 8dlu, left:pref", ""));
-
-        nameBuilder.append(namesAsIs);
-        nameBuilder.append(noAbbrNames);
-        nameBuilder.nextLine();
-        nameBuilder.append(namesFf);
-        nameBuilder.append(abbrNames);
-        nameBuilder.nextLine();
-        nameBuilder.append(namesFl);
-        nameBuilder.append(lastNamesOnly);
-        nameBuilder.nextLine();
-        nameBuilder.append(namesNatbib);
-        builder.append(pan);
-        builder.append(nameBuilder.getPanel());
-        builder.nextLine();
-
-        builder.appendSeparator(Localization.lang("Default sort criteria"));
+        priDesc = new CheckBox(Localization.lang("Descending"));
+        priDesc.setFont(FontSize.smallFont);
+        secDesc = new CheckBox(Localization.lang("Descending"));
+        secDesc.setFont(FontSize.smallFont);
+        terDesc = new CheckBox(Localization.lang("Descending"));
+        terDesc.setFont(FontSize.smallFont);
+
+        Label formatOfAuthor = new Label(Localization.lang("Format of author and editor names") + "  ----------------------");
+        formatOfAuthor.setFont(FontSize.bigFont);
+        builder.add(formatOfAuthor, 1, 1);
+        builder.add(namesAsIs, 1, 2);
+        builder.add(noAbbrNames, 2, 2);
+        builder.add(namesFf, 1, 3);
+        builder.add(abbrNames, 2, 3);
+        builder.add(namesFl, 1, 4);
+        builder.add(lastNamesOnly, 2, 4);
+        builder.add(namesNatbib, 1, 5);
+
+        Label label1 = new Label("");
+        builder.add(label1, 1, 6);
+
+        Label defaultSortCriteria = new Label(Localization.lang("Default sort criteria") + "  ----------------------------------------");
+        defaultSortCriteria.setFont(FontSize.bigFont);
+        builder.add(defaultSortCriteria, 1, 7);
         // Create a new panel with its own FormLayout for these items:
-        FormLayout layout2 = new FormLayout(
-                "left:pref, 8dlu, fill:pref, 4dlu, fill:60dlu, 4dlu, left:pref", "");
-        DefaultFormBuilder builder2 = new DefaultFormBuilder(layout2);
-        lab = new JLabel(Localization.lang("Primary sort criterion"));
-        builder2.append(lab);
-        builder2.append(priSort);
-        builder2.append(priField);
-        builder2.append(priDesc);
-        builder2.nextLine();
-        lab = new JLabel(Localization.lang("Secondary sort criterion"));
-        builder2.append(lab);
-        builder2.append(secSort);
-        builder2.append(secField);
-        builder2.append(secDesc);
-        builder2.nextLine();
-        lab = new JLabel(Localization.lang("Tertiary sort criterion"));
-        builder2.append(lab);
-        builder2.append(terSort);
-        builder2.append(terField);
-        builder2.append(terDesc);
-        builder.nextLine();
-        builder.append(pan);
-        builder.append(builder2.getPanel());
-        builder.nextLine();
-        builder.append(pan);
-        builder2 = new DefaultFormBuilder(new FormLayout("left:pref, 8dlu, fill:pref", ""));
-        builder2.append(Localization.lang("Sort the following fields as numeric fields") + ':');
-        builder2.append(numericFields);
-        builder.append(builder2.getPanel(), 5);
-        builder.nextLine();
-        builder.appendSeparator(Localization.lang("General"));
-        builder.append(pan);
-        builder.append(autoResizeMode);
-        builder.nextLine();
-
-        pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        add(pan, BorderLayout.CENTER);
-
-        namesNatbib.addChangeListener(e -> {
-            abbrNames.setEnabled(!namesNatbib.isSelected());
-            lastNamesOnly.setEnabled(!namesNatbib.isSelected());
-            noAbbrNames.setEnabled(!namesNatbib.isSelected());
+        Label primarySortCriterion = new Label(Localization.lang("Primary sort criterion"));
+        primarySortCriterion.setFont(FontSize.smallFont);
+        builder.add(primarySortCriterion, 1, 8);
+        builder.add(priSort, 2, 8);
+        builder.add(priField, 3, 8);
+        builder.add(priDesc, 4, 8);
+
+        Label secondarySortCriterion = new Label(Localization.lang("Secondary sort criterion"));
+        secondarySortCriterion.setFont(FontSize.smallFont);
+        builder.add(secondarySortCriterion, 1, 9);
+        builder.add(secSort, 2, 9);
+        builder.add(secField, 3, 9);
+        builder.add(secDesc, 4, 9);
+
+        Label tertiarySortCriterion = new Label(Localization.lang("Tertiary sort criterion"));
+        tertiarySortCriterion.setFont(FontSize.smallFont);
+        builder.add(tertiarySortCriterion, 1, 10);
+        builder.add(terSort, 2, 10);
+        builder.add(terField, 3, 10);
+        builder.add(terDesc, 4, 10);
+
+        Label sortFields = new Label(Localization.lang("Sort the following fields as numeric fields") + ':');
+        sortFields.setFont(FontSize.smallFont);
+        builder.add(sortFields, 1, 11);
+        builder.add(numericFields, 2, 11);
+
+        builder.add(new Label(""), 1, 12);
+
+        Label general = new Label(Localization.lang("General") + " ------------------------------------------------------");
+        general.setFont(FontSize.bigFont);
+        builder.add(general, 1, 13);
+        builder.add(autoResizeMode, 1, 14);
+        namesNatbib.setOnAction(e -> {
+            abbrNames.setDisable(namesNatbib.isSelected());
+            lastNamesOnly.setDisable(namesNatbib.isSelected());
+            noAbbrNames.setDisable(namesNatbib.isSelected());
         });
     }
 
+    public Node getBuilder() {
+        return builder;
+    }
+
     @Override
     public void setValues() {
         autoResizeMode.setSelected(prefs.getBoolean(JabRefPreferences.AUTO_RESIZE_MODE));
@@ -206,9 +188,6 @@ public void setValues() {
         priField.setText(prefs.get(JabRefPreferences.TABLE_PRIMARY_SORT_FIELD));
         secField.setText(prefs.get(JabRefPreferences.TABLE_SECONDARY_SORT_FIELD));
         terField.setText(prefs.get(JabRefPreferences.TABLE_TERTIARY_SORT_FIELD));
-        priSort.setSelectedIndex(0);
-        secSort.setSelectedIndex(0);
-        terSort.setSelectedIndex(0);
 
         if (prefs.getBoolean(JabRefPreferences.NAMES_AS_IS)) {
             namesAsIs.setSelected(true);
@@ -230,9 +209,9 @@ public void setValues() {
         secDesc.setSelected(prefs.getBoolean(JabRefPreferences.TABLE_SECONDARY_SORT_DESCENDING));
         terDesc.setSelected(prefs.getBoolean(JabRefPreferences.TABLE_TERTIARY_SORT_DESCENDING));
 
-        abbrNames.setEnabled(!namesNatbib.isSelected());
-        lastNamesOnly.setEnabled(!namesNatbib.isSelected());
-        noAbbrNames.setEnabled(!namesNatbib.isSelected());
+        abbrNames.setDisable(namesNatbib.isSelected());
+        lastNamesOnly.setDisable(namesNatbib.isSelected());
+        noAbbrNames.setDisable(namesNatbib.isSelected());
 
         String numF = prefs.get(JabRefPreferences.NUMERIC_FIELDS);
         if (numF == null) {
diff --git a/src/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java b/src/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java
index aa78b4cd65b..18c1aa56d86 100644
--- a/src/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java
@@ -1,228 +1,141 @@
 package org.jabref.gui.preftabs;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JToolBar;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingConstants;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableColumnModel;
-import javax.swing.table.TableModel;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.control.cell.TextFieldTableCell;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
 
-import org.jabref.gui.OSXCompatibleToolbar;
-import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
 /**
  * Preference Tab for XMP.
  *
  * Allows the user to enable and configure the XMP privacy filter.
  */
-class XmpPrefsTab extends JPanel implements PrefsTab {
-
+class XmpPrefsTab extends Pane implements PrefsTab {
     private final JabRefPreferences prefs;
     private boolean tableChanged;
-
-    private int rowCount;
-
-    private final JTable table;
-
-    private final JCheckBox privacyFilterCheckBox = new JCheckBox(
+    private final GridPane builder = new GridPane();
+    private final ObservableList<TableRow> data = FXCollections.observableArrayList();
+    private final CheckBox privacyFilterCheckBox = new CheckBox(
             Localization.lang("Do not write the following fields to XMP Metadata:"));
-
-    private final List<Object> tableRows = new ArrayList<>(10);
-
+    private final List<TableRow> tableRows = new ArrayList<>(10);
 
     /**
      * Customization of external program paths.
      */
     public XmpPrefsTab(JabRefPreferences prefs) {
         this.prefs = Objects.requireNonNull(prefs);
-        setLayout(new BorderLayout());
-
-        TableModel tableModel = new AbstractTableModel() {
-
-            @Override
-            public int getRowCount() {
-                return rowCount;
-            }
-
-            @Override
-            public int getColumnCount() {
-                return 1;
-            }
-
-            @Override
-            public Object getValueAt(int row, int column) {
-                if (row >= tableRows.size()) {
-                    return "";
-                }
-                Object rowContent = tableRows.get(row);
-                if (rowContent == null) {
-                    return "";
-                }
-                return rowContent;
-            }
-
-            @Override
-            public String getColumnName(int col) {
-                return Localization.lang("Field to filter");
-            }
-
-            @Override
-            public Class<?> getColumnClass(int column) {
-                return String.class;
-            }
-
-            @Override
-            public boolean isCellEditable(int row, int col) {
-                return true;
+        TableView tableView = new TableView();
+        TableColumn<TableRow,String> column = new TableColumn<>(Localization.lang("Field to filter"));
+        column.setCellValueFactory(new PropertyValueFactory<>("name"));
+        column.setCellFactory(TextFieldTableCell.<TableRow>forTableColumn());
+        column.setOnEditCommit(
+                (TableColumn.CellEditEvent<TableRow, String> t) -> {
+                    ((TableRow) t.getTableView().getItems().get(
+                            t.getTablePosition().getRow())
+                    ).setName(t.getNewValue());
+                });
+        column.setPrefWidth(350);
+        tableView.setItems(data);
+        tableView.getColumns().add(column);
+        final TextField addName = new TextField();
+        addName.setPromptText("name");
+        addName.setPrefSize(200, 30);
+        BorderPane tablePanel = new BorderPane();
+        ScrollPane scrollPane = new ScrollPane();
+        scrollPane.setMaxHeight(400);
+        scrollPane.setMaxWidth(400);
+        scrollPane.setContent(tableView);
+        tablePanel.setCenter(scrollPane);
+
+        Button add = new Button("Add");
+        add.setPrefSize(80, 20);
+        add.setOnAction(e-> {
+            if (!addName.getText().isEmpty()) {
+                TableRow tableRow = new TableRow(addName.getText());
+                addName.clear();
+                data.add(tableRow);
+                tableRows.clear();
+                tableRows.addAll(data);
+                tableView.setItems(data);
+                tableChanged = true;
+                tableView.refresh();
             }
-
-            @Override
-            public void setValueAt(Object value, int row, int col) {
+        });
+        Button delete = new Button("Delete");
+        delete.setPrefSize(80, 20);
+        delete.setOnAction(e-> {
+            if (tableView.getFocusModel() != null && tableView.getFocusModel().getFocusedIndex() != -1) {
                 tableChanged = true;
-
-                if (tableRows.size() <= row) {
-                    ((ArrayList<Object>) tableRows).ensureCapacity(row + 1);
-                }
-
-                tableRows.set(row, value);
+                int row = tableView.getFocusModel().getFocusedIndex();
+                TableRow tableRow = data.get(row);
+                data.remove(tableRow);
+                tableRows.clear();
+                tableRows.addAll(data);
+                tableView.setItems(data);
+                tableView.refresh();
             }
-
-        };
-
-        table = new JTable(tableModel);
-
-        TableColumnModel columnModel = table.getColumnModel();
-        columnModel.getColumn(0).setPreferredWidth(140);
-
-        FormLayout layout = new FormLayout("1dlu, 8dlu, left:pref, 4dlu, fill:pref", "");
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        JPanel pan = new JPanel();
-
-        JPanel tablePanel = new JPanel();
-        tablePanel.setLayout(new BorderLayout());
-        JScrollPane scrollPane = new JScrollPane(table, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        table.setPreferredScrollableViewportSize(new Dimension(250, 200));
-        scrollPane.setMinimumSize(new Dimension(250, 300));
-        tablePanel.add(scrollPane, BorderLayout.CENTER);
-
-        JToolBar toolbar = new OSXCompatibleToolbar(SwingConstants.VERTICAL);
-        toolbar.setFloatable(false);
-        toolbar.setBorder(null);
-        toolbar.add(new AddRowAction());
-        toolbar.add(new DeleteRowAction());
-
-        tablePanel.add(toolbar, BorderLayout.EAST);
+        });
+        HBox toolbar = new HBox(addName,add,delete);
+        tablePanel.setBottom(toolbar);
 
         // Build Prefs Tabs
-        builder.appendSeparator(Localization.lang("XMP export privacy settings"));
-        builder.nextLine();
-
-        builder.append(pan);
-        builder.append(privacyFilterCheckBox);
-        builder.nextLine();
+        Label xmpExportPrivacySettings = new Label(Localization.lang("XMP export privacy settings") + "  -------------------------");
+        xmpExportPrivacySettings.setFont(FontSize.bigFont);
+        builder.add(xmpExportPrivacySettings, 1, 1);
+        privacyFilterCheckBox.setFont(FontSize.smallFont);
+        builder.add(privacyFilterCheckBox, 1, 2);
+        builder.add(tablePanel, 1, 3);
 
-        builder.append(pan);
-        builder.append(tablePanel);
-        builder.nextLine();
-
-        pan = builder.getPanel();
-        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        add(pan, BorderLayout.CENTER);
     }
 
-    class DeleteRowAction extends AbstractAction {
-
-        public DeleteRowAction() {
-            super("Delete row", IconTheme.JabRefIcons.REMOVE_NOBOX.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Delete rows"));
-        }
+    public Node getBuilder() {
+        return builder;
+    }
 
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int[] rows = table.getSelectedRows();
-            if (rows.length == 0) {
-                return;
-            }
+    public static class TableRow {
+        private SimpleStringProperty name;
 
-            for (int i = rows.length - 1; i >= 0; i--) {
-                if (rows[i] < tableRows.size()) {
-                    tableRows.remove(rows[i]);
-                }
-            }
-            rowCount -= rows.length;
-            if (rows.length > 1) {
-                table.clearSelection();
-            }
-            table.revalidate();
-            table.repaint();
-            tableChanged = true;
+        TableRow(String name) {
+            this.name = new SimpleStringProperty(name);
         }
-    }
-
-    class AddRowAction extends AbstractAction {
 
-        public AddRowAction() {
-            super("Add row", IconTheme.JabRefIcons.ADD_NOBOX.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Insert rows"));
+        public void setName(String name) {
+            this.name.set(name);
         }
 
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int[] rows = table.getSelectedRows();
-            if (rows.length == 0) {
-                // No rows selected, so we just add one at the end.
-                rowCount++;
-                table.revalidate();
-                table.repaint();
-                return;
-            }
-            for (int i = 0; i < rows.length; i++) {
-                if ((rows[i] + i) < tableRows.size()) {
-                    tableRows.add(rows[i] + i, "");
-                }
-            }
-            rowCount += rows.length;
-            if (rows.length > 1) {
-                table.clearSelection();
-            }
-            table.revalidate();
-            table.repaint();
-            tableChanged = true;
+        public String getName() {
+            return name.get();
         }
     }
 
-
     /**
      * Load settings from the preferences and initialize the table.
      */
     @Override
     public void setValues() {
         tableRows.clear();
-        List<String> names = JabRefPreferences.getInstance().getStringList(JabRefPreferences.XMP_PRIVACY_FILTERS);
-        tableRows.addAll(names);
-        rowCount = tableRows.size() + 5;
-
+        tableRows.addAll(data);
         privacyFilterCheckBox.setSelected(JabRefPreferences.getInstance().getBoolean(
                 JabRefPreferences.USE_XMP_PRIVACY_FILTER));
     }
@@ -234,13 +147,6 @@ public void setValues() {
      */
     @Override
     public void storeSettings() {
-
-        if (table.isEditing()) {
-            int col = table.getEditingColumn();
-            int row = table.getEditingRow();
-            table.getCellEditor(row, col).stopCellEditing();
-        }
-
         // Now we need to make sense of the contents the user has made to the
         // table setup table. This needs to be done either if changes were made, or
         // if the checkbox is checked and no field values have been stored previously:
diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
index 30c1faf65d9..7f35bb9f59a 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
@@ -4,6 +4,11 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+
 import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -16,7 +21,9 @@
 
 public class PushToApplicationSettings {
     protected final JTextField path = new JTextField(30);
+    protected final TextField path1 = new TextField();
     protected JPanel settings;
+    protected GridPane jfxSettings;
     protected FormBuilder builder;
     protected AbstractPushToApplication application;
     private DialogService dialogService;
@@ -29,7 +36,23 @@ public class PushToApplicationSettings {
      *
      * @return a JPanel containing options, or null if options are not needed.
      */
-    public JPanel getSettingsPanel() {
+    public JPanel getSettingsPanel(int n) {
+        switch (n) {
+            case 0: application = new PushToEmacs(dialogService);
+                    break;
+            case 1: application = new PushToLyx(dialogService);
+                    break;
+            case 2: application = new PushToTexmaker(dialogService);
+                    break;
+            case 3: application = new PushToTeXstudio(dialogService);
+                     break;
+            case 4: application = new PushToVim(dialogService);
+                    break;
+            case 5: application = new PushToWinEdt(dialogService);
+                    break;
+            default: application = null;
+                    break;
+        }
         application.initParameters();
         String commandPath = Globals.prefs.get(application.commandPathPreferenceKey);
         if (settings == null) {
@@ -39,13 +62,23 @@ public JPanel getSettingsPanel() {
         return settings;
     }
 
+    public GridPane getJFXSettingPane() {
+        application.initParameters();
+        String commandPath = Globals.prefs.get(application.commandPathPreferenceKey);
+        if (jfxSettings == null) {
+            initJFXSettingsPanel();
+        }
+        path1.setText(commandPath);
+        return jfxSettings;
+    }
+
     /**
      * Create a FormBuilder, fill it with a textbox for the path and store the JPanel in settings
      */
     protected void initSettingsPanel() {
         builder = FormBuilder.create();
         builder.layout(new FormLayout("left:pref, 4dlu, fill:pref:grow, 4dlu, fill:pref", "p"));
-        StringBuilder label = new StringBuilder(Localization.lang("Path to %0", application.getApplicationName()));
+        StringBuilder label = new StringBuilder(Localization.lang("Path to %0", application.commandPathPreferenceKey));
         // In case the application name and the actual command is not the same, add the command in brackets
         if (application.getCommandName() == null) {
             label.append(':');
@@ -66,6 +99,28 @@ protected void initSettingsPanel() {
         settings = builder.build();
     }
 
+    protected void initJFXSettingsPanel() {
+        jfxSettings = new GridPane();
+        StringBuilder label = new StringBuilder(Localization.lang("Path to %0", application.getApplicationName()));
+        // In case the application name and the actual command is not the same, add the command in brackets
+        if (application.getCommandName() == null) {
+            label.append(':');
+        } else {
+            label.append(" (").append(application.getCommandName()).append("):");
+        }
+        jfxSettings.add(new Label(label.toString()),1,1);
+        jfxSettings.add(path1,2, 1);
+        Button browse = new Button(Localization.lang("Browse"));
+
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
+
+        browse.setOnAction(
+                e -> DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showFileOpenDialog(fileDialogConfiguration))
+                        .ifPresent(f -> path.setText(f.toAbsolutePath().toString())));
+        jfxSettings.add(browse,3, 1);
+    }
+
     /**
      * This method is called to indicate that the settings panel returned from the getSettingsPanel() method has been
      * shown to the user and that the user has indicated that the settings should be stored. This method must store the
diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java b/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java
index 099956c4bed..f754941839e 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationSettingsDialog.java
@@ -20,9 +20,9 @@
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 
 public class PushToApplicationSettingsDialog {
-    public static void showSettingsDialog(JFrame parent, PushToApplicationSettings toApp) {
+    public static void showSettingsDialog(JFrame parent, PushToApplicationSettings toApp, int n) {
         final JDialog diag = new JDialog(parent, Localization.lang("Settings"), true);
-        JPanel options = toApp.getSettingsPanel();
+        JPanel options = toApp.getSettingsPanel(n);
         options.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         diag.getContentPane().add(options, BorderLayout.CENTER);
         ButtonBarBuilder bb = new ButtonBarBuilder();
diff --git a/src/main/java/org/jabref/gui/push/PushToApplications.java b/src/main/java/org/jabref/gui/push/PushToApplications.java
index 335123dbdb3..0fe5024dee7 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplications.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplications.java
@@ -13,7 +13,6 @@ public PushToApplications(DialogService dialogService) {
         // Set up the current available choices:
 
         applications = new ArrayList<>();
-
         applications.add(new PushToEmacs(dialogService));
         applications.add(new PushToLyx(dialogService));
         applications.add(new PushToTexmaker(dialogService));
diff --git a/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java b/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
index 3f0665b5a81..e0a44562625 100644
--- a/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
@@ -3,6 +3,8 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
+import javafx.scene.layout.GridPane;
+
 import org.jabref.Globals;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
@@ -12,9 +14,15 @@ public class PushToEmacsSettings extends PushToApplicationSettings {
     private final JTextField additionalParams = new JTextField(30);
 
     @Override
-    public JPanel getSettingsPanel() {
+    public JPanel getSettingsPanel(int n) {
+        additionalParams.setText(Globals.prefs.get(JabRefPreferences.EMACS_ADDITIONAL_PARAMETERS));
+        return super.getSettingsPanel(n);
+    }
+
+    @Override
+    public GridPane getJFXSettingPane() {
         additionalParams.setText(Globals.prefs.get(JabRefPreferences.EMACS_ADDITIONAL_PARAMETERS));
-        return super.getSettingsPanel();
+        return super.getJFXSettingPane();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/push/PushToVimSettings.java b/src/main/java/org/jabref/gui/push/PushToVimSettings.java
index 20fbe337729..89ceab1d37b 100644
--- a/src/main/java/org/jabref/gui/push/PushToVimSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToVimSettings.java
@@ -12,9 +12,9 @@ public class PushToVimSettings extends PushToApplicationSettings {
     private final JTextField vimServer = new JTextField(30);
 
     @Override
-    public JPanel getSettingsPanel() {
+    public JPanel getSettingsPanel(int n) {
         vimServer.setText(Globals.prefs.get(JabRefPreferences.VIM_SERVER));
-        return super.getSettingsPanel();
+        return super.getSettingsPanel(n);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 31295289a14..87eeb0a83e9 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -77,7 +77,7 @@ private void addAndWatchForChanges(Scene scene, String cssUrl, int index) {
 
                     DefaultTaskExecutor.runInJavaFXThread(() -> {
                                 scene.getStylesheets().remove(cssUrl);
-                        scene.getStylesheets().add(index, cssUrl);
+                                scene.getStylesheets().add(index, cssUrl);
                             }
                     );
                 });
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupURLFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupURLFormatter.java
index 87c2ecf1dd5..e14b717dd64 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupURLFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupURLFormatter.java
@@ -38,7 +38,8 @@ public String format(String value) {
 
         Matcher matcher = PATTERN_URL.matcher(value);
         if (matcher.find()) {
-          toDecode = matcher.group(1);
+        toDecode = matcher.group(1);
+
         }
         try {
             decodedLink = URLDecoder.decode(toDecode, StandardCharsets.UTF_8.name());
diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
index 52fd0017aa7..3d49f0abcb2 100644
--- a/src/main/resources/l10n/JabRef_zh.properties
+++ b/src/main/resources/l10n/JabRef_zh.properties
@@ -1913,5 +1913,3 @@ View\ change\ log=查看变更记录
 View\ event\ log=查看事件日志
 Website=网站
 Write\ XMP-metadata\ to\ PDFs=将 XMP 元数据写入到 PDF 中
-
-Removes\ all\ line\ breaks\ in\ the\ field\ content.=删除字段内容中所有的换行。
\ No newline at end of file
diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml
index 0422d0bd80d..8c6a336420a 100644
--- a/src/test/resources/log4j2-test.xml
+++ b/src/test/resources/log4j2-test.xml
@@ -4,7 +4,7 @@
         <Console name="CONSOLE" target="SYSTEM_OUT">
             <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg - %ex{5} %n"/>
         </Console>
-     </Appenders>
+    </Appenders>
     <Loggers>
         <Root level="INFO">
             <AppenderRef ref="CONSOLE"/>

From 1f14795b20eea9be44a0614afe5b8a2bd86a7c0e Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sun, 19 Aug 2018 22:33:45 +0200
Subject: [PATCH 045/229] Implement drag and drop for maintable (#3765)

* Implement drag and drop for maintable
TODO: DataFormat - Whole entries?

* Use BibtexWriter to serialize all entries and parser to deserialize

* try further around with serializing and deserializing

* Add new Dataformat for List<BibEntry>
Add LocalDragboard

* Add DragAndDropDataFormat

* drag and drop to groups works now

* Prepare File Dropping

* No reordering of items in the maintable via drag and drop
Rename getEntriesFiltered to better distinguish it

* add basic support for adding droppped file to entry

* add check for transfer mode move and link

* Add link to file handler
Add files and move them to file directory via cleanup operation
Remove unsused parameter LayoutFormatterPreferences from  Cleanup

* add dialog for importing entries from xmp

* prepare pdf content importer code
Add missing keybinding

* remove no longer needed loop

* add XMPPreferences to ImportFormatPreferences
add dialog to show if new entrie should be imported or file linked

* when no modifier is avaiable show Dialog if xmp entries found

* rework copy options using clipboard manager

* TODO: Find out why  dnd  doesn't work on preview panel

* fix checkstyle and compile error

* enable dnd on preview pane

* add method for opening or import db

* add l10n

* checkstyle

* Open bib files dragged to tab pane

* handle import of dropped bib files
works only if table is not empty, otherwise it will be just opened
Call timestamp update method
fix merge erros

* add drag and drop copy handler
add debug output on gesture target

* fix event propagation

* fix checkstyle

* literals first in comparison

* add l10n for error message

* remove old swing related dnd stuff
Use local dragboard for transfering entries
fix checkstyle
expand group node on drag over

* fix merge error

* fix NPE discovered on linux when row.getItem is null

* Put Dragboard Instance into Gui Globals
remove old TransferableBibtexEntry

* checkstyle

* fix checkstyle

* fix l10n

* fix copying on linux
fix moving if not pdf

* remove old drag and drop popup classes
remove some println

* fix import order

* extract part to logic

* extract files adding and content importer to own class

* some cleanups
reworked debug logging
pass customlocaldragboard as parameter to groups

* Add fileUtil method for checking if it's a bib file
move from logic to gui because of the externalFileType stuff
add property to speedup rendering pdf content
move and rename

* fix l10n

* cleanup

* add methods for putting and getting bib entries of localdragboard
clear clipboard on put
fix drag and drop to groups by adding clipboard stuff

* add javadoc

* Fix build
---
 src/main/java/org/jabref/gui/BasePanel.java   |  38 +-
 .../jabref/gui/DragAndDropDataFormats.java    |   6 +
 .../java/org/jabref/gui/DragDropPane.java     | 160 --------
 .../org/jabref/gui/DragDropPopupPane.java     |  31 --
 src/main/java/org/jabref/gui/GUIGlobals.java  |   7 +-
 src/main/java/org/jabref/gui/JabRefFrame.java | 361 ++++++++--------
 .../java/org/jabref/gui/PreviewPanel.java     | 102 +++--
 .../jabref/gui/TransferableBibtexEntry.java   |  68 ----
 .../ResolveDuplicateLabelDialog.java          |   3 +-
 .../gui/collab/EntryAddChangeViewModel.java   |   3 +-
 .../collab/EntryDeleteChangeViewModel.java    |   3 +-
 .../gui/externalfiles/DroppedFileHandler.java |   2 +-
 .../ExternalFilesEntryLinker.java             |  73 ++++
 .../externalfiles/NewDroppedFileHandler.java  | 154 +++++++
 .../FileListEditorTransferHandler.java        | 161 --------
 .../gui/fieldeditors/LinkedFilesEditor.java   |   1 +
 .../gui/groups/EntryTableTransferHandler.java | 385 ------------------
 .../jabref/gui/groups/GroupNodeViewModel.java |  17 +-
 .../org/jabref/gui/groups/GroupTreeView.java  |  23 +-
 .../jabref/gui/groups/GroupTreeViewModel.java |  16 +-
 .../groups/TransferableEntrySelection.java    |  91 -----
 .../gui/importer/ImportInspectionDialog.java  |   2 +-
 .../org/jabref/gui/keyboard/KeyBinding.java   |   3 +-
 .../org/jabref/gui/maintable/MainTable.java   | 152 +++++--
 .../gui/maintable/MainTableDataModel.java     |   2 +-
 .../jabref/gui/mergeentries/MergeEntries.java |  12 +-
 .../gui/openoffice/StyleSelectDialog.java     |  20 +-
 .../gui/preftabs/PreferencesDialog.java       |   3 +-
 .../jabref/gui/preftabs/PreviewPrefsTab.java  |   9 +-
 .../jabref/gui/search/SearchResultFrame.java  |  85 ++--
 .../jabref/gui/util/CustomLocalDragboard.java |  66 +++
 .../jabref/logic/cleanup/CleanupWorker.java   |   3 -
 .../logic/cleanup/MoveFilesCleanup.java       |   4 +-
 .../logic/cleanup/RenamePdfCleanup.java       |  20 +-
 .../ExternalFilesContentImporter.java         |  40 ++
 .../importer/ImportFormatPreferences.java     |  11 +-
 .../jabref/logic/importer/OpenDatabase.java   |   4 +-
 .../jabref/logic/importer/ParserResult.java   |  11 +-
 .../org/jabref/logic/util/io/FileUtil.java    |  17 +-
 .../org/jabref/logic/xmp/XmpUtilReader.java   |   2 +
 .../java/org/jabref/model/entry/BibEntry.java |  13 +-
 .../jabref/preferences/JabRefPreferences.java |   4 +-
 src/main/resources/l10n/JabRef_en.properties  |   5 +-
 .../gui/groups/GroupNodeViewModelTest.java    |   7 +-
 .../gui/groups/GroupTreeViewModelTest.java    |   9 +-
 .../jabref/logic/util/io/FileUtilTest.java    |  15 +-
 .../org/jabref/model/entry/BibEntryTest.java  |   1 +
 47 files changed, 957 insertions(+), 1268 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/DragDropPane.java
 delete mode 100644 src/main/java/org/jabref/gui/DragDropPopupPane.java
 delete mode 100644 src/main/java/org/jabref/gui/TransferableBibtexEntry.java
 create mode 100644 src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
 create mode 100644 src/main/java/org/jabref/gui/externalfiles/NewDroppedFileHandler.java
 delete mode 100644 src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java
 delete mode 100644 src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java
 delete mode 100644 src/main/java/org/jabref/gui/groups/TransferableEntrySelection.java
 create mode 100644 src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
 create mode 100644 src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 306939d3ace..9bcbc8193b2 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -1,8 +1,5 @@
 package org.jabref.gui;
 
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.ClipboardOwner;
-import java.awt.datatransfer.Transferable;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
@@ -134,7 +131,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BasePanel extends StackPane implements ClipboardOwner {
+public class BasePanel extends StackPane {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(BasePanel.class);
 
     private final BibDatabaseContext bibDatabaseContext;
@@ -227,8 +225,10 @@ public BasePanel(JabRefFrame frame, BasePanelPreferences preferences, BibDatabas
 
         this.entryEditor = new EntryEditor(this, preferences.getEntryEditorPreferences(), Globals.getFileUpdateMonitor(), dialogService);
 
-        this.preview = new PreviewPanel(this, getBibDatabaseContext(), preferences.getKeyBindings(), preferences.getPreviewPreferences(), dialogService);
+        this.preview = new PreviewPanel(this, getBibDatabaseContext(), preferences.getKeyBindings(), preferences.getPreviewPreferences(), dialogService, externalFileTypes);
         frame().getGlobalSearchBar().getSearchQueryHighlightObservable().addSearchListener(preview);
+
+
     }
 
     @Subscribe
@@ -680,15 +680,16 @@ public void runCommand(final Actions command) {
      */
     private boolean saveDatabase(File file, boolean selectedOnly, Charset encoding,
                                  SavePreferences.DatabaseSaveType saveType)
-            throws SaveException {
+        throws SaveException {
         SaveSession session;
         final String SAVE_DATABASE = Localization.lang("Save library");
         try {
             SavePreferences prefs = Globals.prefs.loadForSaveFromPreferences()
-                    .withEncoding(encoding)
-                    .withSaveType(saveType);
+                                                 .withEncoding(encoding)
+                                                 .withSaveType(saveType);
+
             BibtexDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(
-                    FileSaveSession::new);
+                                                                                          FileSaveSession::new);
             if (selectedOnly) {
                 session = databaseWriter.savePartOfDatabase(bibDatabaseContext, mainTable.getSelectedEntries(), prefs);
             } else {
@@ -700,7 +701,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset encoding,
         // FIXME: not sure if this is really thrown anywhere
         catch (UnsupportedCharsetException ex) {
             frame.getDialogService().showErrorDialogAndWait(Localization.lang("Save library"), Localization.lang("Could not save file.")
-                    + Localization.lang("Character encoding '%0' is not supported.", encoding.displayName()));
+                                                                                               + Localization.lang("Character encoding '%0' is not supported.", encoding.displayName()));
             throw new SaveException("rt");
         } catch (SaveException ex) {
             if (ex.specificEntry()) {
@@ -1145,7 +1146,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();
         }
     }
@@ -1312,11 +1313,6 @@ private void saveDividerLocation(Number position) {
         }
     }
 
-    // Method pertaining to the ClipboardOwner interface.
-    @Override
-    public void lostOwnership(Clipboard clipboard, Transferable contents) {
-        // Nothing
-    }
 
     /**
      * Perform necessary cleanup when this BasePanel is closed.
@@ -1500,7 +1496,7 @@ public void listen(EntryAddedEvent addedEntryEvent) {
             if (Globals.prefs.getBoolean(JabRefPreferences.AUTO_ASSIGN_GROUP)) {
                 final List<BibEntry> entries = Collections.singletonList(addedEntryEvent.getBibEntry());
                 Globals.stateManager.getSelectedGroup(bibDatabaseContext).forEach(
-                        selectedGroup -> selectedGroup.addEntriesToGroup(entries));
+                                                                                  selectedGroup -> selectedGroup.addEntriesToGroup(entries));
             }
         }
     }
@@ -1600,10 +1596,10 @@ public void action() {
                     List<LinkedFile> files = bes.get(0).getFiles();
 
                     Optional<LinkedFile> linkedFile = files.stream()
-                            .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
-                                    || FieldName.PS.equalsIgnoreCase(file.getFileType())
-                                    || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
-                            .findFirst();
+                                                           .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
+                                                                            || FieldName.PS.equalsIgnoreCase(file.getFileType())
+                                                                            || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
+                                                           .findFirst();
 
                     if (linkedFile.isPresent()) {
 
diff --git a/src/main/java/org/jabref/gui/DragAndDropDataFormats.java b/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
index bee99cbd86a..8776ecaca3f 100644
--- a/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
+++ b/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
@@ -1,7 +1,11 @@
 package org.jabref.gui;
 
+import java.util.List;
+
 import javafx.scene.input.DataFormat;
 
+import org.jabref.model.entry.BibEntry;
+
 /**
  * Contains all the different {@link DataFormat}s that may occur in JabRef.
  */
@@ -10,4 +14,6 @@ public class DragAndDropDataFormats {
     public static final DataFormat GROUP = new DataFormat("dnd/org.jabref.model.groups.GroupTreeNode");
     public static final DataFormat LINKED_FILE = new DataFormat("dnd/org.jabref.model.entry.LinkedFile");
     public static final DataFormat ENTRIES = new DataFormat("dnd/org.jabref.model.entry.BibEntries");
+    @SuppressWarnings("unchecked") public static final Class<List<BibEntry>> BIBENTRY_LIST_CLASS = (Class<List<BibEntry>>) (Class<?>) List.class;
+
 }
diff --git a/src/main/java/org/jabref/gui/DragDropPane.java b/src/main/java/org/jabref/gui/DragDropPane.java
deleted file mode 100644
index 99890bce454..00000000000
--- a/src/main/java/org/jabref/gui/DragDropPane.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.AlphaComposite;
-import java.awt.Component;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionAdapter;
-
-import javax.swing.JPanel;
-import javax.swing.JTabbedPane;
-import javax.swing.SwingUtilities;
-
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.icon.JabRefIcon;
-
-/**
- * Extends the JTabbedPane class to support Drag&Drop of Tabs.
- */
-class DragDropPane extends JTabbedPane {
-
-    private boolean draggingState; // State var if we are at dragging or not
-    private int indexDraggedTab; // The index of the tab we drag at the moment
-    private final MarkerPane markerPane; // The glass panel for painting the position marker
-
-
-    DragDropPane() {
-        super();
-        indexDraggedTab = -1;
-        markerPane = new MarkerPane();
-        markerPane.setVisible(false);
-
-        // -------------------------------------------
-        // Adding listeners for Drag&Drop Actions
-        // -------------------------------------------
-        addMouseMotionListener(new MouseMotionAdapter() {
-
-            @Override
-            public void mouseDragged(MouseEvent e) { // Mouse is dragging
-                // Calculates the tab index based on the mouse position
-                int indexActTab = getUI().tabForCoordinate(DragDropPane.this,
-                        e.getX(), e.getY());
-                if (draggingState) { // We are at tab dragging
-                    if ((indexDraggedTab >= 0) && (indexActTab >= 0)) { //Is it a valid scenario?
-                        boolean toTheLeft = e.getX() <= getUI().getTabBounds(DragDropPane.this, indexActTab).getCenterX(); //Go to the left or to the right of the actual Tab
-                        DragDropPane.this.getRootPane().setGlassPane(markerPane); //Set the MarkerPane as glass Pane
-                        Rectangle actTabRect = SwingUtilities.convertRectangle(DragDropPane.this, getBoundsAt(indexActTab),
-                                DragDropPane.this.markerPane); //Rectangle with the same dimensions as the tab at the mouse position
-                        if (toTheLeft) {
-                            markerPane.setPicLocation(new Point(actTabRect.x, actTabRect.y
-                                    + actTabRect.height)); //Set pic to the left of the tab at the mouse position
-                        }
-                        else {
-                            markerPane.setPicLocation(new Point(actTabRect.x + actTabRect.width, actTabRect.y
-                                    + actTabRect.height)); //Set pic to the right of the tab at the mouse position
-                        }
-
-                        markerPane.setVisible(true);
-                        markerPane.repaint();
-                        repaint();
-                    } else { //We have no valid tab tragging scenario
-                        markerPane.setVisible(false);
-                        markerPane.repaint();
-                    }
-
-                } else { //We are not at tab dragging
-                    if (indexActTab >= 0) { // Mouse is above a tab, otherwise tabNumber would be -1
-                        // -->Now we are at tab tragging
-                        draggingState = true; // Mark now we are at dragging
-                        indexDraggedTab = indexActTab; // Set draggedTabIndex to the tabNumber where we are now
-                        repaint();
-                    }
-                }
-                super.mouseDragged(e);
-            }
-        });
-
-        addMouseListener(new MouseAdapter() {
-
-            @Override
-            public void mouseReleased(MouseEvent e) {
-                DragDropPane.this.markerPane.setVisible(false); //Set MarkerPane invisible
-                int indexActTab = getUI().tabForCoordinate(DragDropPane.this,
-                        e.getX(), e.getY());
-                if ((indexDraggedTab >= 0) && (indexActTab >= 0) && (indexDraggedTab != indexActTab)) { //Is it a valid scenario?
-                    if (draggingState) { //We are at tab dragging
-                        boolean toTheLeft = e.getX() <= getUI().getTabBounds(DragDropPane.this, indexActTab).getCenterX(); //Go to the left or to the right of the actual Tab
-                        DragDropPane.this.markerPane.setVisible(false);
-
-                        Component actTab = getComponentAt(indexDraggedTab); //Save dragged tab
-                        String actTabTitle = getTitleAt(indexDraggedTab); //Save Title of the dragged tab
-                        removeTabAt(indexDraggedTab); //Remove dragged tab
-                        int newTabPos;
-                        if (indexActTab < indexDraggedTab) { //We are dragging the tab to the left of its the position
-                            if (toTheLeft && (indexActTab < (DragDropPane.this.getTabCount()))) {
-                                newTabPos = indexActTab;
-                            } else {
-                                newTabPos = indexActTab + 1;
-                            }
-                        } else { //We are dragging the tab to the right of the old position
-                            if (toTheLeft && (indexActTab > 0)) {
-                                newTabPos = indexActTab - 1;
-                            } else {
-                                newTabPos = indexActTab;
-                            }
-                        }
-                        insertTab(actTabTitle, null, actTab, null, newTabPos); //Insert dragged tab at new position
-                        DragDropPane.this.setSelectedIndex(newTabPos); //Set selection back to the tab (at the new tab position
-                    }
-                }
-                draggingState = false;
-            }
-        });
-    }
-
-
-    /**
-     * A glass panel which sets the marker for Dragging of Tabs.
-     *
-     */
-    static class MarkerPane extends JPanel {
-
-        private Point locationP;
-        private final JabRefIcon moveTabArrow;
-
-
-        public MarkerPane() {
-            setOpaque(false);
-
-            // Sets the marker fontIcon
-            moveTabArrow = IconTheme.JabRefIcons.MOVE_TAB_ARROW;
-        }
-
-        @Override
-        public void paintComponent(Graphics g) {
-            super.paintComponent(g);
-            Graphics2D g2 = (Graphics2D) g;
-            g2.setComposite(AlphaComposite.getInstance(
-                    AlphaComposite.SRC_OVER, 0.9f)); // Set transparency
-            g.setFont(IconTheme.FONT.deriveFont(Font.BOLD, 24f));
-            moveTabArrow.getSmallIcon().paintIcon(this, g, locationP.x - (moveTabArrow.getIcon().getIconWidth() / 2),
-                    locationP.y + (moveTabArrow.getIcon().getIconHeight() / 2));
-
-        }
-
-        /**
-         * Sets the new location, where the marker should be placed.
-         *
-         * @param pt the point for the marker
-         */
-        public void setPicLocation(Point pt) {
-            this.locationP = pt;
-        }
-
-    }
-}
diff --git a/src/main/java/org/jabref/gui/DragDropPopupPane.java b/src/main/java/org/jabref/gui/DragDropPopupPane.java
deleted file mode 100644
index 42a49da2cfc..00000000000
--- a/src/main/java/org/jabref/gui/DragDropPopupPane.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.event.MouseEvent;
-
-import javax.swing.JPopupMenu;
-
-/**
- * Adds popup functionality to DragDropPane
- */
-public class DragDropPopupPane extends DragDropPane {
-
-    private final JPopupMenu popupMenu;
-
-    public DragDropPopupPane(JPopupMenu menu) {
-        this.popupMenu = menu;
-
-        addMouseListener(new java.awt.event.MouseAdapter() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                tabRightClick(e);
-            }
-        });
-    }
-
-    private void tabRightClick(MouseEvent e) {
-        if ((e.getButton() != MouseEvent.BUTTON1) && (e.getClickCount() == 1)) {
-            // display popup near location of mouse click
-            popupMenu.show(e.getComponent(), e.getX(), e.getY() - 10);
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/GUIGlobals.java b/src/main/java/org/jabref/gui/GUIGlobals.java
index a8c25e50d94..e1f145054ff 100644
--- a/src/main/java/org/jabref/gui/GUIGlobals.java
+++ b/src/main/java/org/jabref/gui/GUIGlobals.java
@@ -6,6 +6,7 @@
 import org.jabref.Globals;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.EmacsKeyBindings;
+import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -16,12 +17,15 @@
  * Static variables for graphics files and keyboard shortcuts.
  */
 public class GUIGlobals {
+
     public static Color editorTextColor;
     public static Color validFieldBackgroundColor;
     public static Color activeBackgroundColor;
     public static Color invalidFieldBackgroundColor;
     public static Font currentFont;
 
+    public static CustomLocalDragboard localDragboard = new CustomLocalDragboard();
+
     public static final int WIDTH_ICON_COL = 16 + 12; // add some additional space to improve appearance
 
     public static final int WIDTH_ICON_COL_RANKING = 5 * 16; // Width of Ranking Icon Column
@@ -58,7 +62,7 @@ public static void init() {
 
         IconTheme.loadFonts();
         GUIGlobals.currentFont = new Font(Globals.prefs.get(JabRefPreferences.FONT_FAMILY),
-                Globals.prefs.getInt(JabRefPreferences.FONT_STYLE), Globals.prefs.getInt(JabRefPreferences.FONT_SIZE));
+                                          Globals.prefs.getInt(JabRefPreferences.FONT_STYLE), Globals.prefs.getInt(JabRefPreferences.FONT_SIZE));
     }
 
     public static void setFont(int size) {
@@ -66,5 +70,4 @@ public static void setFont(int size) {
         // update preferences
         Globals.prefs.putInt(JabRefPreferences.FONT_SIZE, size);
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 2776ed0d70a..7996a474587 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -15,6 +15,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.TimerTask;
+import java.util.stream.Collectors;
 
 import javax.swing.Action;
 import javax.swing.JComponent;
@@ -41,7 +42,9 @@
 import javafx.scene.control.TabPane;
 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;
@@ -104,6 +107,7 @@
 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;
@@ -215,6 +219,29 @@ private void init() {
 
         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);
@@ -335,10 +362,10 @@ public void run() {
     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"));
+                                                                                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);
         }
 
@@ -374,9 +401,9 @@ public void setWindowTitle() {
         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() + " ["
@@ -562,7 +589,7 @@ 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()));
+                               position -> prefs.putDouble(JabRefPreferences.SIDE_PANE_WIDTH, position.doubleValue()));
         }
     }
 
@@ -582,43 +609,43 @@ private Node createToolbar() {
         }
 
         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);
+                                 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 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,
+                                      leftSide,
 
-                globalSearchBar,
+                                      globalSearchBar,
 
-                rightSpacer,
-                rightSide
-                );
+                                      rightSpacer,
+                                      rightSide);
         toolBar.getStyleClass().add("mainToolbar");
 
         return toolBar;
@@ -707,63 +734,62 @@ private MenuBar createMenu() {
         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.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))
-                ),
+                               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(),
+                               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)),
+                               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(),
+                               new SeparatorMenuItem(),
 
-                fileHistory,
+                               fileHistory,
 
-                new SeparatorMenuItem(),
+                               new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new CloseDatabaseAction()),
-                factory.createMenuItem(StandardActions.QUIT, new CloseAction())
+                               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)),
+                               factory.createMenuItem(StandardActions.UNDO, new OldDatabaseCommandWrapper(Actions.UNDO, this, Globals.stateManager)),
+                               factory.createMenuItem(StandardActions.REDO, new OldDatabaseCommandWrapper(Actions.REDO, this, Globals.stateManager)),
 
-                new SeparatorMenuItem(),
+                               new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.CUT, new EditAction(Actions.CUT)),
+                               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.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)),
+                               factory.createMenuItem(StandardActions.PASTE, new EditAction(Actions.PASTE)),
 
-                new SeparatorMenuItem(),
+                               new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new OldDatabaseCommandWrapper(Actions.SEND_AS_EMAIL, this, Globals.stateManager)),
+                               factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new OldDatabaseCommandWrapper(Actions.SEND_AS_EMAIL, this, Globals.stateManager)),
 
-                new SeparatorMenuItem()
+                               new SeparatorMenuItem()
 
         );
 
@@ -805,26 +831,26 @@ private MenuBar createMenu() {
         }
 
         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.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())),
+                                  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(),
+                                  new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, Globals.stateManager)),
+                                  factory.createMenuItem(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, Globals.stateManager)),
 
-                new SeparatorMenuItem(),
+                                  new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new DatabasePropertiesAction(this)),
-                factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(this)),
-                factory.createMenuItem(StandardActions.EDIT_STRINGS, new OldDatabaseCommandWrapper(Actions.EDIT_STRINGS, this, Globals.stateManager))
+                                  factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new DatabasePropertiesAction(this)),
+                                  factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(this)),
+                                  factory.createMenuItem(StandardActions.EDIT_STRINGS, new OldDatabaseCommandWrapper(Actions.EDIT_STRINGS, this, Globals.stateManager))
 
         );
 
@@ -835,22 +861,22 @@ private MenuBar createMenu() {
         }
 
         quality.getItems().addAll(
-                factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this)),
-                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this)),
+                                  factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this)),
+                                  factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this)),
 
-                new SeparatorMenuItem(),
+                                  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(),
+                                  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))
+                                  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))
 
         );
 
@@ -859,67 +885,67 @@ private MenuBar createMenu() {
         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()),
+                               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(),
+                               new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.SELECT_ALL, new OldDatabaseCommandWrapper(Actions.SELECT_ALL, this, Globals.stateManager)),
+                               factory.createMenuItem(StandardActions.SELECT_ALL, new OldDatabaseCommandWrapper(Actions.SELECT_ALL, this, Globals.stateManager)),
 
-                new SeparatorMenuItem(),
+                               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))
+                               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)),
+                                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(),
+                                new SeparatorMenuItem(),
 
-                factory.createMenuItem(openOffice.getToggleAction(), openOffice.getToggleCommand()),
-                factory.createMenuItem(pushToExternal.getMenuAction(), pushToExternal),
+                                factory.createMenuItem(openOffice.getToggleAction(), openOffice.getToggleCommand()),
+                                factory.createMenuItem(pushToExternal.getMenuAction(), pushToExternal),
 
-                new SeparatorMenuItem(),
+                                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)),
+                                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(),
+                                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))
+                                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)),
+                                  factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this)),
 
-                new SeparatorMenuItem(),
+                                  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)),
+                                  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(),
+                                  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))
 
         );
 
@@ -927,45 +953,45 @@ private MenuBar createMenu() {
                 factory.createMenuItem(StandardActions.HELP, HelpAction.getMainHelpPageCommand()),
                 factory.createMenuItem(StandardActions.OPEN_FORUM, new OpenBrowserAction("http://discourse.jabref.org/")),
 
-                new SeparatorMenuItem(),
+                               new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.ERROR_CONSOLE, new ErrorConsoleAction()),
+                               factory.createMenuItem(StandardActions.ERROR_CONSOLE, new ErrorConsoleAction()),
 
-                new SeparatorMenuItem(),
+                               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")),
+                               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(),
+                                                     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")),
+                                                     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(),
+                                                     new SeparatorMenuItem(),
 
-                        factory.createMenuItem(StandardActions.DONATE, new OpenBrowserAction("https://donations.jabref.org"))
+                                                     factory.createMenuItem(StandardActions.DONATE, new OpenBrowserAction("https://donations.jabref.org"))
 
-                ),
-                factory.createMenuItem(StandardActions.ABOUT, new AboutAction())
+                               ),
+                               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);
+                               file,
+                               edit,
+                               library,
+                               quality,
+                               tools,
+                               view,
+                               options,
+                               help);
         menu.setUseSystemMenuBar(true);
         return menu;
     }
@@ -984,8 +1010,8 @@ public void addParserResult(ParserResult pr, boolean focusPanel) {
         } 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()));
@@ -999,7 +1025,7 @@ public void addParserResult(ParserResult pr, boolean focusPanel) {
      * displays the String on the Status Line visible on the bottom of the JabRef mainframe
      */
     public void output(final String s) {
-            statusLine.setText(s);
+        statusLine.setText(s);
     }
 
     private void initActions() {
@@ -1196,8 +1222,9 @@ public BasePanel addTab(BibDatabaseContext databaseContext, boolean raisePanel)
 
     private boolean readyForAutosave(BibDatabaseContext context) {
         return ((context.getLocation() == DatabaseLocation.SHARED) ||
-                ((context.getLocation() == DatabaseLocation.LOCAL) && Globals.prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE))) &&
-                context.getDatabaseFile().isPresent();
+                ((context.getLocation() == DatabaseLocation.LOCAL) && Globals.prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)))
+               &&
+               context.getDatabaseFile().isPresent();
     }
 
     /**
@@ -1210,7 +1237,7 @@ private boolean readyForAutosave(BibDatabaseContext context) {
     private void addImportedEntries(final BasePanel panel, final List<BibEntry> entries) {
         SwingUtilities.invokeLater(() -> {
             ImportInspectionDialog diag = new ImportInspectionDialog(JabRefFrame.this, panel,
-                    Localization.lang("Import"), false);
+                                                                     Localization.lang("Import"), false);
             diag.addEntries(entries);
             diag.entryListComplete();
             diag.setVisible(true);
@@ -1307,9 +1334,9 @@ private boolean confirmClose(BasePanel panel) {
         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);
+                                                                                    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.
@@ -1324,7 +1351,9 @@ private boolean confirmClose(BasePanel panel) {
             } catch (Throwable ex) {
                 return false;
             }
-        } else return !response.isPresent() || !response.get().equals(cancel);
+        } else {
+            return !response.isPresent() || !response.get().equals(cancel);
+        }
         return false;
     }
 
diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
index b5067e7accf..5d7f4c6d016 100644
--- a/src/main/java/org/jabref/gui/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -1,10 +1,14 @@
 package org.jabref.gui;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
+import java.nio.file.Path;
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Future;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import javafx.print.PrinterJob;
 import javafx.scene.control.ContextMenu;
@@ -12,12 +16,15 @@
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.DataFormat;
 import javafx.scene.input.Dragboard;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.web.WebView;
 
 import org.jabref.Globals;
+import org.jabref.gui.externalfiles.NewDroppedFileHandler;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
@@ -33,6 +40,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.FieldChangedEvent;
+import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreviewPreferences;
 
 import com.google.common.eventbus.Subscribe;
@@ -63,20 +71,30 @@ public class PreviewPanel extends ScrollPane implements SearchQueryHighlightList
      * If a database is set, the preview will attempt to resolve strings in the previewed entry using that database.
      */
     private Optional<BibDatabaseContext> databaseContext = Optional.empty();
-    private WebView previewView;
+    private final WebView previewView;
     private Optional<Future<?>> citationStyleFuture = Optional.empty();
 
+    private final NewDroppedFileHandler fileHandler;
+
     /**
      * @param panel           (may be null) Only set this if the preview is associated to the main window.
      * @param databaseContext (may be null) Used for resolving pdf directories for links.
      */
-    public PreviewPanel(BasePanel panel, BibDatabaseContext databaseContext, KeyBindingRepository keyBindingRepository, PreviewPreferences preferences, DialogService dialogService) {
+    public PreviewPanel(BasePanel panel, BibDatabaseContext databaseContext, KeyBindingRepository keyBindingRepository, PreviewPreferences preferences, DialogService dialogService, ExternalFileTypes externalFileTypes) {
         this.databaseContext = Optional.ofNullable(databaseContext);
         this.basePanel = Optional.ofNullable(panel);
         this.dialogService = dialogService;
         this.clipBoardManager = Globals.clipboardManager;
         this.keyBindingRepository = keyBindingRepository;
 
+        fileHandler = new NewDroppedFileHandler(dialogService, databaseContext, externalFileTypes,
+                                                Globals.prefs.getFileDirectoryPreferences(),
+                                                Globals.prefs.getCleanupPreferences(Globals.journalAbbreviationLoader).getFileDirPattern(),
+                                                Globals.prefs.getImportFormatPreferences(),
+                                                Globals.prefs.getUpdateFieldPreferences(),
+                                                Globals.getFileUpdateMonitor(),
+                                                Globals.prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
+
         // Set up scroll pane for preview pane
         setFitToHeight(true);
         setFitToWidth(true);
@@ -89,17 +107,53 @@ public PreviewPanel(BasePanel panel, BibDatabaseContext databaseContext, KeyBind
             // Handler for drag content of preview to different window
             // only created for main window (not for windows like the search results dialog)
             setOnDragDetected(event -> {
-                        Dragboard dragboard = startDragAndDrop(TransferMode.COPY);
-                        ClipboardContent content = new ClipboardContent();
-                        content.putHtml((String) previewView.getEngine().executeScript("window.getSelection().toString()"));
-                        dragboard.setContent(content);
+                startFullDrag();
 
-                        event.consume();
-                    }
-            );
+                Dragboard dragboard = startDragAndDrop(TransferMode.COPY);
+                ClipboardContent content = new ClipboardContent();
+                content.putHtml((String) previewView.getEngine().executeScript("window.getSelection().toString()"));
+                dragboard.setContent(content);
+
+                event.consume();
+            });
         }
+        this.previewView.setOnDragOver(event -> {
+            if (event.getDragboard().hasFiles()) {
+                event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
+            }
+            event.consume();
+        });
+
+        this.previewView.setOnDragDropped(event -> {
+            BibEntry entry = this.getEntry();
+            boolean success = false;
+            if (event.getDragboard().hasContent(DataFormat.FILES)) {
+                List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
+
+                if (event.getTransferMode() == TransferMode.MOVE) {
+
+                    LOGGER.debug("Mode MOVE"); //shift on win or no modifier
+                    fileHandler.addToEntryRenameAndMoveToFileDir(entry, files);
+                }
+                if (event.getTransferMode() == TransferMode.LINK) {
+                    LOGGER.debug("Node LINK"); //alt on win
+                    fileHandler.addToEntry(entry, files);
+
+                }
+                if (event.getTransferMode() == TransferMode.COPY) {
+                    LOGGER.debug("Mode Copy"); //ctrl on win, no modifier on Xubuntu
+                    fileHandler.copyFilesToFileDirAndAddToEntry(entry, files);
+                }
+            }
+
+            event.setDropCompleted(success);
+            event.consume();
+
+        });
+
         createKeyBindings();
         updateLayout(preferences);
+
     }
 
     private void createKeyBindings() {
@@ -227,22 +281,22 @@ public void update() {
         if (layout.isPresent()) {
             StringBuilder sb = new StringBuilder();
             bibEntry.ifPresent(entry -> sb.append(layout.get()
-                    .doLayout(entry, databaseContext.map(BibDatabaseContext::getDatabase).orElse(null))));
+                                                        .doLayout(entry, databaseContext.map(BibDatabaseContext::getDatabase).orElse(null))));
             setPreviewLabel(sb.toString());
         } else if (basePanel.isPresent() && bibEntry.isPresent()) {
             Future<?> citationStyleWorker = BackgroundTask
-                    .wrap(() -> basePanel.get().getCitationStyleCache().getCitationFor(bibEntry.get()))
-                    .onRunning(() -> {
-                        CitationStyle citationStyle = basePanel.get().getCitationStyleCache().getCitationStyle();
-                        setPreviewLabel("<i>" + Localization.lang("Processing %0", Localization.lang("Citation Style")) +
-                                ": " + citationStyle.getTitle() + " ..." + "</i>");
-                    })
-                    .onSuccess(this::setPreviewLabel)
-                    .onFailure(exception -> {
-                        LOGGER.error("Error while generating citation style", exception);
-                        setPreviewLabel(Localization.lang("Error while generating citation style"));
-                    })
-                    .executeWith(Globals.TASK_EXECUTOR);
+                                                          .wrap(() -> basePanel.get().getCitationStyleCache().getCitationFor(bibEntry.get()))
+                                                          .onRunning(() -> {
+                                                              CitationStyle citationStyle = basePanel.get().getCitationStyleCache().getCitationStyle();
+                                                              setPreviewLabel("<i>" + Localization.lang("Processing %0", Localization.lang("Citation Style")) +
+                                                                              ": " + citationStyle.getTitle() + " ..." + "</i>");
+                                                          })
+                                                          .onSuccess(this::setPreviewLabel)
+                                                          .onFailure(exception -> {
+                                                              LOGGER.error("Error while generating citation style", exception);
+                                                              setPreviewLabel(Localization.lang("Error while generating citation style"));
+                                                          })
+                                                          .executeWith(Globals.TASK_EXECUTOR);
             this.citationStyleFuture = Optional.of(citationStyleWorker);
         }
     }
@@ -283,8 +337,8 @@ public void print() {
             job.endJob();
             return null;
         })
-                .onFailure(exception -> dialogService.showErrorDialogAndWait(Localization.lang("Could not print preview"), exception))
-                .executeWith(Globals.TASK_EXECUTOR);
+                      .onFailure(exception -> dialogService.showErrorDialogAndWait(Localization.lang("Could not print preview"), exception))
+                      .executeWith(Globals.TASK_EXECUTOR);
     }
 
     public void close() {
diff --git a/src/main/java/org/jabref/gui/TransferableBibtexEntry.java b/src/main/java/org/jabref/gui/TransferableBibtexEntry.java
deleted file mode 100644
index 742faea2cc9..00000000000
--- a/src/main/java/org/jabref/gui/TransferableBibtexEntry.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.List;
-
-import javax.swing.JOptionPane;
-
-import org.jabref.Globals;
-import org.jabref.logic.bibtex.BibEntryWriter;
-import org.jabref.logic.bibtex.LatexFieldFormatter;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseMode;
-import org.jabref.model.entry.BibEntry;
-
-/*
- * A transferable object containing an array of BibEntry objects. Used
- * for copy-paste operations.
- */
-public class TransferableBibtexEntry implements Transferable {
-
-    public static final DataFlavor ENTRY_FLAVOR = new DataFlavor(BibEntry.class, "JabRef entry");
-    private final List<BibEntry> data;
-
-
-    public TransferableBibtexEntry(List<BibEntry> bes) {
-        this.data = bes;
-    }
-
-    @Override
-    public DataFlavor[] getTransferDataFlavors() {
-        return new DataFlavor[]{TransferableBibtexEntry.ENTRY_FLAVOR,
-                DataFlavor.stringFlavor};
-    }
-
-    @Override
-    public boolean isDataFlavorSupported(DataFlavor flavor) {
-        return flavor.equals(TransferableBibtexEntry.ENTRY_FLAVOR) || flavor.equals(DataFlavor.stringFlavor);
-    }
-
-    @Override
-    public Object getTransferData(DataFlavor flavor)
-            throws UnsupportedFlavorException {
-        if (flavor.equals(TransferableBibtexEntry.ENTRY_FLAVOR)) {
-            return data;
-        } else if (flavor.equals(DataFlavor.stringFlavor)) {
-            try {
-                StringWriter sw = new StringWriter();
-                BibEntryWriter bibtexEntryWriter = new BibEntryWriter(
-                        new LatexFieldFormatter(Globals.prefs.getLatexFieldFormatterPreferences()), false);
-                for (BibEntry entry : data) {
-                    bibtexEntryWriter.write(entry, sw, BibDatabaseMode.BIBTEX);
-                }
-                return sw.toString();
-            } catch (IOException ex) {
-                JOptionPane.showMessageDialog(null,
-                        Localization.lang("Could not paste entry as text:") + "\n" + ex.getLocalizedMessage(),
-                        Localization.lang("Clipboard"), JOptionPane.ERROR_MESSAGE);
-                return "";
-            }
-        } else {
-            throw new UnsupportedFlavorException(flavor);
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java b/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java
index e4ecee93456..61434841141 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java
@@ -25,6 +25,7 @@
 import org.jabref.gui.FXDialogService;
 import org.jabref.gui.PreviewPanel;
 import org.jabref.gui.customjfx.CustomJFXPanel;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
@@ -58,7 +59,7 @@ public ResolveDuplicateLabelDialog(BasePanel panel, String key, List<BibEntry> e
             JCheckBox cb = new JCheckBox(Localization.lang("Generate BibTeX key"), !first);
             b.appendRows("1dlu, p");
             b.add(cb).xy(1, row);
-            PreviewPanel previewPanel = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService());
+            PreviewPanel previewPanel = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService(), ExternalFileTypes.getInstance());
             previewPanel.setEntry(entry);
             JFXPanel container = CustomJFXPanel.wrap(new Scene(previewPanel));
             container.setPreferredSize(new Dimension(800, 90));
diff --git a/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java
index e4334d5598b..622dc4142cf 100644
--- a/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java
@@ -10,6 +10,7 @@
 import org.jabref.gui.FXDialogService;
 import org.jabref.gui.PreviewPanel;
 import org.jabref.gui.customjfx.CustomJFXPanel;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableInsertEntry;
 import org.jabref.logic.l10n.Localization;
@@ -27,7 +28,7 @@ public EntryAddChangeViewModel(BibEntry diskEntry) {
         super(Localization.lang("Added entry"));
         this.diskEntry = diskEntry;
 
-        PreviewPanel previewPanel = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService());
+        PreviewPanel previewPanel = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService(), ExternalFileTypes.getInstance());
         previewPanel.setEntry(diskEntry);
         container = CustomJFXPanel.wrap(new Scene(previewPanel));
     }
diff --git a/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java
index a36990be7eb..37511d67830 100644
--- a/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java
@@ -10,6 +10,7 @@
 import org.jabref.gui.FXDialogService;
 import org.jabref.gui.PreviewPanel;
 import org.jabref.gui.customjfx.CustomJFXPanel;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableRemoveEntry;
 import org.jabref.logic.bibtex.DuplicateCheck;
@@ -44,7 +45,7 @@ public EntryDeleteChangeViewModel(BibEntry memEntry, BibEntry tmpEntry) {
         LOGGER.debug("Modified entry: " + memEntry.getCiteKeyOptional().orElse("<no BibTeX key set>")
                 + "\n Modified locally: " + isModifiedLocally);
 
-        PreviewPanel previewPanel = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService());
+        PreviewPanel previewPanel = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService(), ExternalFileTypes.getInstance());
         previewPanel.setEntry(memEntry);
         container = CustomJFXPanel.wrap(new Scene(previewPanel));
     }
diff --git a/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java b/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
index 934b1d48622..58bfb1e87f4 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
@@ -522,7 +522,7 @@ private boolean doMove(String fileName, String destFilename, NamedCompound edits
     private boolean doCopy(String fileName, String toFile, NamedCompound edits) {
 
         List<String> dirs = panel.getBibDatabaseContext()
-                                 .getFileDirectories(Globals.prefs.getFileDirectoryPreferences());
+                .getFileDirectories(Globals.prefs.getFileDirectoryPreferences());
         int found = -1;
         for (int i = 0; i < dirs.size(); i++) {
             if (new File(dirs.get(i)).exists()) {
diff --git a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
new file mode 100644
index 00000000000..7d6e83c6921
--- /dev/null
+++ b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
@@ -0,0 +1,73 @@
+package org.jabref.gui.externalfiles;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.externalfiletype.UnknownExternalFileType;
+import org.jabref.logic.cleanup.MoveFilesCleanup;
+import org.jabref.logic.cleanup.RenamePdfCleanup;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.metadata.FileDirectoryPreferences;
+
+public class ExternalFilesEntryLinker {
+
+    private final ExternalFileTypes externalFileTypes;
+    private final FileDirectoryPreferences fileDirectoryPreferences;
+    private final BibDatabaseContext bibDatabaseContext;
+    private final MoveFilesCleanup moveFilesCleanup;
+    private final RenamePdfCleanup renameFilesCleanup;
+
+    public ExternalFilesEntryLinker(ExternalFileTypes externalFileTypes, FileDirectoryPreferences fileDirectoryPreferences, String fileDirPattern, BibDatabaseContext bibDatabaseContext, String fileNamePattern) {
+        this.externalFileTypes = externalFileTypes;
+        this.fileDirectoryPreferences = fileDirectoryPreferences;
+        this.bibDatabaseContext = bibDatabaseContext;
+        this.moveFilesCleanup = new MoveFilesCleanup(bibDatabaseContext, fileDirPattern, fileDirectoryPreferences);
+        this.renameFilesCleanup = new RenamePdfCleanup(false, bibDatabaseContext, fileNamePattern, fileDirectoryPreferences);
+    }
+
+    public Optional<Path> copyFileToFileDir(Path file) {
+        Optional<Path> firstExistingFileDir = bibDatabaseContext.getFirstExistingFileDir(fileDirectoryPreferences);
+        if (firstExistingFileDir.isPresent()) {
+            Path targetFile = firstExistingFileDir.get().resolve(file.getFileName());
+            if (FileUtil.copyFile(file, targetFile, false)) {
+                return Optional.ofNullable(targetFile);
+            }
+        }
+        return Optional.empty();
+    }
+
+    public void renameLinkedFilesToPattern(BibEntry entry) {
+        renameFilesCleanup.cleanup(entry);
+    }
+
+    public void moveLinkedFilesToFileDir(BibEntry entry) {
+        moveFilesCleanup.cleanup(entry);
+    }
+
+    public void addFileToEntry(BibEntry entry, Path file) {
+        addFilesToEntry(entry, Arrays.asList(file));
+    }
+
+    public void addFilesToEntry(BibEntry entry, List<Path> files) {
+
+        for (Path file : files) {
+            FileUtil.getFileExtension(file).ifPresent(ext -> {
+
+                ExternalFileType type = externalFileTypes.getExternalFileTypeByExt(ext)
+                                                         .orElse(new UnknownExternalFileType(ext));
+                Path relativePath = FileUtil.shortenFileName(file, bibDatabaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences));
+                LinkedFile linkedfile = new LinkedFile("", relativePath.toString(), type.getName());
+                entry.addFile(linkedfile);
+            });
+
+        }
+
+    }
+}
diff --git a/src/main/java/org/jabref/gui/externalfiles/NewDroppedFileHandler.java b/src/main/java/org/jabref/gui/externalfiles/NewDroppedFileHandler.java
new file mode 100644
index 00000000000..58ab13155e5
--- /dev/null
+++ b/src/main/java/org/jabref/gui/externalfiles/NewDroppedFileHandler.java
@@ -0,0 +1,154 @@
+package org.jabref.gui.externalfiles;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import javafx.scene.control.ButtonBar.ButtonData;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.DialogPane;
+import javafx.scene.control.TextArea;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Text;
+
+import org.jabref.Globals;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.logic.externalfiles.ExternalFilesContentImporter;
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.UpdateField;
+import org.jabref.logic.util.UpdateFieldPreferences;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.JabRefPreferences;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NewDroppedFileHandler {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(NewDroppedFileHandler.class);
+
+    private final BibDatabaseContext bibDatabaseContext;
+    private final UpdateFieldPreferences updateFieldPreferences;
+    private final DialogService dialogService;
+    private final FileUpdateMonitor fileUpdateMonitor;
+    private final ExternalFilesEntryLinker linker;
+    private final ExternalFilesContentImporter contentImporter;
+
+    public NewDroppedFileHandler(DialogService dialogService,
+                                 BibDatabaseContext bibDatabaseContext,
+                                 ExternalFileTypes externalFileTypes,
+                                 FileDirectoryPreferences fileDirectoryPreferences,
+                                 String fileDirPattern,
+                                 ImportFormatPreferences importFormatPreferences,
+                                 UpdateFieldPreferences updateFieldPreferences,
+                                 FileUpdateMonitor fileupdateMonitor,
+                                 String fileNamePattern) {
+
+        this.dialogService = dialogService;
+        this.bibDatabaseContext = bibDatabaseContext;
+        this.updateFieldPreferences = updateFieldPreferences;
+        this.fileUpdateMonitor = fileupdateMonitor;
+
+        this.linker = new ExternalFilesEntryLinker(externalFileTypes, fileDirectoryPreferences, fileDirPattern, bibDatabaseContext, fileNamePattern);
+        this.contentImporter = new ExternalFilesContentImporter(importFormatPreferences);
+    }
+
+    public void addNewEntryFromXMPorPDFContent(BibEntry entry, List<Path> files) {
+
+        for (Path file : files) {
+
+            if (FileUtil.getFileExtension(file).filter(ext -> "pdf".equals(ext)).isPresent()) {
+
+                try {
+                    List<BibEntry> pdfResult = contentImporter.importPDFContent(file);
+                    //FIXME: Show merge dialog if working again properly
+                    List<BibEntry> xmpEntriesInFile = contentImporter.importXMPContent(file);
+
+                    //First try xmp import, if empty try pdf import, otherwise show dialog
+                    if (xmpEntriesInFile.isEmpty()) {
+                        if (pdfResult.isEmpty()) {
+                            addToEntryRenameAndMoveToFileDir(entry, files);
+                        } else {
+                            showImportOrLinkFileDialog(pdfResult, file, entry);
+                        }
+                    } else {
+                        showImportOrLinkFileDialog(xmpEntriesInFile, file, entry);
+                    }
+
+                } catch (IOException e) {
+                    LOGGER.warn("Problem reading XMP", e);
+                }
+
+            } else {
+                addToEntryRenameAndMoveToFileDir(entry, files);
+            }
+        }
+    }
+
+    public void importEntriesFromDroppedBibFiles(Path bibFile) {
+
+        List<BibEntry> entriesToImport = contentImporter.importFromBibFile(bibFile, fileUpdateMonitor);
+        bibDatabaseContext.getDatabase().insertEntries(entriesToImport);
+
+        if (Globals.prefs.getBoolean(JabRefPreferences.USE_OWNER)) {
+            // Set owner field to default value
+            UpdateField.setAutomaticFields(entriesToImport, true, true, updateFieldPreferences);
+        }
+    }
+
+    private void showImportOrLinkFileDialog(List<BibEntry> entriesToImport, Path fileName, BibEntry entryToLink) {
+
+        DialogPane pane = new DialogPane();
+
+        VBox vbox = new VBox();
+        Text text = new Text(Localization.lang("The PDF contains one or several BibTeX-records.")
+                             + "\n" + Localization.lang("Do you want to import these as new entries into the current library or do you want to link the file to the entry?"));
+        vbox.getChildren().add(text);
+
+        entriesToImport.forEach(entry -> {
+            TextArea textArea = new TextArea(entry.toString());
+            textArea.setEditable(false);
+            vbox.getChildren().add(textArea);
+        });
+        pane.setContent(vbox);
+
+        ButtonType importButton = new ButtonType("Import into library", ButtonData.OK_DONE);
+        ButtonType linkToEntry = new ButtonType("Link file to entry", ButtonData.OTHER);
+
+        Optional<ButtonType> buttonPressed = dialogService.showCustomDialogAndWait(Localization.lang("XMP-metadata found in PDF: %0", fileName.getFileName().toString()), pane, importButton, linkToEntry, ButtonType.CANCEL);
+
+        if (buttonPressed.equals(Optional.of(importButton))) {
+            bibDatabaseContext.getDatabase().insertEntries(entriesToImport);
+        }
+        if (buttonPressed.equals(Optional.of(linkToEntry))) {
+            addToEntryRenameAndMoveToFileDir(entryToLink, Arrays.asList(fileName));
+        }
+    }
+
+    public void addToEntryRenameAndMoveToFileDir(BibEntry entry, List<Path> files) {
+        linker.addFilesToEntry(entry, files);
+        linker.moveLinkedFilesToFileDir(entry);
+        linker.renameLinkedFilesToPattern(entry);
+    }
+
+    public void copyFilesToFileDirAndAddToEntry(BibEntry entry, List<Path> files) {
+        for (Path file : files) {
+            linker.copyFileToFileDir(file).ifPresent(copiedFile -> {
+                linker.addFilesToEntry(entry, files);
+            });
+        }
+    }
+
+    public void addToEntry(BibEntry entry, List<Path> files) {
+        linker.addFilesToEntry(entry, files);
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java b/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java
deleted file mode 100644
index eb798b16f71..00000000000
--- a/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.jabref.gui.fieldeditors;
-
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.dnd.DnDConstants;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
-import javax.swing.TransferHandler;
-
-import org.jabref.gui.EntryContainer;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.externalfiles.DroppedFileHandler;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.groups.EntryTableTransferHandler;
-import org.jabref.model.util.FileHelper;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class FileListEditorTransferHandler extends TransferHandler {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(FileListEditorTransferHandler.class);
-
-    private final DataFlavor URL_FLAVOR;
-    private final JabRefFrame frame;
-    private final EntryContainer entryContainer;
-    private final TransferHandler textTransferHandler;
-
-    private DroppedFileHandler droppedFileHandler;
-
-
-    /**
-     * @param textTransferHandler is an instance of javax.swing.plaf.basic.BasicTextUI.TextTransferHandler. That class
-     *                            is not visible. Therefore, we have to "cheat"
-     */
-    public FileListEditorTransferHandler(JabRefFrame frame, EntryContainer entryContainer,
-                                         TransferHandler textTransferHandler) {
-        this.frame = frame;
-        this.entryContainer = entryContainer;
-        this.textTransferHandler = textTransferHandler;
-        URL_FLAVOR = getUrlFlavor();
-    }
-
-    private DataFlavor getUrlFlavor() {
-        DataFlavor urlFlavor;
-        try {
-            urlFlavor = new DataFlavor("application/x-java-url; class=java.net.URL");
-        } catch (ClassNotFoundException e) {
-            LOGGER.info("Unable to configure drag and drop for file link table", e);
-            urlFlavor = null;
-        }
-        return urlFlavor;
-    }
-
-    /**
-     * Overridden to indicate which types of drags are supported (only LINK + COPY). COPY is supported as no support
-     * disables CTRL+C (copy of text)
-     */
-    @Override
-    public int getSourceActions(JComponent c) {
-        return DnDConstants.ACTION_LINK | DnDConstants.ACTION_COPY;
-    }
-
-    @Override
-    public void exportToClipboard(JComponent comp, Clipboard clip, int action) {
-        if (this.textTransferHandler != null) {
-            this.textTransferHandler.exportToClipboard(comp, clip, action);
-        }
-    }
-
-    @Override
-    public boolean importData(JComponent comp, Transferable transferable) {
-        // If the drop target is the main table, we want to record which
-        // row the item was dropped on, to identify the entry if needed:
-
-        try {
-            List<Path> files = new ArrayList<>();
-            // This flavor is used for dragged file links in Windows:
-            if (transferable.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
-                // javaFileListFlavor returns a list of java.io.File (as the string *File* in File indicates) and not a list of java.nio.file
-                // There is no DataFlavor.javaPathListFlavor, so we have to deal with java.io.File
-                @SuppressWarnings("unchecked")
-                List<File> transferedFiles = (List<File>) transferable.getTransferData(DataFlavor.javaFileListFlavor);
-                files.addAll(transferedFiles.stream().map(File::toPath).collect(Collectors.toList()));
-            } else if (transferable.isDataFlavorSupported(URL_FLAVOR)) {
-                URL dropLink = (URL) transferable.getTransferData(URL_FLAVOR);
-                LOGGER.warn("Dropped URL, which is currently not implemented " + dropLink);
-            } else if (transferable.isDataFlavorSupported(DataFlavor.stringFlavor)) {
-                // This is used when one or more files are pasted from the file manager
-                // under Gnome. The data consists of the file paths, one file per line:
-                String dropStr = (String) transferable.getTransferData(DataFlavor.stringFlavor);
-                files.addAll(EntryTableTransferHandler.getFilesFromDraggedFilesString(dropStr));
-            } else {
-                LOGGER.warn("Dropped something, which we currently cannot handle");
-            }
-
-            SwingUtilities.invokeLater(() -> {
-                for (Path file : files) {
-                    // Find the file's extension, if any:
-                    String name = file.toAbsolutePath().toString();
-                    FileHelper.getFileExtension(name).ifPresent(extension -> ExternalFileTypes.getInstance()
-                            .getExternalFileTypeByExt(extension).ifPresent(fileType -> {
-                                if (droppedFileHandler == null) {
-                                    droppedFileHandler = new DroppedFileHandler(frame, frame.getCurrentBasePanel());
-                                }
-                                droppedFileHandler.handleDroppedfile(name, fileType, entryContainer.getEntry());
-                            }));
-                }
-            });
-            if (!files.isEmpty()) {
-                // Found some files, return
-                return true;
-            }
-        } catch (IOException ioe) {
-            LOGGER.warn("Failed to read dropped data. ", ioe);
-        } catch (UnsupportedFlavorException | ClassCastException ufe) {
-            LOGGER.warn("Drop type error. ", ufe);
-        }
-
-        // all supported flavors failed
-        // log the flavors to support debugging
-        LOGGER.warn("Cannot transfer input: " + dataFlavorsToString(transferable.getTransferDataFlavors()));
-        return false;
-    }
-
-    private String dataFlavorsToString(DataFlavor[] transferFlavors) {
-        return Arrays.stream(transferFlavors)
-                .map(dataFlavor -> dataFlavor.toString())
-                .collect(Collectors.joining(" "));
-    }
-
-    /**
-     * This method is called to query whether the transfer can be imported.
-     *
-     *  @return <code>true</code> for urls, strings, javaFileLists, <code>false</code> otherwise
-     */
-    @Override
-    public boolean canImport(JComponent comp, DataFlavor[] transferFlavors) {
-        // accept this if any input flavor matches any of our supported flavors
-        for (DataFlavor inflav : transferFlavors) {
-            if (inflav.match(URL_FLAVOR) || inflav.match(DataFlavor.stringFlavor) || inflav.match(DataFlavor.javaFileListFlavor)) {
-                return true;
-            }
-        }
-
-        // nope, never heard of this type
-        LOGGER.debug("Unknown data transfer flavor: " + dataFlavorsToString(transferFlavors));
-        return false;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
index d72f99ae657..8c4a94d3517 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
@@ -146,6 +146,7 @@ private void handleOnDragDropped(LinkedFileViewModel originalItem, DragEvent eve
         if (dragboard.hasFiles()) {
             List<LinkedFileViewModel> linkedFiles = dragboard.getFiles().stream().map(File::toPath).map(viewModel::fromFile).collect(Collectors.toList());
             items.addAll(linkedFiles);
+            success = true;
         }
         event.setDropCompleted(success);
         event.consume();
diff --git a/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java b/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java
deleted file mode 100644
index 70c0bfaec3d..00000000000
--- a/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java
+++ /dev/null
@@ -1,385 +0,0 @@
-package org.jabref.gui.groups;
-
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.dnd.DnDConstants;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseEvent;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.swing.JComponent;
-import javax.swing.JTable;
-import javax.swing.TransferHandler;
-
-import org.jabref.JabRefExecutorService;
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.externalfiles.DroppedFileHandler;
-import org.jabref.gui.externalfiles.TransferableFileLinkSelection;
-import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.importer.ImportAction;
-import org.jabref.gui.importer.actions.OpenDatabaseAction;
-import org.jabref.gui.maintable.MainTable;
-import org.jabref.logic.net.URLDownload;
-import org.jabref.model.util.FileHelper;
-import org.jabref.pdfimport.PdfImporter;
-import org.jabref.pdfimport.PdfImporter.ImportPdfFilesResult;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class EntryTableTransferHandler extends TransferHandler {
-
-    private static final boolean DROP_ALLOWED = true;
-    private static final Logger LOGGER = LoggerFactory.getLogger(EntryTableTransferHandler.class);
-    private final MainTable entryTable;
-    private final JabRefFrame frame;
-    private final BasePanel panel;
-    private DataFlavor urlFlavor;
-    private final DataFlavor stringFlavor;
-    private boolean draggingFile;
-
-    /**
-     * Construct the transfer handler.
-     *
-     * @param entryTable The table this transfer handler should operate on. This argument is allowed to equal null, in
-     *            which case the transfer handler can assume that it works for a JabRef instance with no databases open,
-     *            attached to the empty tabbed pane.
-     * @param frame The JabRefFrame instance.
-     * @param panel The BasePanel this transferhandler works for.
-     */
-    public EntryTableTransferHandler(MainTable entryTable, JabRefFrame frame, BasePanel panel) {
-        this.entryTable = entryTable;
-        this.frame = frame;
-        this.panel = panel;
-        stringFlavor = DataFlavor.stringFlavor;
-        try {
-            urlFlavor = new DataFlavor("application/x-java-url; class=java.net.URL");
-        } catch (ClassNotFoundException e) {
-            LOGGER.info("Unable to configure drag and drop for main table", e);
-        }
-    }
-
-    /**
-     * Overridden to indicate which types of drags are supported (only LINK).
-     */
-    @Override
-    public int getSourceActions(JComponent c) {
-        return DnDConstants.ACTION_LINK;
-    }
-
-    /**
-     * This method is called when dragging stuff *from* the table.
-     */
-    @Override
-    public Transferable createTransferable(JComponent c) {
-        if (draggingFile) {
-            draggingFile = false;
-            return new TransferableFileLinkSelection(panel, entryTable.getSelectedEntries());//.getTransferable();
-        } else {
-            /* so we can assume it will never be called if entryTable==null: */
-            return new TransferableEntrySelection(entryTable.getSelectedEntries());
-        }
-    }
-
-    /**
-     * This method is called when stuff is drag to the component.
-     *
-     * Imports the dropped URL or plain text as a new entry in the current library.
-     *
-     */
-    @Override
-    public boolean importData(JComponent comp, Transferable t) {
-
-        // If the drop target is the main table, we want to record which
-        // row the item was dropped on, to identify the entry if needed:
-        int dropRow = -1;
-        if (comp instanceof JTable) {
-            dropRow = ((JTable) comp).getSelectedRow();
-        }
-
-        try {
-
-            // This flavor is used for dragged file links in Windows:
-            if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
-                // JOptionPane.showMessageDialog(null, "Received
-                // javaFileListFlavor");
-                @SuppressWarnings("unchecked")
-                List<Path> files = ((List<File>) t.getTransferData(DataFlavor.javaFileListFlavor)).stream()
-                        .map(File::toPath).collect(Collectors.toList());
-                return handleDraggedFiles(files, dropRow);
-            } else if (t.isDataFlavorSupported(urlFlavor)) {
-                URL dropLink = (URL) t.getTransferData(urlFlavor);
-                return handleDropTransfer(dropLink);
-            } else if (t.isDataFlavorSupported(stringFlavor)) {
-                String dropStr = (String) t.getTransferData(stringFlavor);
-                LOGGER.debug("Received stringFlavor: " + dropStr);
-                return handleDropTransfer(dropStr, dropRow);
-            }
-        } catch (IOException ioe) {
-            LOGGER.error("Failed to read dropped data", ioe);
-        } catch (UnsupportedFlavorException | ClassCastException ufe) {
-            LOGGER.error("Drop type error", ufe);
-        }
-
-        // all supported flavors failed
-        LOGGER.info("Can't transfer input: ");
-        DataFlavor[] inflavs = t.getTransferDataFlavors();
-        for (DataFlavor inflav : inflavs) {
-            LOGGER.info("  " + inflav);
-        }
-
-        return false;
-    }
-
-    /**
-     * This method is called to query whether the transfer can be imported.
-     *
-     * Will return true for urls, strings, javaFileLists
-     */
-    @Override
-    public boolean canImport(JComponent comp, DataFlavor[] transferFlavors) {
-        if (!EntryTableTransferHandler.DROP_ALLOWED) {
-            return false;
-        }
-
-        // accept this if any input flavor matches any of our supported flavors
-        for (DataFlavor inflav : transferFlavors) {
-            if (inflav.match(urlFlavor) || inflav.match(stringFlavor) || inflav.match(DataFlavor.javaFileListFlavor)) {
-                return true;
-            }
-        }
-
-        // System.out.println("drop type forbidden");
-        // nope, never heard of this type
-        return false;
-    }
-
-    @Override
-    public void exportAsDrag(JComponent comp, InputEvent e, int action) {
-        if (e instanceof MouseEvent) {
-            // TODO: Reimplement drag & drop
-            /*
-            int columnIndex = entryTable.columnAtPoint(((MouseEvent) e).getPoint());
-            int modelIndex = entryTable.getColumnModel().getColumn(columnIndex).getModelIndex();
-            if (entryTable.isFileColumn(modelIndex)) {
-                LOGGER.info("Dragging file");
-                draggingFile = true;
-            }
-            */
-        }
-        super.exportAsDrag(comp, e, DnDConstants.ACTION_LINK);
-    }
-
-    @Override
-    protected void exportDone(JComponent source, Transferable data, int action) {
-        // default implementation is OK
-        super.exportDone(source, data, action);
-    }
-
-    @Override
-    public void exportToClipboard(JComponent comp, Clipboard clip, int action) {
-        // default implementation is OK
-        super.exportToClipboard(comp, clip, action);
-    }
-
-    // add-ons -----------------------
-
-    private boolean handleDropTransfer(String dropStr, final int dropRow) throws IOException {
-        if (dropStr.startsWith("file:")) {
-            // This appears to be a dragged file link and not a reference
-            // format. Check if we can map this to a set of files:
-            if (handleDraggedFilenames(dropStr, dropRow)) {
-                return true;
-                // If not, handle it in the normal way...
-            }
-        } else if (dropStr.startsWith("http:")) {
-            // This is the way URL links are received on OS X and KDE (Gnome?):
-            URL url = new URL(dropStr);
-            // JOptionPane.showMessageDialog(null, "Making URL:
-            // "+url.toString());
-            return handleDropTransfer(url);
-        }
-        File tmpfile = File.createTempFile("jabrefimport", "");
-        tmpfile.deleteOnExit();
-        try (FileWriter fw = new FileWriter(tmpfile)) {
-            fw.write(dropStr);
-        }
-
-        // System.out.println("importing from " + tmpfile.getAbsolutePath());
-
-        ImportAction importer = new ImportAction(frame, false);
-        importer.automatedImport(Collections.singletonList(tmpfile.getAbsolutePath()));
-
-        return true;
-    }
-
-    /**
-     * Translate a String describing a set of files or URLs dragged into JabRef into a List of File objects, taking care
-     * of URL special characters.
-     *
-     * @param s String describing a set of files or URLs dragged into JabRef
-     * @return a List<File> containing the individual file objects.
-     *
-     */
-    public static List<Path> getFilesFromDraggedFilesString(String s) {
-        // Split into lines:
-        String[] lines = s.replace("\r", "").split("\n");
-        List<Path> files = new ArrayList<>();
-        for (String line1 : lines) {
-            String line = line1;
-
-            // Try to use url.toURI() to translate URL specific sequences like %20 into
-            // standard characters:
-            File fl = null;
-            try {
-                URL url = new URL(line);
-                fl = new File(url.toURI());
-            } catch (MalformedURLException | URISyntaxException e) {
-                LOGGER.warn("Could not get file", e);
-            }
-
-            // Unless an exception was thrown, we should have the sanitized path:
-            if (fl != null) {
-                line = fl.getPath();
-            } else if (line.startsWith("file:")) {
-                line = line.substring(5);
-            } else {
-                continue;
-            }
-            // Under Gnome, the link is given as file:///...., so we
-            // need to strip the extra slashes:
-            if (line.startsWith("//")) {
-                line = line.substring(2);
-            }
-
-            File f = new File(line);
-            if (f.exists()) {
-                files.add(f.toPath());
-            }
-        }
-        return files;
-    }
-
-    /**
-     * Handle a String describing a set of files or URLs dragged into JabRef.
-     *
-     * @param s String describing a set of files or URLs dragged into JabRef
-     * @param dropRow The row in the table where the files were dragged.
-     * @return success status for the operation
-     *
-     */
-    private boolean handleDraggedFilenames(String s, final int dropRow) {
-
-        return handleDraggedFiles(EntryTableTransferHandler.getFilesFromDraggedFilesString(s), dropRow);
-
-    }
-
-    /**
-     * Handle a List containing File objects for a set of files to import.
-     *
-     * @param files A List containing File instances pointing to files.
-     * @param dropRow @param dropRow The row in the table where the files were dragged.
-     * @return success status for the operation
-     */
-    private boolean handleDraggedFiles(List<Path> files, final int dropRow) {
-        final List<String> fileNames = new ArrayList<>();
-        for (Path file : files) {
-            fileNames.add(file.toAbsolutePath().toString());
-        }
-        // Try to load BIB files normally, and import the rest into the current
-        // database.
-        // This process must be spun off into a background thread:
-        JabRefExecutorService.INSTANCE.execute(() -> {
-            final ImportPdfFilesResult importRes = new PdfImporter(frame, panel, entryTable, dropRow)
-                    .importPdfFiles(fileNames);
-            if (!importRes.getNoPdfFiles().isEmpty()) {
-                loadOrImportFiles(importRes.getNoPdfFiles(), dropRow);
-            }
-        });
-
-        return true;
-    }
-
-    /**
-     * Take a set of filenames. Those with names indicating BIB files are opened as such if possible. All other files we
-     * will attempt to import into the current library.
-     *
-     * @param fileNames The names of the files to open.
-     * @param dropRow success status for the operation
-     */
-    private void loadOrImportFiles(List<String> fileNames, int dropRow) {
-
-        OpenDatabaseAction openAction = new OpenDatabaseAction(frame);
-        List<String> notBibFiles = new ArrayList<>();
-        List<String> bibFiles = new ArrayList<>();
-        for (String fileName : fileNames) {
-            // Find the file's extension, if any:
-            Optional<String> extension = FileHelper.getFileExtension(fileName);
-            Optional<ExternalFileType> fileType;
-
-            if (extension.isPresent() && "bib".equals(extension.get())) {
-                // we assume that it is a BibTeX file.
-                // When a user wants to import something with file extension "bib", but which is not a BibTeX file, he should use "file -> import"
-                bibFiles.add(fileName);
-                continue;
-            }
-
-            fileType = ExternalFileTypes.getInstance().getExternalFileTypeByExt(extension.orElse(""));
-            /*
-             * This is a linkable file. If the user dropped it on an entry, we
-             * should offer options for autolinking to this files:
-             *
-             * TODO we should offer an option to highlight the row the user is on too.
-             */
-            if ((fileType.isPresent()) && (dropRow >= 0)) {
-
-                /*
-                 * TODO: make this an instance variable?
-                 */
-                DroppedFileHandler dfh = new DroppedFileHandler(frame, panel);
-                dfh.handleDroppedfile(fileName, fileType.get(), entryTable, dropRow);
-
-                continue;
-            }
-            notBibFiles.add(fileName);
-        }
-
-        openAction.openFilesAsStringList(bibFiles, true);
-
-        if (!notBibFiles.isEmpty()) {
-            // Import into new if entryTable==null, otherwise into current
-            // database:
-            ImportAction importer = new ImportAction(frame, entryTable == null);
-            importer.automatedImport(notBibFiles);
-        }
-    }
-
-    private boolean handleDropTransfer(URL dropLink) throws IOException {
-        File tmpfile = File.createTempFile("jabrefimport", "");
-        tmpfile.deleteOnExit();
-
-        new URLDownload(dropLink).toFile(tmpfile.toPath());
-
-        // Import into new if entryTable==null, otherwise into current library:
-        ImportAction importer = new ImportAction(frame, entryTable == null);
-        importer.automatedImport(Collections.singletonList(tmpfile.getAbsolutePath()));
-
-        return true;
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
index 951b5339f41..2699df22cb6 100644
--- a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
@@ -22,6 +22,7 @@
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.BindingsHelper;
+import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.groups.DefaultGroupsFactory;
 import org.jabref.logic.layout.format.LatexToUnicodeFormatter;
@@ -54,12 +55,14 @@ public class GroupNodeViewModel {
     private final BooleanBinding anySelectedEntriesMatched;
     private final BooleanBinding allSelectedEntriesMatched;
     private final TaskExecutor taskExecutor;
+    private final CustomLocalDragboard localDragBoard;
 
-    public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager stateManager, TaskExecutor taskExecutor, GroupTreeNode groupNode) {
+    public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager stateManager, TaskExecutor taskExecutor, GroupTreeNode groupNode, CustomLocalDragboard localDragBoard) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
         this.stateManager = Objects.requireNonNull(stateManager);
         this.groupNode = Objects.requireNonNull(groupNode);
+        this.localDragBoard = Objects.requireNonNull(localDragBoard);
 
         LatexToUnicodeFormatter formatter = new LatexToUnicodeFormatter();
         displayName = formatter.format(groupNode.getName());
@@ -89,16 +92,16 @@ public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager state
         allSelectedEntriesMatched = BindingsHelper.all(selectedEntriesMatchStatus, matched -> matched);
     }
 
-    public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager stateManager, TaskExecutor taskExecutor, AbstractGroup group) {
-        this(databaseContext, stateManager, taskExecutor, new GroupTreeNode(group));
+    public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager stateManager, TaskExecutor taskExecutor, AbstractGroup group, CustomLocalDragboard localDragboard) {
+        this(databaseContext, stateManager, taskExecutor, new GroupTreeNode(group), localDragboard);
     }
 
-    static GroupNodeViewModel getAllEntriesGroup(BibDatabaseContext newDatabase, StateManager stateManager, TaskExecutor taskExecutor) {
-        return new GroupNodeViewModel(newDatabase, stateManager, taskExecutor, DefaultGroupsFactory.getAllEntriesGroup());
+    static GroupNodeViewModel getAllEntriesGroup(BibDatabaseContext newDatabase, StateManager stateManager, TaskExecutor taskExecutor, CustomLocalDragboard localDragBoard) {
+        return new GroupNodeViewModel(newDatabase, stateManager, taskExecutor, DefaultGroupsFactory.getAllEntriesGroup(), localDragBoard);
     }
 
     private GroupNodeViewModel toViewModel(GroupTreeNode child) {
-        return new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, child);
+        return new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, child, localDragBoard);
     }
 
     public List<FieldChange> addEntriesToGroup(List<BibEntry> entries) {
@@ -259,7 +262,7 @@ public Optional<GroupNodeViewModel> getChildByPath(String pathToSource) {
     public boolean acceptableDrop(Dragboard dragboard) {
         // TODO: we should also check isNodeDescendant
         boolean canDropOtherGroup = dragboard.hasContent(DragAndDropDataFormats.GROUP);
-        boolean canDropEntries = dragboard.hasContent(DragAndDropDataFormats.ENTRIES)
+        boolean canDropEntries = localDragBoard.hasType(DragAndDropDataFormats.BIBENTRY_LIST_CLASS)
                 && (groupNode.getGroup() instanceof GroupEntryChanger);
         return canDropOtherGroup || canDropEntries;
     }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
index 2c4f1e2d8b9..4e4aee8051e 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -36,12 +36,15 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.DragAndDropDataFormats;
+import org.jabref.gui.GUIGlobals;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.BindingsHelper;
+import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.RecursiveTreeItem;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.gui.util.ViewModelTreeTableCellFactory;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.AllEntriesGroup;
 
 import org.controlsfx.control.textfield.CustomTextField;
@@ -66,6 +69,7 @@ public class GroupTreeView {
     @Inject private DialogService dialogService;
     @Inject private TaskExecutor taskExecutor;
     private GroupTreeViewModel viewModel;
+    private CustomLocalDragboard localDragboard;
 
     private static void removePseudoClasses(TreeTableRow<GroupNodeViewModel> row, PseudoClass... pseudoClasses) {
         for (PseudoClass pseudoClass : pseudoClasses) {
@@ -75,7 +79,8 @@ private static void removePseudoClasses(TreeTableRow<GroupNodeViewModel> row, Ps
 
     @FXML
     public void initialize() {
-        viewModel = new GroupTreeViewModel(stateManager, dialogService, taskExecutor);
+        this.localDragboard = GUIGlobals.localDragboard;
+        viewModel = new GroupTreeViewModel(stateManager, dialogService, taskExecutor, localDragboard);
 
         // Set-up groups tree
         groupTree.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
@@ -207,9 +212,12 @@ public void initialize() {
             });
             row.setOnDragOver(event -> {
                 Dragboard dragboard = event.getDragboard();
-                if ((event.getGestureSource() != row) && row.getItem().acceptableDrop(dragboard)) {
+                if ((event.getGestureSource() != row) && (row.getItem() != null) && row.getItem().acceptableDrop(dragboard)) {
                     event.acceptTransferModes(TransferMode.MOVE, TransferMode.LINK);
 
+                    //expand node and all children on drag over
+                    row.getTreeItem().setExpanded(true);
+
                     removePseudoClasses(row, dragOverBottom, dragOverCenter, dragOverTop);
                     switch (getDroppingMouseLocation(row, event)) {
                         case BOTTOM:
@@ -241,11 +249,10 @@ public void initialize() {
                         success = true;
                     }
                 }
-                if (dragboard.hasContent(DragAndDropDataFormats.ENTRIES)) {
-                    TransferableEntrySelection entrySelection = (TransferableEntrySelection) dragboard
-                            .getContent(DragAndDropDataFormats.ENTRIES);
 
-                    row.getItem().addEntriesToGroup(entrySelection.getSelection());
+                if (localDragboard.hasType(DragAndDropDataFormats.BIBENTRY_LIST_CLASS)) {
+                    List<BibEntry> entries = localDragboard.getBibEntries();
+                    row.getItem().addEntriesToGroup(entries);
                     success = true;
                 }
                 event.setDropCompleted(success);
@@ -260,12 +267,12 @@ public void initialize() {
     }
 
     private void updateSelection(List<TreeItem<GroupNodeViewModel>> newSelectedGroups) {
-        if (newSelectedGroups == null || newSelectedGroups.isEmpty()) {
+        if ((newSelectedGroups == null) || newSelectedGroups.isEmpty()) {
             viewModel.selectedGroupsProperty().clear();
         } else {
             List<GroupNodeViewModel> list = new ArrayList<>();
             for (TreeItem<GroupNodeViewModel> model : newSelectedGroups) {
-                if (model != null && model.getValue() != null && !(model.getValue().getGroupNode().getGroup() instanceof AllEntriesGroup)) {
+                if ((model != null) && (model.getValue() != null) && !(model.getValue().getGroupNode().getGroup() instanceof AllEntriesGroup)) {
                     list.add(model.getValue());
                 }
             }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
index 14874771dd8..5ff2106d2ed 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -23,6 +23,7 @@
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
@@ -41,6 +42,7 @@ public class GroupTreeViewModel extends AbstractViewModel {
     private final StateManager stateManager;
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
+    private final CustomLocalDragboard localDragboard;
     private final ObjectProperty<Predicate<GroupNodeViewModel>> filterPredicate = new SimpleObjectProperty<>();
     private final StringProperty filterText = new SimpleStringProperty();
     private final Comparator<GroupTreeNode> compAlphabetIgnoreCase = (GroupTreeNode v1, GroupTreeNode v2) -> v1
@@ -48,11 +50,11 @@ public class GroupTreeViewModel extends AbstractViewModel {
             .compareToIgnoreCase(v2.getName());
     private Optional<BibDatabaseContext> currentDatabase;
 
-    public GroupTreeViewModel(StateManager stateManager, DialogService dialogService, TaskExecutor taskExecutor) {
+    public GroupTreeViewModel(StateManager stateManager, DialogService dialogService, TaskExecutor taskExecutor, CustomLocalDragboard localDragboard) {
         this.stateManager = Objects.requireNonNull(stateManager);
         this.dialogService = Objects.requireNonNull(dialogService);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
-
+        this.localDragboard = Objects.requireNonNull(localDragboard);
         // Register listener
         EasyBind.subscribe(stateManager.activeDatabaseProperty(), this::onActiveDatabaseChanged);
         EasyBind.subscribe(selectedGroups, this::onSelectedGroupChanged);
@@ -92,7 +94,7 @@ private void onSelectedGroupChanged(ObservableList<GroupNodeViewModel> newValue)
         }
 
         currentDatabase.ifPresent(database -> {
-            if (newValue == null || newValue.isEmpty()) {
+            if ((newValue == null) || newValue.isEmpty()) {
                 stateManager.clearSelectedGroups(database);
             } else {
                 stateManager.setSelectedGroups(database, newValue.stream().map(GroupNodeViewModel::getGroupNode).collect(Collectors.toList()));
@@ -116,16 +118,16 @@ private void onActiveDatabaseChanged(Optional<BibDatabaseContext> newDatabase) {
             GroupNodeViewModel newRoot = newDatabase
                     .map(BibDatabaseContext::getMetaData)
                     .flatMap(MetaData::getGroups)
-                    .map(root -> new GroupNodeViewModel(newDatabase.get(), stateManager, taskExecutor, root))
-                    .orElse(GroupNodeViewModel.getAllEntriesGroup(newDatabase.get(), stateManager, taskExecutor));
+                                                    .map(root -> new GroupNodeViewModel(newDatabase.get(), stateManager, taskExecutor, root, localDragboard))
+                                                    .orElse(GroupNodeViewModel.getAllEntriesGroup(newDatabase.get(), stateManager, taskExecutor, localDragboard));
 
             rootGroup.setValue(newRoot);
             this.selectedGroups.setAll(
                     stateManager.getSelectedGroup(newDatabase.get()).stream()
-                                .map(selectedGroup -> new GroupNodeViewModel(newDatabase.get(), stateManager, taskExecutor, selectedGroup))
+                                                   .map(selectedGroup -> new GroupNodeViewModel(newDatabase.get(), stateManager, taskExecutor, selectedGroup, localDragboard))
                                 .collect(Collectors.toList()));
         } else {
-            rootGroup.setValue(GroupNodeViewModel.getAllEntriesGroup(new BibDatabaseContext(), stateManager, taskExecutor));
+            rootGroup.setValue(GroupNodeViewModel.getAllEntriesGroup(new BibDatabaseContext(), stateManager, taskExecutor, localDragboard));
         }
 
         currentDatabase = newDatabase;
diff --git a/src/main/java/org/jabref/gui/groups/TransferableEntrySelection.java b/src/main/java/org/jabref/gui/groups/TransferableEntrySelection.java
deleted file mode 100644
index 84b5fee8b5d..00000000000
--- a/src/main/java/org/jabref/gui/groups/TransferableEntrySelection.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.jabref.gui.groups;
-
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.jabref.model.entry.BibEntry;
-
-public class TransferableEntrySelection implements Transferable {
-
-    public static final DataFlavor FLAVOR_INTERNAL;
-    private static final DataFlavor FLAVOR_EXTERNAL;
-    private static final DataFlavor[] FLAVORS;
-
-    static {
-        DataFlavor df1 = null;
-        DataFlavor df2 = null;
-        try {
-            df1 = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType
-                    + ";class=org.jabref.gui.groups.TransferableEntrySelection");
-            df2 = DataFlavor.getTextPlainUnicodeFlavor();
-        } catch (ClassNotFoundException e) {
-            // never happens
-        }
-        FLAVOR_INTERNAL = df1;
-        FLAVOR_EXTERNAL = df2;
-        FLAVORS = new DataFlavor[] {TransferableEntrySelection.FLAVOR_INTERNAL,
-                TransferableEntrySelection.FLAVOR_EXTERNAL};
-    }
-
-    private final List<BibEntry> selectedEntries;
-    private final String selectedEntriesCiteKeys;
-    private boolean includeCiteKeyword;
-
-    public TransferableEntrySelection(List<BibEntry> list) {
-        this.selectedEntries = list;
-        selectedEntriesCiteKeys = String.join(",",
-                this.selectedEntries.stream().map(BibEntry::getCiteKeyOptional).filter(Optional::isPresent)
-                        .map(Optional::get).collect(Collectors.toList()));
-    }
-
-    @Override
-    public DataFlavor[] getTransferDataFlavors() {
-        return TransferableEntrySelection.FLAVORS;
-    }
-
-    @Override
-    public boolean isDataFlavorSupported(DataFlavor someFlavor) {
-        return someFlavor.equals(TransferableEntrySelection.FLAVOR_INTERNAL)
-                || someFlavor.equals(TransferableEntrySelection.FLAVOR_EXTERNAL);
-    }
-
-    @Override
-    public Object getTransferData(DataFlavor someFlavor)
-            throws UnsupportedFlavorException, IOException {
-
-        String s = includeCiteKeyword ? "\\cite{" + selectedEntriesCiteKeys + "}" : selectedEntriesCiteKeys;
-
-        if (someFlavor.equals(TransferableEntrySelection.FLAVOR_INTERNAL)) {
-            return this;
-        }
-
-        else if (someFlavor.equals(DataFlavor.getTextPlainUnicodeFlavor())) {
-
-            String charsetName = TransferableEntrySelection.FLAVOR_EXTERNAL.getParameter("charset");
-            if (charsetName == null) {
-                charsetName = "";
-            }
-            Charset charset = Charset.forName(charsetName.trim());
-            return new ByteArrayInputStream(s.getBytes(charset));
-        }
-
-        //The text/plain DataFormat of javafx uses the String.class directly as representative class and no longer an InputStream
-        return s;
-    }
-
-    public List<BibEntry> getSelection() {
-        return selectedEntries;
-    }
-
-    public void setIncludeCiteKeyword(boolean includeCiteKeyword) {
-        this.includeCiteKeyword = includeCiteKeyword;
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
index 84fcef65d67..ae3dc7c5b4b 100644
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
@@ -198,7 +198,7 @@ public ImportInspectionDialog(JabRefFrame frame, BasePanel panel, String undoNam
         this.undoName = undoName;
         this.newDatabase = newDatabase;
         setIconImages(IconTheme.getLogoSet());
-        preview = DefaultTaskExecutor.runInJavaFXThread(() -> new PreviewPanel(panel, bibDatabaseContext, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), frame.getDialogService()));
+        preview = DefaultTaskExecutor.runInJavaFXThread(() -> new PreviewPanel(panel, bibDatabaseContext, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), frame.getDialogService(), ExternalFileTypes.getInstance()));
 
         duplLabel.setToolTipText(Localization.lang("Possible duplicate of existing entry. Click to resolve."));
 
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index a4275922bdf..47aeec972f0 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -86,7 +86,8 @@ public enum KeyBinding {
     UNABBREVIATE("Unabbreviate", Localization.lang("Unabbreviate"), "ctrl+alt+shift+A", KeyBindingCategory.TOOLS),
     UNDO("Undo", Localization.lang("Undo"), "ctrl+Z", KeyBindingCategory.EDIT),
     WEB_SEARCH("Web search", Localization.lang("Web search"), "alt+4", KeyBindingCategory.SEARCH),
-    WRITE_XMP("Write XMP", Localization.lang("Write XMP"), "F6", KeyBindingCategory.TOOLS);
+    WRITE_XMP("Write XMP", Localization.lang("Write XMP"), "F6", KeyBindingCategory.TOOLS),
+    CLEAR_SEARCH("Clear search", Localization.lang("Clear search"), "ESCAPE", KeyBindingCategory.SEARCH);
 
     private final String constant;
     private final String localization;
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 663a046ba4e..04f4aa435b1 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.maintable;
 
+import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -13,22 +15,32 @@
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
+import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.DataFormat;
+import javafx.scene.input.DragEvent;
+import javafx.scene.input.Dragboard;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseDragEvent;
 import javafx.scene.input.MouseEvent;
+import javafx.scene.input.TransferMode;
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
+import org.jabref.gui.DragAndDropDataFormats;
+import org.jabref.gui.GUIGlobals;
 import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.externalfiles.NewDroppedFileHandler;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableInsertEntry;
+import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.ViewModelTableRowFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.UpdateField;
+import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
@@ -47,32 +59,49 @@ public class MainTable extends TableView<BibEntryTableViewModel> {
     private final UndoManager undoManager;
 
     private final MainTableDataModel model;
+    private final NewDroppedFileHandler fileHandler;
+    private final CustomLocalDragboard localDragboard = GUIGlobals.localDragboard;
+
 
     public MainTable(MainTableDataModel model, JabRefFrame frame,
-                     BasePanel panel, BibDatabaseContext database, MainTablePreferences preferences, ExternalFileTypes externalFileTypes, KeyBindingRepository keyBindingRepository) {
+                     BasePanel panel, BibDatabaseContext database,
+                     MainTablePreferences preferences, ExternalFileTypes externalFileTypes, KeyBindingRepository keyBindingRepository) {
         super();
+
         this.model = model;
         this.database = Objects.requireNonNull(database);
         this.undoManager = panel.getUndoManager();
 
+        fileHandler = new NewDroppedFileHandler(frame.getDialogService(), database, externalFileTypes,
+                                                Globals.prefs.getFileDirectoryPreferences(),
+                                                Globals.prefs.getCleanupPreferences(Globals.journalAbbreviationLoader).getFileDirPattern(),
+                                                Globals.prefs.getImportFormatPreferences(),
+                                                Globals.prefs.getUpdateFieldPreferences(),
+                                                Globals.getFileUpdateMonitor(),
+                                                Globals.prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)
+
+        );
+
         this.getColumns().addAll(new MainTableColumnFactory(database, preferences.getColumnPreferences(), externalFileTypes, panel.getUndoManager(), frame.getDialogService()).createColumns());
         new ViewModelTableRowFactory<BibEntryTableViewModel>()
-                .withOnMouseClickedEvent((entry, event) -> {
-                    if (event.getClickCount() == 2) {
-                        panel.showAndEdit(entry.getEntry());
-                    }
-                })
-                .withContextMenu(entry -> RightClickMenu.create(entry, keyBindingRepository, panel, Globals.getKeyPrefs(), frame.getDialogService()))
-                .setOnDragDetected(this::handleOnDragDetected)
-                .setOnMouseDragEntered(this::handleOnDragEntered)
-                .install(this);
+                                                              .withOnMouseClickedEvent((entry, event) -> {
+                                                                  if (event.getClickCount() == 2) {
+                                                                      panel.showAndEdit(entry.getEntry());
+                                                                  }
+                                                              })
+                                                              .withContextMenu(entry -> RightClickMenu.create(entry, keyBindingRepository, panel, Globals.getKeyPrefs(), frame.getDialogService()))
+                                                              .setOnDragDetected(this::handleOnDragDetected)
+                                                              .setOnDragDropped(this::handleOnDragDropped)
+                                                              .setOnDragOver(this::handleOnDragOver)
+                                                              .setOnMouseDragEntered(this::handleOnDragEntered)
+                                                              .install(this);
 
         if (preferences.resizeColumnsToFit()) {
             this.setColumnResizePolicy(new SmartConstrainedResizePolicy());
         }
         this.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
-        this.setItems(model.getEntriesFiltered());
+        this.setItems(model.getEntriesFilteredAndSorted());
 
         // Enable sorting
         model.bindComparator(this.comparatorProperty());
@@ -101,12 +130,11 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
     }
 
     public void clearAndSelect(BibEntry bibEntry) {
-        findEntry(bibEntry)
-                .ifPresent(entry -> {
-                    getSelectionModel().clearSelection();
-                    getSelectionModel().select(entry);
-                    scrollTo(entry);
-                });
+        findEntry(bibEntry).ifPresent(entry -> {
+            getSelectionModel().clearSelection();
+            getSelectionModel().select(entry);
+            scrollTo(entry);
+        });
     }
 
     public void copy() {
@@ -210,6 +238,18 @@ public void paste() {
         }
     }
 
+    private void handleOnDragOver(BibEntryTableViewModel originalItem, DragEvent event) {
+        if ((event.getGestureSource() != originalItem) && localDragboard.hasType(DragAndDropDataFormats.BIBENTRY_LIST_CLASS)) {
+            event.acceptTransferModes(TransferMode.MOVE);
+
+        }
+        if (event.getDragboard().hasFiles() && (event.getSource() instanceof TableRow)) {
+            event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
+        }
+        event.consume(); //need to consume it here to stop the DnDTabPane from getting the event
+
+    }
+
     private void handleOnDragEntered(TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel entry, MouseDragEvent event) {
         // Support the following gesture to select entries: click on one row -> hold mouse button -> move over other rows
         // We need to select all items between the starting row and the row where the user currently hovers the mouse over
@@ -222,6 +262,68 @@ private void handleOnDragEntered(TableRow<BibEntryTableViewModel> row, BibEntryT
     private void handleOnDragDetected(TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel entry, MouseEvent event) {
         // Start drag'n'drop
         row.startFullDrag();
+
+        List<BibEntry> entries = getSelectionModel().getSelectedItems().stream().map(BibEntryTableViewModel::getEntry).collect(Collectors.toList());
+
+        //The following is necesary to initiate the drag and drop in javafx, although we don't need the contents
+        //It doesn't work without
+        ClipboardContent content = new ClipboardContent();
+        Dragboard dragboard = startDragAndDrop(TransferMode.MOVE);
+        content.put(DragAndDropDataFormats.ENTRIES, "");
+        dragboard.setContent(content);
+
+        if (!entries.isEmpty()) {
+            localDragboard.putBibEntries(entries);
+        }
+
+        event.consume();
+    }
+
+    private void handleOnDragDropped(BibEntryTableViewModel originalItem, DragEvent event) {
+
+        boolean success = false;
+
+        if (event.getDragboard().hasContent(DataFormat.FILES)) {
+
+            List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
+
+            List<Path> bibFiles = files.stream().filter(FileUtil::isBibFile).collect(Collectors.toList());
+
+            if (!bibFiles.isEmpty()) {
+                for (Path file : bibFiles) {
+                    fileHandler.importEntriesFromDroppedBibFiles(file);
+                }
+                success = true;
+
+            }
+            if (event.getGestureTarget() instanceof TableRow) {
+
+                BibEntry entry = originalItem.getEntry();
+
+                if ((event.getTransferMode() == TransferMode.MOVE)) {
+
+                    LOGGER.debug("Mode MOVE"); //shift on win or no modifier
+                    fileHandler.addNewEntryFromXMPorPDFContent(entry, files);
+                    success = true;
+                }
+
+                if (event.getTransferMode() == TransferMode.LINK) {
+                    LOGGER.debug("LINK"); //alt on win
+                    fileHandler.addToEntryRenameAndMoveToFileDir(entry, files);
+                    success = true;
+
+                }
+                if (event.getTransferMode() == TransferMode.COPY) {
+                    LOGGER.debug("Mode Copy"); //ctrl on win
+                    fileHandler.copyFilesToFileDirAndAddToEntry(entry, files);
+                    success = true;
+                }
+            }
+        }
+
+        event.setDropCompleted(success);
+        event.consume();
+
     }
 
     public void addSelectionListener(ListChangeListener<? super BibEntryTableViewModel> listener) {
@@ -237,14 +339,15 @@ public MainTableDataModel getTableModel() {
     }
 
     public BibEntry getEntryAt(int row) {
-        return model.getEntriesFiltered().get(row).getEntry();
+        return model.getEntriesFilteredAndSorted().get(row).getEntry();
     }
 
     public List<BibEntry> getSelectedEntries() {
         return getSelectionModel()
-                .getSelectedItems().stream()
-                .map(BibEntryTableViewModel::getEntry)
-                .collect(Collectors.toList());
+                                  .getSelectedItems()
+                                  .stream()
+                                  .map(BibEntryTableViewModel::getEntry)
+                                  .collect(Collectors.toList());
     }
 
     /**
@@ -326,9 +429,10 @@ private void setupComparatorChooser() {
     }
 
     private Optional<BibEntryTableViewModel> findEntry(BibEntry entry) {
-        return model.getEntriesFiltered().stream()
-                .filter(viewModel -> viewModel.getEntry().equals(entry))
-                .findFirst();
+        return model.getEntriesFilteredAndSorted()
+                    .stream()
+                    .filter(viewModel -> viewModel.getEntry().equals(entry))
+                    .findFirst();
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
index ee7f7f507a8..f55f981266c 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
@@ -68,7 +68,7 @@ private Optional<MatcherSet> createGroupMatcher(List<GroupTreeNode> selectedGrou
         return Optional.of(searchRules);
     }
 
-    public ObservableList<BibEntryTableViewModel> getEntriesFiltered() {
+    public ObservableList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
         return entriesSorted;
     }
 
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
index 661f5ae8004..1a49ed7f9c1 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
@@ -34,7 +34,7 @@
 import org.jabref.gui.FXDialogService;
 import org.jabref.gui.PreviewPanel;
 import org.jabref.gui.customjfx.CustomJFXPanel;
-import org.jabref.gui.util.DefaultTaskExecutor;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.component.DiffHighlightingTextPane;
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.LatexFieldFormatter;
@@ -179,12 +179,10 @@ private void initialize() {
         // Setup a PreviewPanel and a Bibtex source box for the merged entry
         mainPanel.add(boldFontLabel(Localization.lang("Merged entry")), CELL_CONSTRAINTS.xyw(1, 6, 6));
 
-        DefaultTaskExecutor.runInJavaFXThread(() -> {
-            entryPreview = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService());
-            entryPreview.setEntry(mergedEntry);
-            JFXPanel container = CustomJFXPanel.wrap(new Scene(entryPreview));
-            mainPanel.add(container, CELL_CONSTRAINTS.xyw(1, 8, 6));
-        });
+        entryPreview = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService(), ExternalFileTypes.getInstance());
+        entryPreview.setEntry(mergedEntry);
+        JFXPanel container = CustomJFXPanel.wrap(new Scene(entryPreview));
+        mainPanel.add(container, CELL_CONSTRAINTS.xyw(1, 8, 6));
 
         mainPanel.add(boldFontLabel(Localization.lang("Merged BibTeX source code")), CELL_CONSTRAINTS.xyw(8, 6, 4));
 
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
index 8e9e6cfcf2c..ca73fefff1d 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
@@ -134,7 +134,7 @@ private void init() {
         // Create a preview panel for previewing styles
         // Must be done before creating the table to avoid NPEs
         DefaultTaskExecutor.runInJavaFXThread(() -> {
-            preview = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService);
+            preview = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService, ExternalFileTypes.getInstance());
             // Use the test entry from the Preview settings tab in Preferences:
             preview.setEntry(prevEntry);
         });
@@ -166,7 +166,7 @@ private void init() {
             public void actionPerformed(ActionEvent event) {
                 if ((table.getRowCount() == 0) || (table.getSelectedRowCount() == 0)) {
                     dialogService.showErrorDialogAndWait(Localization.lang("Style selection"),
-                                                                    Localization.lang("You must select a valid style file."));
+                                                         Localization.lang("You must select a valid style file."));
                     return;
                 }
                 okPressed = true;
@@ -269,9 +269,9 @@ private void setupPopupMenu() {
         removeAction = actionEvent -> getSelectedStyle().ifPresent(style -> {
 
             if (!style.isFromResource() && dialogService.showConfirmationDialogAndWait(Localization.lang("Remove style"),
-                                                                                                  Localization.lang("Are you sure you want to remove the style?"),
-                                                                                                  Localization.lang("Remove style"),
-                                                                                                  Localization.lang("Cancel"))) {
+                                                                                       Localization.lang("Are you sure you want to remove the style?"),
+                                                                                       Localization.lang("Remove style"),
+                                                                                       Localization.lang("Cancel"))) {
                 if (!loader.removeStyle(style)) {
                     LOGGER.info("Problem removing style");
                 }
@@ -469,14 +469,14 @@ public AddFileDialog() {
 
             JButton browse = new JButton(Localization.lang("Browse"));
             FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                    .addExtensionFilter(Localization.lang("Style file"), StandardFileType.JSTYLE)
-                    .withDefaultExtension(Localization.lang("Style file"), StandardFileType.JSTYLE)
-                    .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-                    .build();
+                                                                                                   .addExtensionFilter(Localization.lang("Style file"), StandardFileType.JSTYLE)
+                                                                                                   .withDefaultExtension(Localization.lang("Style file"), StandardFileType.JSTYLE)
+                                                                                                   .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                                   .build();
 
             browse.addActionListener(e -> {
                 Optional<Path> file = DefaultTaskExecutor
-                        .runInJavaFXThread(() -> dialogService.showFileOpenDialog(fileDialogConfiguration));
+                                                         .runInJavaFXThread(() -> dialogService.showFileOpenDialog(fileDialogConfiguration));
                 file.ifPresent(f -> newFile.setText(f.toAbsolutePath().toString()));
             });
 
diff --git a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
index 5596f47920a..60e754ef6d8 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
@@ -23,6 +23,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.GUIGlobals;
 import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -104,7 +105,7 @@ public PreferencesDialog(JabRefFrame parent) {
         importSettingsTab = new ImportSettingsTab(prefs);
         nameFormatterTab = new NameFormatterTab(prefs);
         networkTab = new NetworkTab(dialogService,prefs);
-        previewPrefsTab = new PreviewPrefsTab(dialogService);
+        previewPrefsTab = new PreviewPrefsTab(dialogService, ExternalFileTypes.getInstance());
         tableColumnsTab = new TableColumnsTab(prefs,frame);
         tablePrefsTab = new TablePrefsTab(prefs);
         xmpPrefsTab = new XmpPrefsTab(prefs);
diff --git a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java b/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
index b639c4a952f..89d310c8ebd 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
@@ -27,6 +27,7 @@
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.PreviewPanel;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.citationstyle.CitationStyle;
 import org.jabref.logic.l10n.Localization;
@@ -59,9 +60,11 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab {
     private final Button btnDefault = new Button(Localization.lang("Default"));
     private final ScrollPane scrollPane = new ScrollPane(layout);
     private final DialogService dialogService;
+    private final ExternalFileTypes externalFileTypes;
 
-    public PreviewPrefsTab(DialogService dialogService) {
+    public PreviewPrefsTab(DialogService dialogService, ExternalFileTypes externalFileTypes) {
         this.dialogService = dialogService;
+        this.externalFileTypes = externalFileTypes;
         setupLogic();
         setupGui();
     }
@@ -125,7 +128,7 @@ private void setupLogic() {
         btnTest.setOnAction(event -> {
             try {
                 DefaultTaskExecutor.runInJavaFXThread(() -> {
-                    PreviewPanel testPane = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService);
+                    PreviewPanel testPane = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService, externalFileTypes);
                     if (chosen.getSelectionModel().getSelectedItems().isEmpty()) {
                         testPane.setFixedLayout(layout.getText());
                         testPane.setEntry(TestEntry.getTestEntry());
@@ -135,7 +138,7 @@ private void setupLogic() {
                         PreviewPreferences preferences = Globals.prefs.getPreviewPreferences();
                         preferences = new PreviewPreferences(preferences.getPreviewCycle(),indexStyle,preferences.getPreviewPanelDividerPosition(),preferences.isPreviewPanelEnabled(), preferences.getPreviewStyle(),preferences.getPreviewStyleDefault());
 
-                        testPane = new PreviewPanel(JabRefGUI.getMainFrame().getCurrentBasePanel(), new BibDatabaseContext(), Globals.getKeyPrefs(), preferences, dialogService);
+                        testPane = new PreviewPanel(JabRefGUI.getMainFrame().getCurrentBasePanel(), new BibDatabaseContext(), Globals.getKeyPrefs(), preferences, dialogService, externalFileTypes);
                         testPane.setEntry(TestEntry.getTestEntry());
                         testPane.updateLayout(preferences);
                     }
diff --git a/src/main/java/org/jabref/gui/search/SearchResultFrame.java b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
index 5be6cc368aa..9977866efad 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultFrame.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
@@ -43,6 +43,7 @@
 import org.jabref.gui.customjfx.CustomJFXPanel;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileMenuItem;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.filelist.FileListEntry;
 import org.jabref.gui.filelist.FileListTableModel;
 import org.jabref.gui.icon.IconTheme;
@@ -81,9 +82,7 @@
  */
 public class SearchResultFrame {
 
-    private static final String[] FIELDS = new String[] {
-            FieldName.AUTHOR, FieldName.TITLE, FieldName.YEAR, FieldName.JOURNAL
-    };
+    private static final String[] FIELDS = new String[] {FieldName.AUTHOR, FieldName.TITLE, FieldName.YEAR, FieldName.JOURNAL};
     private static final int DATABASE_COL = 0;
     private static final int FILE_COL = 1;
     private static final int URL_COL = 2;
@@ -110,7 +109,6 @@ public class SearchResultFrame {
     private final SearchQuery searchQuery;
     private final boolean globalSearch;
 
-
     public SearchResultFrame(JabRefFrame frame, String title, SearchQuery searchQuery, boolean globalSearch) {
         this.frame = Objects.requireNonNull(frame);
         this.searchQuery = searchQuery;
@@ -124,25 +122,24 @@ private void init(String title) {
         searchResultFrame.setTitle(title);
         searchResultFrame.setIconImages(IconTheme.getLogoSet());
 
-        preview = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), frame.getDialogService());
+        preview = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), frame.getDialogService(), ExternalFileTypes.getInstance());
 
         sortedEntries = new SortedList<>(entries, new EntryComparator(false, true, FieldName.AUTHOR));
         model = (DefaultEventTableModel<BibEntry>) GlazedListsSwing.eventTableModelWithThreadProxyList(sortedEntries,
-                new EntryTableFormat());
+                                                                                                       new EntryTableFormat());
         entryTable = new JTable(model);
 
         GeneralRenderer renderer = new GeneralRenderer(Color.white);
         entryTable.setDefaultRenderer(JLabel.class, renderer);
         entryTable.setDefaultRenderer(String.class, renderer);
         setWidths();
-        TableComparatorChooser<BibEntry> tableSorter =
-                TableComparatorChooser.install(entryTable, sortedEntries,
-                        AbstractTableComparatorChooser.MULTIPLE_COLUMN_KEYBOARD);
+        TableComparatorChooser<BibEntry> tableSorter = TableComparatorChooser.install(entryTable, sortedEntries,
+                                                                                      AbstractTableComparatorChooser.MULTIPLE_COLUMN_KEYBOARD);
         setupComparatorChooser(tableSorter);
         JScrollPane sp = new JScrollPane(entryTable);
 
         final DefaultEventSelectionModel<BibEntry> selectionModel = (DefaultEventSelectionModel<BibEntry>) GlazedListsSwing
-                .eventSelectionModelWithThreadProxyList(sortedEntries);
+                                                                                                                           .eventSelectionModelWithThreadProxyList(sortedEntries);
         entryTable.setSelectionModel(selectionModel);
         selectionModel.getSelected().addListEventListener(new EntrySelectionListener());
         entryTable.addMouseListener(new TableClickListener());
@@ -154,6 +151,7 @@ private void init(String title) {
 
         // Key bindings:
         AbstractAction closeAction = new AbstractAction() {
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 dispose();
@@ -170,24 +168,28 @@ public void actionPerformed(ActionEvent e) {
         inputMap = entryTable.getInputMap();
         //Override 'selectNextColumnCell' and 'selectPreviousColumnCell' to move rows instead of cells on TAB
         actionMap.put("selectNextColumnCell", new AbstractAction() {
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 selectNextEntry();
             }
         });
         actionMap.put("selectPreviousColumnCell", new AbstractAction() {
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 selectPreviousEntry();
             }
         });
         actionMap.put("selectNextRow", new AbstractAction() {
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 selectNextEntry();
             }
         });
         actionMap.put("selectPreviousRow", new AbstractAction() {
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 selectPreviousEntry();
@@ -197,6 +199,7 @@ public void actionPerformed(ActionEvent e) {
         String selectFirst = "selectFirst";
         inputMap.put(Globals.getKeyPrefs().getKey(KeyBinding.SELECT_FIRST_ENTRY), selectFirst);
         actionMap.put(selectFirst, new AbstractAction() {
+
             @Override
             public void actionPerformed(ActionEvent event) {
                 selectFirstEntry();
@@ -206,6 +209,7 @@ public void actionPerformed(ActionEvent event) {
         String selectLast = "selectLast";
         inputMap.put(Globals.getKeyPrefs().getKey(KeyBinding.SELECT_LAST_ENTRY), selectLast);
         actionMap.put(selectLast, new AbstractAction() {
+
             @Override
             public void actionPerformed(ActionEvent event) {
                 selectLastEntry();
@@ -213,6 +217,7 @@ public void actionPerformed(ActionEvent event) {
         });
 
         actionMap.put("copy", new AbstractAction() {
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 if (!selectionModel.getSelected().isEmpty()) {
@@ -232,6 +237,7 @@ public void actionPerformed(ActionEvent e) {
         // override standard enter-action; enter opens the selected entry
         entryTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "Enter");
         actionMap.put("Enter", new AbstractAction() {
+
             @Override
             public void actionPerformed(ActionEvent ae) {
                 BibEntry entry = sortedEntries.get(entryTable.getSelectedRow());
@@ -240,6 +246,7 @@ public void actionPerformed(ActionEvent ae) {
         });
 
         searchResultFrame.addWindowListener(new WindowAdapter() {
+
             @Override
             public void windowOpened(WindowEvent e) {
                 contentPane.setDividerLocation(0.5f);
@@ -259,6 +266,7 @@ public void windowClosing(WindowEvent event) {
         searchResultFrame.setLocation(searchPreferences.getSearchDialogPosX(), searchPreferences.getSearchDialogPosY());
 
         searchResultFrame.addComponentListener(new ComponentAdapter() {
+
             @Override
             public void componentResized(ComponentEvent e) {
                 new SearchPreferences(Globals.prefs)
@@ -269,8 +277,8 @@ public void componentResized(ComponentEvent e) {
             @Override
             public void componentMoved(ComponentEvent e) {
                 new SearchPreferences(Globals.prefs)
-                        .setSearchDialogPosX(searchResultFrame.getLocation().x)
-                        .setSearchDialogPosY(searchResultFrame.getLocation().y);
+                                                    .setSearchDialogPosX(searchResultFrame.getLocation().x)
+                                                    .setSearchDialogPosY(searchResultFrame.getLocation().y);
             }
         });
     }
@@ -518,7 +526,7 @@ public void processPopupTrigger(MouseEvent e) {
                         description = flEntry.getLink();
                     }
                     menu.add(new ExternalFileMenuItem(p.frame(), description, flEntry.getLink(),
-                            flEntry.getType().get().getIcon().getSmallIcon(), p.getBibDatabaseContext(), flEntry.getType()));
+                                                      flEntry.getType().get().getIcon().getSmallIcon(), p.getBibDatabaseContext(), flEntry.getType()));
                     count++;
                 }
 
@@ -579,37 +587,36 @@ public String getColumnName(int column) {
         public Object getColumnValue(BibEntry entry, int column) {
             if (column < PAD) {
                 switch (column) {
-                case DATABASE_COL:
-                    return entryHome.get(entry).getTabTitle();
-                case FILE_COL:
-                    if (entry.hasField(FieldName.FILE)) {
-                        FileListTableModel tmpModel = new FileListTableModel();
-                        entry.getField(FieldName.FILE).ifPresent(tmpModel::setContent);
-                        fileLabel.setToolTipText(tmpModel.getToolTipHTMLRepresentation());
-                        if (tmpModel.getRowCount() > 0) {
-                            if (tmpModel.getEntry(0).getType().isPresent()) {
-                                fileLabel.setIcon(tmpModel.getEntry(0).getType().get().getIcon().getSmallIcon());
-                            } else {
-                                fileLabel.setIcon(IconTheme.JabRefIcons.FILE.getSmallIcon());
+                    case DATABASE_COL:
+                        return entryHome.get(entry).getTabTitle();
+                    case FILE_COL:
+                        if (entry.hasField(FieldName.FILE)) {
+                            FileListTableModel tmpModel = new FileListTableModel();
+                            entry.getField(FieldName.FILE).ifPresent(tmpModel::setContent);
+                            fileLabel.setToolTipText(tmpModel.getToolTipHTMLRepresentation());
+                            if (tmpModel.getRowCount() > 0) {
+                                if (tmpModel.getEntry(0).getType().isPresent()) {
+                                    fileLabel.setIcon(tmpModel.getEntry(0).getType().get().getIcon().getSmallIcon());
+                                } else {
+                                    fileLabel.setIcon(IconTheme.JabRefIcons.FILE.getSmallIcon());
+                                }
                             }
+                            return fileLabel;
+                        } else {
+                            return null;
+                        }
+                    case URL_COL: {
+                        Optional<String> urlField = entry.getField(FieldName.URL);
+                        if (urlField.isPresent()) {
+                            urlLabel.setToolTipText(urlField.get());
+                            return urlLabel;
                         }
-                        return fileLabel;
-                    } else {
                         return null;
                     }
-                case URL_COL: {
-                    Optional<String> urlField = entry.getField(FieldName.URL);
-                    if (urlField.isPresent()) {
-                        urlLabel.setToolTipText(urlField.get());
-                        return urlLabel;
-                    }
-                    return null;
-                }
-                default:
-                    return null;
+                    default:
+                        return null;
                 }
-            }
-            else {
+            } else {
                 String field = FIELDS[column - PAD];
                 String fieldContent = entry.getLatexFreeField(field).orElse("");
 
diff --git a/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java b/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
new file mode 100644
index 00000000000..d8af9e34948
--- /dev/null
+++ b/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
@@ -0,0 +1,66 @@
+package org.jabref.gui.util;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jabref.gui.DragAndDropDataFormats;
+import org.jabref.gui.GUIGlobals;
+import org.jabref.model.entry.BibEntry;
+
+/**
+ * Placeholder class for a custom generic type safe dragboard to be used in drag and drop, does not depend on serialization
+ * Don't use this class directly. Use the instance provided in {@link GUIGlobals#localDragboard}
+ */
+public class CustomLocalDragboard {
+
+    private final Map<Class<?>, Object> contents = new HashMap<>();
+
+    /**
+     * Puts the value of the concrete class in a map. All previous content stored in the map is removed
+     * @param type The Type of the class
+     * @param value The value to store
+     */
+    public <T> void putValue(Class<T> type, T value) {
+        clearAll();
+        contents.put(type, type.cast(value));
+    }
+
+    public <T> T getValue(Class<T> type) {
+        return type.cast(contents.get(type));
+    }
+
+    public boolean hasType(Class<?> type) {
+        return contents.keySet().contains(type);
+    }
+
+    public void clear(Class<?> type) {
+        contents.remove(type);
+    }
+
+    public void clearAll() {
+        contents.clear();
+    }
+
+    /**
+     * Puts A List of {@link BibEntry} in the map
+     * All previous content is cleared
+     * @param entries The list to put
+     */
+    public void putBibEntries(List<BibEntry> entries) {
+        putValue(DragAndDropDataFormats.BIBENTRY_LIST_CLASS, entries);
+    }
+
+    /**
+     * Get a List of {@link BibEntry} from the dragboard
+     * @return List of BibEntry or empty list if no entries are avaiable
+     */
+    public List<BibEntry> getBibEntries() {
+        if (hasType(DragAndDropDataFormats.BIBENTRY_LIST_CLASS)) {
+            return getValue(DragAndDropDataFormats.BIBENTRY_LIST_CLASS);
+        }
+        return Collections.emptyList();
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
index 1c7e651182b..737a16a0157 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.model.FieldChange;
 import org.jabref.model.cleanup.CleanupJob;
 import org.jabref.model.database.BibDatabaseContext;
@@ -16,7 +15,6 @@ public class CleanupWorker {
     private final BibDatabaseContext databaseContext;
     private final String fileNamePattern;
     private final String fileDirPattern;
-    private final LayoutFormatterPreferences layoutPrefs;
     private final FileDirectoryPreferences fileDirectoryPreferences;
     private int unsuccessfulRenames;
 
@@ -25,7 +23,6 @@ public CleanupWorker(BibDatabaseContext databaseContext, CleanupPreferences clea
         this.databaseContext = databaseContext;
         this.fileNamePattern = cleanupPreferences.getFileNamePattern();
         this.fileDirPattern = cleanupPreferences.getFileDirPattern();
-        this.layoutPrefs = cleanupPreferences.getLayoutFormatterPreferences();
         this.fileDirectoryPreferences = cleanupPreferences.getFileDirectoryPreferences();
     }
 
diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
index b919576a0dd..463dd0aba53 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
@@ -71,7 +71,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
             fileList = Arrays.asList(singleFileFieldCleanup);
             //Add all other except the current selected file
             newFileList = entry.getFiles().stream().filter(name -> !name.equals(singleFileFieldCleanup))
-                    .collect(Collectors.toList());
+                               .collect(Collectors.toList());
         } else {
             newFileList = new ArrayList<>();
             fileList = entry.getFiles();
@@ -113,7 +113,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 LinkedFile newFileEntry = fileEntry;
                 if (!oldFileName.equals(newTargetFile.toString())) {
                     newFileEntry = new LinkedFile(fileEntry.getDescription(), newEntryFilePath,
-                            fileEntry.getFileType());
+                                                  fileEntry.getFileType());
                     changed = true;
                 }
                 newFileList.add(newFileEntry);
diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
index e5bf8e77802..12061c6600b 100644
--- a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
@@ -68,7 +68,7 @@ public List<FieldChange> cleanupWithException(BibEntry entry) throws IOException
             oldFileList = Collections.singletonList(singleFieldCleanup);
 
             newFileList = entry.getFiles().stream().filter(x -> !x.equals(singleFieldCleanup))
-                    .collect(Collectors.toList());
+                               .collect(Collectors.toList());
         } else {
             newFileList = new ArrayList<>();
             oldFileList = entry.getFiles();
@@ -101,7 +101,7 @@ public List<FieldChange> cleanupWithException(BibEntry entry) throws IOException
 
             String expandedOldFilePath = expandedOldFile.get().toString();
             boolean pathsDifferOnlyByCase = newPath.toString().equalsIgnoreCase(expandedOldFilePath)
-                    && !newPath.toString().equals(expandedOldFilePath);
+                && !newPath.toString().equals(expandedOldFilePath);
 
             if (Files.exists(newPath) && !pathsDifferOnlyByCase) {
                 // we do not overwrite files
@@ -154,10 +154,9 @@ public List<FieldChange> cleanupWithException(BibEntry entry) throws IOException
     public String getTargetFileName(LinkedFile flEntry, BibEntry entry) {
         String realOldFilename = flEntry.getLink();
 
-        String targetFileName = FileUtil.createFileNameFromPattern(
-                databaseContext.getDatabase(), entry, fileNamePattern).trim()
-                + '.'
-                + FileHelper.getFileExtension(realOldFilename).orElse("pdf");
+        String targetFileName = FileUtil.createFileNameFromPattern(databaseContext.getDatabase(), entry, fileNamePattern).trim()
+            + '.'
+            + FileHelper.getFileExtension(realOldFilename).orElse("pdf");
 
         // Only create valid file names
         return FileUtil.getValidFileName(targetFileName);
@@ -176,16 +175,15 @@ public int getUnsuccessfulRenames() {
     public Optional<Path> findExistingFile(LinkedFile flEntry, BibEntry entry) {
         String targetFileName = getTargetFileName(flEntry, entry);
         // The .get() is legal without check because the method will always return a value.
-        Path targetFilePath = flEntry.findIn(databaseContext,
-                fileDirectoryPreferences).get().getParent().resolve(targetFileName);
+        Path targetFilePath = flEntry.findIn(databaseContext, fileDirectoryPreferences)
+                                     .get().getParent().resolve(targetFileName);
         Path oldFilePath = flEntry.findIn(databaseContext, fileDirectoryPreferences).get();
         //Check if file already exists in directory with different case.
         //This is necessary because other entries may have such a file.
         Optional<Path> matchedByDiffCase = Optional.empty();
         try (Stream<Path> stream = Files.list(oldFilePath.getParent())) {
-            matchedByDiffCase = stream
-                    .filter(name -> name.toString().equalsIgnoreCase(targetFilePath.toString()))
-                    .findFirst();
+            matchedByDiffCase = stream.filter(name -> name.toString().equalsIgnoreCase(targetFilePath.toString()))
+                                      .findFirst();
         } catch (IOException e) {
             LOGGER.error("Could not get the list of files in target directory", e);
         }
diff --git a/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
new file mode 100644
index 00000000000..bdfe5970639
--- /dev/null
+++ b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
@@ -0,0 +1,40 @@
+package org.jabref.logic.externalfiles;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.OpenDatabase;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.fileformat.PdfContentImporter;
+import org.jabref.logic.xmp.XmpUtilReader;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.util.FileUpdateMonitor;
+
+public class ExternalFilesContentImporter {
+
+    private final PdfContentImporter pdfImporter;
+    private final ImportFormatPreferences importFormatPreferences;
+
+    public ExternalFilesContentImporter(ImportFormatPreferences importFormatPreferences) {
+        pdfImporter = new PdfContentImporter(importFormatPreferences);
+        this.importFormatPreferences = importFormatPreferences;
+    }
+
+    public List<BibEntry> importPDFContent(Path file) {
+        return pdfImporter.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+
+    }
+
+    public List<BibEntry> importXMPContent(Path file) throws IOException {
+        return XmpUtilReader.readXmp(file, importFormatPreferences.getXmpPreferences());
+
+    }
+
+    public List<BibEntry> importFromBibFile(Path bibFile, FileUpdateMonitor fileUpdateMonitor) {
+        ParserResult parserResult = OpenDatabase.loadDatabase(bibFile.toString(), importFormatPreferences, fileUpdateMonitor);
+        return parserResult.getDatabaseContext().getEntries();
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
index 5f155356ad4..2bb90b382fc 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
@@ -6,6 +6,7 @@
 import org.jabref.logic.bibtex.FieldContentParserPreferences;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
 import org.jabref.logic.importer.fileformat.CustomImporter;
+import org.jabref.logic.xmp.XmpPreferences;
 
 public class ImportFormatPreferences {
 
@@ -14,16 +15,18 @@ public class ImportFormatPreferences {
     private final Character keywordSeparator;
     private final BibtexKeyPatternPreferences bibtexKeyPatternPreferences;
     private final FieldContentParserPreferences fieldContentParserPreferences;
+    private final XmpPreferences xmpPreferences;
     private final boolean keywordSyncEnabled;
 
     public ImportFormatPreferences(Set<CustomImporter> customImportList, Charset encoding, Character keywordSeparator,
             BibtexKeyPatternPreferences bibtexKeyPatternPreferences,
-            FieldContentParserPreferences fieldContentParserPreferences, boolean keywordSyncEnabled) {
+                                   FieldContentParserPreferences fieldContentParserPreferences, XmpPreferences xmpPreferences, boolean keywordSyncEnabled) {
         this.customImportList = customImportList;
         this.encoding = encoding;
         this.keywordSeparator = keywordSeparator;
         this.bibtexKeyPatternPreferences = bibtexKeyPatternPreferences;
         this.fieldContentParserPreferences = fieldContentParserPreferences;
+        this.xmpPreferences = xmpPreferences;
         this.keywordSyncEnabled = keywordSyncEnabled;
     }
 
@@ -53,7 +56,7 @@ public FieldContentParserPreferences getFieldContentParserPreferences() {
 
     public ImportFormatPreferences withEncoding(Charset newEncoding) {
         return new ImportFormatPreferences(customImportList, newEncoding, keywordSeparator, bibtexKeyPatternPreferences,
-                fieldContentParserPreferences, keywordSyncEnabled);
+                                           fieldContentParserPreferences, xmpPreferences, keywordSyncEnabled);
     }
 
     /**
@@ -63,4 +66,8 @@ public ImportFormatPreferences withEncoding(Charset newEncoding) {
     public boolean isKeywordSyncEnabled() {
         return keywordSyncEnabled;
     }
+
+    public XmpPreferences getXmpPreferences() {
+        return xmpPreferences;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/importer/OpenDatabase.java b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
index f8c04f8d870..ed777ef8211 100644
--- a/src/main/java/org/jabref/logic/importer/OpenDatabase.java
+++ b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
@@ -46,7 +46,7 @@ public static ParserResult loadDatabase(String name, ImportFormatPreferences imp
         try {
             if (!FileBasedLock.waitForFileLock(file.toPath())) {
                 LOGGER.error(Localization.lang("Error opening file") + " '" + name + "'. "
-                        + "File is locked by another JabRef instance.");
+                             + "File is locked by another JabRef instance.");
                 return new ParserResult();
             }
 
@@ -70,7 +70,7 @@ public static ParserResult loadDatabase(String name, ImportFormatPreferences imp
      * Opens a new database.
      */
     public static ParserResult loadDatabase(File fileToOpen, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor)
-            throws IOException {
+        throws IOException {
         ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(fileToOpen.toPath(),
                 importFormatPreferences.getEncoding());
 
diff --git a/src/main/java/org/jabref/logic/importer/ParserResult.java b/src/main/java/org/jabref/logic/importer/ParserResult.java
index a19b5020a2d..998a710d3d5 100644
--- a/src/main/java/org/jabref/logic/importer/ParserResult.java
+++ b/src/main/java/org/jabref/logic/importer/ParserResult.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.importer;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -24,7 +25,7 @@ public class ParserResult {
     private final List<String> duplicateKeys = new ArrayList<>();
     private BibDatabase database;
     private MetaData metaData = new MetaData();
-    private File file;
+    private Path file;
     private boolean invalid;
     private boolean toOpenTab;
     private boolean changedOnMigration = false;
@@ -94,11 +95,11 @@ public Map<String, EntryType> getEntryTypes() {
     }
 
     public Optional<File> getFile() {
-        return Optional.ofNullable(file);
+        return Optional.ofNullable(file).map(Path::toFile);
     }
 
     public void setFile(File f) {
-        file = f;
+        file = f.toPath();
     }
 
     /**
@@ -167,14 +168,14 @@ public String getErrorMessage() {
     }
 
     public BibDatabaseContext getDatabaseContext() {
-        return new BibDatabaseContext(database, metaData, file);
+        return new BibDatabaseContext(database, metaData, file.toFile());
     }
 
     public void setDatabaseContext(BibDatabaseContext bibDatabaseContext) {
         Objects.requireNonNull(bibDatabaseContext);
         database = bibDatabaseContext.getDatabase();
         metaData = bibDatabaseContext.getMetaData();
-        file = bibDatabaseContext.getDatabaseFile().orElse(null);
+        file = bibDatabaseContext.getDatabasePath().orElse(null);
     }
 
     public boolean isEmpty() {
diff --git a/src/main/java/org/jabref/logic/util/io/FileUtil.java b/src/main/java/org/jabref/logic/util/io/FileUtil.java
index db2c860f1c7..8a759739528 100644
--- a/src/main/java/org/jabref/logic/util/io/FileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/FileUtil.java
@@ -52,13 +52,14 @@ public static Optional<String> getFileExtension(String fileName) {
         }
     }
 
+
     /**
      * Returns the extension of a file or Optional.empty() if the file does not have one (no . in name).
      *
      * @return The extension, trimmed and in lowercase.
      */
-    public static Optional<String> getFileExtension(File file) {
-        return getFileExtension(file.getName());
+    public static Optional<String> getFileExtension(Path file) {
+        return getFileExtension(file.getFileName().toString());
     }
 
     /**
@@ -155,7 +156,7 @@ public static boolean copyFile(Path pathToSourceFile, Path pathToDestinationFile
             return false;
         }
         if (Files.exists(pathToDestinationFile) && !replaceExisting) {
-            LOGGER.error("Path to the destination file is not exists and the file shouldn't be replace.");
+            LOGGER.error("Path to the destination file exists but the file shouldn't be replaced.");
             return false;
         }
         try {
@@ -329,4 +330,14 @@ public static String toPortableString(Path path) {
         return path.toString()
                    .replace('\\', '/');
     }
+
+    /**
+     * Test if the file is a bib file by simply checking the extension to be ".bib"
+     * @param file The file to check
+     * @return True if file extension is ".bib", false otherwise
+     */
+    public static boolean isBibFile(Path file)
+    {
+        return getFileExtension(file).filter(type -> "bib".equals(type)).isPresent();
+    }
 }
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java b/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
index 29d17ba9f88..0eb04675789 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
@@ -26,6 +26,8 @@ public class XmpUtilReader {
     private static final String END_TAG = "</rdf:Description>";
 
     private XmpUtilReader() {
+        //See: https://pdfbox.apache.org/2.0/getting-started.html
+        System.setProperty("sun.java2d.cmm", "sun.java2d.cmm.kcms.KcmsServiceProvider"); //To get higher rendering speed on java 8 oder 9 for images
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index e2a02520e14..370b3d655df 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -59,12 +59,13 @@ public class BibEntry implements Cloneable {
     private final Map<String, String> latexFreeFields = new ConcurrentHashMap<>();
     private final EventBus eventBus = new EventBus();
     private String id;
-    private StringProperty type = new SimpleStringProperty();
+    private final StringProperty type = new SimpleStringProperty();
+
     private ObservableMap<String, String> fields = FXCollections.observableMap(new ConcurrentHashMap<>());
     // Search and grouping status is stored in boolean fields for quick reference:
     private boolean searchHit;
     private boolean groupHit;
-    private String parsedSerialization;
+    private String parsedSerialization = "";
     private String commentsBeforeEntry = "";
     /**
      * Marks whether the complete serialization, which was read from file, should be used.
@@ -78,6 +79,7 @@ public class BibEntry implements Cloneable {
      */
     public BibEntry() {
         this(IdGenerator.next(), DEFAULT_TYPE);
+
     }
 
     /**
@@ -582,7 +584,7 @@ public void setGroupHit(boolean groupHit) {
      */
     public String getAuthorTitleYear(int maxCharacters) {
         String[] s = new String[] {getField(FieldName.AUTHOR).orElse("N/A"), getField(FieldName.TITLE).orElse("N/A"),
-                getField(FieldName.YEAR).orElse("N/A")};
+            getField(FieldName.YEAR).orElse("N/A")};
 
         String text = s[0] + ": \"" + s[1] + "\" (" + s[2] + ')';
         if ((maxCharacters <= 0) || (text.length() <= maxCharacters)) {
@@ -702,7 +704,7 @@ public Optional<FieldChange> removeKeywords(KeywordList keywordsToRemove, Charac
     }
 
     public Optional<FieldChange> replaceKeywords(KeywordList keywordsToReplace, Keyword newValue,
-                                                 Character keywordDelimiter) {
+            Character keywordDelimiter) {
         KeywordList keywordList = getKeywords(keywordDelimiter);
         keywordList.replaceAll(keywordsToReplace, newValue);
 
@@ -876,10 +878,11 @@ public ObservableMap<String, String> getFieldsObservable() {
      * Returns a list of observables that represent the data of the entry.
      */
     public Observable[] getObservables() {
-        return new Observable[]{fields};
+        return new Observable[] {fields};
     }
 
     private interface GetFieldInterface {
         Optional<String> getValueForField(String fieldName);
     }
+
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index a6b4b65d800..69a11d02469 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -1413,8 +1413,8 @@ public boolean isKeywordSyncEnabled() {
 
     public ImportFormatPreferences getImportFormatPreferences() {
         return new ImportFormatPreferences(customImports, getDefaultEncoding(), getKeywordDelimiter(),
-                                           getBibtexKeyPatternPreferences(), getFieldContentParserPreferences(),
-                                           isKeywordSyncEnabled());
+                                           getBibtexKeyPatternPreferences(), getFieldContentParserPreferences(), getXMPPreferences(),
+               				   isKeywordSyncEnabled());
     }
 
     public SavePreferences loadForExportFromPreferences() {
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 6c7e4ca7907..0b3bfa33c0a 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1735,8 +1735,6 @@ Ill-formed\ entrytype\ comment\ in\ BIB\ file=Ill-formed entrytype comment in BI
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=Move linked files to default file directory %0
 
-Clipboard=Clipboard
-Could\ not\ paste\ entry\ as\ text\:=Could not paste entry as text:
 Do\ you\ still\ want\ to\ continue?=Do you still want to continue?
 This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=This action will modify the following field(s) in at least one entry each:
 This\ could\ cause\ undesired\ changes\ to\ your\ entries.=This could cause undesired changes to your entries.
@@ -2240,5 +2238,8 @@ View\ change\ log=View change log
 View\ event\ log=View event log
 Website=Website
 Write\ XMP-metadata\ to\ PDFs=Write XMP-metadata to PDFs
+Do\ you\ want\ to\ import\ these\ as\ new\ entries\ into\ the\ current\ library\ or\ do\ you\ want\ to\ link\ the\ file\ to\ the\ entry?=Do you want to import these as new entries into the current library or do you want to link the file to the entry?
+
 Font\ size\:=Font size\:
 Override\ default\ font\ settings=Override default font settings
+Clear\ search=Clear search
\ No newline at end of file
diff --git a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
index 4ed4d465885..05941f3a4ab 100644
--- a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
@@ -7,6 +7,7 @@
 
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
+import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -157,7 +158,7 @@ public void entriesAreAddedCorrectly() {
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupNodeViewModel model = new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group);
+        GroupNodeViewModel model = new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard());
         model.addEntriesToGroup(databaseContext.getEntries());
 
         assertEquals(databaseContext.getEntries(), model.getGroupNode().getEntriesInGroup(databaseContext.getEntries()));
@@ -165,10 +166,10 @@ public void entriesAreAddedCorrectly() {
     }
 
     private GroupNodeViewModel getViewModelForGroup(AbstractGroup group) {
-        return new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group);
+        return new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard());
     }
 
     private GroupNodeViewModel getViewModelForGroup(GroupTreeNode group) {
-        return new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group);
+        return new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard());
     }
 }
diff --git a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
index 4a594140bd6..afa4ad53eba 100644
--- a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
@@ -5,6 +5,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
+import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -32,13 +33,13 @@ public void setUp() throws Exception {
         stateManager = new StateManager();
         stateManager.activeDatabaseProperty().setValue(Optional.of(databaseContext));
         taskExecutor = new CurrentThreadTaskExecutor();
-        groupTree = new GroupTreeViewModel(stateManager, mock(DialogService.class), taskExecutor);
+        groupTree = new GroupTreeViewModel(stateManager, mock(DialogService.class), taskExecutor, new CustomLocalDragboard());
     }
 
     @Test
     public void rootGroupIsAllEntriesByDefault() throws Exception {
         AllEntriesGroup allEntriesGroup = new AllEntriesGroup("All entries");
-        assertEquals(new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, allEntriesGroup), groupTree.rootGroupProperty().getValue());
+        assertEquals(new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, allEntriesGroup, new CustomLocalDragboard()), groupTree.rootGroupProperty().getValue());
     }
 
     @Test
@@ -47,7 +48,7 @@ public void explicitGroupsAreRemovedFromEntriesOnDelete() {
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupNodeViewModel model = new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group);
+        GroupNodeViewModel model = new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard());
         model.addEntriesToGroup(databaseContext.getEntries());
         groupTree.removeGroupsAndSubGroupsFromEntries(model);
 
@@ -61,7 +62,7 @@ public void keywordGroupsAreNotRemovedFromEntriesOnDelete() {
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupNodeViewModel model = new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group);
+        GroupNodeViewModel model = new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard());
         model.addEntriesToGroup(databaseContext.getEntries());
         groupTree.removeGroupsAndSubGroupsFromEntries(model);
 
diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index 28c764a024f..7073e65415e 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -14,7 +13,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileHelper;
 
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -364,4 +362,17 @@ void testGetLinkedDirNameDefaultFullTitle() {
         assertEquals("PDF/1998/Åuthör/1234 - mytitle",
                 FileUtil.createDirNameFromPattern(null, entry, fileNamePattern));
     }
+    @Test
+    public void testIsBibFile() throws IOException
+    {
+        Path bibFile = Files.createFile(rootDir.resolve("test.bib"));
+
+        assertTrue(FileUtil.isBibFile(bibFile));
+    }
+
+    @Test
+    public void testIsNotBibFile() throws IOException {
+        Path bibFile = Files.createFile(rootDir.resolve("test.pdf"));
+        assertFalse(FileUtil.isBibFile(bibFile));
+    }
 }
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTest.java b/src/test/java/org/jabref/model/entry/BibEntryTest.java
index 6e62eff5c77..886439451a0 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTest.java
@@ -132,4 +132,5 @@ public void testGetResolvedKeywords() {
         assertEquals(new KeywordList(new Keyword("kw"), new Keyword("kw2"), new Keyword("kw3")), actual);
     }
 
+
 }

From 11a17befe7be1297ba943875fddbe29a3e8e2ebd Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sun, 19 Aug 2018 22:44:18 +0200
Subject: [PATCH 046/229] Move preferences stuff to gui.preferences

---
 .../jabref/gui/actions/ShowPreferencesAction.java   | 13 +++----------
 .../gui/bibtexkeypattern/BibtexKeyPatternPanel.java |  2 +-
 .../gui/{preftabs => preferences}/AdvancedTab.java  |  2 +-
 .../AppearancePrefsTab.java                         |  2 +-
 .../BibtexKeyPatternPrefTab.java                    |  2 +-
 .../EntryEditorPrefsTab.java                        |  2 +-
 .../ExportSortingPrefsTab.java                      |  2 +-
 .../gui/{preftabs => preferences}/ExternalTab.java  |  2 +-
 .../gui/{preftabs => preferences}/FileTab.java      |  2 +-
 .../gui/{preftabs => preferences}/FontSize.java     |  2 +-
 .../gui/{preftabs => preferences}/GeneralTab.java   |  2 +-
 .../{preftabs => preferences}/GroupsPrefsTab.java   |  2 +-
 .../ImportSettingsTab.java                          |  2 +-
 .../{preftabs => preferences}/NameFormatterTab.java |  2 +-
 .../gui/{preftabs => preferences}/NetworkTab.java   |  2 +-
 .../PreferencesDialog.java                          |  2 +-
 .../PreferencesFilterDialog.java                    |  2 +-
 .../gui/{preftabs => preferences}/PrefsTab.java     |  2 +-
 .../{preftabs => preferences}/PreviewPrefsTab.java  |  2 +-
 .../{preftabs => preferences}/TableColumnsTab.java  |  2 +-
 .../{preftabs => preferences}/TablePrefsTab.java    |  2 +-
 .../gui/{preftabs => preferences}/XmpPrefsTab.java  |  2 +-
 .../org/jabref/preferences/JabRefPreferences.java   |  4 ++--
 23 files changed, 26 insertions(+), 33 deletions(-)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/AdvancedTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/AppearancePrefsTab.java (98%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/BibtexKeyPatternPrefTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/EntryEditorPrefsTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/ExportSortingPrefsTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/ExternalTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/FileTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/FontSize.java (87%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/GeneralTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/GroupsPrefsTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/ImportSettingsTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/NameFormatterTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/NetworkTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/PreferencesDialog.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/PreferencesFilterDialog.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/PrefsTab.java (97%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/PreviewPrefsTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/TableColumnsTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/TablePrefsTab.java (99%)
 rename src/main/java/org/jabref/gui/{preftabs => preferences}/XmpPrefsTab.java (99%)

diff --git a/src/main/java/org/jabref/gui/actions/ShowPreferencesAction.java b/src/main/java/org/jabref/gui/actions/ShowPreferencesAction.java
index 7e80756495f..7c13cbcc250 100644
--- a/src/main/java/org/jabref/gui/actions/ShowPreferencesAction.java
+++ b/src/main/java/org/jabref/gui/actions/ShowPreferencesAction.java
@@ -1,25 +1,18 @@
 package org.jabref.gui.actions;
 
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.preftabs.PreferencesDialog;
+import org.jabref.gui.preferences.PreferencesDialog;
 
 public class ShowPreferencesAction extends SimpleCommand {
 
-    private PreferencesDialog prefsDialog;
     private final JabRefFrame jabRefFrame;
-
     public ShowPreferencesAction(JabRefFrame jabRefFrame) {
         this.jabRefFrame = jabRefFrame;
     }
 
     @Override
     public void execute() {
-        if (prefsDialog == null) {
-            prefsDialog = new PreferencesDialog(jabRefFrame);
-        } else {
-            prefsDialog.setValues();
-        }
-
-        prefsDialog.showAndWait();
+        PreferencesDialog preferencesDialog = new PreferencesDialog(jabRefFrame);
+        preferencesDialog.showAndWait();
     }
 }
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
index 35ce60b3592..909b1dc7b3f 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
@@ -15,7 +15,7 @@
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.preftabs.FontSize;
+import org.jabref.gui.preferences.FontSize;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.EntryTypes;
diff --git a/src/main/java/org/jabref/gui/preftabs/AdvancedTab.java b/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/AdvancedTab.java
rename to src/main/java/org/jabref/gui/preferences/AdvancedTab.java
index b63ed0850b4..8288b5bda12 100644
--- a/src/main/java/org/jabref/gui/preftabs/AdvancedTab.java
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
similarity index 98%
rename from src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
rename to src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
index 6defa3209b9..c83db2c1ed2 100644
--- a/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import javafx.geometry.Insets;
 import javafx.scene.Node;
diff --git a/src/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java
rename to src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
index 194adda61b0..640d1be00b7 100644
--- a/src/main/java/org/jabref/gui/preftabs/BibtexKeyPatternPrefTab.java
+++ b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
diff --git a/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java
rename to src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
index 9d753245bde..0eee8e55e82 100644
--- a/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
diff --git a/src/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java
rename to src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index aab52671263..4d2a18545d0 100644
--- a/src/main/java/org/jabref/gui/preftabs/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
diff --git a/src/main/java/org/jabref/gui/preftabs/ExternalTab.java b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/ExternalTab.java
rename to src/main/java/org/jabref/gui/preferences/ExternalTab.java
index ffc193c0c05..3ece935234f 100644
--- a/src/main/java/org/jabref/gui/preftabs/ExternalTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.awt.BorderLayout;
 
diff --git a/src/main/java/org/jabref/gui/preftabs/FileTab.java b/src/main/java/org/jabref/gui/preferences/FileTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/FileTab.java
rename to src/main/java/org/jabref/gui/preferences/FileTab.java
index 0e1ede1e543..e59d1f4546a 100644
--- a/src/main/java/org/jabref/gui/preftabs/FileTab.java
+++ b/src/main/java/org/jabref/gui/preferences/FileTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/src/main/java/org/jabref/gui/preftabs/FontSize.java b/src/main/java/org/jabref/gui/preferences/FontSize.java
similarity index 87%
rename from src/main/java/org/jabref/gui/preftabs/FontSize.java
rename to src/main/java/org/jabref/gui/preferences/FontSize.java
index 3c6e45c5046..dc7797f8212 100644
--- a/src/main/java/org/jabref/gui/preftabs/FontSize.java
+++ b/src/main/java/org/jabref/gui/preferences/FontSize.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import javafx.scene.text.Font;
 
diff --git a/src/main/java/org/jabref/gui/preftabs/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/GeneralTab.java
rename to src/main/java/org/jabref/gui/preferences/GeneralTab.java
index f7d0653a616..c8d6a134de8 100644
--- a/src/main/java/org/jabref/gui/preftabs/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.nio.charset.Charset;
 import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java b/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java
rename to src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
index 38af586d31c..61666dac399 100644
--- a/src/main/java/org/jabref/gui/preftabs/GroupsPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
diff --git a/src/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java b/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java
rename to src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
index a47bf24ce17..aacc27f50b4 100644
--- a/src/main/java/org/jabref/gui/preftabs/ImportSettingsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.util.Objects;
 
diff --git a/src/main/java/org/jabref/gui/preftabs/NameFormatterTab.java b/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/NameFormatterTab.java
rename to src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
index 3a91d0ad879..65b355e19be 100644
--- a/src/main/java/org/jabref/gui/preftabs/NameFormatterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/jabref/gui/preftabs/NetworkTab.java b/src/main/java/org/jabref/gui/preferences/NetworkTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/NetworkTab.java
rename to src/main/java/org/jabref/gui/preferences/NetworkTab.java
index 860b8b2af37..89b18631052 100644
--- a/src/main/java/org/jabref/gui/preftabs/NetworkTab.java
+++ b/src/main/java/org/jabref/gui/preferences/NetworkTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
diff --git a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
rename to src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 60e754ef6d8..8e61504603b 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.awt.event.ActionEvent;
 import java.nio.file.Path;
diff --git a/src/main/java/org/jabref/gui/preftabs/PreferencesFilterDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/PreferencesFilterDialog.java
rename to src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
index fb3bbdc6b86..de09b2cb100 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreferencesFilterDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
diff --git a/src/main/java/org/jabref/gui/preftabs/PrefsTab.java b/src/main/java/org/jabref/gui/preferences/PrefsTab.java
similarity index 97%
rename from src/main/java/org/jabref/gui/preftabs/PrefsTab.java
rename to src/main/java/org/jabref/gui/preferences/PrefsTab.java
index 3a346a9a1bd..48c29278145 100644
--- a/src/main/java/org/jabref/gui/preftabs/PrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/PrefsTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 /**
  * A prefsTab is a component displayed in the PreferenceDialog.
diff --git a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java b/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
rename to src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java
index 89d310c8ebd..aeb13b1fc4b 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.util.ArrayList;
 import java.util.Comparator;
diff --git a/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java
rename to src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
index 8f0c1eec7c4..6697fb84f10 100644
--- a/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
diff --git a/src/main/java/org/jabref/gui/preftabs/TablePrefsTab.java b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/TablePrefsTab.java
rename to src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
index c563b75848d..ded73d21acc 100644
--- a/src/main/java/org/jabref/gui/preftabs/TablePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java b/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java
rename to src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
index 18c1aa56d86..3252175ec83 100644
--- a/src/main/java/org/jabref/gui/preftabs/XmpPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preftabs;
+package org.jabref.gui.preferences;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 69a11d02469..4baf9556d23 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -47,7 +47,7 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.maintable.ColumnPreferences;
 import org.jabref.gui.maintable.MainTablePreferences;
-import org.jabref.gui.preftabs.ImportSettingsTab;
+import org.jabref.gui.preferences.ImportSettingsTab;
 import org.jabref.logic.bibtex.FieldContentParserPreferences;
 import org.jabref.logic.bibtex.LatexFieldFormatterPreferences;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
@@ -246,7 +246,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String SUMATRA_PDF_COMMAND = "sumatraCommand";
     public static final String USE_PDF_READER = "usePDFReader";
     // Currently, it is not possible to specify defaults for specific entry types
-    // When this should be made possible, the code to inspect is org.jabref.gui.preftabs.BibtexKeyPatternPrefTab.storeSettings() -> LabelPattern keypatterns = getCiteKeyPattern(); etc
+    // When this should be made possible, the code to inspect is org.jabref.gui.preferences.BibtexKeyPatternPrefTab.storeSettings() -> LabelPattern keypatterns = getCiteKeyPattern(); etc
     public static final String DEFAULT_BIBTEX_KEY_PATTERN = "defaultBibtexKeyPattern";
     public static final String GRAY_OUT_NON_HITS = "grayOutNonHits";
     public static final String CONFIRM_DELETE = "confirmDelete";

From a3beda925b3c5b1592f3ae5a40f8e1c231b0f60a Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 20 Aug 2018 08:42:50 +0200
Subject: [PATCH 047/229] Rework preference dialog main class

---
 .../BibtexKeyPatternPanel.java                |  43 ++-
 .../jabref/gui/preferences/AdvancedTab.java   |   1 +
 .../gui/preferences/AppearancePrefsTab.java   |   2 +-
 .../gui/preferences/PreferencesDialog.java    | 296 ++++++------------
 .../org/jabref/gui/preferences/PrefsTab.java  |   4 +
 .../gui/preferences/PreviewPrefsTab.java      |   2 +-
 .../gui/util/ViewModelListCellFactory.java    |   4 +
 .../jabref/preferences/JabRefPreferences.java |  22 +-
 8 files changed, 148 insertions(+), 226 deletions(-)

diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
index 909b1dc7b3f..fd1ef4fa0ee 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
@@ -38,7 +38,6 @@ public class BibtexKeyPatternPanel extends Pane {
 
     // one field for each type
     private final Map<String, TextField> textFields = new HashMap<>();
-    private final TextField[] textFieldArray = new TextField[19];
     private final BasePanel panel;
     private final GridPane gridPane = new GridPane();
 
@@ -78,11 +77,6 @@ private void buildGUI() {
         }
 
         addExtraText(mode);
-        int y = 0;
-        for (EntryType type : EntryTypes.getAllValues(mode)) {
-            textFields.put(type.getName().toLowerCase(Locale.ROOT), textFieldArray[y]);
-            y++;
-        }
 
         Button help1 = new Button("?");
         help1.setOnAction(e->new HelpAction(Localization.lang("Help on key patterns"), HelpFile.BIBTEX_KEY_PATTERN).getHelpButton().doClick());
@@ -92,7 +86,7 @@ private void buildGUI() {
         btnDefaultAll1.setFont(FontSize.smallFont);
         btnDefaultAll1.setOnAction(e-> {
             // reset all fields
-            for (TextField field : textFieldArray) {
+            for (TextField field : textFields.values()) {
                 field.setText("");
             }
             defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN));
@@ -101,25 +95,24 @@ private void buildGUI() {
     }
 
     private void addExtraText(BibDatabaseMode mode) {
-        Label []label = new Label[19];
-        Button []button = new Button[19];
-        int i = 0;
-        for (i = 0; i <= 18; i++) {
-            textFieldArray[i] = new TextField();
-            button[i] = new Button("Default");
-            button[i].setFont(new javafx.scene.text.Font(10));
-            button[i].setOnAction(e-> defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
-        }
-        i = 0;
+        int rowIndex = 0;
         for (EntryType type : EntryTypes.getAllValues(mode)) {
-            label[i] = new Label(type.getName());
-            i ++;
-        }
-        for (i = 0; i <= 18; i++) {
-            label[i].setFont(FontSize.smallFont);
-            gridPane.add(label[i], 1, i + 3);
-            gridPane.add(textFieldArray[i], 3, i + 3);
-            gridPane.add(button[i], 4, i + 3);
+            Label label = new Label(type.getName());
+            label.setFont(FontSize.smallFont);
+
+            TextField textField = new TextField();
+
+            Button button = new Button("Default");
+            button.setFont(new javafx.scene.text.Font(10));
+            button.setOnAction(e -> textField.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
+
+            gridPane.add(label, 1, rowIndex + 3);
+            gridPane.add(textField, 3, rowIndex + 3);
+            gridPane.add(button, 4, rowIndex + 3);
+
+            textFields.put(type.getName().toLowerCase(Locale.ROOT), textField);
+
+            rowIndex++;
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTab.java b/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
index 8288b5bda12..473de31617f 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
@@ -111,6 +111,7 @@ public AdvancedTab(DialogService dialogService, JabRefPreferences prefs) {
 
     }
 
+    @Override
     public Node getBuilder() {
         return builder;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
index c83db2c1ed2..c13de2563c3 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
@@ -45,7 +45,7 @@ public AppearancePrefsTab(DialogService dialogService, JabRefPreferences prefs)
 
     }
 
-    public Node getContainer() {
+    public Node getBuilder() {
         return container;
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 8e61504603b..0409e2dcc56 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -1,19 +1,15 @@
 package org.jabref.gui.preferences;
 
-import java.awt.event.ActionEvent;
-import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Map;
-import java.util.Optional;
 import java.util.prefs.BackingStoreException;
 
-import javax.swing.AbstractAction;
-
-import javafx.geometry.Pos;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
-import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
@@ -26,57 +22,38 @@
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
-import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.exporter.ExporterFactory;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.exporter.TemplateExporter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.JabRefPreferencesFilter;
 
+import org.fxmisc.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Preferences dialog. Contains a TabbedPane, and tabs will be defined in
- * separate classes. Tabs MUST implement the PrefsTab interface, since this
- * dialog will call the storeSettings() method of all tabs when the user presses
- * ok.
+ * Preferences dialog. Contains a TabbedPane, and tabs will be defined in separate classes. Tabs MUST implement the
+ * PrefsTab interface, since this dialog will call the storeSettings() method of all tabs when the user presses ok.
  *
  * With this design, it should be very easy to add new tabs later.
- *
  */
 public class PreferencesDialog extends BaseDialog<Void> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesDialog.class);
 
-    private final BorderPane main;
+    private final BorderPane container;
 
     private final DialogService dialogService;
     private final JabRefFrame frame;
     private final JabRefPreferences prefs;
-    private final AdvancedTab advancedTab;
-    private final AppearancePrefsTab appearancePrefsTab;
-    private final BibtexKeyPatternPrefTab bibtexKeyPatternPrefTab;
-    private final EntryEditorPrefsTab entryEditorPrefsTab;
-    private final ExportSortingPrefsTab exportSortingPrefsTab;
-    private final ExternalTab externalTab;
-    private final FileTab fileTab;
-    private final GeneralTab generalTab;
-    private final GroupsPrefsTab groupsPrefsTab;
-    private final ImportSettingsTab importSettingsTab;
-    private final NameFormatterTab nameFormatterTab;
-    private final NetworkTab networkTab;
-    private final PreviewPrefsTab previewPrefsTab;
-    private final TableColumnsTab tableColumnsTab;
-    private final TablePrefsTab tablePrefsTab;
-    private final XmpPrefsTab xmpPrefsTab;
-    private ArrayList<PrefsTab> arrayList = new ArrayList<>();
+    private final ObservableList<PrefsTab> preferenceTabs;
 
     public PreferencesDialog(JabRefFrame parent) {
         setTitle(Localization.lang("JabRef preferences"));
@@ -86,144 +63,92 @@ public PreferencesDialog(JabRefFrame parent) {
         ButtonType save = new ButtonType(Localization.lang("Save"), ButtonData.OK_DONE);
         getDialogPane().getButtonTypes().addAll(save, ButtonType.CANCEL);
         ControlHelper.setAction(save, getDialogPane(), event -> {
-           storeAllSettings();
+            storeAllSettings();
             close();
         });
 
         prefs = JabRefPreferences.getInstance();
         frame = parent;
         dialogService = frame.getDialogService();
-        advancedTab = new AdvancedTab(dialogService,prefs);
-        appearancePrefsTab = new AppearancePrefsTab(dialogService,prefs);
-        bibtexKeyPatternPrefTab = new BibtexKeyPatternPrefTab(prefs,frame.getCurrentBasePanel());
-        entryEditorPrefsTab = new EntryEditorPrefsTab(prefs);
-        exportSortingPrefsTab = new ExportSortingPrefsTab(prefs);
-        externalTab = new ExternalTab(frame,this,prefs);
-        fileTab = new FileTab(dialogService,prefs);
-        generalTab = new GeneralTab(dialogService,prefs);
-        groupsPrefsTab = new GroupsPrefsTab(prefs);
-        importSettingsTab = new ImportSettingsTab(prefs);
-        nameFormatterTab = new NameFormatterTab(prefs);
-        networkTab = new NetworkTab(dialogService,prefs);
-        previewPrefsTab = new PreviewPrefsTab(dialogService, ExternalFileTypes.getInstance());
-        tableColumnsTab = new TableColumnsTab(prefs,frame);
-        tablePrefsTab = new TablePrefsTab(prefs);
-        xmpPrefsTab = new XmpPrefsTab(prefs);
-
-        if (arrayList.isEmpty()) {
-            arrayList.add(advancedTab);
-            arrayList.add(appearancePrefsTab);
-            arrayList.add(bibtexKeyPatternPrefTab);
-            arrayList.add(entryEditorPrefsTab);
-            arrayList.add(exportSortingPrefsTab);
-            arrayList.add(externalTab);
-            arrayList.add(fileTab);
-            arrayList.add(generalTab);
-            arrayList.add(groupsPrefsTab);
-            arrayList.add(importSettingsTab);
-            arrayList.add(nameFormatterTab);
-            arrayList.add(networkTab);
-            arrayList.add(previewPrefsTab);
-            arrayList.add(tableColumnsTab);
-            arrayList.add(tablePrefsTab);
-            arrayList.add(xmpPrefsTab);
-        }
 
-        main = new BorderPane();
-        main.setCenter(generalTab.getBuilder());
-        getDialogPane().setContent(main);
+        preferenceTabs = FXCollections.observableArrayList();
+        preferenceTabs.add(new GeneralTab(dialogService, prefs));
+        preferenceTabs.add(new FileTab(dialogService, prefs));
+        preferenceTabs.add(new TablePrefsTab(prefs));
+        preferenceTabs.add(new TableColumnsTab(prefs, frame));
+        preferenceTabs.add(new PreviewPrefsTab(dialogService, ExternalFileTypes.getInstance()));
+        preferenceTabs.add(new ExternalTab(frame, this, prefs));
+        preferenceTabs.add(new GroupsPrefsTab(prefs));
+        preferenceTabs.add(new EntryEditorPrefsTab(prefs));
+        preferenceTabs.add(new BibtexKeyPatternPrefTab(prefs, frame.getCurrentBasePanel()));
+        preferenceTabs.add(new ImportSettingsTab(prefs));
+        preferenceTabs.add(new ExportSortingPrefsTab(prefs));
+        preferenceTabs.add(new NameFormatterTab(prefs));
+        preferenceTabs.add(new XmpPrefsTab(prefs));
+        preferenceTabs.add(new NetworkTab(dialogService, prefs));
+        preferenceTabs.add(new AdvancedTab(dialogService, prefs));
+        preferenceTabs.add(new AppearancePrefsTab(dialogService, prefs));
+
+        container = new BorderPane();
+        getDialogPane().setContent(container);
         construct();
     }
 
     private void construct() {
         VBox vBox = new VBox();
-        vBox.setPrefSize(160,800);
-        Button []button = new Button[20];
+        vBox.setPrefWidth(160);
 
-        button[0] = new Button(Localization.lang("General"));
-        button[0].setOnAction( e -> main.setCenter(generalTab.getBuilder()));
-        button[1] = new Button(Localization.lang("File"));
-        button[1].setOnAction( e-> main.setCenter(fileTab.getBuilder()));
-        button[2] = new Button(Localization.lang("Entry table"));
-        button[2].setOnAction(e -> main.setCenter(tablePrefsTab.getBuilder()));
-        button[3] = new Button(Localization.lang("Entry table columns"));
-        button[3].setOnAction( e -> main.setCenter(tableColumnsTab.getBuilder()));
-        button[4] = new Button(Localization.lang("Entry preview"));
-        button[4].setOnAction( e -> main.setCenter(previewPrefsTab.getGridPane()));
-        button[5] = new Button(Localization.lang("External programs"));
-        button[5].setOnAction(e -> main.setCenter(externalTab.getBuilder()));
-        button[6] = new Button(Localization.lang("Groups"));
-        button[6].setOnAction( e -> main.setCenter(groupsPrefsTab.getBuilder()));
-        button[7] = new Button(Localization.lang("Entry editor"));
-        button[7].setOnAction( e -> main.setCenter(entryEditorPrefsTab.getBuilder()));
-        button[8] = new Button(Localization.lang("BibTeX key generator"));
-        button[8].setOnAction( e -> main.setCenter(bibtexKeyPatternPrefTab.getBuilder()));
-        button[9] = new Button(Localization.lang("Import"));
-        button[9].setOnAction( e -> main.setCenter(importSettingsTab.getBuilder()));
-        button[10] = new Button(Localization.lang("Export sorting"));
-        button[10].setOnAction( e -> main.setCenter(exportSortingPrefsTab.getBuilder()));
-        button[11] = new Button(Localization.lang("Name formatter"));
-        button[11].setOnAction( e -> main.setCenter(nameFormatterTab.getBuilder()));
-        button[12] = new Button(Localization.lang("XMP-metadata"));
-        button[12].setOnAction( e -> main.setCenter(xmpPrefsTab.getBuilder()));
-        button[13] = new Button(Localization.lang("Network"));
-        button[13].setOnAction(e -> main.setCenter(networkTab.getBuilder()));
-        button[14] = new Button(Localization.lang("Advanced"));
-        button[14].setOnAction( e -> main.setCenter(advancedTab.getBuilder()));
-        button[15] = new Button(Localization.lang("Appearance"));
-        button[15].setOnAction( e -> main.setCenter(appearancePrefsTab.getContainer()));
-        button[16] = new Button(Localization.lang("Import preferences"));
-        button[17] = new Button(Localization.lang("Export preferences"));
-        button[18] = new Button(Localization.lang("Show preferences"));
-        button[19] = new Button(Localization.lang("Reset preferences"));
-        for (int i = 0; i < button.length; i++) {
-            button[i].setFont(FontSize.smallFont);
-            button[i].setEffect(null);
-            button[i].setAlignment(Pos.BASELINE_LEFT);
-            button[i].setPrefSize(130,20);
-        }
-
-        for (int i = 0; i < 16; i++) {
-            vBox.getChildren().add(button[i]);
-        }
-        for (int i = 0; i < 12; i++) {
-            vBox.getChildren().add(new Label(""));
-        }
-
-        vBox.getChildren().addAll(button[16], button[17], button[18], button[19]);
-        main.setLeft(vBox);
-
-        // TODO: Key bindings:
-        // KeyBinder.bindCloseDialogKeyToCancelAction(this.getRootPane(), cancelAction);
-        // Import and export actions:
-        button[17].setAccessibleText(Localization.lang("Export preferences to file"));
-        button[17].setOnAction( e -> new ExportAction());
-
-        button[16].setAccessibleText(Localization.lang("Import preferences from file"));
-        button[16].setOnAction(e -> importPreferences());
-
-        button[18].setOnAction(
-                e -> new PreferencesFilterDialog(new JabRefPreferencesFilter(prefs)).setVisible(true));
-        button[19].setOnAction(e -> resetPreferences());
+        ListView<PrefsTab> tabsList = new ListView<>();
+        tabsList.itemsProperty().setValue(preferenceTabs);
+        EasyBind.subscribe(tabsList.getSelectionModel().selectedItemProperty(), tab -> {
+            if (tab != null) {
+                container.setCenter(tab.getBuilder());
+            }
+        });
+        tabsList.getSelectionModel().selectFirst();
+        new ViewModelListCellFactory<PrefsTab>()
+                .withText(PrefsTab::getTabName)
+                .install(tabsList);
+
+        Button importPreferences = new Button(Localization.lang("Import preferences"));
+        importPreferences.setTooltip(new Tooltip(Localization.lang("Import preferences from file")));
+        importPreferences.setOnAction(e -> importPreferences());
+        Button exportPreferences = new Button(Localization.lang("Export preferences"));
+        exportPreferences.setTooltip(new Tooltip(Localization.lang("Export preferences to file")));
+        exportPreferences.setOnAction(e -> exportPreferences());
+        Button showPreferences = new Button(Localization.lang("Show preferences"));
+        showPreferences.setOnAction(e -> new PreferencesFilterDialog(new JabRefPreferencesFilter(prefs)).setVisible(true));
+        Button resetPreferences = new Button(Localization.lang("Reset preferences"));
+        resetPreferences.setOnAction(e -> resetPreferences());
+
+        vBox.getChildren().addAll(
+                tabsList,
+                importPreferences,
+                exportPreferences,
+                showPreferences,
+                resetPreferences
+        );
+
+        container.setLeft(vBox);
 
         setValues();
-
     }
 
     private void resetPreferences() {
-        boolean resetPreferencesClicked = DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showConfirmationDialogAndWait(Localization.lang("Reset preferences"),
+        boolean resetPreferencesConfirmed = dialogService.showConfirmationDialogAndWait(
+                Localization.lang("Reset preferences"),
                 Localization.lang("Are you sure you want to reset all settings to default values?"),
-                Localization.lang("Reset preferences"), Localization.lang("Cancel")));
-        if (resetPreferencesClicked) {
+                Localization.lang("Reset preferences"),
+                Localization.lang("Cancel"));
+        if (resetPreferencesConfirmed) {
             try {
                 prefs.clear();
-                new SharedDatabasePreferences().clear();
 
-                DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showWarningDialogAndWait(Localization.lang("Reset preferences"),
-                        Localization.lang("You must restart JabRef for this to come into effect.")));
+                dialogService.showWarningDialogAndWait(Localization.lang("Reset preferences"),
+                        Localization.lang("You must restart JabRef for this to come into effect."));
             } catch (BackingStoreException ex) {
-                LOGGER.warn(ex.getMessage(), ex);
-                DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Reset preferences"), ex));
+                LOGGER.error("Error while resetting preferences", ex);
+                dialogService.showErrorDialogAndWait(Localization.lang("Reset preferences"), ex);
             }
             updateAfterPreferenceChanges();
         }
@@ -233,27 +158,20 @@ private void importPreferences() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.XML)
                 .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(getPrefsExportPath()).build();
+                .withInitialDirectory(prefs.getPrefsExportPath()).build();
 
-        Optional<Path> fileName = DefaultTaskExecutor
-                .runInJavaFXThread(() -> dialogService.showFileOpenDialog(fileDialogConfiguration));
-
-        if (fileName.isPresent()) {
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> {
             try {
-                prefs.importPreferences(fileName.get().toString());
+                prefs.importPreferences(file);
                 updateAfterPreferenceChanges();
 
-                DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showWarningDialogAndWait(Localization.lang("Import preferences"),
-                        Localization.lang("You must restart JabRef for this to come into effect.")));
+                dialogService.showWarningDialogAndWait(Localization.lang("Import preferences"),
+                        Localization.lang("You must restart JabRef for this to come into effect."));
             } catch (JabRefException ex) {
-                LOGGER.warn(ex.getMessage(), ex);
-                DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Import preferences"), ex));
+                LOGGER.error("Error while importing preferences", ex);
+                dialogService.showErrorDialogAndWait(Localization.lang("Import preferences"), ex);
             }
-        }
-    }
-
-    private String getPrefsExportPath() {
-        return prefs.get(JabRefPreferences.PREFS_EXPORT_PATH);
+        });
     }
 
     private void updateAfterPreferenceChanges() {
@@ -268,13 +186,13 @@ private void updateAfterPreferenceChanges() {
 
     private void storeAllSettings() {
         // First check that all tabs are ready to close:
-        for (PrefsTab tab : arrayList) {
+        for (PrefsTab tab : preferenceTabs) {
             if (!tab.validateSettings()) {
                 return; // If not, break off.
             }
         }
         // Then store settings and close:
-        for (PrefsTab tab : arrayList) {
+        for (PrefsTab tab : preferenceTabs) {
             tab.storeSettings();
         }
         prefs.flush();
@@ -286,38 +204,28 @@ private void storeAllSettings() {
 
     public void setValues() {
         // Update all field values in the tabs:
-        for (PrefsTab prefsTab : arrayList) {
+        for (PrefsTab prefsTab : preferenceTabs) {
             prefsTab.setValues();
         }
     }
 
-    class ExportAction extends AbstractAction {
-
-        public ExportAction() {
-            super("Export");
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-
-            FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                    .addExtensionFilter(StandardFileType.XML)
-                    .withDefaultExtension(StandardFileType.XML)
-                    .withInitialDirectory(prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
-            Optional<Path> path = DefaultTaskExecutor
-                    .runInJavaFXThread(() -> dialogService.showFileSaveDialog(fileDialogConfiguration));
-
-            path.ifPresent(exportFile -> {
-                try {
-                    storeAllSettings();
-                    prefs.exportPreferences(exportFile.toString());
-                    prefs.put(JabRefPreferences.PREFS_EXPORT_PATH, exportFile.toString());
-                } catch (JabRefException ex) {
-                    LOGGER.warn(ex.getMessage(), ex);
-                    dialogService.showErrorDialogAndWait(Localization.lang("Export preferences"), ex);
-
-                }
-            });
-        }
+    private void exportPreferences() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(StandardFileType.XML)
+                .withDefaultExtension(StandardFileType.XML)
+                .withInitialDirectory(prefs.getPrefsExportPath())
+                .build();
+
+        dialogService.showFileSaveDialog(fileDialogConfiguration)
+                     .ifPresent(exportFile -> {
+                         try {
+                             storeAllSettings();
+                             prefs.exportPreferences(exportFile);
+                             prefs.put(JabRefPreferences.PREFS_EXPORT_PATH, exportFile.toString());
+                         } catch (JabRefException ex) {
+                             LOGGER.warn(ex.getMessage(), ex);
+                             dialogService.showErrorDialogAndWait(Localization.lang("Export preferences"), ex);
+                         }
+                     });
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PrefsTab.java b/src/main/java/org/jabref/gui/preferences/PrefsTab.java
index 48c29278145..47bf3fd77cf 100644
--- a/src/main/java/org/jabref/gui/preferences/PrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/PrefsTab.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.preferences;
 
+import javafx.scene.Node;
+
 /**
  * A prefsTab is a component displayed in the PreferenceDialog.
  *
@@ -7,6 +9,8 @@
  */
 interface PrefsTab {
 
+    Node getBuilder();
+
     /**
      * This method is called when the dialog is opened, or if it is made
      * visible after being hidden. The tab should update all its values.
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java b/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java
index aeb13b1fc4b..fa19dafbfe8 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java
@@ -182,7 +182,7 @@ private void setupGui() {
         gridPane.add(scrollPane, 1, 9);
     }
 
-    public Node getGridPane() {
+    public Node getBuilder() {
         return gridPane;
     }
 
diff --git a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
index e628e1c371e..87295e0b7dd 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
@@ -113,6 +113,10 @@ public void install(ComboBox<T> comboBox) {
         comboBox.setCellFactory(this);
     }
 
+    public void install(ListView<T> listView) {
+        listView.setCellFactory(this);
+    }
+
     @Override
     public ListCell<T> call(ListView<T> param) {
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 4baf9556d23..0d010e23608 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -74,6 +74,7 @@
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.logic.protectedterms.ProtectedTermsPreferences;
 import org.jabref.logic.remote.RemotePreferences;
+import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
 import org.jabref.logic.util.OS;
 import org.jabref.logic.util.UpdateFieldPreferences;
 import org.jabref.logic.util.Version;
@@ -1144,6 +1145,7 @@ public void clear() throws BackingStoreException {
         clearAllCustomEntryTypes();
         clearKeyPatterns();
         prefs.clear();
+        new SharedDatabasePreferences().clear();
     }
 
     public void clear(String key) {
@@ -1322,8 +1324,11 @@ public void updateEntryEditorTabList() {
      * @param filename String File to export to
      */
     public void exportPreferences(String filename) throws JabRefException {
-        File f = new File(filename);
-        try (OutputStream os = new FileOutputStream(f)) {
+        exportPreferences(Paths.get(filename));
+    }
+
+    public void exportPreferences(Path file) throws JabRefException {
+        try (OutputStream os = new FileOutputStream(file.toFile())) {
             prefs.exportSubtree(os);
         } catch (BackingStoreException | IOException ex) {
             throw new JabRefException("Could not export preferences", Localization.lang("Could not export preferences"),
@@ -1339,12 +1344,15 @@ public void exportPreferences(String filename) throws JabRefException {
      *                         or an IOException
      */
     public void importPreferences(String filename) throws JabRefException {
-        File f = new File(filename);
-        try (InputStream is = new FileInputStream(f)) {
+        importPreferences(Paths.get(filename));
+    }
+
+    public void importPreferences(Path file) throws JabRefException {
+        try (InputStream is = new FileInputStream(file.toFile())) {
             Preferences.importPreferences(is);
         } catch (InvalidPreferencesFormatException | IOException ex) {
             throw new JabRefException("Could not import preferences", Localization.lang("Could not import preferences"),
-                                      ex);
+                    ex);
         }
     }
 
@@ -1912,4 +1920,8 @@ public Optional<Integer> getFontSize() {
             return Optional.empty();
         }
     }
+
+    public String getPrefsExportPath() {
+        return get(PREFS_EXPORT_PATH);
+    }
 }

From f0ceab92c1ed3dd22c0c3ef50e9edeb2adeef586 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 20 Aug 2018 11:22:55 +0200
Subject: [PATCH 048/229] Update mysql driver to 8.0.12

Suports all newer mysql versions
https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-versions.html
---
 build.gradle                                                 | 3 +--
 src/main/java/org/jabref/model/database/shared/DBMSType.java | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index a493ae0bca1..21d1b0585ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -119,8 +119,7 @@ dependencies {
     antlr4 'org.antlr:antlr4:4.7.1'
     compile 'org.antlr:antlr4-runtime:4.7.1'
 
-    // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release"
-    compile 'mysql:mysql-connector-java:5.1.46'
+    compile 'mysql:mysql-connector-java:8.0.12'
 
     compile 'org.postgresql:postgresql:42.2.4'
 
diff --git a/src/main/java/org/jabref/model/database/shared/DBMSType.java b/src/main/java/org/jabref/model/database/shared/DBMSType.java
index 4bf87c36189..2d578b2dbfc 100644
--- a/src/main/java/org/jabref/model/database/shared/DBMSType.java
+++ b/src/main/java/org/jabref/model/database/shared/DBMSType.java
@@ -8,7 +8,7 @@
  */
 public enum DBMSType {
 
-    MYSQL("MySQL", "com.mysql.jdbc.Driver", "jdbc:mysql://%s:%d/%s", 3306),
+    MYSQL("MySQL", "com.mysql.cj.jdbc.Driver", "jdbc:mysql://%s:%d/%s", 3306),
     ORACLE("Oracle", "oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@%s:%d:%s", 1521),
     POSTGRESQL("PostgreSQL", "org.postgresql.Driver", "jdbc:postgresql://%s:%d/%s", 5432);
 

From c156f0e9694342fbec58e8949578f1641bd65b43 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 20 Aug 2018 11:33:04 +0200
Subject: [PATCH 049/229] update xmlunit and log4j jul and checkstyle

---
 build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 21d1b0585ad..8eb24702287 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.gradle.build-scan' version '1.15.1'
+    id 'com.gradle.build-scan' version '1.15.2'
     id 'com.install4j.gradle' version '7.0.6'
     id 'com.github.johnrengelman.shadow' version '2.0.4'
     id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
@@ -168,8 +168,8 @@ dependencies {
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.0-RC1'
     testCompile 'org.junit.platform:junit-platform-launcher:1.3.0-RC1'
     testCompile 'org.junit-pioneer:junit-pioneer:0.1.2'
-    testRuntime 'org.apache.logging.log4j:log4j-core:2.11.0'
-    testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.0'
+    testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
+    testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'
     testCompile 'org.mockito:mockito-core:2.21.0'
     testCompile 'com.github.tomakehurst:wiremock:2.18.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
@@ -180,7 +180,7 @@ dependencies {
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:8.11'
+    checkstyle 'com.puppycrawl.tools:checkstyle:8.12'
 }
 
 jacoco {

From bc34ee644387224177fe3e973ce793328d27b001 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 20 Aug 2018 12:52:46 +0200
Subject: [PATCH 050/229] Fix NPE with bibdatabasecontext in preview style
 dialog

---
 src/main/java/org/jabref/gui/BasePanel.java           |  1 -
 src/main/java/org/jabref/gui/PreviewPanel.java        | 11 ++++++-----
 .../org/jabref/gui/openoffice/StyleSelectDialog.java  |  3 ++-
 .../java/org/jabref/gui/preftabs/PreviewPrefsTab.java |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 9bcbc8193b2..f9f1641a7e3 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -228,7 +228,6 @@ public BasePanel(JabRefFrame frame, BasePanelPreferences preferences, BibDatabas
         this.preview = new PreviewPanel(this, getBibDatabaseContext(), preferences.getKeyBindings(), preferences.getPreviewPreferences(), dialogService, externalFileTypes);
         frame().getGlobalSearchBar().getSearchQueryHighlightObservable().addSearchListener(preview);
 
-
     }
 
     @Subscribe
diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
index 5d7f4c6d016..7a0b16a16a7 100644
--- a/src/main/java/org/jabref/gui/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -5,6 +5,7 @@
 import java.io.StringReader;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Future;
 import java.util.regex.Pattern;
@@ -70,7 +71,7 @@ public class PreviewPanel extends ScrollPane implements SearchQueryHighlightList
     /**
      * If a database is set, the preview will attempt to resolve strings in the previewed entry using that database.
      */
-    private Optional<BibDatabaseContext> databaseContext = Optional.empty();
+    private BibDatabaseContext databaseContext;
     private final WebView previewView;
     private Optional<Future<?>> citationStyleFuture = Optional.empty();
 
@@ -78,10 +79,10 @@ public class PreviewPanel extends ScrollPane implements SearchQueryHighlightList
 
     /**
      * @param panel           (may be null) Only set this if the preview is associated to the main window.
-     * @param databaseContext (may be null) Used for resolving pdf directories for links.
+     * @param databaseContext Used for resolving pdf directories for links. Must not be null.
      */
     public PreviewPanel(BasePanel panel, BibDatabaseContext databaseContext, KeyBindingRepository keyBindingRepository, PreviewPreferences preferences, DialogService dialogService, ExternalFileTypes externalFileTypes) {
-        this.databaseContext = Optional.ofNullable(databaseContext);
+        this.databaseContext = Objects.requireNonNull(databaseContext);
         this.basePanel = Optional.ofNullable(panel);
         this.dialogService = dialogService;
         this.clipBoardManager = Globals.clipboardManager;
@@ -198,7 +199,7 @@ private ContextMenu createPopupMenu() {
     }
 
     public void setDatabaseContext(BibDatabaseContext databaseContext) {
-        this.databaseContext = Optional.ofNullable(databaseContext);
+        this.databaseContext = databaseContext;
     }
 
     public Optional<BasePanel> getBasePanel() {
@@ -281,7 +282,7 @@ public void update() {
         if (layout.isPresent()) {
             StringBuilder sb = new StringBuilder();
             bibEntry.ifPresent(entry -> sb.append(layout.get()
-                                                        .doLayout(entry, databaseContext.map(BibDatabaseContext::getDatabase).orElse(null))));
+                                                        .doLayout(entry, databaseContext.getDatabase())));
             setPreviewLabel(sb.toString());
         } else if (basePanel.isPresent() && bibEntry.isPresent()) {
             Future<?> citationStyleWorker = BackgroundTask
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
index ca73fefff1d..62317e1c8fd 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
@@ -53,6 +53,7 @@
 import org.jabref.logic.openoffice.StyleLoader;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.util.TestEntry;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -134,7 +135,7 @@ private void init() {
         // Create a preview panel for previewing styles
         // Must be done before creating the table to avoid NPEs
         DefaultTaskExecutor.runInJavaFXThread(() -> {
-            preview = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService, ExternalFileTypes.getInstance());
+            preview = new PreviewPanel(null, new BibDatabaseContext(), Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService, ExternalFileTypes.getInstance());
             // Use the test entry from the Preview settings tab in Preferences:
             preview.setEntry(prevEntry);
         });
diff --git a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java b/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
index 89d310c8ebd..9e2b8480302 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
@@ -128,7 +128,7 @@ private void setupLogic() {
         btnTest.setOnAction(event -> {
             try {
                 DefaultTaskExecutor.runInJavaFXThread(() -> {
-                    PreviewPanel testPane = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService, externalFileTypes);
+                    PreviewPanel testPane = new PreviewPanel(null, new BibDatabaseContext(), Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService, externalFileTypes);
                     if (chosen.getSelectionModel().getSelectedItems().isEmpty()) {
                         testPane.setFixedLayout(layout.getText());
                         testPane.setEntry(TestEntry.getTestEntry());

From fee680083a51face20c54ce7ec49b96cac764503 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 20 Aug 2018 14:30:40 +0200
Subject: [PATCH 051/229] Wrap preference tabs in scrollpane

---
 .../org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java | 3 ++-
 .../java/org/jabref/gui/preferences/PreferencesDialog.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
index fd1ef4fa0ee..93d1388abb3 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
@@ -6,6 +6,7 @@
 import java.util.Locale;
 import java.util.Map;
 
+import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
@@ -174,7 +175,7 @@ private static void setValue(TextField tf, String fieldName, AbstractBibtexKeyPa
         }
     }
 
-    public GridPane getPanel() {
+    public Node getPanel() {
         return gridPane;
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 0409e2dcc56..63e38e631aa 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -9,6 +9,7 @@
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListView;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Region;
@@ -102,7 +103,7 @@ private void construct() {
         tabsList.itemsProperty().setValue(preferenceTabs);
         EasyBind.subscribe(tabsList.getSelectionModel().selectedItemProperty(), tab -> {
             if (tab != null) {
-                container.setCenter(tab.getBuilder());
+                container.setCenter(new ScrollPane(tab.getBuilder()));
             }
         });
         tabsList.getSelectionModel().selectFirst();

From b00ecd18a510ef3ab9ccec2a57aadad9feb2772c Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 20 Aug 2018 15:07:04 +0200
Subject: [PATCH 052/229] Style side pane in preferences

---
 .../gui/preferences/PreferencesDialog.css     |  8 +++++++
 .../gui/preferences/PreferencesDialog.java    | 23 ++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/preferences/PreferencesDialog.css

diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
new file mode 100644
index 00000000000..955ca91573e
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
@@ -0,0 +1,8 @@
+#sideMenu {
+    -fx-background-color: -jr-white;
+}
+
+#sideMenu > .virtual-flow > .clipped-container > .sheet > .list-cell {
+    -fx-padding: 8 8 8 8;
+    -fx-background: -jr-white;
+}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 63e38e631aa..45a1c4bc6d1 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -5,6 +5,7 @@
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
@@ -12,6 +13,7 @@
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 
@@ -60,6 +62,7 @@ public PreferencesDialog(JabRefFrame parent) {
         setTitle(Localization.lang("JabRef preferences"));
         getDialogPane().setPrefSize(1250, 800);
         getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
+        getDialogPane().getScene().getStylesheets().add(this.getClass().getResource("PreferencesDialog.css").toExternalForm());
         setResizable(true);
         ButtonType save = new ButtonType(Localization.lang("Save"), ButtonData.OK_DONE);
         getDialogPane().getButtonTypes().addAll(save, ButtonType.CANCEL);
@@ -100,6 +103,7 @@ private void construct() {
         vBox.setPrefWidth(160);
 
         ListView<PrefsTab> tabsList = new ListView<>();
+        tabsList.setId("sideMenu");
         tabsList.itemsProperty().setValue(preferenceTabs);
         EasyBind.subscribe(tabsList.getSelectionModel().selectedItemProperty(), tab -> {
             if (tab != null) {
@@ -111,25 +115,38 @@ private void construct() {
                 .withText(PrefsTab::getTabName)
                 .install(tabsList);
 
+        VBox buttonContainer = new VBox();
+        buttonContainer.setAlignment(Pos.BOTTOM_LEFT);
         Button importPreferences = new Button(Localization.lang("Import preferences"));
         importPreferences.setTooltip(new Tooltip(Localization.lang("Import preferences from file")));
         importPreferences.setOnAction(e -> importPreferences());
+        importPreferences.getStyleClass().add("text-button");
         Button exportPreferences = new Button(Localization.lang("Export preferences"));
         exportPreferences.setTooltip(new Tooltip(Localization.lang("Export preferences to file")));
         exportPreferences.setOnAction(e -> exportPreferences());
+        exportPreferences.getStyleClass().add("text-button");
         Button showPreferences = new Button(Localization.lang("Show preferences"));
         showPreferences.setOnAction(e -> new PreferencesFilterDialog(new JabRefPreferencesFilter(prefs)).setVisible(true));
+        showPreferences.getStyleClass().add("text-button");
         Button resetPreferences = new Button(Localization.lang("Reset preferences"));
         resetPreferences.setOnAction(e -> resetPreferences());
-
-        vBox.getChildren().addAll(
-                tabsList,
+        resetPreferences.getStyleClass().add("text-button");
+        buttonContainer.getChildren().addAll(
                 importPreferences,
                 exportPreferences,
                 showPreferences,
                 resetPreferences
         );
 
+        VBox spacer = new VBox();
+        VBox.setVgrow(tabsList, Priority.ALWAYS);
+        VBox.setVgrow(spacer, Priority.SOMETIMES);
+        vBox.getChildren().addAll(
+                tabsList,
+                spacer,
+                buttonContainer
+        );
+
         container.setLeft(vBox);
 
         setValues();

From b2d6b8997cdcea563e1d38d41bca56c34561e0bc Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 20 Aug 2018 15:22:50 +0200
Subject: [PATCH 053/229] Remove small font size

---
 .../bibtexkeypattern/BibtexKeyPatternPanel.java |  8 --------
 .../org/jabref/gui/preferences/AdvancedTab.java |  8 --------
 .../preferences/BibtexKeyPatternPrefTab.java    |  8 --------
 .../gui/preferences/EntryEditorPrefsTab.java    | 15 ---------------
 .../gui/preferences/ExportSortingPrefsTab.java  |  3 ---
 .../org/jabref/gui/preferences/ExternalTab.java | 13 -------------
 .../org/jabref/gui/preferences/FileTab.java     | 16 ----------------
 .../org/jabref/gui/preferences/FontSize.java    |  1 -
 .../org/jabref/gui/preferences/GeneralTab.java  | 16 ----------------
 .../jabref/gui/preferences/GroupsPrefsTab.java  |  4 ----
 .../gui/preferences/ImportSettingsTab.java      |  7 -------
 .../gui/preferences/NameFormatterTab.java       |  3 ---
 .../org/jabref/gui/preferences/NetworkTab.java  |  7 -------
 .../jabref/gui/preferences/TableColumnsTab.java | 17 -----------------
 .../jabref/gui/preferences/TablePrefsTab.java   | 15 ---------------
 .../org/jabref/gui/preferences/XmpPrefsTab.java |  1 -
 16 files changed, 142 deletions(-)

diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
index 93d1388abb3..fb749c149a3 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
@@ -16,7 +16,6 @@
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.preferences.FontSize;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.EntryTypes;
@@ -51,20 +50,16 @@ public BibtexKeyPatternPanel(BasePanel panel) {
     private void buildGUI() {
         // The header - can be removed
         Label label = new Label(Localization.lang("Entry type"));
-        label.setFont(FontSize.smallFont);
         gridPane.add(label, 1, 1);
 
         Label keyPattern = new Label(Localization.lang("Key pattern"));
-        keyPattern.setFont(FontSize.smallFont);
         gridPane.add(keyPattern, 3, 1);
 
         Label defaultPattern = new Label(Localization.lang("Default pattern"));
-        defaultPattern.setFont(FontSize.smallFont);
         gridPane.add(defaultPattern, 1, 2);
         gridPane.add(defaultPat, 3, 2);
 
         Button button = new Button("Default");
-        button.setFont(FontSize.smallFont);
         button.setOnAction(e-> defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
         gridPane.add(button, 4, 2);
 
@@ -84,7 +79,6 @@ private void buildGUI() {
         gridPane.add(help1, 1, 24);
 
         Button btnDefaultAll1 = new Button(Localization.lang("Reset all"));
-        btnDefaultAll1.setFont(FontSize.smallFont);
         btnDefaultAll1.setOnAction(e-> {
             // reset all fields
             for (TextField field : textFields.values()) {
@@ -99,12 +93,10 @@ private void addExtraText(BibDatabaseMode mode) {
         int rowIndex = 0;
         for (EntryType type : EntryTypes.getAllValues(mode)) {
             Label label = new Label(type.getName());
-            label.setFont(FontSize.smallFont);
 
             TextField textField = new TextField();
 
             Button button = new Button("Default");
-            button.setFont(new javafx.scene.text.Font(10));
             button.setOnAction(e -> textField.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
 
             gridPane.add(label, 1, rowIndex + 3);
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTab.java b/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
index 473de31617f..b8fa886c3d4 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
@@ -44,14 +44,10 @@ public AdvancedTab(DialogService dialogService, JabRefPreferences prefs) {
         remotePreferences = prefs.getRemotePreferences();
 
         useRemoteServer = new CheckBox(Localization.lang("Listen for remote operation on port") + ':');
-        useRemoteServer.setFont(FontSize.smallFont);
         useIEEEAbrv = new CheckBox(Localization.lang("Use IEEE LaTeX abbreviations"));
-        useIEEEAbrv.setFont(FontSize.smallFont);
         remoteServerPort = new TextField();
         useCaseKeeperOnSearch = new CheckBox(Localization.lang("Add {} to specified title words on search to keep the correct case"));
-        useCaseKeeperOnSearch.setFont(FontSize.smallFont);
         useUnitFormatterOnSearch = new CheckBox(Localization.lang("Format units by adding non-breaking separators and keeping the correct case on search"));
-        useUnitFormatterOnSearch.setFont(FontSize.smallFont);
 
         Label remoteOperation = new Label(Localization.lang("Remote operation") + "  -----------------------------");
         remoteOperation.setFont(FontSize.bigFont);
@@ -69,13 +65,10 @@ public AdvancedTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(label1, 2, 22);
 
         Label textLabel1 = new Label("    This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For");
-        textLabel1.setFont(FontSize.smallFont);
         builder.add(textLabel1, 2, 3);
         Label textLabel2 = new Label("instance, this is useful when you open a file in JabRef from your web browser. ");
-        textLabel2.setFont(FontSize.smallFont);
         builder.add(textLabel2, 2, 4);
         Label textLabel3 = new Label("    Note that this will prevent you from running more than one instance of JabRef at a time.");
-        textLabel3.setFont(FontSize.smallFont);
         builder.add(textLabel3, 2, 5);
         builder.add(new Line(), 2, 6);
         builder.add(new Pane(), 2, 7);
@@ -84,7 +77,6 @@ public AdvancedTab(DialogService dialogService, JabRefPreferences prefs) {
         p.getChildren().add(useRemoteServer);
         p.getChildren().add(remoteServerPort);
         Button helpButton = new Button("?");
-        helpButton.setFont(FontSize.smallFont);
         helpButton.setOnAction(event -> new HelpAction(HelpFile.REMOTE).getHelpButton().doClick());
         p.getChildren().add(helpButton);
 
diff --git a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
index 640d1be00b7..2f428d3f75e 100644
--- a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
+++ b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
@@ -79,14 +79,6 @@ public void storeSettings() {
 
     private void appendKeyGeneratorSettings() {
         // Build a panel for checkbox settings:
-        autoGenerateOnImport.setFont(FontSize.smallFont);
-        letterStartA.setFont(FontSize.smallFont);
-        warnBeforeOverwriting.setFont(FontSize.smallFont);
-        letterStartB.setFont(FontSize.smallFont);
-        dontOverwrite.setFont(FontSize.smallFont);
-        alwaysAddLetter.setFont(FontSize.smallFont);
-        generateOnSave.setFont(FontSize.smallFont);
-
         Label keyGeneratorSettings = new Label(Localization.lang("Key generator settings") + "  --------------------------");
         keyGeneratorSettings.setFont(FontSize.bigFont);
         builder.add(keyGeneratorSettings, 1, 10);
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
index 0eee8e55e82..3987fe266de 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
@@ -45,37 +45,23 @@ public EntryEditorPrefsTab(JabRefPreferences prefs) {
         this.prefs = prefs;
         autoCompletePreferences = prefs.getAutoCompletePreferences();
         autoOpenForm = new CheckBox(Localization.lang("Open editor when a new entry is created"));
-        autoOpenForm.setFont(FontSize.smallFont);
         defSource = new CheckBox(Localization.lang("Show BibTeX source by default"));
-        defSource.setFont(FontSize.smallFont);
         emacsMode = new CheckBox(Localization.lang("Use Emacs key bindings"));
-        emacsMode.setFont(FontSize.smallFont);
         emacsRebindCtrlA = new CheckBox(Localization.lang("Rebind C-a, too"));
-        emacsRebindCtrlA.setFont(FontSize.smallFont);
         emacsRebindCtrlF = new CheckBox(Localization.lang("Rebind C-f, too"));
-        emacsRebindCtrlF.setFont(FontSize.smallFont);
         autoComplete = new CheckBox(Localization.lang("Enable word/name autocompletion"));
-        autoComplete.setFont(FontSize.smallFont);
         recommendations = new CheckBox(Localization.lang("Show 'Related Articles' tab"));
-        recommendations.setFont(FontSize.smallFont);
         validation = new CheckBox(Localization.lang("Show validation messages"));
-        validation.setFont(FontSize.smallFont);
 
         // allowed name formats
         autoCompFF = new RadioButton(Localization.lang("Autocomplete names in 'Firstname Lastname' format only"));
-        autoCompFF.setFont(FontSize.smallFont);
         autoCompLF = new RadioButton(Localization.lang("Autocomplete names in 'Lastname, Firstname' format only"));
-        autoCompLF.setFont(FontSize.smallFont);
         autoCompBoth = new RadioButton(Localization.lang("Autocomplete names in both formats"));
-        autoCompBoth.setFont(FontSize.smallFont);
 
         // treatment of first name
         firstNameModeFull = new RadioButton(Localization.lang("Use full firstname whenever possible"));
-        firstNameModeFull.setFont(FontSize.smallFont);
         firstNameModeAbbr = new RadioButton(Localization.lang("Use abbreviated firstname whenever possible"));
-        firstNameModeAbbr.setFont(FontSize.smallFont);
         firstNameModeBoth = new RadioButton(Localization.lang("Use abbreviated and full firstname"));
-        firstNameModeBoth.setFont(FontSize.smallFont);
 
         // We need a listener on showSource to enable and disable the source panel-related choices:
         emacsMode.setOnAction(event -> emacsRebindCtrlA.setDisable(!emacsMode.isSelected()));
@@ -107,7 +93,6 @@ public EntryEditorPrefsTab(JabRefPreferences prefs) {
         builder.add(autoComplete,   1, 11);
 
         Label useFields = new Label("       " + Localization.lang("Use autocompletion for the following fields") + ":");
-        useFields.setFont(FontSize.smallFont);
         builder.add(useFields, 1, 12);
         builder.add(autoCompFields, 2, 12);
         builder.add(new Label(""), 1, 13);
diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index 4d2a18545d0..9d46bf900f1 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -33,11 +33,8 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
         // EXPORT SORT ORDER
         // create Components
         exportInOriginalOrder = new RadioButton(Localization.lang("Export entries in their original order"));
-        exportInOriginalOrder.setFont(FontSize.smallFont);
         exportInTableOrder = new RadioButton(Localization.lang("Export in current table sort order"));
-        exportInTableOrder.setFont(FontSize.smallFont);
         exportInSpecifiedOrder = new RadioButton(Localization.lang("Export entries ordered as specified"));
-        exportInSpecifiedOrder.setFont(FontSize.smallFont);
 
         exportOrderPanel = new SaveOrderConfigDisplay();
 
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTab.java b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
index 3ece935234f..633e3128616 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
@@ -48,29 +48,20 @@ class ExternalTab extends JPanel implements PrefsTab {
     public ExternalTab(JabRefFrame frame, PreferencesDialog prefsDiag, JabRefPreferences prefs) {
         this.prefs = prefs;
         Button editFileTypes = new Button(Localization.lang("Manage external file types"));
-        editFileTypes.setFont(FontSize.smallFont);
         citeCommand = new TextField();
         editFileTypes.setOnAction(e->ExternalFileTypeEditor.getAction());
         defaultConsole = new RadioButton(Localization.lang("Use default terminal emulator"));
-        defaultConsole.setFont(FontSize.smallFont);
         executeConsole = new RadioButton(Localization.lang("Execute command") + ":");
-        executeConsole.setFont(FontSize.smallFont);
         consoleCommand = new TextField();
         browseButton = new Button(Localization.lang("Browse"));
-        browseButton.setFont(FontSize.smallFont);
         adobeAcrobatReader = new RadioButton(Localization.lang("Adobe Acrobat Reader"));
-        adobeAcrobatReader.setFont(FontSize.smallFont);
         adobeAcrobatReaderPath = new TextField();
         Button browseAdobeAcrobatReader = new Button(Localization.lang("Browse"));
-        browseAdobeAcrobatReader.setFont(FontSize.smallFont);
         sumatraReader = new RadioButton(Localization.lang("Sumatra Reader"));
-        sumatraReader.setFont(FontSize.smallFont);
         sumatraReaderPath = new TextField();
         Button browseSumatraReader = new Button(Localization.lang("Browse"));
-        browseSumatraReader.setFont(FontSize.smallFont);
 
         Label commandDescription = new Label(Localization.lang("Note: Use the placeholder %0 for the location of the opened library file.", "%DIR"));
-        commandDescription.setFont(FontSize.smallFont);
         defaultConsole.setOnAction(e -> updateExecuteConsoleButtonAndFieldEnabledState());
         executeConsole.setOnAction(e -> updateExecuteConsoleButtonAndFieldEnabledState());
         browseButton.setOnAction(e -> showConsoleChooser());
@@ -100,12 +91,10 @@ public ExternalTab(JabRefFrame frame, PreferencesDialog prefsDiag, JabRefPrefere
         sendingOfEmails.setFont(FontSize.bigFont);
         builder.add(sendingOfEmails, 1, 1);
         Label subject = new Label(Localization.lang("Subject for sending an email with references").concat(":"));
-        subject.setFont(FontSize.smallFont);
         builder.add(subject, 1, 2);
         emailSubject = new TextField();
         builder.add(emailSubject, 2, 2);
         openFoldersOfAttachedFiles = new CheckBox(Localization.lang("Automatically open folders of attached files"));
-        openFoldersOfAttachedFiles.setFont(FontSize.smallFont);
         builder.add(openFoldersOfAttachedFiles, 1, 3);
 
         builder.add(new Label(""), 1, 4);
@@ -123,7 +112,6 @@ public ExternalTab(JabRefFrame frame, PreferencesDialog prefsDiag, JabRefPrefere
         builder.add(butpan, 1, 6);
 
         Label citeCommandLabel = new Label(Localization.lang("Cite command") + ':');
-        citeCommandLabel.setFont(FontSize.smallFont);
         builder.add(citeCommandLabel, 1, 7);
         builder.add(citeCommand, 2, 7);
         builder.add(editFileTypes, 1, 8);
@@ -152,7 +140,6 @@ public Node getBuilder() {
     private void addSettingsButton(final PushToApplication application, GridPane panel, int index) {
         PushToApplicationSettings settings = PushToApplications.getSettings(application);
         Button button = new Button(Localization.lang("Settings for %0", application.getApplicationName()));
-        button.setFont(FontSize.smallFont);
         button.setPrefSize(150, 20);
         button.setOnAction(e -> PushToApplicationSettingsDialog.showSettingsDialog(null, settings, index));
         if (index % 2 == 0) {
diff --git a/src/main/java/org/jabref/gui/preferences/FileTab.java b/src/main/java/org/jabref/gui/preferences/FileTab.java
index e59d1f4546a..7fc51fbf8ef 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTab.java
+++ b/src/main/java/org/jabref/gui/preferences/FileTab.java
@@ -62,36 +62,26 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         this.prefs = prefs;
         fileDir = new TextField();
         bibLocAsPrimaryDir = new CheckBox(Localization.lang("Use the BIB file location as primary file directory"));
-        bibLocAsPrimaryDir.setFont(FontSize.smallFont);
         bibLocAsPrimaryDir.setAccessibleText(Localization.lang("When downloading files, or moving linked files to the "
                 + "file directory, prefer the BIB file location rather than the file directory set above"));
         runAutoFileSearch = new CheckBox(
                 Localization.lang("When opening file link, search for matching file if no link is defined"));
-        runAutoFileSearch.setFont(FontSize.smallFont);
         allowFileAutoOpenBrowse = new CheckBox(
                 Localization.lang("Automatically open browse dialog when creating new file link"));
-        allowFileAutoOpenBrowse.setFont(FontSize.smallFont);
         regExpTextField = new TextField();
         useRegExpComboBox = new RadioButton(Localization.lang("Use regular expression search"));
-        useRegExpComboBox.setFont(FontSize.smallFont);
         useRegExpComboBox.setOnAction(e -> regExpTextField.setEditable(useRegExpComboBox.isSelected()));
 
         openLast = new CheckBox(Localization.lang("Open last edited libraries at startup"));
-        openLast.setFont(FontSize.smallFont);
         backup = new CheckBox(Localization.lang("Backup old file when saving"));
-        backup.setFont(FontSize.smallFont);
         localAutoSave = new CheckBox(Localization.lang("Autosave local libraries"));
-        localAutoSave.setFont(FontSize.smallFont);
         resolveStringsAll = new RadioButton(Localization.lang("Resolve strings for all fields except") + ":");
-        resolveStringsAll.setFont(FontSize.smallFont);
         resolveStringsStandard = new RadioButton(Localization.lang("Resolve strings for standard BibTeX fields only"));
-        resolveStringsStandard.setFont(FontSize.smallFont);
 
         // This is sort of a quick hack
         newlineSeparator = new ComboBox<>(FXCollections.observableArrayList("CR", "CR/LF", "LF"));
 
         reformatFileOnSaveAndExport = new CheckBox(Localization.lang("Always reformat BIB file on save and export"));
-        reformatFileOnSaveAndExport.setFont(FontSize.smallFont);
 
         nonWrappableFields = new TextField();
         doNotResolveStringsFor = new TextField();
@@ -105,7 +95,6 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(openLast,  1, 2);
         builder.add(backup, 1, 3);
         Label label = new Label(Localization.lang("Do not wrap the following fields when saving") + ":");
-        label.setFont(FontSize.smallFont);
         builder.add(label, 1, 4);
         builder.add(nonWrappableFields, 2, 4);
         builder.add(resolveStringsStandard,  1, 5);
@@ -113,7 +102,6 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(doNotResolveStringsFor, 2, 6);
 
         Label newlineSeparatorLabel = new Label(Localization.lang("Newline separator") + ":");
-        newlineSeparatorLabel.setFont(FontSize.smallFont);
         builder.add(newlineSeparatorLabel, 1, 7);
         builder.add(newlineSeparator, 2, 7);
         builder.add(reformatFileOnSaveAndExport, 1, 8);
@@ -125,13 +113,11 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(externalFileLinks, 1, 11);
 
         label = new Label(Localization.lang("Main file directory") + ':');
-        label.setFont(FontSize.smallFont);
         builder.add(label, 1, 12);
         builder.add(fileDir, 2, 12);
 
         Button browse = new Button(Localization.lang("Browse"));
         browse.setPrefSize(80, 20);
-        browse.setFont(FontSize.smallFont);
         browse.setOnAction(e -> {
             DirectoryDialogConfiguration dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
                     .withInitialDirectory(Paths.get(fileDir.getText())).build();
@@ -146,7 +132,6 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(regExpTextField, 2, 16);
 
         Button help = new Button("?");
-        help.setFont(FontSize.smallFont);
         help.setOnAction(event -> new HelpAction(Localization.lang("Help on regular expression search"),
                 HelpFile.REGEX_SEARCH).getHelpButton().doClick());
 
@@ -162,7 +147,6 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(autosave, 1, 20);
         builder.add(localAutoSave,  1, 21);
         Button help1 = new Button("?");
-        help1.setFont(FontSize.smallFont);
         help1.setOnAction(event -> new HelpAction(HelpFile.AUTOSAVE).getHelpButton().doClick());
         builder.add(help1, 2, 21);
     }
diff --git a/src/main/java/org/jabref/gui/preferences/FontSize.java b/src/main/java/org/jabref/gui/preferences/FontSize.java
index dc7797f8212..65c0c53ffb2 100644
--- a/src/main/java/org/jabref/gui/preferences/FontSize.java
+++ b/src/main/java/org/jabref/gui/preferences/FontSize.java
@@ -7,5 +7,4 @@
  */
 public class FontSize {
     public static Font bigFont = new Font(14);
-    public static Font smallFont = new Font(10);
 }
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
index c8d6a134de8..1ead9353a1f 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
@@ -59,26 +59,18 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         biblatexMode = new ComboBox<>(FXCollections.observableArrayList(BibDatabaseMode.values()));
 
         memoryStick = new CheckBox(Localization.lang("Load and Save preferences from/to jabref.xml on start-up (memory stick mode)"));
-        memoryStick.setFont(FontSize.smallFont);
         useOwner = new CheckBox(Localization.lang("Mark new entries with owner name") + ':');
-        useOwner.setFont(FontSize.smallFont);
         updateTimeStamp = new CheckBox(Localization.lang("Update timestamp on modification"));
-        updateTimeStamp.setFont(FontSize.smallFont);
         useTimeStamp = new CheckBox(Localization.lang("Mark new entries with addition date") + ". "
                 + Localization.lang("Date format") + ':');
-        useTimeStamp.setFont(FontSize.smallFont);
         if (!useTimeStamp.isSelected()) {
             updateTimeStamp.setDisable(true);
         }
         useTimeStamp.setOnAction(e->updateTimeStamp.setDisable(!useTimeStamp.isSelected()));
         overwriteOwner = new CheckBox(Localization.lang("Overwrite"));
-        overwriteOwner.setFont(FontSize.smallFont);
         overwriteTimeStamp = new CheckBox(Localization.lang("If a pasted or imported entry already has the field set, overwrite."));
-        overwriteTimeStamp.setFont(FontSize.smallFont);
         enforceLegalKeys = new CheckBox(Localization.lang("Enforce legal characters in BibTeX keys"));
-        enforceLegalKeys.setFont(FontSize.smallFont);
         confirmDelete = new CheckBox(Localization.lang("Show confirmation dialog when deleting entries"));
-        confirmDelete.setFont(FontSize.smallFont);
         defOwnerField = new TextField();
         defOwnerField.setPrefSize(80, 20);
         timeStampFormat = new TextField();
@@ -86,9 +78,7 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         timeStampField = new TextField();
         timeStampField.setPrefSize(80, 20);
         inspectionWarnDupli = new CheckBox(Localization.lang("Warn about unresolved duplicates when closing inspection window"));
-        inspectionWarnDupli.setFont(FontSize.smallFont);
         shouldCollectTelemetry = new CheckBox(Localization.lang("Collect and share telemetry data to help improve JabRef."));
-        shouldCollectTelemetry.setFont(FontSize.smallFont);
         encodings = new ComboBox<>(FXCollections.observableArrayList(Encodings.ENCODINGS));
 
         Label general = new Label(Localization.lang("General") + "  -----------------------------------------------");
@@ -109,7 +99,6 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(overwriteOwner, 3, 10);
 
         Button help = new Button("?");
-        help.setFont(FontSize.smallFont);
         help.setPrefSize(10, 10);
         help.setOnAction(event -> new HelpAction(HelpFile.OWNER).getHelpButton().doClick());
         builder.add(help, 4, 10);
@@ -118,12 +107,10 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(timeStampFormat, 2, 13);
         builder.add(overwriteTimeStamp, 3, 13);
         Label fieldName = new Label(Localization.lang("Field name") + ':');
-        fieldName.setFont(FontSize.smallFont);
         builder.add(fieldName, 4, 13);
         builder.add(timeStampField, 5, 13);
 
         Button help1 = new Button("?");
-        help1.setFont(FontSize.smallFont);
         help1.setOnAction(event -> new HelpAction(HelpFile.TIMESTAMP).getHelpButton().doClick());
         builder.add(help1, 6, 13);
 
@@ -133,16 +120,13 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(shouldCollectTelemetry, 1, 15);
         builder.add(new Line(), 1, 16);
         Label languageLabel = new Label(Localization.lang("Language") + ':');
-        languageLabel.setFont(FontSize.smallFont);
         builder.add(languageLabel, 1, 17);
         builder.add(language, 2, 17);
         builder.add(new Line(), 2, 18);
         Label defaultEncoding = new Label(Localization.lang("Default encoding") + ':');
-        defaultEncoding.setFont(FontSize.smallFont);
         builder.add(defaultEncoding, 1, 19);
         builder.add(encodings, 2, 19);
         Label defaultBibliographyMode = new Label(Localization.lang("Default bibliography mode"));
-        defaultBibliographyMode.setFont(FontSize.smallFont);
         builder.add(defaultBibliographyMode, 1, 20);
         builder.add(biblatexMode, 2, 20);
     }
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java b/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
index 61666dac399..6fb4d96c26d 100644
--- a/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
@@ -38,9 +38,7 @@ public void handle(ActionEvent event) {
         });
 
         multiSelectionModeIntersection.setText(Localization.lang("Display only entries belonging to all selected groups."));
-        multiSelectionModeIntersection.setFont(FontSize.smallFont);
         multiSelectionModeUnion.setText(Localization.lang("Display all entries belonging to one or more of the selected groups."));
-        multiSelectionModeUnion.setFont(FontSize.smallFont);
 
         Label view = new Label(Localization.lang("View") + "  ---------------------------------------");
         view.setFont(FontSize.bigFont);
@@ -57,11 +55,9 @@ public void handle(ActionEvent event) {
         builder.add(dynamicGroups, 1, 8);
 
         Label defaultGrouping = new Label(Localization.lang("Default grouping field") + ":");
-        defaultGrouping.setFont(FontSize.smallFont);
         builder.add(defaultGrouping, 1, 9);
         builder.add(groupingField, 2, 9);
         Label label = new Label(Localization.lang("When adding/removing keywords, separate them by") + ":");
-        label.setFont(FontSize.smallFont);
         builder.add(label, 1, 10);
         builder.add(keywordSeparator, 2, 10);
     }
diff --git a/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java b/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
index aacc27f50b4..6a657a07cab 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
@@ -41,17 +41,12 @@ public class ImportSettingsTab extends Pane implements PrefsTab {
     public ImportSettingsTab(JabRefPreferences prefs) {
         this.prefs = Objects.requireNonNull(prefs);
         radioButtonNoMeta = new RadioButton(Localization.lang("Create blank entry linking the PDF"));
-        radioButtonNoMeta.setFont(FontSize.smallFont);
         radioButtonXmp = new RadioButton(Localization.lang("Create entry based on XMP-metadata"));
-        radioButtonXmp.setFont(FontSize.smallFont);
         radioButtonPDFcontent = new RadioButton(Localization.lang("Create entry based on content"));
-        radioButtonPDFcontent.setFont(FontSize.smallFont);
         radioButtononlyAttachPDF = new RadioButton(Localization.lang("Only attach PDF"));
-        radioButtononlyAttachPDF.setFont(FontSize.smallFont);
 
         useDefaultPDFImportStyle = new CheckBox(
                 Localization.lang("Always use this PDF import style (and do not ask for each import)"));
-        useDefaultPDFImportStyle.setFont(FontSize.smallFont);
 
         fileNamePattern = new TextField();
         fileDirPattern = new TextField();
@@ -77,13 +72,11 @@ public ImportSettingsTab(JabRefPreferences prefs) {
         defaultPdfFileLinkAction.setFont(FontSize.bigFont);
         builder.add(defaultPdfFileLinkAction, 1, 8);
         Label filenameFormatPattern = new Label(Localization.lang("Filename format pattern").concat(":"));
-        filenameFormatPattern.setFont(FontSize.smallFont);
         builder.add(filenameFormatPattern, 1, 9);
         builder.add(fileNamePattern, 2, 9);
         builder.add(selectFileNamePattern, 3, 9);
 
         Label lbfileDirPattern = new Label(Localization.lang("File directory pattern").concat(":"));
-        lbfileDirPattern.setFont(FontSize.smallFont);
         builder.add(lbfileDirPattern, 1, 10);
         builder.add(fileDirPattern, 2, 10);
     }
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java b/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
index 65b355e19be..e0b4b1da98d 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
@@ -118,7 +118,6 @@ public NameFormatterTab(JabRefPreferences prefs) {
         Label insertRows = new Label(Localization.lang("Insert rows"));
         insertRows.setVisible(false);
         Button add = new Button("Insert");
-        add.setFont(FontSize.smallFont);
         add.setOnAction(e-> {
             if (!addName.getText().isEmpty() && !addLast.getText().isEmpty()) {
                 TableRow tableRow = new TableRow(addName.getText(), addLast.getText());
@@ -134,7 +133,6 @@ public NameFormatterTab(JabRefPreferences prefs) {
         Label deleteRows = new Label(Localization.lang("Delete rows"));
         deleteRows.setVisible(false);
         Button delete = new Button("Delete");
-        delete.setFont(FontSize.smallFont);
         delete.setOnAction(e-> {
             if (table.getFocusModel() != null && table.getFocusModel().getFocusedIndex() != -1) {
                 tableChanged = true;
@@ -146,7 +144,6 @@ public NameFormatterTab(JabRefPreferences prefs) {
                 table.refresh();
             }});
         Button help = new Button("?");
-        help.setFont(FontSize.smallFont);
         help.setOnAction(e-> new HelpAction(Localization.lang("Help on Name Formatting"),
                 HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER).getHelpButton().doClick());
         HBox toolbar = new HBox();
diff --git a/src/main/java/org/jabref/gui/preferences/NetworkTab.java b/src/main/java/org/jabref/gui/preferences/NetworkTab.java
index 89b18631052..ae16eeab828 100644
--- a/src/main/java/org/jabref/gui/preferences/NetworkTab.java
+++ b/src/main/java/org/jabref/gui/preferences/NetworkTab.java
@@ -35,14 +35,12 @@ public NetworkTab(DialogService dialogService, JabRefPreferences preferences) {
         this.preferences = preferences;
 
         useProxyCheckBox = new CheckBox(Localization.lang("Use custom proxy configuration"));
-        useProxyCheckBox.setFont(FontSize.smallFont);
         hostnameTextField = new TextField();
         hostnameTextField.setDisable(true);
         portTextField = new TextField();
         portTextField.setDisable(true);
 
         useAuthenticationCheckBox = new CheckBox(Localization.lang("Proxy requires authentication"));
-        useAuthenticationCheckBox.setFont(FontSize.smallFont);
         useAuthenticationCheckBox.setDisable(true);
 
         usernameTextField = new TextField();
@@ -50,7 +48,6 @@ public NetworkTab(DialogService dialogService, JabRefPreferences preferences) {
         passwordTextField = new PasswordField();
         passwordTextField.setDisable(true);
         Label passwordWarningLabel = new Label(Localization.lang("Attention: Password is stored in plain text!"));
-        passwordWarningLabel.setFont(FontSize.smallFont);
         passwordWarningLabel.setDisable(true);
         passwordWarningLabel.setTextFill(Paint.valueOf("Red"));
 
@@ -73,20 +70,16 @@ public NetworkTab(DialogService dialogService, JabRefPreferences preferences) {
         builder.add(new Separator(), 2, 1);
         builder.add(useProxyCheckBox, 2, 2);
         Label hostname = new Label(Localization.lang("Hostname") + ':');
-        hostname.setFont(FontSize.smallFont);
         builder.add(hostname, 1, 3);
         builder.add(hostnameTextField, 2, 3);
         Label port = new Label(Localization.lang("Port") + ':');
-        port.setFont(FontSize.smallFont);
         builder.add(port, 1, 4);
         builder.add(portTextField, 2, 4);
         builder.add(useAuthenticationCheckBox, 2, 5);
         Label username = new Label(Localization.lang("Username") + ':');
-        username.setFont(FontSize.smallFont);
         builder.add(username, 2, 6);
         builder.add(usernameTextField, 3, 6);
         Label password = new Label(Localization.lang("Password") + ':');
-        password.setFont(FontSize.smallFont);
         builder.add(password, 2, 7);
         builder.add(passwordTextField, 3, 7);
         builder.add(passwordWarningLabel, 3, 8);
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
index 6697fb84f10..56c2d0dd0b0 100644
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
@@ -213,20 +213,15 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
         tabPanel.setBottom(toolBar);
 
         fileColumn = new CheckBox(Localization.lang("Show file column"));
-        fileColumn.setFont(FontSize.smallFont);
         urlColumn = new CheckBox(Localization.lang("Show URL/DOI column"));
-        urlColumn.setFont(FontSize.smallFont);
         preferUrl = new RadioButton(Localization.lang("Show URL first"));
-        preferUrl.setFont(FontSize.smallFont);
         preferDoi = new RadioButton(Localization.lang("Show DOI first"));
-        preferDoi.setFont(FontSize.smallFont);
 
         urlColumn.setOnAction(arg0 -> {
             preferUrl.setDisable(!urlColumn.isSelected());
             preferDoi.setDisable(!urlColumn.isSelected());
         });
         arxivColumn = new CheckBox(Localization.lang("Show ArXiv column"));
-        arxivColumn.setFont(FontSize.smallFont);
 
         Collection<ExternalFileType> fileTypes = ExternalFileTypes.getInstance().getExternalFileTypeSelection();
         String[] fileTypeNames = new String[fileTypes.size()];
@@ -241,7 +236,6 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
         listOfFileColumnsScrollPane.setMaxHeight(80);
         listOfFileColumnsScrollPane.setContent(listOfFileColumnsVBox);
         extraFileColumns = new CheckBox(Localization.lang("Show extra columns"));
-        extraFileColumns.setFont(FontSize.smallFont);
         if (!extraFileColumns.isSelected()) {
             listOfFileColumnsVBox.setDisable(true);
         }
@@ -255,28 +249,19 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
                 HelpFile.SPECIAL_FIELDS).getHelpButton().doClick());
 
         rankingColumn = new CheckBox(Localization.lang("Show rank"));
-        rankingColumn.setFont(FontSize.smallFont);
         qualityColumn = new CheckBox(Localization.lang("Show quality"));
-        qualityColumn.setFont(FontSize.smallFont);
         priorityColumn = new CheckBox(Localization.lang("Show priority"));
-        priorityColumn.setFont(FontSize.smallFont);
         relevanceColumn = new CheckBox(Localization.lang("Show relevance"));
-        relevanceColumn.setFont(FontSize.smallFont);
         printedColumn = new CheckBox(Localization.lang("Show printed status"));
-        printedColumn.setFont(FontSize.smallFont);
         readStatusColumn = new CheckBox(Localization.lang("Show read status"));
-        readStatusColumn.setFont(FontSize.smallFont);
 
         // "sync keywords" and "write special" fields may be configured mutually exclusive only
         // The implementation supports all combinations (TRUE+TRUE and FALSE+FALSE, even if the latter does not make sense)
         // To avoid confusion, we opted to make the setting mutually exclusive
         syncKeywords = new RadioButton(Localization.lang("Synchronize with keywords"));
-        syncKeywords.setFont(FontSize.smallFont);
         writeSpecialFields = new RadioButton(Localization.lang("Write values of special fields as separate fields to BibTeX"));
-        writeSpecialFields.setFont(FontSize.smallFont);
 
         specialFieldsEnabled = new CheckBox(Localization.lang("Enable special fields"));
-        specialFieldsEnabled.setFont(FontSize.smallFont);
         specialFieldsEnabled.setOnAction(event -> {
             boolean isEnabled = specialFieldsEnabled.isSelected();
             rankingColumn.setDisable(!isEnabled);
@@ -325,11 +310,9 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
 
         Button buttonWidth = new Button("Update to current column widths");
         buttonWidth.setPrefSize(200, 30);
-        buttonWidth.setFont(FontSize.smallFont);
         buttonWidth.setOnAction(e->new UpdateWidthsAction());
         Button buttonOrder = new Button("Update to current column order");
         buttonOrder.setPrefSize(200, 30);
-        buttonOrder.setFont(FontSize.smallFont);
         buttonOrder.setOnAction(e->new UpdateOrderAction());
         builder.add(buttonWidth, 1, 6);
         builder.add(buttonOrder, 1, 7);
diff --git a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
index ded73d21acc..cc56f288476 100644
--- a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
@@ -71,21 +71,13 @@ public TablePrefsTab(JabRefPreferences prefs) {
         terSort = new ComboBox<>(FXCollections.observableArrayList(allPlusKey));
 
         autoResizeMode = new CheckBox(Localization.lang("Fit table horizontally on screen"));
-        autoResizeMode.setFont(FontSize.smallFont);
         namesAsIs = new RadioButton(Localization.lang("Show names unchanged"));
-        namesAsIs.setFont(FontSize.smallFont);
         namesFf = new RadioButton(Localization.lang("Show 'Firstname Lastname'"));
-        namesFf.setFont(FontSize.smallFont);
         namesFl = new RadioButton(Localization.lang("Show 'Lastname, Firstname'"));
-        namesFl.setFont(FontSize.smallFont);
         namesNatbib = new RadioButton(Localization.lang("Natbib style"));
-        namesNatbib.setFont(FontSize.smallFont);
         noAbbrNames = new RadioButton(Localization.lang("Do not abbreviate names"));
-        noAbbrNames.setFont(FontSize.smallFont);
         abbrNames = new RadioButton(Localization.lang("Abbreviate names"));
-        abbrNames.setFont(FontSize.smallFont);
         lastNamesOnly = new RadioButton(Localization.lang("Show last names only"));
-        lastNamesOnly.setFont(FontSize.smallFont);
 
         priField = new TextField();
         secField = new TextField();
@@ -114,11 +106,8 @@ public TablePrefsTab(JabRefPreferences prefs) {
         });
 
         priDesc = new CheckBox(Localization.lang("Descending"));
-        priDesc.setFont(FontSize.smallFont);
         secDesc = new CheckBox(Localization.lang("Descending"));
-        secDesc.setFont(FontSize.smallFont);
         terDesc = new CheckBox(Localization.lang("Descending"));
-        terDesc.setFont(FontSize.smallFont);
 
         Label formatOfAuthor = new Label(Localization.lang("Format of author and editor names") + "  ----------------------");
         formatOfAuthor.setFont(FontSize.bigFont);
@@ -139,28 +128,24 @@ public TablePrefsTab(JabRefPreferences prefs) {
         builder.add(defaultSortCriteria, 1, 7);
         // Create a new panel with its own FormLayout for these items:
         Label primarySortCriterion = new Label(Localization.lang("Primary sort criterion"));
-        primarySortCriterion.setFont(FontSize.smallFont);
         builder.add(primarySortCriterion, 1, 8);
         builder.add(priSort, 2, 8);
         builder.add(priField, 3, 8);
         builder.add(priDesc, 4, 8);
 
         Label secondarySortCriterion = new Label(Localization.lang("Secondary sort criterion"));
-        secondarySortCriterion.setFont(FontSize.smallFont);
         builder.add(secondarySortCriterion, 1, 9);
         builder.add(secSort, 2, 9);
         builder.add(secField, 3, 9);
         builder.add(secDesc, 4, 9);
 
         Label tertiarySortCriterion = new Label(Localization.lang("Tertiary sort criterion"));
-        tertiarySortCriterion.setFont(FontSize.smallFont);
         builder.add(tertiarySortCriterion, 1, 10);
         builder.add(terSort, 2, 10);
         builder.add(terField, 3, 10);
         builder.add(terDesc, 4, 10);
 
         Label sortFields = new Label(Localization.lang("Sort the following fields as numeric fields") + ':');
-        sortFields.setFont(FontSize.smallFont);
         builder.add(sortFields, 1, 11);
         builder.add(numericFields, 2, 11);
 
diff --git a/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java b/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
index 3252175ec83..e43551a99ef 100644
--- a/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
@@ -103,7 +103,6 @@ public XmpPrefsTab(JabRefPreferences prefs) {
         Label xmpExportPrivacySettings = new Label(Localization.lang("XMP export privacy settings") + "  -------------------------");
         xmpExportPrivacySettings.setFont(FontSize.bigFont);
         builder.add(xmpExportPrivacySettings, 1, 1);
-        privacyFilterCheckBox.setFont(FontSize.smallFont);
         builder.add(privacyFilterCheckBox, 1, 2);
         builder.add(tablePanel, 1, 3);
 

From f9b26ef9b958f7e768b42b09cc095f30d7bf57dd Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 20 Aug 2018 15:44:06 +0200
Subject: [PATCH 054/229] Fix checkbox display

---
 src/main/java/org/jabref/gui/Base.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 74e0df96bcb..abd966c08d6 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -380,7 +380,7 @@
     -fx-border-color: rgba(0, 0, 0, 0.54);
     -fx-border-width: 2px;
     -fx-border-radius: 1px;
-    -fx-padding: 0.166667em 0.166667em 0.25em 0.25em;
+    -fx-padding: 0.1em 0.1em 0.2em 0.2em;
 }
 
 .check-box:selected > .box {
@@ -391,8 +391,9 @@
 
 .check-box > .box > .mark {
     -fx-background-color: white;
-    -fx-padding: 0.166667em 0.166667em 0.166667em 0.166667 m;
+    -fx-padding: 0.2em 0.2em 0.2em 0.2em;
     -fx-shape: "M6.61 11.89L3.5 8.78 2.44 9.84 6.61 14l8.95-8.95L14.5 4z";
+    -fx-stroke-width: 5;
 }
 
 .menu-bar {

From bd5a440296ab77fa7dc210bcbc5af9ee4e4d4365 Mon Sep 17 00:00:00 2001
From: NorwayMaple <abepolk@gmail.com>
Date: Tue, 21 Aug 2018 11:32:32 -0400
Subject: [PATCH 055/229] Changed the behavior of the field formatting dialog
 (#4275)

* Change formatting behavior

* Updated CHANGELOG.md

* Add unit tests
---
 CHANGELOG.md                                  |  7 +++--
 .../model/cleanup/FieldFormatterCleanup.java  |  8 +++--
 .../cleanup/FieldFormatterCleanupTest.java    | 29 +++++++++++++++++++
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c74df57dea..0429c492efa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ## [Unreleased]
 
 ### Changed
+- We changed the behavior of the field formatting dialog such that the `bibtexkey` is not changed when formatting all fields or all text fields.
 - We added a "Move file to file directory and rename file" option for simultaneously moving and renaming of document file. [#4166](https://github.com/JabRef/jabref/issues/4166)
 - Use integrated graphics card instead of discrete on macOS [#4070](https://github.com/JabRef/jabref/issues/4070)
 - We changed the minimum required version of Java to 1.8.0_171, as this is the latest release for which the automatic Java update works.  [4093](https://github.com/JabRef/jabref/issues/4093)
@@ -118,9 +119,9 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 
 ## Older versions
 
-The changelog of JabRef 4.x is available at the [v4.x branch](https://github.com/JabRef/jabref/blob/v4.x/CHANGELOG.md).  
-The changelog of JabRef 3.x is available at the [v3.8.2 tag](https://github.com/JabRef/jabref/blob/v3.8.2/CHANGELOG.md).  
-The changelog of JabRef 2.11 and all previous versions is available as [text file in the v2.11.1 tag](https://github.com/JabRef/jabref/blob/v2.11.1/CHANGELOG).  
+The changelog of JabRef 4.x is available at the [v4.x branch](https://github.com/JabRef/jabref/blob/v4.x/CHANGELOG.md).
+The changelog of JabRef 3.x is available at the [v3.8.2 tag](https://github.com/JabRef/jabref/blob/v3.8.2/CHANGELOG.md).
+The changelog of JabRef 2.11 and all previous versions is available as [text file in the v2.11.1 tag](https://github.com/JabRef/jabref/blob/v2.11.1/CHANGELOG).
 
 [Unreleased]: https://github.com/JabRef/jabref/compare/v4.3...HEAD
 [4.3]: https://github.com/JabRef/jabref/compare/v4.2...v4.3
diff --git a/src/main/java/org/jabref/model/cleanup/FieldFormatterCleanup.java b/src/main/java/org/jabref/model/cleanup/FieldFormatterCleanup.java
index 5a4f800107b..13e8b57fa65 100644
--- a/src/main/java/org/jabref/model/cleanup/FieldFormatterCleanup.java
+++ b/src/main/java/org/jabref/model/cleanup/FieldFormatterCleanup.java
@@ -71,7 +71,9 @@ private List<FieldChange> cleanupAllFields(BibEntry entry) {
         List<FieldChange> fieldChanges = new ArrayList<>();
 
         for (String fieldKey : entry.getFieldNames()) {
-            fieldChanges.addAll(cleanupSingleField(fieldKey, entry));
+            if (!fieldKey.equals(BibEntry.KEY_FIELD)) {
+                fieldChanges.addAll(cleanupSingleField(fieldKey, entry));
+            }
         }
 
         return fieldChanges;
@@ -82,7 +84,9 @@ private List<FieldChange> cleanupAllTextFields(BibEntry entry) {
         Set<String> fields = entry.getFieldNames();
         fields.removeAll(FieldName.getNotTextFieldNames());
         for (String fieldKey : fields) {
-            fieldChanges.addAll(cleanupSingleField(fieldKey, entry));
+            if (!fieldKey.equals(BibEntry.KEY_FIELD)) {
+                fieldChanges.addAll(cleanupSingleField(fieldKey, entry));
+            }
         }
 
         return fieldChanges;
diff --git a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
index 9f3b76b5bdf..57a87a1493d 100644
--- a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 
 import org.jabref.logic.formatter.casechanger.UpperCaseFormatter;
+import org.jabref.logic.formatter.bibtexfields.UnicodeToLatexFormatter;
 import org.jabref.model.cleanup.FieldFormatterCleanup;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibtexEntryTypes;
@@ -63,4 +64,32 @@ public void testInternalAllTextFieldsField() throws Exception {
         assertEquals(fieldMap.get("doi"), entry.getField("doi").get());
         assertEquals(fieldMap.get("issn"), entry.getField("issn").get());
     }
+
+    @Test
+    public void testCleanupAllFieldsIgnoresKeyField() throws Exception {
+        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(FieldName.INTERNAL_ALL_FIELD, new UnicodeToLatexFormatter());
+        entry.setField(BibEntry.KEY_FIELD, "François-Marie Arouet"); // Contains ç, not in Basic Latin
+        cleanup.cleanup(entry);
+
+        assertEquals("François-Marie Arouet", entry.getField(BibEntry.KEY_FIELD).get());
+    }
+
+    @Test
+    public void testCleanupAllTextFieldsIgnoresKeyField() throws Exception {
+        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(FieldName.INTERNAL_ALL_TEXT_FIELDS_FIELD, new UnicodeToLatexFormatter());
+        entry.setField(BibEntry.KEY_FIELD, "François-Marie Arouet"); // Contains ç, not in Basic Latin
+        cleanup.cleanup(entry);
+
+        assertEquals("François-Marie Arouet", entry.getField(BibEntry.KEY_FIELD).get());
+    }
+
+    @Test
+    public void testCleanupKeyFieldCleansUpKeyField() throws Exception {
+        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(BibEntry.KEY_FIELD, new UnicodeToLatexFormatter());
+        entry.setField(BibEntry.KEY_FIELD, "François-Marie Arouet"); // Contains ç, not in Basic Latin
+        cleanup.cleanup(entry);
+
+        assertEquals("Fran{\\c{c}}ois-Marie Arouet", entry.getField(BibEntry.KEY_FIELD).get());
+    }
+
 }

From 7348bbadeefa5656d0b43b0947d4a3ec90663cc9 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 21 Aug 2018 22:34:01 +0200
Subject: [PATCH 056/229] Fix a few style issues

---
 src/main/java/org/jabref/gui/Base.css         | 20 ++++++++++++++-----
 src/main/java/org/jabref/gui/SidePane.java    |  2 ++
 .../gui/preferences/PreferencesDialog.css     |  4 ++++
 .../gui/preferences/PreferencesDialog.java    |  4 +++-
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index abd966c08d6..8eb1c449a3e 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -524,9 +524,9 @@
 .table-view:focused,
 .tree-table-view:focused,
 .html-editor:contains-focus {
-    -fx-background-color: -fx-outer-border, -fx-control-inner-background;
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 0, 0;
+    -fx-background-color: -fx-control-inner-background;
+    -fx-background-insets: 0;
+    -fx-background-radius: 0;
 }
 
 /* Selected rows */
@@ -551,8 +551,7 @@
     -fx-background: -jr-selected;
     -fx-background-color: -jr-selected;
     -fx-table-cell-border-color: transparent;
-    -fx-fill: white;
-    -fx-text-fill: green;
+    -fx-text-fill: -jr-black;
 }
 
 .combo-box-base {
@@ -594,8 +593,11 @@
     -fx-text-fill: -fx-text-base-color;
 }
 
+.stack-pane,
 .scroll-pane,
+.scroll-pane > .viewport,
 .split-pane {
+    -fx-background-color: transparent;
     -fx-background-insets: 0, 0;
     -fx-padding: 0;
 }
@@ -897,3 +899,11 @@ We want to have a look that matches our icons in the tool-bar */
 .mainToolbar .context-menu * {
     -fx-background-color: -fx-control-inner-background;
 }
+
+#sidePane {
+    -fx-background-color: -jr-sidepane-background;
+}
+
+.sidePaneComponent {
+    -fx-background-color: -jr-sidepane-background;
+}
diff --git a/src/main/java/org/jabref/gui/SidePane.java b/src/main/java/org/jabref/gui/SidePane.java
index b4f22230346..0e6c47dd815 100644
--- a/src/main/java/org/jabref/gui/SidePane.java
+++ b/src/main/java/org/jabref/gui/SidePane.java
@@ -13,6 +13,7 @@ public class SidePane extends BorderPane {
     private final VBox mainPanel = new VBox();
 
     public SidePane() {
+        setId("sidePane");
         setCenter(mainPanel);
     }
 
@@ -21,6 +22,7 @@ public void setComponents(Collection<SidePaneComponent> components) {
 
         for (SidePaneComponent component : components) {
             BorderPane node = new BorderPane();
+            node.getStyleClass().add("sidePaneComponent");
             node.setTop(component.getHeader());
             node.setCenter(component.getContentPane());
             mainPanel.getChildren().add(node);
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
index 955ca91573e..22db04e00f0 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
@@ -6,3 +6,7 @@
     -fx-padding: 8 8 8 8;
     -fx-background: -jr-white;
 }
+
+.preferencePaneContainer {
+    -fx-padding: 0em 1em 0em 2em;
+}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 45a1c4bc6d1..6773c5e301a 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -107,7 +107,9 @@ private void construct() {
         tabsList.itemsProperty().setValue(preferenceTabs);
         EasyBind.subscribe(tabsList.getSelectionModel().selectedItemProperty(), tab -> {
             if (tab != null) {
-                container.setCenter(new ScrollPane(tab.getBuilder()));
+                ScrollPane preferencePaneContainer = new ScrollPane(tab.getBuilder());
+                preferencePaneContainer.getStyleClass().add("preferencePaneContainer");
+                container.setCenter(preferencePaneContainer);
             }
         });
         tabsList.getSelectionModel().selectFirst();

From f931ac0afde0b7b7508df9ae6d2cdd63c21be5fe Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 21 Aug 2018 22:49:15 +0200
Subject: [PATCH 057/229] Style preference sections using css

---
 .../jabref/gui/preferences/AdvancedTab.java   | 12 +++++------
 .../preferences/BibtexKeyPatternPrefTab.java  |  4 ++--
 .../gui/preferences/EntryEditorPrefsTab.java  | 16 +++++++--------
 .../preferences/ExportSortingPrefsTab.java    |  4 ++--
 .../jabref/gui/preferences/ExternalTab.java   | 16 +++++++--------
 .../org/jabref/gui/preferences/FileTab.java   | 12 +++++------
 .../org/jabref/gui/preferences/FontSize.java  | 10 ----------
 .../jabref/gui/preferences/GeneralTab.java    |  4 ++--
 .../gui/preferences/GroupsPrefsTab.java       |  8 ++++----
 .../gui/preferences/ImportSettingsTab.java    |  6 +++---
 .../gui/preferences/NameFormatterTab.java     | 18 ++++++++---------
 .../jabref/gui/preferences/NetworkTab.java    |  4 ++--
 .../gui/preferences/PreferencesDialog.css     |  7 ++++++-
 .../gui/preferences/PreviewPrefsTab.java      |  4 ++--
 .../gui/preferences/TableColumnsTab.java      | 20 +++++++++----------
 .../jabref/gui/preferences/TablePrefsTab.java | 12 +++++------
 .../jabref/gui/preferences/XmpPrefsTab.java   | 11 +++++-----
 17 files changed, 79 insertions(+), 89 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/preferences/FontSize.java

diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTab.java b/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
index b8fa886c3d4..3fcd0516ce5 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
@@ -49,8 +49,8 @@ public AdvancedTab(DialogService dialogService, JabRefPreferences prefs) {
         useCaseKeeperOnSearch = new CheckBox(Localization.lang("Add {} to specified title words on search to keep the correct case"));
         useUnitFormatterOnSearch = new CheckBox(Localization.lang("Format units by adding non-breaking separators and keeping the correct case on search"));
 
-        Label remoteOperation = new Label(Localization.lang("Remote operation") + "  -----------------------------");
-        remoteOperation.setFont(FontSize.bigFont);
+        Label remoteOperation = new Label(Localization.lang("Remote operation"));
+        remoteOperation.getStyleClass().add("sectionHeader");
         builder.add(remoteOperation, 2, 1);
         builder.add(new Separator(), 2, 1);
         builder.add(new Pane(), 1, 2);
@@ -83,8 +83,8 @@ public AdvancedTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(p, 2, 9);
         builder.add(new Label(""), 1, 10);
 
-        Label explore = new Label(Localization.lang("Search %0", "IEEEXplore") + "  -----------------------------");
-        explore.setFont(FontSize.bigFont);
+        Label explore = new Label(Localization.lang("Search %0", "IEEEXplore"));
+        explore.getStyleClass().add("sectionHeader");
         builder.add(explore, 2, 11);
         builder.add(new Separator(), 2, 11);
         builder.add(new Pane(), 2, 12);
@@ -93,8 +93,8 @@ public AdvancedTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(new Line(), 2, 16);
         builder.add(new Label(""), 1, 17);
 
-        Label importConversions = new Label(Localization.lang("Import conversions") + "  ----------------------------");
-        importConversions.setFont(FontSize.bigFont);
+        Label importConversions = new Label(Localization.lang("Import conversions"));
+        importConversions.getStyleClass().add("sectionHeader");
         builder.add(importConversions, 2, 18);
 
         builder.add(useCaseKeeperOnSearch, 2, 19);
diff --git a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
index 2f428d3f75e..3dabc05b209 100644
--- a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
+++ b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
@@ -79,8 +79,8 @@ public void storeSettings() {
 
     private void appendKeyGeneratorSettings() {
         // Build a panel for checkbox settings:
-        Label keyGeneratorSettings = new Label(Localization.lang("Key generator settings") + "  --------------------------");
-        keyGeneratorSettings.setFont(FontSize.bigFont);
+        Label keyGeneratorSettings = new Label(Localization.lang("Key generator settings"));
+        keyGeneratorSettings.getStyleClass().add("sectionHeader");
         builder.add(keyGeneratorSettings, 1, 10);
         builder.add(autoGenerateOnImport, 1, 11);
         builder.add(letterStartA, 2, 11);
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
index 3987fe266de..4530cb88157 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
@@ -74,8 +74,8 @@ public EntryEditorPrefsTab(JabRefPreferences prefs) {
         // autoCompFields text field:
         autoComplete.setOnAction(event -> setAutoCompleteElementsEnabled(autoComplete.isSelected()));
 
-        Label editorOptions = new Label(Localization.lang("Editor options") + "  -------------------------------------");
-        editorOptions.setFont(FontSize.bigFont);
+        Label editorOptions = new Label(Localization.lang("Editor options"));
+        editorOptions.getStyleClass().add("sectionHeader");
         builder.add(editorOptions, 1, 1);
         builder.add(new Separator(), 2, 1);
         builder.add(autoOpenForm,  1, 2);
@@ -87,8 +87,8 @@ public EntryEditorPrefsTab(JabRefPreferences prefs) {
         builder.add(validation, 1, 8);
         builder.add(new Label(""), 1, 9);
 
-        Label autocompletionOptions = new Label(Localization.lang("Autocompletion options") + "  --------------------------");
-        autocompletionOptions.setFont(FontSize.bigFont);
+        Label autocompletionOptions = new Label(Localization.lang("Autocompletion options"));
+        autocompletionOptions.getStyleClass().add("sectionHeader");
         builder.add(autocompletionOptions, 1, 10);
         builder.add(autoComplete,   1, 11);
 
@@ -97,16 +97,16 @@ public EntryEditorPrefsTab(JabRefPreferences prefs) {
         builder.add(autoCompFields, 2, 12);
         builder.add(new Label(""), 1, 13);
 
-        Label nameFormat = new Label(Localization.lang("Name format used for autocompletion") + "  ----------");
-        nameFormat.setFont(FontSize.bigFont);
+        Label nameFormat = new Label(Localization.lang("Name format used for autocompletion"));
+        nameFormat.getStyleClass().add("sectionHeader");
         builder.add(nameFormat, 1, 14);
         builder.add(autoCompFF, 1, 15);
         builder.add(autoCompLF,  1, 16);
         builder.add(autoCompBoth,  1, 17);
         builder.add(new Label(""), 1, 18);
 
-        Label treatment = new Label(Localization.lang("Treatment of first names") + "  --------------------------");
-        treatment.setFont(FontSize.bigFont);
+        Label treatment = new Label(Localization.lang("Treatment of first names"));
+        treatment.getStyleClass().add("sectionHeader");
         builder.add(treatment, 1, 19);
         builder.add(firstNameModeAbbr,  1, 20);
         builder.add(firstNameModeFull, 1, 21);
diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index 9d46bf900f1..cf1e1554819 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -47,8 +47,8 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
         exportInTableOrder.setOnAction(listener);
         exportInSpecifiedOrder.setOnAction(listener);
 
-        Label exportSortOrder = new Label(Localization.lang("Export sort order") + "  ------------------------");
-        exportSortOrder.setFont(FontSize.bigFont);
+        Label exportSortOrder = new Label(Localization.lang("Export sort order"));
+        exportSortOrder.getStyleClass().add("sectionHeader");
         // create GUI
         builder.add(exportSortOrder, 1, 1);
         builder.add(new Separator(), 2, 1);
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTab.java b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
index 633e3128616..a9ec0064a42 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
@@ -87,8 +87,8 @@ public ExternalTab(JabRefFrame frame, PreferencesDialog prefsDiag, JabRefPrefere
             pdfOptionPanel.add(browseSumatraReader,  3, 2);
         }
 
-        Label sendingOfEmails = new Label(Localization.lang("Sending of emails") + "  ----------------------------");
-        sendingOfEmails.setFont(FontSize.bigFont);
+        Label sendingOfEmails = new Label(Localization.lang("Sending of emails"));
+        sendingOfEmails.getStyleClass().add("sectionHeader");
         builder.add(sendingOfEmails, 1, 1);
         Label subject = new Label(Localization.lang("Subject for sending an email with references").concat(":"));
         builder.add(subject, 1, 2);
@@ -98,8 +98,8 @@ public ExternalTab(JabRefFrame frame, PreferencesDialog prefsDiag, JabRefPrefere
         builder.add(openFoldersOfAttachedFiles, 1, 3);
 
         builder.add(new Label(""), 1, 4);
-        Label externalPrograms = new Label(Localization.lang("External programs") + "  ----------------------------");
-        externalPrograms.setFont(FontSize.bigFont);
+        Label externalPrograms = new Label(Localization.lang("External programs"));
+        externalPrograms.getStyleClass().add("sectionHeader");
         builder.add(externalPrograms, 1, 5);
 
         GridPane butpan = new GridPane();
@@ -116,15 +116,15 @@ public ExternalTab(JabRefFrame frame, PreferencesDialog prefsDiag, JabRefPrefere
         builder.add(citeCommand, 2, 7);
         builder.add(editFileTypes, 1, 8);
         builder.add(new Label(""), 1, 9);
-        Label openConsole = new Label(Localization.lang("Open console") + "  ---------------------------------");
-        openConsole.setFont(FontSize.bigFont);
+        Label openConsole = new Label(Localization.lang("Open console"));
+        openConsole.getStyleClass().add("sectionHeader");
         builder.add(openConsole, 1, 10);
 
         builder.add(consoleOptionPanel, 1, 11);
         builder.add(new Label(""), 1, 12);
 
-        Label openPdf = new Label(Localization.lang("Open PDF") + "  -------------------------------------");
-        openPdf.setFont(FontSize.bigFont);
+        Label openPdf = new Label(Localization.lang("Open PDF"));
+        openPdf.getStyleClass().add("sectionHeader");
         builder.add(openPdf,  1, 12);
 
         builder.add(pdfOptionPanel, 1, 13);
diff --git a/src/main/java/org/jabref/gui/preferences/FileTab.java b/src/main/java/org/jabref/gui/preferences/FileTab.java
index 7fc51fbf8ef..4957a672f96 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTab.java
+++ b/src/main/java/org/jabref/gui/preferences/FileTab.java
@@ -89,8 +89,8 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         doNotResolveStringsFor.setPrefSize(80, 25);
         builder.setPrefSize(800, 600);
 
-        Label general = new Label(Localization.lang("General") + "  ----------------------------------------------");
-        general.setFont(FontSize.bigFont);
+        Label general = new Label(Localization.lang("General"));
+        general.getStyleClass().add("sectionHeader");
         builder.add(general, 1, 1);
         builder.add(openLast,  1, 2);
         builder.add(backup, 1, 3);
@@ -108,8 +108,8 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         Label invisible = new Label("");
         builder.add(invisible, 1, 9);
 
-        Label externalFileLinks = new Label(Localization.lang("External file links") + "  ------------------------------------");
-        externalFileLinks.setFont(FontSize.bigFont);
+        Label externalFileLinks = new Label(Localization.lang("External file links"));
+        externalFileLinks.getStyleClass().add("sectionHeader");
         builder.add(externalFileLinks, 1, 11);
 
         label = new Label(Localization.lang("Main file directory") + ':');
@@ -142,8 +142,8 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         Label invisible1 = new Label("");
         builder.add(invisible1, 1, 19);
 
-        Label autosave = new Label(Localization.lang("Autosave") + "  ---------------------------------------------");
-        autosave.setFont(FontSize.bigFont);
+        Label autosave = new Label(Localization.lang("Autosave"));
+        autosave.getStyleClass().add("sectionHeader");
         builder.add(autosave, 1, 20);
         builder.add(localAutoSave,  1, 21);
         Button help1 = new Button("?");
diff --git a/src/main/java/org/jabref/gui/preferences/FontSize.java b/src/main/java/org/jabref/gui/preferences/FontSize.java
deleted file mode 100644
index 65c0c53ffb2..00000000000
--- a/src/main/java/org/jabref/gui/preferences/FontSize.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.jabref.gui.preferences;
-
-import javafx.scene.text.Font;
-
-/**
- *   This class is used to save the font size of all the controls in the preferences dialog
- */
-public class FontSize {
-    public static Font bigFont = new Font(14);
-}
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
index 1ead9353a1f..12cb5dd03cc 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
@@ -81,8 +81,8 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         shouldCollectTelemetry = new CheckBox(Localization.lang("Collect and share telemetry data to help improve JabRef."));
         encodings = new ComboBox<>(FXCollections.observableArrayList(Encodings.ENCODINGS));
 
-        Label general = new Label(Localization.lang("General") + "  -----------------------------------------------");
-        general.setFont(FontSize.bigFont);
+        Label general = new Label(Localization.lang("General"));
+        general.getStyleClass().add("sectionHeader");
         builder.add(general, 1, 1);
         builder.add(new Line(), 1, 2);
         builder.add(inspectionWarnDupli, 1, 3);
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java b/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
index 6fb4d96c26d..989f4b534cc 100644
--- a/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
@@ -40,8 +40,8 @@ public void handle(ActionEvent event) {
         multiSelectionModeIntersection.setText(Localization.lang("Display only entries belonging to all selected groups."));
         multiSelectionModeUnion.setText(Localization.lang("Display all entries belonging to one or more of the selected groups."));
 
-        Label view = new Label(Localization.lang("View") + "  ---------------------------------------");
-        view.setFont(FontSize.bigFont);
+        Label view = new Label(Localization.lang("View"));
+        view.getStyleClass().add("sectionHeader");
         builder.add(view, 1, 1);
         builder.add(hideNonHits, 2, 2);
         builder.add(grayOut, 2, 3);
@@ -50,8 +50,8 @@ public void handle(ActionEvent event) {
         builder.add(autoAssignGroup, 2, 6);
         builder.add(new Label(""), 1, 7);
 
-        Label dynamicGroups = new Label(Localization.lang("Dynamic groups") + "  --------------------------");
-        dynamicGroups.setFont(FontSize.bigFont);
+        Label dynamicGroups = new Label(Localization.lang("Dynamic groups"));
+        dynamicGroups.getStyleClass().add("sectionHeader");
         builder.add(dynamicGroups, 1, 8);
 
         Label defaultGrouping = new Label(Localization.lang("Default grouping field") + ":");
diff --git a/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java b/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
index 6a657a07cab..ad63acc2ffa 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
@@ -58,7 +58,7 @@ public ImportSettingsTab(JabRefPreferences prefs) {
         });
 
         Label defaultImportStyle = new Label(Localization.lang("Default import style for drag and drop of PDFs"));
-        defaultImportStyle.setFont(FontSize.bigFont);
+        defaultImportStyle.getStyleClass().add("sectionHeader");
         builder.add(defaultImportStyle, 1, 1);
         builder.add(new Separator(), 2, 1);
         builder.add(radioButtonNoMeta, 2, 2);
@@ -68,8 +68,8 @@ public ImportSettingsTab(JabRefPreferences prefs) {
         builder.add(useDefaultPDFImportStyle, 2, 6);
         builder.add(new Label(""), 1, 7);
 
-        Label defaultPdfFileLinkAction = new Label(Localization.lang("Default PDF file link action") + "  ------------------------");
-        defaultPdfFileLinkAction.setFont(FontSize.bigFont);
+        Label defaultPdfFileLinkAction = new Label(Localization.lang("Default PDF file link action"));
+        defaultPdfFileLinkAction.getStyleClass().add("sectionHeader");
         builder.add(defaultPdfFileLinkAction, 1, 8);
         Label filenameFormatPattern = new Label(Localization.lang("Filename format pattern").concat(":"));
         builder.add(filenameFormatPattern, 1, 9);
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java b/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
index e0b4b1da98d..bac74718d33 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
@@ -82,20 +82,18 @@ public NameFormatterTab(JabRefPreferences prefs) {
         table = new TableView();
         table.setEditable(true);
         firstCol.setCellValueFactory(new PropertyValueFactory<>("name"));
-        firstCol.setCellFactory(TextFieldTableCell.<TableRow>forTableColumn());
+        firstCol.setCellFactory(TextFieldTableCell.forTableColumn());
         firstCol.setOnEditCommit(
                 (TableColumn.CellEditEvent<TableRow, String> t) -> {
-                    ((TableRow) t.getTableView().getItems().get(
-                            t.getTablePosition().getRow())
-                    ).setName(t.getNewValue());
+                    t.getTableView().getItems().get(
+                            t.getTablePosition().getRow()).setName(t.getNewValue());
                 });
         lastCol.setCellValueFactory(new PropertyValueFactory<>("format"));
-        lastCol.setCellFactory(TextFieldTableCell.<TableRow>forTableColumn());
+        lastCol.setCellFactory(TextFieldTableCell.forTableColumn());
         lastCol.setOnEditCommit(
                 (TableColumn.CellEditEvent<TableRow, String> t) -> {
-                    ((TableRow) t.getTableView().getItems().get(
-                            t.getTablePosition().getRow())
-                    ).setFormat(t.getNewValue());
+                    t.getTableView().getItems().get(
+                            t.getTablePosition().getRow()).setFormat(t.getNewValue());
                 });
         firstCol.setPrefWidth(140);
         lastCol.setPrefWidth(200);
@@ -150,8 +148,8 @@ public NameFormatterTab(JabRefPreferences prefs) {
         toolbar.getChildren().addAll(addName, addLast,add,delete,help);
         tabPanel.setBottom(toolbar);
 
-        Label specialNameFormatters = new Label(Localization.lang("Special name formatters") + "  ------------------------------------");
-        specialNameFormatters.setFont(FontSize.bigFont);
+        Label specialNameFormatters = new Label(Localization.lang("Special name formatters"));
+        specialNameFormatters.getStyleClass().add("sectionHeader");
         builder.add(specialNameFormatters, 1, 1);
         builder.add(tabPanel, 1, 2);
     }
diff --git a/src/main/java/org/jabref/gui/preferences/NetworkTab.java b/src/main/java/org/jabref/gui/preferences/NetworkTab.java
index ae16eeab828..41e39951aee 100644
--- a/src/main/java/org/jabref/gui/preferences/NetworkTab.java
+++ b/src/main/java/org/jabref/gui/preferences/NetworkTab.java
@@ -64,8 +64,8 @@ public NetworkTab(DialogService dialogService, JabRefPreferences preferences) {
             passwordWarningLabel.setDisable(!useProxyCheckBox.isSelected() || !useAuthenticationCheckBox.isSelected());
         });
 
-        Label network = new Label(Localization.lang("Network") + "  ---------------------------------");
-        network.setFont(FontSize.bigFont);
+        Label network = new Label(Localization.lang("Network"));
+        network.getStyleClass().add("sectionHeader");
         builder.add(network, 1, 1);
         builder.add(new Separator(), 2, 1);
         builder.add(useProxyCheckBox, 2, 2);
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
index 22db04e00f0..21717a7709c 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
@@ -8,5 +8,10 @@
 }
 
 .preferencePaneContainer {
-    -fx-padding: 0em 1em 0em 2em;
+    -fx-padding: 0em 1em 0em 3em;
+}
+
+.sectionHeader {
+    -fx-font-size: 1.5em;
+    -fx-padding: 1em 0em 1em 0em;
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java b/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java
index fa19dafbfe8..525bee59399 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java
@@ -170,8 +170,8 @@ private void setupGui() {
         vBox.getChildren().addAll(new Label(""),  new Label(""), new Label(""), new Label(""), new Label(""),
                 new Label(""), new Label(""), btnRight, btnLeft, new Label(""), new Label(""), new Label(""),
                 btnUp, btnDown);
-        Label currentPreview = new Label(Localization.lang("Current Preview") + "  ------------------------------------------");
-        currentPreview.setFont(FontSize.bigFont);
+        Label currentPreview = new Label(Localization.lang("Current Preview"));
+        currentPreview.getStyleClass().add("sectionHeader");
         gridPane.add(currentPreview, 1, 1);
         gridPane.add(available, 1, 2);
         gridPane.add(vBox, 2, 2);
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
index 56c2d0dd0b0..9a9ea48bd0b 100644
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
@@ -109,19 +109,17 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
         field.setPrefWidth(400);
         column.setPrefWidth(240);
         field.setCellValueFactory(new PropertyValueFactory<>("name"));
-        field.setCellFactory(TextFieldTableCell.<TableRow>forTableColumn());
+        field.setCellFactory(TextFieldTableCell.forTableColumn());
         field.setOnEditCommit(
                 (TableColumn.CellEditEvent<TableRow, String> t) -> {
-                    ((TableRow) t.getTableView().getItems().get(
-                            t.getTablePosition().getRow())
-                    ).setName(t.getNewValue());
+                    t.getTableView().getItems().get(
+                            t.getTablePosition().getRow()).setName(t.getNewValue());
                 });
         column.setCellValueFactory(new PropertyValueFactory<>("length"));
         column.setOnEditCommit(
                 (TableColumn.CellEditEvent<TableRow, Double> t) -> {
-                    ((TableRow) t.getTableView().getItems().get(
-                            t.getTablePosition().getRow())
-                    ).setLength(t.getNewValue());
+                    t.getTableView().getItems().get(
+                            t.getTablePosition().getRow()).setLength(t.getNewValue());
                 });
 
         colSetup.setItems(data);
@@ -274,8 +272,8 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
             writeSpecialFields.setDisable(!isEnabled);
         });
 
-        Label specialTableColumns = new Label(Localization.lang("Special table columns") + "  ------------------------------------");
-        specialTableColumns.setFont(FontSize.bigFont);
+        Label specialTableColumns = new Label(Localization.lang("Special table columns"));
+        specialTableColumns.getStyleClass().add("sectionHeader");
         builder.add(specialTableColumns, 1, 1);
 
         GridPane specialTableColumnsBuilder = new GridPane();
@@ -303,8 +301,8 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
 
         /*** end: special table columns and special fields ***/
         builder.add(new Label(""), 1, 3);
-        Label entryTableColumns = new Label(Localization.lang("Entry table columns") + "  --------------------------------------");
-        entryTableColumns.setFont(FontSize.bigFont);
+        Label entryTableColumns = new Label(Localization.lang("Entry table columns"));
+        entryTableColumns.getStyleClass().add("sectionHeader");
         builder.add(entryTableColumns, 1, 4);
         builder.add(tabPanel, 1, 5);
 
diff --git a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
index cc56f288476..9069ac21e09 100644
--- a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
@@ -109,8 +109,8 @@ public TablePrefsTab(JabRefPreferences prefs) {
         secDesc = new CheckBox(Localization.lang("Descending"));
         terDesc = new CheckBox(Localization.lang("Descending"));
 
-        Label formatOfAuthor = new Label(Localization.lang("Format of author and editor names") + "  ----------------------");
-        formatOfAuthor.setFont(FontSize.bigFont);
+        Label formatOfAuthor = new Label(Localization.lang("Format of author and editor names"));
+        formatOfAuthor.getStyleClass().add("sectionHeader");
         builder.add(formatOfAuthor, 1, 1);
         builder.add(namesAsIs, 1, 2);
         builder.add(noAbbrNames, 2, 2);
@@ -123,8 +123,8 @@ public TablePrefsTab(JabRefPreferences prefs) {
         Label label1 = new Label("");
         builder.add(label1, 1, 6);
 
-        Label defaultSortCriteria = new Label(Localization.lang("Default sort criteria") + "  ----------------------------------------");
-        defaultSortCriteria.setFont(FontSize.bigFont);
+        Label defaultSortCriteria = new Label(Localization.lang("Default sort criteria"));
+        defaultSortCriteria.getStyleClass().add("sectionHeader");
         builder.add(defaultSortCriteria, 1, 7);
         // Create a new panel with its own FormLayout for these items:
         Label primarySortCriterion = new Label(Localization.lang("Primary sort criterion"));
@@ -151,8 +151,8 @@ public TablePrefsTab(JabRefPreferences prefs) {
 
         builder.add(new Label(""), 1, 12);
 
-        Label general = new Label(Localization.lang("General") + " ------------------------------------------------------");
-        general.setFont(FontSize.bigFont);
+        Label general = new Label(Localization.lang("General"));
+        general.getStyleClass().add("sectionHeader");
         builder.add(general, 1, 13);
         builder.add(autoResizeMode, 1, 14);
         namesNatbib.setOnAction(e -> {
diff --git a/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java b/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
index e43551a99ef..ef61c915444 100644
--- a/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
@@ -48,12 +48,11 @@ public XmpPrefsTab(JabRefPreferences prefs) {
         TableView tableView = new TableView();
         TableColumn<TableRow,String> column = new TableColumn<>(Localization.lang("Field to filter"));
         column.setCellValueFactory(new PropertyValueFactory<>("name"));
-        column.setCellFactory(TextFieldTableCell.<TableRow>forTableColumn());
+        column.setCellFactory(TextFieldTableCell.forTableColumn());
         column.setOnEditCommit(
                 (TableColumn.CellEditEvent<TableRow, String> t) -> {
-                    ((TableRow) t.getTableView().getItems().get(
-                            t.getTablePosition().getRow())
-                    ).setName(t.getNewValue());
+                    t.getTableView().getItems().get(
+                            t.getTablePosition().getRow()).setName(t.getNewValue());
                 });
         column.setPrefWidth(350);
         tableView.setItems(data);
@@ -100,8 +99,8 @@ public XmpPrefsTab(JabRefPreferences prefs) {
         tablePanel.setBottom(toolbar);
 
         // Build Prefs Tabs
-        Label xmpExportPrivacySettings = new Label(Localization.lang("XMP export privacy settings") + "  -------------------------");
-        xmpExportPrivacySettings.setFont(FontSize.bigFont);
+        Label xmpExportPrivacySettings = new Label(Localization.lang("XMP export privacy settings"));
+        xmpExportPrivacySettings.getStyleClass().add("sectionHeader");
         builder.add(xmpExportPrivacySettings, 1, 1);
         builder.add(privacyFilterCheckBox, 1, 2);
         builder.add(tablePanel, 1, 3);

From 2dbb05ebbaa2d8f986d5fc948bb486df79291a7f Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Wed, 22 Aug 2018 17:18:16 +0200
Subject: [PATCH 058/229] convert bibtexkeypatterndlg to javafx as well (#4277)

* onvert bibtex pattern dialog to javafx as well

* simplify call of keypattern dialog
base dialog is now by default resizable
---
 .../gui/actions/BibtexKeyPatternAction.java   |  6 +-
 .../BibtexKeyPatternDialog.java               | 76 +++----------------
 .../gui/copyfiles/CopyFilesDialogView.java    |  1 -
 .../documentviewer/DocumentViewerView.java    |  1 -
 .../gui/errorconsole/ErrorConsoleView.java    |  3 +-
 .../ExternalFileTypeEditor.java               |  1 -
 .../org/jabref/gui/help/AboutDialogView.java  |  1 -
 .../ManageJournalAbbreviationsView.java       |  1 -
 .../gui/keyboard/KeyBindingsDialogView.java   |  1 -
 .../java/org/jabref/gui/util/BaseDialog.java  |  2 +-
 10 files changed, 15 insertions(+), 78 deletions(-)

diff --git a/src/main/java/org/jabref/gui/actions/BibtexKeyPatternAction.java b/src/main/java/org/jabref/gui/actions/BibtexKeyPatternAction.java
index 71c125f9659..7eaae3af4df 100644
--- a/src/main/java/org/jabref/gui/actions/BibtexKeyPatternAction.java
+++ b/src/main/java/org/jabref/gui/actions/BibtexKeyPatternAction.java
@@ -5,7 +5,7 @@
 
 public class BibtexKeyPatternAction extends SimpleCommand {
 
-    private JabRefFrame frame;
+    private final JabRefFrame frame;
 
     public BibtexKeyPatternAction(JabRefFrame frame) {
         this.frame = frame;
@@ -13,8 +13,6 @@ public BibtexKeyPatternAction(JabRefFrame frame) {
 
     @Override
     public void execute() {
-        BibtexKeyPatternDialog bibtexKeyPatternDialog = new BibtexKeyPatternDialog(frame.getCurrentBasePanel());
-        bibtexKeyPatternDialog.setLocationRelativeTo(null);
-        bibtexKeyPatternDialog.setVisible(true);
+       new BibtexKeyPatternDialog(frame.getCurrentBasePanel()).showAndWait();
     }
 }
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java
index 7fc92b94f67..647c54a1fc0 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java
@@ -1,40 +1,20 @@
 package org.jabref.gui.bibtexkeypattern;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.WindowEvent;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.WindowConstants;
-
-import javafx.embed.swing.JFXPanel;
-import javafx.scene.Scene;
+import javafx.scene.control.ButtonType;
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.customjfx.CustomJFXPanel;
-import org.jabref.gui.keyboard.KeyBinder;
-import org.jabref.logic.l10n.Localization;
+import org.jabref.gui.util.BaseDialog;
 import org.jabref.model.bibtexkeypattern.AbstractBibtexKeyPattern;
 import org.jabref.model.metadata.MetaData;
 
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-
-public class BibtexKeyPatternDialog extends JabRefDialog {
+public class BibtexKeyPatternDialog extends BaseDialog<Void> {
 
     private final MetaData metaData;
     private final BasePanel panel;
     private final BibtexKeyPatternPanel bibtexKeyPatternPanel;
 
     public BibtexKeyPatternDialog(BasePanel panel) {
-        super(Localization.lang("BibTeX key patterns"), true, BibtexKeyPatternDialog.class);
         this.bibtexKeyPatternPanel = new BibtexKeyPatternPanel(panel);
         this.panel = panel;
         this.metaData = panel.getBibDatabaseContext().getMetaData();
@@ -44,53 +24,19 @@ public BibtexKeyPatternDialog(BasePanel panel) {
     }
 
     private void init() {
-        getContentPane().setLayout(new BorderLayout());
-        JFXPanel bibPanel = CustomJFXPanel.wrap(new Scene(bibtexKeyPatternPanel));
-        getContentPane().add(bibPanel, BorderLayout.CENTER);
-
-        JButton ok = new JButton(Localization.lang("OK"));
-        JButton cancel = new JButton(); // label of "cancel" is set later as the label is overwritten by assigning an action to the button
-
-        JPanel lower = new JPanel();
-        lower.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-        ButtonBarBuilder bb = new ButtonBarBuilder(lower);
-        bb.addGlue();
-        bb.addButton(ok);
-        bb.addButton(cancel);
-        bb.addGlue();
-
-        getContentPane().add(lower, BorderLayout.SOUTH);
 
-        this.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        getContentPane().setPreferredSize(new Dimension(500, 600));
-        pack();
+        this.getDialogPane().setContent(bibtexKeyPatternPanel.getPanel());
+        this.getDialogPane().getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
 
-        ok.addActionListener(e -> {
-            metaData.setCiteKeyPattern(bibtexKeyPatternPanel.getKeyPatternAsDatabaseBibtexKeyPattern());
-            panel.markNonUndoableBaseChanged();
-            dispose();
-        });
-
-        final JDialog dialog = this;
-
-        Action cancelAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dialog.dispatchEvent(new WindowEvent(dialog, WindowEvent.WINDOW_CLOSING));
+        this.setResultConverter(button -> {
+            if (button == ButtonType.APPLY) {
+                metaData.setCiteKeyPattern(bibtexKeyPatternPanel.getKeyPatternAsDatabaseBibtexKeyPattern());
+                panel.markNonUndoableBaseChanged();
             }
-        };
-        cancel.setAction(cancelAction);
-        cancel.setText(Localization.lang("Cancel"));
 
-        KeyBinder.bindCloseDialogKeyToCancelAction(this.getRootPane(), cancelAction);
-    }
+            return null;
+        });
 
-    @Override
-    public void setVisible(boolean visible) {
-        if (visible) {
-            super.setVisible(visible);
-        }
     }
 
 }
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
index bbf813c4c14..eff25118bdb 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
@@ -26,7 +26,6 @@ public class CopyFilesDialogView extends BaseDialog<Void> {
 
     public CopyFilesDialogView(BibDatabaseContext bibDatabaseContext, CopyFilesResultListDependency results) {
         this.setTitle(Localization.lang("Result"));
-        this.setResizable(true);
 
         this.getDialogPane().getButtonTypes().addAll(ButtonType.OK);
 
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
index 60ef762d9bc..0f7383989b5 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
@@ -41,7 +41,6 @@ public class DocumentViewerView extends BaseDialog<Void> {
     public DocumentViewerView() {
         this.setTitle(Localization.lang("Document viewer"));
         this.initModality(Modality.NONE);
-        this.setResizable(true);
 
         ViewLoader.view(this)
                   .load()
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
index d45adf100c9..fe1d592fe23 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
@@ -47,7 +47,6 @@ public class ErrorConsoleView extends BaseDialog<Void> {
 
     public ErrorConsoleView() {
         this.setTitle(Localization.lang("Event log"));
-        this.setResizable(true);
         this.initModality(Modality.NONE);
 
         ViewLoader.view(this)
@@ -97,7 +96,7 @@ private Callback<ListView<LogEventViewModel>, ListCell<LogEventViewModel>> creat
             public void updateItem(LogEventViewModel event, boolean empty) {
                 super.updateItem(event, empty);
 
-                if (event == null || empty) {
+                if ((event == null) || empty) {
                     setGraphic(null);
                 } else {
                     icon = event.getIcon().getGraphicNode();
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java
index 868b38bf896..ce1192c5d47 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypeEditor.java
@@ -53,7 +53,6 @@ public class ExternalFileTypeEditor extends BaseDialog<Void> {
     public ExternalFileTypeEditor() {
         this.setTitle(Localization.lang("Manage external file types"));
         this.initModality(Modality.APPLICATION_MODAL);
-        this.setResizable(true);
         this.getDialogPane().setPrefSize(600, 500);
 
         init();
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java
index 5fbb6f857c7..f1356fd9684 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogView.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java
@@ -28,7 +28,6 @@ public class AboutDialogView extends BaseDialog<Void> {
 
     public AboutDialogView() {
         this.setTitle(Localization.lang("About JabRef"));
-        this.setResizable(true);
 
         ViewLoader.view(this)
                   .load()
diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java
index 42611dccbed..1a0457af443 100644
--- a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java
+++ b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java
@@ -52,7 +52,6 @@ public class ManageJournalAbbreviationsView extends BaseDialog<Void> {
 
     public ManageJournalAbbreviationsView() {
         this.setTitle(Localization.lang("Journal abbreviations"));
-        this.setResizable(true);
 
         ViewLoader.view(this)
                   .load()
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java
index 5e834ea9087..c58665b93e2 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java
@@ -39,7 +39,6 @@ public class KeyBindingsDialogView extends BaseDialog<Void> {
     public KeyBindingsDialogView() {
         this.setTitle(Localization.lang("Key bindings"));
         this.getDialogPane().setPrefSize(375, 475);
-        this.setResizable(true);
 
         ViewLoader.view(this)
                   .load()
diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index 73c157838df..44a4a116a62 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -20,7 +20,7 @@ protected BaseDialog() {
         });
 
         setDialogIcon(IconTheme.getJabRefImageFX());
-
+        setResizable(true);
         Globals.getThemeLoader().installBaseCss(getDialogPane().getScene(), Globals.prefs);
     }
 

From e61fc5906528a0d218bf01e0b9aef8e6f6a684ac Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 22 Aug 2018 17:35:31 +0200
Subject: [PATCH 059/229] Fix display of key patterns

---
 .../BibtexKeyPatternPanel.java                | 42 +++++++++----------
 .../gui/preferences/PreferencesDialog.java    |  8 ++--
 .../jabref/preferences/JabRefPreferences.java | 18 ++++----
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
index fb749c149a3..daf7a4ac105 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
@@ -72,11 +72,27 @@ private void buildGUI() {
             mode = Globals.prefs.getDefaultBibDatabaseMode();
         }
 
-        addExtraText(mode);
+        int rowIndex = 3;
+        for (EntryType type : EntryTypes.getAllValues(mode)) {
+            Label label1 = new Label(type.getName());
+
+            TextField textField = new TextField();
+
+            Button button1 = new Button("Default");
+            button1.setOnAction(e1 -> textField.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
+
+            gridPane.add(label1, 1, rowIndex);
+            gridPane.add(textField, 3, rowIndex);
+            gridPane.add(button1, 4, rowIndex);
+
+            textFields.put(type.getName().toLowerCase(Locale.ROOT), textField);
+
+            rowIndex++;
+        }
 
         Button help1 = new Button("?");
         help1.setOnAction(e->new HelpAction(Localization.lang("Help on key patterns"), HelpFile.BIBTEX_KEY_PATTERN).getHelpButton().doClick());
-        gridPane.add(help1, 1, 24);
+        gridPane.add(help1, 1, rowIndex);
 
         Button btnDefaultAll1 = new Button(Localization.lang("Reset all"));
         btnDefaultAll1.setOnAction(e-> {
@@ -86,27 +102,7 @@ private void buildGUI() {
             }
             defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN));
         });
-        gridPane.add(btnDefaultAll1, 3, 24);
-    }
-
-    private void addExtraText(BibDatabaseMode mode) {
-        int rowIndex = 0;
-        for (EntryType type : EntryTypes.getAllValues(mode)) {
-            Label label = new Label(type.getName());
-
-            TextField textField = new TextField();
-
-            Button button = new Button("Default");
-            button.setOnAction(e -> textField.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
-
-            gridPane.add(label, 1, rowIndex + 3);
-            gridPane.add(textField, 3, rowIndex + 3);
-            gridPane.add(button, 4, rowIndex + 3);
-
-            textFields.put(type.getName().toLowerCase(Locale.ROOT), textField);
-
-            rowIndex++;
-        }
+        gridPane.add(btnDefaultAll1, 3, rowIndex);
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 6773c5e301a..cfaff81308a 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -63,7 +63,7 @@ public PreferencesDialog(JabRefFrame parent) {
         getDialogPane().setPrefSize(1250, 800);
         getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
         getDialogPane().getScene().getStylesheets().add(this.getClass().getResource("PreferencesDialog.css").toExternalForm());
-        setResizable(true);
+
         ButtonType save = new ButtonType(Localization.lang("Save"), ButtonData.OK_DONE);
         getDialogPane().getButtonTypes().addAll(save, ButtonType.CANCEL);
         ControlHelper.setAction(save, getDialogPane(), event -> {
@@ -178,7 +178,7 @@ private void importPreferences() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.XML)
                 .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(prefs.getPrefsExportPath()).build();
+                .withInitialDirectory(prefs.setLastPreferencesExportPath()).build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> {
             try {
@@ -233,7 +233,7 @@ private void exportPreferences() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.XML)
                 .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(prefs.getPrefsExportPath())
+                .withInitialDirectory(prefs.setLastPreferencesExportPath())
                 .build();
 
         dialogService.showFileSaveDialog(fileDialogConfiguration)
@@ -241,7 +241,7 @@ private void exportPreferences() {
                          try {
                              storeAllSettings();
                              prefs.exportPreferences(exportFile);
-                             prefs.put(JabRefPreferences.PREFS_EXPORT_PATH, exportFile.toString());
+                             prefs.setLastPreferencesExportPath(exportFile);
                          } catch (JabRefException ex) {
                              LOGGER.warn(ex.getMessage(), ex);
                              dialogService.showErrorDialogAndWait(Localization.lang("Export preferences"), ex);
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 0d010e23608..dfbb3cb801e 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -3,8 +3,6 @@
 import java.awt.Color;
 import java.awt.Font;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -14,6 +12,7 @@
 import java.net.UnknownHostException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -192,7 +191,6 @@ public class JabRefPreferences implements PreferencesService {
     public static final String AUTO_OPEN_FORM = "autoOpenForm";
     public static final String IMPORT_WORKING_DIRECTORY = "importWorkingDirectory";
     public static final String EXPORT_WORKING_DIRECTORY = "exportWorkingDirectory";
-    public static final String PREFS_EXPORT_PATH = "prefsExportPath";
     public static final String WORKING_DIRECTORY = "workingDirectory";
     public static final String EDITOR_EMACS_KEYBINDINGS = "editorEMACSkeyBindings";
     public static final String EDITOR_EMACS_KEYBINDINGS_REBIND_CA = "editorEMACSkeyBindingsRebindCA";
@@ -366,7 +364,6 @@ public class JabRefPreferences implements PreferencesService {
 
     // Preview
     private static final String PREVIEW_STYLE = "previewStyle";
-
     private static final String CYCLE_PREVIEW_POS = "cyclePreviewPos";
     private static final String CYCLE_PREVIEW = "cyclePreview";
     private static final String PREVIEW_PANEL_HEIGHT = "previewPanelHeightFX";
@@ -402,6 +399,9 @@ public class JabRefPreferences implements PreferencesService {
     //GroupViewMode
     private static final String GROUP_INTERSECT_UNION_VIEW_MODE = "groupIntersectUnionViewModes";
 
+    // Dialog states
+    private static final String PREFS_EXPORT_PATH = "prefsExportPath";
+
     // Helper string
     private static final String USER_HOME = System.getProperty("user.home");
     // The only instance of this class:
@@ -1328,7 +1328,7 @@ public void exportPreferences(String filename) throws JabRefException {
     }
 
     public void exportPreferences(Path file) throws JabRefException {
-        try (OutputStream os = new FileOutputStream(file.toFile())) {
+        try (OutputStream os = Files.newOutputStream(file)) {
             prefs.exportSubtree(os);
         } catch (BackingStoreException | IOException ex) {
             throw new JabRefException("Could not export preferences", Localization.lang("Could not export preferences"),
@@ -1348,7 +1348,7 @@ public void importPreferences(String filename) throws JabRefException {
     }
 
     public void importPreferences(Path file) throws JabRefException {
-        try (InputStream is = new FileInputStream(file.toFile())) {
+        try (InputStream is = Files.newInputStream(file)) {
             Preferences.importPreferences(is);
         } catch (InvalidPreferencesFormatException | IOException ex) {
             throw new JabRefException("Could not import preferences", Localization.lang("Could not import preferences"),
@@ -1921,7 +1921,11 @@ public Optional<Integer> getFontSize() {
         }
     }
 
-    public String getPrefsExportPath() {
+    public String setLastPreferencesExportPath() {
         return get(PREFS_EXPORT_PATH);
     }
+
+    public void setLastPreferencesExportPath(Path exportFile) {
+        put(PREFS_EXPORT_PATH, exportFile.toString());
+    }
 }

From 17f3753a30bcd7fb3c84197287e93309ccac16b2 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 22 Aug 2018 21:21:09 +0200
Subject: [PATCH 060/229] Fix NPE when importing from CLI (#4281)

* Fix NPE when importing from CLI

* Fix failing tests
---
 .../org/jabref/cli/ArgumentProcessor.java     |  3 +-
 .../jabref/logic/importer/ParserResult.java   |  2 +-
 .../model/database/BibDatabaseContext.java    | 31 +++++++++----------
 .../jabref/model/database/BibDatabases.java   |  4 ++-
 .../java/org/jabref/cli/JabRefCLITest.java    | 19 +++++++++---
 5 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index 4bf16b3fe85..120fd25c775 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -220,13 +220,12 @@ private List<ParserResult> processArguments() {
         if (cli.isFileExport()) {
             if (!loaded.isEmpty()) {
                 exportFile(loaded, cli.getFileExport().split(","));
+                LOGGER.debug("Finished export");
             } else {
                 System.err.println(Localization.lang("The output option depends on a valid import option."));
             }
         }
 
-        LOGGER.debug("Finished export");
-
         if (cli.isPreferencesExport()) {
             try {
                 Globals.prefs.exportPreferences(cli.getPreferencesExport());
diff --git a/src/main/java/org/jabref/logic/importer/ParserResult.java b/src/main/java/org/jabref/logic/importer/ParserResult.java
index 998a710d3d5..c9163c75315 100644
--- a/src/main/java/org/jabref/logic/importer/ParserResult.java
+++ b/src/main/java/org/jabref/logic/importer/ParserResult.java
@@ -168,7 +168,7 @@ public String getErrorMessage() {
     }
 
     public BibDatabaseContext getDatabaseContext() {
-        return new BibDatabaseContext(database, metaData, file.toFile());
+        return new BibDatabaseContext(database, metaData, file);
     }
 
     public void setDatabaseContext(BibDatabaseContext bibDatabaseContext) {
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index 2f8fe054dac..76c6bfb6c9f 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -31,7 +31,7 @@ public class BibDatabaseContext {
     /**
      * The file where this database was last saved to.
      */
-    private File file;
+    private Optional<Path> file;
     private DatabaseSynchronizer dbmsSynchronizer;
     private CoarseChangeFilter dbmsListener;
     private DatabaseLocation location;
@@ -57,28 +57,29 @@ public BibDatabaseContext(BibDatabase database, MetaData metaData, Defaults defa
         this.database = Objects.requireNonNull(database);
         this.metaData = Objects.requireNonNull(metaData);
         this.location = DatabaseLocation.LOCAL;
+        this.file = Optional.empty();
     }
 
     public BibDatabaseContext(BibDatabase database, MetaData metaData) {
         this(database, metaData, new Defaults());
     }
 
-    public BibDatabaseContext(BibDatabase database, MetaData metaData, File file, Defaults defaults,
+    public BibDatabaseContext(BibDatabase database, MetaData metaData, Path file, Defaults defaults,
                               DatabaseLocation location) {
         this(database, metaData, defaults);
         Objects.requireNonNull(location);
-        this.setDatabaseFile(file);
+        this.file = Optional.ofNullable(file);
 
         if (location == DatabaseLocation.LOCAL) {
             convertToLocalDatabase();
         }
     }
 
-    public BibDatabaseContext(BibDatabase database, MetaData metaData, File file, Defaults defaults) {
+    public BibDatabaseContext(BibDatabase database, MetaData metaData, Path file, Defaults defaults) {
         this(database, metaData, file, defaults, DatabaseLocation.LOCAL);
     }
 
-    public BibDatabaseContext(BibDatabase database, MetaData metaData, File file) {
+    public BibDatabaseContext(BibDatabase database, MetaData metaData, Path file) {
         this(database, metaData, file, new Defaults());
     }
 
@@ -109,19 +110,19 @@ public void setMode(BibDatabaseMode bibDatabaseMode) {
      */
     @Deprecated
     public Optional<File> getDatabaseFile() {
-        return Optional.ofNullable(file);
+        return file.map(Path::toFile);
     }
 
     public void setDatabaseFile(File file) {
-        this.file = file;
+        this.file = Optional.ofNullable(file).map(File::toPath);
     }
 
     public Optional<Path> getDatabasePath() {
-        return Optional.ofNullable(file).map(File::toPath);
+        return file;
     }
 
     public void clearDatabaseFile() {
-        this.file = null;
+        this.file = Optional.empty();
     }
 
     public BibDatabase getDatabase() {
@@ -188,16 +189,12 @@ public List<String> getFileDirectories(String fieldName, FileDirectoryPreference
         List<String> fileDirs = new ArrayList<>();
 
         // 1. metadata user-specific directory
-        Optional<String> userFileDirectory = metaData.getUserFileDirectory(preferences.getUser());
-        if (userFileDirectory.isPresent()) {
-            fileDirs.add(getFileDirectoryPath(userFileDirectory.get()));
-        }
+        metaData.getUserFileDirectory(preferences.getUser())
+                .ifPresent(userFileDirectory -> fileDirs.add(getFileDirectoryPath(userFileDirectory)));
 
         // 2. metadata general directory
-        Optional<String> metaDataDirectory = metaData.getDefaultFileDirectory();
-        if (metaDataDirectory.isPresent()) {
-            fileDirs.add(getFileDirectoryPath(metaDataDirectory.get()));
-        }
+        metaData.getDefaultFileDirectory()
+                .ifPresent(metaDataDirectory -> fileDirs.add(getFileDirectoryPath(metaDataDirectory)));
 
         // 3. preferences directory
         preferences.getFileDirectory(fieldName).ifPresent(path -> fileDirs.add(path.toAbsolutePath().toString()));
diff --git a/src/main/java/org/jabref/model/database/BibDatabases.java b/src/main/java/org/jabref/model/database/BibDatabases.java
index 9d64696d43f..eb095d3e0d2 100644
--- a/src/main/java/org/jabref/model/database/BibDatabases.java
+++ b/src/main/java/org/jabref/model/database/BibDatabases.java
@@ -36,6 +36,8 @@ public static BibDatabase createDatabase(Collection<BibEntry> bibentries) {
      * an unsucessful import (wrong format) that returns a number of empty entries.
      */
     public static List<BibEntry> purgeEmptyEntries(Collection<BibEntry> entries) {
-        return entries.stream().filter(e -> !e.getFieldNames().isEmpty()).collect(Collectors.toList());
+        return entries.stream()
+                      .filter(entry -> !entry.getFieldNames().isEmpty())
+                      .collect(Collectors.toList());
     }
 }
diff --git a/src/test/java/org/jabref/cli/JabRefCLITest.java b/src/test/java/org/jabref/cli/JabRefCLITest.java
index 12f12d1f751..f3c43c05fed 100644
--- a/src/test/java/org/jabref/cli/JabRefCLITest.java
+++ b/src/test/java/org/jabref/cli/JabRefCLITest.java
@@ -7,10 +7,10 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class JabRefCLITest {
+class JabRefCLITest {
 
     @Test
-    public void testCLIParsingLongOptions() {
+    void parsingLongOptions() {
         JabRefCLI cli = new JabRefCLI(new String[] {"--nogui", "--import=some/file", "--output=some/export/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
@@ -20,7 +20,7 @@ public void testCLIParsingLongOptions() {
     }
 
     @Test
-    public void testCLIParsingShortOptions() {
+    void parsingShortOptions() {
         JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-i=some/file", "-o=some/export/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
@@ -30,7 +30,7 @@ public void testCLIParsingShortOptions() {
     }
 
     @Test
-    public void testPreferencesExport() {
+    void preferencesExport() {
         JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-x=some/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
@@ -39,11 +39,20 @@ public void testPreferencesExport() {
     }
 
     @Test
-    public void recognizesImportBibtex() {
+    void recognizesImportBibtex() {
         String bibtex = "@article{test, title=\"test title\"}";
         JabRefCLI cli = new JabRefCLI(new String[]{"-ib", bibtex});
         assertEquals(Collections.emptyList(), cli.getLeftOver());
         assertTrue(cli.isBibtexImport());
         assertEquals(bibtex, cli.getBibtexImport());
     }
+
+    @Test
+    void recognizesImportBibtexLong() {
+        String bibtex = "@article{test, title=\"test title\"}";
+        JabRefCLI cli = new JabRefCLI(new String[]{"-importBibtex", bibtex});
+        assertEquals(Collections.emptyList(), cli.getLeftOver());
+        assertTrue(cli.isBibtexImport());
+        assertEquals(bibtex, cli.getBibtexImport());
+    }
 }

From 835bb47fd6c5912353b21e8714b234de68d3a135 Mon Sep 17 00:00:00 2001
From: Kelly Click <kclick91@gmail.com>
Date: Wed, 22 Aug 2018 16:08:05 -0400
Subject: [PATCH 061/229] Added a comment for the purpose of the class (#4282)

---
 src/main/java/org/jabref/model/FieldChange.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/model/FieldChange.java b/src/main/java/org/jabref/model/FieldChange.java
index 042a118a128..c5cbbf9a85e 100644
--- a/src/main/java/org/jabref/model/FieldChange.java
+++ b/src/main/java/org/jabref/model/FieldChange.java
@@ -5,7 +5,7 @@
 import org.jabref.model.entry.BibEntry;
 
 /**
- *
+ * This class is used in the instance of a field being modified, removed or added.
  */
 public class FieldChange {
 

From 4dc1008ae2ebd81adeaa9a4705aafd0b4b15a7eb Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Thu, 23 Aug 2018 09:41:50 +0200
Subject: [PATCH 062/229] Fix exceptions when trying to change settings (#4284)

I also took the opportunity to improve a few things around our localization code (mainly converting Languages to enum).
---
 .../org/jabref/gui/preferences/FileTab.java   |  9 ++-
 .../jabref/gui/preferences/GeneralTab.java    | 57 ++++++----------
 .../java/org/jabref/logic/l10n/Language.java  | 65 +++++++++++++++++++
 .../java/org/jabref/logic/l10n/Languages.java | 63 ------------------
 .../org/jabref/logic/l10n/Localization.java   | 12 ++--
 .../jabref/preferences/JabRefPreferences.java | 21 +++++-
 .../org/jabref/logic/l10n/LanguageTest.java   | 28 ++++++++
 .../org/jabref/logic/l10n/LanguagesTest.java  | 55 ----------------
 .../l10n/LocalizationConsistencyTest.java     | 26 +++++---
 .../jabref/logic/l10n/LocalizationTest.java   | 27 +++-----
 .../PropertiesLocaleCompletenessTest.java     | 10 +--
 11 files changed, 177 insertions(+), 196 deletions(-)
 create mode 100644 src/main/java/org/jabref/logic/l10n/Language.java
 delete mode 100644 src/main/java/org/jabref/logic/l10n/Languages.java
 create mode 100644 src/test/java/org/jabref/logic/l10n/LanguageTest.java
 delete mode 100644 src/test/java/org/jabref/logic/l10n/LanguagesTest.java

diff --git a/src/main/java/org/jabref/gui/preferences/FileTab.java b/src/main/java/org/jabref/gui/preferences/FileTab.java
index 4957a672f96..5369f8df138 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTab.java
+++ b/src/main/java/org/jabref/gui/preferences/FileTab.java
@@ -17,7 +17,6 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
@@ -38,7 +37,7 @@ class FileTab extends Pane implements PrefsTab {
     private final CheckBox backup;
     private final CheckBox localAutoSave;
     private final CheckBox openLast;
-    private final ComboBox newlineSeparator;
+    private final ComboBox<String> newlineSeparator;
     private final CheckBox reformatFileOnSaveAndExport;
     private final RadioButton resolveStringsStandard;
     private final RadioButton resolveStringsAll;
@@ -121,8 +120,8 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         browse.setOnAction(e -> {
             DirectoryDialogConfiguration dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
                     .withInitialDirectory(Paths.get(fileDir.getText())).build();
-            DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showDirectorySelectionDialog(dirDialogConfiguration))
-                    .ifPresent(f -> fileDir.setText(f.toString()));
+            dialogService.showDirectorySelectionDialog(dirDialogConfiguration)
+                         .ifPresent(f -> fileDir.setText(f.toString()));
         });
         builder.add(browse, 3, 12);
         builder.add(bibLocAsPrimaryDir, 1, 13);
@@ -153,7 +152,7 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
 
     @Override
     public void setValues() {
-        fileDir.setText(prefs.get(FieldName.FILE + FileDirectoryPreferences.DIR_SUFFIX));
+        fileDir.setText(prefs.getAsOptional(FieldName.FILE + FileDirectoryPreferences.DIR_SUFFIX).orElse(""));
         bibLocAsPrimaryDir.setSelected(prefs.getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR));
         runAutoFileSearch.setSelected(prefs.getBoolean(JabRefPreferences.RUN_AUTOMATIC_FILE_SEARCH));
         allowFileAutoOpenBrowse.setSelected(prefs.getBoolean(JabRefPreferences.ALLOW_FILE_AUTO_OPEN_BROWSE));
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
index 12cb5dd03cc..8b77ad06651 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
@@ -4,7 +4,6 @@
 import java.time.format.DateTimeFormatter;
 
 import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
@@ -15,19 +14,18 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.shape.Line;
 
-import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.util.DefaultTaskExecutor;
+import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Encodings;
+import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.preferences.JabRefPreferences;
 
-import static org.jabref.logic.l10n.Languages.LANGUAGES;
-
 class GeneralTab extends Pane implements PrefsTab {
 
     private final CheckBox useOwner;
@@ -47,8 +45,7 @@ class GeneralTab extends Pane implements PrefsTab {
     private final TextField timeStampField;
     private final JabRefPreferences prefs;
 
-    private final ObservableList<String> options = FXCollections.observableArrayList(LANGUAGES.keySet().toArray(new String[LANGUAGES.keySet().size()]));
-    private final ComboBox<String> language = new ComboBox<>(options);
+    private final ComboBox<Language> languageSelection = new ComboBox<>();
     private final ComboBox<Charset> encodings;
     private final ComboBox<BibDatabaseMode> biblatexMode;
     private final DialogService dialogService;
@@ -121,7 +118,11 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(new Line(), 1, 16);
         Label languageLabel = new Label(Localization.lang("Language") + ':');
         builder.add(languageLabel, 1, 17);
-        builder.add(language, 2, 17);
+        languageSelection.setItems(FXCollections.observableArrayList(Language.values()));
+        new ViewModelListCellFactory<Language>()
+                .withText(Language::getDisplayName)
+                .install(languageSelection);
+        builder.add(languageSelection, 2, 17);
         builder.add(new Line(), 2, 18);
         Label defaultEncoding = new Label(Localization.lang("Default encoding") + ':');
         builder.add(defaultEncoding, 1, 19);
@@ -151,26 +152,13 @@ public void setValues() {
         timeStampFormat.setText(prefs.get(JabRefPreferences.TIME_STAMP_FORMAT));
         timeStampField.setText(prefs.get(JabRefPreferences.TIME_STAMP_FIELD));
         inspectionWarnDupli.setSelected(prefs.getBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION));
-        if (Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE)) {
+        if (prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE)) {
             biblatexMode.setValue(BibDatabaseMode.BIBLATEX);
         } else {
             biblatexMode.setValue(BibDatabaseMode.BIBTEX);
         }
-
-        Charset enc = Globals.prefs.getDefaultEncoding();
-        encodings.setValue(enc);
-
-        String oldLan = prefs.get(JabRefPreferences.LANGUAGE);
-
-        // Language choice
-        int ilk = 0;
-        for (String lan : LANGUAGES.values()) {
-            if (lan.equals(oldLan)) {
-                language.setVisibleRowCount(ilk);
-            }
-            ilk++;
-        }
-
+        encodings.setValue(prefs.getDefaultEncoding());
+        languageSelection.setValue(prefs.getLanguage());
     }
 
     @Override
@@ -183,10 +171,9 @@ public void storeSettings() {
         prefs.putBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY, enforceLegalKeys.isSelected());
         prefs.setShouldCollectTelemetry(shouldCollectTelemetry.isSelected());
         if (prefs.getBoolean(JabRefPreferences.MEMORY_STICK_MODE) && !memoryStick.isSelected()) {
-
-            DefaultTaskExecutor.runInJavaFXThread(()->dialogService.showInformationDialogAndWait(Localization.lang("Memory stick mode"),
+            dialogService.showInformationDialogAndWait(Localization.lang("Memory stick mode"),
                     Localization.lang("To disable the memory stick mode"
-                            + " rename or remove the jabref.xml file in the same folder as JabRef.")));
+                            + " rename or remove the jabref.xml file in the same folder as JabRef."));
         }
         prefs.putBoolean(JabRefPreferences.MEMORY_STICK_MODE, memoryStick.isSelected());
         prefs.putBoolean(JabRefPreferences.CONFIRM_DELETE, confirmDelete.isSelected());
@@ -196,21 +183,19 @@ public void storeSettings() {
         prefs.put(JabRefPreferences.TIME_STAMP_FORMAT, timeStampFormat.getText().trim());
         prefs.put(JabRefPreferences.TIME_STAMP_FIELD, timeStampField.getText().trim());
         // Update name of the time stamp field based on preferences
-        InternalBibtexFields.updateTimeStampField(Globals.prefs.get(JabRefPreferences.TIME_STAMP_FIELD));
+        InternalBibtexFields.updateTimeStampField(prefs.get(JabRefPreferences.TIME_STAMP_FIELD));
         prefs.setDefaultEncoding(encodings.getValue());
         prefs.putBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE, biblatexMode.getValue().equals(BibDatabaseMode.BIBLATEX));
 
-        if (!LANGUAGES.get(language.getValue()).equals(prefs.get(JabRefPreferences.LANGUAGE))) {
-            prefs.put(JabRefPreferences.LANGUAGE, LANGUAGES.get(language.getValue()));
-            Localization.setLanguage(LANGUAGES.get(language.getValue()));
-            // Update any defaults that might be language dependent:
-            Globals.prefs.setLanguageDependentDefaultValues();
-            // Warn about restart needed:
+        if (!languageSelection.getValue().equals(prefs.getLanguage())) {
+            prefs.setLanguage(languageSelection.getValue());
+            Localization.setLanguage(languageSelection.getValue());
 
-            DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showWarningDialogAndWait(Localization.lang("Changed language settings"),
+            // Warn about restart needed:
+            dialogService.showWarningDialogAndWait(Localization.lang("Changed language settings"),
                     Localization.lang("You have changed the language setting.")
-                            .concat(" ")
-                            .concat(Localization.lang("You must restart JabRef for this to come into effect."))));
+                                .concat(" ")
+                                .concat(Localization.lang("You must restart JabRef for this to come into effect.")));
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/l10n/Language.java b/src/main/java/org/jabref/logic/l10n/Language.java
new file mode 100644
index 00000000000..1bde6443678
--- /dev/null
+++ b/src/main/java/org/jabref/logic/l10n/Language.java
@@ -0,0 +1,65 @@
+package org.jabref.logic.l10n;
+
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * Contains all supported languages.
+ */
+public enum Language {
+
+    BahasaIndonesia("Bahasa Indonesia", "in"),
+    BrazilianPortuguese("Brazilian Portuguese", "pt_BR"),
+    Danish("Dansk", "da"),
+    German("Deutsch", "de"),
+    English("English", "en"),
+    Spanish("Español", "es"),
+    French("Français", "fr"),
+    Italian("Italiano", "it"),
+    Japanese("Japanese", "ja"),
+    Dutch("Nederlands", "nl"),
+    Norwegian("Norsk", "no"),
+    Persian("Persian (فارسی)", "fa"),
+    Russian("Russian", "ru"),
+    SimplifiedChinese("Simplified Chinese", "zh"),
+    Svenska("Svenska", "sv"),
+    Turkish("Turkish", "tr"),
+    Vietnamese("Vietnamese", "vi"),
+    Greek("ελληνικά", "el"),
+    Tagalog("Tagalog/Filipino", "tl");
+
+    private final String displayName;
+    private final String id;
+
+    Language(String displayName, String id) {
+        this.displayName = displayName;
+        this.id = id;
+    }
+
+    public static Optional<Locale> convertToSupportedLocale(Language language) {
+        Objects.requireNonNull(language);
+
+        //Very important to split languages like pt_BR into two parts, because otherwise the country would be treated lowercase and create problems in loading
+        String[] languageParts = language.getId().split("_");
+        Locale locale;
+        if (languageParts.length == 1) {
+            locale = new Locale(languageParts[0]);
+        } else if (languageParts.length == 2) {
+            locale = new Locale(languageParts[0], languageParts[1]);
+        } else {
+            locale = Locale.ENGLISH;
+        }
+
+        return Optional.of(locale);
+
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public String getId() {
+        return id;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/l10n/Languages.java b/src/main/java/org/jabref/logic/l10n/Languages.java
deleted file mode 100644
index 566e9216b5e..00000000000
--- a/src/main/java/org/jabref/logic/l10n/Languages.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.jabref.logic.l10n;
-
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.TreeMap;
-
-public class Languages {
-
-    public static final Map<String, String> LANGUAGES;
-
-    static {
-        LANGUAGES = new TreeMap<>();
-
-        // LANGUAGES contains mappings for supported languages.
-        LANGUAGES.put("Bahasa Indonesia", "in");
-        LANGUAGES.put("Brazilian Portuguese", "pt_BR");
-        LANGUAGES.put("Dansk", "da");
-        LANGUAGES.put("Deutsch", "de");
-        LANGUAGES.put("English", "en");
-        LANGUAGES.put("Español", "es");
-        LANGUAGES.put("Français", "fr");
-        LANGUAGES.put("Italiano", "it");
-        LANGUAGES.put("Japanese", "ja");
-        LANGUAGES.put("Nederlands", "nl");
-        LANGUAGES.put("Norsk", "no");
-        LANGUAGES.put("Persian (فارسی)", "fa");
-        LANGUAGES.put("Russian", "ru");
-        LANGUAGES.put("Simplified Chinese", "zh");
-        LANGUAGES.put("Svenska", "sv");
-        LANGUAGES.put("Turkish", "tr");
-        LANGUAGES.put("Vietnamese", "vi");
-        LANGUAGES.put("ελληνικά", "el");
-        LANGUAGES.put("Tagalog/Filipino", "tl");
-    }
-
-    private Languages() {
-    }
-
-    public static Optional<Locale> convertToSupportedLocale(String language) {
-        Objects.requireNonNull(language);
-
-        if (!LANGUAGES.values().contains(language)) {
-            return Optional.empty();
-        }
-        //Very important to split languages like pt_BR into two parts, because otherwise the country would be threated lowercase
-        //and create problems in loading
-        String[] languageParts = language.split("_");
-        Locale locale;
-        if (languageParts.length == 1) {
-            locale = new Locale(languageParts[0]);
-        } else if (languageParts.length == 2) {
-            locale = new Locale(languageParts[0], languageParts[1]);
-        } else {
-            locale = Locale.ENGLISH;
-        }
-
-        return Optional.of(locale);
-
-    }
-
-}
diff --git a/src/main/java/org/jabref/logic/l10n/Localization.java b/src/main/java/org/jabref/logic/l10n/Localization.java
index b6cce674b13..57b48226452 100644
--- a/src/main/java/org/jabref/logic/l10n/Localization.java
+++ b/src/main/java/org/jabref/logic/l10n/Localization.java
@@ -53,7 +53,7 @@ public static String lang(String key, String... params) {
         if (localizedMessages == null) {
             // I'm logging this because it should never happen
             LOGGER.error("Messages are not initialized before accessing key: " + key);
-            setLanguage("en");
+            setLanguage(Language.English);
         }
         return lookup(localizedMessages, key, params);
     }
@@ -64,12 +64,12 @@ public static String lang(String key, String... params) {
      *
      * @param language Language identifier like "en", "de", etc.
      */
-    public static void setLanguage(String language) {
-        Optional<Locale> knownLanguage = Languages.convertToSupportedLocale(language);
+    public static void setLanguage(Language language) {
+        Optional<Locale> knownLanguage = Language.convertToSupportedLocale(language);
         final Locale defaultLocale = Locale.getDefault();
         if (!knownLanguage.isPresent()) {
             LOGGER.warn("Language " + language + " is not supported by JabRef (Default:" + defaultLocale + ")");
-            setLanguage("en");
+            setLanguage(Language.English);
             return;
         }
         // avoid reinitialization of the language bundles
@@ -86,7 +86,7 @@ public static void setLanguage(String language) {
         } catch (MissingResourceException ex) {
             // should not happen as we have scripts to enforce this
             LOGGER.warn("Could not find bundles for language " + locale + ", switching to full english language", ex);
-            setLanguage("en");
+            setLanguage(Language.English);
         }
     }
 
@@ -98,7 +98,7 @@ public static void setLanguage(String language) {
     public static LocalizationBundle getMessages() {
         // avoid situations where this function is called before any language was set
         if (locale == null) {
-            setLanguage("en");
+            setLanguage(Language.English);
         }
         return localizedMessages;
     }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index dfbb3cb801e..1be4e2a6052 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -32,6 +32,7 @@
 import java.util.prefs.InvalidPreferencesFormatException;
 import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.jabref.Globals;
 import org.jabref.JabRefException;
@@ -61,6 +62,7 @@
 import org.jabref.logic.importer.fetcher.DoiFetcher;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
+import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.layout.format.FileLinkPreferences;
@@ -444,7 +446,7 @@ private JabRefPreferences() {
         // the initialization of the preferences in main
         // Otherwise that language framework will be instantiated and more importantly, statically initialized preferences
         // like the SearchDisplayMode will never be translated.
-        Localization.setLanguage(prefs.get(LANGUAGE, "en"));
+        Localization.setLanguage(getLanguage());
 
         SearchPreferences.putDefaults(defaults);
 
@@ -1928,4 +1930,21 @@ public String setLastPreferencesExportPath() {
     public void setLastPreferencesExportPath(Path exportFile) {
         put(PREFS_EXPORT_PATH, exportFile.toString());
     }
+
+    public Language getLanguage() {
+        String languageId = get(LANGUAGE);
+        return Stream.of(Language.values())
+                     .filter(language -> language.getId().equalsIgnoreCase(languageId))
+                     .findFirst()
+                     .orElse(Language.English);
+    }
+
+    public void setLanguage(Language language) {
+        Language oldLanguage = getLanguage();
+        put(LANGUAGE, language.getId());
+        if (language != oldLanguage) {
+            // Update any defaults that might be language dependent:
+            setLanguageDependentDefaultValues();
+        }
+    }
 }
diff --git a/src/test/java/org/jabref/logic/l10n/LanguageTest.java b/src/test/java/org/jabref/logic/l10n/LanguageTest.java
new file mode 100644
index 00000000000..92f7329f8b7
--- /dev/null
+++ b/src/test/java/org/jabref/logic/l10n/LanguageTest.java
@@ -0,0 +1,28 @@
+package org.jabref.logic.l10n;
+
+import java.util.Locale;
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class LanguageTest {
+
+    @Test
+    void convertKnownLanguageOnly() {
+        assertEquals(Optional.of(new Locale("en")), Language.convertToSupportedLocale(Language.English));
+    }
+
+    @Test
+    void convertKnownLanguageAndCountryCorrect() {
+        //Language and country code have to be separated see: https://stackoverflow.com/a/3318598
+        assertEquals(Optional.of(new Locale("pt", "BR")), Language.convertToSupportedLocale(Language.BrazilianPortuguese));
+    }
+
+    @Test
+    void convertToKnownLocaleNull() {
+        assertThrows(NullPointerException.class, () -> Language.convertToSupportedLocale(null));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/l10n/LanguagesTest.java b/src/test/java/org/jabref/logic/l10n/LanguagesTest.java
deleted file mode 100644
index 25f9612b772..00000000000
--- a/src/test/java/org/jabref/logic/l10n/LanguagesTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.jabref.logic.l10n;
-
-import java.util.Locale;
-import java.util.Optional;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class LanguagesTest {
-
-    @Test
-    public void convertKnownLanguageOnly() {
-        assertEquals(Optional.of(new Locale("en")), Languages.convertToSupportedLocale("en"));
-    }
-
-    @Test
-    public void convertUnknownLanguage() {
-        assertEquals(Optional.empty(), Languages.convertToSupportedLocale("This is not a locale"));
-    }
-
-    @Test
-    public void convertKnownLanguageAndCountryCorrect() {
-        //Language and country code have to be separated see: https://stackoverflow.com/a/3318598
-        assertEquals(Optional.of(new Locale("pt", "BR")), Languages.convertToSupportedLocale("pt_BR"));
-    }
-
-    @Test
-    public void convertKnownLanguageAndCountryInCorrect() {
-        //Language and country code have to be separated see: https://stackoverflow.com/a/3318598
-        assertFalse(Optional.of(new Locale("pt_BR")).equals(Languages.convertToSupportedLocale("pt_BR")));
-    }
-
-    @Test
-    public void convertKnownLanguageAndCountryOnly() {
-        assertEquals(Optional.empty(), Languages.convertToSupportedLocale("en_US"));
-    }
-
-    @Test
-    public void convertKnownLanguageAndUnknownCountry() {
-        assertEquals(Optional.empty(), Languages.convertToSupportedLocale("en_GB_unknownvariant"));
-    }
-
-    @Test
-    public void convertUnknownKnownLanguageAndUnknownCountry() {
-        assertEquals(Optional.empty(), Languages.convertToSupportedLocale("language_country_variant"));
-    }
-
-    @Test
-    public void convertToKnownLocaleNull() {
-        assertThrows(NullPointerException.class, () -> Languages.convertToSupportedLocale(null));
-    }
-}
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
index 40de1312b73..a5c0d30751e 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.l10n;
 
-import com.google.common.collect.Sets;
-import org.junit.jupiter.api.Test;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -11,9 +8,18 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -34,14 +40,18 @@ void allFilesMustBeInLanguages() throws IOException {
                 }
             }
         }
-        assertEquals(Collections.emptySet(), Sets.symmetricDifference(new HashSet<>(Languages.LANGUAGES.values()), localizationFiles), "There are some localization files that are not present in org.jabref.logic.l10n.Languages or vice versa!");
+
+        Set<String> knownLanguages = Stream.of(Language.values())
+                                           .map(Language::getId)
+                                           .collect(Collectors.toSet());
+        assertEquals(knownLanguages, localizationFiles, "There are some localization files that are not present in org.jabref.logic.l10n.Language or vice versa!");
     }
 
     @Test
     void ensureNoDuplicates() {
         String bundle = "JabRef";
-        for (String lang : Languages.LANGUAGES.values()) {
-            String propertyFilePath = String.format("/l10n/%s_%s.properties", bundle, lang);
+        for (Language lang : Language.values()) {
+            String propertyFilePath = String.format("/l10n/%s_%s.properties", bundle, lang.getId());
 
             // read in
             DuplicationDetectionProperties properties = new DuplicationDetectionProperties();
@@ -54,7 +64,7 @@ void ensureNoDuplicates() {
 
             List<String> duplicates = properties.getDuplicates();
 
-            assertEquals(Collections.emptyList(), duplicates, "Duplicate keys inside bundle " + bundle + "_" + lang);
+            assertEquals(Collections.emptyList(), duplicates, "Duplicate keys inside bundle " + bundle + "_" + lang.getId());
         }
     }
 
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
index fd8dcd5516e..021c5c53bd1 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.l10n;
 
+import java.util.Locale;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.Locale;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class LocalizationTest {
@@ -21,50 +21,43 @@ void storeDefaultLocale() {
     void restoreDefaultLocale() {
         Locale.setDefault(locale);
         javax.swing.JComponent.setDefaultLocale(locale);
-        Localization.setLanguage("en");
+        Localization.setLanguage(Language.English);
     }
 
     @Test
     void testSetKnownLanguage() {
         Locale.setDefault(Locale.CHINA);
-        Localization.setLanguage("en");
-        assertEquals("en", Locale.getDefault().toString());
-    }
-
-    @Test
-    void testSetUnknownLanguage() {
-        Locale.setDefault(Locale.CHINA);
-        Localization.setLanguage("WHATEVER");
+        Localization.setLanguage(Language.English);
         assertEquals("en", Locale.getDefault().toString());
     }
 
     @Test
     void testKnownTranslationWithGroups() {
-        Localization.setLanguage("en");
+        Localization.setLanguage(Language.English);
         assertEquals("Groups", Localization.lang("Groups"));
     }
 
     @Test
     void testKnownEnglishTranslationOfUndo() {
-        Localization.setLanguage("en");
+        Localization.setLanguage(Language.English);
         assertEquals("Undo", Localization.lang("Undo"));
     }
 
     @Test
     void testKnownGermanTranslation() {
-        Localization.setLanguage("de");
+        Localization.setLanguage(Language.German);
         assertEquals("Zeige Einstellungen", Localization.lang("Show preferences"));
     }
 
     @Test
     void testKnownTranslationWithCountryModifier() {
-        Localization.setLanguage("en_US");
-        assertEquals("Groups", Localization.lang("Groups"));
+        Localization.setLanguage(Language.BrazilianPortuguese);
+        assertEquals("Grupos", Localization.lang("Groups"));
     }
 
     @Test
     void testUnknownTranslation() {
-        Localization.setLanguage("en");
+        Localization.setLanguage(Language.English);
         assertEquals("WHATEVER", Localization.lang("WHATEVER"));
     }
 
diff --git a/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java b/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java
index 922f7345385..96ef48148e5 100644
--- a/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java
+++ b/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.l10n;
 
-import com.google.common.base.Splitter;
-import org.junit.jupiter.api.Test;
-
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -14,6 +11,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.google.common.base.Splitter;
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -49,8 +49,8 @@ private String[] getParts(Path p) {
 
     @Test
     void testCompletenessOfBundles() {
-        for (String lang : Languages.LANGUAGES.values()) {
-            Path messagesPropertyFile = Paths.get("src/main/resources").resolve(Localization.RESOURCE_PREFIX + "_" + lang + ".properties");
+        for (Language language : Language.values()) {
+            Path messagesPropertyFile = Paths.get("src/main/resources").resolve(Localization.RESOURCE_PREFIX + "_" + language.getId() + ".properties");
             assertTrue(Files.exists(messagesPropertyFile));
         }
     }

From 6c0d6ed66a47eb4e5a522db725c5973fc2dc3fa7 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Thu, 23 Aug 2018 09:45:46 +0200
Subject: [PATCH 063/229] Add minimal height for entry editor (#4283)

Fixes #4279.
---
 CHANGELOG.md                                              | 4 ++--
 src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0429c492efa..6c079e3f6a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,8 +29,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - Files without a defined external file type are now directly opened with the default application of the operating system
 - We streamlined the process to rename and move files by removing the confirmation dialogs.
 - We removed the redundant new lines of markings and wrapped the summary in the File annotation tab. [#3823](https://github.com/JabRef/jabref/issues/3823)
-- We add auto url formatting when user paste link to URL field in Entry editor  [#254](https://github.com/koppor/jabref/issues/254)
-
+- We add auto url formatting when user paste link to URL field in entry editor. [#254](https://github.com/koppor/jabref/issues/254)
+- We added a minimal height for the entry editor so that it can no longer be hidden by accident. [#4279](https://github.com/JabRef/jabref/issues/4279)
 
 
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml
index c31e177399e..d4cd990c09b 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root xmlns:fx="http://javafx.com/fxml/1" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.112"
-         fx:controller="org.jabref.gui.entryeditor.EntryEditor">
+         fx:controller="org.jabref.gui.entryeditor.EntryEditor" minHeight="50">
     <left>
         <ToolBar orientation="VERTICAL">
             <Button styleClass="icon-button,narrow" onAction="#close">

From 27e3f1c0235726629b7d2d29a0c72fe1a1a0742d Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Thu, 23 Aug 2018 15:30:38 +0200
Subject: [PATCH 064/229] fix npe in Merge entries dialog

fix fx thread error
convert file to path
---
 .../org/jabref/gui/collab/ChangeScanner.java  |  7 +++---
 .../gui/collab/DatabaseChangeMonitor.java     |  3 +--
 .../gui/exporter/SaveDatabaseAction.java      |  4 ++--
 .../jabref/gui/mergeentries/MergeEntries.java |  3 ++-
 .../gui/mergeentries/MergeEntriesDialog.java  | 22 +++++++++++--------
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
index 553d17cb3a2..4d395c167a8 100644
--- a/src/main/java/org/jabref/gui/collab/ChangeScanner.java
+++ b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.collab;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Comparator;
@@ -39,7 +38,7 @@ public class ChangeScanner implements Runnable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ChangeScanner.class);
 
-    private final File file;
+    private final Path file;
     private final Path tempFile;
     private final BibDatabaseContext databaseInMemory;
 
@@ -56,7 +55,7 @@ public class ChangeScanner implements Runnable {
 
     //  NamedCompound edit = new NamedCompound("Merged external changes")
 
-    public ChangeScanner(JabRefFrame frame, BasePanel bp, File file, Path tempFile) {
+    public ChangeScanner(JabRefFrame frame, BasePanel bp, Path file, Path tempFile) {
         this.panel = bp;
         this.frame = frame;
         this.databaseInMemory = bp.getBibDatabaseContext();
@@ -126,7 +125,7 @@ public void run() {
             databaseInTemp = result.getDatabaseContext();
 
             // Parse the modified file.
-            result = OpenDatabase.loadDatabase(file, importFormatPreferences, Globals.getFileUpdateMonitor());
+            result = OpenDatabase.loadDatabase(file.toAbsolutePath().toString(), importFormatPreferences, Globals.getFileUpdateMonitor());
             BibDatabaseContext databaseOnDisk = result.getDatabaseContext();
 
             // Start looking at changes.
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
index 8b4424e870b..7c300bcc5d8 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
@@ -60,7 +60,7 @@ public void fileUpdated() {
 
         updatedExternally = true;
 
-        final ChangeScanner scanner = new ChangeScanner(panel.frame(), panel, database.getDatabaseFile().orElse(null), tmpFile);
+        final ChangeScanner scanner = new ChangeScanner(panel.frame(), panel, database.getDatabasePath().orElse(null), tmpFile);
 
         // Test: running scan automatically in background
         if (database.getDatabasePath().isPresent() && !FileBasedLock.waitForFileLock(database.getDatabasePath().get())) {
@@ -76,7 +76,6 @@ public void fileUpdated() {
             fileUpdated();
             return;
         }
-
         JabRefExecutorService.INSTANCE.executeInterruptableTaskAndWait(scanner);
 
         // Adding the sidepane component is Swing work, so we must do this in the Swing
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index a5a99090927..9187ecee7b8 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -409,13 +409,13 @@ private boolean checkExternalModification() {
                     JabRefExecutorService.INSTANCE.execute(() -> {
 
                         if (!FileBasedLock
-                                .waitForFileLock(panel.getBibDatabaseContext().getDatabaseFile().get().toPath())) {
+                                          .waitForFileLock(panel.getBibDatabaseContext().getDatabasePath().get())) {
                             // TODO: GUI handling of the situation when the externally modified file keeps being locked.
                             LOGGER.error("File locked, this will be trouble.");
                         }
 
                         ChangeScanner scanner = new ChangeScanner(panel.frame(), panel,
-                                panel.getBibDatabaseContext().getDatabaseFile().get(), panel.getTempFile());
+                                                                  panel.getBibDatabaseContext().getDatabasePath().orElse(null), panel.getTempFile());
                         JabRefExecutorService.INSTANCE.executeInterruptableTaskAndWait(scanner);
                         if (scanner.changesFound()) {
                             scanner.displayResult(resolved -> {
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
index 1a49ed7f9c1..1e4db5bcc0f 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
@@ -41,6 +41,7 @@
 import org.jabref.logic.formatter.casechanger.SentenceCaseFormatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.strings.DiffHighlighting;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.InternalBibtexFields;
@@ -179,7 +180,7 @@ private void initialize() {
         // Setup a PreviewPanel and a Bibtex source box for the merged entry
         mainPanel.add(boldFontLabel(Localization.lang("Merged entry")), CELL_CONSTRAINTS.xyw(1, 6, 6));
 
-        entryPreview = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService(), ExternalFileTypes.getInstance());
+        entryPreview = new PreviewPanel(null, new BibDatabaseContext(), Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService(), ExternalFileTypes.getInstance());
         entryPreview.setEntry(mergedEntry);
         JFXPanel container = CustomJFXPanel.wrap(new Scene(entryPreview));
         mainPanel.add(container, CELL_CONSTRAINTS.xyw(1, 8, 6));
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
index 39a9e6f789b..ed5fc5a7863 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
@@ -11,6 +11,7 @@
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableInsertEntry;
 import org.jabref.gui.undo.UndoableRemoveEntry;
+import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.WindowLocation;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
@@ -88,15 +89,18 @@ private void init(List<BibEntry> selected) {
             // Create a new entry and add it to the undo stack
             // Remove the other two entries and add them to the undo stack (which is not working...)
             BibEntry mergedEntry = mergeEntries.getMergeEntry();
-            panel.insertEntry(mergedEntry);
-            ce.addEdit(new UndoableInsertEntry(panel.getDatabase(), mergedEntry));
-            ce.addEdit(new UndoableRemoveEntry(panel.getDatabase(), one, panel));
-            panel.getDatabase().removeEntry(one);
-            ce.addEdit(new UndoableRemoveEntry(panel.getDatabase(), two, panel));
-            panel.getDatabase().removeEntry(two);
-            ce.end();
-            panel.getUndoManager().addEdit(ce);
-            panel.output(Localization.lang("Merged entries"));
+            DefaultTaskExecutor.runInJavaFXThread(()->{
+                panel.insertEntry(mergedEntry);
+                ce.addEdit(new UndoableInsertEntry(panel.getDatabase(), mergedEntry));
+                ce.addEdit(new UndoableRemoveEntry(panel.getDatabase(), one, panel));
+                panel.getDatabase().removeEntry(one);
+                ce.addEdit(new UndoableRemoveEntry(panel.getDatabase(), two, panel));
+                panel.getDatabase().removeEntry(two);
+                ce.end();
+                panel.getUndoManager().addEdit(ce);
+                panel.output(Localization.lang("Merged entries"));
+            });
+
             dispose();
         });
 

From fe0631032f828cfda650b18a28929313f22978a8 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Thu, 23 Aug 2018 15:44:37 +0200
Subject: [PATCH 065/229] Fix Export to clipbaord action (#4286)

* Fix Export to clipbaord action

* execute clipboard setting in onsuccess

* fix l10n
---
 src/main/java/org/jabref/gui/BasePanel.java   |  2 -
 src/main/java/org/jabref/gui/JabRefFrame.java |  3 +-
 .../gui/exporter/ExportToClipboardAction.java | 99 ++++++++++---------
 .../jabref/gui/maintable/RightClickMenu.java  |  7 +-
 src/main/resources/l10n/JabRef_en.properties  |  1 -
 5 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index f9f1641a7e3..229ee4ad24b 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -50,7 +50,6 @@
 import org.jabref.gui.contentselector.ContentSelectorDialog;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.entryeditor.EntryEditor;
-import org.jabref.gui.exporter.ExportToClipboardAction;
 import org.jabref.gui.exporter.SaveDatabaseAction;
 import org.jabref.gui.externalfiles.FindFullTextAction;
 import org.jabref.gui.externalfiletype.ExternalFileMenuItem;
@@ -434,7 +433,6 @@ private void setupActions() {
             csd.setVisible(true);
         });
 
-        actions.put(Actions.EXPORT_TO_CLIPBOARD, new ExportToClipboardAction(this));
         actions.put(Actions.SEND_AS_EMAIL, new SendAsEMailAction(frame));
 
         actions.put(Actions.WRITE_XMP, new WriteXMPAction(this)::execute);
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 7996a474587..179bcb9f0f5 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -88,6 +88,7 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.dialogs.AutosaveUIManager;
 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.externalfiletype.ExternalFileTypes;
@@ -781,7 +782,7 @@ private MenuBar createMenu() {
                                                      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)),
 
diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
index 97dc2a559e4..ee1cfad868d 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
@@ -1,12 +1,10 @@
 package org.jabref.gui.exporter;
 
-import java.awt.datatransfer.ClipboardOwner;
+import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
@@ -16,30 +14,43 @@
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
-import org.jabref.gui.actions.BaseAction;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.BackgroundTask;
-import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.exporter.Exporter;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ExportToClipboardAction implements BaseAction {
+public class ExportToClipboardAction extends SimpleCommand {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(ExportToClipboardAction.class);
 
-    private final BasePanel panel;
+    private JabRefFrame frame;
+    private final DialogService dialogService;
+    private BasePanel panel;
+    private final List<BibEntry> entries = new ArrayList<>();
+
+    public ExportToClipboardAction(JabRefFrame frame, DialogService dialogService) {
+        this.frame = frame;
+        this.dialogService = dialogService;
+    }
 
-    public ExportToClipboardAction(BasePanel panel) {
+    public ExportToClipboardAction(BasePanel panel, DialogService dialogService) {
         this.panel = panel;
+        this.dialogService = dialogService;
     }
 
     @Override
-    public void action() {
+    public void execute() {
         if (panel == null) {
-            return;
+            panel = frame.getCurrentBasePanel();
         }
+
         if (panel.getSelectedEntries().isEmpty()) {
             panel.output(Localization.lang("This operation requires one or more entries to be selected."));
             return;
@@ -49,14 +60,12 @@ public void action() {
                                                         .sorted(Comparator.comparing(Exporter::getName))
                                                         .collect(Collectors.toList());
 
-        DefaultTaskExecutor.runInJavaFXThread(() -> {
-            Optional<Exporter> selectedExporter = panel.frame().getDialogService().showChoiceDialogAndWait(Localization.lang("Export"), Localization.lang("Select export format"),
-                    Localization.lang("Export"), exporters);
+        Optional<Exporter> selectedExporter = dialogService.showChoiceDialogAndWait(Localization.lang("Export"), Localization.lang("Select export format"),
+                                                                                    Localization.lang("Export"), exporters);
 
-            selectedExporter.ifPresent(exporter -> BackgroundTask.wrap(() -> exportToClipboard(exporter))
-                                                                 .onSuccess(panel::output)
-                                                                 .executeWith(Globals.TASK_EXECUTOR));
-        });
+        selectedExporter.ifPresent(exporter -> BackgroundTask.wrap(() -> exportToClipboard(exporter))
+                                                             .onSuccess(this::setContentToClipboard)
+                                                             .executeWith(Globals.TASK_EXECUTOR));
 
     }
 
@@ -64,8 +73,7 @@ private String exportToClipboard(Exporter exporter) {
         // Set the global variable for this database's file directory before exporting,
         // so formatters can resolve linked files correctly.
         // (This is an ugly hack!)
-        Globals.prefs.fileDirForDatabase = panel.getBibDatabaseContext()
-                                                .getFileDirectories(Globals.prefs.getFileDirectoryPreferences());
+        Globals.prefs.fileDirForDatabase = panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()).stream().map(Path::toString).collect(Collectors.toList());
 
         Path tmp = null;
         try {
@@ -73,38 +81,20 @@ private String exportToClipboard(Exporter exporter) {
             // file, and read the contents afterwards:
             tmp = Files.createTempFile("jabrefCb", ".tmp");
 
-            List<BibEntry> entries = panel.getSelectedEntries();
+            entries.addAll(panel.getSelectedEntries());
 
             // Write to file:
             exporter.export(panel.getBibDatabaseContext(), tmp,
-                    panel.getBibDatabaseContext()
-                         .getMetaData()
-                         .getEncoding()
-                         .orElse(Globals.prefs.getDefaultEncoding()),
-                    entries);
+                            panel.getBibDatabaseContext()
+                                 .getMetaData()
+                                 .getEncoding()
+                                 .orElse(Globals.prefs.getDefaultEncoding()),
+                            entries);
             // Read the file and put the contents on the clipboard:
-            StringBuilder sb = new StringBuilder();
-            try (Reader reader = new InputStreamReader(Files.newInputStream(tmp, StandardOpenOption.DELETE_ON_CLOSE),
-                    panel.getBibDatabaseContext()
-                         .getMetaData()
-                         .getEncoding()
-                         .orElse(Globals.prefs.getDefaultEncoding()))) {
-                int s;
-                while ((s = reader.read()) != -1) {
-                    sb.append((char) s);
-                }
-            }
-            ClipboardOwner owner = (clipboard, content) -> {
-                // Do nothing
-            };
-            ClipboardContent clipboardContent = new ClipboardContent();
-            clipboardContent.putRtf(sb.toString());
-            Globals.clipboardManager.setContent(clipboardContent);
-            return Localization.lang("Entries exported to clipboard") + ": " + entries.size();
 
+            return readFileToString(tmp);
         } catch (Exception e) {
             LOGGER.error("Error exporting to clipboard", e);
-            return Localization.lang("Error exporting to clipboard");
         } finally {
             // Clean up:
             if ((tmp != null) && Files.exists(tmp)) {
@@ -115,5 +105,24 @@ private String exportToClipboard(Exporter exporter) {
                 }
             }
         }
+        return "";
+    }
+
+    private void setContentToClipboard(String content) {
+        ClipboardContent clipboardContent = new ClipboardContent();
+        clipboardContent.putRtf(content);
+        Globals.clipboardManager.setContent(clipboardContent);
+
+        panel.output(Localization.lang("Entries exported to clipboard") + ": " + entries.size());
+
+    }
+
+    private String readFileToString(Path tmp) throws IOException {
+        try (BufferedReader reader = Files.newBufferedReader(tmp, panel.getBibDatabaseContext()
+                                                                       .getMetaData()
+                                                                       .getEncoding()
+                                                                       .orElse(Globals.prefs.getDefaultEncoding()))) {
+            return reader.lines().collect(Collectors.joining(OS.NEWLINE));
+        }
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index 28c188eca9c..f0bd9d61775 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -14,6 +14,7 @@
 import org.jabref.gui.actions.Actions;
 import org.jabref.gui.actions.OldCommandWrapper;
 import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.exporter.ExportToClipboardAction;
 import org.jabref.gui.filelist.AttachFileAction;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.menus.ChangeEntryTypeMenu;
@@ -34,7 +35,7 @@ public static ContextMenu create(BibEntryTableViewModel entry, KeyBindingReposit
         ActionFactory factory = new ActionFactory(keyBindingRepository);
 
         contextMenu.getItems().add(factory.createMenuItem(StandardActions.COPY, new OldCommandWrapper(Actions.COPY, panel)));
-        contextMenu.getItems().add(createCopySubMenu(panel, factory));
+        contextMenu.getItems().add(createCopySubMenu(panel, factory, dialogService));
         contextMenu.getItems().add(factory.createMenuItem(StandardActions.PASTE, new OldCommandWrapper(Actions.PASTE, panel)));
         contextMenu.getItems().add(factory.createMenuItem(StandardActions.CUT, new OldCommandWrapper(Actions.CUT, panel)));
         contextMenu.getItems().add(factory.createMenuItem(StandardActions.DELETE, new OldCommandWrapper(Actions.DELETE, panel)));
@@ -141,7 +142,7 @@ private static OldCommandWrapper getOpenFolderCommand(BasePanel panel) {
         return command;
     }
 
-    private static Menu createCopySubMenu(BasePanel panel, ActionFactory factory) {
+    private static Menu createCopySubMenu(BasePanel panel, ActionFactory factory, DialogService dialogService) {
         Menu copySpecialMenu = factory.createMenu(StandardActions.COPY_MORE);
         copySpecialMenu.getItems().add(factory.createMenuItem(StandardActions.COPY_TITLE, new OldCommandWrapper(Actions.COPY_TITLE, panel)));
         copySpecialMenu.getItems().add(factory.createMenuItem(StandardActions.COPY_KEY, new OldCommandWrapper(Actions.COPY_KEY, panel)));
@@ -164,7 +165,7 @@ private static Menu createCopySubMenu(BasePanel panel, ActionFactory factory) {
             copySpecialMenu.getItems().add(factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new OldCommandWrapper(Actions.COPY_CITATION_HTML, panel)));
         }
 
-        copySpecialMenu.getItems().add(factory.createMenuItem(StandardActions.EXPORT_TO_CLIPBOARD, new OldCommandWrapper(Actions.EXPORT_TO_CLIPBOARD, panel)));
+        copySpecialMenu.getItems().add(factory.createMenuItem(StandardActions.EXPORT_TO_CLIPBOARD, new ExportToClipboardAction(panel, dialogService)));
         return copySpecialMenu;
     }
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 0b3bfa33c0a..d088df6710c 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -378,7 +378,6 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Entry types
 
 Error=Error
-Error\ exporting\ to\ clipboard=Error exporting to clipboard
 
 Error\ occurred\ when\ parsing\ entry=Error occurred when parsing entry
 

From a09ab966784ac78df9b1d36479714f7514d15d9a Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Thu, 23 Aug 2018 15:52:29 +0200
Subject: [PATCH 066/229] execute changes only if disk db present

---
 .../org/jabref/gui/collab/ChangeScanner.java  | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
index 4d395c167a8..ba99990d46d 100644
--- a/src/main/java/org/jabref/gui/collab/ChangeScanner.java
+++ b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.collab;
 
-import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Comparator;
 import java.util.List;
@@ -38,7 +37,7 @@ public class ChangeScanner implements Runnable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ChangeScanner.class);
 
-    private final Path file;
+    private final Optional<Path> file;
     private final Path tempFile;
     private final BibDatabaseContext databaseInMemory;
 
@@ -59,7 +58,7 @@ public ChangeScanner(JabRefFrame frame, BasePanel bp, Path file, Path tempFile)
         this.panel = bp;
         this.frame = frame;
         this.databaseInMemory = bp.getBibDatabaseContext();
-        this.file = file;
+        this.file = Optional.ofNullable(file);
         this.tempFile = tempFile;
     }
 
@@ -73,8 +72,8 @@ public boolean changesFound() {
      */
     private static BibEntry bestFit(BibEntry targetEntry, List<BibEntry> entries) {
         return entries.stream()
-                .max(Comparator.comparingDouble(candidate -> DuplicateCheck.compareEntriesStrictly(targetEntry, candidate)))
-                .orElse(null);
+                      .max(Comparator.comparingDouble(candidate -> DuplicateCheck.compareEntriesStrictly(targetEntry, candidate)))
+                      .orElse(null);
     }
 
     public void displayResult(final DisplayResultCallback fup) {
@@ -90,7 +89,7 @@ public void displayResult(final DisplayResultCallback fup) {
             });
         } else {
             frame.getDialogService().showInformationDialogAndWait(Localization.lang("External changes"),
-                    Localization.lang("No actual changes found."));
+                                                                  Localization.lang("No actual changes found."));
 
             fup.scanResultsResolved(true);
         }
@@ -100,11 +99,11 @@ private void storeTempDatabase() {
         JabRefExecutorService.INSTANCE.execute(() -> {
             try {
                 SavePreferences prefs = Globals.prefs.loadForSaveFromPreferences()
-                        .withMakeBackup(false)
-                        .withEncoding(panel.getBibDatabaseContext()
-                                .getMetaData()
-                                .getEncoding()
-                                .orElse(Globals.prefs.getDefaultEncoding()));
+                                                     .withMakeBackup(false)
+                                                     .withEncoding(panel.getBibDatabaseContext()
+                                                                        .getMetaData()
+                                                                        .getEncoding()
+                                                                        .orElse(Globals.prefs.getDefaultEncoding()));
 
                 BibDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new);
                 SaveSession ss = databaseWriter.saveDatabase(databaseInTemp, prefs);
@@ -117,15 +116,14 @@ private void storeTempDatabase() {
 
     @Override
     public void run() {
-        try {
-
+        file.ifPresent(diskdb -> {
             // Parse the temporary file.
             ImportFormatPreferences importFormatPreferences = Globals.prefs.getImportFormatPreferences();
-            ParserResult result = OpenDatabase.loadDatabase(tempFile.toFile(), importFormatPreferences, Globals.getFileUpdateMonitor());
+            ParserResult result = OpenDatabase.loadDatabase(tempFile.toAbsolutePath().toString(), importFormatPreferences, Globals.getFileUpdateMonitor());
             databaseInTemp = result.getDatabaseContext();
 
             // Parse the modified file.
-            result = OpenDatabase.loadDatabase(file.toAbsolutePath().toString(), importFormatPreferences, Globals.getFileUpdateMonitor());
+            result = OpenDatabase.loadDatabase(diskdb.toAbsolutePath().toString(), importFormatPreferences, Globals.getFileUpdateMonitor());
             BibDatabaseContext databaseOnDisk = result.getDatabaseContext();
 
             // Start looking at changes.
@@ -137,9 +135,7 @@ public void run() {
             differences.getPreambleDifferences().ifPresent(diff -> changes.add(new PreambleChangeViewModel(databaseInMemory.getDatabase().getPreamble().orElse(""), diff)));
             differences.getBibStringDifferences().forEach(diff -> changes.add(createBibStringDiff(diff)));
             differences.getEntryDifferences().forEach(diff -> changes.add(createBibEntryDiff(diff)));
-        } catch (IOException ex) {
-            LOGGER.warn("Problem running", ex);
-        }
+        });
     }
 
     private ChangeViewModel createBibStringDiff(BibStringDiff diff) {

From d6fe3568a7900b1c27544acf0169922e0dc43042 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Thu, 23 Aug 2018 15:58:47 +0200
Subject: [PATCH 067/229] checkstyle

---
 .../org/jabref/gui/mergeentries/MergeEntriesDialog.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
index ed5fc5a7863..f081759bb67 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
@@ -52,7 +52,7 @@ private void init(List<BibEntry> selected) {
         if (selected.size() != 2) { // None selected. Inform the user to select entries first.
 
             dialogService.showInformationDialogAndWait(Localization.lang("Merge entries"),
-                    Localization.lang("You have to choose exactly two entries to merge."));
+                                                       Localization.lang("You have to choose exactly two entries to merge."));
 
             this.dispose();
             return;
@@ -89,7 +89,7 @@ private void init(List<BibEntry> selected) {
             // Create a new entry and add it to the undo stack
             // Remove the other two entries and add them to the undo stack (which is not working...)
             BibEntry mergedEntry = mergeEntries.getMergeEntry();
-            DefaultTaskExecutor.runInJavaFXThread(()->{
+            DefaultTaskExecutor.runInJavaFXThread(() -> {
                 panel.insertEntry(mergedEntry);
                 ce.addEdit(new UndoableInsertEntry(panel.getDatabase(), mergedEntry));
                 ce.addEdit(new UndoableRemoveEntry(panel.getDatabase(), one, panel));
@@ -114,8 +114,8 @@ private void init(List<BibEntry> selected) {
         layout.insertColumn(1, ColumnSpec.decode(MARGIN));
 
         WindowLocation pw = new WindowLocation(this, JabRefPreferences.MERGEENTRIES_POS_X,
-                JabRefPreferences.MERGEENTRIES_POS_Y, JabRefPreferences.MERGEENTRIES_SIZE_X,
-                JabRefPreferences.MERGEENTRIES_SIZE_Y);
+                                               JabRefPreferences.MERGEENTRIES_POS_Y, JabRefPreferences.MERGEENTRIES_SIZE_X,
+                                               JabRefPreferences.MERGEENTRIES_SIZE_Y);
         pw.displayWindowAtStoredLocation();
 
         // Show what we've got

From 75b54c07b9ee05a72b6e6c196ee884606f59e81a Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus.dietz@tum.de>
Date: Fri, 24 Aug 2018 14:38:39 +0200
Subject: [PATCH 068/229] update gradle build-scan from 1.15.2 -> 1.16

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8eb24702287..8e12b13b869 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.gradle.build-scan' version '1.15.2'
+    id 'com.gradle.build-scan' version '1.16'
     id 'com.install4j.gradle' version '7.0.6'
     id 'com.github.johnrengelman.shadow' version '2.0.4'
     id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"

From f43b9c7e8bc6cba00e0d148ce657795ed0d5aa5a Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus.dietz@tum.de>
Date: Fri, 24 Aug 2018 14:39:36 +0200
Subject: [PATCH 069/229] update xmlunit-matchers from 2.6.0 -> 2.6.1

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8e12b13b869..03da92d1548 100644
--- a/build.gradle
+++ b/build.gradle
@@ -174,8 +174,8 @@ dependencies {
     testCompile 'com.github.tomakehurst:wiremock:2.18.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'
-    testCompile 'org.xmlunit:xmlunit-core:2.6.0'
-    testCompile 'org.xmlunit:xmlunit-matchers:2.6.0'
+    testCompile 'org.xmlunit:xmlunit-core:2.6.1'
+    testCompile 'org.xmlunit:xmlunit-matchers:2.6.1'
     testCompile 'com.tngtech.archunit:archunit-junit:0.8.3'
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"

From 64e6c9ed5bdf0a48c115720c7da80922f45170fe Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Tue, 28 Aug 2018 16:54:13 +0200
Subject: [PATCH 070/229] Upgrade gradle to 4.10 update xmlunit and postgres

---
 build.gradle                             |  12 +++---------
 gradle/wrapper/gradle-wrapper.jar        | Bin 54417 -> 54413 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 03da92d1548..8f5141a30a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -121,7 +121,7 @@ dependencies {
 
     compile 'mysql:mysql-connector-java:8.0.12'
 
-    compile 'org.postgresql:postgresql:42.2.4'
+    compile 'org.postgresql:postgresql:42.2.5'
 
     compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
 
@@ -174,8 +174,8 @@ dependencies {
     testCompile 'com.github.tomakehurst:wiremock:2.18.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'
-    testCompile 'org.xmlunit:xmlunit-core:2.6.1'
-    testCompile 'org.xmlunit:xmlunit-matchers:2.6.1'
+    testCompile 'org.xmlunit:xmlunit-core:2.6.2'
+    testCompile 'org.xmlunit:xmlunit-matchers:2.6.2'
     testCompile 'com.tngtech.archunit:archunit-junit:0.8.3'
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
@@ -217,12 +217,6 @@ dependencyUpdates.resolutionStrategy = {
                 selection.reject("Cannot be upgraded to version 2")
             }
         }
-        rules.withModule("mysql:mysql-connector-java") { ComponentSelection selection ->
-            if (selection.candidate.version ==~ /[6-9].*/) {
-                selection.reject("http://dev.mysql.com/downloads/connector/j/ lists the version 5.* as last stable version.")
-            }
-        }
-
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 758de960ec7947253b058ff79c88ce51f3abe08a..0d4a9516871afd710a9d84d89e31ba77745607bd 100644
GIT binary patch
delta 732
zcmYk4Ur19?9LINl)~4m3n;~1*r8tRj;+ldsTG*&j;mD0LiLwYROK2iKWQ|?~A0o3h
zzap4_7J?6pUPQ=BD%&6DHm6Q~$R4bh2%#5!>&Z@s+uDW0{d~^%+{^czdwqed{y>)Z
zc+T&yL!MJAm8!{SYf|rYZFe!1SDt!vF<7`q<#K4UACy<N9_0A}J_f>iSVEQmpTWJ*
zCH4Yyp=$OKJ0T0(LXSg>)8PuzGk9Y~a55RAVIwuGg?b~|_z|w56PmQvMb6Mjj-nRY
z(x#K25gTpjgx1eD(Bo2p{&_ncGbpGYh+64zl`vOT0mdT|v?eK+msKu}NrWG2H3&p&
z=t-@jdDx8_DRo|`ZJ~~CIRy4EIH}`;f_VcmGv8lz>^k${dF(1Rx9~&{Z%aNJQWB2D
zW!4H?+{J?M#ZR(rEX8loqq`_*JA`wIMk;e7)u+cbw-)h)k!CuCwj@e%v@^4%wo?S{
zi*>97FBdP<zHUBIj_;nmaCH}9Hz~oMl*#W=rVF86l`xr<*&ybU?ewKb1dU5hde|%Q
zeXkyyOGcXR<64hbyzZ4{nWmnJbaPmZv1J=g`qKK#Cy7lZ1~Z$@4yG5lSFH4QNYPwu
zte9zRSg0v=mhO)V98Os&IW92YU&0$mD4xiC;r<C88gP5nOk30VHfz8;j-O{an)o3}
ss92L(6!x_{Yy_{@+NdLlr@=DRu1m$4Kcnv77Z&$VxVc`b)`kAcA3t>?lmGw#

delta 674
zcmYk)T}V@590u^ce`_BwX^}IxS%%_;lVr<EjY%_8!l6cqDF{ZiDO5BKTAzy0m1(&i
z69i4_rlboA^P*O%oo(*>!`V#{7~K>D!@P~?^<`NH4(Ing@BclV!#Ts#S?=kqkqXuP
zh4b|_GMTK^ZEaC})BWsS?`2rD8(zFT^*$$2zD;)0rchoVsqNJAp<VohTgt~lsr27Y
zbW5k%1l~wywtzLMlBLlj&qcM@NP8K+__gTs9;Y_BU__<FeYq0f`Km>+Rb5f&VDlMi
zQYES(UnQk?Z>@gyS?N=rh)4VlG+4lCz<faty22Xx{CZ}_s{afX>=!dlOI4&Q6MV!u
zbVzV*se)1`1TBHX<gf`&HD+ThaEzRdBK`<e(?pA4xMdH{290#9UBu_@dU$wj>k#o*
z@F>~s=(iW+T*%107!Fxz!;Wl6Iev$X)Yr|aLv6T;iY{T%osXGt4SR+4a4YGYqG)!i
z`5iSFi0EnGRbCZgAz~)AORzt>9ZfDROi?2}zLBXcG<I8XHCjg>2Lu~p&2;mQ;Ja8o
z&D|9&iPzEWJ<bx0$F20#%~^%ZF%5#F8a4lpnd9x~=FEeKJ24a2U@)Pl*JEOrDJjQ?
zgo&ocGttVfp(okN;z%YhQuY&G7h=Pg3)ixq(zE#NDa72ei6jqanRv6}l%54)O?9zJ
eJWDy46FXK882<m8^8P-DxGth&rBt3TZH7P2bsJXz

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a95009c3b9e..115e6ac0aab 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From b39c2e5aa2a89644f5220f42befa0e758b44bc80 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Tue, 28 Aug 2018 19:50:07 +0200
Subject: [PATCH 071/229] Fix freeze on import into current library (#4299)

Execute import inspetion dialog in swing thread
---
 .../org/jabref/gui/importer/ImportAction.java | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/jabref/gui/importer/ImportAction.java b/src/main/java/org/jabref/gui/importer/ImportAction.java
index 445a85b06a9..f81bb517c9e 100644
--- a/src/main/java/org/jabref/gui/importer/ImportAction.java
+++ b/src/main/java/org/jabref/gui/importer/ImportAction.java
@@ -9,6 +9,8 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import javax.swing.SwingUtilities;
+
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
@@ -33,7 +35,7 @@ public class ImportAction {
     private final Optional<Importer> importer;
     private final DialogService dialogService;
     private Exception importError;
-    private TaskExecutor taskExecutor = Globals.TASK_EXECUTOR;
+    private final TaskExecutor taskExecutor = Globals.TASK_EXECUTOR;
 
     public ImportAction(JabRefFrame frame, boolean openInNew) {
         this(frame, openInNew, null);
@@ -78,9 +80,8 @@ private void reportResult(List<ImportFormatReader.UnknownFormatImport> imports)
             } else {
                 // Import in a specific format was specified. Check if we have stored error information:
                 if (importError == null) {
-                    dialogService.showErrorDialogAndWait(
-                            Localization.lang("Import failed"),
-                            Localization.lang("No entries found. Please make sure you are using the correct import filter."));
+                    dialogService.showErrorDialogAndWait(Localization.lang("Import failed"),
+                                                         Localization.lang("No entries found. Please make sure you are using the correct import filter."));
                 } else {
                     dialogService.showErrorDialogAndWait(Localization.lang("Import failed"), importError);
                 }
@@ -88,16 +89,17 @@ private void reportResult(List<ImportFormatReader.UnknownFormatImport> imports)
         } else {
             if (openInNew) {
                 frame.addTab(bibtexResult.getDatabaseContext(), true);
-                frame.output(
-                        Localization.lang("Imported entries") + ": " + bibtexResult.getDatabase().getEntryCount());
+                frame.output(Localization.lang("Imported entries") + ": " + bibtexResult.getDatabase().getEntryCount());
             } else {
                 final BasePanel panel = frame.getCurrentBasePanel();
 
-                ImportInspectionDialog diag = new ImportInspectionDialog(frame, panel, Localization.lang("Import"), false);
-                diag.addEntries(bibtexResult.getDatabase().getEntries());
-                diag.entryListComplete();
-                diag.setVisible(true);
-                diag.toFront();
+                SwingUtilities.invokeLater(() -> {
+                    ImportInspectionDialog diag = new ImportInspectionDialog(frame, panel, Localization.lang("Import"), false);
+                    diag.addEntries(bibtexResult.getDatabase().getEntries());
+                    diag.entryListComplete();
+                    diag.setVisible(true);
+                    diag.toFront();
+                });
             }
         }
     }
@@ -147,7 +149,6 @@ private ParserResult mergeImportResults(List<ImportFormatReader.UnknownFormatImp
                 if (directParserResult == null) {
                     directParserResult = pr;
                 }
-
                 // Merge entries:
                 for (BibEntry entry : pr.getDatabase().getEntries()) {
                     database.insertEntry(entry);

From ce713ca96dc879b9de86c26aa5f8aa9805ce8ecf Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 29 Aug 2018 01:43:08 +0200
Subject: [PATCH 072/229] Fix error prone warnings (#4290)

---
 .../importer/fileformat/BibtexParserTest.java |  4 +-
 .../l10n/LocalizationConsistencyTest.java     | 30 +++++++++
 .../jabref/logic/l10n/LocalizationParser.java | 13 ++--
 .../PropertiesLocaleCompletenessTest.java     | 67 -------------------
 .../jabref/model/strings/StringUtilTest.java  |  2 +-
 5 files changed, 40 insertions(+), 76 deletions(-)
 delete mode 100644 src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java

diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index 3ff1092b631..10cb4a4d7bb 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -47,8 +47,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -1172,7 +1172,7 @@ void parsePreambleAndEntryWithoutNewLine() throws IOException {
     @Test
     void parseFileHeaderAndPreambleWithoutNewLine() throws IOException {
         ParserResult result = parser
-                .parse(new StringReader("% Encoding: US-ASCII@preamble{some text and \\latex}"));
+                .parse(new StringReader("\\% Encoding: US-ASCII@preamble{some text and \\latex}"));
 
         assertFalse(result.hasWarnings());
         assertEquals(Optional.of("some text and \\latex"), result.getDatabase().getPreamble());
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
index a5c0d30751e..63848639692 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
@@ -12,16 +12,21 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
+import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class LocalizationConsistencyTest {
@@ -140,6 +145,31 @@ void localizationParameterMustIncludeAString() throws IOException {
         }
     }
 
+    private static Language[] installedLanguages() {
+        return Language.values();
+    }
+
+    @ParameterizedTest
+    @MethodSource("installedLanguages")
+    void resourceBundleExists(Language language) {
+        Path messagesPropertyFile = Paths.get("src/main/resources").resolve(Localization.RESOURCE_PREFIX + "_" + language.getId() + ".properties");
+        assertTrue(Files.exists(messagesPropertyFile));
+    }
+
+    @ParameterizedTest
+    @MethodSource("installedLanguages")
+    void languageCanBeLoaded(Language language) {
+        Locale oldLocale = Locale.getDefault();
+        try {
+            Locale locale = Language.convertToSupportedLocale(language).get();
+            Locale.setDefault(locale);
+            ResourceBundle messages = ResourceBundle.getBundle(Localization.RESOURCE_PREFIX, locale, new EncodingControl(StandardCharsets.UTF_8));
+            assertNotNull(messages);
+        } finally {
+            Locale.setDefault(oldLocale);
+        }
+    }
+
     private static class DuplicationDetectionProperties extends Properties {
 
         private static final long serialVersionUID = 1L;
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
index 3038fb7fb36..8ffdd5a7a96 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
@@ -155,8 +155,8 @@ private static List<LocalizationEntry> getLanguageKeysInJavaFile(Path path, Loca
             for (String key : keys) {
                 result.add(new LocalizationEntry(path, key, type));
             }
-        } catch (IOException ignore) {
-            ignore.printStackTrace();
+        } catch (IOException exception) {
+            throw new RuntimeException(exception);
         }
 
         return result;
@@ -174,8 +174,8 @@ private static List<LocalizationEntry> getLocalizationParametersInJavaFile(Path
             for (String key : keys) {
                 result.add(new LocalizationEntry(path, key, type));
             }
-        } catch (IOException ignore) {
-            ignore.printStackTrace();
+        } catch (IOException exception) {
+            throw new RuntimeException(exception);
         }
 
         return result;
@@ -209,6 +209,7 @@ public boolean containsKey(String key) {
 
         PlatformImpl.startup(() -> {
         });
+
         try {
             FXMLLoader loader = new FXMLLoader(path.toUri().toURL(), registerUsageResourceBundle);
             // We don't want to initialize controller
@@ -216,8 +217,8 @@ public boolean containsKey(String key) {
             // Don't check if root is null (needed for custom controls, where the root value is normally set in the FXMLLoader)
             loader.impl_setStaticLoad(true);
             loader.load();
-        } catch (IOException ignore) {
-            ignore.printStackTrace();
+        } catch (IOException exception) {
+            throw new RuntimeException(exception);
         }
 
         return result.stream()
diff --git a/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java b/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java
deleted file mode 100644
index 96ef48148e5..00000000000
--- a/src/test/java/org/jabref/logic/l10n/PropertiesLocaleCompletenessTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.jabref.logic.l10n;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Locale;
-import java.util.ResourceBundle;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.google.common.base.Splitter;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * Checks that all property files are correctly encoded and can be loaded without errors.
- */
-class PropertiesLocaleCompletenessTest {
-
-    @Test
-    void testi10nFiles() throws IOException {
-        try (Stream<Path> pathStream = Files.list(Paths.get("src/main/resources/l10n"))) {
-            for (Path p : pathStream.collect(Collectors.toList())) {
-
-                String[] parts = getParts(p);
-                String prefix = "l10n/" + parts[0];
-                Locale locale;
-                if (parts.length == 3) {
-                    locale = new Locale(parts[1], parts[2]);
-                } else {
-                    locale = new Locale(parts[1]);
-                }
-
-                checkPropertiesFile(locale, prefix);
-            }
-        }
-    }
-
-    private String[] getParts(Path p) {
-        List<String> elements = Splitter.on("_").splitToList(p.getFileName().toString().split("\\.")[0]);
-        String[] parts = new String[elements.size()];
-        elements.toArray(parts);
-        return parts;
-    }
-
-    @Test
-    void testCompletenessOfBundles() {
-        for (Language language : Language.values()) {
-            Path messagesPropertyFile = Paths.get("src/main/resources").resolve(Localization.RESOURCE_PREFIX + "_" + language.getId() + ".properties");
-            assertTrue(Files.exists(messagesPropertyFile));
-        }
-    }
-
-    private void checkPropertiesFile(Locale locale, String prefix) {
-        Locale oldLocale = Locale.getDefault();
-        try {
-            Locale.setDefault(locale);
-            ResourceBundle.getBundle(prefix, locale, new EncodingControl(StandardCharsets.UTF_8));
-        } finally {
-            Locale.setDefault(oldLocale);
-        }
-    }
-}
diff --git a/src/test/java/org/jabref/model/strings/StringUtilTest.java b/src/test/java/org/jabref/model/strings/StringUtilTest.java
index 0e59d8b375c..19872c9d294 100644
--- a/src/test/java/org/jabref/model/strings/StringUtilTest.java
+++ b/src/test/java/org/jabref/model/strings/StringUtilTest.java
@@ -120,7 +120,7 @@ void testShaveString() {
 
     @Test
     void testJoin() {
-        String[] s = "ab/cd/ed".split("/");
+        String[] s = {"ab", "cd", "ed"};
         assertEquals("ab\\cd\\ed", StringUtil.join(s, "\\", 0, s.length));
 
         assertEquals("cd\\ed", StringUtil.join(s, "\\", 1, s.length));

From c30224a4ebfafaf83c582b23ab7a0952ee34d678 Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus.dietz@tum.de>
Date: Wed, 29 Aug 2018 13:39:04 +0200
Subject: [PATCH 073/229] update install4j gradle plugin from 7.0.6 -> 7.0.7

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8f5141a30a2..0e5f247711d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
 
 plugins {
     id 'com.gradle.build-scan' version '1.16'
-    id 'com.install4j.gradle' version '7.0.6'
+    id 'com.install4j.gradle' version '7.0.7'
     id 'com.github.johnrengelman.shadow' version '2.0.4'
     id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
     id "com.simonharrer.modernizer" version '1.6.0-1'

From 2d2a0f63d5cd36209a48f993d7f9031c3aa107ff Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Wed, 29 Aug 2018 18:00:58 +0200
Subject: [PATCH 074/229] fix loading and storing of XMP Field Exclusions
 (#4291)

* fix loading and storing of XMP Field Exlusions

Fixes #4072

* rename variable

* fix l10n and replace textfield with combobox

* adjust xmp test and add case for xmp privacy

* add changelog

* make editable
remove explicit pref size adjustments

* add delete icon button to table
disable when checkbox is unchecked

* fix comment
---
 CHANGELOG.md                                  |   1 +
 .../jabref/gui/preferences/XmpPrefsTab.java   | 176 +++++++++---------
 .../gui/util/ValueTableCellFactory.java       |   2 +-
 src/main/resources/l10n/JabRef_en.properties  |   2 -
 .../logic/exporter/XmpExporterTest.java       | 139 ++++++++++++--
 5 files changed, 216 insertions(+), 104 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c079e3f6a1..378e01c4634 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where users were vulnerable to XXE attacks during parsing [#4229](https://github.com/JabRef/jabref/issues/4229)
 - We fixed an issue where files added via the "Attach file" contextmenu of an entry were not made relative. [#4201](https://github.com/JabRef/jabref/issues/4201) and [#4241](https://github.com/JabRef/jabref/issues/4241)
 - We fixed an issue where author list parser can't generate bibtex for Chinese author. [#4169](https://github.com/JabRef/jabref/issues/4169)
+- We fixed an issue where the list of XMP Exclusion fields in the preferences was not be saved [#4072](https://github.com/JabRef/jabref/issues/4072)
 
 
 
diff --git a/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java b/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
index ef61c915444..a0e10e07760 100644
--- a/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
@@ -1,29 +1,34 @@
 package org.jabref.gui.preferences;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 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.cell.PropertyValueFactory;
-import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.icon.IconTheme.JabRefIcons;
+import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.InternalBibtexFields;
+import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.JabRefPreferences;
 
 /**
@@ -32,34 +37,44 @@
  * Allows the user to enable and configure the XMP privacy filter.
  */
 class XmpPrefsTab extends Pane implements PrefsTab {
+
     private final JabRefPreferences prefs;
-    private boolean tableChanged;
     private final GridPane builder = new GridPane();
-    private final ObservableList<TableRow> data = FXCollections.observableArrayList();
+    private final ListProperty<XMPPrivacyFilter> fields = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final CheckBox privacyFilterCheckBox = new CheckBox(
-            Localization.lang("Do not write the following fields to XMP Metadata:"));
-    private final List<TableRow> tableRows = new ArrayList<>(10);
+                                                                Localization.lang("Do not write the following fields to XMP Metadata:"));
+    private final TableView<XMPPrivacyFilter> tableView = new TableView<>();
 
     /**
      * Customization of external program paths.
      */
     public XmpPrefsTab(JabRefPreferences prefs) {
         this.prefs = Objects.requireNonNull(prefs);
-        TableView tableView = new TableView();
-        TableColumn<TableRow,String> column = new TableColumn<>(Localization.lang("Field to filter"));
-        column.setCellValueFactory(new PropertyValueFactory<>("name"));
-        column.setCellFactory(TextFieldTableCell.forTableColumn());
-        column.setOnEditCommit(
-                (TableColumn.CellEditEvent<TableRow, String> t) -> {
-                    t.getTableView().getItems().get(
-                            t.getTablePosition().getRow()).setName(t.getNewValue());
-                });
-        column.setPrefWidth(350);
-        tableView.setItems(data);
-        tableView.getColumns().add(column);
-        final TextField addName = new TextField();
-        addName.setPromptText("name");
-        addName.setPrefSize(200, 30);
+
+        tableView.itemsProperty().bindBidirectional(fields);
+        TableColumn<XMPPrivacyFilter, String> column = new TableColumn<>();
+        column.setCellValueFactory(cellData -> cellData.getValue().field());
+
+        TableColumn<XMPPrivacyFilter, String> deleteIconColumn = new TableColumn<>();
+        deleteIconColumn.setPrefWidth(60);
+        deleteIconColumn.setCellValueFactory(cellData -> cellData.getValue().field());
+        new ValueTableCellFactory<XMPPrivacyFilter, String>()
+        .withGraphic(item -> {
+            return IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode();
+        }).withOnMouseClickedEvent(item -> {
+            return evt -> delete();
+        }).install(deleteIconColumn);
+
+        column.setOnEditCommit((CellEditEvent<XMPPrivacyFilter, String> cell) -> {
+            cell.getRowValue().setField(cell.getNewValue());
+        });
+
+        tableView.getColumns().setAll(column, deleteIconColumn);
+        tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+
+        ComboBox<String> bibtexFields = new ComboBox<>(FXCollections.observableArrayList(InternalBibtexFields.getAllPublicAndInternalFieldNames()));
+        bibtexFields.setEditable(true);
+
         BorderPane tablePanel = new BorderPane();
         ScrollPane scrollPane = new ScrollPane();
         scrollPane.setMaxHeight(400);
@@ -68,34 +83,15 @@ public XmpPrefsTab(JabRefPreferences prefs) {
         tablePanel.setCenter(scrollPane);
 
         Button add = new Button("Add");
-        add.setPrefSize(80, 20);
-        add.setOnAction(e-> {
-            if (!addName.getText().isEmpty()) {
-                TableRow tableRow = new TableRow(addName.getText());
-                addName.clear();
-                data.add(tableRow);
-                tableRows.clear();
-                tableRows.addAll(data);
-                tableView.setItems(data);
-                tableChanged = true;
-                tableView.refresh();
-            }
-        });
-        Button delete = new Button("Delete");
-        delete.setPrefSize(80, 20);
-        delete.setOnAction(e-> {
-            if (tableView.getFocusModel() != null && tableView.getFocusModel().getFocusedIndex() != -1) {
-                tableChanged = true;
-                int row = tableView.getFocusModel().getFocusedIndex();
-                TableRow tableRow = data.get(row);
-                data.remove(tableRow);
-                tableRows.clear();
-                tableRows.addAll(data);
-                tableView.setItems(data);
-                tableView.refresh();
+        add.setGraphic(JabRefIcons.ADD.getGraphicNode());
+        add.setOnAction(e -> {
+            if (!StringUtil.isNullOrEmpty(bibtexFields.getSelectionModel().getSelectedItem())) {
+                XMPPrivacyFilter tableRow = new XMPPrivacyFilter(bibtexFields.getSelectionModel().getSelectedItem());
+                fields.add(tableRow);
             }
         });
-        HBox toolbar = new HBox(addName,add,delete);
+
+        HBox toolbar = new HBox(bibtexFields, add);
         tablePanel.setBottom(toolbar);
 
         // Build Prefs Tabs
@@ -105,26 +101,20 @@ public XmpPrefsTab(JabRefPreferences prefs) {
         builder.add(privacyFilterCheckBox, 1, 2);
         builder.add(tablePanel, 1, 3);
 
+        tableView.disableProperty().bind(privacyFilterCheckBox.selectedProperty().not());
+        add.disableProperty().bind(privacyFilterCheckBox.selectedProperty().not());
     }
 
-    public Node getBuilder() {
-        return builder;
-    }
-
-    public static class TableRow {
-        private SimpleStringProperty name;
-
-        TableRow(String name) {
-            this.name = new SimpleStringProperty(name);
-        }
-
-        public void setName(String name) {
-            this.name.set(name);
+    private void delete() {
+        if (tableView.getSelectionModel().getSelectedItem() != null) {
+            XMPPrivacyFilter tableRow = tableView.getSelectionModel().getSelectedItem();
+            fields.remove(tableRow);
         }
+    }
 
-        public String getName() {
-            return name.get();
-        }
+    @Override
+    public Node getBuilder() {
+        return builder;
     }
 
     /**
@@ -132,10 +122,9 @@ public String getName() {
      */
     @Override
     public void setValues() {
-        tableRows.clear();
-        tableRows.addAll(data);
-        privacyFilterCheckBox.setSelected(JabRefPreferences.getInstance().getBoolean(
-                JabRefPreferences.USE_XMP_PRIVACY_FILTER));
+        List<XMPPrivacyFilter> xmpExclusions = prefs.getStringList(JabRefPreferences.XMP_PRIVACY_FILTERS).stream().map(XMPPrivacyFilter::new).collect(Collectors.toList());
+        fields.setAll(xmpExclusions);
+        privacyFilterCheckBox.setSelected(JabRefPreferences.getInstance().getBoolean(JabRefPreferences.USE_XMP_PRIVACY_FILTER));
     }
 
     /**
@@ -145,24 +134,11 @@ public void setValues() {
      */
     @Override
     public void storeSettings() {
-        // Now we need to make sense of the contents the user has made to the
-        // table setup table. This needs to be done either if changes were made, or
-        // if the checkbox is checked and no field values have been stored previously:
-        if (tableChanged ||
-                (privacyFilterCheckBox.isSelected() && !prefs.hasKey(JabRefPreferences.XMP_PRIVACY_FILTERS))) {
-
-            // First we remove all rows with empty names.
-            for (int i = tableRows.size() - 1; i >= 0; i--) {
-                if ((tableRows.get(i) == null) || tableRows.get(i).toString().isEmpty()) {
-                    tableRows.remove(i);
-                }
-            }
-            // Finally, we store the new preferences.
-            JabRefPreferences.getInstance().putStringList(JabRefPreferences.XMP_PRIVACY_FILTERS,
-                    tableRows.stream().map(Object::toString).collect(Collectors.toList()));
-        }
 
-        JabRefPreferences.getInstance().putBoolean(JabRefPreferences.USE_XMP_PRIVACY_FILTER, privacyFilterCheckBox.isSelected());
+        fields.stream().filter(s -> StringUtil.isNullOrEmpty(s.getField())).forEach(fields::remove);
+        prefs.putStringList(JabRefPreferences.XMP_PRIVACY_FILTERS,
+                            fields.stream().map(XMPPrivacyFilter::getField).collect(Collectors.toList()));
+        prefs.putBoolean(JabRefPreferences.USE_XMP_PRIVACY_FILTER, privacyFilterCheckBox.isSelected());
     }
 
     @Override
@@ -174,4 +150,30 @@ public boolean validateSettings() {
     public String getTabName() {
         return Localization.lang("XMP-metadata");
     }
+
+    private class XMPPrivacyFilter {
+
+        private final SimpleStringProperty field;
+
+        XMPPrivacyFilter(String field) {
+            this.field = new SimpleStringProperty(field);
+        }
+
+        public void setField(String field) {
+            this.field.set(field);
+        }
+
+        public String getField() {
+            return field.get();
+        }
+
+        public StringProperty field() {
+            return field;
+        }
+
+        @Override
+        public String toString() {
+            return field.getValue();
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
index 82fc7b9cd3f..557d1a5f7c2 100644
--- a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
@@ -122,7 +122,7 @@ protected void updateItem(T item, boolean empty) {
                             toOnMouseClickedEvent.apply(rowItem, item).handle(event);
                         }
 
-                        if (menuFactory != null && !event.isConsumed()) {
+                        if ((menuFactory != null) && !event.isConsumed()) {
                             if (event.getButton() == MouseButton.PRIMARY) {
                                 ContextMenu menu = menuFactory.apply(rowItem, item);
                                 if (menu != null) {
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index d088df6710c..bc440f631a4 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -420,8 +420,6 @@ field=field
 Field\ name=Field name
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Field names are not allowed to contain white space or the following characters
 
-Field\ to\ filter=Field to filter
-
 Field\ to\ group\ by=Field to group by
 
 File=File
diff --git a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
index 3ea662508e6..4174683a69e 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
@@ -10,6 +10,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
@@ -24,6 +25,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @ExtendWith(TempDirectory.class)
 public class XmpExporterTest {
@@ -31,13 +33,13 @@ public class XmpExporterTest {
     private Exporter exporter;
     private BibDatabaseContext databaseContext;
     private Charset encoding;
+    private final XmpPreferences xmpPreferences = mock(XmpPreferences.class);
 
     @BeforeEach
     public void setUp() {
         Map<String, TemplateExporter> customFormats = new HashMap<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         SavePreferences savePreferences = mock(SavePreferences.class);
-        XmpPreferences xmpPreferences = mock(XmpPreferences.class);
         ExporterFactory exporterFactory = ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences);
 
         exporter = exporterFactory.getExporterByName("xmp").get();
@@ -55,10 +57,23 @@ public void exportSingleEntry(@TempDirectory.TempDir Path testFolder) throws Exc
         entry.setField("author", "Alan Turing");
 
         exporter.export(databaseContext, file, encoding, Collections.singletonList(entry));
-
-        List<String> lines = Files.readAllLines(file);
-        assertEquals(15, lines.size());
-        assertEquals("<rdf:li>Alan Turing</rdf:li>", lines.get(4).trim());
+        String actual = Files.readAllLines(file).stream().collect(Collectors.joining("\n")); //we are using \n to join, so we need it in the expected string as well, \r\n would fail
+        String expected = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
+                          "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                          "      <dc:creator>\n" +
+                          "        <rdf:Seq>\n" +
+                          "          <rdf:li>Alan Turing</rdf:li>\n" +
+                          "        </rdf:Seq>\n" +
+                          "      </dc:creator>\n" +
+                          "      <dc:format>application/pdf</dc:format>\n" +
+                          "      <dc:type>\n" +
+                          "        <rdf:Bag>\n" +
+                          "          <rdf:li>Misc</rdf:li>\n" +
+                          "        </rdf:Bag>\n" +
+                          "      </dc:type>\n" +
+                          "    </rdf:Description>\n" +
+                          "  </rdf:RDF>";
+        assertEquals(expected, actual);
     }
 
     @Test
@@ -75,10 +90,42 @@ public void writeMultipleEntriesInASingleFile(@TempDirectory.TempDir Path testFo
 
         exporter.export(databaseContext, file, encoding, Arrays.asList(entryTuring, entryArmbrust));
 
-        List<String> lines = Files.readAllLines(file);
-        assertEquals(33, lines.size());
-        assertEquals("<rdf:li>Alan Turing</rdf:li>", lines.get(4).trim());
-        assertEquals("<rdf:li>Michael Armbrust</rdf:li>", lines.get(17).trim());
+        String actual = Files.readAllLines(file).stream().collect(Collectors.joining("\n")); //we are using \n to join, so we need it in the expected string as well, \r\n would fail
+
+        String expected = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
+                          "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                          "      <dc:creator>\n" +
+                          "        <rdf:Seq>\n" +
+                          "          <rdf:li>Alan Turing</rdf:li>\n" +
+                          "        </rdf:Seq>\n" +
+                          "      </dc:creator>\n" +
+                          "      <dc:format>application/pdf</dc:format>\n" +
+                          "      <dc:type>\n" +
+                          "        <rdf:Bag>\n" +
+                          "          <rdf:li>Misc</rdf:li>\n" +
+                          "        </rdf:Bag>\n" +
+                          "      </dc:type>\n" +
+                          "    </rdf:Description>\n" +
+                          "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                          "      <dc:creator>\n" +
+                          "        <rdf:Seq>\n" +
+                          "          <rdf:li>Michael Armbrust</rdf:li>\n" +
+                          "        </rdf:Seq>\n" +
+                          "      </dc:creator>\n" +
+                          "      <dc:relation>\n" +
+                          "        <rdf:Bag>\n" +
+                          "          <rdf:li>bibtex/bibtexkey/Armbrust2010</rdf:li>\n" +
+                          "        </rdf:Bag>\n" +
+                          "      </dc:relation>\n" +
+                          "      <dc:format>application/pdf</dc:format>\n" +
+                          "      <dc:type>\n" +
+                          "        <rdf:Bag>\n" +
+                          "          <rdf:li>Misc</rdf:li>\n" +
+                          "        </rdf:Bag>\n" +
+                          "      </dc:type>\n" +
+                          "    </rdf:Description>\n" +
+                          "  </rdf:RDF>";
+        assertEquals(expected, actual);
     }
 
     @Test
@@ -100,12 +147,76 @@ public void writeMultipleEntriesInDifferentFiles(@TempDirectory.TempDir Path tes
 
         Path fileTuring = Paths.get(file.getParent().toString() + "/" + entryTuring.getId() + "_null.xmp");
         List<String> linesTuring = Files.readAllLines(fileTuring);
-        assertEquals(15, linesTuring.size());
-        assertEquals("<rdf:li>Alan Turing</rdf:li>", linesTuring.get(4).trim());
+        String actualTuring = Files.readAllLines(fileTuring).stream().collect(Collectors.joining("\n")); //we are using \n to join, so we need it in the expected string as well, \r\n would fail
+
+        String expectedTuring = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
+                                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                                "      <dc:creator>\n" +
+                                "        <rdf:Seq>\n" +
+                                "          <rdf:li>Alan Turing</rdf:li>\n" +
+                                "        </rdf:Seq>\n" +
+                                "      </dc:creator>\n" +
+                                "      <dc:format>application/pdf</dc:format>\n" +
+                                "      <dc:type>\n" +
+                                "        <rdf:Bag>\n" +
+                                "          <rdf:li>Misc</rdf:li>\n" +
+                                "        </rdf:Bag>\n" +
+                                "      </dc:type>\n" +
+                                "    </rdf:Description>\n" +
+                                "  </rdf:RDF>";
+
+        assertEquals(expectedTuring, actualTuring);
 
         Path fileArmbrust = Paths.get(file.getParent().toString() + "/" + entryArmbrust.getId() + "_Armbrust2010.xmp");
-        List<String> linesArmbrust = Files.readAllLines(fileArmbrust);
-        assertEquals(20, linesArmbrust.size());
-        assertEquals("<rdf:li>Michael Armbrust</rdf:li>", linesArmbrust.get(4).trim());
+        String actualArmbrust = Files.readAllLines(fileArmbrust).stream().collect(Collectors.joining("\n")); //we are using \n to join, so we need it in the expected string as well, \r\n would fail
+
+        String expectedArmbrust = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
+                                  "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                                  "      <dc:creator>\n" +
+                                  "        <rdf:Seq>\n" +
+                                  "          <rdf:li>Michael Armbrust</rdf:li>\n" +
+                                  "        </rdf:Seq>\n" +
+                                  "      </dc:creator>\n" +
+                                  "      <dc:relation>\n" +
+                                  "        <rdf:Bag>\n" +
+                                  "          <rdf:li>bibtex/bibtexkey/Armbrust2010</rdf:li>\n" +
+                                  "        </rdf:Bag>\n" +
+                                  "      </dc:relation>\n" +
+                                  "      <dc:format>application/pdf</dc:format>\n" +
+                                  "      <dc:type>\n" +
+                                  "        <rdf:Bag>\n" +
+                                  "          <rdf:li>Misc</rdf:li>\n" +
+                                  "        </rdf:Bag>\n" +
+                                  "      </dc:type>\n" +
+                                  "    </rdf:Description>\n" +
+                                  "  </rdf:RDF>";
+
+        assertEquals(expectedArmbrust, actualArmbrust);
+    }
+
+    @Test
+    public void exportSingleEntryWithPrivacyFilter(@TempDirectory.TempDir Path testFolder) throws Exception {
+        when(xmpPreferences.getXmpPrivacyFilter()).thenReturn(Arrays.asList("author"));
+        when(xmpPreferences.isUseXMPPrivacyFilter()).thenReturn(true);
+
+        Path file = testFolder.resolve("ThisIsARandomlyNamedFile");
+        Files.createFile(file);
+
+        BibEntry entry = new BibEntry();
+        entry.setField("author", "Alan Turing");
+
+        exporter.export(databaseContext, file, encoding, Collections.singletonList(entry));
+        String actual = Files.readAllLines(file).stream().collect(Collectors.joining("\n"));
+        String expected = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
+                          "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                          "      <dc:format>application/pdf</dc:format>\n" +
+                          "      <dc:type>\n" +
+                          "        <rdf:Bag>\n" +
+                          "          <rdf:li>Misc</rdf:li>\n" +
+                          "        </rdf:Bag>\n" +
+                          "      </dc:type>\n" +
+                          "    </rdf:Description>\n" +
+                          "  </rdf:RDF>";
+        assertEquals(expected, actual);
     }
 }

From ab3b138ecee59fa168d180d26df80e98947ff75e Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Fri, 31 Aug 2018 16:51:37 +0200
Subject: [PATCH 075/229] Convert to circle CI 2.0 (#4302)

* Update to CircleCI 2.0

* Build dev version in dev branch

* Fix path

* improve filters

* Add store as release artifact

* Fix YAML

* Add missing checkout step

* Optimize cashes and try to fix build command

* Try to fix paths

* Split up install4j scripts

* Fix caches

* Remove obsolete task

* Really build only on tags

* Fix release/dev

* Change name and fix dependency

* Remove obsolete branch condition

* Fix deployment

* Try to fix keys

* Experiment with branch/tag only builds

* Add host key to known hosts

* Add missing tag

* Fix script

* Play around with tags

* Try to get tag build running

* Remove condition

* readd filters

* add conition to pretask

* Add missing preparaton statement

* trigger build

* try to add filter:
---
 .circleci/config.yml                          | 79 +++++++++++++++++++
 circle.yml                                    | 47 -----------
 ...ll4j.sh => download-install4j-and-jres.sh} | 16 +---
 scripts/extract-install4j.sh                  |  4 +
 scripts/upload-to-builds.jabref.org.sh        |  6 ++
 5 files changed, 93 insertions(+), 59 deletions(-)
 create mode 100644 .circleci/config.yml
 delete mode 100644 circle.yml
 rename scripts/{prepare-install4j.sh => download-install4j-and-jres.sh} (51%)
 create mode 100755 scripts/extract-install4j.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000000..d21c1c05c59
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,79 @@
+version: 2
+
+jobs:
+  downloadinstall4j:
+    docker:
+      - image: circleci/openjdk:8-jdk
+    steps:
+      - restore_cache:
+          keys:
+            - install4j
+      - checkout
+      - run: scripts/download-install4j-and-jres.sh
+      - save_cache:
+          key: install4j
+          paths:
+            - "~/downloads"
+            - "~/.install4j7"
+    filters:
+      tags:
+        only: /.*/
+
+  buildDev:
+    docker:
+      - image: circleci/openjdk:8-jdk
+    steps:
+      - restore_cache:
+          key: dependency-cache
+      - restore_cache:
+          key: install4j
+      - checkout
+      - run: scripts/extract-install4j.sh
+      - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
+      - run: ./gradlew -Pdev=true -Pinstall4jDir="install4j7" release --stacktrace
+      - save_cache:
+          key: dependency-cache
+          paths:
+            - "~/.gradle"
+      - store_artifacts:
+          path: build/releases
+          destination: build
+      - run: scripts/upload-to-builds.jabref.org.sh
+
+  buildRelease:
+    docker:
+      - image: circleci/openjdk:8-jdk
+    steps:
+      - restore_cache:
+          key: dependency-cache
+      - restore_cache:
+          key: install4j
+      - checkout
+      - run: scripts/extract-install4j.sh
+      - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
+      - run: ./gradlew -Pinstall4jDir="install4j7" release --stacktrace
+      - store_artifacts:
+          path: build/releases
+          destination: release
+      - run: scripts/upload-to-builds.jabref.org.sh
+    filters:
+      tags:
+        only: /.*/
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - downloadinstall4j
+      - buildDev:
+          requires:
+            - downloadinstall4j
+      - buildRelease:
+          requires:
+            - downloadinstall4j
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /.*/
+
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 42533f60628..00000000000
--- a/circle.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-machine:
-  environment:
-    TERM: dumb
-  java:
-    version: oraclejdk8
-
-dependencies:
-  pre:
-    # update locally with:
-    # openssl aes-256-cbc -e -in ./buildres/jabref-cert-2016.p12 -out jabref-cert-2016.p12.enc -k {PASSWORD}
-    #- openssl aes-256-cbc -d -in ./buildres/jabref-cert-2016.p12.enc -out ./buildres/jabref-cert-2016.p12 -k $CERTIFICATE
-    - scripts/prepare-install4j.sh
-    - install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY 
-    #--win-keystore-password $CERTIFICATE_PW --mac-keystore-password $CERTIFICATE_PW
-  override:
-    - ./gradlew downloadDependencies
-  cache_directories:
-    - "~/.install4j7"
-    - "~/downloads"
-
-test:
-  override:
-    - "true"
-
-deployment:
-  release:
-    # we only do a simple check for SemVer and do not use a sophisticated check as presented at https://github.com/sindresorhus/semver-regex/blob/master/index.js
-   tag: /v[0-9]+(\.[0-9]+)*(-.+)?/
-   commands:
-      # we have to do a clean build as changing gradle's "project.version" does not lead to a rebuild of resources (mirroring project.version)
-      - ./gradlew -Pinstall4jDir="install4j7" clean release --stacktrace
-      # if upload fails, it is accepted; CircleCI provides deep links to the binaries as fallback.
-      - timeout 580 scripts/upload-to-builds.jabref.org.sh || exit 0
-      # generate dependency information. This is not published on our buid server, but can be collected as logged in user at CircleCI
-      - ./gradlew dependencyUpdates -Drevision=release -DoutputFormatter=json -DoutputDir=build/releases
-  development:
-     # match all branches; this is executed, if "release" is not matched - see https://circleci.com/docs/configuration/
-    branch: /.*/
-    commands:
-      # generate binaries
-      - ./gradlew -Pdev=true -Pinstall4jDir="install4j7" release --stacktrace
-      # if upload fails, it is accepted; CircleCI provides deep links to the binaries as fallback
-      - timeout 580 scripts/upload-to-builds.jabref.org.sh || exit 0
-
-general:
-  artifacts:
-    - "build/releases"
diff --git a/scripts/prepare-install4j.sh b/scripts/download-install4j-and-jres.sh
similarity index 51%
rename from scripts/prepare-install4j.sh
rename to scripts/download-install4j-and-jres.sh
index fcdb8d86897..0e99d438c6e 100755
--- a/scripts/prepare-install4j.sh
+++ b/scripts/download-install4j-and-jres.sh
@@ -1,25 +1,17 @@
 #!/bin/bash
 
-# ensure that downloads directory exists
+# fetch intall4j binary
 if [ ! -d ~/downloads ]; then
   mkdir ~/downloads
 fi
-
-# ensure that tar archive of install4j exists
 cd ~/downloads
 wget --quiet -nc http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_4.tar.gz
 
-# extract tar archive of install4j into the source directory of JabRef
-cd ~/jabref
-tar -xf ~/downloads/install4j_unix_7_0_4.tar.gz
-# fix directory name (until install4j 6.1.5 it was install4j6
-mv install4j7.0.4 install4j7
-
 # fetch JREs
-if [ ! -d ~/.install4j7/jres/ ]; then
-  mkdir -p ~/.install4j7/jres/
+if [ ! -d ~/.install4j7/jres ]; then
+  mkdir -p ~/.install4j7/jres
 fi
-cd ~/.install4j7/jres/
+cd ~/.install4j7/jres
 wget --quiet -nc https://files.jabref.org/jres/windows-x86-1.8.0_172.tar.gz
 wget --quiet -nc https://files.jabref.org/jres/windows-amd64-1.8.0_172.tar.gz
 wget --quiet -nc https://files.jabref.org/jres/macosx-amd64-1.8.0_172_unpacked.tar.gz
diff --git a/scripts/extract-install4j.sh b/scripts/extract-install4j.sh
new file mode 100755
index 00000000000..4e8cfcc7dd3
--- /dev/null
+++ b/scripts/extract-install4j.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+tar -xf ~/downloads/install4j_unix_7_0_4.tar.gz
+# fix directory name (until install4j 6.1.5 it was install4j6
+mv install4j7.0.4 install4j7
diff --git a/scripts/upload-to-builds.jabref.org.sh b/scripts/upload-to-builds.jabref.org.sh
index a7297a169f8..5e49c2c577c 100755
--- a/scripts/upload-to-builds.jabref.org.sh
+++ b/scripts/upload-to-builds.jabref.org.sh
@@ -42,4 +42,10 @@ command="${command}exit\n"
 
 # now $command is complete
 
+# add host key of build-upload.jabref.org to SSH known hosts
+cat <<EOF >> ~/.ssh/known_hosts
+|1|/E0gFRKMKG83OQVcwqFPIy3mnE4=|tLYRVZQ/3nCkBTZ9NtBVxx3si+Y= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNjYLP9C+PhQrpKfYsdgr8dDB/50S3BnaXAYQOVC5o3H0SqKisWw8iTkij/u8H20Rmsf/ABduOLPOBubfPFlE34=
+|1|dEeue80RCldo/x5XyhbGIkS72d8=|09t8muprLf6YoXsc3r3kxicBykI= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNjYLP9C+PhQrpKfYsdgr8dDB/50S3BnaXAYQOVC5o3H0SqKisWw8iTkij/u8H20Rmsf/ABduOLPOBubfPFlE34=
+EOF
+
 echo -e "$command" | sftp -P 9922 builds_jabref_org@build-upload.jabref.org

From ef088e2fe126b71f4a856966073ce83ee8db0ce8 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Fri, 31 Aug 2018 17:58:52 +0200
Subject: [PATCH 076/229] Convert SharedDatabaseConnect Dialog to Javafx
 (#4040)

* Convert SharedBD Dialog to javafx


* convert shared database dialog to javafx

* fix checkstyle

* convert some more dialogs to fx

* checkstyle

* remove duplicate listener which results in loop

* add localization
add migration help message
remove old dialogs

* add cancel button

* add button types, but results in npe

* move gui logic to viewmodel
add bindings

* add validation support, move rest of logic to view model
TODO: Validation throws error

* wrap initVisualization in platform.runlater to avoid exception regarding duplicate root pane stuff

* remove old gui class
renamings and other refactorings

* add ssl options

* l10n cleanup

* add bindings for keystore
fix layoout
enable ssl stuff only when postgres is enabeld

* checkstyle

* fix l10n

* add support for ssl

* fix checkstyle

* fix keystore file path not displayed

* renamings
shutdown listener stops the listener thread safely

* enable ssl for all

* checkstyle

* cleanups
use executor
store keystore in prefs(todo)

* store keystore file in prefs

* set useSSL and keystore correctly

* fix checkstyle

* resize and convert one binding to view model

* address comments, pass connectionProperties as parameter

* fix one codacy suggestion
---
 .../ConnectToSharedDatabaseCommand.java       |   5 +-
 .../shared/ConnectToSharedDatabaseDialog.java | 488 ------------------
 .../gui/shared/MigrationHelpDialog.java       |  79 ---
 .../gui/shared/SharedDatabaseLoginDialog.fxml | 100 ++++
 .../shared/SharedDatabaseLoginDialogView.java | 128 +++++
 .../SharedDatabaseLoginDialogViewModel.java   | 367 +++++++++++++
 .../gui/shared/SharedDatabaseUIManager.java   |  77 +--
 .../jabref/logic/shared/DBMSConnection.java   |  11 +-
 .../shared/DBMSConnectionProperties.java      |  85 ++-
 .../jabref/logic/shared/DBMSSynchronizer.java |  12 +-
 .../logic/shared/PostgreSQLProcessor.java     |   5 +-
 .../PostgresSQLNotificationListener.java      |  11 +-
 .../prefs/SharedDatabasePreferences.java      |  21 +-
 .../logic/shared/security/Password.java       |   6 +-
 .../jabref/logic/util/StandardFileType.java   |   1 +
 .../model/database/BibDatabaseContext.java    |  11 +
 .../shared/DatabaseConnectionProperties.java  |   5 +
 src/main/resources/l10n/JabRef_en.properties  |  20 +-
 .../logic/shared/DBMSConnectionTest.java      |   2 +-
 .../jabref/logic/shared/TestConnector.java    |   6 +-
 20 files changed, 790 insertions(+), 650 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java
 delete mode 100644 src/main/java/org/jabref/gui/shared/MigrationHelpDialog.java
 create mode 100644 src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java

diff --git a/src/main/java/org/jabref/gui/actions/ConnectToSharedDatabaseCommand.java b/src/main/java/org/jabref/gui/actions/ConnectToSharedDatabaseCommand.java
index d31b3382c95..792aff5bf34 100644
--- a/src/main/java/org/jabref/gui/actions/ConnectToSharedDatabaseCommand.java
+++ b/src/main/java/org/jabref/gui/actions/ConnectToSharedDatabaseCommand.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.actions;
 
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.shared.ConnectToSharedDatabaseDialog;
+import org.jabref.gui.shared.SharedDatabaseLoginDialogView;
 
 /**
  * Opens a shared database.
@@ -16,7 +16,6 @@ public ConnectToSharedDatabaseCommand(JabRefFrame jabRefFrame) {
 
     @Override
     public void execute() {
-        ConnectToSharedDatabaseDialog connectToSharedDatabaseDialog = new ConnectToSharedDatabaseDialog(jabRefFrame);
-        connectToSharedDatabaseDialog.setVisible(true);
+        new SharedDatabaseLoginDialogView(jabRefFrame).showAndWait();
     }
 }
diff --git a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java
deleted file mode 100644
index 9dd594d2418..00000000000
--- a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java
+++ /dev/null
@@ -1,488 +0,0 @@
-package org.jabref.gui.shared;
-
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.io.UnsupportedEncodingException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.GeneralSecurityException;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-
-import org.jabref.Globals;
-import org.jabref.JabRefException;
-import org.jabref.JabRefGUI;
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.exporter.SaveDatabaseAction;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.shared.DBMSConnection;
-import org.jabref.logic.shared.DBMSConnectionProperties;
-import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
-import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
-import org.jabref.logic.shared.security.Password;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.database.shared.DBMSType;
-import org.jabref.model.database.shared.DatabaseLocation;
-import org.jabref.model.database.shared.DatabaseNotSupportedException;
-import org.jabref.preferences.JabRefPreferences;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ConnectToSharedDatabaseDialog extends JabRefDialog {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ConnectToSharedDatabaseDialog.class);
-
-    private final JabRefFrame frame;
-
-    private final GridBagLayout gridBagLayout = new GridBagLayout();
-    private final GridBagConstraints gridBagConstraints = new GridBagConstraints();
-    private final JPanel connectionPanel = new JPanel();
-    private final JPanel filePanel = new JPanel();
-    private final JPanel buttonPanel = new JPanel();
-
-    private final JLabel databaseTypeLabel = new JLabel(Localization.lang("Database type") + ":");
-    private final JLabel hostPortLabel = new JLabel(Localization.lang("Host") + "/" + Localization.lang("Port") + ":");
-    private final JLabel databaseLabel = new JLabel(Localization.lang("Database") + ":");
-    private final JLabel userLabel = new JLabel(Localization.lang("User") + ":");
-    private final JLabel passwordLabel = new JLabel(Localization.lang("Password") + ":");
-
-    private final JTextField hostField = new JTextField(12);
-    private final JTextField portField = new JTextField(4);
-    private final JTextField userField = new JTextField(14);
-    private final JTextField databaseField = new JTextField(14);
-    private final JTextField fileLocationField = new JTextField(20);
-
-    private final JPasswordField passwordField = new JPasswordField(14);
-    private final JComboBox<DBMSType> dbmsTypeDropDown = new JComboBox<>();
-
-    private final JButton connectButton = new JButton(Localization.lang("Connect"));
-    private final JButton cancelButton = new JButton(Localization.lang("Cancel"));
-    private final JButton browseButton = new JButton(Localization.lang("Browse"));
-    private final JButton helpButton = new HelpAction(HelpFile.SQL_DATABASE).getHelpButton();
-
-    private final JCheckBox rememberPassword = new JCheckBox(Localization.lang("Remember password?"));
-    private final JCheckBox autosaveFile = new JCheckBox(Localization.lang("Automatically save the library to"));
-
-    private final SharedDatabasePreferences prefs = new SharedDatabasePreferences();
-
-    private DBMSConnectionProperties connectionProperties;
-
-    /**
-     * @param frame the JabRef Frame
-     */
-    public ConnectToSharedDatabaseDialog(JabRefFrame frame) {
-        super(Localization.lang("Connect to shared database"), ConnectToSharedDatabaseDialog.class);
-        this.frame = frame;
-        initLayout();
-        updateEnableState();
-        applyPreferences();
-        setupActions();
-        pack();
-    }
-
-    public void openSharedDatabase() {
-
-        if (isSharedDatabaseAlreadyPresent()) {
-
-            frame.getDialogService().showWarningDialogAndWait(Localization.lang("Shared database connection"),
-                    Localization.lang("You are already connected to a database using entered connection details."));
-
-            return;
-        }
-
-        if (autosaveFile.isSelected()) {
-
-            Path localFilePath = Paths.get(fileLocationField.getText());
-
-            if (Files.exists(localFilePath) && !Files.isDirectory(localFilePath)) {
-
-                boolean overwriteFilePressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Existing file"),
-                        Localization.lang("'%0' exists. Overwrite file?", localFilePath.getFileName().toString()),
-                        Localization.lang("Overwrite file"),
-                        Localization.lang("Cancel"));
-
-                if (!overwriteFilePressed) {
-                    fileLocationField.requestFocus();
-                    return;
-                }
-            }
-        }
-
-        setLoadingConnectButtonText(true);
-
-        try {
-            BasePanel panel = new SharedDatabaseUIManager(frame).openNewSharedDatabaseTab(connectionProperties);
-            setPreferences();
-            dispose();
-            if (!fileLocationField.getText().isEmpty()) {
-                try {
-                    new SaveDatabaseAction(panel, Paths.get(fileLocationField.getText())).runCommand();
-                } catch (Throwable e) {
-                    LOGGER.error("Error while saving the database", e);
-                }
-            }
-
-            return; // setLoadingConnectButtonText(false) should not be reached regularly.
-        } catch (SQLException | InvalidDBMSConnectionPropertiesException exception) {
-
-            DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showErrorDialogAndWait(Localization.lang("Connection error"), exception));
-
-        } catch (DatabaseNotSupportedException exception) {
-            new MigrationHelpDialog(this).setVisible(true);
-        }
-
-        setLoadingConnectButtonText(false);
-    }
-
-    /**
-     * Defines and sets the different actions up.
-     */
-    private void setupActions() {
-
-        Action openAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                try {
-                    checkFields();
-
-                    connectionProperties = new DBMSConnectionProperties();
-                    connectionProperties.setType((DBMSType) dbmsTypeDropDown.getSelectedItem());
-                    connectionProperties.setHost(hostField.getText());
-                    connectionProperties.setPort(Integer.parseInt(portField.getText()));
-                    connectionProperties.setDatabase(databaseField.getText());
-                    connectionProperties.setUser(userField.getText());
-                    connectionProperties.setPassword(new String(passwordField.getPassword())); //JPasswordField.getPassword() does not return a String, but a char array.
-
-                    openSharedDatabase();
-                } catch (JabRefException exception) {
-                    DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showErrorDialogAndWait(Localization.lang("Warning"), exception));
-                }
-            }
-        };
-        connectButton.addActionListener(openAction);
-        cancelButton.addActionListener(e -> dispose());
-
-        /**
-         * Set up a listener which updates the default port number once the selection in dbmsTypeDropDown has changed.
-         */
-        Action dbmsTypeDropDownAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                portField.setText(Integer.toString(((DBMSType) dbmsTypeDropDown.getSelectedItem()).getDefaultPort()));
-            }
-        };
-        dbmsTypeDropDown.addActionListener(dbmsTypeDropDownAction);
-
-        // Add enter button action listener
-        connectButton.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
-                "Enter_pressed");
-        connectButton.getActionMap().put("Enter_pressed", openAction);
-        browseButton.addActionListener(e -> showFileChooser());
-        autosaveFile.addActionListener(e -> updateEnableState());
-    }
-
-    /**
-     * Fetches possibly saved data and configures the control elements respectively.
-     */
-    private void applyPreferences() {
-        Optional<String> sharedDatabaseType = prefs.getType();
-        Optional<String> sharedDatabaseHost = prefs.getHost();
-        Optional<String> sharedDatabasePort = prefs.getPort();
-        Optional<String> sharedDatabaseName = prefs.getName();
-        Optional<String> sharedDatabaseUser = prefs.getUser();
-        Optional<String> sharedDatabasePassword = prefs.getPassword();
-        boolean sharedDatabaseRememberPassword = prefs.getRememberPassword();
-
-        if (sharedDatabaseType.isPresent()) {
-            Optional<DBMSType> dbmsType = DBMSType.fromString(sharedDatabaseType.get());
-            if (dbmsType.isPresent()) {
-                dbmsTypeDropDown.setSelectedItem(dbmsType.get());
-            }
-        }
-
-        if (sharedDatabaseHost.isPresent()) {
-            hostField.setText(sharedDatabaseHost.get());
-        }
-
-        if (sharedDatabasePort.isPresent()) {
-            portField.setText(sharedDatabasePort.get());
-        } else {
-            portField.setText(Integer.toString(((DBMSType) dbmsTypeDropDown.getSelectedItem()).getDefaultPort()));
-        }
-
-        if (sharedDatabaseName.isPresent()) {
-            databaseField.setText(sharedDatabaseName.get());
-        }
-
-        if (sharedDatabaseUser.isPresent()) {
-            userField.setText(sharedDatabaseUser.get());
-        }
-
-        if (sharedDatabasePassword.isPresent() && sharedDatabaseUser.isPresent()) {
-            try {
-                passwordField.setText(
-                        new Password(sharedDatabasePassword.get().toCharArray(), sharedDatabaseUser.get()).decrypt());
-            } catch (GeneralSecurityException | UnsupportedEncodingException e) {
-                LOGGER.error("Could not read the password due to decryption problems.", e);
-            }
-        }
-
-        rememberPassword.setSelected(sharedDatabaseRememberPassword);
-    }
-
-    /**
-     * Set up the layout and position the control units in their right place.
-     */
-    private void initLayout() {
-
-        setResizable(false);
-
-        Insets defautInsets = new Insets(4, 15, 4, 4);
-
-        connectionPanel.setBorder(
-                BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), Localization.lang("Connection")));
-        connectionPanel.setLayout(gridBagLayout);
-
-        Set<DBMSType> availableDBMSTypes = DBMSConnection.getAvailableDBMSTypes();
-        DefaultComboBoxModel<DBMSType> comboBoxModel = new DefaultComboBoxModel<>(
-                availableDBMSTypes.toArray(new DBMSType[availableDBMSTypes.size()]));
-
-        dbmsTypeDropDown.setModel(comboBoxModel);
-
-        gridBagConstraints.insets = defautInsets;
-        gridBagConstraints.fill = GridBagConstraints.BOTH;
-        gridBagLayout.setConstraints(connectionPanel, gridBagConstraints);
-
-        //1. column
-        gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 0;
-        connectionPanel.add(databaseTypeLabel, gridBagConstraints);
-
-        gridBagConstraints.gridy = 1;
-        connectionPanel.add(hostPortLabel, gridBagConstraints);
-
-        gridBagConstraints.gridy = 2;
-        connectionPanel.add(databaseLabel, gridBagConstraints);
-
-        gridBagConstraints.gridy = 3;
-        connectionPanel.add(userLabel, gridBagConstraints);
-
-        gridBagConstraints.gridy = 4;
-        connectionPanel.add(passwordLabel, gridBagConstraints);
-
-        // 2. column
-        gridBagConstraints.gridwidth = 2;
-
-        gridBagConstraints.gridx = 1;
-        gridBagConstraints.gridy = 0;
-        connectionPanel.add(dbmsTypeDropDown, gridBagConstraints);
-
-        gridBagConstraints.gridy = 1;
-        gridBagConstraints.gridwidth = 1; // the hostField is smaller than the others.
-        gridBagConstraints.insets = new Insets(4, 15, 4, 0);
-        connectionPanel.add(hostField, gridBagConstraints);
-
-        gridBagConstraints.gridy = 2;
-        gridBagConstraints.gridwidth = 2;
-        gridBagConstraints.insets = defautInsets;
-        connectionPanel.add(databaseField, gridBagConstraints);
-
-        gridBagConstraints.gridy = 3;
-        connectionPanel.add(userField, gridBagConstraints);
-
-        gridBagConstraints.gridy = 4;
-        connectionPanel.add(passwordField, gridBagConstraints);
-
-        gridBagConstraints.gridy = 5;
-        connectionPanel.add(rememberPassword, gridBagConstraints);
-
-        // 3. column
-        gridBagConstraints.gridx = 2;
-        gridBagConstraints.gridy = 1;
-        gridBagConstraints.gridwidth = 1;
-        gridBagConstraints.insets = new Insets(4, 0, 4, 4);
-        connectionPanel.add(portField, gridBagConstraints);
-
-        // help button
-        gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 6;
-        gridBagConstraints.insets = new Insets(10, 10, 0, 0);
-        JPanel helpPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        helpPanel.add(helpButton);
-
-        // add panel
-        getContentPane().setLayout(gridBagLayout);
-        gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 0;
-        gridBagConstraints.gridwidth = 1;
-        gridBagConstraints.insets = new Insets(5, 5, 5, 5);
-        gridBagLayout.setConstraints(connectionPanel, gridBagConstraints);
-        getContentPane().add(connectionPanel);
-
-        // filePanel
-        filePanel.setBorder(
-                BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), Localization.lang("File")));
-        filePanel.setLayout(gridBagLayout);
-
-        gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 0;
-        gridBagConstraints.gridwidth = 2;
-
-        filePanel.add(autosaveFile, gridBagConstraints);
-        gridBagConstraints.gridx = 1;
-        gridBagConstraints.gridy = 1;
-        gridBagConstraints.gridwidth = 1;
-        filePanel.add(fileLocationField, gridBagConstraints);
-        gridBagConstraints.gridx = 2;
-        filePanel.add(browseButton, gridBagConstraints);
-
-        gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 1;
-        gridBagConstraints.insets = new Insets(5, 5, 5, 5);
-        gridBagLayout.setConstraints(filePanel, gridBagConstraints);
-        getContentPane().add(filePanel);
-
-        // buttonPanel
-        buttonPanel.setLayout(new FlowLayout(FlowLayout.CENTER));
-
-        buttonPanel.add(connectButton);
-        buttonPanel.add(cancelButton);
-        buttonPanel.add(helpPanel);
-
-        gridBagConstraints.gridy = 2;
-        gridBagConstraints.insets = new Insets(5, 5, 5, 5);
-        gridBagLayout.setConstraints(buttonPanel, gridBagConstraints);
-        getContentPane().add(buttonPanel);
-
-        setModal(true); // Owner window should be disabled while this dialog is opened.
-    }
-
-    /**
-     * Saves the data from this dialog persistently to facilitate the usage.
-     */
-    private void setPreferences() {
-        prefs.setType(dbmsTypeDropDown.getSelectedItem().toString());
-        prefs.setHost(hostField.getText());
-        prefs.setPort(portField.getText());
-        prefs.setName(databaseField.getText());
-        prefs.setUser(userField.getText());
-
-        if (rememberPassword.isSelected()) {
-            try {
-                prefs.setPassword(new Password(passwordField.getPassword(), userField.getText()).encrypt());
-            } catch (GeneralSecurityException | UnsupportedEncodingException e) {
-                LOGGER.error("Could not store the password due to encryption problems.", e);
-            }
-        } else {
-            prefs.clearPassword(); // for the case that the password is already set
-        }
-
-        prefs.setRememberPassword(rememberPassword.isSelected());
-    }
-
-    private boolean isEmptyField(JTextField field) {
-        return field.getText().trim().length() == 0;
-    }
-
-    /**
-     * Checks every required text field for emptiness.
-     */
-    private void checkFields() throws JabRefException {
-        if (isEmptyField(hostField)) {
-            hostField.requestFocus();
-            throw new JabRefException(Localization.lang("Required field \"%0\" is empty.", Localization.lang("Host")));
-        }
-        if (isEmptyField(portField)) {
-            portField.requestFocus();
-            throw new JabRefException(Localization.lang("Required field \"%0\" is empty.", Localization.lang("Port")));
-        }
-        if (isEmptyField(databaseField)) {
-            databaseField.requestFocus();
-            throw new JabRefException(
-                    Localization.lang("Required field \"%0\" is empty.", Localization.lang("Library")));
-        }
-        if (isEmptyField(userField)) {
-            userField.requestFocus();
-            throw new JabRefException(Localization.lang("Required field \"%0\" is empty.", Localization.lang("User")));
-        }
-        if (autosaveFile.isSelected() && isEmptyField(fileLocationField)) {
-            fileLocationField.requestFocus();
-            throw new JabRefException(Localization.lang("Please enter a valid file path."));
-        }
-    }
-
-    /**
-     * Sets the connectButton according to the current connection state.
-     */
-    private void setLoadingConnectButtonText(boolean isLoading) {
-        connectButton.setEnabled(!isLoading);
-        if (isLoading) {
-            connectButton.setText(Localization.lang("Connecting..."));
-        } else {
-            connectButton.setText(Localization.lang("Connect"));
-        }
-    }
-
-    /**
-     * Checks whether a database with the given @link {@link DBMSConnectionProperties} is already opened.
-     */
-    private boolean isSharedDatabaseAlreadyPresent() {
-        List<BasePanel> panels = JabRefGUI.getMainFrame().getBasePanelList();
-        return panels.parallelStream().anyMatch(panel -> {
-            BibDatabaseContext context = panel.getBibDatabaseContext();
-
-            return ((context.getLocation() == DatabaseLocation.SHARED) &&
-                    this.connectionProperties.equals(context.getDBMSSynchronizer().getConnectionProperties()));
-        });
-    }
-
-    private void showFileChooser() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(String.format("%1s %2s", "BibTex", Localization.lang("Library")), StandardFileType.BIBTEX_DB)
-                .withDefaultExtension(String.format("%1s %2s", "BibTex", Localization.lang("Library")), StandardFileType.BIBTEX_DB)
-                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-                .build();
-        DialogService ds = frame.getDialogService();
-
-        Optional<Path> path = DefaultTaskExecutor
-                .runInJavaFXThread(() -> ds.showFileOpenDialog(fileDialogConfiguration));
-        path.ifPresent(p -> fileLocationField.setText(p.toString()));
-    }
-
-    private void updateEnableState() {
-        fileLocationField.setEnabled(autosaveFile.isSelected());
-        browseButton.setEnabled(autosaveFile.isSelected());
-    }
-}
diff --git a/src/main/java/org/jabref/gui/shared/MigrationHelpDialog.java b/src/main/java/org/jabref/gui/shared/MigrationHelpDialog.java
deleted file mode 100644
index 1147a291a8c..00000000000
--- a/src/main/java/org/jabref/gui/shared/MigrationHelpDialog.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.jabref.gui.shared;
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.KeyStroke;
-import javax.swing.border.EmptyBorder;
-
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-
-public class MigrationHelpDialog extends JabRefDialog {
-
-    public MigrationHelpDialog(ConnectToSharedDatabaseDialog openSharedDatabaseDialog) {
-        super(openSharedDatabaseDialog, Localization.lang("Migration help information"), MigrationHelpDialog.class);
-
-        String migrationMessage = Localization
-                .lang("Entered database has obsolete structure and is no longer supported.");
-        JLabel migrationLabel = new JLabel(migrationMessage);
-        migrationLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
-
-        String helpMessage = Localization.lang("Click here to learn about the migration of pre-3.6 databases.");
-        JLabel helpLabel = new HelpAction(HelpFile.SQL_DATABASE_MIGRATION).getHelpLabel(helpMessage);
-        helpLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
-
-        String informationMessage = Localization.lang("However, a new database was created alongside the pre-3.6 one.");
-        JLabel informationLabel = new JLabel(informationMessage);
-        informationLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
-
-        Action openAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                openSharedDatabaseDialog.openSharedDatabase();
-            }
-        };
-
-        JButton okButton = new JButton(Localization.lang("OK"));
-        okButton.addActionListener(openAction);
-        okButton.setAlignmentX(Component.CENTER_ALIGNMENT);
-        okButton.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
-                "Enter_pressed");
-        okButton.getActionMap().put("Enter_pressed", openAction);
-
-        JPanel buttonPanel = new JPanel();
-        buttonPanel.add(okButton, BorderLayout.CENTER);
-
-        JPanel contentPanel = new JPanel();
-        contentPanel.setBorder(new EmptyBorder(9, 9, 9, 9));
-        contentPanel.setLayout(new BoxLayout(contentPanel, BoxLayout.Y_AXIS));
-
-        contentPanel.add(migrationLabel);
-        contentPanel.add(Box.createRigidArea(new Dimension(0, 10)));
-        contentPanel.add(helpLabel);
-        contentPanel.add(Box.createRigidArea(new Dimension(0, 10)));
-        contentPanel.add(informationLabel);
-        contentPanel.add(Box.createRigidArea(new Dimension(0, 20)));
-        contentPanel.add(buttonPanel);
-
-        add(contentPanel);
-
-        setResizable(false);
-        pack();
-        setLocationRelativeTo(openSharedDatabaseDialog);
-    }
-}
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml
new file mode 100644
index 00000000000..c8c3d49729c
--- /dev/null
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.Group?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<DialogPane minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.shared.SharedDatabaseLoginDialogView">
+   <content>
+      <BorderPane>
+         <center>
+            <BorderPane BorderPane.alignment="TOP_LEFT">
+               <center>
+                  <GridPane BorderPane.alignment="CENTER">
+                    <columnConstraints>
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="20.0" prefWidth="120.0" />
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" />
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" />
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" />
+                    </rowConstraints>
+                     <children>
+                        <Label text="%Database Type:" />
+                        <ComboBox fx:id="databaseType" prefHeight="25.0" prefWidth="606.0" GridPane.columnIndex="1" GridPane.columnSpan="2" />
+                        <Label text="%Host/Port:" GridPane.rowIndex="1" />
+                        <TextField fx:id="host" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                        <TextField fx:id="database" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2" />
+                        <TextField fx:id="port" prefHeight="25.0" prefWidth="66.0" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+                        <Label text="%Database:" GridPane.rowIndex="2" />
+                        <Label text="%User:" GridPane.rowIndex="3" />
+                        <TextField fx:id="user" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3" />
+                        <Label text="%Password:" GridPane.rowIndex="4" />
+                        <PasswordField fx:id="password" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="4" />
+                        <CheckBox fx:id="rememberPassword" mnemonicParsing="false" text="%Remember Password" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="5" />
+                        <CheckBox fx:id="useSSL" mnemonicParsing="false" text="%Use SSL" GridPane.rowIndex="5" />
+                        <TextField fx:id="fileKeystore" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+                        <Button fx:id="browseKeystore" mnemonicParsing="false" onAction="#showOpenKeystoreFileDialog" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="6" />
+                        <GridPane>
+                          <columnConstraints>
+                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                          </columnConstraints>
+                          <rowConstraints>
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                          </rowConstraints>
+                        </GridPane>
+                        <PasswordField fx:id="passwordKeystore" GridPane.columnIndex="1" GridPane.rowIndex="7" />
+                        <Label text="%Keystore:" GridPane.rowIndex="6" />
+                        <Label text="%Keystore password:" GridPane.rowIndex="7" />
+                     </children>
+                  </GridPane>
+               </center>
+            </BorderPane>
+         </center>
+         <bottom>
+            <GridPane BorderPane.alignment="CENTER">
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <CheckBox fx:id="autosave" mnemonicParsing="false" text="%Automatically save the library to" GridPane.columnSpan="2" />
+                  <TextField fx:id="folder" GridPane.rowIndex="1" />
+                  <Button fx:id="browseButton" mnemonicParsing="false" onAction="#showSaveDbToFileDialog" text="%Browse" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <Group />
+               </children>
+            </GridPane>
+         </bottom>
+      </BorderPane>
+   </content>
+   <header>
+   </header>
+   <buttonTypes>
+      <ButtonType fx:constant="CLOSE" />
+      <ButtonType fx:id="connectButton" buttonData="OK_DONE" text="%Connect" />
+   </buttonTypes>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
new file mode 100644
index 00000000000..4964fd8bb2d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
@@ -0,0 +1,128 @@
+package org.jabref.gui.shared;
+
+import javax.inject.Inject;
+
+import javafx.application.Platform;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
+import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.shared.DBMSType;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import org.fxmisc.easybind.EasyBind;
+
+public class SharedDatabaseLoginDialogView extends BaseDialog<Void> {
+
+    private final JabRefFrame frame;
+
+    @FXML private ComboBox<DBMSType> databaseType;
+    @FXML private TextField host;
+    @FXML private TextField database;
+    @FXML private TextField port;
+    @FXML private TextField user;
+    @FXML private PasswordField password;
+    @FXML private CheckBox rememberPassword;
+    @FXML private TextField folder;
+    @FXML private Button browseButton;
+    @FXML private CheckBox autosave;
+    @FXML private ButtonType connectButton;
+    @FXML private CheckBox useSSL;
+    @FXML private TextField fileKeystore;
+    @FXML private PasswordField passwordKeystore;
+    @FXML private Button browseKeystore;
+
+    @Inject private DialogService dialogService;
+
+    private SharedDatabaseLoginDialogViewModel viewModel;
+    private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
+
+    public SharedDatabaseLoginDialogView(JabRefFrame frame) {
+        this.frame = frame;
+        this.setTitle(Localization.lang("Connect to shared database"));
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        ControlHelper.setAction(connectButton, this.getDialogPane(), event -> openDatabase());
+        Button btnConnect = (Button) this.getDialogPane().lookupButton(connectButton);
+        //must be set here, because in initialize the button is still null
+        btnConnect.disableProperty().bind(viewModel.formValidation().validProperty().not());
+        btnConnect.textProperty().bind(EasyBind.map(viewModel.loadingProperty(), loading -> (loading) ? Localization.lang("Connecting...") : Localization.lang("Connect")));
+    }
+
+    @FXML
+    private void openDatabase() {
+        viewModel.openDatabase();
+        this.close();
+    }
+
+    @FXML
+    private void initialize() {
+        visualizer.setDecoration(new IconValidationDecorator());
+
+        viewModel = new SharedDatabaseLoginDialogViewModel(frame, dialogService);
+        databaseType.getItems().addAll(DBMSType.values());
+        databaseType.getSelectionModel().select(0);
+
+        database.textProperty().bindBidirectional(viewModel.databaseproperty());
+        host.textProperty().bindBidirectional(viewModel.hostProperty());
+        user.textProperty().bindBidirectional(viewModel.userProperty());
+        password.textProperty().bindBidirectional(viewModel.passwordProperty());
+        port.textProperty().bindBidirectional(viewModel.portProperty());
+        databaseType.valueProperty().bindBidirectional(viewModel.selectedDbmstypeProperty());
+
+        folder.textProperty().bindBidirectional(viewModel.folderProperty());
+        browseButton.disableProperty().bind(viewModel.autosaveProperty().not());
+        folder.disableProperty().bind(viewModel.autosaveProperty().not());
+        autosave.selectedProperty().bindBidirectional(viewModel.autosaveProperty());
+
+        useSSL.selectedProperty().bindBidirectional(viewModel.useSSLProperty());
+
+        fileKeystore.textProperty().bindBidirectional(viewModel.keyStoreProperty());
+
+        browseKeystore.disableProperty().bind(viewModel.useSSLProperty().not());
+        passwordKeystore.disableProperty().bind(viewModel.useSSLProperty().not());
+        passwordKeystore.textProperty().bindBidirectional(viewModel.keyStorePasswordProperty());
+
+        //Must be executed after the initialization of the view, otherwise it doesn't work
+        Platform.runLater(() -> {
+            visualizer.initVisualization(viewModel.dbValidation(), database, true);
+            visualizer.initVisualization(viewModel.hostValidation(), host, true);
+            visualizer.initVisualization(viewModel.portValidation(), port, true);
+            visualizer.initVisualization(viewModel.userValidation(), user, true);
+
+            EasyBind.subscribe(autosave.selectedProperty(), selected -> {
+                visualizer.initVisualization(viewModel.folderValidation(), folder, true);
+            });
+
+            EasyBind.subscribe(useSSL.selectedProperty(), selected -> {
+                visualizer.initVisualization(viewModel.keystoreValidation(), fileKeystore, true);
+            });
+        });
+    }
+
+    @FXML
+    private void showSaveDbToFileDialog(ActionEvent event) {
+        viewModel.showSaveDbToFileDialog();
+    }
+
+    @FXML
+    private void showOpenKeystoreFileDialog(ActionEvent event) {
+        viewModel.showOpenKeystoreFileDialog();
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
new file mode 100644
index 00000000000..d03300bba12
--- /dev/null
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -0,0 +1,367 @@
+package org.jabref.gui.shared;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.GeneralSecurityException;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.ButtonBar.ButtonData;
+import javafx.scene.control.ButtonType;
+
+import org.jabref.Globals;
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.exporter.SaveDatabaseAction;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.gui.util.FileFilterConverter;
+import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.shared.DBMSConnectionProperties;
+import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
+import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
+import org.jabref.logic.shared.security.Password;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.shared.DBMSType;
+import org.jabref.model.database.shared.DatabaseLocation;
+import org.jabref.model.database.shared.DatabaseNotSupportedException;
+import org.jabref.preferences.JabRefPreferences;
+
+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;
+import de.saxsys.mvvmfx.utils.validation.Validator;
+import org.fxmisc.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SharedDatabaseLoginDialogViewModel.class);
+
+    private final ObjectProperty<DBMSType> selectedDBMSType = new SimpleObjectProperty<>(DBMSType.values()[0]);
+
+    private final StringProperty database = new SimpleStringProperty("");
+    private final StringProperty host = new SimpleStringProperty("");
+    private final StringProperty port = new SimpleStringProperty("");
+    private final StringProperty user = new SimpleStringProperty("");
+    private final StringProperty password = new SimpleStringProperty("");
+    private final StringProperty folder = new SimpleStringProperty("");
+    private final BooleanProperty autosave = new SimpleBooleanProperty();
+    private final BooleanProperty rememberPassword = new SimpleBooleanProperty();
+    private final BooleanProperty loading = new SimpleBooleanProperty();
+    private final StringProperty keystore = new SimpleStringProperty("");
+    private final BooleanProperty useSSL = new SimpleBooleanProperty();
+    private final StringProperty keyStorePasswordProperty = new SimpleStringProperty("");
+
+    private final JabRefFrame frame;
+    private final DialogService dialogService;
+    private final SharedDatabasePreferences prefs = new SharedDatabasePreferences();
+
+    private final Validator databaseValidator;
+    private final Validator hostValidator;
+    private final Validator portValidator;
+    private final Validator userValidator;
+    private final Validator folderValidator;
+    private final Validator keystoreValidator;
+    private final CompositeValidator formValidator;
+
+    public SharedDatabaseLoginDialogViewModel(JabRefFrame frame, DialogService dialogService) {
+        this.frame = frame;
+        this.dialogService = dialogService;
+
+        EasyBind.subscribe(selectedDBMSType, selected -> {
+            port.setValue(Integer.toString(selected.getDefaultPort()));
+        });
+
+        Predicate<String> notEmpty = input -> (input != null) && !input.trim().isEmpty();
+        Predicate<String> fileExists = input -> Files.exists(Paths.get(input));
+        Predicate<String> notEmptyAndfilesExist = notEmpty.and(fileExists);
+
+        databaseValidator = new FunctionBasedValidator<>(database, notEmpty, ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("Library"))));
+        hostValidator = new FunctionBasedValidator<>(host, notEmpty, ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("Port"))));
+        portValidator = new FunctionBasedValidator<>(port, notEmpty, ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("Host"))));
+        userValidator = new FunctionBasedValidator<>(user, notEmpty, ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("User"))));
+        folderValidator = new FunctionBasedValidator<>(folder, notEmptyAndfilesExist, ValidationMessage.error(Localization.lang("Please enter a valid file path.")));
+        keystoreValidator = new FunctionBasedValidator<>(keystore, notEmptyAndfilesExist, ValidationMessage.error(Localization.lang("Please enter a valid file path.")));
+
+        formValidator = new CompositeValidator();
+        formValidator.addValidators(databaseValidator, hostValidator, portValidator, userValidator);
+
+        applyPreferences();
+    }
+
+    public void openDatabase() {
+
+        DBMSConnectionProperties connectionProperties = new DBMSConnectionProperties();
+        connectionProperties.setType(selectedDBMSType.getValue());
+        connectionProperties.setHost(host.getValue());
+        connectionProperties.setPort(Integer.parseInt(port.getValue()));
+        connectionProperties.setDatabase(database.getValue());
+        connectionProperties.setUser(user.getValue());
+        connectionProperties.setPassword(password.getValue());
+        connectionProperties.setUseSSL(useSSL.getValue());
+        connectionProperties.setKeyStore(keystore.getValue());
+
+        setupKeyStore();
+        openSharedDatabase(connectionProperties);
+    }
+
+    private void setupKeyStore() {
+        System.setProperty("javax.net.ssl.trustStore", keystore.getValue());
+        System.setProperty("javax.net.ssl.trustStorePassword", keyStorePasswordProperty.getValue());
+        System.setProperty("javax.net.debug", "ssl");
+    }
+
+    private void openSharedDatabase(DBMSConnectionProperties connectionProperties) {
+        if (isSharedDatabaseAlreadyPresent(connectionProperties)) {
+
+            dialogService.showWarningDialogAndWait(Localization.lang("Shared database connection"),
+                                                   Localization.lang("You are already connected to a database using entered connection details."));
+            return;
+        }
+
+        if (autosave.get()) {
+            Path localFilePath = Paths.get(folder.getValue());
+
+            if (Files.exists(localFilePath) && !Files.isDirectory(localFilePath)) {
+
+                boolean overwriteFilePressed = dialogService.showConfirmationDialogAndWait(Localization.lang("Existing file"),
+                                                                                           Localization.lang("'%0' exists. Overwrite file?", localFilePath.getFileName().toString()),
+                                                                                           Localization.lang("Overwrite file"),
+                                                                                           Localization.lang("Cancel"));
+                if (!overwriteFilePressed) {
+                    return;
+                }
+            }
+        }
+
+        loading.set(true);
+
+        try {
+            SharedDatabaseUIManager manager = new SharedDatabaseUIManager(frame);
+            BasePanel panel = manager.openNewSharedDatabaseTab(connectionProperties);
+            setPreferences();
+
+            if (!folder.getValue().isEmpty()) {
+                try {
+                    new SaveDatabaseAction(panel, Paths.get(folder.getValue())).runCommand();
+                } catch (Throwable e) {
+                    LOGGER.error("Error while saving the database", e);
+                }
+            }
+
+            return;
+        } catch (SQLException | InvalidDBMSConnectionPropertiesException exception) {
+
+            frame.getDialogService().showErrorDialogAndWait(Localization.lang("Connection error"), exception);
+
+        } catch (DatabaseNotSupportedException exception) {
+            ButtonType openHelp = new ButtonType("Open Help", ButtonData.OTHER);
+
+            Optional<ButtonType> result = dialogService.showCustomButtonDialogAndWait(AlertType.INFORMATION,
+                                                                                      Localization.lang("Migration help information"),
+                                                                                      Localization.lang("Entered database has obsolete structure and is no longer supported.")
+                                                                                                                                       + "\n" +
+                                                                                                                                       Localization.lang("Click help to learn about the migration of pre-3.6 databases.")
+                                                                                                                                       + "\n" +
+                                                                                                                                       Localization.lang("However, a new database was created alongside the pre-3.6 one."),
+                                                                                      ButtonType.OK, openHelp);
+
+            result.filter(btn -> btn.equals(openHelp)).ifPresent(btn -> HelpAction.openHelpPage(HelpFile.SQL_DATABASE_MIGRATION));
+            result.filter(btn -> btn.equals(ButtonType.OK)).ifPresent(btn -> openSharedDatabase(connectionProperties));
+
+        }
+        loading.set(false);
+
+    }
+
+    private void setPreferences() {
+        prefs.setType(selectedDBMSType.getValue().toString());
+        prefs.setHost(host.getValue());
+        prefs.setPort(port.getValue());
+        prefs.setName(database.getValue());
+        prefs.setUser(user.getValue());
+        prefs.setUseSSL(useSSL.getValue());
+        prefs.setKeystoreFile(keystore.getValue());
+
+        if (rememberPassword.get()) {
+            try {
+                prefs.setPassword(new Password(password.getValue(), password.getValue()).encrypt());
+            } catch (GeneralSecurityException | UnsupportedEncodingException e) {
+                LOGGER.error("Could not store the password due to encryption problems.", e);
+            }
+        } else {
+            prefs.clearPassword(); // for the case that the password is already set
+        }
+
+        prefs.setRememberPassword(rememberPassword.get());
+    }
+
+    /**
+     * Fetches possibly saved data and configures the control elements respectively.
+     */
+    private void applyPreferences() {
+        Optional<String> sharedDatabaseType = prefs.getType();
+        Optional<String> sharedDatabaseHost = prefs.getHost();
+        Optional<String> sharedDatabasePort = prefs.getPort();
+        Optional<String> sharedDatabaseName = prefs.getName();
+        Optional<String> sharedDatabaseUser = prefs.getUser();
+        Optional<String> sharedDatabasePassword = prefs.getPassword();
+        boolean sharedDatabaseRememberPassword = prefs.getRememberPassword();
+        Optional<String> sharedDatabaseKeystoreFile = prefs.getKeyStoreFile();
+
+        if (sharedDatabaseType.isPresent()) {
+            Optional<DBMSType> dbmsType = DBMSType.fromString(sharedDatabaseType.get());
+            dbmsType.ifPresent(selectedDBMSType::set);
+        }
+
+        sharedDatabaseHost.ifPresent(host::set);
+        sharedDatabasePort.ifPresent(port::set);
+        sharedDatabaseName.ifPresent(database::set);
+        sharedDatabaseUser.ifPresent(user::set);
+        sharedDatabaseKeystoreFile.ifPresent(keystore::set);
+        useSSL.setValue(prefs.isUseSSL());
+
+        if (sharedDatabasePassword.isPresent() && sharedDatabaseUser.isPresent()) {
+            try {
+                password.setValue(new Password(sharedDatabasePassword.get().toCharArray(), sharedDatabaseUser.get()).decrypt());
+            } catch (GeneralSecurityException | UnsupportedEncodingException e) {
+                LOGGER.error("Could not read the password due to decryption problems.", e);
+            }
+        }
+
+        rememberPassword.set(sharedDatabaseRememberPassword);
+    }
+
+    private boolean isSharedDatabaseAlreadyPresent(DBMSConnectionProperties connectionProperties) {
+        List<BasePanel> panels = frame.getBasePanelList();
+        return panels.parallelStream().anyMatch(panel -> {
+            BibDatabaseContext context = panel.getBibDatabaseContext();
+
+            return ((context.getLocation() == DatabaseLocation.SHARED) &&
+                    connectionProperties.equals(context.getDBMSSynchronizer().getConnectionProperties()));
+        });
+    }
+
+    public void showSaveDbToFileDialog() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                                                                                               .addExtensionFilter(StandardFileType.BIBTEX_DB)
+                                                                                               .withDefaultExtension(StandardFileType.BIBTEX_DB)
+                                                                                               .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                               .build();
+        Optional<Path> exportPath = dialogService.showFileSaveDialog(fileDialogConfiguration);
+        exportPath.ifPresent(path -> {
+            folder.setValue(path.toString());
+        });
+    }
+
+    public void showOpenKeystoreFileDialog() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                                                                                               .addExtensionFilter(FileFilterConverter.ANY_FILE)
+                                                                                               .addExtensionFilter(StandardFileType.JAVA_KEYSTORE)
+                                                                                               .withDefaultExtension(StandardFileType.JAVA_KEYSTORE)
+                                                                                               .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                                                                                               .build();
+        Optional<Path> keystorePath = dialogService.showFileOpenDialog(fileDialogConfiguration);
+        keystorePath.ifPresent(path -> {
+            keystore.setValue(path.toString());
+        });
+    }
+
+    public StringProperty databaseproperty() {
+        return database;
+    }
+
+    public StringProperty hostProperty() {
+        return host;
+    }
+
+    public StringProperty portProperty() {
+        return port;
+    }
+
+    public StringProperty userProperty() {
+        return user;
+    }
+
+    public StringProperty passwordProperty() {
+        return password;
+    }
+
+    public BooleanProperty autosaveProperty() {
+        return autosave;
+    }
+
+    public BooleanProperty rememberPasswordProperty() {
+        return rememberPassword;
+    }
+
+    public StringProperty folderProperty() {
+        return folder;
+    }
+
+    public StringProperty keyStoreProperty() {
+        return keystore;
+    }
+
+    public StringProperty keyStorePasswordProperty() {
+        return keyStorePasswordProperty;
+    }
+
+    public BooleanProperty useSSLProperty() {
+        return useSSL;
+    }
+
+    public ObjectProperty<DBMSType> selectedDbmstypeProperty() {
+        return selectedDBMSType;
+    }
+
+    public BooleanProperty loadingProperty() {
+        return loading;
+    }
+
+    public ValidationStatus dbValidation() {
+        return databaseValidator.getValidationStatus();
+    }
+
+    public ValidationStatus hostValidation() {
+        return hostValidator.getValidationStatus();
+    }
+
+    public ValidationStatus portValidation() {
+        return portValidator.getValidationStatus();
+    }
+
+    public ValidationStatus userValidation() {
+        return userValidator.getValidationStatus();
+    }
+
+    public ValidationStatus folderValidation() {
+        return folderValidator.getValidationStatus();
+    }
+
+    public ValidationStatus keystoreValidation() {
+        return keystoreValidator.getValidationStatus();
+    }
+
+    public ValidationStatus formValidation() {
+        return formValidator.getValidationStatus();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
index eec194140a3..219c157fc53 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -4,12 +4,13 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.ButtonBar.ButtonData;
+import javafx.scene.control.ButtonType;
 
 import org.jabref.Globals;
-import org.jabref.JabRefGUI;
 import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.entryeditor.EntryEditor;
 import org.jabref.gui.exporter.SaveDatabaseAction;
@@ -37,9 +38,11 @@ public class SharedDatabaseUIManager {
 
     private final JabRefFrame jabRefFrame;
     private DatabaseSynchronizer dbmsSynchronizer;
+    private final DialogService dialogService;
 
     public SharedDatabaseUIManager(JabRefFrame jabRefFrame) {
         this.jabRefFrame = jabRefFrame;
+        this.dialogService = jabRefFrame.getDialogService();
     }
 
     @Subscribe
@@ -47,22 +50,27 @@ public void listen(ConnectionLostEvent connectionLostEvent) {
 
         jabRefFrame.output(Localization.lang("Connection lost."));
 
-        String[] options = {Localization.lang("Reconnect"), Localization.lang("Work offline"),
-                Localization.lang("Close library")};
-
-        int answer = JOptionPane.showOptionDialog(null,
-                Localization.lang("The connection to the server has been terminated.") + "\n\n",
-                Localization.lang("Connection lost"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE,
-                null, options, options[0]);
-
-        if (answer == 0) {
-            jabRefFrame.closeCurrentTab();
-            ConnectToSharedDatabaseDialog connectToSharedDatabaseDialog = new ConnectToSharedDatabaseDialog(jabRefFrame);
-            connectToSharedDatabaseDialog.setVisible(true);
-        } else if (answer == 1) {
-            connectionLostEvent.getBibDatabaseContext().convertToLocalDatabase();
-            jabRefFrame.refreshTitleAndTabs();
-            jabRefFrame.output(Localization.lang("Working offline."));
+        ButtonType reconnect = new ButtonType(Localization.lang("Reconnect"), ButtonData.YES);
+        ButtonType workOffline = new ButtonType(Localization.lang("Work offline"), ButtonData.NO);
+        ButtonType closeLibrary = new ButtonType(Localization.lang("Close library"), ButtonData.CANCEL_CLOSE);
+
+        Optional<ButtonType> answer = dialogService.showCustomButtonDialogAndWait(AlertType.WARNING,
+                                                                                  Localization.lang("Connection lost"),
+                                                                                  Localization.lang("The connection to the server has been terminated."),
+                                                                                  reconnect,
+                                                                                  workOffline,
+                                                                                  closeLibrary);
+
+        if (answer.isPresent()) {
+            if (answer.get().equals(reconnect)) {
+                jabRefFrame.closeCurrentTab();
+                new SharedDatabaseLoginDialogView(jabRefFrame).showAndWait();
+
+            } else if (answer.get().equals(workOffline)) {
+                connectionLostEvent.getBibDatabaseContext().convertToLocalDatabase();
+                jabRefFrame.refreshTitleAndTabs();
+                jabRefFrame.output(Localization.lang("Working offline."));
+            }
         } else {
             jabRefFrame.closeCurrentTab();
         }
@@ -74,8 +82,8 @@ public void listen(UpdateRefusedEvent updateRefusedEvent) {
         jabRefFrame.output(Localization.lang("Update refused."));
 
         new MergeSharedEntryDialog(jabRefFrame, dbmsSynchronizer, updateRefusedEvent.getLocalBibEntry(),
-                updateRefusedEvent.getSharedBibEntry(),
-                    updateRefusedEvent.getBibDatabaseContext().getMode()).showMergeDialog();
+                                   updateRefusedEvent.getSharedBibEntry(),
+                                   updateRefusedEvent.getBibDatabaseContext().getMode()).showMergeDialog();
     }
 
     @Subscribe
@@ -86,12 +94,12 @@ public void listen(SharedEntryNotPresentEvent event) {
         panel.getUndoManager().addEdit(new UndoableRemoveEntry(panel.getDatabase(), event.getBibEntry(), panel));
 
         if (Objects.nonNull(entryEditor) && (entryEditor.getEntry() == event.getBibEntry())) {
-            JOptionPane.showMessageDialog(null,
-                    Localization.lang("The BibEntry you currently work on has been deleted on the shared side.")
-                            + "\n" + Localization.lang("You can restore the entry using the \"Undo\" operation."),
-                    Localization.lang("Shared entry is no longer present"), JOptionPane.INFORMATION_MESSAGE);
 
-            SwingUtilities.invokeLater(() -> panel.closeBottomPane());
+            dialogService.showInformationDialogAndWait(Localization.lang("Shared entry is no longer present"),
+                                                       Localization.lang("The entry you currently work on has been deleted on the shared side.")
+                                                                                                               + "\n"
+                                                                                                               + Localization.lang("You can restore the entry using the \"Undo\" operation."));
+            panel.closeBottomPane();
         }
     }
 
@@ -103,8 +111,8 @@ public void listen(SharedEntryNotPresentEvent event) {
      * @return BasePanel which also used by {@link SaveDatabaseAction}
      */
     public BasePanel openNewSharedDatabaseTab(DBMSConnectionProperties dbmsConnectionProperties)
-            throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException {
-        JabRefFrame frame = JabRefGUI.getMainFrame();
+        throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException {
+
         BibDatabaseMode selectedMode = Globals.prefs.getDefaultBibDatabaseMode();
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new Defaults(selectedMode));
         DBMSSynchronizer synchronizer = new DBMSSynchronizer(bibDatabaseContext, Globals.prefs.getKeywordDelimiter(), Globals.prefs.getKeyPattern(), Globals.getFileUpdateMonitor());
@@ -113,13 +121,13 @@ public BasePanel openNewSharedDatabaseTab(DBMSConnectionProperties dbmsConnectio
         dbmsSynchronizer = bibDatabaseContext.getDBMSSynchronizer();
         dbmsSynchronizer.openSharedDatabase(new DBMSConnection(dbmsConnectionProperties));
         dbmsSynchronizer.registerListener(this);
-        frame.output(Localization.lang("Connection to %0 server established.", dbmsConnectionProperties.getType().toString()));
-        return frame.addTab(bibDatabaseContext, true);
+        jabRefFrame.output(Localization.lang("Connection to %0 server established.", dbmsConnectionProperties.getType().toString()));
+        return jabRefFrame.addTab(bibDatabaseContext, true);
     }
 
     public void openSharedDatabaseFromParserResult(ParserResult parserResult)
-            throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException,
-            NotASharedDatabaseException {
+        throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException,
+        NotASharedDatabaseException {
 
         Optional<String> sharedDatabaseIDOptional = parserResult.getDatabase().getSharedDatabaseID();
 
@@ -130,19 +138,18 @@ public void openSharedDatabaseFromParserResult(ParserResult parserResult)
         String sharedDatabaseID = sharedDatabaseIDOptional.get();
         DBMSConnectionProperties dbmsConnectionProperties = new DBMSConnectionProperties(new SharedDatabasePreferences(sharedDatabaseID));
 
-        JabRefFrame frame = JabRefGUI.getMainFrame();
         BibDatabaseMode selectedMode = Globals.prefs.getDefaultBibDatabaseMode();
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new Defaults(selectedMode));
         DBMSSynchronizer synchronizer = new DBMSSynchronizer(bibDatabaseContext, Globals.prefs.getKeywordDelimiter(), Globals.prefs.getKeyPattern(), Globals.getFileUpdateMonitor());
         bibDatabaseContext.convertToSharedDatabase(synchronizer);
 
         bibDatabaseContext.getDatabase().setSharedDatabaseID(sharedDatabaseID);
-        bibDatabaseContext.setDatabaseFile(parserResult.getDatabaseContext().getDatabaseFile().orElse(null));
+        bibDatabaseContext.setDatabaseFile(parserResult.getDatabaseContext().getDatabasePath().orElse(null));
 
         dbmsSynchronizer = bibDatabaseContext.getDBMSSynchronizer();
         dbmsSynchronizer.openSharedDatabase(new DBMSConnection(dbmsConnectionProperties));
         dbmsSynchronizer.registerListener(this);
         parserResult.setDatabaseContext(bibDatabaseContext);
-        frame.output(Localization.lang("Connection to %0 server established.", dbmsConnectionProperties.getType().toString()));
+        jabRefFrame.output(Localization.lang("Connection to %0 server established.", dbmsConnectionProperties.getType().toString()));
     }
 }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnection.java b/src/main/java/org/jabref/logic/shared/DBMSConnection.java
index b0bf08a72bf..89952950add 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnection.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnection.java
@@ -21,23 +21,20 @@ public class DBMSConnection implements DatabaseConnection {
     private final Connection connection;
     private final DBMSConnectionProperties properties;
 
+    public DBMSConnection(DBMSConnectionProperties connectionProperties) throws SQLException, InvalidDBMSConnectionPropertiesException {
 
-    public DBMSConnection(DBMSConnectionProperties properties) throws SQLException, InvalidDBMSConnectionPropertiesException {
-
-        if (!properties.isValid()) {
+        if (!connectionProperties.isValid()) {
             throw new InvalidDBMSConnectionPropertiesException();
         }
-        this.properties = properties;
+        this.properties = connectionProperties;
 
         try {
             DriverManager.setLoginTimeout(3);
             // ensure that all SQL drivers are loaded - source: http://stackoverflow.com/a/22384826/873282
             // we use the side effect of getAvailableDBMSTypes() - it loads all available drivers
             DBMSConnection.getAvailableDBMSTypes();
+            this.connection = DriverManager.getConnection(connectionProperties.getUrl(), connectionProperties.asProperties());
 
-            this.connection = DriverManager.getConnection(
-                    properties.getType().getUrl(properties.getHost(), properties.getPort(), properties.getDatabase()),
-                    properties.getUser(), properties.getPassword());
         } catch (SQLException e) {
             // Some systems like PostgreSQL retrieves 0 to every exception.
             // Therefore a stable error determination is not possible.
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
index 2c50fa82c25..6373c1e3035 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
@@ -4,6 +4,7 @@
 import java.security.GeneralSecurityException;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Properties;
 
 import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
 import org.jabref.logic.shared.security.Password;
@@ -26,7 +27,10 @@ public class DBMSConnectionProperties implements DatabaseConnectionProperties {
     private String database;
     private String user;
     private String password;
+    private boolean useSSL;
 
+    //Not needed for connection, but stored for future login
+    private String keyStore;
 
     public DBMSConnectionProperties() {
         // no data
@@ -37,13 +41,14 @@ public DBMSConnectionProperties(SharedDatabasePreferences prefs) {
     }
 
     public DBMSConnectionProperties(DBMSType type, String host, int port, String database, String user,
-            String password) {
+                                    String password, boolean useSSL) {
         this.type = type;
         this.host = host;
         this.port = port;
         this.database = database;
         this.user = user;
         this.password = password;
+        this.useSSL = useSSL;
     }
 
     @Override
@@ -100,15 +105,68 @@ public void setPassword(String password) {
         this.password = password;
     }
 
+    @Override
+    public boolean isUseSSL() {
+        return useSSL;
+    }
+
+    public void setUseSSL(boolean useSSL) {
+        this.useSSL = useSSL;
+    }
+
+    public String getUrl() {
+        return type.getUrl(host, port, database);
+    }
+
+    /**
+     * Returns username, password and ssl as Properties Object
+     * @return Properties with values for user, password and ssl
+     */
+    public Properties asProperties() {
+        Properties props = new Properties();
+        props.setProperty("user", user);
+        props.setProperty("password", password);
+
+        if (useSSL) {
+            props.setProperty("ssl", Boolean.toString(useSSL));
+        }
+
+        return props;
+    }
+
+    @Override
+    public String getKeyStore() {
+        return keyStore;
+    }
+
+    public void setKeyStore(String keyStore) {
+        this.keyStore = keyStore;
+    }
+
     /**
      * Compares all properties except the password.
      */
-    public boolean equals(DBMSConnectionProperties properties) {
-        return this.type.equals(properties.getType())
-                && this.host.equalsIgnoreCase(properties.getHost())
-                && (this.port == properties.getPort())
-                && this.database.equals(properties.getDatabase())
-                && this.user.equals(properties.getUser());
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (!(obj instanceof DBMSConnectionProperties)) {
+            return false;
+        }
+        DBMSConnectionProperties properties = (DBMSConnectionProperties) obj;
+        return Objects.equals(type, properties.getType())
+               && this.host.equalsIgnoreCase(properties.getHost())
+               && Objects.equals(port, properties.getPort())
+               && Objects.equals(database, properties.getDatabase())
+               && Objects.equals(user, properties.getUser())
+               && Objects.equals(useSSL, properties.isUseSSL());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(type, host, port, database, user, useSSL);
     }
 
     /**
@@ -125,6 +183,8 @@ private void setFromPreferences(SharedDatabasePreferences prefs) {
         prefs.getHost().ifPresent(theHost -> this.host = theHost);
         prefs.getPort().ifPresent(thePort -> this.port = Integer.parseInt(thePort));
         prefs.getName().ifPresent(theDatabase -> this.database = theDatabase);
+        prefs.getKeyStoreFile().ifPresent(theKeystore -> this.keyStore = theKeystore);
+        this.setUseSSL(prefs.isUseSSL());
 
         if (prefs.getUser().isPresent()) {
             this.user = prefs.getUser().get();
@@ -146,10 +206,11 @@ private void setFromPreferences(SharedDatabasePreferences prefs) {
     @Override
     public boolean isValid() {
         return Objects.nonNull(type)
-                && Objects.nonNull(host)
-                && Objects.nonNull(port)
-                && Objects.nonNull(database)
-                && Objects.nonNull(user)
-                && Objects.nonNull(password);
+               && Objects.nonNull(host)
+               && Objects.nonNull(port)
+               && Objects.nonNull(database)
+               && Objects.nonNull(user)
+               && Objects.nonNull(password);
     }
+
 }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
index 3b42416e511..64ede9203ba 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
@@ -55,7 +55,7 @@ public class DBMSSynchronizer implements DatabaseSynchronizer {
     private Connection currentConnection;
     private final Character keywordSeparator;
     private final GlobalBibtexKeyPattern globalCiteKeyPattern;
-    private FileUpdateMonitor fileMonitor;
+    private final FileUpdateMonitor fileMonitor;
 
     public DBMSSynchronizer(BibDatabaseContext bibDatabaseContext, Character keywordSeparator,
                             GlobalBibtexKeyPattern globalCiteKeyPattern, FileUpdateMonitor fileMonitor) {
@@ -132,13 +132,6 @@ public void listen(MetaDataChangedEvent event) {
         }
     }
 
-    @Subscribe
-    public void listen(EntryEvent event) {
-        if (isEventSourceAccepted(event)) {
-            dbmsProcessor.notifyClients();
-        }
-    }
-
     /**
      * Sets the table structure of shared database if needed and pulls all shared entries
      * to the new local database.
@@ -195,7 +188,7 @@ public void synchronizeLocalDatabase() {
                             // update fields
                             localEntry.setType(sharedEntry.get().getType(), EntryEventSource.SHARED);
                             localEntry.getSharedBibEntryData()
-                                    .setVersion(sharedEntry.get().getSharedBibEntryData().getVersion());
+                                      .setVersion(sharedEntry.get().getSharedBibEntryData().getVersion());
                             for (String field : sharedEntry.get().getFieldNames()) {
                                 localEntry.setField(field, sharedEntry.get().getField(field), EntryEventSource.SHARED);
                             }
@@ -399,6 +392,7 @@ public void setMetaData(MetaData metaData) {
         this.metaData = metaData;
     }
 
+    @Override
     public void registerListener(Object listener) {
         eventBus.register(listener);
     }
diff --git a/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java b/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
index d02ba9025ed..b4b07dcbf08 100644
--- a/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
@@ -5,6 +5,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import org.jabref.JabRefExecutorService;
 import org.jabref.logic.shared.listener.PostgresSQLNotificationListener;
 import org.jabref.model.database.shared.DatabaseConnection;
 import org.jabref.model.entry.BibEntry;
@@ -89,7 +90,8 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
             // Otherwise the listener is going to be deleted by GC.
             PGConnection pgConnection = connection.unwrap(PGConnection.class);
             listener = new PostgresSQLNotificationListener(dbmsSynchronizer, pgConnection);
-            listener.start();
+            JabRefExecutorService.INSTANCE.execute(listener);
+
         } catch (SQLException e) {
             LOGGER.error("SQL Error: ", e);
         }
@@ -98,6 +100,7 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
     @Override
     public void stopNotificationListener() {
         try {
+            listener.stop();
             connection.close();
         } catch (SQLException e) {
             LOGGER.error("SQL Error: ", e);
diff --git a/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java b/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java
index cf59f7a5641..77a3d6d9128 100644
--- a/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java
+++ b/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java
@@ -13,23 +13,24 @@
 /**
  * A listener for PostgreSQL database notifications.
  */
-public class PostgresSQLNotificationListener extends Thread {
+public class PostgresSQLNotificationListener implements Runnable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PostgresSQLNotificationListener.class);
 
     private final DBMSSynchronizer dbmsSynchronizer;
     private final PGConnection pgConnection;
+    private volatile boolean stop;
 
     public PostgresSQLNotificationListener(DBMSSynchronizer dbmsSynchronizer, PGConnection pgConnection) {
         this.dbmsSynchronizer = dbmsSynchronizer;
         this.pgConnection = pgConnection;
     }
-
     @Override
     public void run() {
+        stop = false;
         try {
             //noinspection InfiniteLoopStatement
-            while (true) {
+            while (!stop) {
                 PGNotification notifications[] = pgConnection.getNotifications();
 
                 if (notifications != null) {
@@ -47,4 +48,8 @@ public void run() {
             LOGGER.error("Error while listening for updates to PostgresSQL", exception);
         }
     }
+
+    public void stop() {
+        stop = true;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
index 6ae59105a7b..14b306a6b94 100644
--- a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
+++ b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
@@ -30,11 +30,12 @@ public class SharedDatabasePreferences {
     private static final String SHARED_DATABASE_USER = "sharedDatabaseUser";
     private static final String SHARED_DATABASE_PASSWORD = "sharedDatabasePassword";
     private static final String SHARED_DATABASE_REMEMBER_PASSWORD = "sharedDatabaseRememberPassword";
+    private static final String SHARED_DATABASE_USE_SSL = "sharedDatabaseUseSSL";
+    private static final String SHARED_DATABASE_KEYSTORE_FILE = "sharedDatabaseKeyStoreFile";
 
     // This {@link Preferences} is used only for things which should not appear in real JabRefPreferences due to security reasons.
     private final Preferences internalPrefs;
 
-
     public SharedDatabasePreferences() {
         this(DEFAULT_NODE);
     }
@@ -67,10 +68,18 @@ public Optional<String> getPassword() {
         return getOptionalValue(SHARED_DATABASE_PASSWORD);
     }
 
+    public Optional<String> getKeyStoreFile() {
+        return getOptionalValue(SHARED_DATABASE_KEYSTORE_FILE);
+    }
+
     public boolean getRememberPassword() {
         return internalPrefs.getBoolean(SHARED_DATABASE_REMEMBER_PASSWORD, false);
     }
 
+    public boolean isUseSSL() {
+        return internalPrefs.getBoolean(SHARED_DATABASE_USE_SSL, false);
+    }
+
     public void setType(String type) {
         internalPrefs.put(SHARED_DATABASE_TYPE, type);
     }
@@ -99,6 +108,14 @@ public void setRememberPassword(boolean rememberPassword) {
         internalPrefs.putBoolean(SHARED_DATABASE_REMEMBER_PASSWORD, rememberPassword);
     }
 
+    public void setUseSSL(boolean useSSL) {
+        internalPrefs.putBoolean(SHARED_DATABASE_USE_SSL, useSSL);
+    }
+
+    public void setKeystoreFile(String keystoreFile) {
+        internalPrefs.put(SHARED_DATABASE_KEYSTORE_FILE, keystoreFile);
+    }
+
     public void clearPassword() {
         internalPrefs.remove(SHARED_DATABASE_PASSWORD);
     }
@@ -123,6 +140,8 @@ public void putAllDBMSConnectionProperties(DatabaseConnectionProperties properti
         setPort(String.valueOf(properties.getPort()));
         setName(properties.getDatabase());
         setUser(properties.getUser());
+        setUseSSL(properties.isUseSSL());
+        setKeystoreFile(properties.getKeyStore());
 
         try {
             setPassword(new Password(properties.getPassword().toCharArray(), properties.getUser()).encrypt());
diff --git a/src/main/java/org/jabref/logic/shared/security/Password.java b/src/main/java/org/jabref/logic/shared/security/Password.java
index 4df6c73ab6f..50ebab42e01 100644
--- a/src/main/java/org/jabref/logic/shared/security/Password.java
+++ b/src/main/java/org/jabref/logic/shared/security/Password.java
@@ -29,7 +29,11 @@ public class Password {
      * @param key Key which is used to improve symmetric encryption
      */
     public Password(char[] phrase, String key) throws NoSuchAlgorithmException, NoSuchPaddingException {
-        this.phrase = new String(phrase).getBytes();
+        this(new String(phrase), key);
+    }
+
+    public Password(String phrase, String key) throws NoSuchAlgorithmException, NoSuchPaddingException {
+        this.phrase = phrase.getBytes();
         this.cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
         this.secretKey = new SecretKeySpec(get128BitHash(key.getBytes()), "AES");
         this.ivSpec = new IvParameterSpec("ThisIsA128BitKey".getBytes());
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index a231e941fc2..5eb21456754 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -24,6 +24,7 @@ public enum StandardFileType implements FileType {
     CSV("csv"),
     HTML("html"),
     JAR("jar"),
+    JAVA_KEYSTORE("jks"),
     JSTYLE("jstyle"),
     LAYOUT("layout"),
     ODS("ods"),
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index 76c6bfb6c9f..ece8531db46 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -113,10 +113,20 @@ public Optional<File> getDatabaseFile() {
         return file.map(Path::toFile);
     }
 
+    /**
+     *
+     * @param Set the database file
+     * @deprecated use {@link #setDatabaseFile(Path)}
+     */
+    @Deprecated
     public void setDatabaseFile(File file) {
         this.file = Optional.ofNullable(file).map(File::toPath);
     }
 
+    public void setDatabaseFile(Path file) {
+        this.file = Optional.ofNullable(file);
+    }
+
     public Optional<Path> getDatabasePath() {
         return file;
     }
@@ -282,4 +292,5 @@ public void convertToLocalDatabase() {
     public List<BibEntry> getEntries() {
         return database.getEntries();
     }
+
 }
diff --git a/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java b/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java
index 73c083ed81e..152078b6af7 100644
--- a/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java
+++ b/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java
@@ -15,4 +15,9 @@ public interface DatabaseConnectionProperties {
     String getPassword();
 
     boolean isValid();
+
+    String getKeyStore();
+
+    boolean isUseSSL();
+
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index bc440f631a4..f356031221a 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1959,7 +1959,6 @@ Your\ issue\ was\ reported\ in\ your\ browser.=Your issue was reported in your b
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=The log and exception information was copied to your clipboard.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Please paste this information (with Ctrl+V) in the issue description.
 
-Connection=Connection
 Connecting...=Connecting...
 Host=Host
 Port=Port
@@ -1986,9 +1985,8 @@ Shared\ version\:\ %0=Shared version: %0
 Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Please merge the shared entry with yours and press "Merge entries" to resolve this problem.
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Canceling this operation will leave your changes unsynchronized. Cancel anyway?
 Shared\ entry\ is\ no\ longer\ present=Shared entry is no longer present
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=The BibEntry you currently work on has been deleted on the shared side.
+The\ entry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=The entry you currently work on has been deleted on the shared side.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=You can restore the entry using the "Undo" operation.
-Remember\ password?=Remember password?
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=You are already connected to a database using entered connection details.
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Cannot cite entries without BibTeX keys. Generate keys now?
@@ -2013,7 +2011,6 @@ There\ were\ %0\ files\ which\ could\ not\ be\ imported.=There were %0 files whi
 Migration\ help\ information=Migration help information
 Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Entered database has obsolete structure and is no longer supported.
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=However, a new database was created alongside the pre-3.6 one.
-Click\ here\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=Click here to learn about the migration of pre-3.6 databases.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Opens a link where the current development version can be downloaded
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=See what has been changed in the JabRef versions
 Referenced\ BibTeX\ key\ does\ not\ exist=Referenced BibTeX key does not exist
@@ -2158,8 +2155,6 @@ Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Group containing entr
 Any\ file=Any file
 
 No\ linked\ files\ found\ for\ export.=No linked files found for export.
-Database=Database
-Database\ type=Database type
 
 Full\ text\ document\ download\ failed\ for\ entry\ %0=Full text document download failed for entry %0
 No\ full\ text\ document\ found\ for\ entry\ %0.=No full text document found for entry %0.
@@ -2239,4 +2234,15 @@ Do\ you\ want\ to\ import\ these\ as\ new\ entries\ into\ the\ current\ library\
 
 Font\ size\:=Font size\:
 Override\ default\ font\ settings=Override default font settings
-Clear\ search=Clear search
\ No newline at end of file
+Clear\ search=Clear search
+
+Click\ help\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=Click help to learn about the migration of pre-3.6 databases.
+Database\ Type\:=Database Type\:
+Database\:=Database\:
+Host/Port\:=Host/Port\:
+User\:=User\:
+Keystore\ password\:=Keystore password\:
+Keystore\:=Keystore\:
+Password\:=Password\:
+Remember\ Password=Remember Password
+Use\ SSL=Use SSL
\ No newline at end of file
diff --git a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
index 7137551af48..64a1eeb381e 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
@@ -26,6 +26,6 @@ public void testGetConnection(DBMSType dbmsType) throws SQLException, InvalidDBM
     @Test
     public void testGetConnectionFail(DBMSType dbmsType) throws SQLException, InvalidDBMSConnectionPropertiesException {
         assertThrows(SQLException.class,
-                () -> new DBMSConnection(new DBMSConnectionProperties(dbmsType, "XXXX", 0, "XXXX", "XXXX", "XXXX")).getConnection());
+                     () -> new DBMSConnection(new DBMSConnectionProperties(dbmsType, "XXXX", 0, "XXXX", "XXXX", "XXXX", false)).getConnection());
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/TestConnector.java b/src/test/java/org/jabref/logic/shared/TestConnector.java
index a265d0ac4b4..2d42b85e410 100644
--- a/src/test/java/org/jabref/logic/shared/TestConnector.java
+++ b/src/test/java/org/jabref/logic/shared/TestConnector.java
@@ -17,15 +17,15 @@ public static DBMSConnection getTestDBMSConnection(DBMSType dbmsType) throws SQL
     public static DBMSConnectionProperties getTestConnectionProperties(DBMSType dbmsType) {
 
         if (dbmsType == DBMSType.MYSQL) {
-            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "root", "");
+            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "root", "", false);
         }
 
         if (dbmsType == DBMSType.POSTGRESQL) {
-            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "postgres", "");
+            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "postgres", "", false);
         }
 
         if (dbmsType == DBMSType.ORACLE) {
-            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "xe", "travis", "travis");
+            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "xe", "travis", "travis", false);
         }
 
         return new DBMSConnectionProperties();

From 2d5908a7ae171e00deb6e930cc6270d9f5a8c3b0 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sun, 2 Sep 2018 17:20:31 +0200
Subject: [PATCH 077/229] Fix drag and drop in entry editor (#4311)

Fixes #4305
---
 src/main/java/org/jabref/gui/BasePanel.java   |  2 +-
 .../jabref/gui/entryeditor/EntryEditor.java   | 57 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 229ee4ad24b..373a49c9bee 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -222,7 +222,7 @@ public BasePanel(JabRefFrame frame, BasePanelPreferences preferences, BibDatabas
 
         this.getDatabase().registerListener(new UpdateTimestampListener(Globals.prefs));
 
-        this.entryEditor = new EntryEditor(this, preferences.getEntryEditorPreferences(), Globals.getFileUpdateMonitor(), dialogService);
+        this.entryEditor = new EntryEditor(this, preferences.getEntryEditorPreferences(), Globals.getFileUpdateMonitor(), dialogService, externalFileTypes);
 
         this.preview = new PreviewPanel(this, getBibDatabaseContext(), preferences.getKeyBindings(), preferences.getPreviewPreferences(), dialogService, externalFileTypes);
         frame().getGlobalSearchBar().getSearchQueryHighlightObservable().addSearchListener(preview);
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 8f9c348fb85..b71d2b3e727 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.entryeditor;
 
+import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -16,9 +18,12 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
+import javafx.scene.input.DataFormat;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.input.TransferMode;
 import javafx.scene.layout.BorderPane;
 
+import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.GUIGlobals;
@@ -26,6 +31,8 @@
 import org.jabref.gui.actions.GenerateBibtexKeySingleAction;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.entryeditor.fileannotationtab.FileAnnotationTab;
+import org.jabref.gui.externalfiles.NewDroppedFileHandler;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.menus.ChangeEntryTypeMenu;
@@ -41,10 +48,13 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.JabRefPreferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.Subscription;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * GUI component that allows editing of the fields of a BibEntry (i.e. the
@@ -58,6 +68,8 @@
  */
 public class EntryEditor extends BorderPane {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(EntryEditor.class);
+
     private final BibDatabaseContext databaseContext;
     private final CountingUndoManager undoManager;
     private final BasePanel panel;
@@ -79,8 +91,9 @@ public class EntryEditor extends BorderPane {
 
     private final EntryEditorPreferences preferences;
     private final DialogService dialogService;
+    private final NewDroppedFileHandler fileHandler;
 
-    public EntryEditor(BasePanel panel, EntryEditorPreferences preferences, FileUpdateMonitor fileMonitor, DialogService dialogService) {
+    public EntryEditor(BasePanel panel, EntryEditorPreferences preferences, FileUpdateMonitor fileMonitor, DialogService dialogService, ExternalFileTypes externalFileTypes) {
         this.panel = panel;
         this.databaseContext = panel.getBibDatabaseContext();
         this.undoManager = panel.getUndoManager();
@@ -88,6 +101,14 @@ public EntryEditor(BasePanel panel, EntryEditorPreferences preferences, FileUpda
         this.fileMonitor = fileMonitor;
         this.dialogService = dialogService;
 
+        fileHandler = new NewDroppedFileHandler(dialogService, databaseContext, externalFileTypes,
+                                                Globals.prefs.getFileDirectoryPreferences(),
+                                                Globals.prefs.getCleanupPreferences(Globals.journalAbbreviationLoader).getFileDirPattern(),
+                                                Globals.prefs.getImportFormatPreferences(),
+                                                Globals.prefs.getUpdateFieldPreferences(),
+                                                Globals.getFileUpdateMonitor(),
+                                                Globals.prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
+
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -109,6 +130,40 @@ public EntryEditor(BasePanel panel, EntryEditorPreferences preferences, FileUpda
         setupKeyBindings();
 
         tabs = createTabs();
+
+        this.setOnDragOver(event -> {
+            if (event.getDragboard().hasFiles()) {
+                event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
+            }
+            event.consume();
+        });
+
+        this.setOnDragDropped(event -> {
+            BibEntry entry = this.getEntry();
+            boolean success = false;
+            if (event.getDragboard().hasContent(DataFormat.FILES)) {
+                List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
+
+                if (event.getTransferMode() == TransferMode.MOVE) {
+
+                    LOGGER.debug("Mode MOVE"); //shift on win or no modifier
+                    fileHandler.addToEntryRenameAndMoveToFileDir(entry, files);
+                }
+                if (event.getTransferMode() == TransferMode.LINK) {
+                    LOGGER.debug("Node LINK"); //alt on win
+                    fileHandler.addToEntry(entry, files);
+
+                }
+                if (event.getTransferMode() == TransferMode.COPY) {
+                    LOGGER.debug("Mode Copy"); //ctrl on win, no modifier on Xubuntu
+                    fileHandler.copyFilesToFileDirAndAddToEntry(entry, files);
+                }
+            }
+
+            event.setDropCompleted(success);
+            event.consume();
+
+        });
     }
 
     /**

From b39ed7b94108308fb078adcd07e28e52d4a3df48 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 3 Sep 2018 00:04:27 +0200
Subject: [PATCH 078/229] Minimal code improvements

---
 src/main/java/org/jabref/gui/maintable/MainTable.java     | 2 +-
 .../java/org/jabref/gui/maintable/MainTableDataModel.java | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 04f4aa435b1..4678e6dfb30 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -104,7 +104,7 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
         this.setItems(model.getEntriesFilteredAndSorted());
 
         // Enable sorting
-        model.bindComparator(this.comparatorProperty());
+        model.getEntriesFilteredAndSorted().comparatorProperty().bind(this.comparatorProperty());
 
         this.panel = panel;
 
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
index f55f981266c..57d0f4439f1 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
@@ -1,11 +1,9 @@
 package org.jabref.gui.maintable;
 
-import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 
 import javafx.beans.binding.Bindings;
-import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.collections.transformation.SortedList;
@@ -68,11 +66,7 @@ private Optional<MatcherSet> createGroupMatcher(List<GroupTreeNode> selectedGrou
         return Optional.of(searchRules);
     }
 
-    public ObservableList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
+    public SortedList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
         return entriesSorted;
     }
-
-    public void bindComparator(ReadOnlyObjectProperty<Comparator<BibEntryTableViewModel>> comparator) {
-        entriesSorted.comparatorProperty().bind(comparator);
-    }
 }

From d1da461b0ce22e8bc97ef97c87d88b1407588e27 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 4 Sep 2018 23:48:43 +0200
Subject: [PATCH 079/229] Fix that sometimes a white background appeared in the
 groups panel (#4316)

---
 src/main/java/org/jabref/gui/groups/GroupTree.css  | 5 +++++
 src/main/java/org/jabref/gui/groups/GroupTree.fxml | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupTree.css b/src/main/java/org/jabref/gui/groups/GroupTree.css
index 6a41fd91a0b..0b8b66b1928 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTree.css
+++ b/src/main/java/org/jabref/gui/groups/GroupTree.css
@@ -1,3 +1,8 @@
+#groupTree:focused,
+#groupTree:filled:selected {
+    -fx-background-color: -jr-sidepane-background;
+}
+
 .tree-table-view, .tree-table-row-cell {
     -fx-background-color: -jr-sidepane-background;
     -fx-table-cell-border-color: transparent; /* hide grid lines */
diff --git a/src/main/java/org/jabref/gui/groups/GroupTree.fxml b/src/main/java/org/jabref/gui/groups/GroupTree.fxml
index 583d5c1cea1..ea9b692ef1b 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTree.fxml
+++ b/src/main/java/org/jabref/gui/groups/GroupTree.fxml
@@ -10,10 +10,10 @@
 <?import javafx.scene.layout.Region?>
 <?import org.jabref.gui.icon.JabRefIconView?>
 <?import org.controlsfx.control.textfield.CustomTextField?>
-<BorderPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="600.0" prefWidth="150.0" styleClass="groupsPane"
+<BorderPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="600.0" prefWidth="150.0"
             xmlns="http://javafx.com/javafx/8.0.112" fx:controller="org.jabref.gui.groups.GroupTreeView">
     <center>
-        <TreeTableView fx:id="groupTree" layoutY="-7.0" prefHeight="600.0" prefWidth="250.0" styleClass="groupsPane">
+        <TreeTableView fx:id="groupTree" layoutY="-7.0" prefHeight="600.0" prefWidth="250.0">
             <columns>
                 <TreeTableColumn fx:id="mainColumn"/>
                 <TreeTableColumn fx:id="numberColumn" minWidth="50.0" maxWidth="70.0" prefWidth="60.0"

From d6b5dcf3d2fa45eb5d114e9132b015cc5ca8b1a7 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Thu, 6 Sep 2018 12:36:30 +0200
Subject: [PATCH 080/229] Readd status line in form of a snack bar (#4314)

---
 build.gradle                                  |   1 +
 src/main/java/org/jabref/gui/Base.css         |  11 +
 src/main/java/org/jabref/gui/BasePanel.java   |   6 -
 .../java/org/jabref/gui/DialogService.java    |   2 +-
 src/main/java/org/jabref/gui/JabRefFrame.java | 375 +++++++++---------
 .../org/jabref/gui/worker/VersionWorker.java  |   2 -
 6 files changed, 196 insertions(+), 201 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0e5f247711d..2002b8feb88 100644
--- a/build.gradle
+++ b/build.gradle
@@ -136,6 +136,7 @@ dependencies {
     compile 'org.fxmisc.richtext:richtextfx:0.9.1'
     compile 'com.sibvisions.external.jvxfx:dndtabpane:0.1'
     compile 'javax.inject:javax.inject:1'
+    compile 'com.jfoenix:jfoenix:8.0.7'
 
     // Cannot be updated to 9.*.* until Jabref works with Java 9
     compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT'
diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 8eb1c449a3e..6ec8d5c9482 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -907,3 +907,14 @@ We want to have a look that matches our icons in the tool-bar */
 .sidePaneComponent {
     -fx-background-color: -jr-sidepane-background;
 }
+
+.jfx-snackbar-content {
+    -fx-background-color: -jr-gray-3;
+    -fx-background-radius: 4px;
+    -fx-padding: 0ex 0ex 0ex 0ex;
+}
+
+.jfx-snackbar-toast {
+    -fx-text-fill: -fx-light-text-color;
+    -fx-padding: -1ex -0.5ex -1ex -0.5ex;
+}
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 373a49c9bee..c83ec818dff 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -1173,12 +1173,6 @@ private void markBasedChangedInternal() {
         // Put an asterisk behind the filename to indicate the database has changed.
         frame.setWindowTitle();
         DefaultTaskExecutor.runInJavaFXThread(frame::updateAllTabTitles);
-        // If the status line states that the base has been saved, we
-        // remove this message, since it is no longer relevant. If a
-        // different message is shown, we leave it.
-        if (frame.getStatusLineText().startsWith(Localization.lang("Saved library"))) {
-            frame.output(" ");
-        }
     }
 
     public void markNonUndoableBaseChanged() {
diff --git a/src/main/java/org/jabref/gui/DialogService.java b/src/main/java/org/jabref/gui/DialogService.java
index a19f831470c..304efe82289 100644
--- a/src/main/java/org/jabref/gui/DialogService.java
+++ b/src/main/java/org/jabref/gui/DialogService.java
@@ -188,7 +188,7 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
     <V> void showCanceableProgressDialogAndWait(Task<V> task);
 
     /**
-     * Notify the user in an non-blocking way (i.e., update status message instead of showing a dialog).
+     * Notify the user in an non-blocking way (i.e., in form of toast in a snackbar).
      *
      * @param message the message to show.
      */
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 179bcb9f0f5..b894a5e3f05 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -32,7 +32,6 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
-import javafx.scene.control.Label;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuBar;
 import javafx.scene.control.ProgressBar;
@@ -132,6 +131,7 @@
 import org.jabref.preferences.SearchPreferences;
 
 import com.google.common.eventbus.Subscribe;
+import com.jfoenix.controls.JFXSnackbar;
 import org.eclipse.fx.ui.controls.tabpane.DndTabPane;
 import org.eclipse.fx.ui.controls.tabpane.DndTabPaneFactory;
 import org.fxmisc.easybind.EasyBind;
@@ -152,8 +152,8 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
     private final SplitPane splitPane = new SplitPane();
     private final JabRefPreferences prefs = Globals.prefs;
     private final GlobalSearchBar globalSearchBar = new GlobalSearchBar(this);
-    private final Label statusLine = new Label("");
-    private final Label statusLabel = new Label(Localization.lang("Status") + ':');
+    private final JFXSnackbar statusLine = new JFXSnackbar(this);
+    ;
     private final ProgressBar progressBar = new ProgressBar();
     private final FileHistoryMenu fileHistory = new FileHistoryMenu(prefs, this);
 
@@ -363,10 +363,10 @@ public void run() {
     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"));
+                    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);
         }
 
@@ -437,7 +437,8 @@ public JabRefPreferences prefs() {
      * <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) {
         //prefs.putBoolean(JabRefPreferences.WINDOW_MAXIMISED, getExtendedState() == Frame.MAXIMIZED_BOTH);
@@ -453,7 +454,6 @@ private void tearDownJabRef(List<String> filenames) {
                 File focusedDatabase = getCurrentBasePanel().getBibDatabaseContext().getDatabaseFile().orElse(null);
                 new LastFocusedTabPreferences(prefs).setLastFocusedTab(focusedDatabase);
             }
-
         }
 
         fileHistory.storeHistory();
@@ -469,9 +469,9 @@ private void tearDownJabRef(List<String> filenames) {
     }
 
     /**
-     * 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>
@@ -590,7 +590,7 @@ 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()));
+                    position -> prefs.putDouble(JabRefPreferences.SIDE_PANE_WIDTH, position.doubleValue()));
         }
     }
 
@@ -610,10 +610,10 @@ private Node createToolbar() {
         }
 
         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
+                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());
@@ -621,32 +621,32 @@ private Node createToolbar() {
 
         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.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.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.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"))
+                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,
+                leftSide,
 
-                                      globalSearchBar,
+                globalSearchBar,
 
-                                      rightSpacer,
-                                      rightSide);
+                rightSpacer,
+                rightSide);
         toolBar.getStyleClass().add("mainToolbar");
 
         return toolBar;
@@ -663,7 +663,6 @@ public BasePanel getBasePanelAt(int i) {
 
     /**
      * Returns a list of BasePanel.
-     *
      */
     public List<BasePanel> getBasePanelList() {
         List<BasePanel> returnList = new ArrayList<>();
@@ -735,62 +734,62 @@ private MenuBar createMenu() {
         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.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))),
+                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(),
+                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)),
+                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(),
+                new SeparatorMenuItem(),
 
-                               fileHistory,
+                fileHistory,
 
-                               new SeparatorMenuItem(),
+                new SeparatorMenuItem(),
 
-                               factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new CloseDatabaseAction()),
-                               factory.createMenuItem(StandardActions.QUIT, new CloseAction())
+                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)),
+                factory.createMenuItem(StandardActions.UNDO, new OldDatabaseCommandWrapper(Actions.UNDO, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.REDO, new OldDatabaseCommandWrapper(Actions.REDO, this, Globals.stateManager)),
 
-                               new SeparatorMenuItem(),
+                new SeparatorMenuItem(),
 
-                               factory.createMenuItem(StandardActions.CUT, new EditAction(Actions.CUT)),
+                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.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)),
+                factory.createMenuItem(StandardActions.PASTE, new EditAction(Actions.PASTE)),
 
-                               new SeparatorMenuItem(),
+                new SeparatorMenuItem(),
 
-                               factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new OldDatabaseCommandWrapper(Actions.SEND_AS_EMAIL, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new OldDatabaseCommandWrapper(Actions.SEND_AS_EMAIL, this, Globals.stateManager)),
 
-                               new SeparatorMenuItem()
+                new SeparatorMenuItem()
 
         );
 
@@ -832,27 +831,26 @@ private MenuBar createMenu() {
         }
 
         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.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())),
+                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(),
+                new SeparatorMenuItem(),
 
-                                  factory.createMenuItem(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, Globals.stateManager)),
+                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)),
-                                  factory.createMenuItem(StandardActions.EDIT_STRINGS, new OldDatabaseCommandWrapper(Actions.EDIT_STRINGS, this, Globals.stateManager))
+                new SeparatorMenuItem(),
 
+                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new DatabasePropertiesAction(this)),
+                factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(this)),
+                factory.createMenuItem(StandardActions.EDIT_STRINGS, new OldDatabaseCommandWrapper(Actions.EDIT_STRINGS, this, Globals.stateManager))
         );
 
         Menu lookupIdentifiers = factory.createSubMenu(StandardActions.LOOKUP_DOC_IDENTIFIER);
@@ -862,23 +860,22 @@ private MenuBar createMenu() {
         }
 
         quality.getItems().addAll(
-                                  factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this)),
-                                  factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this)),
+                factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this)),
+                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this)),
 
-                                  new SeparatorMenuItem(),
+                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))
+                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);
@@ -886,113 +883,109 @@ private MenuBar createMenu() {
         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()),
+                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(),
+                new SeparatorMenuItem(),
 
-                               factory.createMenuItem(StandardActions.SELECT_ALL, new OldDatabaseCommandWrapper(Actions.SELECT_ALL, this, Globals.stateManager)),
+                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))
+                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(StandardActions.NEW_SUB_LIBRARY_FROM_AUX, new NewSubLibraryAction(this)),
+                factory.createMenuItem(StandardActions.WRITE_XMP, new OldDatabaseCommandWrapper(Actions.WRITE_XMP, this, Globals.stateManager)),
 
-                                factory.createMenuItem(openOffice.getToggleAction(), openOffice.getToggleCommand()),
-                                factory.createMenuItem(pushToExternal.getMenuAction(), pushToExternal),
+                new SeparatorMenuItem(),
 
-                                new SeparatorMenuItem(),
+                factory.createMenuItem(openOffice.getToggleAction(), openOffice.getToggleCommand()),
+                factory.createMenuItem(pushToExternal.getMenuAction(), pushToExternal),
 
-                                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(),
 
-                                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)),
 
-                                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))
+                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)),
+                factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this)),
 
-                                  new SeparatorMenuItem(),
+                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)),
+                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))
+                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(),
 
-                               new SeparatorMenuItem(),
+                factory.createMenuItem(StandardActions.ERROR_CONSOLE, new ErrorConsoleAction()),
 
-                               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(),
 
-                                                     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")),
 
-                                                     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(),
 
-                                                     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")),
 
-                                                     factory.createMenuItem(StandardActions.DONATE, new OpenBrowserAction("https://donations.jabref.org"))
+                        new SeparatorMenuItem(),
 
-                               ),
-                               factory.createMenuItem(StandardActions.ABOUT, new AboutAction())
+                        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);
+                file,
+                edit,
+                library,
+                quality,
+                tools,
+                view,
+                options,
+                help);
         menu.setUseSystemMenuBar(true);
         return menu;
     }
@@ -1023,10 +1016,13 @@ public void addParserResult(ParserResult pr, boolean focusPanel) {
     }
 
     /**
-     * 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
      */
+    @Deprecated
     public void output(final String s) {
-        statusLine.setText(s);
+        statusLine.show(s, 3000);
     }
 
     private void initActions() {
@@ -1108,9 +1104,8 @@ public void updateEnabledState(ListChangeListener.Change<? extends Tab> change)
     }
 
     /**
-     * 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
@@ -1224,21 +1219,21 @@ public BasePanel addTab(BibDatabaseContext databaseContext, boolean raisePanel)
     private boolean readyForAutosave(BibDatabaseContext context) {
         return ((context.getLocation() == DatabaseLocation.SHARED) ||
                 ((context.getLocation() == DatabaseLocation.LOCAL) && Globals.prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)))
-               &&
-               context.getDatabaseFile().isPresent();
+                &&
+                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(() -> {
             ImportInspectionDialog diag = new ImportInspectionDialog(JabRefFrame.this, panel,
-                                                                     Localization.lang("Import"), false);
+                    Localization.lang("Import"), false);
             diag.addEntries(entries);
             diag.entryListComplete();
             diag.setVisible(true);
@@ -1251,8 +1246,7 @@ public FileHistoryMenu getFileHistory() {
     }
 
     /**
-     * Set the visibility of the progress bar in the right end of the
-     * status line at the bottom of the frame.
+     * 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);
@@ -1261,8 +1255,8 @@ public void setProgressBarVisible(final boolean 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
@@ -1277,9 +1271,10 @@ public void setProgressBarIndeterminate(final boolean 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) {
@@ -1291,9 +1286,10 @@ private boolean isExistFile(List<BibEntry> selectEntryList) {
 
     /**
      * 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) {
@@ -1335,9 +1331,9 @@ private boolean confirmClose(BasePanel panel) {
         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);
+                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.
@@ -1401,10 +1397,6 @@ public OpenDatabaseAction getOpenDatabaseAction() {
         return new OpenDatabaseAction(this);
     }
 
-    public String getStatusLineText() {
-        return statusLine.getText();
-    }
-
     public SidePaneManager getSidePaneManager() {
         return sidePaneManager;
     }
@@ -1437,9 +1429,8 @@ public void execute() {
     }
 
     /**
-     * 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 {
 
diff --git a/src/main/java/org/jabref/gui/worker/VersionWorker.java b/src/main/java/org/jabref/gui/worker/VersionWorker.java
index a761066d18c..0926a0d6e50 100644
--- a/src/main/java/org/jabref/gui/worker/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/worker/VersionWorker.java
@@ -108,8 +108,6 @@ private void showUpdateInfo(List<Version> availableVersions) {
             if (manualExecution) {
                 DefaultTaskExecutor.runInJavaFXThread(() -> mainFrame.getDialogService().showInformationDialogAndWait(upToDate, upToDate));
             }
-            this.mainFrame.output(upToDate);
-
         } else {
             // notify the user about a newer version
             new NewVersionDialog(installedVersion, newerVersion.get());

From 6c5bc563ff51b7cdaaec323423a6be0dd98ebcf0 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Thu, 6 Sep 2018 16:52:49 +0200
Subject: [PATCH 081/229] update junit to release (#4320)

add rejection rule for jfoenix 9.x
---
 build.gradle | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2002b8feb88..c9c2f90604d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -163,11 +163,11 @@ dependencies {
     compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.1.2'
     compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.1.2'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.0-RC1'
-    testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.0-RC1'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.0-RC1'
-    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.0-RC1'
-    testCompile 'org.junit.platform:junit-platform-launcher:1.3.0-RC1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.0'
+    testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.0'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.0'
+    testCompile 'org.junit.platform:junit-platform-launcher:1.3.0'
     testCompile 'org.junit-pioneer:junit-pioneer:0.1.2'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'
@@ -218,6 +218,11 @@ dependencyUpdates.resolutionStrategy = {
                 selection.reject("Cannot be upgraded to version 2")
             }
         }
+         rules.withModule("com.jfoenix:jfoenix") { ComponentSelection selection ->
+            if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher
+                selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9")
+            }
+        }
     }
 }
 

From 7a443418afc89cb9b65eed136da7964c07bd5b6e Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sat, 8 Sep 2018 11:56:53 +0200
Subject: [PATCH 082/229] Wrap preferences in scrollPane as well (#4325)

don't override pref size

Fixes #4322
---
 .../java/org/jabref/gui/preferences/GeneralTab.java   | 11 ++++-------
 .../org/jabref/gui/preferences/PreferencesDialog.java |  6 ++----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
index 8b77ad06651..2cb74aca865 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
@@ -54,7 +54,6 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         this.prefs = prefs;
         this.dialogService = dialogService;
         biblatexMode = new ComboBox<>(FXCollections.observableArrayList(BibDatabaseMode.values()));
-
         memoryStick = new CheckBox(Localization.lang("Load and Save preferences from/to jabref.xml on start-up (memory stick mode)"));
         useOwner = new CheckBox(Localization.lang("Mark new entries with owner name") + ':');
         updateTimeStamp = new CheckBox(Localization.lang("Update timestamp on modification"));
@@ -69,11 +68,8 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         enforceLegalKeys = new CheckBox(Localization.lang("Enforce legal characters in BibTeX keys"));
         confirmDelete = new CheckBox(Localization.lang("Show confirmation dialog when deleting entries"));
         defOwnerField = new TextField();
-        defOwnerField.setPrefSize(80, 20);
         timeStampFormat = new TextField();
-        timeStampFormat.setPrefSize(80, 20);
         timeStampField = new TextField();
-        timeStampField.setPrefSize(80, 20);
         inspectionWarnDupli = new CheckBox(Localization.lang("Warn about unresolved duplicates when closing inspection window"));
         shouldCollectTelemetry = new CheckBox(Localization.lang("Collect and share telemetry data to help improve JabRef."));
         encodings = new ComboBox<>(FXCollections.observableArrayList(Encodings.ENCODINGS));
@@ -102,10 +98,10 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
 
         builder.add(useTimeStamp, 1, 13);
         builder.add(timeStampFormat, 2, 13);
-        builder.add(overwriteTimeStamp, 3, 13);
+        builder.add(overwriteTimeStamp, 2, 14);
         Label fieldName = new Label(Localization.lang("Field name") + ':');
-        builder.add(fieldName, 4, 13);
-        builder.add(timeStampField, 5, 13);
+        builder.add(fieldName, 3, 13);
+        builder.add(timeStampField, 4, 13);
 
         Button help1 = new Button("?");
         help1.setOnAction(event -> new HelpAction(HelpFile.TIMESTAMP).getHelpButton().doClick());
@@ -132,6 +128,7 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(biblatexMode, 2, 20);
     }
 
+    @Override
     public Node getBuilder() {
         return builder;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index cfaff81308a..db3e8e22a23 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -14,7 +14,6 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Priority;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 
 import org.jabref.Globals;
@@ -60,8 +59,6 @@ public class PreferencesDialog extends BaseDialog<Void> {
 
     public PreferencesDialog(JabRefFrame parent) {
         setTitle(Localization.lang("JabRef preferences"));
-        getDialogPane().setPrefSize(1250, 800);
-        getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
         getDialogPane().getScene().getStylesheets().add(this.getClass().getResource("PreferencesDialog.css").toExternalForm());
 
         ButtonType save = new ButtonType(Localization.lang("Save"), ButtonData.OK_DONE);
@@ -94,7 +91,8 @@ public PreferencesDialog(JabRefFrame parent) {
         preferenceTabs.add(new AppearancePrefsTab(dialogService, prefs));
 
         container = new BorderPane();
-        getDialogPane().setContent(container);
+        ScrollPane scroll = new ScrollPane(container);
+        getDialogPane().setContent(scroll);
         construct();
     }
 

From 3d1bc8a7ed5568c65cfb7a2a8ea6139ed9230838 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sat, 8 Sep 2018 21:25:51 +0200
Subject: [PATCH 083/229] Fix height of some field editors (#4326)

---
 .../gui/entryeditor/FieldsEditorTab.java      | 20 +++++++++----------
 .../gui/fieldeditors/EditorTextArea.java      |  5 ++---
 .../gui/fieldeditors/EditorTextField.java     |  4 ++--
 .../gui/fieldeditors/PersonsEditor.java       |  6 ++----
 .../jabref/gui/fieldeditors/SimpleEditor.java | 12 ++++++++---
 .../java/org/jabref/gui/icon/IconTheme.java   |  2 +-
 6 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index c653ed1b23f..cdaebfda242 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -120,14 +120,12 @@ private Region setupPanel(BibEntry entry, boolean compressed, SuggestionProvider
 
             setCompressedRowLayout(gridPane, rows);
         } else {
-            rows = fields.size();
-
             addColumn(gridPane, 0, labels);
             addColumn(gridPane, 1, editors.values().stream().map(FieldEditorFX::getNode));
 
             gridPane.getColumnConstraints().addAll(columnDoNotContract, columnExpand);
 
-            setRegularRowLayout(gridPane, rows);
+            setRegularRowLayout(gridPane);
         }
 
         // Warp everything in a scroll-pane
@@ -140,17 +138,17 @@ private Region setupPanel(BibEntry entry, boolean compressed, SuggestionProvider
         return scrollPane;
     }
 
-    private void setRegularRowLayout(GridPane gridPane, int rows) {
-        List<RowConstraints> constraints = new ArrayList<>(rows);
+    private void setRegularRowLayout(GridPane gridPane) {
+        double totalWeight = fields.stream()
+                                   .mapToDouble(field -> editors.get(field).getWeight())
+                                   .sum();
+
+        List<RowConstraints> constraints = new ArrayList<>();
         for (String field : fields) {
             RowConstraints rowExpand = new RowConstraints();
             rowExpand.setVgrow(Priority.ALWAYS);
             rowExpand.setValignment(VPos.TOP);
-            if (rows == 0) {
-                rowExpand.setPercentHeight(100);
-            } else {
-                rowExpand.setPercentHeight(100 / rows * editors.get(field).getWeight());
-            }
+            rowExpand.setPercentHeight(100 * editors.get(field).getWeight() / totalWeight);
             constraints.add(rowExpand);
         }
         gridPane.getRowConstraints().addAll(constraints);
@@ -163,7 +161,7 @@ private void setCompressedRowLayout(GridPane gridPane, int rows) {
         if (rows == 0) {
             rowExpand.setPercentHeight(100);
         } else {
-            rowExpand.setPercentHeight(100 / rows);
+            rowExpand.setPercentHeight(100 / (double) rows);
         }
         for (int i = 0; i < rows; i++) {
             gridPane.getRowConstraints().add(rowExpand);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
index a718e408252..7de28a720ee 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
@@ -9,12 +9,13 @@
 import javafx.fxml.Initializable;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
+import javafx.scene.control.TextArea;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 
 import com.sun.javafx.scene.control.skin.TextAreaSkin;
 
-public class EditorTextArea extends javafx.scene.control.TextArea implements Initializable, ContextMenuAddable {
+public class EditorTextArea extends TextArea implements Initializable, ContextMenuAddable {
 
     /**
      *  Variable that contains user-defined behavior for paste action.
@@ -30,8 +31,6 @@ public EditorTextArea() {
     public EditorTextArea(final String text) {
         super(text);
 
-        setMinHeight(1);
-        setMinWidth(200);
 
         // Hide horizontal scrollbar and always wrap text
         setWrapText(true);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
index 26c23006a88..76d693dc59f 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
@@ -22,8 +22,8 @@ public EditorTextField() {
     public EditorTextField(final String text) {
         super(text);
 
-        setMinHeight(1);
-        setMinWidth(200);
+        // Always fill out all the available vertical space
+        this.setPrefHeight(Double.POSITIVE_INFINITY);
 
         // Should behave as a normal text field with respect to TAB behaviour
         addEventFilter(KeyEvent.KEY_PRESSED, event -> {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
index f72a5cf23fe..44f3cebc292 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.HBox;
@@ -15,9 +14,8 @@
 
 public class PersonsEditor extends HBox implements FieldEditorFX {
 
-    @FXML private final PersonsEditorViewModel viewModel;
-
-    private TextInputControl textInput;
+    private final PersonsEditorViewModel viewModel;
+    private final TextInputControl textInput;
 
     public PersonsEditor(final String fieldName,
                          final AutoCompleteSuggestionProvider<?> suggestionProvider,
diff --git a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
index de42b9e0d73..dbcb3504d74 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.HBox;
@@ -16,7 +15,8 @@
 
 public class SimpleEditor extends HBox implements FieldEditorFX {
 
-    @FXML private final SimpleEditorViewModel viewModel;
+    private final SimpleEditorViewModel viewModel;
+    private final TextInputControl textInput;
 
     public SimpleEditor(final String fieldName,
                         final AutoCompleteSuggestionProvider<?> suggestionProvider,
@@ -25,10 +25,11 @@ public SimpleEditor(final String fieldName,
                         final boolean isSingleLine) {
         this.viewModel = new SimpleEditorViewModel(fieldName, suggestionProvider, fieldCheckers);
 
-        TextInputControl textInput = isSingleLine
+        textInput = isSingleLine
                 ? new EditorTextField()
                 : new EditorTextArea();
         HBox.setHgrow(textInput, Priority.ALWAYS);
+
         textInput.textProperty().bindBidirectional(viewModel.textProperty());
         ((ContextMenuAddable) textInput).addToContextMenu(EditorMenus.getDefaultMenu(textInput));
         this.getChildren().add(textInput);
@@ -59,4 +60,9 @@ public void bindToEntry(BibEntry entry) {
     public Parent getNode() {
         return this;
     }
+
+    @Override
+    public void requestFocus() {
+        textInput.requestFocus();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 1191180aae7..5c0510f862a 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -308,7 +308,7 @@ public enum JabRefIcons implements JabRefIcon {
         LOOKUP_IDENTIFIER(MaterialDesignIcon.MAGNIFY), // TODO: use WEB_SEARCH instead as soon as it is available
         FETCH_FULLTEXT(MaterialDesignIcon.MAGNIFY), // TODO: use WEB_SEARCH instead as soon as it is available
         FETCH_BY_IDENTIFIER(MaterialDesignIcon.CLIPBOARD_ARROW_DOWN),
-        TOGGLE_ABBREVIATION(MaterialDesignIcon.TEXT_SHADOW),
+        TOGGLE_ABBREVIATION(MaterialDesignIcon.FORMAT_ALIGN_CENTER),
         NEW_FILE(MaterialDesignIcon.PLUS),
         DOWNLOAD(MaterialDesignIcon.DOWNLOAD),
         OWNER(MaterialDesignIcon.ACCOUNT),

From 4c7194a39bb0487de0afa3ec3717d048ebdd6472 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sun, 9 Sep 2018 14:50:39 +0200
Subject: [PATCH 084/229] Convert New entry dialog to javafx (#4312)

* convert the NewEntryType Dialog to javafx

* delete useless class file

* fix order and empty else statement

* fix pdfImport old dialog problem

* rework fxml code
add title pane
add bindings
Create view model todo

Co-authored-by: 1160300608 <18846010223@163.com>

* use managed properties, pass dialog service as argument

* fix checkstyle

* add new prefereces method for getting and setting last used id based fetchr
bind combobox directly to fetcher
improve binding
pass preferences to constructor
delete obsolete gui test class and old dialog

* improve layout, move id grid pane to bottom, remove third col

* refactor and extract data to ViewModel
TODO: merge insertentry and newEntry in basePanel

* fix checkstyle

* fix result converter

* remove newEntry method, replcae with insertEntry
fix event handler

* refactor task and add value property to select last used fetcher

* fix l10nn

* fix l10n

* refactor code some more

* fix checkstyle
---
 .../org/jabref/gui/AbstractViewModel.java     |   2 +-
 src/main/java/org/jabref/gui/BasePanel.java   |  62 +--
 src/main/java/org/jabref/gui/EntryType.fxml   |  76 ++++
 .../java/org/jabref/gui/EntryTypeDialog.java  | 366 ------------------
 .../java/org/jabref/gui/EntryTypeView.java    | 161 ++++++++
 .../org/jabref/gui/EntryTypeViewModel.java    | 158 ++++++++
 src/main/java/org/jabref/gui/JabRefFrame.java |   8 +-
 .../jabref/gui/actions/NewEntryAction.java    |  41 +-
 .../actions/NewEntryFromPlainTextAction.java  |  17 +-
 .../jabref/logic/bibtex/DuplicateCheck.java   |  19 +-
 .../org/jabref/pdfimport/PdfImporter.java     |  87 ++---
 .../jabref/preferences/JabRefPreferences.java |  42 +-
 src/main/resources/l10n/JabRef_en.properties  |   7 +-
 src/test/java/org/jabref/gui/GUITest.java     |  99 -----
 src/test/java/org/jabref/gui/UndoTest.java    |  66 ----
 15 files changed, 501 insertions(+), 710 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/EntryType.fxml
 delete mode 100644 src/main/java/org/jabref/gui/EntryTypeDialog.java
 create mode 100644 src/main/java/org/jabref/gui/EntryTypeView.java
 create mode 100644 src/main/java/org/jabref/gui/EntryTypeViewModel.java
 delete mode 100644 src/test/java/org/jabref/gui/GUITest.java
 delete mode 100644 src/test/java/org/jabref/gui/UndoTest.java

diff --git a/src/main/java/org/jabref/gui/AbstractViewModel.java b/src/main/java/org/jabref/gui/AbstractViewModel.java
index f04b77cd7a8..ff9f1fca633 100644
--- a/src/main/java/org/jabref/gui/AbstractViewModel.java
+++ b/src/main/java/org/jabref/gui/AbstractViewModel.java
@@ -1,5 +1,5 @@
 package org.jabref.gui;
 
 public class AbstractViewModel {
-
+    //empty
 }
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index c83ec818dff..b6b506375e2 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -11,7 +11,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -110,7 +109,6 @@
 import org.jabref.model.database.shared.DatabaseLocation;
 import org.jabref.model.database.shared.DatabaseSynchronizer;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.EntryType;
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.model.entry.LinkedFile;
@@ -761,58 +759,6 @@ public void registerUndoableChanges(SaveSession session) {
         }
     }
 
-    /**
-     * This method is called from JabRefFrame when the user wants to create a new entry. If the argument is null, the
-     * user is prompted for an entry type.
-     *
-     * @param type The type of the entry to create.
-     * @return The newly created BibEntry or null the operation was canceled by the user.
-     */
-    public BibEntry newEntry(EntryType type) {
-        EntryType actualType = type;
-        if (actualType == null) {
-            // Find out what type is wanted.
-            final EntryTypeDialog etd = new EntryTypeDialog(frame);
-            // We want to center the dialog, to make it look nicer.
-            etd.setVisible(true);
-            actualType = etd.getChoice();
-        }
-        if (actualType != null) { // Only if the dialog was not canceled.
-            final BibEntry be = new BibEntry(actualType.getName());
-            try {
-                bibDatabaseContext.getDatabase().insertEntry(be);
-                // Set owner/timestamp if options are enabled:
-                List<BibEntry> list = new ArrayList<>();
-                list.add(be);
-                UpdateField.setAutomaticFields(list, true, true, Globals.prefs.getUpdateFieldPreferences());
-
-                // Create an UndoableInsertEntry object.
-                getUndoManager().addEdit(new UndoableInsertEntry(bibDatabaseContext.getDatabase(), be));
-                output(Localization.lang("Added new '%0' entry.", actualType.getName().toLowerCase(Locale.ROOT)));
-
-                // We are going to select the new entry. Before that, make sure that we are in
-                // show-entry mode. If we aren't already in that mode, enter the WILL_SHOW_EDITOR
-                // mode which makes sure the selection will trigger display of the entry editor
-                // and adjustment of the splitter.
-                if (mode != BasePanelMode.SHOWING_EDITOR) {
-                    mode = BasePanelMode.WILL_SHOW_EDITOR;
-                }
-
-                clearAndSelect(be);
-
-                // The database just changed.
-                markBaseChanged();
-
-                this.showAndEdit(be);
-
-                return be;
-            } catch (KeyCollisionException ex) {
-                LOGGER.info(ex.getMessage(), ex);
-            }
-        }
-        return null;
-    }
-
     /**
      * This method is called from JabRefFrame when the user wants to create a new entry.
      *
@@ -822,10 +768,10 @@ public void insertEntry(final BibEntry bibEntry) {
         if (bibEntry != null) {
             try {
                 bibDatabaseContext.getDatabase().insertEntry(bibEntry);
-                if (Globals.prefs.getBoolean(JabRefPreferences.USE_OWNER)) {
-                    // Set owner field to default value
-                    UpdateField.setAutomaticFields(bibEntry, true, true, Globals.prefs.getUpdateFieldPreferences());
-                }
+
+                // Set owner and timestamp
+                UpdateField.setAutomaticFields(bibEntry, true, true, Globals.prefs.getUpdateFieldPreferences());
+
                 // Create an UndoableInsertEntry object.
                 getUndoManager().addEdit(new UndoableInsertEntry(bibDatabaseContext.getDatabase(), bibEntry));
                 output(Localization.lang("Added new '%0' entry.", bibEntry.getType()));
diff --git a/src/main/java/org/jabref/gui/EntryType.fxml b/src/main/java/org/jabref/gui/EntryType.fxml
new file mode 100644
index 00000000000..e08551310df
--- /dev/null
+++ b/src/main/java/org/jabref/gui/EntryType.fxml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.TitledPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?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.EntryTypeView">
+   <content>
+      <BorderPane>
+         <top>
+            <VBox prefHeight="200.0" prefWidth="400.0" BorderPane.alignment="CENTER">
+               <children>
+                  <TitledPane fx:id="biblatexTitlePane" animated="false" collapsible="false" text="Biblatex">
+                     <content>
+                        <FlowPane fx:id="biblatexPane" prefHeight="200.0" prefWidth="200.0" />
+                     </content>
+                  </TitledPane>
+                  <TitledPane fx:id="bibTexTitlePane" animated="false" collapsible="false" text="BibTeX">
+                     <content>
+                        <FlowPane fx:id="bibTexPane" prefHeight="200.0" prefWidth="200.0" />
+                     </content>
+                  </TitledPane>
+                  <TitledPane fx:id="ieeeTranTitlePane" animated="false" collapsible="false" text="IEEETran">
+                     <content>
+                        <FlowPane fx:id="ieeetranPane" prefHeight="200.0" prefWidth="200.0" />
+                     </content>
+                  </TitledPane>
+                  <TitledPane fx:id="customTitlePane" animated="false" collapsible="false" text="%Custom">
+                     <content>
+                        <FlowPane fx:id="customPane" prefHeight="200.0" prefWidth="200.0" />
+                     </content>
+                  </TitledPane>
+               </children>
+            </VBox>
+         </top>
+         <bottom>
+            <GridPane alignment="CENTER" BorderPane.alignment="CENTER">
+               <children>
+                  <Label text="%ID type" />
+                  <ComboBox fx:id="idBasedFetchers" prefHeight="30.0" prefWidth="300.0" GridPane.columnIndex="1" onAction="#focusTextField" />                  	
+                  <Label text="%ID" GridPane.rowIndex="1" />
+                  <TextField fx:id="idTextField" prefHeight="30.0" prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="1" onAction="#runFetcherWorker"/>
+               </children>
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="122.0" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="146.0" minWidth="10.0" prefWidth="300.0" />
+               </columnConstraints>
+               <opaqueInsets>
+                  <Insets bottom="4.0" left="4.0" right="4.0" top="4.0" />
+               </opaqueInsets>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <padding>
+                  <Insets bottom="4.0" left="4.0" right="4.0" top="4.0" />
+               </padding>
+            </GridPane>
+         </bottom>
+      </BorderPane>
+   </content>
+      <buttonTypes>
+        <ButtonType fx:constant="CANCEL" />
+        <ButtonType fx:id="generateButton" buttonData="OK_DONE" text="%Generate" />
+      </buttonTypes>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/EntryTypeDialog.java b/src/main/java/org/jabref/gui/EntryTypeDialog.java
deleted file mode 100644
index 93cc5a73a3d..00000000000
--- a/src/main/java/org/jabref/gui/EntryTypeDialog.java
+++ /dev/null
@@ -1,366 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-
-import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-import javax.swing.SwingWorker;
-
-import org.jabref.Globals;
-import org.jabref.gui.importer.ImportInspectionDialog;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.logic.bibtex.DuplicateCheck;
-import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
-import org.jabref.logic.importer.FetcherException;
-import org.jabref.logic.importer.IdBasedFetcher;
-import org.jabref.logic.importer.WebFetchers;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.EntryTypes;
-import org.jabref.model.database.BibDatabaseMode;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.BiblatexEntryTypes;
-import org.jabref.model.entry.BibtexEntryTypes;
-import org.jabref.model.entry.EntryType;
-import org.jabref.model.entry.IEEETranEntryTypes;
-import org.jabref.preferences.JabRefPreferences;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Dialog that prompts the user to choose a type for an entry.
- * Returns null if canceled.
- */
-public class EntryTypeDialog extends JabRefDialog implements ActionListener {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(EntryTypeDialog.class);
-    private static final int COLUMN = 3;
-    private final JabRefFrame frame;
-    private final CancelAction cancelAction = new CancelAction();
-    private EntryType type;
-    private SwingWorker<Optional<BibEntry>, Void> fetcherWorker = new FetcherWorker();
-    private JButton generateButton;
-    private JTextField idTextField;
-    private JComboBox<String> comboBox;
-
-    public EntryTypeDialog(JabRefFrame frame) {
-        // modal dialog
-        super(true, EntryTypeDialog.class);
-
-        this.frame = frame;
-
-        setTitle(Localization.lang("Select entry type"));
-
-        addWindowListener(new WindowAdapter() {
-
-            @Override
-            public void windowClosing(WindowEvent e) {
-                cancelAction.actionPerformed(null);
-            }
-        });
-
-        getContentPane().setLayout(new BorderLayout());
-        getContentPane().add(createCancelButtonBarPanel(), BorderLayout.SOUTH);
-        getContentPane().add(createEntryGroupsPanel(), BorderLayout.CENTER);
-
-        pack();
-        setResizable(false);
-    }
-
-    private JPanel createEntryGroupsPanel() {
-        JPanel panel = new JPanel();
-        panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-
-        if (frame.getCurrentBasePanel().getBibDatabaseContext().isBiblatexMode()) {
-            panel.add(createEntryGroupPanel("biblatex", BiblatexEntryTypes.ALL));
-
-            List<EntryType> customTypes = EntryTypes.getAllCustomTypes(BibDatabaseMode.BIBLATEX);
-            if (!customTypes.isEmpty()) {
-                panel.add(createEntryGroupPanel(Localization.lang("Custom"), customTypes));
-            }
-        } else {
-            panel.add(createEntryGroupPanel("BibTeX", BibtexEntryTypes.ALL));
-            panel.add(createEntryGroupPanel("IEEETran", IEEETranEntryTypes.ALL));
-
-            List<EntryType> customTypes = EntryTypes.getAllCustomTypes(BibDatabaseMode.BIBTEX);
-            if (!customTypes.isEmpty()) {
-                panel.add(createEntryGroupPanel(Localization.lang("Custom"), customTypes));
-            }
-        }
-        panel.add(createIdFetcherPanel());
-
-        return panel;
-    }
-
-    private JPanel createCancelButtonBarPanel() {
-        JButton cancel = new JButton(Localization.lang("Cancel"));
-        cancel.addActionListener(this);
-
-        // Make ESC close dialog, equivalent to clicking Cancel.
-        cancel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        cancel.getActionMap().put("close", cancelAction);
-
-        JPanel buttons = new JPanel();
-        ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-        bb.addGlue();
-        bb.addButton(cancel);
-        bb.addGlue();
-        return buttons;
-    }
-
-    private JPanel createEntryGroupPanel(String groupTitle, Collection<? extends EntryType> entries) {
-        JPanel panel = new JPanel();
-        GridBagLayout bagLayout = new GridBagLayout();
-        panel.setLayout(bagLayout);
-        GridBagConstraints constraints = new GridBagConstraints();
-        constraints.anchor = GridBagConstraints.WEST;
-        constraints.fill = GridBagConstraints.HORIZONTAL;
-        constraints.insets = new Insets(4, 4, 4, 4);
-        // column count
-        int col = 0;
-
-        for (EntryType entryType : entries) {
-            TypeButton entryButton = new TypeButton(entryType.getName(), entryType);
-            entryButton.addActionListener(this);
-            // Check if we should finish the row.
-            col++;
-            if (col == EntryTypeDialog.COLUMN) {
-                col = 0;
-                constraints.gridwidth = GridBagConstraints.REMAINDER;
-            } else {
-                constraints.gridwidth = 1;
-            }
-            bagLayout.setConstraints(entryButton, constraints);
-            panel.add(entryButton);
-        }
-        panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), groupTitle));
-
-        return panel;
-    }
-
-    private JPanel createIdFetcherPanel() {
-        JLabel fetcherLabel = new JLabel(Localization.lang("ID type"));
-        JLabel idLabel = new JLabel(Localization.lang("ID"));
-        generateButton = new JButton(Localization.lang("Generate"));
-        idTextField = new JTextField("");
-        comboBox = new JComboBox<>();
-
-        WebFetchers.getIdBasedFetchers(Globals.prefs.getImportFormatPreferences()).forEach(fetcher -> comboBox.addItem(fetcher.getName()));
-
-        comboBox.setSelectedItem(Globals.prefs.get(JabRefPreferences.ID_ENTRY_GENERATOR));
-
-        generateButton.addActionListener(action -> {
-            fetcherWorker.execute();
-        });
-
-        comboBox.addActionListener(e -> {
-            idTextField.requestFocus();
-            idTextField.selectAll();
-        });
-
-        idTextField.addActionListener(event -> fetcherWorker.execute());
-
-        JPanel jPanel = new JPanel();
-
-        GridBagConstraints constraints = new GridBagConstraints();
-        constraints.insets = new Insets(4, 4, 4, 4);
-
-        GridBagLayout layout = new GridBagLayout();
-        jPanel.setLayout(layout);
-
-        constraints.fill = GridBagConstraints.HORIZONTAL;
-
-        constraints.gridx = 0;
-        constraints.gridy = 0;
-        constraints.weightx = 1;
-        jPanel.add(fetcherLabel, constraints);
-
-        constraints.gridx = 1;
-        constraints.gridy = 0;
-        constraints.weightx = 2;
-        jPanel.add(comboBox, constraints);
-
-        constraints.gridx = 0;
-        constraints.gridy = 1;
-        constraints.weightx = 1;
-        jPanel.add(idLabel, constraints);
-
-        constraints.gridx = 1;
-        constraints.gridy = 1;
-        constraints.weightx = 2;
-        jPanel.add(idTextField, constraints);
-
-        constraints.gridy = 2;
-        constraints.gridx = 0;
-        constraints.gridwidth = 2;
-        constraints.fill = GridBagConstraints.NONE;
-        jPanel.add(generateButton, constraints);
-
-        jPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), Localization.lang("ID-based entry generator")));
-
-        SwingUtilities.invokeLater(() -> idTextField.requestFocus());
-
-        return jPanel;
-    }
-
-    private void stopFetching() {
-        if (fetcherWorker.getState() == SwingWorker.StateValue.STARTED) {
-            fetcherWorker.cancel(true);
-        }
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        if (e.getSource() instanceof TypeButton) {
-            type = ((TypeButton) e.getSource()).getType();
-        }
-        stopFetching();
-        dispose();
-    }
-
-    public EntryType getChoice() {
-        return type;
-    }
-
-    static class TypeButton extends JButton implements Comparable<TypeButton> {
-
-        private final EntryType type;
-
-        TypeButton(String label, EntryType type) {
-            super(label);
-            this.type = type;
-        }
-
-        @Override
-        public int compareTo(TypeButton o) {
-            return type.getName().compareTo(o.type.getName());
-        }
-
-        public EntryType getType() {
-            return type;
-        }
-    }
-
-    class CancelAction extends AbstractAction {
-
-        public CancelAction() {
-            super("Cancel");
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            stopFetching();
-            dispose();
-        }
-    }
-
-    private class FetcherWorker extends SwingWorker<Optional<BibEntry>, Void> {
-
-        private boolean fetcherException = false;
-        private String fetcherExceptionMessage = "";
-        private IdBasedFetcher fetcher = null;
-        private String searchID = "";
-
-        @Override
-        protected Optional<BibEntry> doInBackground() throws Exception {
-            Optional<BibEntry> bibEntry = Optional.empty();
-            SwingUtilities.invokeLater(() -> {
-                generateButton.setEnabled(false);
-                generateButton.setText(Localization.lang("Searching..."));
-            });
-
-            Globals.prefs.put(JabRefPreferences.ID_ENTRY_GENERATOR, String.valueOf(comboBox.getSelectedItem()));
-            fetcher = WebFetchers.getIdBasedFetchers(Globals.prefs.getImportFormatPreferences()).get(comboBox.getSelectedIndex());
-            searchID = idTextField.getText();
-            if (!searchID.isEmpty()) {
-                try {
-                    bibEntry = fetcher.performSearchById(searchID);
-                } catch (FetcherException e) {
-                    LOGGER.error(e.getMessage(), e);
-                    fetcherException = true;
-                    fetcherExceptionMessage = e.getMessage();
-                }
-            }
-            return bibEntry;
-        }
-
-        @Override
-        protected void done() {
-            try {
-                Optional<BibEntry> result = get();
-                if (result.isPresent()) {
-                    final BibEntry bibEntry = result.get();
-                    if ((DuplicateCheck.containsDuplicate(frame.getCurrentBasePanel().getDatabase(), bibEntry, frame.getCurrentBasePanel().getBibDatabaseContext().getMode()).isPresent())) {
-                        //If there are duplicates starts ImportInspectionDialog
-                        final BasePanel panel = frame.getCurrentBasePanel();
-
-                        ImportInspectionDialog diag = new ImportInspectionDialog(frame, panel, Localization.lang("Import"), false);
-                        diag.addEntries(Collections.singletonList(bibEntry));
-                        diag.entryListComplete();
-                        diag.setVisible(true);
-                        diag.toFront();
-                    } else {
-                        // Regenerate CiteKey of imported BibEntry
-                        new BibtexKeyGenerator(frame.getCurrentBasePanel().getBibDatabaseContext(), Globals.prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(bibEntry);
-                        // Update Timestamps
-                        if (Globals.prefs.getTimestampPreferences().includeCreatedTimestamp()) {
-                            bibEntry.setField(Globals.prefs.getTimestampPreferences().getTimestampField(), Globals.prefs.getTimestampPreferences().now());
-                        }
-                        DefaultTaskExecutor.runInJavaFXThread(() -> frame.getCurrentBasePanel().insertEntry(bibEntry));
-                    }
-
-                    dispose();
-                } else if (searchID.trim().isEmpty()) {
-                    DefaultTaskExecutor.runInJavaFXThread(() -> {
-                        frame.getDialogService().showWarningDialogAndWait(
-                                Localization.lang("Empty search ID"),
-                                Localization.lang("The given search ID was empty."));
-                    });
-                } else if (!fetcherException) {
-                    DefaultTaskExecutor.runInJavaFXThread(() -> {
-                        frame.getDialogService().showErrorDialogAndWait(
-                                Localization.lang("No files found."),
-                                Localization.lang("Fetcher '%0' did not find an entry for id '%1'.", fetcher.getName(), searchID) + "\n" + fetcherExceptionMessage);
-                    });
-                } else {
-                    DefaultTaskExecutor.runInJavaFXThread(() -> {
-                        frame.getDialogService().showErrorDialogAndWait(
-                                Localization.lang("Error"),
-                                Localization.lang("Error while fetching from %0", fetcher.getName()) + "." + "\n" + fetcherExceptionMessage);
-                    });
-                }
-                fetcherWorker = new FetcherWorker();
-                SwingUtilities.invokeLater(() -> {
-                    idTextField.requestFocus();
-                    idTextField.selectAll();
-                    generateButton.setText(Localization.lang("Generate"));
-                    generateButton.setEnabled(true);
-                });
-            } catch (ExecutionException | InterruptedException e) {
-                LOGGER.error(String.format("Exception during fetching when using fetcher '%s' with entry id '%s'.", searchID, fetcher.getName()), e);
-            }
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java
new file mode 100644
index 00000000000..7eeb35a218c
--- /dev/null
+++ b/src/main/java/org/jabref/gui/EntryTypeView.java
@@ -0,0 +1,161 @@
+package org.jabref.gui;
+
+import java.util.Collection;
+import java.util.List;
+
+import javafx.event.Event;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextField;
+import javafx.scene.control.TitledPane;
+import javafx.scene.layout.FlowPane;
+
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
+import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.importer.IdBasedFetcher;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.EntryTypes;
+import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.model.entry.BiblatexEntryTypes;
+import org.jabref.model.entry.BibtexEntryTypes;
+import org.jabref.model.entry.EntryType;
+import org.jabref.model.entry.IEEETranEntryTypes;
+import org.jabref.preferences.JabRefPreferences;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import org.fxmisc.easybind.EasyBind;
+
+/**
+ * Dialog that prompts the user to choose a type for an entry.
+ * Returns null if canceled.
+ */
+public class EntryTypeView extends BaseDialog<EntryType> {
+
+    @FXML private ButtonType generateButton;
+    @FXML private TextField idTextField;
+    @FXML private ComboBox<IdBasedFetcher> idBasedFetchers;
+    @FXML private FlowPane biblatexPane;
+    @FXML private FlowPane bibTexPane;
+    @FXML private FlowPane ieeetranPane;
+    @FXML private FlowPane customPane;
+    @FXML private TitledPane biblatexTitlePane;
+    @FXML private TitledPane bibTexTitlePane;
+    @FXML private TitledPane ieeeTranTitlePane;
+    @FXML private TitledPane customTitlePane;
+
+    private final BasePanel basePanel;
+    private final DialogService dialogService;
+    private final JabRefPreferences prefs;
+
+    private EntryType type;
+    private EntryTypeViewModel viewModel;
+
+    public EntryTypeView(BasePanel basePanel, DialogService dialogService, JabRefPreferences preferences) {
+        this.basePanel = basePanel;
+        this.dialogService = dialogService;
+        this.prefs = preferences;
+
+        this.setTitle(Localization.lang("Select entry type"));
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        ControlHelper.setAction(generateButton, this.getDialogPane(), event -> viewModel.runFetcherWorker());
+
+        setResultConverter(button -> {
+            //The buttonType will always be cancel, even if we pressed one of the entry type buttons
+            return type;
+        });
+
+        Button btnGenerate = (Button) this.getDialogPane().lookupButton(generateButton);
+
+        btnGenerate.textProperty().bind(EasyBind.map(viewModel.searchingProperty(), searching -> (searching) ? Localization.lang("Searching...") : Localization.lang("Generate")));
+        btnGenerate.disableProperty().bind(viewModel.searchingProperty());
+    }
+
+    private void addEntriesToPane(FlowPane pane, Collection<? extends EntryType> entries) {
+
+        for (EntryType entryType : entries) {
+            Button entryButton = new Button(entryType.getName());
+            entryButton.setUserData(entryType);
+            entryButton.setOnAction(event -> setEntryTypeForReturnAndClose(entryType));
+            pane.getChildren().add(entryButton);
+        }
+    }
+
+    @FXML
+    public void initialize() {
+        viewModel = new EntryTypeViewModel(prefs, basePanel, dialogService);
+
+        idBasedFetchers.itemsProperty().bind(viewModel.fetcherItemsProperty());
+        idTextField.textProperty().bindBidirectional(viewModel.idTextProperty());
+        idBasedFetchers.valueProperty().bindBidirectional(viewModel.selectedItemProperty());
+
+        EasyBind.subscribe(viewModel.getFocusAndSelectAllProperty(), evt -> {
+            if (evt) {
+                idTextField.requestFocus();
+                idTextField.selectAll();
+            }
+        });
+
+        new ViewModelListCellFactory<IdBasedFetcher>().withText(item -> item.getName()).install(idBasedFetchers);
+
+        //we set the managed property so that they will only be rendered when they are visble so that the Nodes only take the space when visible
+        //avoids removing and adding from the scence graph
+        bibTexTitlePane.managedProperty().bind(bibTexTitlePane.visibleProperty());
+        ieeeTranTitlePane.managedProperty().bind(ieeeTranTitlePane.visibleProperty());
+        biblatexTitlePane.managedProperty().bind(biblatexTitlePane.visibleProperty());
+        customTitlePane.managedProperty().bind(customTitlePane.visibleProperty());
+
+        if (basePanel.getBibDatabaseContext().isBiblatexMode()) {
+            addEntriesToPane(biblatexPane, BiblatexEntryTypes.ALL);
+
+            bibTexTitlePane.setVisible(false);
+            ieeeTranTitlePane.setVisible(false);
+
+            List<EntryType> customTypes = EntryTypes.getAllCustomTypes(BibDatabaseMode.BIBLATEX);
+            if (customTypes.isEmpty()) {
+                customTitlePane.setVisible(false);
+            } else {
+                addEntriesToPane(customPane, customTypes);
+            }
+
+        } else {
+            biblatexTitlePane.setVisible(false);
+            addEntriesToPane(bibTexPane, BibtexEntryTypes.ALL);
+            addEntriesToPane(ieeetranPane, IEEETranEntryTypes.ALL);
+
+            List<EntryType> customTypes = EntryTypes.getAllCustomTypes(BibDatabaseMode.BIBTEX);
+            if (customTypes.isEmpty()) {
+                customTitlePane.setVisible(false);
+            } else {
+                addEntriesToPane(customPane, customTypes);
+            }
+        }
+
+    }
+
+    public EntryType getChoice() {
+        return type;
+    }
+
+    @FXML
+    private void runFetcherWorker(Event event) {
+        viewModel.runFetcherWorker();
+    }
+
+    @FXML
+    private void focusTextField(Event event) {
+        idTextField.requestFocus();
+        idTextField.selectAll();
+    }
+
+    private void setEntryTypeForReturnAndClose(EntryType entryType) {
+        type = entryType;
+        viewModel.stopFetching();
+        this.close();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
new file mode 100644
index 00000000000..bc0464a309d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -0,0 +1,158 @@
+package org.jabref.gui;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+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.collections.FXCollections;
+import javafx.concurrent.Task;
+import javafx.concurrent.Worker;
+
+import org.jabref.gui.importer.ImportInspectionDialog;
+import org.jabref.logic.bibtex.DuplicateCheck;
+import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.IdBasedFetcher;
+import org.jabref.logic.importer.WebFetchers;
+import org.jabref.logic.importer.fetcher.DoiFetcher;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.JabRefPreferences;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EntryTypeViewModel {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(EntryTypeViewModel.class);
+
+    private final JabRefPreferences prefs;
+    private final BooleanProperty searchingProperty = new SimpleBooleanProperty();
+    private final ObjectProperty<IdBasedFetcher> selectedItemProperty = new SimpleObjectProperty<>();
+    private final ListProperty<IdBasedFetcher> fetchers = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final StringProperty idText = new SimpleStringProperty();
+    private final BooleanProperty focusAndSelectAllProperty = new SimpleBooleanProperty();
+    private Task<Optional<BibEntry>> fetcherWorker = new FetcherWorker();
+    private final BasePanel basePanel;
+    private final DialogService dialogService;
+
+    public EntryTypeViewModel(JabRefPreferences preferences, BasePanel basePanel, DialogService dialogService) {
+        this.basePanel = basePanel;
+        this.prefs = preferences;
+        this.dialogService = dialogService;
+        fetchers.addAll(WebFetchers.getIdBasedFetchers(preferences.getImportFormatPreferences()));
+        selectedItemProperty.setValue(getLastSelectedFetcher());
+
+    }
+
+    public BooleanProperty searchingProperty() {
+        return searchingProperty;
+    }
+
+    public ObjectProperty<IdBasedFetcher> selectedItemProperty() {
+        return selectedItemProperty;
+    }
+
+    public StringProperty idTextProperty() {
+        return idText;
+    }
+
+    public BooleanProperty getFocusAndSelectAllProperty() {
+        return focusAndSelectAllProperty;
+    }
+
+    public void storeSelectedFetcher() {
+        prefs.setIdBasedFetcherForEntryGenerator(selectedItemProperty.getValue().getName());
+    }
+
+    private IdBasedFetcher getLastSelectedFetcher() {
+        return fetchers.stream().filter(fetcher -> fetcher.getName().equals(prefs.getIdBasedFetcherForEntryGenerator()))
+                       .findFirst().orElse(new DoiFetcher(prefs.getImportFormatPreferences()));
+    }
+
+    public ListProperty<IdBasedFetcher> fetcherItemsProperty() {
+        return fetchers;
+    }
+
+    public void stopFetching() {
+        if (fetcherWorker.getState() == Worker.State.RUNNING) {
+            fetcherWorker.cancel(true);
+        }
+    }
+
+    private class FetcherWorker extends Task<Optional<BibEntry>> {
+
+        private IdBasedFetcher fetcher = null;
+        private String searchID = "";
+
+        @Override
+        protected Optional<BibEntry> call() throws InterruptedException, FetcherException {
+            Optional<BibEntry> bibEntry = Optional.empty();
+
+            searchingProperty().setValue(true);
+            storeSelectedFetcher();
+            fetcher = selectedItemProperty().getValue();
+            searchID = idText.getValue();
+            if (!searchID.isEmpty()) {
+                bibEntry = fetcher.performSearchById(searchID);
+            }
+            return bibEntry;
+        }
+
+    }
+
+    public void runFetcherWorker() {
+        fetcherWorker.run();
+        fetcherWorker.setOnFailed(event -> {
+            Throwable exception = fetcherWorker.getException();
+            String fetcherExceptionMessage = exception.getMessage();
+            String fetcher = selectedItemProperty().getValue().getName();
+            String searchId = idText.getValue();
+            if (exception instanceof FetcherException) {
+                dialogService.showErrorDialogAndWait(Localization.lang("Error"), Localization.lang("Error while fetching from %0", fetcher + "." + "\n" + fetcherExceptionMessage));
+            } else {
+                dialogService.showErrorDialogAndWait(Localization.lang("No files found.", Localization.lang("Fetcher '%0' did not find an entry for id '%1'.", fetcher, searchId) + "\n" + fetcherExceptionMessage));
+            }
+            LOGGER.error(String.format("Exception during fetching when using fetcher '%s' with entry id '%s'.", searchId, fetcher), exception);
+
+            searchingProperty.set(false);
+            fetcherWorker = new FetcherWorker();
+        });
+
+        fetcherWorker.setOnSucceeded(evt -> {
+            Optional<BibEntry> result = fetcherWorker.getValue();
+            if (result.isPresent()) {
+                final BibEntry bibEntry = result.get();
+                if ((DuplicateCheck.containsDuplicate(basePanel.getDatabase(), bibEntry, basePanel.getBibDatabaseContext().getMode()).isPresent())) {
+                    //If there are duplicates starts ImportInspectionDialog
+                    ImportInspectionDialog diag = new ImportInspectionDialog(basePanel.frame(), basePanel, Localization.lang("Import"), false);
+                    diag.addEntries(Arrays.asList(bibEntry));
+                    diag.entryListComplete();
+                    diag.setVisible(true);
+                    diag.toFront();
+                } else {
+                    // Regenerate CiteKey of imported BibEntry
+                    new BibtexKeyGenerator(basePanel.getBibDatabaseContext(), prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(bibEntry);
+                    basePanel.insertEntry(bibEntry);
+                }
+
+                // close();
+            } else if (StringUtil.isBlank(idText.getValue())) {
+                dialogService.showWarningDialogAndWait(Localization.lang("Empty search ID"), Localization.lang("The given search ID was empty."));
+            }
+            fetcherWorker = new FetcherWorker();
+
+            focusAndSelectAllProperty.set(true);
+            searchingProperty().setValue(false);
+
+        });
+    }
+}
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index b894a5e3f05..d440752b7a2 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -621,7 +621,7 @@ private Node createToolbar() {
 
         PushToApplicationButton pushToExternal = new PushToApplicationButton(this, pushApplications.getApplications());
         HBox rightSide = new HBox(
-                factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(this, BiblatexEntryTypes.ARTICLE)),
+                factory.createIconButton(StandardActions.NEW_ENTRY, 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)),
@@ -838,9 +838,9 @@ private MenuBar createMenu() {
         );
 
         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(),
 
diff --git a/src/main/java/org/jabref/gui/actions/NewEntryAction.java b/src/main/java/org/jabref/gui/actions/NewEntryAction.java
index dd8c0add054..a5b483a4d67 100644
--- a/src/main/java/org/jabref/gui/actions/NewEntryAction.java
+++ b/src/main/java/org/jabref/gui/actions/NewEntryAction.java
@@ -4,17 +4,19 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.swing.SwingUtilities;
-
 import org.jabref.Globals;
-import org.jabref.gui.EntryTypeDialog;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.EntryTypeView;
 import org.jabref.gui.JabRefFrame;
+import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.EntryType;
+import org.jabref.preferences.JabRefPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class NewEntryAction extends SimpleCommand {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(NewEntryAction.class);
 
     private final JabRefFrame jabRefFrame;
@@ -22,16 +24,21 @@ public class NewEntryAction extends SimpleCommand {
      * The type of the entry to create.
      */
     private final Optional<EntryType> type;
+    private final DialogService dialogService;
+    private final JabRefPreferences preferences;
 
-
-    public NewEntryAction(JabRefFrame jabRefFrame) {
+    public NewEntryAction(JabRefFrame jabRefFrame, DialogService dialogService, JabRefPreferences preferences) {
         this.jabRefFrame = jabRefFrame;
         this.type = Optional.empty();
+        this.dialogService = dialogService;
+        this.preferences = preferences;
     }
 
-    public NewEntryAction(JabRefFrame jabRefFrame, EntryType type) {
+    public NewEntryAction(JabRefFrame jabRefFrame, EntryType type, DialogService dialogService, JabRefPreferences preferences) {
         this.jabRefFrame = jabRefFrame;
         this.type = Optional.of(type);
+        this.dialogService = dialogService;
+        this.preferences = preferences;
     }
 
     @Override
@@ -42,27 +49,23 @@ public void execute() {
         }
 
         if (type.isPresent()) {
-            jabRefFrame.getCurrentBasePanel().newEntry(type.get());
+            jabRefFrame.getCurrentBasePanel().insertEntry(new BibEntry(type.get()));
         } else {
-            SwingUtilities.invokeLater(() -> {
-                EntryTypeDialog typeChoiceDialog = new EntryTypeDialog(jabRefFrame);
-                typeChoiceDialog.setVisible(true);
-                EntryType selectedType = typeChoiceDialog.getChoice();
-                if (selectedType == null) {
-                    return;
-                }
+            EntryTypeView typeChoiceDialog = new EntryTypeView(jabRefFrame.getCurrentBasePanel(), dialogService, preferences);
+            EntryType selectedType = typeChoiceDialog.showAndWait().orElse(null);
+            if (selectedType == null) {
+                return;
+            }
 
-                trackNewEntry(selectedType);
-                jabRefFrame.getCurrentBasePanel().newEntry(selectedType);
-            });
+            trackNewEntry(selectedType);
+            jabRefFrame.getCurrentBasePanel().insertEntry(new BibEntry(selectedType));
         }
     }
 
     private void trackNewEntry(EntryType type) {
         Map<String, String> properties = new HashMap<>();
         properties.put("EntryType", type.getName());
-        Map<String, Double> measurements = new HashMap<>();
 
-        Globals.getTelemetryClient().ifPresent(client -> client.trackEvent("NewEntry", properties, measurements));
+        Globals.getTelemetryClient().ifPresent(client -> client.trackEvent("NewEntry", properties, new HashMap<>()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/actions/NewEntryFromPlainTextAction.java b/src/main/java/org/jabref/gui/actions/NewEntryFromPlainTextAction.java
index 0c048ea7ed8..b4c3faa9a2b 100644
--- a/src/main/java/org/jabref/gui/actions/NewEntryFromPlainTextAction.java
+++ b/src/main/java/org/jabref/gui/actions/NewEntryFromPlainTextAction.java
@@ -1,12 +1,14 @@
 package org.jabref.gui.actions;
 
-import org.jabref.gui.EntryTypeDialog;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.EntryTypeView;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.plaintextimport.TextInputDialog;
 import org.jabref.logic.util.UpdateField;
 import org.jabref.logic.util.UpdateFieldPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.EntryType;
+import org.jabref.preferences.JabRefPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,10 +19,14 @@ public class NewEntryFromPlainTextAction extends SimpleCommand {
 
     private final UpdateFieldPreferences prefs;
     private final JabRefFrame jabRefFrame;
+    private final DialogService dialogService;
+    private final JabRefPreferences preferences;
 
-    public NewEntryFromPlainTextAction(JabRefFrame jabRefFrame, UpdateFieldPreferences prefs) {
+    public NewEntryFromPlainTextAction(JabRefFrame jabRefFrame, UpdateFieldPreferences prefs, DialogService dialogService, JabRefPreferences preferences) {
         this.jabRefFrame = jabRefFrame;
         this.prefs = prefs;
+        this.dialogService = dialogService;
+        this.preferences = preferences;
 
     }
 
@@ -31,13 +37,12 @@ public void execute() {
             return;
         }
 
-        EntryTypeDialog typeChoiceDialog = new EntryTypeDialog(jabRefFrame);
-        typeChoiceDialog.setVisible(true);
-        EntryType selectedType = typeChoiceDialog.getChoice();
+        EntryTypeView typeChoiceDialog = new EntryTypeView(jabRefFrame.getCurrentBasePanel(), dialogService, preferences);
+        EntryType selectedType = typeChoiceDialog.showAndWait().orElse(null);
         if (selectedType == null) {
             return;
         }
-        BibEntry bibEntry = new BibEntry(selectedType.getName());
+        BibEntry bibEntry = new BibEntry(selectedType);
 
         TextInputDialog tidialog = new TextInputDialog(jabRefFrame, bibEntry);
         tidialog.setVisible(true);
diff --git a/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java b/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java
index 01b54ce0103..2d260b3f074 100644
--- a/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java
+++ b/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java
@@ -117,10 +117,10 @@ private static boolean haveDifferentEditions(final BibEntry one, final BibEntry
     }
 
     private static boolean haveDifferentChaptersOrPagesOfTheSameBook(final BibEntry one, final BibEntry two) {
-        return compareSingleField(AUTHOR, one, two) == EQUAL &&
-                compareSingleField(TITLE, one, two) == EQUAL &&
-                (compareSingleField(CHAPTER, one, two) == NOT_EQUAL ||
-                        compareSingleField(PAGES, one, two) == NOT_EQUAL);
+        return (compareSingleField(AUTHOR, one, two) == EQUAL) &&
+                (compareSingleField(TITLE, one, two) == EQUAL) &&
+                ((compareSingleField(CHAPTER, one, two) == NOT_EQUAL) ||
+                        (compareSingleField(PAGES, one, two) == NOT_EQUAL));
 
     }
 
@@ -289,12 +289,9 @@ public static double compareEntriesStrictly(BibEntry one, BibEntry two) {
     public static Optional<BibEntry> containsDuplicate(final BibDatabase database,
                                                        final BibEntry entry,
                                                        final BibDatabaseMode bibDatabaseMode) {
-        for (final BibEntry other : database.getEntries()) {
-            if (DuplicateCheck.isDuplicate(entry, other, bibDatabaseMode)) {
-                return Optional.of(other); // Duplicate found.
-            }
-        }
-        return Optional.empty(); // No duplicate found.
+
+        return database.getEntries().stream().filter(other -> DuplicateCheck.isDuplicate(entry, other, bibDatabaseMode)).findFirst();
+
     }
 
     /**
@@ -342,7 +339,7 @@ private static double similarity(final String first, final String second) {
             return 1.0;
         }
         final double distanceIgnoredCase = new StringSimilarity().editDistanceIgnoreCase(longer, shorter);
-        final double similarity = (longerLength - distanceIgnoredCase) / (double) longerLength;
+        final double similarity = (longerLength - distanceIgnoredCase) / longerLength;
         LOGGER.debug("Longer string: " + longer + " Shorter string: " + shorter + " Similarity: " + similarity);
         return similarity;
     }
diff --git a/src/main/java/org/jabref/pdfimport/PdfImporter.java b/src/main/java/org/jabref/pdfimport/PdfImporter.java
index 78428efab3e..7f1298cfc44 100644
--- a/src/main/java/org/jabref/pdfimport/PdfImporter.java
+++ b/src/main/java/org/jabref/pdfimport/PdfImporter.java
@@ -5,7 +5,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import java.util.Optional;
 
 import javax.swing.JOptionPane;
@@ -13,21 +12,17 @@
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
-import org.jabref.gui.BasePanelMode;
-import org.jabref.gui.EntryTypeDialog;
+import org.jabref.gui.EntryTypeView;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.externalfiles.DroppedFileHandler;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.filelist.FileListEntry;
 import org.jabref.gui.filelist.FileListTableModel;
 import org.jabref.gui.maintable.MainTable;
-import org.jabref.gui.undo.UndoableInsertEntry;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.PdfContentImporter;
 import org.jabref.logic.importer.fileformat.PdfXmpImporter;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.UpdateField;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.logic.xmp.XmpUtilShared;
 import org.jabref.model.database.KeyCollisionException;
@@ -117,26 +112,26 @@ private List<BibEntry> importPdfFilesInternal(List<String> fileNames) {
             if (neverShow || (importDialog.getResult() == JOptionPane.OK_OPTION)) {
                 int choice = neverShow ? globalChoice : importDialog.getChoice();
                 switch (choice) {
-                case ImportDialog.XMP:
-                    doXMPImport(fileName, res);
-                    break;
-
-                case ImportDialog.CONTENT:
-                    doContentImport(fileName, res);
-                    break;
-                case ImportDialog.NOMETA:
-                    createNewBlankEntry(fileName).ifPresent(res::add);
-                    break;
-                case ImportDialog.ONLYATTACH:
-                    DroppedFileHandler dfh = new DroppedFileHandler(frame, panel);
-                    if (dropRow >= 0) {
-                        dfh.linkPdfToEntry(fileName, entryTable, dropRow);
-                    } else {
-                        entryTable.getSelectedEntries().forEach(entry -> dfh.linkPdfToEntry(fileName, entry));
-                    }
-                    break;
-                default:
-                    break;
+                    case ImportDialog.XMP:
+                        doXMPImport(fileName, res);
+                        break;
+
+                    case ImportDialog.CONTENT:
+                        doContentImport(fileName, res);
+                        break;
+                    case ImportDialog.NOMETA:
+                        createNewBlankEntry(fileName).ifPresent(res::add);
+                        break;
+                    case ImportDialog.ONLYATTACH:
+                        DroppedFileHandler dfh = new DroppedFileHandler(frame, panel);
+                        if (dropRow >= 0) {
+                            dfh.linkPdfToEntry(fileName, entryTable, dropRow);
+                        } else {
+                            entryTable.getSelectedEntries().forEach(entry -> dfh.linkPdfToEntry(fileName, entry));
+                        }
+                        break;
+                    default:
+                        break;
                 }
             }
 
@@ -169,10 +164,10 @@ private void doXMPImport(String fileName, List<BibEntry> res) {
             Path toLink = Paths.get(fileName);
             // Get a list of file directories:
             List<Path> dirsS = panel.getBibDatabaseContext()
-                    .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
+                                    .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
 
             tm.addEntry(0, new FileListEntry("", FileUtil.shortenFileName(toLink, dirsS).toString(),
-                    ExternalFileTypes.getInstance().getExternalFileTypeByName("PDF")));
+                                             ExternalFileTypes.getInstance().getExternalFileTypeByName("PDF")));
             entry.setField(FieldName.FILE, tm.getStringRepresentation());
             res.add(entry);
         }
@@ -190,7 +185,7 @@ private Optional<BibEntry> createNewBlankEntry(String fileName) {
     private void doContentImport(String fileName, List<BibEntry> res) {
 
         PdfContentImporter contentImporter = new PdfContentImporter(
-                Globals.prefs.getImportFormatPreferences());
+                                                                    Globals.prefs.getImportFormatPreferences());
         Path filePath = Paths.get(fileName);
         ParserResult result = contentImporter.importDatabase(filePath, Globals.prefs.getDefaultEncoding());
         if (result.hasWarnings()) {
@@ -210,7 +205,7 @@ private void doContentImport(String fileName, List<BibEntry> res) {
         panel.getDatabase().insertEntry(entry);
         panel.markBaseChanged();
         new BibtexKeyGenerator(panel.getBibDatabaseContext(), Globals.prefs.getBibtexKeyPatternPreferences())
-                .generateAndSetKey(entry);
+                                                                                                             .generateAndSetKey(entry);
         DroppedFileHandler dfh = new DroppedFileHandler(frame, panel);
         dfh.linkPdfToEntry(fileName, entry);
 
@@ -224,37 +219,13 @@ private void doContentImport(String fileName, List<BibEntry> res) {
 
     private Optional<BibEntry> createNewEntry() {
         // Find out what type is desired
-        EntryTypeDialog etd = new EntryTypeDialog(frame);
-        etd.setVisible(true);
-        EntryType type = etd.getChoice();
+        EntryTypeView entryTypeDialog = new EntryTypeView(frame.getCurrentBasePanel(), frame.getDialogService(), Globals.prefs);
+        EntryType type = entryTypeDialog.showAndWait().orElse(null);
 
         if (type != null) { // Only if the dialog was not canceled.
-            final BibEntry bibEntry = new BibEntry(type.getName());
+            final BibEntry bibEntry = new BibEntry(type);
             try {
-                panel.getDatabase().insertEntry(bibEntry);
-
-                // Set owner/timestamp if options are enabled:
-                List<BibEntry> list = new ArrayList<>();
-                list.add(bibEntry);
-                UpdateField.setAutomaticFields(list, true, true, Globals.prefs.getUpdateFieldPreferences());
-
-                // Create an UndoableInsertEntry object.
-                panel.getUndoManager().addEdit(new UndoableInsertEntry(panel.getDatabase(), bibEntry));
-                panel.output(Localization.lang("Added new") + " '" + type.getName().toLowerCase(Locale.ROOT) + "' "
-                        + Localization.lang("entry") + ".");
-
-                // We are going to select the new entry. Before that, make sure that we are in
-                // show-entry mode. If we aren't already in that mode, enter the WILL_SHOW_EDITOR
-                // mode which makes sure the selection will trigger display of the entry editor
-                // and adjustment of the splitter.
-                if (panel.getMode() != BasePanelMode.SHOWING_EDITOR) {
-                    panel.setMode(BasePanelMode.WILL_SHOW_EDITOR);
-                }
-
-                SwingUtilities.invokeLater(() -> panel.showAndEdit(bibEntry));
-
-                // The database just changed.
-                panel.markBaseChanged();
+                panel.insertEntry(bibEntry);
 
                 return Optional.of(bibEntry);
             } catch (KeyCollisionException ex) {
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 1be4e2a6052..d398ff19978 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -901,14 +901,14 @@ private static void insertDefaultCleanupPreset(Map<String, Object> storage) {
 
     public EntryEditorPreferences getEntryEditorPreferences() {
         return new EntryEditorPreferences(getEntryEditorTabList(),
-                getLatexFieldFormatterPreferences(),
-                getImportFormatPreferences(),
-                getCustomTabFieldNames(),
-                getBoolean(SHOW_RECOMMENDATIONS),
-                getBoolean(DEFAULT_SHOW_SOURCE),
-                getBibtexKeyPatternPreferences(),
-                Globals.getKeyPrefs(),
-                getBoolean(AVOID_OVERWRITING_KEY));
+                                          getLatexFieldFormatterPreferences(),
+                                          getImportFormatPreferences(),
+                                          getCustomTabFieldNames(),
+                                          getBoolean(SHOW_RECOMMENDATIONS),
+                                          getBoolean(DEFAULT_SHOW_SOURCE),
+                                          getBibtexKeyPatternPreferences(),
+                                          Globals.getKeyPrefs(),
+                                          getBoolean(AVOID_OVERWRITING_KEY));
     }
 
     public Map<SidePaneType, Integer> getSidePanePreferredPositions() {
@@ -1354,7 +1354,7 @@ public void importPreferences(Path file) throws JabRefException {
             Preferences.importPreferences(is);
         } catch (InvalidPreferencesFormatException | IOException ex) {
             throw new JabRefException("Could not import preferences", Localization.lang("Could not import preferences"),
-                    ex);
+                                      ex);
         }
     }
 
@@ -1424,7 +1424,7 @@ public boolean isKeywordSyncEnabled() {
     public ImportFormatPreferences getImportFormatPreferences() {
         return new ImportFormatPreferences(customImports, getDefaultEncoding(), getKeywordDelimiter(),
                                            getBibtexKeyPatternPreferences(), getFieldContentParserPreferences(), getXMPPreferences(),
-               				   isKeywordSyncEnabled());
+                                           isKeywordSyncEnabled());
     }
 
     public SavePreferences loadForExportFromPreferences() {
@@ -1472,13 +1472,13 @@ public ExporterFactory getExporterFactory(JournalAbbreviationLoader abbreviation
 
     public BibtexKeyPatternPreferences getBibtexKeyPatternPreferences() {
         return new BibtexKeyPatternPreferences(
-                get(KEY_PATTERN_REGEX),
-                get(KEY_PATTERN_REPLACEMENT),
-                getBoolean(KEY_GEN_ALWAYS_ADD_LETTER),
-                getBoolean(KEY_GEN_FIRST_LETTER_A),
-                getBoolean(ENFORCE_LEGAL_BIBTEX_KEY),
-                getKeyPattern(),
-                getKeywordDelimiter());
+                                               get(KEY_PATTERN_REGEX),
+                                               get(KEY_PATTERN_REPLACEMENT),
+                                               getBoolean(KEY_GEN_ALWAYS_ADD_LETTER),
+                                               getBoolean(KEY_GEN_FIRST_LETTER_A),
+                                               getBoolean(ENFORCE_LEGAL_BIBTEX_KEY),
+                                               getKeyPattern(),
+                                               getKeywordDelimiter());
     }
 
     public TimestampPreferences getTimestampPreferences() {
@@ -1947,4 +1947,12 @@ public void setLanguage(Language language) {
             setLanguageDependentDefaultValues();
         }
     }
+
+    public void setIdBasedFetcherForEntryGenerator(String fetcherName) {
+        put(ID_ENTRY_GENERATOR, fetcherName);
+    }
+
+    public String getIdBasedFetcherForEntryGenerator() {
+        return get(ID_ENTRY_GENERATOR);
+    }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index f356031221a..58fe003e16b 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -39,6 +39,8 @@ What\ is\ Mr.\ DLib?=What is Mr. DLib?
 
 Add=Add
 
+Add\ new=Add new
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Add a (compiled) custom Importer class from a class path.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=The path need not be on the classpath of JabRef.
 
@@ -53,16 +55,12 @@ Add\ from\ folder=Add from folder
 
 Add\ from\ JAR=Add from JAR
 
-Add\ new=Add new
-
 Add\ subgroup=Add subgroup
 
 Add\ to\ group=Add to group
 
 Added\ group\ "%0".=Added group "%0".
 
-Added\ new=Added new
-
 Added\ string=Added string
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Additionally, entries whose <b>%0</b> field does not contain <b>%1</b> can be assigned manually to this group by selecting them then using either drag and drop or the context menu. This process adds the term <b>%1</b> to each entry's <b>%0</b> field. Entries can be removed manually from this group by selecting them then using the context menu. This process removes the term <b>%1</b> from each entry's <b>%0</b> field.
@@ -2038,7 +2036,6 @@ Existing\ file=Existing file
 
 ID=ID
 ID\ type=ID type
-ID-based\ entry\ generator=ID-based entry generator
 Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=Fetcher '%0' did not find an entry for id '%1'.
 
 Select\ first\ entry=Select first entry
diff --git a/src/test/java/org/jabref/gui/GUITest.java b/src/test/java/org/jabref/gui/GUITest.java
deleted file mode 100644
index 92f93eaca61..00000000000
--- a/src/test/java/org/jabref/gui/GUITest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.jabref.gui;
-
-import java.io.IOException;
-
-import javax.swing.JButton;
-
-import org.jabref.gui.dbproperties.DatabasePropertiesDialog;
-
-import org.assertj.swing.core.GenericTypeMatcher;
-import org.assertj.swing.dependency.jsr305.Nonnull;
-import org.assertj.swing.fixture.DialogFixture;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.swing.finder.WindowFinder.findDialog;
-
-@Tag("GUITest")
-public class GUITest extends AbstractUITest {
-
-    @Test
-    public void testExit() {
-        exitJabRef();
-    }
-
-    @Test
-    public void testNewFile() {
-        newDatabase();
-        closeDatabase();
-        exitJabRef();
-    }
-
-    @Test
-    public void testCreateBibtexEntry() throws IOException {
-        newDatabase();
-
-        mainFrame.menuItemWithPath("BibTeX", "New entry...").click();
-        findDialog(EntryTypeDialog.class).withTimeout(10_000).using(robot())
-                .button(new GenericTypeMatcher<JButton>(JButton.class) {
-                    @Override
-                    protected boolean isMatching(@Nonnull JButton jButton) {
-                        return "Book".equals(jButton.getText());
-                    }
-                }).click();
-        takeScreenshot(mainFrame, "MainWindowWithOneDatabase");
-    }
-
-    /**
-     * tests different buttons
-     * sometimes this test clicks some buttons twice to reverse their effect and leaves JabRef as it was before
-     */
-    @Test
-    public void testViewChanges() {
-        newDatabase();
-
-        mainFrame.menuItemWithPath("View", "Increase table font size").click();
-        mainFrame.menuItemWithPath("View", "Decrease table font size").click();
-
-        mainFrame.menuItemWithPath("View", "Web search").click();
-        mainFrame.menuItemWithPath("View", "Web search").click();
-
-        mainFrame.menuItemWithPath("View", "Toggle groups interface").click();
-        mainFrame.menuItemWithPath("View", "Toggle groups interface").click();
-
-        mainFrame.menuItemWithPath("View", "Toggle entry preview").click();
-        mainFrame.menuItemWithPath("View", "Toggle entry preview").click();
-
-        mainFrame.menuItemWithPath("View", "Next preview layout").click();
-        mainFrame.menuItemWithPath("View", "Previous preview layout").click();
-
-        mainFrame.menuItemWithPath("View", "Hide/show toolbar").click();
-        mainFrame.menuItemWithPath("View", "Hide/show toolbar").click();
-
-        mainFrame.menuItemWithPath("View", "Focus entry table").click();
-
-        closeDatabase();
-        exitJabRef();
-    }
-
-    @Test
-    public void testDatabasePropertiesDialog() throws IOException {
-        newDatabase();
-
-        mainFrame.menuItemWithPath("File", "Library properties").click();
-
-        robot().waitForIdle();
-
-        DialogFixture databasePropertiesDialog = findDialog(DatabasePropertiesDialog.class).withTimeout(10_000).using(robot());
-        takeScreenshot(databasePropertiesDialog, "DatabasePropertiesDialog");
-        databasePropertiesDialog.button(new GenericTypeMatcher<JButton>(JButton.class) {
-                    @Override
-                    protected boolean isMatching(@Nonnull JButton jButton) {
-                        return "OK".equals(jButton.getText());
-                    }
-                }).click();
-
-        closeDatabase();
-        exitJabRef();
-    }
-}
diff --git a/src/test/java/org/jabref/gui/UndoTest.java b/src/test/java/org/jabref/gui/UndoTest.java
deleted file mode 100644
index b8b2fb3eb18..00000000000
--- a/src/test/java/org/jabref/gui/UndoTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.jabref.gui;
-
-import javax.swing.JButton;
-
-import org.assertj.swing.core.GenericTypeMatcher;
-import org.assertj.swing.dependency.jsr305.Nonnull;
-import org.assertj.swing.fixture.JTableFixture;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.swing.finder.WindowFinder.findDialog;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@Tag("GUITest")
-public class UndoTest extends AbstractUITest {
-
-    @Test
-    public void undoCutOfMultipleEntries() {
-        importBibIntoNewDatabase(getAbsolutePath("testbib/testjabref.bib"));
-
-        JTableFixture entryTable = mainFrame.table();
-
-        assertTrue(entryTable.rowCount() >= 2, "The database must have at least 2 entries for the test to begin!");
-        entryTable.selectRows(0, 1);
-        entryTable.requireSelectedRows(0, 1);
-
-        int oldRowCount = entryTable.rowCount();
-        mainFrame.menuItemWithPath("Edit", "Cut").click();
-        mainFrame.menuItemWithPath("Edit", "Undo").click();
-        entryTable.requireRowCount(oldRowCount);
-
-        closeDatabase();
-        exitJabRef();
-    }
-
-    @Test
-    public void undoRedoUpdatedCorrectly() {
-        newDatabase();
-        assertFalse(mainFrame.menuItemWithPath("Edit", "Undo").isEnabled());
-        assertFalse(mainFrame.menuItemWithPath("Edit", "Redo").isEnabled());
-        JTableFixture entryTable = mainFrame.table();
-        mainFrame.menuItemWithPath("BibTeX", "New entry...").click();
-        findDialog(EntryTypeDialog.class).withTimeout(10_000).using(robot())
-                .button(new GenericTypeMatcher<JButton>(JButton.class) {
-
-                    @Override
-                    protected boolean isMatching(@Nonnull JButton jButton) {
-                        return "Book".equals(jButton.getText());
-                    }
-                }).click();
-
-        assertTrue(mainFrame.menuItemWithPath("Edit", "Undo").isEnabled());
-        assertFalse(mainFrame.menuItemWithPath("Edit", "Redo").isEnabled());
-        entryTable.requireRowCount(1);
-
-        mainFrame.menuItemWithPath("Edit", "Undo").click();
-        assertFalse(mainFrame.menuItemWithPath("Edit", "Undo").isEnabled());
-        assertTrue(mainFrame.menuItemWithPath("Edit", "Redo").isEnabled());
-        entryTable.requireRowCount(0);
-
-        closeDatabase();
-        exitJabRef();
-    }
-
-}

From 4c3e520a32f986e0df8a6b7187cf6b2dfe322ccc Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 11 Sep 2018 10:55:56 +0200
Subject: [PATCH 085/229] Fix that "Rename and move file" throws file not found
 exception (#4317)

* Fix that "Rename and move file" throws file not found exception

Fixes #4307. Moreover, I refactored a bit how files are renamed/moved to the default file directory. This should make it easier to reuse the code.

* Fix tests
---
 .../org/jabref/cli/ArgumentProcessor.java     |   2 +-
 src/main/java/org/jabref/gui/BasePanel.java   |   6 +-
 .../java/org/jabref/gui/PreviewPanel.java     |   7 +-
 .../org/jabref/gui/actions/CleanupAction.java |   8 +-
 .../gui/actions/IntegrityCheckAction.java     |   2 +-
 .../jabref/gui/actions/WriteXMPAction.java    |   2 +-
 .../gui/cleanup/CleanupPresetPanel.java       |   2 +-
 .../jabref/gui/copyfiles/CopyFilesTask.java   |   2 +-
 .../org/jabref/gui/desktop/JabRefDesktop.java |   4 +-
 .../DocumentViewerViewModel.java              |   4 +-
 .../jabref/gui/entryeditor/EntryEditor.java   |   7 +-
 .../jabref/gui/exporter/ExportCommand.java    |   4 +-
 .../gui/exporter/ExportToClipboardAction.java |   2 +-
 .../externalfiles/AutoSetFileLinksUtil.java   |   8 +-
 .../gui/externalfiles/AutoSetLinks.java       |   2 +-
 .../externalfiles/DownloadExternalFile.java   |   2 +-
 .../gui/externalfiles/DroppedFileHandler.java |  26 +--
 .../ExternalFilesEntryLinker.java             |  17 +-
 .../gui/externalfiles/FindFullTextAction.java |   2 +-
 .../externalfiles/NewDroppedFileHandler.java  |  10 +-
 .../TransferableFileLinkSelection.java        |   4 +-
 .../ExternalFileMenuItem.java                 |   2 +-
 .../jabref/gui/fieldeditors/FieldEditors.java |   2 +-
 .../gui/fieldeditors/LinkedFileViewModel.java | 118 ++++++------
 .../LinkedFilesEditorViewModel.java           |  12 +-
 .../jabref/gui/filelist/AttachFileAction.java |   2 +-
 .../gui/filelist/FileListEntryEditor.java     |   8 +-
 .../LinkedFilesEditDialogViewModel.java       |   6 +-
 .../gui/importer/EntryFromFileCreator.java    |   4 +-
 .../gui/importer/UnlinkedPDFFileFilter.java   |   2 +-
 .../org/jabref/gui/maintable/MainTable.java   |   6 +-
 .../org/jabref/gui/preferences/FileTab.java   |   6 +-
 .../jabref/gui/worker/SendAsEMailAction.java  |   2 +-
 .../logic/cleanup/CleanupPreferences.java     |  26 +--
 .../jabref/logic/cleanup/CleanupWorker.java   |  24 +--
 .../logic/cleanup/MoveFilesCleanup.java       | 109 ++---------
 .../logic/cleanup/RelativePathsCleanup.java   |  11 +-
 .../logic/cleanup/RenamePdfCleanup.java       | 167 ++---------------
 .../externalfiles/LinkedFileHandler.java      | 144 +++++++++++++++
 .../jabref/logic/integrity/FieldCheckers.java |  10 +-
 .../jabref/logic/integrity/FileChecker.java   |  11 +-
 .../logic/integrity/IntegrityCheck.java       |  10 +-
 .../logic/pdf/EntryAnnotationImporter.java    |   8 +-
 .../jabref/logic/pdf/FileAnnotationCache.java |   6 +-
 .../logic/util/io/DatabaseFileLookup.java     |   8 +-
 .../org/jabref/logic/util/io/FileUtil.java    |  19 +-
 .../migrations/FileLinksUpgradeWarning.java   |  16 +-
 .../model/database/BibDatabaseContext.java    |  16 +-
 .../org/jabref/model/entry/LinkedFile.java    |  23 ++-
 ...yPreferences.java => FilePreferences.java} |  21 ++-
 .../org/jabref/model/metadata/MetaData.java   |   2 +-
 .../org/jabref/model/util/FileHelper.java     |   8 +-
 .../org/jabref/pdfimport/PdfImporter.java     |   6 +-
 .../jabref/preferences/JabRefPreferences.java |  26 +--
 .../preferences/PreferencesService.java       |   4 +-
 src/main/resources/l10n/JabRef_en.properties  |   3 +-
 .../AutoSetFileLinksUtilTest.java             |   6 +-
 .../fieldeditors/LinkedFileViewModelTest.java |  24 ++-
 .../logic/cleanup/CleanupWorkerTest.java      |  18 +-
 .../jabref/logic/cleanup/ISSNCleanupTest.java |   5 +-
 .../logic/cleanup/MoveFilesCleanupTest.java   | 174 ++++++------------
 .../logic/cleanup/RenamePdfCleanupTest.java   |  78 ++------
 .../logic/integrity/IntegrityCheckTest.java   |   8 +-
 .../pdf/EntryAnnotationImporterTest.java      |   4 +-
 .../database/BibDatabaseContextTest.java      |   8 +-
 65 files changed, 558 insertions(+), 738 deletions(-)
 create mode 100644 src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
 rename src/main/java/org/jabref/model/metadata/{FileDirectoryPreferences.java => FilePreferences.java} (66%)

diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index 120fd25c775..9d2509b922a 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -454,7 +454,7 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
             BibDatabaseContext databaseContext = pr.getDatabaseContext();
             databaseContext.setDatabaseFile(theFile);
             Globals.prefs.fileDirForDatabase = databaseContext
-                    .getFileDirectories(Globals.prefs.getFileDirectoryPreferences());
+                    .getFileDirectories(Globals.prefs.getFilePreferences());
             System.out.println(Localization.lang("Exporting") + ": " + data[0]);
             Optional<Exporter> exporter = Globals.exportFactory.getExporterByName(data[1]);
             if (!exporter.isPresent()) {
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index b6b506375e2..efe88110716 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -191,7 +191,7 @@ public BasePanel(JabRefFrame frame, BasePanelPreferences preferences, BibDatabas
         this.tableModel = new MainTableDataModel(getBibDatabaseContext());
 
         citationStyleCache = new CitationStyleCache(bibDatabaseContext);
-        annotationCache = new FileAnnotationCache(bibDatabaseContext, Globals.prefs.getFileDirectoryPreferences());
+        annotationCache = new FileAnnotationCache(bibDatabaseContext, Globals.prefs.getFilePreferences());
 
         setupMainPanel();
 
@@ -368,7 +368,7 @@ private void setupActions() {
         actions.put(Actions.OPEN_EXTERNAL_FILE, this::openExternalFile);
 
         actions.put(Actions.OPEN_FOLDER, () -> JabRefExecutorService.INSTANCE.execute(() -> {
-            final List<Path> files = FileUtil.getListOfLinkedFiles(mainTable.getSelectedEntries(), bibDatabaseContext.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()));
+            final List<Path> files = FileUtil.getListOfLinkedFiles(mainTable.getSelectedEntries(), bibDatabaseContext.getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences()));
             for (final Path f : files) {
                 try {
                     JabRefDesktop.openFolderAndSelectFile(f.toAbsolutePath());
@@ -1398,7 +1398,7 @@ public void searchAndOpen() {
             }
 
             final Set<ExternalFileType> types = ExternalFileTypes.getInstance().getExternalFileTypeSelection();
-            final List<Path> dirs = basePanel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
+            final List<Path> dirs = basePanel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences());
             final List<String> extensions = types.stream().map(ExternalFileType::getExtension).collect(Collectors.toList());
 
             // Run the search operation:
diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
index 7a0b16a16a7..cece4cdda37 100644
--- a/src/main/java/org/jabref/gui/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -41,7 +41,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.FieldChangedEvent;
-import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreviewPreferences;
 
 import com.google.common.eventbus.Subscribe;
@@ -89,12 +88,10 @@ public PreviewPanel(BasePanel panel, BibDatabaseContext databaseContext, KeyBind
         this.keyBindingRepository = keyBindingRepository;
 
         fileHandler = new NewDroppedFileHandler(dialogService, databaseContext, externalFileTypes,
-                                                Globals.prefs.getFileDirectoryPreferences(),
-                                                Globals.prefs.getCleanupPreferences(Globals.journalAbbreviationLoader).getFileDirPattern(),
+                Globals.prefs.getFilePreferences(),
                                                 Globals.prefs.getImportFormatPreferences(),
                                                 Globals.prefs.getUpdateFieldPreferences(),
-                                                Globals.getFileUpdateMonitor(),
-                                                Globals.prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
+                Globals.getFileUpdateMonitor());
 
         // Set up scroll pane for preview pane
         setFitToHeight(true);
diff --git a/src/main/java/org/jabref/gui/actions/CleanupAction.java b/src/main/java/org/jabref/gui/actions/CleanupAction.java
index ef179b58b52..a4814735c8d 100644
--- a/src/main/java/org/jabref/gui/actions/CleanupAction.java
+++ b/src/main/java/org/jabref/gui/actions/CleanupAction.java
@@ -74,8 +74,6 @@ private void doCleanup(CleanupPreset preset, BibEntry entry, NamedCompound ce) {
                 Globals.journalAbbreviationLoader));
         List<FieldChange> changes = cleaner.cleanup(preset, entry);
 
-        unsuccessfulRenames = cleaner.getUnsuccessfulRenames();
-
         if (changes.isEmpty()) {
             return;
         }
@@ -90,11 +88,7 @@ private void showResults() {
         if (isCanceled) {
             return;
         }
-        if (unsuccessfulRenames > 0) { //Rename failed for at least one entry
-            dialogService.showErrorDialogAndWait(
-                    Localization.lang("Autogenerate PDF Names"),
-                    Localization.lang("File rename failed for %0 entries.", Integer.toString(unsuccessfulRenames)));
-        }
+
         if (modifiedEntriesCount > 0) {
             panel.updateEntryEditorIfShowing();
             panel.markBaseChanged();
diff --git a/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java
index d5702800f5f..ad07a4dde80 100644
--- a/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java
@@ -48,7 +48,7 @@ public IntegrityCheckAction(JabRefFrame frame) {
     @Override
     public void execute() {
         IntegrityCheck check = new IntegrityCheck(frame.getCurrentBasePanel().getBibDatabaseContext(),
-                Globals.prefs.getFileDirectoryPreferences(),
+                Globals.prefs.getFilePreferences(),
                 Globals.prefs.getBibtexKeyPatternPreferences(),
                 Globals.journalAbbreviationLoader.getRepository(Globals.prefs.getJournalAbbreviationPreferences()),
                 Globals.prefs.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
diff --git a/src/main/java/org/jabref/gui/actions/WriteXMPAction.java b/src/main/java/org/jabref/gui/actions/WriteXMPAction.java
index e2d549e2c4e..9d77d998195 100644
--- a/src/main/java/org/jabref/gui/actions/WriteXMPAction.java
+++ b/src/main/java/org/jabref/gui/actions/WriteXMPAction.java
@@ -111,7 +111,7 @@ private void writeXMP() {
             // Make a list of all PDFs linked from this entry:
             List<Path> files = entry.getFiles().stream()
                                     .filter(file -> file.getFileType().equalsIgnoreCase("pdf"))
-                                    .map(file -> file.findIn(basePanel.getBibDatabaseContext(), Globals.prefs.getFileDirectoryPreferences()))
+                                    .map(file -> file.findIn(basePanel.getBibDatabaseContext(), Globals.prefs.getFilePreferences()))
                                     .filter(Optional::isPresent)
                                     .map(Optional::get)
                                     .collect(Collectors.toList());
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
index 32c3dbeb61b..b5127707c6c 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -53,7 +53,7 @@ private void init() {
         cleanUpISSN = new JCheckBox(Localization.lang("Reformat ISSN"));
 
         Optional<Path> firstExistingDir = databaseContext
-                .getFirstExistingFileDir(JabRefPreferences.getInstance().getFileDirectoryPreferences());
+                .getFirstExistingFileDir(JabRefPreferences.getInstance().getFilePreferences());
         if (firstExistingDir.isPresent()) {
             cleanUpMovePDF = new JCheckBox(Localization.lang("Move linked files to default file directory %0",
                     firstExistingDir.get().toString()));
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
index 7dd83dbd4be..aec95051171 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
@@ -74,7 +74,7 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
 
                     LinkedFile fileName = files.get(j);
 
-                    Optional<Path> fileToExport = fileName.findIn(databaseContext, Globals.prefs.getFileDirectoryPreferences());
+                    Optional<Path> fileToExport = fileName.findIn(databaseContext, Globals.prefs.getFilePreferences());
 
                     newPath = OptionalUtil.combine(Optional.of(exportPath), fileToExport, resolvePathFilename);
 
diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
index c9c1a515aa4..aa7f9dd22fc 100644
--- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
@@ -57,7 +57,7 @@ public static void openExternalViewer(BibDatabaseContext databaseContext, String
         String fieldName = initialFieldName;
         if (FieldName.PS.equals(fieldName) || FieldName.PDF.equals(fieldName)) {
             // Find the default directory for this field type:
-            List<String> dir = databaseContext.getFileDirectories(fieldName, Globals.prefs.getFileDirectoryPreferences());
+            List<String> dir = databaseContext.getFileDirectories(fieldName, Globals.prefs.getFilePreferences());
 
             Optional<Path> file = FileHelper.expandFilename(link, dir);
 
@@ -128,7 +128,7 @@ public static boolean openExternalFileAnyFormat(final BibDatabaseContext databas
             return true;
         }
 
-        Optional<Path> file = FileHelper.expandFilename(databaseContext, link, Globals.prefs.getFileDirectoryPreferences());
+        Optional<Path> file = FileHelper.expandFilename(databaseContext, link, Globals.prefs.getFilePreferences());
         if (file.isPresent() && Files.exists(file.get())) {
             // Open the file:
             String filePath = file.get().toString();
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
index 22e54a97d28..61ac47eb2ef 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
@@ -112,8 +112,8 @@ private void setCurrentDocument(Path path) {
     public void switchToFile(LinkedFile file) {
         if (file != null) {
             stateManager.getActiveDatabase().ifPresent(database ->
-                    file.findIn(database, Globals.prefs.getFileDirectoryPreferences())
-                            .ifPresent(this::setCurrentDocument));
+                    file.findIn(database, Globals.prefs.getFilePreferences())
+                        .ifPresent(this::setCurrentDocument));
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index b71d2b3e727..505aed2298a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -48,7 +48,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.JabRefPreferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import org.fxmisc.easybind.EasyBind;
@@ -102,12 +101,10 @@ public EntryEditor(BasePanel panel, EntryEditorPreferences preferences, FileUpda
         this.dialogService = dialogService;
 
         fileHandler = new NewDroppedFileHandler(dialogService, databaseContext, externalFileTypes,
-                                                Globals.prefs.getFileDirectoryPreferences(),
-                                                Globals.prefs.getCleanupPreferences(Globals.journalAbbreviationLoader).getFileDirPattern(),
+                Globals.prefs.getFilePreferences(),
                                                 Globals.prefs.getImportFormatPreferences(),
                                                 Globals.prefs.getUpdateFieldPreferences(),
-                                                Globals.getFileUpdateMonitor(),
-                                                Globals.prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
+                Globals.getFileUpdateMonitor());
 
         ViewLoader.view(this)
                   .root(this)
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCommand.java b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
index 86c70a8a526..102d36d9e24 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -86,8 +86,8 @@ private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilt
         // so formatters can resolve linked files correctly.
         // (This is an ugly hack!)
         Globals.prefs.fileDirForDatabase = frame.getCurrentBasePanel()
-                .getBibDatabaseContext()
-                .getFileDirectories(Globals.prefs.getFileDirectoryPreferences());
+                                                .getBibDatabaseContext()
+                                                .getFileDirectories(Globals.prefs.getFilePreferences());
 
         // Make sure we remember which filter was used, to set
         // the default for next time:
diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
index ee1cfad868d..626fb96723a 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
@@ -73,7 +73,7 @@ private String exportToClipboard(Exporter exporter) {
         // Set the global variable for this database's file directory before exporting,
         // so formatters can resolve linked files correctly.
         // (This is an ugly hack!)
-        Globals.prefs.fileDirForDatabase = panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()).stream().map(Path::toString).collect(Collectors.toList());
+        Globals.prefs.fileDirForDatabase = panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences()).stream().map(Path::toString).collect(Collectors.toList());
 
         Path tmp = null;
         try {
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
index 1ad53ec5559..f1f07088a16 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
@@ -18,7 +18,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.util.FileHelper;
 
 import org.slf4j.Logger;
@@ -31,8 +31,8 @@ public class AutoSetFileLinksUtil {
     private AutoLinkPreferences autoLinkPreferences;
     private ExternalFileTypes externalFileTypes;
 
-    public AutoSetFileLinksUtil(BibDatabaseContext databaseContext, FileDirectoryPreferences fileDirectoryPreferences, AutoLinkPreferences autoLinkPreferences, ExternalFileTypes externalFileTypes) {
-        this(databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences), autoLinkPreferences, externalFileTypes);
+    public AutoSetFileLinksUtil(BibDatabaseContext databaseContext, FilePreferences filePreferences, AutoLinkPreferences autoLinkPreferences, ExternalFileTypes externalFileTypes) {
+        this(databaseContext.getFileDirectoriesAsPaths(filePreferences), autoLinkPreferences, externalFileTypes);
     }
 
     public AutoSetFileLinksUtil(List<Path> directories, AutoLinkPreferences autoLinkPreferences, ExternalFileTypes externalFileTypes) {
@@ -68,7 +68,7 @@ public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry) throws IOEx
                         .orElse(Optional.of(new UnknownExternalFileType("")));
 
                 String strType = type.isPresent() ? type.get().getName() : "";
-                String relativeFilePath = FileUtil.shortenFileName(foundFile, directories).toString();
+                String relativeFilePath = FileUtil.relativize(foundFile, directories).toString();
                 LinkedFile linkedFile = new LinkedFile("", relativeFilePath, strType);
                 linkedFiles.add(linkedFile);
             }
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java b/src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java
index 1e9d9813dee..d874493a98d 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java
@@ -89,7 +89,7 @@ public static Runnable autoSetLinks(final List<BibEntry> entries, final NamedCom
 
         Runnable r = () -> {
             boolean foundAny = false;
-            AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(databaseContext, Globals.prefs.getFileDirectoryPreferences(), Globals.prefs.getAutoLinkPreferences(), ExternalFileTypes.getInstance());
+            AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(databaseContext, Globals.prefs.getFilePreferences(), Globals.prefs.getAutoLinkPreferences(), ExternalFileTypes.getInstance());
 
             for (BibEntry entry : entries) {
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java b/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java
index e70395197e6..b4e1ad794db 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java
@@ -202,7 +202,7 @@ public void download(URL url, String mimeType, final DownloadCallback callback)
             fileType = ExternalFileTypes.getInstance().getExternalFileTypeByExt(suffix);
         }
         String suggestedName = getSuggestedFileName(suffix);
-        List<String> fDirectory = databaseContext.getFileDirectories(Globals.prefs.getFileDirectoryPreferences());
+        List<String> fDirectory = databaseContext.getFileDirectories(Globals.prefs.getFilePreferences());
         String directory;
         if (fDirectory.isEmpty()) {
             directory = null;
diff --git a/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java b/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
index 58bfb1e87f4..b4cc4e2e9bf 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
@@ -147,9 +147,9 @@ public void handleDroppedfile(String fileName, ExternalFileType fileType, BibEnt
         String destFilename;
 
         if (linkInPlace.isSelected()) {
-            destFilename = FileUtil.shortenFileName(Paths.get(fileName),
-                    panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()))
-                    .toString();
+            destFilename = FileUtil.relativize(Paths.get(fileName),
+                    panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences()))
+                                   .toString();
         } else {
             destFilename = renameCheckBox.isSelected() ? renameToTextBox.getText() : Paths.get(fileName).toString();
             if (copyRadioButton.isSelected()) {
@@ -199,9 +199,9 @@ public void linkPdfToEntry(String fileName, BibEntry entry) {
         NamedCompound edits = new NamedCompound(Localization.lang("Drop %0", fileType.getExtension()));
 
         if (linkInPlace.isSelected()) {
-            destFilename = FileUtil.shortenFileName(Paths.get(fileName),
-                    panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()))
-                    .toString();
+            destFilename = FileUtil.relativize(Paths.get(fileName),
+                    panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences()))
+                                   .toString();
         } else {
             destFilename = renameCheckBox.isSelected() ? renameToTextBox.getText() : new File(fileName).getName();
             if (copyRadioButton.isSelected()) {
@@ -284,9 +284,9 @@ private boolean tryXmpImport(String fileName, ExternalFileType fileType, NamedCo
         String destFilename;
 
         if (linkInPlace.isSelected()) {
-            destFilename = FileUtil.shortenFileName(Paths.get(fileName),
-                    panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()))
-                    .toString();
+            destFilename = FileUtil.relativize(Paths.get(fileName),
+                    panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences()))
+                                   .toString();
         } else {
             if (renameCheckBox.isSelected() || (single == null)) {
                 destFilename = fileName;
@@ -325,7 +325,7 @@ private boolean showLinkMoveCopyRenameDialog(String linkFileName, ExternalFileTy
         String dialogTitle = Localization.lang("Link to file %0", linkFileName);
 
         Optional<Path> dir = panel.getBibDatabaseContext()
-                .getFirstExistingFileDir(Globals.prefs.getFileDirectoryPreferences());
+                                  .getFirstExistingFileDir(Globals.prefs.getFilePreferences());
 
         if (!dir.isPresent()) {
             destDirLabel.setText(Localization.lang("File directory is not set or does not exist!"));
@@ -416,7 +416,7 @@ private void doLink(BibEntry entry, ExternalFileType fileType, String filename,
         if (avoidDuplicate) {
             // For comparison, find the absolute filename:
             List<Path> dirs = panel.getBibDatabaseContext()
-                    .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
+                                   .getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences());
             String absFilename;
             if (new File(filename).isAbsolute() || dirs.isEmpty()) {
                 absFilename = filename;
@@ -475,7 +475,7 @@ private void doLink(BibEntry entry, ExternalFileType fileType, String filename,
      */
     private boolean doMove(String fileName, String destFilename, NamedCompound edits) {
         Optional<Path> dir = panel.getBibDatabaseContext()
-                .getFirstExistingFileDir(Globals.prefs.getFileDirectoryPreferences());
+                                  .getFirstExistingFileDir(Globals.prefs.getFilePreferences());
 
         if (dir.isPresent()) {
             Path destFile = dir.get().resolve(destFilename);
@@ -522,7 +522,7 @@ private boolean doMove(String fileName, String destFilename, NamedCompound edits
     private boolean doCopy(String fileName, String toFile, NamedCompound edits) {
 
         List<String> dirs = panel.getBibDatabaseContext()
-                .getFileDirectories(Globals.prefs.getFileDirectoryPreferences());
+                                 .getFileDirectories(Globals.prefs.getFilePreferences());
         int found = -1;
         for (int i = 0; i < dirs.size(); i++) {
             if (new File(dirs.get(i)).exists()) {
diff --git a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
index 7d6e83c6921..98640b3a377 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
@@ -14,26 +14,26 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
 public class ExternalFilesEntryLinker {
 
     private final ExternalFileTypes externalFileTypes;
-    private final FileDirectoryPreferences fileDirectoryPreferences;
+    private final FilePreferences filePreferences;
     private final BibDatabaseContext bibDatabaseContext;
     private final MoveFilesCleanup moveFilesCleanup;
     private final RenamePdfCleanup renameFilesCleanup;
 
-    public ExternalFilesEntryLinker(ExternalFileTypes externalFileTypes, FileDirectoryPreferences fileDirectoryPreferences, String fileDirPattern, BibDatabaseContext bibDatabaseContext, String fileNamePattern) {
+    public ExternalFilesEntryLinker(ExternalFileTypes externalFileTypes, FilePreferences filePreferences, BibDatabaseContext bibDatabaseContext) {
         this.externalFileTypes = externalFileTypes;
-        this.fileDirectoryPreferences = fileDirectoryPreferences;
+        this.filePreferences = filePreferences;
         this.bibDatabaseContext = bibDatabaseContext;
-        this.moveFilesCleanup = new MoveFilesCleanup(bibDatabaseContext, fileDirPattern, fileDirectoryPreferences);
-        this.renameFilesCleanup = new RenamePdfCleanup(false, bibDatabaseContext, fileNamePattern, fileDirectoryPreferences);
+        this.moveFilesCleanup = new MoveFilesCleanup(bibDatabaseContext, filePreferences);
+        this.renameFilesCleanup = new RenamePdfCleanup(false, bibDatabaseContext, filePreferences);
     }
 
     public Optional<Path> copyFileToFileDir(Path file) {
-        Optional<Path> firstExistingFileDir = bibDatabaseContext.getFirstExistingFileDir(fileDirectoryPreferences);
+        Optional<Path> firstExistingFileDir = bibDatabaseContext.getFirstExistingFileDir(filePreferences);
         if (firstExistingFileDir.isPresent()) {
             Path targetFile = firstExistingFileDir.get().resolve(file.getFileName());
             if (FileUtil.copyFile(file, targetFile, false)) {
@@ -56,13 +56,12 @@ public void addFileToEntry(BibEntry entry, Path file) {
     }
 
     public void addFilesToEntry(BibEntry entry, List<Path> files) {
-
         for (Path file : files) {
             FileUtil.getFileExtension(file).ifPresent(ext -> {
 
                 ExternalFileType type = externalFileTypes.getExternalFileTypeByExt(ext)
                                                          .orElse(new UnknownExternalFileType(ext));
-                Path relativePath = FileUtil.shortenFileName(file, bibDatabaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences));
+                Path relativePath = FileUtil.relativize(file, bibDatabaseContext.getFileDirectoriesAsPaths(filePreferences));
                 LinkedFile linkedfile = new LinkedFile("", relativePath.toString(), type.getName());
                 entry.addFile(linkedfile);
             });
diff --git a/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
index ef81d91e030..bb72fa8ff3f 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
@@ -91,7 +91,7 @@ private void downloadFullTexts(Map<Optional<URL>, BibEntry> downloads) {
             BibEntry entry = download.getValue();
             Optional<URL> result = download.getKey();
             if (result.isPresent()) {
-                Optional<Path> dir = basePanel.getBibDatabaseContext().getFirstExistingFileDir(Globals.prefs.getFileDirectoryPreferences());
+                Optional<Path> dir = basePanel.getBibDatabaseContext().getFirstExistingFileDir(Globals.prefs.getFilePreferences());
 
                 if (!dir.isPresent()) {
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/NewDroppedFileHandler.java b/src/main/java/org/jabref/gui/externalfiles/NewDroppedFileHandler.java
index 58ab13155e5..77cfd682642 100644
--- a/src/main/java/org/jabref/gui/externalfiles/NewDroppedFileHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/NewDroppedFileHandler.java
@@ -24,7 +24,7 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -45,19 +45,17 @@ public class NewDroppedFileHandler {
     public NewDroppedFileHandler(DialogService dialogService,
                                  BibDatabaseContext bibDatabaseContext,
                                  ExternalFileTypes externalFileTypes,
-                                 FileDirectoryPreferences fileDirectoryPreferences,
-                                 String fileDirPattern,
+                                 FilePreferences filePreferences,
                                  ImportFormatPreferences importFormatPreferences,
                                  UpdateFieldPreferences updateFieldPreferences,
-                                 FileUpdateMonitor fileupdateMonitor,
-                                 String fileNamePattern) {
+                                 FileUpdateMonitor fileupdateMonitor) {
 
         this.dialogService = dialogService;
         this.bibDatabaseContext = bibDatabaseContext;
         this.updateFieldPreferences = updateFieldPreferences;
         this.fileUpdateMonitor = fileupdateMonitor;
 
-        this.linker = new ExternalFilesEntryLinker(externalFileTypes, fileDirectoryPreferences, fileDirPattern, bibDatabaseContext, fileNamePattern);
+        this.linker = new ExternalFilesEntryLinker(externalFileTypes, filePreferences, bibDatabaseContext);
         this.contentImporter = new ExternalFilesContentImporter(importFormatPreferences);
     }
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java b/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java
index ea3f0626f5b..798189cb1c6 100644
--- a/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java
+++ b/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java
@@ -31,8 +31,8 @@ public TransferableFileLinkSelection(BasePanel panel, List<BibEntry> selection)
         if (!files.isEmpty()) {
             // Find the default directory for this field type, if any:
             LinkedFile firstFile = files.get(0);
-            firstFile.findIn(panel.getBibDatabaseContext(), Globals.prefs.getFileDirectoryPreferences())
-                .ifPresent(fileList::add);
+            firstFile.findIn(panel.getBibDatabaseContext(), Globals.prefs.getFilePreferences())
+                     .ifPresent(fileList::add);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
index c15a22c83ac..a2ebcb02dae 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
@@ -57,7 +57,7 @@ public ExternalFileMenuItem(JabRefFrame frame, String name, String link, Icon ic
     public void actionPerformed(ActionEvent e) {
         boolean success = openLink();
         if (!success) {
-            List<Path> searchedDirs = databaseContext.getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
+            List<Path> searchedDirs = databaseContext.getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences());
             frame.output(Localization.lang("Unable to open %0", link) + " " + Arrays.toString(searchedDirs.toArray()));
         }
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
index cff53232371..9809e926cc8 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
@@ -43,7 +43,7 @@ public static FieldEditorFX getForField(final String fieldName,
 
         final FieldCheckers fieldCheckers = new FieldCheckers(
                 databaseContext,
-                preferences.getFileDirectoryPreferences(),
+                preferences.getFilePreferences(),
                 journalAbbreviationRepository,
                 preferences.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index ee0a04e5b4f..3ef40844f14 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -34,17 +34,15 @@
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
-import org.jabref.logic.cleanup.MoveFilesCleanup;
-import org.jabref.logic.cleanup.RenamePdfCleanup;
+import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.net.URLDownload;
-import org.jabref.logic.util.io.FileUtil;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.logic.xmp.XmpUtilWriter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -64,10 +62,9 @@ public class LinkedFileViewModel extends AbstractViewModel {
     private final DialogService dialogService;
     private final BibEntry entry;
     private final TaskExecutor taskExecutor;
-    private final FileDirectoryPreferences fileDirectoryPreferences;
-    private final String fileDirPattern;
+    private final FilePreferences filePreferences;
     private final XmpPreferences xmpPreferences;
-    private final String fileNamePattern;
+    private final LinkedFileHandler linkedFileHandler;
 
     public LinkedFileViewModel(LinkedFile linkedFile,
                                BibEntry entry,
@@ -77,15 +74,14 @@ public LinkedFileViewModel(LinkedFile linkedFile,
                                JabRefPreferences preferences) {
 
         this.linkedFile = linkedFile;
+        this.filePreferences = preferences.getFilePreferences();
+        this.linkedFileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
         this.databaseContext = databaseContext;
         this.entry = entry;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
 
         xmpPreferences = preferences.getXMPPreferences();
-        fileNamePattern = preferences.get(JabRefPreferences.IMPORT_FILENAMEPATTERN);
-        fileDirectoryPreferences = preferences.getFileDirectoryPreferences();
-        fileDirPattern = preferences.get(JabRefPreferences.IMPORT_FILEDIRPATTERN);
         downloadOngoing.bind(downloadProgress.greaterThanOrEqualTo(0).and(downloadProgress.lessThan(1)));
         canWriteXMPMetadata.setValue(!linkedFile.isOnlineLink() && linkedFile.getFileType().equalsIgnoreCase("pdf"));
     }
@@ -178,7 +174,7 @@ public void openFolder() {
                 path = Paths.get(linkedFile.getLink());
             } else {
                 // relative to file folder
-                for (Path folder : databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences)) {
+                for (Path folder : databaseContext.getFileDirectoriesAsPaths(filePreferences)) {
                     Path file = folder.resolve(linkedFile.getLink());
                     if (Files.exists(file)) {
                         path = file;
@@ -202,41 +198,43 @@ public void rename() {
             return;
         }
 
-        Optional<Path> file = linkedFile.findIn(databaseContext, fileDirectoryPreferences);
-        if ((file.isPresent()) && Files.exists(file.get())) {
-            RenamePdfCleanup pdfCleanup = new RenamePdfCleanup(false, databaseContext, fileDirPattern, fileDirectoryPreferences, linkedFile);
-            performRenameWithConflictCheck(file.get(), pdfCleanup);
+        Optional<Path> file = linkedFile.findIn(databaseContext, filePreferences);
+        if (file.isPresent()) {
+            performRenameWithConflictCheck();
         } else {
             dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
         }
     }
 
-    private void performRenameWithConflictCheck(Path file, RenamePdfCleanup pdfCleanup) {
-        boolean confirm;
-        Optional<Path> fileConflictCheck = pdfCleanup.findExistingFile(linkedFile, entry);
-        if (!fileConflictCheck.isPresent()) {
-            try {
-                pdfCleanup.cleanupWithException(entry);
-            } catch (IOException e) {
-                dialogService.showErrorDialogAndWait(Localization.lang("Rename failed"), Localization.lang("JabRef cannot access the file because it is being used by another process."));
-            }
-        } else {
-            String targetFileName = pdfCleanup.getTargetFileName(linkedFile, entry);
-            confirm = dialogService.showConfirmationDialogAndWait(Localization.lang("File exists"),
-                                                                  Localization.lang("'%0' exists. Overwrite file?", targetFileName),
-                                                                  Localization.lang("Overwrite"),
-                                                                  Localization.lang("Cancel"));
+    private void performRenameWithConflictCheck() {
+        Optional<Path> fileConflictCheck = linkedFileHandler.findExistingFile(linkedFile, entry);
+        if (fileConflictCheck.isPresent()) {
+            String targetFileName = linkedFileHandler.getSuggestedFileName();
+            boolean confirmOverwrite = dialogService.showConfirmationDialogAndWait(
+                    Localization.lang("File exists"),
+                    Localization.lang("'%0' exists. Overwrite file?", targetFileName),
+                    Localization.lang("Overwrite"));
 
-            if (confirm) {
+            if (confirmOverwrite) {
                 try {
-                    FileUtil.renameFileWithException(fileConflictCheck.get(), file, true);
-                    pdfCleanup.cleanupWithException(entry);
+                    Files.delete(fileConflictCheck.get());
                 } catch (IOException e) {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Rename failed"),
-                                                         Localization.lang("JabRef cannot access the file because it is being used by another process."));
+                    dialogService.showErrorDialogAndWait(
+                            Localization.lang("Rename failed"),
+                            Localization.lang("JabRef cannot access the file because it is being used by another process."),
+                            e);
+                    return;
                 }
+            } else {
+                return;
             }
         }
+
+        try {
+            linkedFileHandler.renameToSuggestedName();
+        } catch (IOException e) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Rename failed"), Localization.lang("JabRef cannot access the file because it is being used by another process."));
+        }
     }
 
     public void moveToDefaultDirectory() {
@@ -246,17 +244,23 @@ public void moveToDefaultDirectory() {
         }
 
         // Get target folder
-        Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(fileDirectoryPreferences);
+        Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(filePreferences);
         if (!fileDir.isPresent()) {
             dialogService.showErrorDialogAndWait(Localization.lang("Move file"), Localization.lang("File directory is not set or does not exist!"));
             return;
         }
 
-        Optional<Path> file = linkedFile.findIn(databaseContext, fileDirectoryPreferences);
-        if ((file.isPresent()) && Files.exists(file.get())) {
+        Optional<Path> file = linkedFile.findIn(databaseContext, filePreferences);
+        if ((file.isPresent())) {
             // Found the linked file, so move it
-            MoveFilesCleanup moveFiles = new MoveFilesCleanup(databaseContext, fileDirPattern, fileDirectoryPreferences, linkedFile);
-            moveFiles.cleanup(entry);
+            try {
+                linkedFileHandler.moveToDefaultDirectory();
+            } catch (IOException exception) {
+                dialogService.showErrorDialogAndWait(
+                        Localization.lang("Move file"),
+                        Localization.lang("Could not move file '%0'.", file.get().toString()),
+                        exception);
+            }
         } else {
             // File doesn't exist, so we can't move it.
             dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
@@ -268,8 +272,14 @@ public void moveToDefaultDirectoryAndRename() {
         rename();
     }
 
-    public boolean delete(FileDirectoryPreferences prefs) {
-        Optional<Path> file = linkedFile.findIn(databaseContext, prefs);
+    /**
+     * Asks the user for confirmation that he really wants to the delete the file from disk (or just remove the link).
+     *
+     * @return true if the linked file should be removed afterwards from the entry (i.e because it was deleted
+     * successfully, does not exist in the first place or the user choose to remove it)
+     */
+    public boolean delete() {
+        Optional<Path> file = linkedFile.findIn(databaseContext, filePreferences);
 
         if (!file.isPresent()) {
             LOGGER.warn("Could not find file " + linkedFile.getLink());
@@ -279,9 +289,9 @@ public boolean delete(FileDirectoryPreferences prefs) {
         ButtonType removeFromEntry = new ButtonType(Localization.lang("Remove from entry"), ButtonData.YES);
         ButtonType deleteFromEntry = new ButtonType(Localization.lang("Delete from disk"));
         Optional<ButtonType> buttonType = dialogService.showCustomButtonDialogAndWait(AlertType.INFORMATION,
-                                                                                      Localization.lang("Delete '%0'", file.get().toString()),
-                                                                                      Localization.lang("Delete the selected file permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk."),
-                                                                                      removeFromEntry, deleteFromEntry, ButtonType.CANCEL);
+                Localization.lang("Delete '%0'", file.get().toString()),
+                Localization.lang("Delete the selected file permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk."),
+                removeFromEntry, deleteFromEntry, ButtonType.CANCEL);
 
         if (buttonType.isPresent()) {
             if (buttonType.get().equals(removeFromEntry)) {
@@ -316,7 +326,7 @@ public void edit() {
     public void writeXMPMetadata() {
         // Localization.lang("Writing XMP-metadata...")
         BackgroundTask<Void> writeTask = BackgroundTask.wrap(() -> {
-            Optional<Path> file = linkedFile.findIn(databaseContext, fileDirectoryPreferences);
+            Optional<Path> file = linkedFile.findIn(databaseContext, filePreferences);
             if (!file.isPresent()) {
                 // TODO: Print error message
                 // Localization.lang("PDF does not exist");
@@ -343,7 +353,7 @@ public void download() {
         }
 
         try {
-            Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(fileDirectoryPreferences);
+            Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(filePreferences);
             if (!targetDirectory.isPresent()) {
                 dialogService.showErrorDialogAndWait(Localization.lang("Download file"), Localization.lang("File directory is not set or does not exist!"));
                 return;
@@ -356,13 +366,12 @@ public void download() {
                         String suggestedTypeName = suggestedType.map(ExternalFileType::getName).orElse("");
                         linkedFile.setFileType(suggestedTypeName);
 
-                        String suffix = suggestedType.map(ExternalFileType::getExtension).orElse("");
-                        String suggestedName = getSuggestedFileName(suffix);
+                        String suggestedName = linkedFileHandler.getSuggestedFileName();
                         return targetDirectory.get().resolve(suggestedName);
                     })
                     .then(destination -> new FileDownloadTask(urlDownload.getSource(), destination))
                     .onSuccess(destination -> {
-                        LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences));
+                        LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, databaseContext.getFileDirectoriesAsPaths(filePreferences));
                         linkedFile.setLink(newLinkedFile.getLink());
                         linkedFile.setFileType(newLinkedFile.getFileType());
                     })
@@ -405,15 +414,6 @@ private Optional<ExternalFileType> inferFileTypeFromURL(String url) {
         }
     }
 
-    private String getSuggestedFileName(String suffix) {
-        String plannedName = FileUtil.createFileNameFromPattern(databaseContext.getDatabase(), entry, fileNamePattern);
-
-        if (!suffix.isEmpty()) {
-            plannedName += "." + suffix;
-        }
-        return plannedName;
-    }
-
     public LinkedFile getFile() {
         return linkedFile;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
index b215e97a4ad..815d4be3a04 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
@@ -91,12 +91,12 @@ public static LinkedFile fromFile(Path file, List<Path> fileDirectories) {
         ExternalFileType suggestedFileType = ExternalFileTypes.getInstance()
                 .getExternalFileTypeByExt(fileExtension)
                 .orElse(new UnknownExternalFileType(fileExtension));
-        Path relativePath = FileUtil.shortenFileName(file, fileDirectories);
+        Path relativePath = FileUtil.relativize(file, fileDirectories);
         return new LinkedFile("", relativePath.toString(), suggestedFileType.getName());
     }
 
     public LinkedFileViewModel fromFile(Path file) {
-        List<Path> fileDirectories = databaseContext.getFileDirectoriesAsPaths(preferences.getFileDirectoryPreferences());
+        List<Path> fileDirectories = databaseContext.getFileDirectoriesAsPaths(preferences.getFilePreferences());
 
         LinkedFile linkedFile = fromFile(file, fileDirectories);
         return new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
@@ -126,14 +126,14 @@ public ListProperty<LinkedFileViewModel> filesProperty() {
     }
 
     public void addNewFile() {
-        Path workingDirectory = databaseContext.getFirstExistingFileDir(preferences.getFileDirectoryPreferences())
+        Path workingDirectory = databaseContext.getFirstExistingFileDir(preferences.getFilePreferences())
                                                .orElse(Paths.get(preferences.get(JabRefPreferences.WORKING_DIRECTORY)));
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .withInitialDirectory(workingDirectory)
                 .build();
 
-        List<Path> fileDirectories = databaseContext.getFileDirectoriesAsPaths(preferences.getFileDirectoryPreferences());
+        List<Path> fileDirectories = databaseContext.getFileDirectoriesAsPaths(preferences.getFilePreferences());
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
                 LinkedFile newLinkedFile = fromFile(newFile, fileDirectories);
             files.add(new LinkedFileViewModel(newLinkedFile, entry, databaseContext, taskExecutor, dialogService, preferences));
@@ -158,7 +158,7 @@ public void bindToEntry(BibEntry entry) {
     private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(BibEntry entry) {
         List<LinkedFileViewModel> result = new ArrayList<>();
 
-        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(databaseContext, preferences.getFileDirectoryPreferences(), preferences.getAutoLinkPreferences(), ExternalFileTypes.getInstance());
+        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(databaseContext, preferences.getFilePreferences(), preferences.getAutoLinkPreferences(), ExternalFileTypes.getInstance());
         try {
             List<LinkedFile> linkedFiles = util.findAssociatedNotLinkedFiles(entry);
             for (LinkedFile linkedFile : linkedFiles) {
@@ -214,7 +214,7 @@ public void deleteFile(LinkedFileViewModel file) {
         if (file.getFile().isOnlineLink()) {
             removeFileLink(file);
         } else {
-            boolean deleteSuccessful = file.delete(preferences.getFileDirectoryPreferences());
+            boolean deleteSuccessful = file.delete();
             if (deleteSuccessful) {
                 files.remove(file);
             }
diff --git a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
index 47e89416858..c36318ea60e 100644
--- a/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/filelist/AttachFileAction.java
@@ -38,7 +38,7 @@ public void execute() {
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
 
-            LinkedFile linkedFile = LinkedFilesEditorViewModel.fromFile(newFile, panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()));
+            LinkedFile linkedFile = LinkedFilesEditorViewModel.fromFile(newFile, panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences()));
 
             LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(linkedFile);
 
diff --git a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
index 31c046720f0..fc590f146e2 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
@@ -86,7 +86,7 @@ public class FileListEntryEditor {
     private final ActionListener browsePressed = e -> {
         String fileText = link.getText().trim();
         Optional<Path> file = FileHelper.expandFilename(this.databaseContext, fileText,
-                Globals.prefs.getFileDirectoryPreferences());
+                Globals.prefs.getFilePreferences());
 
         Path workingDir = file.orElse(Paths.get(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)));
         String fileName = Paths.get(fileText).getFileName().toString();
@@ -108,8 +108,8 @@ public class FileListEntryEditor {
 
             // If the file is below the file directory, make the path relative:
             List<Path> fileDirectories = this.databaseContext
-                    .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
-            newFile = FileUtil.shortenFileName(newFile, fileDirectories);
+                    .getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences());
+            newFile = FileUtil.relativize(newFile, fileDirectories);
 
             link.setText(newFile.toString());
             link.requestFocus();
@@ -346,7 +346,7 @@ private void storeSettings(LinkedFile listEntry) {
         String fileLink = "";
         // See if we should trim the file link to be relative to the file directory:
         try {
-            List<String> dirs = databaseContext.getFileDirectories(Globals.prefs.getFileDirectoryPreferences());
+            List<String> dirs = databaseContext.getFileDirectories(Globals.prefs.getFilePreferences());
             if (dirs.isEmpty()) {
                 fileLink = this.link.getText().trim();
             } else {
diff --git a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
index 94c534381c1..96005fc6b57 100644
--- a/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/filelist/LinkedFilesEditDialogViewModel.java
@@ -70,7 +70,7 @@ private void setExternalFileTypeByExtension(String link) {
     public void openBrowseDialog() {
         String fileText = link.get();
 
-        Optional<Path> file = FileHelper.expandFilename(database, fileText, preferences.getFileDirectoryPreferences());
+        Optional<Path> file = FileHelper.expandFilename(database, fileText, preferences.getFilePreferences());
 
         Path workingDir = file.orElse(preferences.getWorkingDir());
         String fileName = Paths.get(fileText).getFileName().toString();
@@ -127,8 +127,8 @@ public LinkedFile getNewLinkedFile() {
     }
 
     private String relativize(Path filePath) {
-        List<Path> fileDirectories = database.getFileDirectoriesAsPaths(preferences.getFileDirectoryPreferences());
-        return FileUtil.shortenFileName(filePath, fileDirectories).toString();
+        List<Path> fileDirectories = database.getFileDirectoriesAsPaths(preferences.getFilePreferences());
+        return FileUtil.relativize(filePath, fileDirectories).toString();
     }
 
 }
diff --git a/src/main/java/org/jabref/gui/importer/EntryFromFileCreator.java b/src/main/java/org/jabref/gui/importer/EntryFromFileCreator.java
index dd83b21d4ee..80264c77c00 100644
--- a/src/main/java/org/jabref/gui/importer/EntryFromFileCreator.java
+++ b/src/main/java/org/jabref/gui/importer/EntryFromFileCreator.java
@@ -136,8 +136,8 @@ private void addFileInfo(BibEntry entry, File file) {
                 .getExternalFileTypeByExt(externalFileType.getFieldName());
 
         List<Path> possibleFilePaths = JabRefGUI.getMainFrame().getCurrentBasePanel().getBibDatabaseContext()
-                .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
-        Path shortenedFileName = FileUtil.shortenFileName(file.toPath(), possibleFilePaths);
+                                                .getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences());
+        Path shortenedFileName = FileUtil.relativize(file.toPath(), possibleFilePaths);
         FileListEntry fileListEntry = new FileListEntry("", shortenedFileName.toString(), fileType);
 
         FileListTableModel model = new FileListTableModel();
diff --git a/src/main/java/org/jabref/gui/importer/UnlinkedPDFFileFilter.java b/src/main/java/org/jabref/gui/importer/UnlinkedPDFFileFilter.java
index 9686a8af9ae..e387a6bd758 100644
--- a/src/main/java/org/jabref/gui/importer/UnlinkedPDFFileFilter.java
+++ b/src/main/java/org/jabref/gui/importer/UnlinkedPDFFileFilter.java
@@ -26,7 +26,7 @@ public class UnlinkedPDFFileFilter implements FileFilter {
 
     public UnlinkedPDFFileFilter(FileFilter fileFilter, BibDatabaseContext databaseContext) {
         this.fileFilter = fileFilter;
-        this.lookup = new DatabaseFileLookup(databaseContext, Globals.prefs.getFileDirectoryPreferences());
+        this.lookup = new DatabaseFileLookup(databaseContext, Globals.prefs.getFilePreferences());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 4678e6dfb30..0c739e23b6a 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -73,12 +73,10 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
         this.undoManager = panel.getUndoManager();
 
         fileHandler = new NewDroppedFileHandler(frame.getDialogService(), database, externalFileTypes,
-                                                Globals.prefs.getFileDirectoryPreferences(),
-                                                Globals.prefs.getCleanupPreferences(Globals.journalAbbreviationLoader).getFileDirPattern(),
+                Globals.prefs.getFilePreferences(),
                                                 Globals.prefs.getImportFormatPreferences(),
                                                 Globals.prefs.getUpdateFieldPreferences(),
-                                                Globals.getFileUpdateMonitor(),
-                                                Globals.prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)
+                Globals.getFileUpdateMonitor()
 
         );
 
diff --git a/src/main/java/org/jabref/gui/preferences/FileTab.java b/src/main/java/org/jabref/gui/preferences/FileTab.java
index 5369f8df138..110caa3f640 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTab.java
+++ b/src/main/java/org/jabref/gui/preferences/FileTab.java
@@ -22,7 +22,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.OS;
 import org.jabref.model.entry.FieldName;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.preferences.JabRefPreferences;
 
 /**
@@ -152,7 +152,7 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
 
     @Override
     public void setValues() {
-        fileDir.setText(prefs.getAsOptional(FieldName.FILE + FileDirectoryPreferences.DIR_SUFFIX).orElse(""));
+        fileDir.setText(prefs.getAsOptional(FieldName.FILE + FilePreferences.DIR_SUFFIX).orElse(""));
         bibLocAsPrimaryDir.setSelected(prefs.getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR));
         runAutoFileSearch.setSelected(prefs.getBoolean(JabRefPreferences.RUN_AUTOMATIC_FILE_SEARCH));
         allowFileAutoOpenBrowse.setSelected(prefs.getBoolean(JabRefPreferences.ALLOW_FILE_AUTO_OPEN_BROWSE));
@@ -193,7 +193,7 @@ public Node getBuilder() {
 
     @Override
     public void storeSettings() {
-        prefs.put(FieldName.FILE + FileDirectoryPreferences.DIR_SUFFIX, fileDir.getText());
+        prefs.put(FieldName.FILE + FilePreferences.DIR_SUFFIX, fileDir.getText());
         prefs.putBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR, bibLocAsPrimaryDir.isSelected());
         prefs.putBoolean(JabRefPreferences.RUN_AUTOMATIC_FILE_SEARCH, runAutoFileSearch.isSelected());
         prefs.putBoolean(JabRefPreferences.ALLOW_FILE_AUTO_OPEN_BROWSE, allowFileAutoOpenBrowse.isSelected());
diff --git a/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java b/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java
index d00d15fba8a..51b85ba2784 100644
--- a/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java
+++ b/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java
@@ -90,7 +90,7 @@ private String sendEmail() throws Exception {
         boolean openFolders = JabRefPreferences.getInstance().getBoolean(JabRefPreferences.OPEN_FOLDERS_OF_ATTACHED_FILES);
 
         List<Path> fileList = FileUtil.getListOfLinkedFiles(bes, frame.getCurrentBasePanel().getBibDatabaseContext()
-                                                                      .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences()));
+                                                                      .getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences()));
         for (Path f : fileList) {
             attachments.add(f.toAbsolutePath().toString());
             if (openFolders) {
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java b/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java
index ac5f96d6a48..5f548e16edf 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java
@@ -1,37 +1,23 @@
 package org.jabref.logic.cleanup;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
 public class CleanupPreferences {
 
-    private final String fileNamePattern;
-    private final String fileDirPattern;
     private final LayoutFormatterPreferences layoutFormatterPreferences;
-    private final FileDirectoryPreferences fileDirectoryPreferences;
+    private final FilePreferences filePreferences;
 
-
-    public CleanupPreferences(String fileNamePattern, String fileDirPattern,
-            LayoutFormatterPreferences layoutFormatterPreferences, FileDirectoryPreferences fileDirectoryPreferences) {
-        this.fileNamePattern = fileNamePattern;
-        this.fileDirPattern = fileDirPattern;
+    public CleanupPreferences(LayoutFormatterPreferences layoutFormatterPreferences, FilePreferences filePreferences) {
         this.layoutFormatterPreferences = layoutFormatterPreferences;
-        this.fileDirectoryPreferences = fileDirectoryPreferences;
-    }
-
-    public String getFileNamePattern() {
-        return fileNamePattern;
-    }
-
-    public String getFileDirPattern() {
-        return fileDirPattern;
+        this.filePreferences = filePreferences;
     }
 
     public LayoutFormatterPreferences getLayoutFormatterPreferences() {
         return layoutFormatterPreferences;
     }
 
-    public FileDirectoryPreferences getFileDirectoryPreferences() {
-        return fileDirectoryPreferences;
+    public FilePreferences getFilePreferences() {
+        return filePreferences;
     }
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
index 737a16a0157..c07650436d1 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
@@ -8,26 +8,16 @@
 import org.jabref.model.cleanup.CleanupJob;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
 public class CleanupWorker {
 
     private final BibDatabaseContext databaseContext;
-    private final String fileNamePattern;
-    private final String fileDirPattern;
-    private final FileDirectoryPreferences fileDirectoryPreferences;
-    private int unsuccessfulRenames;
-
+    private final FilePreferences filePreferences;
 
     public CleanupWorker(BibDatabaseContext databaseContext, CleanupPreferences cleanupPreferences) {
         this.databaseContext = databaseContext;
-        this.fileNamePattern = cleanupPreferences.getFileNamePattern();
-        this.fileDirPattern = cleanupPreferences.getFileDirPattern();
-        this.fileDirectoryPreferences = cleanupPreferences.getFileDirectoryPreferences();
-    }
-
-    public int getUnsuccessfulRenames() {
-        return unsuccessfulRenames;
+        this.filePreferences = cleanupPreferences.getFilePreferences();
     }
 
     public List<FieldChange> cleanup(CleanupPreset preset, BibEntry entry) {
@@ -69,16 +59,14 @@ private List<CleanupJob> determineCleanupActions(CleanupPreset preset) {
             jobs.add(new FileLinksCleanup());
         }
         if (preset.isMovePDF()) {
-            jobs.add(new MoveFilesCleanup(databaseContext, fileDirPattern, fileDirectoryPreferences));
+            jobs.add(new MoveFilesCleanup(databaseContext, filePreferences));
         }
         if (preset.isMakePathsRelative()) {
-            jobs.add(new RelativePathsCleanup(databaseContext, fileDirectoryPreferences));
+            jobs.add(new RelativePathsCleanup(databaseContext, filePreferences));
         }
         if (preset.isRenamePDF()) {
-            RenamePdfCleanup cleaner = new RenamePdfCleanup(preset.isRenamePdfOnlyRelativePaths(), databaseContext,
-                                                            fileNamePattern, fileDirectoryPreferences);
+            RenamePdfCleanup cleaner = new RenamePdfCleanup(preset.isRenamePdfOnlyRelativePaths(), databaseContext, filePreferences);
             jobs.add(cleaner);
-            unsuccessfulRenames += cleaner.getUnsuccessfulRenames();
         }
 
         return jobs;
diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
index 463dd0aba53..420167764f8 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
@@ -1,25 +1,19 @@
 package org.jabref.logic.cleanup;
 
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
-import org.jabref.logic.util.io.FileUtil;
+import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.model.FieldChange;
 import org.jabref.model.cleanup.CleanupJob;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
-import org.jabref.model.util.FileHelper;
+import org.jabref.model.metadata.FilePreferences;
+import org.jabref.model.util.OptionalUtil;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,106 +21,35 @@
 public class MoveFilesCleanup implements CleanupJob {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MoveFilesCleanup.class);
-    private final BibDatabaseContext databaseContext;
-    private final FileDirectoryPreferences fileDirectoryPreferences;
-
-    private final String fileDirPattern;
 
-    private LinkedFile singleFileFieldCleanup;
+    private final BibDatabaseContext databaseContext;
+    private final FilePreferences filePreferences;
 
-    public MoveFilesCleanup(BibDatabaseContext databaseContext, String fileDirPattern,
-                            FileDirectoryPreferences fileDirectoryPreferences) {
+    public MoveFilesCleanup(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
-        this.fileDirPattern = Objects.requireNonNull(fileDirPattern);
-        this.fileDirectoryPreferences = Objects.requireNonNull(fileDirectoryPreferences);
-    }
-
-    public MoveFilesCleanup(BibDatabaseContext databaseContext, String fileDirPattern,
-                            FileDirectoryPreferences fileDirectoryPreferences, LinkedFile field) {
-
-        this(databaseContext, fileDirPattern, fileDirectoryPreferences);
-        this.singleFileFieldCleanup = field;
+        this.filePreferences = Objects.requireNonNull(filePreferences);
     }
 
     @Override
     public List<FieldChange> cleanup(BibEntry entry) {
-        Optional<Path> firstExistingFileDir = databaseContext.getFirstExistingFileDir(fileDirectoryPreferences);
-
-        if (!firstExistingFileDir.isPresent()) {
-            return Collections.emptyList();
-        }
-
-        List<Path> paths = databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences);
-        String defaultFileDirectory = firstExistingFileDir.get().toString();
-        Optional<Path> targetDirectory = FileHelper.expandFilenameAsPath(defaultFileDirectory, paths);
-
-        if (!targetDirectory.isPresent()) {
-            return Collections.emptyList();
-        }
-
-        List<LinkedFile> fileList;
-        List<LinkedFile> newFileList;
-
-        if (singleFileFieldCleanup != null) {
-            fileList = Arrays.asList(singleFileFieldCleanup);
-            //Add all other except the current selected file
-            newFileList = entry.getFiles().stream().filter(name -> !name.equals(singleFileFieldCleanup))
-                               .collect(Collectors.toList());
-        } else {
-            newFileList = new ArrayList<>();
-            fileList = entry.getFiles();
-        }
+        List<LinkedFile> files = entry.getFiles();
 
         boolean changed = false;
-        for (LinkedFile fileEntry : fileList) {
-            String oldFileName = fileEntry.getLink();
-
-            Optional<Path> oldFile = fileEntry.findIn(paths);
-            if (!oldFile.isPresent() || !Files.exists(oldFile.get())) {
-                newFileList.add(fileEntry);
-                continue;
-            }
-            String targetDirName = "";
-            if (!fileDirPattern.isEmpty()) {
-                targetDirName = FileUtil.createDirNameFromPattern(databaseContext.getDatabase(), entry, fileDirPattern);
-            }
-
-            Path newTargetFile = targetDirectory.get().resolve(targetDirName).resolve(oldFile.get().getFileName());
-            if (Files.exists(newTargetFile)) {
-                // We do not overwrite already existing files
-                newFileList.add(fileEntry);
-                continue;
-            }
-
+        for (LinkedFile file : files) {
+            LinkedFileHandler fileHandler = new LinkedFileHandler(file, entry, databaseContext, filePreferences);
             try {
-                if (!Files.exists(newTargetFile)) {
-                    Files.createDirectories(newTargetFile);
-                }
-            } catch (IOException e) {
-                LOGGER.error("Could no create necessary target directoires for renaming", e);
-            }
-
-            if (FileUtil.renameFile(oldFile.get(), newTargetFile, true)) {
-                changed = true;
-
-                String newEntryFilePath = Paths.get(defaultFileDirectory).relativize(newTargetFile).toString();
-                LinkedFile newFileEntry = fileEntry;
-                if (!oldFileName.equals(newTargetFile.toString())) {
-                    newFileEntry = new LinkedFile(fileEntry.getDescription(), newEntryFilePath,
-                                                  fileEntry.getFileType());
+                boolean fileChanged = fileHandler.moveToDefaultDirectory();
+                if (fileChanged) {
                     changed = true;
                 }
-                newFileList.add(newFileEntry);
+            } catch (IOException exception) {
+                LOGGER.error("Error while moving file {}", file.getLink(), exception);
             }
         }
 
         if (changed) {
-            Optional<FieldChange> change = entry.setFiles(newFileList);
-            if (change.isPresent()) {
-                return Collections.singletonList(change.get());
-            } else {
-                return Collections.emptyList();
-            }
+            Optional<FieldChange> changes = entry.setFiles(files);
+            return OptionalUtil.toList(changes);
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java b/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
index 305bdd58b55..9b18e939782 100644
--- a/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
@@ -13,17 +13,16 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
 public class RelativePathsCleanup implements CleanupJob {
 
     private final BibDatabaseContext databaseContext;
-    private final FileDirectoryPreferences fileDirectoryPreferences;
+    private final FilePreferences filePreferences;
 
-
-    public RelativePathsCleanup(BibDatabaseContext databaseContext, FileDirectoryPreferences fileDirectoryPreferences) {
+    public RelativePathsCleanup(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
-        this.fileDirectoryPreferences = Objects.requireNonNull(fileDirectoryPreferences);
+        this.filePreferences = Objects.requireNonNull(filePreferences);
     }
 
     @Override
@@ -35,7 +34,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
         for (LinkedFile fileEntry : fileList) {
             String oldFileName = fileEntry.getLink();
             String newFileName = FileUtil
-                    .shortenFileName(Paths.get(oldFileName), databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences))
+                    .relativize(Paths.get(oldFileName), databaseContext.getFileDirectoriesAsPaths(filePreferences))
                     .toString();
 
             LinkedFile newFileEntry = fileEntry;
diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
index 12061c6600b..4016081e60b 100644
--- a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
@@ -1,26 +1,20 @@
 package org.jabref.logic.cleanup;
 
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-import org.jabref.logic.util.io.FileUtil;
+import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.model.FieldChange;
 import org.jabref.model.cleanup.CleanupJob;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
-import org.jabref.model.strings.StringUtil;
-import org.jabref.model.util.FileHelper;
+import org.jabref.model.metadata.FilePreferences;
+import org.jabref.model.util.OptionalUtil;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,163 +24,40 @@ public class RenamePdfCleanup implements CleanupJob {
 
     private final BibDatabaseContext databaseContext;
     private final boolean onlyRelativePaths;
-    private final String fileNamePattern;
-    private final FileDirectoryPreferences fileDirectoryPreferences;
-    private int unsuccessfulRenames;
-    private LinkedFile singleFieldCleanup;
+    private final FilePreferences filePreferences;
 
-
-    public RenamePdfCleanup(boolean onlyRelativePaths, BibDatabaseContext databaseContext, String fileNamePattern,
-                            FileDirectoryPreferences fileDirectoryPreferences) {
+    public RenamePdfCleanup(boolean onlyRelativePaths, BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.onlyRelativePaths = onlyRelativePaths;
-        this.fileNamePattern = Objects.requireNonNull(fileNamePattern);
-        this.fileDirectoryPreferences = fileDirectoryPreferences;
-    }
-
-    public RenamePdfCleanup(boolean onlyRelativePaths, BibDatabaseContext databaseContext, String fileNamePattern,
-                            FileDirectoryPreferences fileDirectoryPreferences, LinkedFile singleField) {
-
-        this(onlyRelativePaths, databaseContext, fileNamePattern, fileDirectoryPreferences);
-        this.singleFieldCleanup = singleField;
+        this.filePreferences = filePreferences;
     }
 
     @Override
     public List<FieldChange> cleanup(BibEntry entry) {
-        try {
-            return cleanupWithException(entry);
-        } catch (IOException e) {
-            LOGGER.error("Cleanup failed", e);
-            return Collections.emptyList();
-        }
-    }
-
-    public List<FieldChange> cleanupWithException(BibEntry entry) throws IOException {
-        List<LinkedFile> newFileList;
-        List<LinkedFile> oldFileList;
-        if (singleFieldCleanup != null) {
-            oldFileList = Collections.singletonList(singleFieldCleanup);
-
-            newFileList = entry.getFiles().stream().filter(x -> !x.equals(singleFieldCleanup))
-                               .collect(Collectors.toList());
-        } else {
-            newFileList = new ArrayList<>();
-            oldFileList = entry.getFiles();
-        }
+        List<LinkedFile> files = entry.getFiles();
 
         boolean changed = false;
-
-        for (LinkedFile oldLinkedFile : oldFileList) {
-            String realOldFilename = oldLinkedFile.getLink();
-
-            if (StringUtil.isBlank(realOldFilename)) {
-                continue; //Skip empty filenames
-            }
-
-            if (onlyRelativePaths && Paths.get(realOldFilename).isAbsolute()) {
-                newFileList.add(oldLinkedFile);
-                continue;
-            }
-
-            //old path and old filename
-            Optional<Path> expandedOldFile = oldLinkedFile.findIn(databaseContext, fileDirectoryPreferences);
-
-            if ((!expandedOldFile.isPresent()) || (expandedOldFile.get().getParent() == null)) {
-                // something went wrong. Just skip this entry
-                newFileList.add(oldLinkedFile);
-                continue;
-            }
-            String targetFileName = getTargetFileName(oldLinkedFile, entry);
-            Path newPath = expandedOldFile.get().getParent().resolve(targetFileName);
-
-            String expandedOldFilePath = expandedOldFile.get().toString();
-            boolean pathsDifferOnlyByCase = newPath.toString().equalsIgnoreCase(expandedOldFilePath)
-                && !newPath.toString().equals(expandedOldFilePath);
-
-            if (Files.exists(newPath) && !pathsDifferOnlyByCase) {
-                // we do not overwrite files
-                // Since File.exists is sometimes not case-sensitive, the check pathsDifferOnlyByCase ensures that we
-                // nonetheless rename files to a new name which just differs by case.
-                // TODO: we could check here if the newPath file is linked with the current entry. And if not, we could add a link
-                LOGGER.debug("There already exists a file with that name " + newPath.getFileName() + " so I won't rename it");
-                newFileList.add(oldLinkedFile);
+        for (LinkedFile file : files) {
+            if (onlyRelativePaths && Paths.get(file.getLink()).isAbsolute()) {
                 continue;
             }
 
+            LinkedFileHandler fileHandler = new LinkedFileHandler(file, entry, databaseContext, filePreferences);
             try {
-                if (!Files.exists(newPath)) {
-                    Files.createDirectories(newPath);
+                boolean changedFile = fileHandler.renameToSuggestedName();
+                if (changedFile) {
+                    changed = true;
                 }
-            } catch (IOException e) {
-                LOGGER.error("Could not create necessary target directories for renaming", e);
-            }
-
-            boolean renameSuccessful = FileUtil.renameFileWithException(Paths.get(expandedOldFilePath), newPath, true);
-            if (renameSuccessful) {
-                changed = true;
-
-                // Change the path for this entry
-                String description = oldLinkedFile.getDescription();
-                String type = oldLinkedFile.getFileType();
-
-                // We use the file directory (if none is set - then bib file) to create relative file links.
-                // The .get() is legal without check because the method will always return a value.
-                Path settingsDir = databaseContext.getFirstExistingFileDir(fileDirectoryPreferences).get();
-                if (settingsDir.getRoot().equals(newPath.getRoot())) {
-                    newFileList.add(new LinkedFile(description, settingsDir.relativize(newPath).toString(), type));
-                } else {
-                    newFileList.add(new LinkedFile(description, newPath.toString(), type));
-                }
-            } else {
-                unsuccessfulRenames++;
+            } catch (IOException exception) {
+                LOGGER.error("Error while renaming file {}", file.getLink(), exception);
             }
         }
+
         if (changed) {
-            Optional<FieldChange> change = entry.setFiles(newFileList);
-            //we put an undo of the field content here
-            //the file is not being renamed back, which leads to inconsistencies
-            //if we put a null undo object here, the change by "doMakePathsRelative" would overwrite the field value nevertheless.
-            return change.map(Collections::singletonList).orElseGet(Collections::emptyList);
+            Optional<FieldChange> changes = entry.setFiles(files);
+            return OptionalUtil.toList(changes);
         }
-        return Collections.emptyList();
-    }
-
-    public String getTargetFileName(LinkedFile flEntry, BibEntry entry) {
-        String realOldFilename = flEntry.getLink();
-
-        String targetFileName = FileUtil.createFileNameFromPattern(databaseContext.getDatabase(), entry, fileNamePattern).trim()
-            + '.'
-            + FileHelper.getFileExtension(realOldFilename).orElse("pdf");
-
-        // Only create valid file names
-        return FileUtil.getValidFileName(targetFileName);
-    }
 
-    public int getUnsuccessfulRenames() {
-        return unsuccessfulRenames;
-    }
-
-    /**
-    * Check to see if a file already exists in the target directory.  Search is not case sensitive.
-    * @param flEntry
-    * @param entry
-    * @return First identified path that matches an existing file.  This name can be used in subsequent calls to override the existing file.
-    */
-    public Optional<Path> findExistingFile(LinkedFile flEntry, BibEntry entry) {
-        String targetFileName = getTargetFileName(flEntry, entry);
-        // The .get() is legal without check because the method will always return a value.
-        Path targetFilePath = flEntry.findIn(databaseContext, fileDirectoryPreferences)
-                                     .get().getParent().resolve(targetFileName);
-        Path oldFilePath = flEntry.findIn(databaseContext, fileDirectoryPreferences).get();
-        //Check if file already exists in directory with different case.
-        //This is necessary because other entries may have such a file.
-        Optional<Path> matchedByDiffCase = Optional.empty();
-        try (Stream<Path> stream = Files.list(oldFilePath.getParent())) {
-            matchedByDiffCase = stream.filter(name -> name.toString().equalsIgnoreCase(targetFilePath.toString()))
-                                      .findFirst();
-        } catch (IOException e) {
-            LOGGER.error("Could not get the list of files in target directory", e);
-        }
-        return matchedByDiffCase;
+        return Collections.emptyList();
     }
 }
diff --git a/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java b/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
new file mode 100644
index 00000000000..ac38e27c560
--- /dev/null
+++ b/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
@@ -0,0 +1,144 @@
+package org.jabref.logic.externalfiles;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.metadata.FilePreferences;
+import org.jabref.model.util.FileHelper;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LinkedFileHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFileHandler.class);
+
+    private final BibDatabaseContext databaseContext;
+    private final FilePreferences filePreferences;
+    private final BibEntry entry;
+
+    private final LinkedFile fileEntry;
+
+    public LinkedFileHandler(LinkedFile fileEntry, BibEntry entry, BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+        this.fileEntry = fileEntry;
+        this.entry = entry;
+        this.databaseContext = Objects.requireNonNull(databaseContext);
+        this.filePreferences = Objects.requireNonNull(filePreferences);
+    }
+
+    public boolean moveToDefaultDirectory() throws IOException {
+        Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(filePreferences);
+        if (!targetDirectory.isPresent()) {
+            return false;
+        }
+
+        Optional<Path> oldFile = fileEntry.findIn(databaseContext, filePreferences);
+        if (!oldFile.isPresent()) {
+            // Could not find file
+            return false;
+        }
+
+        String targetDirName = "";
+        if (!filePreferences.getFileDirPattern().isEmpty()) {
+            targetDirName = FileUtil.createDirNameFromPattern(databaseContext.getDatabase(), entry, filePreferences.getFileDirPattern());
+        }
+
+        Path targetPath = targetDirectory.get().resolve(targetDirName).resolve(oldFile.get().getFileName());
+        if (Files.exists(targetPath)) {
+            // We do not overwrite already existing files
+            LOGGER.debug("The file {} would have been moved to {}. However, there exists already a file with that name so we do nothing.", oldFile.get(), targetPath);
+            return false;
+        } else {
+            // Make sure sub-directories exist
+            Files.createDirectories(targetPath.getParent());
+        }
+
+        // Move
+        Files.move(oldFile.get(), targetPath);
+
+        // Update path
+        fileEntry.setLink(relativize(targetPath));
+        return true;
+    }
+
+    public boolean renameToSuggestedName() throws IOException {
+        Optional<Path> oldFile = fileEntry.findIn(databaseContext, filePreferences);
+        if (!oldFile.isPresent()) {
+            // Could not find file
+            return false;
+        }
+
+        String targetFileName = getSuggestedFileName();
+        Path newPath = oldFile.get().resolveSibling(targetFileName);
+
+        String expandedOldFilePath = oldFile.get().toString();
+        boolean pathsDifferOnlyByCase = newPath.toString().equalsIgnoreCase(expandedOldFilePath)
+                && !newPath.toString().equals(expandedOldFilePath);
+
+        if (Files.exists(newPath) && !pathsDifferOnlyByCase) {
+            // We do not overwrite files
+            // Since Files.exists is sometimes not case-sensitive, the check pathsDifferOnlyByCase ensures that we
+            // nonetheless rename files to a new name which just differs by case.
+            LOGGER.debug("The file {} would have been moved to {}. However, there exists already a file with that name so we do nothing.", oldFile.get(), newPath);
+            return false;
+        } else {
+            Files.createDirectories(newPath.getParent());
+        }
+
+        // Rename
+        Files.move(oldFile.get(), newPath);
+
+        // Update path
+        fileEntry.setLink(relativize(newPath));
+
+        return true;
+    }
+
+    private String relativize(Path path) {
+        List<Path> fileDirectories = databaseContext.getFileDirectoriesAsPaths(filePreferences);
+        return FileUtil.relativize(path, fileDirectories).toString();
+    }
+
+    public String getSuggestedFileName() {
+        String oldFileName = fileEntry.getLink();
+
+        String targetFileName = FileUtil.createFileNameFromPattern(databaseContext.getDatabase(), entry, filePreferences.getFileNamePattern()).trim()
+                + '.'
+                + FileHelper.getFileExtension(oldFileName).orElse(fileEntry.getFileType());
+
+        // Only create valid file names
+        return FileUtil.getValidFileName(targetFileName);
+    }
+
+    /**
+     * Check to see if a file already exists in the target directory.  Search is not case sensitive.
+     *
+     * @return First identified path that matches an existing file.  This name can be used in subsequent calls to
+     * override the existing file.
+     */
+    public Optional<Path> findExistingFile(LinkedFile flEntry, BibEntry entry) {
+        String targetFileName = getSuggestedFileName();
+        // The .get() is legal without check because the method will always return a value.
+        Path targetFilePath = flEntry.findIn(databaseContext, filePreferences)
+                                     .get().getParent().resolve(targetFileName);
+        Path oldFilePath = flEntry.findIn(databaseContext, filePreferences).get();
+        //Check if file already exists in directory with different case.
+        //This is necessary because other entries may have such a file.
+        Optional<Path> matchedByDiffCase = Optional.empty();
+        try (Stream<Path> stream = Files.list(oldFilePath.getParent())) {
+            matchedByDiffCase = stream.filter(name -> name.toString().equalsIgnoreCase(targetFilePath.toString()))
+                                      .findFirst();
+        } catch (IOException e) {
+            LOGGER.error("Could not get the list of files in target directory", e);
+        }
+        return matchedByDiffCase;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/integrity/FieldCheckers.java b/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
index 79cca452b11..df473a94604 100644
--- a/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
+++ b/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
@@ -8,7 +8,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.InternalBibtexFields;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
@@ -17,11 +17,11 @@ public class FieldCheckers {
 
     private Multimap<String, ValueChecker> fieldChecker;
 
-    public FieldCheckers(BibDatabaseContext databaseContext, FileDirectoryPreferences fileDirectoryPreferences, JournalAbbreviationRepository abbreviationRepository, boolean enforceLegalKey) {
-        fieldChecker = getAllMap(databaseContext, fileDirectoryPreferences, abbreviationRepository, enforceLegalKey);
+    public FieldCheckers(BibDatabaseContext databaseContext, FilePreferences filePreferences, JournalAbbreviationRepository abbreviationRepository, boolean enforceLegalKey) {
+        fieldChecker = getAllMap(databaseContext, filePreferences, abbreviationRepository, enforceLegalKey);
     }
 
-    private static Multimap<String, ValueChecker> getAllMap(BibDatabaseContext databaseContext, FileDirectoryPreferences fileDirectoryPreferences, JournalAbbreviationRepository abbreviationRepository, boolean enforceLegalKey) {
+    private static Multimap<String, ValueChecker> getAllMap(BibDatabaseContext databaseContext, FilePreferences filePreferences, JournalAbbreviationRepository abbreviationRepository, boolean enforceLegalKey) {
         ArrayListMultimap<String, ValueChecker> fieldCheckers = ArrayListMultimap.create(50, 10);
 
         for (String field : InternalBibtexFields.getJournalNameFields()) {
@@ -38,7 +38,7 @@ private static Multimap<String, ValueChecker> getAllMap(BibDatabaseContext datab
         fieldCheckers.put(FieldName.TITLE, new TitleChecker(databaseContext));
         fieldCheckers.put(FieldName.DOI, new DOIValidityChecker());
         fieldCheckers.put(FieldName.EDITION, new EditionChecker(databaseContext));
-        fieldCheckers.put(FieldName.FILE, new FileChecker(databaseContext, fileDirectoryPreferences));
+        fieldCheckers.put(FieldName.FILE, new FileChecker(databaseContext, filePreferences));
         fieldCheckers.put(FieldName.HOWPUBLISHED, new HowPublishedChecker(databaseContext));
         fieldCheckers.put(FieldName.ISBN, new ISBNChecker());
         fieldCheckers.put(FieldName.ISSN, new ISSNChecker());
diff --git a/src/main/java/org/jabref/logic/integrity/FileChecker.java b/src/main/java/org/jabref/logic/integrity/FileChecker.java
index f631230922b..b70cb834dc0 100644
--- a/src/main/java/org/jabref/logic/integrity/FileChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/FileChecker.java
@@ -10,18 +10,17 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.FileFieldParser;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.strings.StringUtil;
 
 public class FileChecker implements ValueChecker {
 
     private final BibDatabaseContext context;
-    private final FileDirectoryPreferences fileDirectoryPreferences;
+    private final FilePreferences filePreferences;
 
-
-    public FileChecker(BibDatabaseContext context, FileDirectoryPreferences fileDirectoryPreferences) {
+    public FileChecker(BibDatabaseContext context, FilePreferences filePreferences) {
         this.context = context;
-        this.fileDirectoryPreferences = fileDirectoryPreferences;
+        this.filePreferences = filePreferences;
     }
 
     @Override
@@ -35,7 +34,7 @@ public Optional<String> checkValue(String value) {
                 .collect(Collectors.toList());
 
         for (LinkedFile file : linkedFiles) {
-            Optional<Path> linkedFile = file.findIn(context, fileDirectoryPreferences);
+            Optional<Path> linkedFile = file.findIn(context, filePreferences);
             if ((!linkedFile.isPresent()) || !Files.exists(linkedFile.get())) {
                 return Optional.of(Localization.lang("link should refer to a correct file path"));
             }
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
index f23573afd4d..7932c842ae1 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
@@ -9,23 +9,23 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
 public class IntegrityCheck {
 
     private final BibDatabaseContext bibDatabaseContext;
-    private final FileDirectoryPreferences fileDirectoryPreferences;
+    private final FilePreferences filePreferences;
     private final BibtexKeyPatternPreferences bibtexKeyPatternPreferences;
     private final JournalAbbreviationRepository journalAbbreviationRepository;
     private final boolean enforceLegalKey;
 
     public IntegrityCheck(BibDatabaseContext bibDatabaseContext,
-                          FileDirectoryPreferences fileDirectoryPreferences,
+                          FilePreferences filePreferences,
                           BibtexKeyPatternPreferences bibtexKeyPatternPreferences,
                           JournalAbbreviationRepository journalAbbreviationRepository,
                           boolean enforceLegalKey) {
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
-        this.fileDirectoryPreferences = Objects.requireNonNull(fileDirectoryPreferences);
+        this.filePreferences = Objects.requireNonNull(filePreferences);
         this.bibtexKeyPatternPreferences = Objects.requireNonNull(bibtexKeyPatternPreferences);
         this.journalAbbreviationRepository = Objects.requireNonNull(journalAbbreviationRepository);
         this.enforceLegalKey = enforceLegalKey;
@@ -48,7 +48,7 @@ private List<IntegrityMessage> checkBibtexEntry(BibEntry entry) {
             return result;
         }
 
-        FieldCheckers fieldCheckers = new FieldCheckers(bibDatabaseContext, fileDirectoryPreferences, journalAbbreviationRepository, enforceLegalKey);
+        FieldCheckers fieldCheckers = new FieldCheckers(bibDatabaseContext, filePreferences, journalAbbreviationRepository, enforceLegalKey);
         for (FieldChecker checker : fieldCheckers.getAll()) {
             result.addAll(checker.check(entry));
         }
diff --git a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
index 8953c139e11..12bf844cf1f 100644
--- a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
@@ -9,7 +9,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.pdf.FileAnnotation;
 
 
@@ -44,14 +44,14 @@ private List<LinkedFile> getFilteredFileList() {
      * @param databaseContext The context is needed for the importer.
      * @return Map from each PDF to a list of file annotations
      */
-    public Map<Path, List<FileAnnotation>> importAnnotationsFromFiles(BibDatabaseContext databaseContext, FileDirectoryPreferences fileDirectoryPreferences) {
+    public Map<Path, List<FileAnnotation>> importAnnotationsFromFiles(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         Map<Path, List<FileAnnotation>> annotations = new HashMap<>();
         AnnotationImporter importer = new PdfAnnotationImporter();
 
         //import annotationsOfFiles if the selected files are valid which is checked in getFilteredFileList()
         for (LinkedFile linkedFile : this.getFilteredFileList()) {
-            linkedFile.findIn(databaseContext, fileDirectoryPreferences)
-                    .ifPresent(file -> annotations.put(file, importer.importAnnotations(file)));
+            linkedFile.findIn(databaseContext, filePreferences)
+                      .ifPresent(file -> annotations.put(file, importer.importAnnotations(file)));
         }
         return annotations;
     }
diff --git a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
index fd59cfde876..22a2e7cb872 100644
--- a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
+++ b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
@@ -6,7 +6,7 @@
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.pdf.FileAnnotation;
 
 import com.google.common.cache.CacheBuilder;
@@ -32,11 +32,11 @@ public FileAnnotationCache() {
 
     }
 
-    public FileAnnotationCache(BibDatabaseContext context, FileDirectoryPreferences fileDirectoryPreferences) {
+    public FileAnnotationCache(BibDatabaseContext context, FilePreferences filePreferences) {
         annotationCache = CacheBuilder.newBuilder().maximumSize(CACHE_SIZE).build(new CacheLoader<BibEntry, Map<Path, List<FileAnnotation>>>() {
             @Override
             public Map<Path, List<FileAnnotation>> load(BibEntry entry) throws Exception {
-                return new EntryAnnotationImporter(entry).importAnnotationsFromFiles(context, fileDirectoryPreferences);
+                return new EntryAnnotationImporter(entry).importAnnotationsFromFiles(context, filePreferences);
             }
         });
     }
diff --git a/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java b/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
index d8f17f80fef..7dff7fe0695 100644
--- a/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
+++ b/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
@@ -13,7 +13,7 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
 /**
  * Search class for files. <br>
@@ -30,10 +30,10 @@ public class DatabaseFileLookup {
     /**
      * Creates an instance by passing a {@link BibDatabase} which will be used for the searches.
      */
-    public DatabaseFileLookup(BibDatabaseContext databaseContext, FileDirectoryPreferences fileDirectoryPreferences) {
+    public DatabaseFileLookup(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         Objects.requireNonNull(databaseContext);
-        possibleFilePaths = Optional.ofNullable(databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences))
-                .orElse(new ArrayList<>());
+        possibleFilePaths = Optional.ofNullable(databaseContext.getFileDirectoriesAsPaths(filePreferences))
+                                    .orElse(new ArrayList<>());
 
         for (BibEntry entry : databaseContext.getDatabase().getEntries()) {
             fileCache.addAll(parseFileField(entry));
diff --git a/src/main/java/org/jabref/logic/util/io/FileUtil.java b/src/main/java/org/jabref/logic/util/io/FileUtil.java
index 8a759739528..10a28fb45cd 100644
--- a/src/main/java/org/jabref/logic/util/io/FileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/FileUtil.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.nio.file.CopyOption;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -188,7 +189,7 @@ public static boolean renameFile(Path fromFile, Path toFile) {
      * @param toFile          The target fileName
      * @param replaceExisting Wether to replace existing files or not
      * @return True if the rename was successful, false if an exception occurred
-     * @deprecated Use {@link #renameFileWithException(Path, Path, boolean)} instead and handle exception properly
+     * @deprecated Use {@link Files#move(Path, Path, CopyOption...)} instead and handle exception properly
      */
     @Deprecated
     public static boolean renameFile(Path fromFile, Path toFile, boolean replaceExisting) {
@@ -200,6 +201,10 @@ public static boolean renameFile(Path fromFile, Path toFile, boolean replaceExis
         }
     }
 
+    /**
+     * @deprecated Directly use {@link Files#move(Path, Path, CopyOption...)}
+     */
+    @Deprecated
     public static boolean renameFileWithException(Path fromFile, Path toFile, boolean replaceExisting) throws IOException {
         if (replaceExisting) {
             return Files.move(fromFile, fromFile.resolveSibling(toFile),
@@ -213,19 +218,19 @@ public static boolean renameFileWithException(Path fromFile, Path toFile, boolea
      * Converts an absolute file to a relative one, if possible. Returns the parameter file itself if no shortening is
      * possible.
      * <p>
-     * This method works correctly only if dirs are sorted decent in their length i.e. /home/user/literature/important before /home/user/literature.
+     * This method works correctly only if directories are sorted decent in their length i.e. /home/user/literature/important before /home/user/literature.
      *
      * @param file the file to be shortened
-     * @param dirs directories to check
+     * @param directories directories to check
      */
-    public static Path shortenFileName(Path file, List<Path> dirs) {
+    public static Path relativize(Path file, List<Path> directories) {
         if (!file.isAbsolute()) {
             return file;
         }
 
-        for (Path dir : dirs) {
-            if (file.startsWith(dir)) {
-                return dir.relativize(file);
+        for (Path directory : directories) {
+            if (file.startsWith(directory)) {
+                return directory.relativize(file);
             }
         }
         return file;
diff --git a/src/main/java/org/jabref/migrations/FileLinksUpgradeWarning.java b/src/main/java/org/jabref/migrations/FileLinksUpgradeWarning.java
index 8668bc30843..eed9497457e 100644
--- a/src/main/java/org/jabref/migrations/FileLinksUpgradeWarning.java
+++ b/src/main/java/org/jabref/migrations/FileLinksUpgradeWarning.java
@@ -25,7 +25,7 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.preferences.JabRefPreferences;
 
 import com.jgoodies.forms.builder.FormBuilder;
@@ -87,9 +87,9 @@ public boolean isActionNecessary(ParserResult pr) {
         // Only offer to upgrade links if the pdf/ps fields are used:
         offerChangeDatabase = linksFound(pr.getDatabase(), FileLinksUpgradeWarning.FIELDS_TO_LOOK_FOR);
         // If the "file" directory is not set, offer to migrate pdf/ps dir:
-        offerSetFileDir = !Globals.prefs.hasKey(FieldName.FILE + FileDirectoryPreferences.DIR_SUFFIX)
-                && (Globals.prefs.hasKey(FieldName.PDF + FileDirectoryPreferences.DIR_SUFFIX)
-                || Globals.prefs.hasKey(FieldName.PS + FileDirectoryPreferences.DIR_SUFFIX));
+        offerSetFileDir = !Globals.prefs.hasKey(FieldName.FILE + FilePreferences.DIR_SUFFIX)
+                && (Globals.prefs.hasKey(FieldName.PDF + FilePreferences.DIR_SUFFIX)
+                || Globals.prefs.hasKey(FieldName.PS + FilePreferences.DIR_SUFFIX));
 
         // First check if this warning is disabled:
         return Globals.prefs.getBoolean(JabRefPreferences.SHOW_FILE_LINKS_UPGRADE_WARNING)
@@ -141,10 +141,10 @@ public void performAction(BasePanel panel, ParserResult parserResult) {
             formBuilder.add(changeDatabase).xy(1, row);
         }
         if (offerSetFileDir) {
-            if (Globals.prefs.hasKey(FieldName.PDF + FileDirectoryPreferences.DIR_SUFFIX)) {
-                fileDir.setText(Globals.prefs.get(FieldName.PDF + FileDirectoryPreferences.DIR_SUFFIX));
+            if (Globals.prefs.hasKey(FieldName.PDF + FilePreferences.DIR_SUFFIX)) {
+                fileDir.setText(Globals.prefs.get(FieldName.PDF + FilePreferences.DIR_SUFFIX));
             } else {
-                fileDir.setText(Globals.prefs.get(FieldName.PS + FileDirectoryPreferences.DIR_SUFFIX));
+                fileDir.setText(Globals.prefs.get(FieldName.PS + FilePreferences.DIR_SUFFIX));
             }
             JPanel builderPanel = new JPanel();
             builderPanel.add(setFileDir);
@@ -220,7 +220,7 @@ private void makeChanges(BasePanel panel, ParserResult pr, boolean upgradePrefs,
         }
 
         if (fileDir != null) {
-            Globals.prefs.put(FieldName.FILE + FileDirectoryPreferences.DIR_SUFFIX, fileDir);
+            Globals.prefs.put(FieldName.FILE + FilePreferences.DIR_SUFFIX, fileDir);
         }
 
         if (upgradePrefs) {
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index ece8531db46..adabb5805ed 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -16,7 +16,7 @@
 import org.jabref.model.database.shared.DatabaseSynchronizer;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.metadata.MetaData;
 
 /**
@@ -151,7 +151,7 @@ public boolean isBiblatexMode() {
         return getMode() == BibDatabaseMode.BIBLATEX;
     }
 
-    public List<Path> getFileDirectoriesAsPaths(FileDirectoryPreferences preferences) {
+    public List<Path> getFileDirectoriesAsPaths(FilePreferences preferences) {
         // Filter for empty string, as this would be expanded to the jar-directory with Paths.get()
         return getFileDirectories(preferences).stream()
                 .filter(s -> !s.isEmpty())
@@ -162,20 +162,20 @@ public List<Path> getFileDirectoriesAsPaths(FileDirectoryPreferences preferences
     }
 
     /**
-     * @deprecated use {@link #getFileDirectoriesAsPaths(FileDirectoryPreferences)} instead
+     * @deprecated use {@link #getFileDirectoriesAsPaths(FilePreferences)} instead
      */
     @Deprecated
-    public List<String> getFileDirectories(FileDirectoryPreferences preferences) {
+    public List<String> getFileDirectories(FilePreferences preferences) {
         return getFileDirectories(FieldName.FILE, preferences);
     }
 
     /**
-     * Returns the first existing file directory from  {@link #getFileDirectories(FileDirectoryPreferences)}
+     * Returns the first existing file directory from  {@link #getFileDirectories(FilePreferences)}
      *
-     * @param preferences The FileDirectoryPreferences
+     * @param preferences The FilePreferences
      * @return Optional of Path
      */
-    public Optional<Path> getFirstExistingFileDir(FileDirectoryPreferences preferences) {
+    public Optional<Path> getFirstExistingFileDir(FilePreferences preferences) {
         return getFileDirectoriesAsPaths(preferences).stream().filter(Files::exists).findFirst();
     }
 
@@ -195,7 +195,7 @@ public Optional<Path> getFirstExistingFileDir(FileDirectoryPreferences preferenc
      * @param preferences The fileDirectory preferences
      * @return The default directory for this field type.
      */
-    public List<String> getFileDirectories(String fieldName, FileDirectoryPreferences preferences) {
+    public List<String> getFileDirectories(String fieldName, FilePreferences preferences) {
         List<String> fileDirs = new ArrayList<>();
 
         // 1. metadata user-specific directory
diff --git a/src/main/java/org/jabref/model/entry/LinkedFile.java b/src/main/java/org/jabref/model/entry/LinkedFile.java
index 93b99e347af..63d0dfb2cea 100644
--- a/src/main/java/org/jabref/model/entry/LinkedFile.java
+++ b/src/main/java/org/jabref/model/entry/LinkedFile.java
@@ -5,6 +5,7 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.net.URL;
+import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -17,7 +18,7 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.util.FileHelper;
 
 /**
@@ -154,16 +155,29 @@ public boolean isOnlineLink() {
         return isOnlineLink(link.get());
     }
 
-    public Optional<Path> findIn(BibDatabaseContext databaseContext, FileDirectoryPreferences fileDirectoryPreferences) {
-        List<Path> dirs = databaseContext.getFileDirectoriesAsPaths(fileDirectoryPreferences);
+    public Optional<Path> findIn(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+        List<Path> dirs = databaseContext.getFileDirectoriesAsPaths(filePreferences);
         return findIn(dirs);
     }
 
+    /**
+     * Tries to find the file in the given directories and returns the path to the file (if found). Returns an empty
+     * optional if the file cannot be found.
+     */
     public Optional<Path> findIn(List<Path> directories) {
         try {
+            if (link.get().isEmpty()) {
+                // We do not want to match empty paths (which could be any file or none ?!)
+                return Optional.empty();
+            }
+
             Path file = Paths.get(link.get());
             if (file.isAbsolute() || directories.isEmpty()) {
-                return Optional.of(file);
+                if (Files.exists(file)) {
+                    return Optional.of(file);
+                } else {
+                    return Optional.empty();
+                }
             } else {
                 return FileHelper.expandFilenameAsPath(link.get(), directories);
             }
@@ -171,5 +185,4 @@ public Optional<Path> findIn(List<Path> directories) {
             return Optional.empty();
         }
     }
-
 }
diff --git a/src/main/java/org/jabref/model/metadata/FileDirectoryPreferences.java b/src/main/java/org/jabref/model/metadata/FilePreferences.java
similarity index 66%
rename from src/main/java/org/jabref/model/metadata/FileDirectoryPreferences.java
rename to src/main/java/org/jabref/model/metadata/FilePreferences.java
index b24a699da8d..47b3874b195 100644
--- a/src/main/java/org/jabref/model/metadata/FileDirectoryPreferences.java
+++ b/src/main/java/org/jabref/model/metadata/FilePreferences.java
@@ -8,18 +8,25 @@
 
 import org.jabref.model.entry.FieldName;
 
-public class FileDirectoryPreferences {
+public class FilePreferences {
     public static final String DIR_SUFFIX = "Directory";
 
     private final String user;
     private final Map<String, String> fieldFileDirectories;
     private final boolean bibLocationAsPrimary;
+    private final String fileNamePattern;
+    private final String fileDirPattern;
 
-
-    public FileDirectoryPreferences(String user, Map<String, String> fieldFileDirectories, boolean bibLocationAsPrimary) {
+    public FilePreferences(String user,
+                           Map<String, String> fieldFileDirectories,
+                           boolean bibLocationAsPrimary,
+                           String fileNamePattern,
+                           String fileDirPattern) {
         this.user = user;
         this.fieldFileDirectories = fieldFileDirectories;
         this.bibLocationAsPrimary = bibLocationAsPrimary;
+        this.fileNamePattern = fileNamePattern;
+        this.fileDirPattern = fileDirPattern;
     }
 
     public String getUser() {
@@ -47,4 +54,12 @@ public Optional<Path> getFileDirectory() {
     public boolean isBibLocationAsPrimary() {
         return bibLocationAsPrimary;
     }
+
+    public String getFileNamePattern() {
+        return fileNamePattern;
+    }
+
+    public String getFileDirPattern() {
+        return fileDirPattern;
+    }
 }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index dbd662681c1..94b105eadac 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -31,7 +31,7 @@ public class MetaData {
     public static final String DATABASE_TYPE = "databaseType";
     public static final String GROUPSTREE = "grouping";
     public static final String GROUPSTREE_LEGACY = "groupstree";
-    public static final String FILE_DIRECTORY = FieldName.FILE + FileDirectoryPreferences.DIR_SUFFIX;
+    public static final String FILE_DIRECTORY = FieldName.FILE + FilePreferences.DIR_SUFFIX;
     public static final String PROTECTED_FLAG_META = "protectedFlag";
     public static final String SELECTOR_META_PREFIX = "selector_";
 
diff --git a/src/main/java/org/jabref/model/util/FileHelper.java b/src/main/java/org/jabref/model/util/FileHelper.java
index bd75c54ca95..f972d42cc46 100644
--- a/src/main/java/org/jabref/model/util/FileHelper.java
+++ b/src/main/java/org/jabref/model/util/FileHelper.java
@@ -10,7 +10,7 @@
 import java.util.Optional;
 
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
 public class FileHelper {
 
@@ -53,12 +53,12 @@ public static Optional<String> getFileExtension(String fileName) {
      * @param name     The filename, may also be a relative path to the file
      */
     public static Optional<Path> expandFilename(final BibDatabaseContext databaseContext, String name,
-            FileDirectoryPreferences fileDirectoryPreferences) {
+                                                FilePreferences filePreferences) {
         Optional<String> extension = getFileExtension(name);
         // Find the default directory for this field type, if any:
-        List<String> directories = databaseContext.getFileDirectories(extension.orElse(null), fileDirectoryPreferences);
+        List<String> directories = databaseContext.getFileDirectories(extension.orElse(null), filePreferences);
         // Include the standard "file" directory:
-        List<String> fileDir = databaseContext.getFileDirectories(fileDirectoryPreferences);
+        List<String> fileDir = databaseContext.getFileDirectories(filePreferences);
 
         List<String> searchDirectories = new ArrayList<>();
         for (String dir : directories) {
diff --git a/src/main/java/org/jabref/pdfimport/PdfImporter.java b/src/main/java/org/jabref/pdfimport/PdfImporter.java
index 7f1298cfc44..f0c28b563eb 100644
--- a/src/main/java/org/jabref/pdfimport/PdfImporter.java
+++ b/src/main/java/org/jabref/pdfimport/PdfImporter.java
@@ -164,10 +164,10 @@ private void doXMPImport(String fileName, List<BibEntry> res) {
             Path toLink = Paths.get(fileName);
             // Get a list of file directories:
             List<Path> dirsS = panel.getBibDatabaseContext()
-                                    .getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences());
+                                    .getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences());
 
-            tm.addEntry(0, new FileListEntry("", FileUtil.shortenFileName(toLink, dirsS).toString(),
-                                             ExternalFileTypes.getInstance().getExternalFileTypeByName("PDF")));
+            tm.addEntry(0, new FileListEntry("", FileUtil.relativize(toLink, dirsS).toString(),
+                    ExternalFileTypes.getInstance().getExternalFileTypeByName("PDF")));
             entry.setField(FieldName.FILE, tm.getStringRepresentation());
             res.add(entry);
         }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index d398ff19978..b406dcf8950 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -91,7 +91,7 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.model.entry.specialfields.SpecialField;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.metadata.SaveOrderConfig;
 import org.jabref.model.strings.StringUtil;
 
@@ -1392,13 +1392,16 @@ public void storeFileHistory(FileHistory history) {
     }
 
     @Override
-    public FileDirectoryPreferences getFileDirectoryPreferences() {
-        List<String> fields = Arrays.asList(FieldName.FILE, FieldName.PDF, FieldName.PS);
-        Map<String, String> fieldDirectories = new HashMap<>();
-        fields.stream().forEach(
-                                fieldName -> fieldDirectories.put(fieldName, get(fieldName + FileDirectoryPreferences.DIR_SUFFIX)));
-        return new FileDirectoryPreferences(getUser(), fieldDirectories,
-                                            getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR));
+    public FilePreferences getFilePreferences() {
+        Map<String, String> fieldDirectories = Stream.of(FieldName.FILE, FieldName.PDF, FieldName.PS)
+                                                     .collect(Collectors.toMap(field -> field, field -> get(field + FilePreferences.DIR_SUFFIX, "")));
+        return new FilePreferences(
+                getUser(),
+                fieldDirectories,
+                getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR),
+                get(IMPORT_FILENAMEPATTERN),
+                get(IMPORT_FILEDIRPATTERN)
+        );
     }
 
     public UpdateFieldPreferences getUpdateFieldPreferences() {
@@ -1526,7 +1529,7 @@ private NameFormatterPreferences getNameFormatterPreferences() {
 
     public FileLinkPreferences getFileLinkPreferences() {
         return new FileLinkPreferences(
-                                       Collections.singletonList(get(FieldName.FILE + FileDirectoryPreferences.DIR_SUFFIX)),
+                Collections.singletonList(get(FieldName.FILE + FilePreferences.DIR_SUFFIX)),
                                        fileDirForDatabase);
     }
 
@@ -1620,8 +1623,9 @@ public JournalAbbreviationPreferences getJournalAbbreviationPreferences() {
     }
 
     public CleanupPreferences getCleanupPreferences(JournalAbbreviationLoader journalAbbreviationLoader) {
-        return new CleanupPreferences(get(IMPORT_FILENAMEPATTERN), get(IMPORT_FILEDIRPATTERN),
-                                      getLayoutFormatterPreferences(journalAbbreviationLoader), getFileDirectoryPreferences());
+        return new CleanupPreferences(
+                getLayoutFormatterPreferences(journalAbbreviationLoader),
+                getFilePreferences());
     }
 
     public CleanupPreset getCleanupPreset() {
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 1245e404ba7..7e869e518d5 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -4,7 +4,7 @@
 
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
 public interface PreferencesService {
     JournalAbbreviationPreferences getJournalAbbreviationPreferences();
@@ -15,7 +15,7 @@ public interface PreferencesService {
 
     void storeJournalAbbreviationPreferences(JournalAbbreviationPreferences abbreviationsPreferences);
 
-    FileDirectoryPreferences getFileDirectoryPreferences();
+    FilePreferences getFilePreferences();
 
     Path getWorkingDir();
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 58fe003e16b..23785537e34 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1620,7 +1620,6 @@ Print\ entry\ preview=Print entry preview
 Copy\ title=Copy title
 Copy\ \\cite{BibTeX\ key}=Copy \\cite{BibTeX key}
 Copy\ BibTeX\ key\ and\ title=Copy BibTeX key and title
-File\ rename\ failed\ for\ %0\ entries.=File rename failed for %0 entries.
 Merged\ BibTeX\ source\ code=Merged BibTeX source code
 Invalid\ DOI\:\ '%0'.=Invalid DOI: '%0'.
 should\ start\ with\ a\ name=should start with a name
@@ -2242,4 +2241,4 @@ Keystore\ password\:=Keystore password\:
 Keystore\:=Keystore\:
 Password\:=Password\:
 Remember\ Password=Remember Password
-Use\ SSL=Use SSL
\ No newline at end of file
+Use\ SSL=Use SSL
diff --git a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
index 6b97ff2965a..c2e2773a31f 100644
--- a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
@@ -11,10 +11,10 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.TempDirectory;
 
@@ -26,7 +26,7 @@
 @ExtendWith(TempDirectory.class)
 public class AutoSetFileLinksUtilTest {
 
-    private final FileDirectoryPreferences fileDirPrefs = mock(FileDirectoryPreferences.class);
+    private final FilePreferences fileDirPrefs = mock(FilePreferences.class);
     private final AutoLinkPreferences autoLinkPrefs = new AutoLinkPreferences(false, "", true, ';');
     private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
     private final ExternalFileTypes externalFileTypes = mock(ExternalFileTypes.class);
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
index 3bf8d043435..a2fcce655cf 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
@@ -12,13 +12,14 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.preferences.JabRefPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.TempDirectory;
+import org.mockito.Answers;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -27,7 +28,6 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
@@ -35,13 +35,12 @@
 class LinkedFileViewModelTest {
 
     private Path tempFile;
-    private final JabRefPreferences preferences = mock(JabRefPreferences.class);
+    private final JabRefPreferences preferences = mock(JabRefPreferences.class, Answers.RETURNS_DEEP_STUBS);
     private LinkedFile linkedFile;
     private BibEntry entry;
     private BibDatabaseContext databaseContext;
     private TaskExecutor taskExecutor;
     private DialogService dialogService;
-    private final FileDirectoryPreferences fileDirectoryPreferences = mock(FileDirectoryPreferences.class);
 
     @BeforeEach
     void setUp(@TempDirectory.TempDir Path tempFolder) throws Exception {
@@ -58,10 +57,10 @@ void setUp(@TempDirectory.TempDir Path tempFolder) throws Exception {
     void deleteWhenFilePathNotPresentReturnsTrue() {
         // Making this a spy, so we can inject an empty optional without digging into the implementation
         linkedFile = spy(new LinkedFile("", "nonexistent file", ""));
-        doReturn(Optional.empty()).when(linkedFile).findIn(any(BibDatabaseContext.class), any(FileDirectoryPreferences.class));
+        doReturn(Optional.empty()).when(linkedFile).findIn(any(BibDatabaseContext.class), any(FilePreferences.class));
 
         LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
-        boolean removed = viewModel.delete(fileDirectoryPreferences);
+        boolean removed = viewModel.delete();
 
         assertTrue(removed);
         verifyZeroInteractions(dialogService); // dialog was never shown
@@ -79,7 +78,7 @@ void deleteWhenRemoveChosenReturnsTrueButDoesNotDeletesFile() {
                 any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(3))); // first vararg - remove button
 
         LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
-        boolean removed = viewModel.delete(fileDirectoryPreferences);
+        boolean removed = viewModel.delete();
 
         assertTrue(removed);
         assertTrue(Files.exists(tempFile));
@@ -97,14 +96,14 @@ void deleteWhenDeleteChosenReturnsTrueAndDeletesFile() {
                 any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(4))); // second vararg - delete button
 
         LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
-        boolean removed = viewModel.delete(fileDirectoryPreferences);
+        boolean removed = viewModel.delete();
 
         assertTrue(removed);
         assertFalse(Files.exists(tempFile));
     }
 
     @Test
-    void deleteWhenDeleteChosenAndFileMissingReturnsFalse() {
+    void deleteMissingFileReturnsTrue() {
         linkedFile = new LinkedFile("", "!!nonexistent file!!", "");
         when(dialogService.showCustomButtonDialogAndWait(
                 any(AlertType.class),
@@ -115,10 +114,9 @@ void deleteWhenDeleteChosenAndFileMissingReturnsFalse() {
                 any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(4))); // second vararg - delete button
 
         LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
-        boolean removed = viewModel.delete(fileDirectoryPreferences);
+        boolean removed = viewModel.delete();
 
-        verify(dialogService).showErrorDialogAndWait(anyString(), anyString());
-        assertFalse(removed);
+        assertTrue(removed);
     }
 
     @Test
@@ -133,7 +131,7 @@ void deleteWhenDialogCancelledReturnsFalseAndDoesNotRemoveFile() {
                 any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(5))); // third vararg - cancel button
 
         LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
-        boolean removed = viewModel.delete(fileDirectoryPreferences);
+        boolean removed = viewModel.delete();
 
         assertFalse(removed);
         assertTrue(Files.exists(tempFile));
diff --git a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
index 4dab917f68c..124e08b2304 100644
--- a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
@@ -2,13 +2,13 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
-import java.nio.file.Path;
-import java.nio.file.Files;
 
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
 import org.jabref.logic.formatter.bibtexfields.LatexCleanupFormatter;
@@ -29,13 +29,14 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FileFieldWriter;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.metadata.MetaData;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.TempDirectory;
-import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -62,17 +63,12 @@ void setUp(@TempDirectory.TempDir Path bibFolder) throws IOException {
         Files.createFile(bibFolder.resolve("test.bib"));
         context.setDatabaseFile(bibFolder.resolve("test.bib").toFile());
 
-        FileDirectoryPreferences fileDirPrefs = mock(FileDirectoryPreferences.class);
+        FilePreferences fileDirPrefs = mock(FilePreferences.class, Answers.RETURNS_SMART_NULLS);
         //Biblocation as Primary overwrites all other dirs
         when(fileDirPrefs.isBibLocationAsPrimary()).thenReturn(true);
 
         worker = new CleanupWorker(context,
-                //empty fileDirPattern for backwards compatibility
-                new CleanupPreferences("[bibtexkey]",
-                        "",
-                        mock(LayoutFormatterPreferences.class),
-                        fileDirPrefs));
-
+                new CleanupPreferences(mock(LayoutFormatterPreferences.class), fileDirPrefs));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
index c4827f7eef0..fbe92bc4a65 100644
--- a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
@@ -5,7 +5,7 @@
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -20,8 +20,7 @@ public class ISSNCleanupTest {
     @BeforeEach
     public void setUp() {
         worker = new CleanupWorker(mock(BibDatabaseContext.class),
-                new CleanupPreferences("", "", mock(LayoutFormatterPreferences.class),
-                        mock(FileDirectoryPreferences.class)));
+                new CleanupPreferences(mock(LayoutFormatterPreferences.class), mock(FilePreferences.class)));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
index 1d54e86a199..9e9d21bfbd0 100644
--- a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -13,11 +12,11 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FileFieldWriter;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.metadata.MetaData;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.TempDirectory;
 
@@ -30,155 +29,96 @@
 @ExtendWith(TempDirectory.class)
 class MoveFilesCleanupTest {
 
-    private File pdfFolder;
-    private BibDatabaseContext databaseContext;
+    private Path defaultFileFolder;
+    private Path fileBefore;
     private MoveFilesCleanup cleanup;
     private BibEntry entry;
-    private FileDirectoryPreferences fileDirPrefs;
+    private FilePreferences filePreferences;
 
     @BeforeEach
     void setUp(@TempDirectory.TempDir Path bibFolder) throws IOException {
+        // The folder where the files should be moved to
+        defaultFileFolder = bibFolder.resolve("pdf");
+        Files.createDirectory(defaultFileFolder);
+
+        // The folder where the files are located originally
+        Path fileFolder = bibFolder.resolve("files");
+        Files.createDirectory(fileFolder);
+        fileBefore = fileFolder.resolve("test.pdf");
+        Files.createFile(fileBefore);
+
         MetaData metaData = new MetaData();
-        Path path = bibFolder.resolve("ARandomlyNamedFolder");
-        Files.createDirectory(path);
-        pdfFolder = path.toFile();
-        metaData.setDefaultFileDirectory(pdfFolder.getAbsolutePath());
-        databaseContext = new BibDatabaseContext(new BibDatabase(), metaData, new Defaults());
-        Files.createFile(path.resolve("test.bib"));
-        databaseContext.setDatabaseFile(path.resolve("test.bib").toFile());
+        metaData.setDefaultFileDirectory(defaultFileFolder.toAbsolutePath().toString());
+        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(), metaData, new Defaults());
+        Files.createFile(bibFolder.resolve("test.bib"));
+        databaseContext.setDatabaseFile(bibFolder.resolve("test.bib"));
+
         entry = new BibEntry();
         entry.setCiteKey("Toot");
         entry.setField("title", "test title");
+        entry.setField("year", "1989");
+        LinkedFile fileField = new LinkedFile("", fileBefore.toAbsolutePath().toString(), "");
+        entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
 
-        fileDirPrefs = mock(FileDirectoryPreferences.class);
-        when(fileDirPrefs.isBibLocationAsPrimary()).thenReturn(false); //Biblocation as Primary overwrites all other dirs, therefore we set it to false here
+        filePreferences = mock(FilePreferences.class);
+        when(filePreferences.isBibLocationAsPrimary()).thenReturn(false); //Biblocation as Primary overwrites all other dirs, therefore we set it to false here
+        cleanup = new MoveFilesCleanup(databaseContext, filePreferences);
     }
 
     @Test
-    void movesFileFromSubfolder(@TempDirectory.TempDir Path bibFolder) throws IOException {
-        Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
-        Files.createDirectory(path);
-        File fileBefore = path.resolve("test.pdf").toFile();
-        assertTrue(fileBefore.createNewFile());
-        assertTrue(fileBefore.exists());
-
-        LinkedFile fileField = new LinkedFile("", fileBefore.getAbsolutePath(), "");
-        entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
-        cleanup = new MoveFilesCleanup(databaseContext, "", fileDirPrefs);
-
+    void movesFile() throws Exception {
+        when(filePreferences.getFileDirPattern()).thenReturn("");
         cleanup.cleanup(entry);
 
-        assertFalse(fileBefore.exists());
-        File fileAfter = pdfFolder.toPath().resolve("test.pdf").toFile();
-        assertTrue(fileAfter.exists());
-
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", fileAfter.getName(), ""))),
+        Path fileAfter = defaultFileFolder.resolve("test.pdf");
+        assertEquals(
+                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", "test.pdf", ""))),
                 entry.getField("file"));
+        assertFalse(Files.exists(fileBefore));
+        assertTrue(Files.exists(fileAfter));
     }
 
     @Test
-    void movesFileFromSubfolderMultiple(@TempDirectory.TempDir Path bibFolder) throws IOException {
-        Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
-        Files.createDirectory(path);
-        File fileBefore = path.resolve("test.pdf").toFile();
-        assertTrue(fileBefore.createNewFile());
-        assertTrue(fileBefore.exists());
-
-        LinkedFile fileField = new LinkedFile("", fileBefore.getAbsolutePath(), "");
+    void movesFileWithMulitpleLinked() throws Exception {
+        LinkedFile fileField = new LinkedFile("", fileBefore.toAbsolutePath().toString(), "");
         entry.setField("file", FileFieldWriter.getStringRepresentation(
                 Arrays.asList(new LinkedFile("", "", ""), fileField, new LinkedFile("", "", ""))));
 
-        cleanup = new MoveFilesCleanup(databaseContext, "", fileDirPrefs);
+        when(filePreferences.getFileDirPattern()).thenReturn("");
         cleanup.cleanup(entry);
 
-        assertFalse(fileBefore.exists());
-        File fileAfter = pdfFolder.toPath().resolve("test.pdf").toFile();
-        assertTrue(fileAfter.exists());
-
+        Path fileAfter = defaultFileFolder.resolve("test.pdf");
         assertEquals(
-                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", fileAfter.getName(), ""))),
+                Optional.of(FileFieldWriter.getStringRepresentation(
+                        Arrays.asList(new LinkedFile("", "", ""), new LinkedFile("", "test.pdf", ""), new LinkedFile("", "", "")))),
                 entry.getField("file"));
+        assertFalse(Files.exists(fileBefore));
+        assertTrue(Files.exists(fileAfter));
     }
 
     @Test
-    void movesFileFromSubfolderWithFileDirPattern(@TempDirectory.TempDir Path bibFolder) throws IOException {
-        Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
-        Files.createDirectory(path);
-        File fileBefore = path.resolve("test.pdf").toFile();
-
-        assertTrue(fileBefore.createNewFile());
-        assertTrue(fileBefore.exists());
-
-        LinkedFile fileField = new LinkedFile("", fileBefore.getAbsolutePath(), "");
-        entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
-
-        cleanup = new MoveFilesCleanup(databaseContext, "[entrytype]", fileDirPrefs);
-
+    void movesFileWithFileDirPattern() throws Exception {
+        when(filePreferences.getFileDirPattern()).thenReturn("[entrytype]");
         cleanup.cleanup(entry);
 
-        assertFalse(fileBefore.exists());
-        Path after = pdfFolder.toPath().resolve("Misc").resolve("test.pdf");
-        Path relativefileDir = pdfFolder.toPath().relativize(after);
-        assertTrue(Files.exists(after));
-
-        assertEquals(Optional
-                        .of(FileFieldWriter.getStringRepresentation(new LinkedFile("", relativefileDir.toString(), ""))),
+        Path fileAfter = defaultFileFolder.resolve("Misc").resolve("test.pdf");
+        assertEquals(
+                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", "Misc/test.pdf", ""))),
                 entry.getField("file"));
+        assertFalse(Files.exists(fileBefore));
+        assertTrue(Files.exists(fileAfter));
     }
 
     @Test
-    void movesFileFromSubfolderWithSubdirPattern(@TempDirectory.TempDir Path bibFolder) throws IOException {
-        BibEntry local_entry = (BibEntry) entry.clone();
-        local_entry.setField("year", "1989");
-        Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
-        Files.createDirectory(path);
-        File fileBefore = path.resolve("test.pdf").toFile();
-
-        assertTrue(fileBefore.createNewFile());
-        assertTrue(fileBefore.exists());
-
-        LinkedFile fileField = new LinkedFile("", fileBefore.getAbsolutePath(), "");
-        local_entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
-
-        cleanup = new MoveFilesCleanup(databaseContext, "[year]", fileDirPrefs);
-        cleanup.cleanup(local_entry);
-
-        assertFalse(fileBefore.exists());
-        Path after = pdfFolder.toPath().resolve("1989").resolve("test.pdf");
-        Path relativefileDir = pdfFolder.toPath().relativize(after);
-        assertTrue(Files.exists(after));
-
-        assertEquals(Optional
-                        .of(FileFieldWriter.getStringRepresentation(new LinkedFile("", relativefileDir.toString(), ""))),
-                local_entry.getField("file"));
-    }
-
-    @Test
-    void movesFileFromSubfolderWithDeepSubdirPattern(@TempDirectory.TempDir Path bibFolder) throws IOException {
-        BibEntry local_entry = (BibEntry) entry.clone();
-        local_entry.setField("year", "1989");
-        local_entry.setField("author", "O. Kitsune");
-        Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
-        Files.createDirectory(path);
-        File fileBefore = path.resolve("test.pdf").toFile();
-
-        assertTrue(fileBefore.createNewFile());
-        assertTrue(fileBefore.exists());
-
-        LinkedFile fileField = new LinkedFile("", fileBefore.getAbsolutePath(), "");
-        local_entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
-
-        cleanup = new MoveFilesCleanup(databaseContext, "[entrytype]/[year]/[auth]", fileDirPrefs);
-
-        cleanup.cleanup(local_entry);
-
-        assertFalse(fileBefore.exists());
-        Path after = pdfFolder.toPath().resolve("Misc").resolve("1989").resolve("Kitsune").resolve("test.pdf");
-        Path relativefileDir = pdfFolder.toPath().relativize(after);
-        assertTrue(Files.exists(after));
+    void movesFileWithSubdirectoryPattern() throws Exception {
+        when(filePreferences.getFileDirPattern()).thenReturn("[entrytype]/[year]/[auth]");
+        cleanup.cleanup(entry);
 
-        assertEquals(Optional
-                        .of(FileFieldWriter.getStringRepresentation(new LinkedFile("", relativefileDir.toString(), ""))),
-                local_entry.getField("file"));
+        Path fileAfter = defaultFileFolder.resolve("Misc").resolve("1989").resolve("test.pdf");
+        assertEquals(
+                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", "Misc/1989/test.pdf", ""))),
+                entry.getField("file"));
+        assertFalse(Files.exists(fileBefore));
+        assertTrue(Files.exists(fileAfter));
     }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
index 9c3ad79cb91..eb027f824d0 100644
--- a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
@@ -1,27 +1,24 @@
 package org.jabref.logic.cleanup;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Optional;
 
-import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.model.Defaults;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FileFieldWriter;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.metadata.MetaData;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.TempDirectory;
-import org.mockito.Answers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
@@ -30,24 +27,24 @@
 @ExtendWith(TempDirectory.class)
 class RenamePdfCleanupTest {
 
-    private BibDatabaseContext context;
     private BibEntry entry;
 
-    private FileDirectoryPreferences fileDirPrefs;
-    private LayoutFormatterPreferences layoutFormatterPreferences;
+    private FilePreferences filePreferences;
+    private RenamePdfCleanup cleanup;
 
     @BeforeEach
     void setUp(@TempDirectory.TempDir Path testFolder) {
         Path path = testFolder.resolve("test.bib");
         MetaData metaData = new MetaData();
-        context = new BibDatabaseContext(new BibDatabase(), metaData, new Defaults());
-        context.setDatabaseFile(path.toFile());
+        BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(), metaData, new Defaults());
+        context.setDatabaseFile(path);
 
-        fileDirPrefs = mock(FileDirectoryPreferences.class);
-        when(fileDirPrefs.isBibLocationAsPrimary()).thenReturn(true); //Set Biblocation as Primary Directory, otherwise the tmp folders won't be cleaned up correctly
         entry = new BibEntry();
         entry.setCiteKey("Toot");
-        layoutFormatterPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+
+        filePreferences = mock(FilePreferences.class);
+        when(filePreferences.isBibLocationAsPrimary()).thenReturn(true); //Set Biblocation as Primary Directory, otherwise the tmp folders won't be cleaned up correctly
+        cleanup = new RenamePdfCleanup(false, context, filePreferences);
     }
 
     /**
@@ -55,15 +52,13 @@ void setUp(@TempDirectory.TempDir Path testFolder) {
      */
     @Test
     void cleanupRenamePdfRenamesFileEvenIfOnlyDifferenceIsCase(@TempDirectory.TempDir Path testFolder) throws IOException {
-        String fileNamePattern = "[bibtexkey]";
         Path path = testFolder.resolve("toot.tmp");
         Files.createFile(path);
 
         LinkedFile fileField = new LinkedFile("", path.toAbsolutePath().toString(), "");
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
 
-        RenamePdfCleanup cleanup = new RenamePdfCleanup(false, context, fileNamePattern,
-                fileDirPrefs);
+        when(filePreferences.getFileNamePattern()).thenReturn("[bibtexkey]");
         cleanup.cleanup(entry);
 
         LinkedFile newFileField = new LinkedFile("", "Toot.tmp", "");
@@ -72,27 +67,24 @@ void cleanupRenamePdfRenamesFileEvenIfOnlyDifferenceIsCase(@TempDirectory.TempDi
 
     @Test
     void cleanupRenamePdfRenamesWithMultipleFiles(@TempDirectory.TempDir Path testFolder) throws IOException {
-        String fileNamePattern = "[bibtexkey] - [fulltitle]";
         Path path = testFolder.resolve("Toot.tmp");
         Files.createFile(path);
-        File tempFile = path.toFile();
 
         entry.setField("title", "test title");
-        entry.setField("file", FileFieldWriter.getStringRepresentation(Arrays.asList(new LinkedFile("", "", ""),
-                new LinkedFile("", tempFile.getAbsolutePath(), ""), new LinkedFile("", "", ""))));
+        entry.setField("file", FileFieldWriter.getStringRepresentation(
+                Arrays.asList(new LinkedFile("", "", ""), new LinkedFile("", path.toAbsolutePath().toString(), ""), new LinkedFile("", "", ""))));
 
-        RenamePdfCleanup cleanup = new RenamePdfCleanup(false, context, fileNamePattern,
-                fileDirPrefs);
+        when(filePreferences.getFileNamePattern()).thenReturn("[bibtexkey] - [fulltitle]");
         cleanup.cleanup(entry);
 
         assertEquals(
-                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", "Toot - test title.tmp", ""))),
+                Optional.of(FileFieldWriter.getStringRepresentation(
+                        Arrays.asList(new LinkedFile("", "", ""), new LinkedFile("", "Toot - test title.tmp", ""), new LinkedFile("", "", "")))),
                 entry.getField("file"));
     }
 
     @Test
     void cleanupRenamePdfRenamesFileStartingWithBibtexKey(@TempDirectory.TempDir Path testFolder) throws IOException {
-        String fileNamePattern = "[bibtexkey] - [fulltitle]";
         Path path = testFolder.resolve("Toot.tmp");
         Files.createFile(path);
 
@@ -100,8 +92,7 @@ void cleanupRenamePdfRenamesFileStartingWithBibtexKey(@TempDirectory.TempDir Pat
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
         entry.setField("title", "test title");
 
-        RenamePdfCleanup cleanup = new RenamePdfCleanup(false, context, fileNamePattern,
-                fileDirPrefs);
+        when(filePreferences.getFileNamePattern()).thenReturn("[bibtexkey] - [fulltitle]");
         cleanup.cleanup(entry);
 
         LinkedFile newFileField = new LinkedFile("", "Toot - test title.tmp", "");
@@ -110,49 +101,16 @@ void cleanupRenamePdfRenamesFileStartingWithBibtexKey(@TempDirectory.TempDir Pat
 
     @Test
     void cleanupRenamePdfRenamesFileInSameFolder(@TempDirectory.TempDir Path testFolder) throws IOException {
-        String fileNamePattern = "[bibtexkey] - [fulltitle]";
         Path path = testFolder.resolve("Toot.pdf");
         Files.createFile(path);
         LinkedFile fileField = new LinkedFile("", "Toot.pdf", "PDF");
         entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
         entry.setField("title", "test title");
 
-        RenamePdfCleanup cleanup = new RenamePdfCleanup(false, context, fileNamePattern, fileDirPrefs);
+        when(filePreferences.getFileNamePattern()).thenReturn("[bibtexkey] - [fulltitle]");
         cleanup.cleanup(entry);
 
         LinkedFile newFileField = new LinkedFile("", "Toot - test title.pdf", "PDF");
         assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField("file"));
     }
-
-    @Test
-    void cleanupSingleField(@TempDirectory.TempDir Path testFolder) throws IOException {
-        String fileNamePattern = "[bibtexkey] - [fulltitle]";
-        Path path = testFolder.resolve("Toot.pdf");
-        Files.createFile(path);
-        LinkedFile fileField = new LinkedFile("", "Toot.pdf", "PDF");
-        entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
-        entry.setField("title", "test title");
-        RenamePdfCleanup cleanup = new RenamePdfCleanup(false, context, fileNamePattern,
-                fileDirPrefs, fileField);
-
-        cleanup.cleanup(entry);
-
-        LinkedFile newFileField = new LinkedFile("", "Toot - test title.pdf", "PDF");
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField("file"));
-
-    }
-
-    @Test
-    void cleanupGetTargetFilename(@TempDirectory.TempDir Path testFolder) throws IOException {
-        String fileNamePattern = "[bibtexkey] - [fulltitle]";
-        Path path = testFolder.resolve("Toot.pdf");
-        Files.createFile(path);
-        LinkedFile fileField = new LinkedFile("", "Toot.pdf", "PDF");
-        RenamePdfCleanup cleanup = new RenamePdfCleanup(false, context, fileNamePattern, fileDirPrefs);
-        entry.setField("file", FileFieldWriter.getStringRepresentation(fileField));
-        entry.setField("title", "test title");
-
-        assertEquals("Toot - test title.pdf", cleanup.getTargetFileName(fileField, entry));
-    }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index 04f687f6666..879abb26d7e 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -19,7 +19,7 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.InternalBibtexFields;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.metadata.MetaData;
 
 import org.junit.jupiter.api.Test;
@@ -340,7 +340,7 @@ public void testEntryIsUnchangedAfterChecks() {
         BibDatabaseContext context = new BibDatabaseContext(bibDatabase, new Defaults());
 
         new IntegrityCheck(context,
-                mock(FileDirectoryPreferences.class),
+                mock(FilePreferences.class),
                 createBibtexKeyPatternPreferences(),
                 new JournalAbbreviationRepository(new Abbreviation("IEEE Software", "IEEE SW")), true)
                 .checkBibtexDatabase();
@@ -378,7 +378,7 @@ private BibDatabaseContext createContext(String field, String value) {
 
     private void assertWrong(BibDatabaseContext context) {
         List<IntegrityMessage> messages = new IntegrityCheck(context,
-                mock(FileDirectoryPreferences.class),
+                mock(FilePreferences.class),
                 createBibtexKeyPatternPreferences(),
                 new JournalAbbreviationRepository(new Abbreviation("IEEE Software", "IEEE SW")), true)
                 .checkBibtexDatabase();
@@ -387,7 +387,7 @@ private void assertWrong(BibDatabaseContext context) {
 
     private void assertCorrect(BibDatabaseContext context) {
         List<IntegrityMessage> messages = new IntegrityCheck(context,
-                mock(FileDirectoryPreferences.class),
+                mock(FilePreferences.class),
                 createBibtexKeyPatternPreferences(),
                 new JournalAbbreviationRepository(new Abbreviation("IEEE Software", "IEEE SW")), true
         ).checkBibtexDatabase();
diff --git a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
index f4068cda66f..1a94f42a49a 100644
--- a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
+++ b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
@@ -9,7 +9,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.pdf.FileAnnotation;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -37,7 +37,7 @@ public void readEntryExampleThesis() {
         EntryAnnotationImporter entryAnnotationImporter = new EntryAnnotationImporter(entry);
 
         //when
-        Map<Path, List<FileAnnotation>> annotations = entryAnnotationImporter.importAnnotationsFromFiles(databaseContext, mock(FileDirectoryPreferences.class));
+        Map<Path, List<FileAnnotation>> annotations = entryAnnotationImporter.importAnnotationsFromFiles(databaseContext, mock(FilePreferences.class));
 
         //then
         int fileCounter = 0;
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
index 8d97da29687..62dcb69d9b9 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
@@ -5,7 +5,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jabref.model.metadata.FileDirectoryPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -20,12 +20,12 @@ public class BibDatabaseContextTest {
 
     // Store the minimal preferences for the
     // BibDatabaseContext.getFileDirectories(File,
-    // FileDirectoryPreferences) incocation:
-    private FileDirectoryPreferences fileDirPrefs;
+    // FilePreferences) incocation:
+    private FilePreferences fileDirPrefs;
 
     @BeforeEach
     public void setUp() {
-        fileDirPrefs = mock(FileDirectoryPreferences.class);
+        fileDirPrefs = mock(FilePreferences.class);
         currentWorkingDir = Paths.get(System.getProperty("user.dir"));
         when(fileDirPrefs.isBibLocationAsPrimary()).thenReturn(true);
     }

From 0e1acfe478e1f7160f65bb93e010328c9b879ed3 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 12 Sep 2018 00:14:26 +0200
Subject: [PATCH 086/229] Convert update worker to BackgroundTask (#4334)

---
 src/main/java/org/jabref/JabRefGUI.java       |  12 +-
 src/main/java/org/jabref/gui/JabRefFrame.java |   2 +-
 .../gui/actions/SearchForUpdateAction.java    |  21 +++-
 .../org/jabref/gui/help/VersionWorker.java    |  94 ++++++++++++++
 .../org/jabref/gui/worker/VersionWorker.java  | 117 ------------------
 5 files changed, 117 insertions(+), 129 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/help/VersionWorker.java
 delete mode 100644 src/main/java/org/jabref/gui/worker/VersionWorker.java

diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
index 84ea60e87cb..b8669181f8e 100644
--- a/src/main/java/org/jabref/JabRefGUI.java
+++ b/src/main/java/org/jabref/JabRefGUI.java
@@ -15,18 +15,17 @@
 import org.jabref.gui.GUIGlobals;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.dialogs.BackupUIManager;
+import org.jabref.gui.help.VersionWorker;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.importer.ParserResultWarningDialog;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.shared.SharedDatabaseUIManager;
-import org.jabref.gui.worker.VersionWorker;
 import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.logic.shared.exception.NotASharedDatabaseException;
-import org.jabref.logic.util.Version;
 import org.jabref.model.database.shared.DatabaseNotSupportedException;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -60,13 +59,8 @@ public JabRefGUI(Stage mainStage, List<ParserResult> argsDatabases, boolean isBl
                                     .orElse(Globals.prefs.get(JabRefPreferences.LAST_FOCUSED));
 
         openWindow(mainStage);
-        JabRefGUI.checkForNewVersion(false);
-    }
-
-    public static void checkForNewVersion(boolean manualExecution) {
-        Version toBeIgnored = Globals.prefs.getVersionPreferences().getIgnoredVersion();
-        Version currentVersion = Globals.BUILD_INFO.getVersion();
-        new VersionWorker(JabRefGUI.getMainFrame(), manualExecution, currentVersion, toBeIgnored).execute();
+        new VersionWorker(Globals.BUILD_INFO.getVersion(), Globals.prefs.getVersionPreferences().getIgnoredVersion(), JabRefGUI.getMainFrame().getDialogService(), Globals.TASK_EXECUTOR)
+                .checkForNewVersionAsync(false);
     }
 
     private void openWindow(Stage mainStage) {
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index d440752b7a2..7e8b983de25 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -954,7 +954,7 @@ private MenuBar createMenu() {
 
                 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/")),
diff --git a/src/main/java/org/jabref/gui/actions/SearchForUpdateAction.java b/src/main/java/org/jabref/gui/actions/SearchForUpdateAction.java
index 5a8dc415b74..be3415c2120 100644
--- a/src/main/java/org/jabref/gui/actions/SearchForUpdateAction.java
+++ b/src/main/java/org/jabref/gui/actions/SearchForUpdateAction.java
@@ -1,11 +1,28 @@
 package org.jabref.gui.actions;
 
-import org.jabref.JabRefGUI;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.help.VersionWorker;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.util.BuildInfo;
+import org.jabref.preferences.VersionPreferences;
 
 public class SearchForUpdateAction extends SimpleCommand {
 
+    private final BuildInfo buildInfo;
+    private final VersionPreferences versionPreferences;
+    private final DialogService dialogService;
+    private final TaskExecutor taskExecutor;
+
+    public SearchForUpdateAction(BuildInfo buildInfo, VersionPreferences versionPreferences, DialogService dialogService, TaskExecutor taskExecutor) {
+        this.buildInfo = buildInfo;
+        this.versionPreferences = versionPreferences;
+        this.dialogService = dialogService;
+        this.taskExecutor = taskExecutor;
+    }
+
     @Override
     public void execute() {
-        JabRefGUI.checkForNewVersion(true);
+        new VersionWorker(buildInfo.getVersion(), versionPreferences.getIgnoredVersion(), dialogService, taskExecutor)
+                .checkForNewVersionAsync(true);
     }
 }
diff --git a/src/main/java/org/jabref/gui/help/VersionWorker.java b/src/main/java/org/jabref/gui/help/VersionWorker.java
new file mode 100644
index 00000000000..a77be5cc955
--- /dev/null
+++ b/src/main/java/org/jabref/gui/help/VersionWorker.java
@@ -0,0 +1,94 @@
+package org.jabref.gui.help;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.Version;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This worker checks if there is a new version of JabRef available. If there is it will display a dialog to the user
+ * offering him multiple options to proceed (see changelog, go to the download page, ignore this version, and remind
+ * later).
+ *
+ * If the versions check is executed manually and this is the latest version it will also display a dialog to inform the
+ * user.
+ */
+public class VersionWorker {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(VersionWorker.class);
+
+    /**
+     * The current version of the installed JabRef
+     */
+    private final Version installedVersion;
+
+    /**
+     * The version which was previously ignored by the user
+     */
+    private final Version toBeIgnored;
+    private final DialogService dialogService;
+    private final TaskExecutor taskExecutor;
+
+    public VersionWorker(Version installedVersion, Version toBeIgnored, DialogService dialogService, TaskExecutor taskExecutor) {
+        this.installedVersion = Objects.requireNonNull(installedVersion);
+        this.toBeIgnored = Objects.requireNonNull(toBeIgnored);
+        this.dialogService = Objects.requireNonNull(dialogService);
+        this.taskExecutor = Objects.requireNonNull(taskExecutor);
+    }
+
+    /**
+     * Returns a newer version excluding any non-stable versions, except if the installed one is unstable too. If no
+     * newer version was found, then an empty optional is returned.
+     */
+    private Optional<Version> getNewVersion() throws IOException {
+        List<Version> availableVersions = Version.getAllAvailableVersions();
+        return installedVersion.shouldBeUpdatedTo(availableVersions);
+    }
+
+    /**
+     * @param manualExecution if this versions check is executed automatically (eg. on startup) or manually by the user
+     */
+    public void checkForNewVersionAsync(boolean manualExecution) {
+        BackgroundTask.wrap(this::getNewVersion)
+                      .onSuccess(version -> showUpdateInfo(version, manualExecution))
+                      .onFailure(exception -> showConnectionError(exception, manualExecution))
+                      .executeWith(taskExecutor);
+    }
+
+    /**
+     * Prints the connection problem to the status bar and shows a dialog if it was executed manually
+     */
+    private void showConnectionError(Exception exception, boolean manualExecution) {
+        String couldNotConnect = Localization.lang("Could not connect to the update server.");
+        String tryLater = Localization.lang("Please try again later and/or check your network connection.");
+        if (manualExecution) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Error"), couldNotConnect + "\n" + tryLater, exception);
+        }
+        LOGGER.warn(couldNotConnect + " " + tryLater, exception);
+    }
+
+    /**
+     * Prints up-to-date to the status bar (and shows a dialog it was executed manually) if there is now new version.
+     * Shows a "New Version" Dialog to the user if there is.
+     */
+    private void showUpdateInfo(Optional<Version> newerVersion, boolean manualExecution) {
+        // no new version could be found, only respect the ignored version on automated version checks
+        if (!newerVersion.isPresent() || (newerVersion.get().equals(toBeIgnored) && !manualExecution)) {
+            if (manualExecution) {
+                dialogService.notify(Localization.lang("JabRef is up-to-date."));
+            }
+        } else {
+            // notify the user about a newer version
+            new NewVersionDialog(installedVersion, newerVersion.get());
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/worker/VersionWorker.java b/src/main/java/org/jabref/gui/worker/VersionWorker.java
deleted file mode 100644
index 0926a0d6e50..00000000000
--- a/src/main/java/org/jabref/gui/worker/VersionWorker.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.jabref.gui.worker;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-
-import javax.swing.JOptionPane;
-import javax.swing.SwingWorker;
-
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.help.NewVersionDialog;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.Version;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * This worker checks if there is a new version of JabRef available.
- * If there is it will display a Dialog to the User offering him multiple Options to proceed
- * (see changelog, go to the download page, ignore this version, and remind later).
- *
- * If the versions check is executed manually and this is the latest version it will also display a dialog to inform the user.
- */
-public class VersionWorker extends SwingWorker<List<Version>, Void> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(VersionWorker.class);
-
-    private final JabRefFrame mainFrame;
-
-    /** If this versions check is executed automatically (eg. on startup) or manually by the user */
-    private final boolean manualExecution;
-
-    /** The current version of the installed JabRef */
-    private final Version installedVersion;
-
-    /** The version which was previously ignored by the user */
-    private final Version toBeIgnored;
-
-
-    public VersionWorker(JabRefFrame mainFrame, boolean manualExecution, Version installedVersion, Version toBeIgnored) {
-        this.mainFrame = Objects.requireNonNull(mainFrame);
-        this.manualExecution = manualExecution;
-        this.installedVersion = Objects.requireNonNull(installedVersion);
-        this.toBeIgnored = Objects.requireNonNull(toBeIgnored);
-    }
-
-    @Override
-    protected List<Version> doInBackground() throws Exception {
-        try {
-            return Version.getAllAvailableVersions();
-        } catch (IOException ioException) {
-            LOGGER.warn("Could not connect to the updateserver.", ioException);
-            return Collections.emptyList();
-        }
-    }
-
-    @Override
-    public void done() {
-        if (this.isCancelled()) {
-            return;
-        }
-
-        try {
-            List<Version> availableVersions = this.get();
-
-            // couldn't find any version, connection problems?
-            if (availableVersions.isEmpty()) {
-                showConnectionError();
-            } else {
-                showUpdateInfo(availableVersions);
-            }
-
-        } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error("Error while checking for updates", e);
-        }
-    }
-
-    /**
-     * prints the connection problem to the status bar and shows a dialog if it was executed manually
-     */
-    private void showConnectionError() {
-        String couldNotConnect = Localization.lang("Could not connect to the update server.");
-        String tryLater = Localization.lang("Please try again later and/or check your network connection.");
-        if (manualExecution) {
-            JOptionPane.showMessageDialog(null, couldNotConnect + "\n" + tryLater,
-                    couldNotConnect, JOptionPane.ERROR_MESSAGE);
-        }
-        this.mainFrame.output(couldNotConnect + " " + tryLater);
-    }
-
-    /**
-     * Prints up-to-date to the status bar (and shows a dialog it was executed manually) if there is now new version.
-     * Shows a "New Version" Dialog to the user if there is.
-     */
-    private void showUpdateInfo(List<Version> availableVersions) {
-        // the newer version, excluding any non-stable versions, except if the installed one is unstable too
-        Optional<Version> newerVersion = installedVersion.shouldBeUpdatedTo(availableVersions);
-
-        // no new version could be found, only respect the ignored version on automated version checks
-        if (!newerVersion.isPresent() || (newerVersion.get().equals(toBeIgnored) && !manualExecution)) {
-            String upToDate = Localization.lang("JabRef is up-to-date.");
-            if (manualExecution) {
-                DefaultTaskExecutor.runInJavaFXThread(() -> mainFrame.getDialogService().showInformationDialogAndWait(upToDate, upToDate));
-            }
-        } else {
-            // notify the user about a newer version
-            new NewVersionDialog(installedVersion, newerVersion.get());
-        }
-    }
-
-}

From 8971a4fe79577addbbb6c4582069786ba2c011b6 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 12 Sep 2018 00:14:48 +0200
Subject: [PATCH 087/229] Fix entry editor field display (#4333)

* Fix height of some field editors

* Make more fields single line
---
 src/main/java/org/jabref/gui/PreviewPanel.java    | 15 +++++++++++----
 .../jabref/gui/fieldeditors/BibtexKeyEditor.fxml  |  4 ++--
 .../jabref/gui/fieldeditors/BibtexKeyEditor.java  |  6 +++---
 .../jabref/gui/fieldeditors/EditorTextArea.java   |  1 -
 .../jabref/gui/fieldeditors/EditorTextField.java  |  7 +++++--
 .../jabref/gui/fieldeditors/FieldNameLabel.java   |  8 +++-----
 .../jabref/gui/fieldeditors/JournalEditor.fxml    |  4 ++--
 .../jabref/gui/fieldeditors/JournalEditor.java    | 10 +++++-----
 .../jabref/model/entry/InternalBibtexFields.java  |  6 +++---
 9 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
index cece4cdda37..58fe5a684b2 100644
--- a/src/main/java/org/jabref/gui/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -150,8 +150,7 @@ public PreviewPanel(BasePanel panel, BibDatabaseContext databaseContext, KeyBind
         });
 
         createKeyBindings();
-        updateLayout(preferences);
-
+        updateLayout(preferences, true);
     }
 
     private void createKeyBindings() {
@@ -208,6 +207,10 @@ public void setBasePanel(BasePanel basePanel) {
     }
 
     public void updateLayout(PreviewPreferences previewPreferences) {
+        updateLayout(previewPreferences, false);
+    }
+
+    private void updateLayout(PreviewPreferences previewPreferences, boolean init) {
         if (fixedLayout) {
             LOGGER.debug("cannot change the layout because the layout is fixed");
             return;
@@ -220,12 +223,16 @@ public void updateLayout(PreviewPreferences previewPreferences) {
                 CitationStyle.createCitationStyleFromFile(style)
                              .ifPresent(citationStyle -> {
                                  basePanel.get().getCitationStyleCache().setCitationStyle(citationStyle);
-                                 basePanel.get().output(Localization.lang("Preview style changed to: %0", citationStyle.getTitle()));
+                                 if (!init) {
+                                     basePanel.get().output(Localization.lang("Preview style changed to: %0", citationStyle.getTitle()));
+                                 }
                              });
             }
         } else {
             updatePreviewLayout(previewPreferences.getPreviewStyle(), previewPreferences.getLayoutFormatterPreferences());
-            basePanel.ifPresent(panel -> panel.output(Localization.lang("Preview style changed to: %0", Localization.lang("Preview"))));
+            if (!init) {
+                basePanel.ifPresent(panel -> panel.output(Localization.lang("Preview style changed to: %0", Localization.lang("Preview"))));
+            }
         }
 
         update();
diff --git a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
index 211549c7ac5..99d6d3f7601 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
@@ -2,9 +2,9 @@
 
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.layout.HBox?>
-<?import org.jabref.gui.fieldeditors.EditorTextArea?>
+<?import org.jabref.gui.fieldeditors.EditorTextField?>
 <fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112"
          fx:controller="org.jabref.gui.fieldeditors.BibtexKeyEditor">
-    <EditorTextArea fx:id="textArea" prefHeight="0.0" HBox.hgrow="ALWAYS"/>
+    <EditorTextField fx:id="textField"/>
     <Button fx:id="generateCiteKeyButton" styleClass="icon-button"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java
index d9e2a254550..92850966124 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java
@@ -23,7 +23,7 @@ public class BibtexKeyEditor extends HBox implements FieldEditorFX {
     private final JabRefPreferences preferences;
     @FXML private BibtexKeyEditorViewModel viewModel;
     @FXML private Button generateCiteKeyButton;
-    @FXML private EditorTextArea textArea;
+    @FXML private EditorTextField textField;
 
     public BibtexKeyEditor(String fieldName, JabRefPreferences preferences, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, BibDatabaseContext databaseContext, UndoManager undoManager, DialogService dialogService) {
         this.preferences = preferences;
@@ -33,9 +33,9 @@ public BibtexKeyEditor(String fieldName, JabRefPreferences preferences, AutoComp
                   .root(this)
                   .load();
 
-        textArea.textProperty().bindBidirectional(viewModel.textProperty());
+        textField.textProperty().bindBidirectional(viewModel.textProperty());
 
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textField);
     }
 
     public BibtexKeyEditorViewModel getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
index 7de28a720ee..08454e72968 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
@@ -31,7 +31,6 @@ public EditorTextArea() {
     public EditorTextArea(final String text) {
         super(text);
 
-
         // Hide horizontal scrollbar and always wrap text
         setWrapText(true);
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
index 76d693dc59f..51cd466a784 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
@@ -10,6 +10,8 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
 
 import com.sun.javafx.scene.control.skin.TextFieldSkin;
 
@@ -22,8 +24,9 @@ public EditorTextField() {
     public EditorTextField(final String text) {
         super(text);
 
-        // Always fill out all the available vertical space
-        this.setPrefHeight(Double.POSITIVE_INFINITY);
+        // Always fill out all the available space
+        setPrefHeight(Double.POSITIVE_INFINITY);
+        HBox.setHgrow(this, Priority.ALWAYS);
 
         // Should behave as a normal text field with respect to TAB behaviour
         addEventFilter(KeyEvent.KEY_PRESSED, event -> {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java b/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
index 4f157cf21ce..eb753e4e9d3 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.fieldeditors;
 
 import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 
 import org.jabref.model.entry.FieldName;
@@ -11,10 +12,7 @@ public FieldNameLabel(String fieldName) {
         super(FieldName.getDisplayName(fieldName));
 
         setPadding(new Insets(4, 0, 0, 0));
-        // TODO: style!
-        //setVerticalAlignment(SwingConstants.TOP);
-        //setForeground(GUIGlobals.ENTRY_EDITOR_LABEL_COLOR);
-        //setBorder(BorderFactory.createEmptyBorder());
+        setAlignment(Pos.CENTER);
+        setPrefHeight(Double.POSITIVE_INFINITY);
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
index a2d74f56609..dafded3704e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
@@ -3,11 +3,11 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
-<?import org.jabref.gui.fieldeditors.EditorTextArea?>
+<?import org.jabref.gui.fieldeditors.EditorTextField?>
 <?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112"
          fx:controller="org.jabref.gui.fieldeditors.JournalEditor">
-    <EditorTextArea fx:id="textArea" prefHeight="0.0" HBox.hgrow="ALWAYS"/>
+    <EditorTextField fx:id="textField"/>
     <Button onAction="#toggleAbbreviation"
             styleClass="icon-button">
         <graphic>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
index ad00729bab3..e76616e03c2 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
@@ -17,7 +17,7 @@
 public class JournalEditor extends HBox implements FieldEditorFX {
 
     @FXML private JournalEditorViewModel viewModel;
-    @FXML private EditorTextArea textArea;
+    @FXML private EditorTextField textField;
 
     public JournalEditor(String fieldName, JournalAbbreviationRepository journalAbbreviationRepository, JabRefPreferences preferences, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         this.viewModel = new JournalEditorViewModel(fieldName, suggestionProvider, journalAbbreviationRepository, fieldCheckers);
@@ -26,12 +26,12 @@ public JournalEditor(String fieldName, JournalAbbreviationRepository journalAbbr
                   .root(this)
                   .load();
 
-        textArea.textProperty().bindBidirectional(viewModel.textProperty());
-        textArea.addToContextMenu(EditorMenus.getDefaultMenu(textArea));
+        textField.textProperty().bindBidirectional(viewModel.textProperty());
+        textField.addToContextMenu(EditorMenus.getDefaultMenu(textField));
 
-        AutoCompletionTextInputBinding.autoComplete(textArea, viewModel::complete);
+        AutoCompletionTextInputBinding.autoComplete(textField, viewModel::complete);
 
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textField);
     }
 
     public JournalEditorViewModel getViewModel() {
diff --git a/src/main/java/org/jabref/model/entry/InternalBibtexFields.java b/src/main/java/org/jabref/model/entry/InternalBibtexFields.java
index d33e73abdf8..5de79d360d6 100644
--- a/src/main/java/org/jabref/model/entry/InternalBibtexFields.java
+++ b/src/main/java/org/jabref/model/entry/InternalBibtexFields.java
@@ -93,8 +93,8 @@ public class InternalBibtexFields {
             SpecialField.RELEVANCE.getFieldName()
     );
 
-    private static final Set<String> SINGLE_LINE_FIELDS = Collections.unmodifiableSet(new HashSet<>(
-            Arrays.asList(FieldName.TITLE, FieldName.AUTHOR, FieldName.YEAR, FieldName.INSTITUTION)
+    private static final Set<String> MULTILINE_FIELDS = Collections.unmodifiableSet(new HashSet<>(
+            Arrays.asList(FieldName.NOTE, FieldName.ABSTRACT, FieldName.COMMENT)
     ));
 
     // singleton instance
@@ -481,6 +481,6 @@ private void add(BibtexSingleField field) {
     }
 
     public static boolean isSingleLineField(final String fieldName) {
-        return SINGLE_LINE_FIELDS.contains(fieldName.toLowerCase());
+        return !MULTILINE_FIELDS.contains(fieldName.toLowerCase());
     }
 }

From 7775e053acde896e4020dc0f6f12736e505ef73c Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 12 Sep 2018 00:15:05 +0200
Subject: [PATCH 088/229] Fix that web search pane steals input (#4335)

Fixes https://github.com/JabRef/jabref/issues/4330 by making the search button in the web search pane not the default button.
---
 .../java/org/jabref/gui/importer/fetcher/WebSearchPane.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPane.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPane.java
index 1f9c0d637d6..30ee0635043 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPane.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPane.java
@@ -71,11 +71,12 @@ protected Node createContentPane() {
 
         // Create text field for query input
         TextField query = SearchTextField.create();
+        query.setOnAction(event -> viewModel.search());
         viewModel.queryProperty().bind(query.textProperty());
 
         // Create button that triggers search
         Button search = new Button(Localization.lang("Search"));
-        search.setDefaultButton(true);
+        search.setDefaultButton(false);
         search.setOnAction(event -> viewModel.search());
 
         // Put everything together

From fef1b8afa3842c52b0310b2c58fd132f73246c7b Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 12 Sep 2018 20:16:15 +0200
Subject: [PATCH 089/229] Remove GlobalFocusListener and old TextField entry
 editor (#4336)

* Remove GlobalFocusListener and old TextField entry editor

Fixes https://github.com/JabRef/jabref/issues/4324.

* Add default to switch
---
 src/main/java/org/jabref/Globals.java         |   9 -
 src/main/java/org/jabref/gui/BasePanel.java   |  18 +-
 .../org/jabref/gui/GlobalFocusListener.java   |  31 ---
 src/main/java/org/jabref/gui/JabRefFrame.java |  44 ++++-
 .../gui/fieldeditors/EditorTextField.java     |   3 +-
 .../jabref/gui/fieldeditors/FieldEditor.java  |  72 -------
 .../FieldEditorFocusListener.java             |  29 ---
 .../jabref/gui/fieldeditors/TextField.java    | 183 ------------------
 .../org/jabref/gui/groups/GroupDialog.java    |   3 +-
 .../jabref/gui/search/GlobalSearchBar.java    |   1 -
 10 files changed, 54 insertions(+), 339 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/GlobalFocusListener.java
 delete mode 100644 src/main/java/org/jabref/gui/fieldeditors/FieldEditor.java
 delete mode 100644 src/main/java/org/jabref/gui/fieldeditors/FieldEditorFocusListener.java
 delete mode 100644 src/main/java/org/jabref/gui/fieldeditors/TextField.java

diff --git a/src/main/java/org/jabref/Globals.java b/src/main/java/org/jabref/Globals.java
index 0e0b4457f4d..60a1d626acf 100644
--- a/src/main/java/org/jabref/Globals.java
+++ b/src/main/java/org/jabref/Globals.java
@@ -7,7 +7,6 @@
 import javafx.stage.Screen;
 
 import org.jabref.gui.ClipBoardManager;
-import org.jabref.gui.GlobalFocusListener;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
@@ -60,8 +59,6 @@ public class Globals {
     public static ExporterFactory exportFactory;
     // Key binding preferences
     private static KeyBindingRepository keyBindingRepository;
-    // Background tasks
-    private static GlobalFocusListener focusListener;
     private static DefaultFileUpdateMonitor fileUpdateMonitor;
     private static ThemeLoader themeLoader;
     private static TelemetryClient telemetryClient;
@@ -79,8 +76,6 @@ public static synchronized KeyBindingRepository getKeyPrefs() {
 
     // Background tasks
     public static void startBackgroundTasks() {
-        Globals.focusListener = new GlobalFocusListener();
-
         Globals.fileUpdateMonitor = new DefaultFileUpdateMonitor();
         JabRefExecutorService.INSTANCE.executeInterruptableTask(Globals.fileUpdateMonitor, "FileUpdateMonitor");
 
@@ -117,10 +112,6 @@ private static void startTelemetryClient() {
         telemetryClient.trackSessionState(SessionState.Start);
     }
 
-    public static GlobalFocusListener getFocusListener() {
-        return focusListener;
-    }
-
     public static FileUpdateMonitor getFileUpdateMonitor() {
         return fileUpdateMonitor;
     }
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index efe88110716..66f4b7647e5 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -305,11 +305,11 @@ private void setupActions() {
         actions.put(Actions.SAVE_SELECTED_AS_PLAIN, new SaveSelectedAction(SavePreferences.DatabaseSaveType.PLAIN_BIBTEX));
 
         // The action for copying selected entries.
-        actions.put(Actions.COPY, mainTable::copy);
+        actions.put(Actions.COPY, this::copy);
 
         actions.put(Actions.PRINT_PREVIEW, new PrintPreviewAction());
 
-        actions.put(Actions.CUT, mainTable::cut);
+        actions.put(Actions.CUT, this::cut);
 
         actions.put(Actions.DELETE, () -> delete(false));
 
@@ -319,7 +319,7 @@ private void setupActions() {
         //    This allows you to (a) paste entire bibtex entries from a text editor, web browser, etc
         //                       (b) copy and paste entries between multiple instances of JabRef (since
         //         only the text representation seems to get as far as the X clipboard, at least on my system)
-        actions.put(Actions.PASTE, mainTable::paste);
+        actions.put(Actions.PASTE, this::paste);
 
         actions.put(Actions.SELECT_ALL, mainTable.getSelectionModel()::selectAll);
 
@@ -1379,6 +1379,18 @@ public Path getTempFile() {
         return changeMonitor.map(DatabaseChangeMonitor::getTempFile).orElse(null);
     }
 
+    public void copy() {
+        mainTable.copy();
+    }
+
+    public void paste() {
+        mainTable.paste();
+    }
+
+    public void cut() {
+        mainTable.cut();
+    }
+
     private static class SearchAndOpenFile {
 
         private final BibEntry entry;
diff --git a/src/main/java/org/jabref/gui/GlobalFocusListener.java b/src/main/java/org/jabref/gui/GlobalFocusListener.java
deleted file mode 100644
index 865de194b33..00000000000
--- a/src/main/java/org/jabref/gui/GlobalFocusListener.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.Component;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-
-import javax.swing.JComponent;
-
-public class GlobalFocusListener implements FocusListener {
-    private Component focused;
-
-    @Override
-    public void focusGained(FocusEvent e) {
-        if (!e.isTemporary()) {
-            focused = (Component) e.getSource();
-        }
-    }
-
-    @Override
-    public void focusLost(FocusEvent e) {
-        // Do nothing
-    }
-
-    public JComponent getFocused() {
-        return (JComponent) focused;
-    }
-
-    public void setFocused(Component c) {
-        focused = c;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 7e8b983de25..6c79182fc5b 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -2,7 +2,6 @@
 
 import java.awt.Component;
 import java.awt.Window;
-import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -18,7 +17,6 @@
 import java.util.stream.Collectors;
 
 import javax.swing.Action;
-import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
@@ -39,6 +37,7 @@
 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;
@@ -284,8 +283,7 @@ private void init() {
             //previewToggle.setSelected(Globals.prefs.getPreviewPreferences().isPreviewPanelEnabled());
             //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();
@@ -1442,10 +1440,40 @@ public EditAction(Actions command) {
 
         @Override
         public void execute() {
-            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/fieldeditors/EditorTextField.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
index 51cd466a784..6452c64957b 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
@@ -8,6 +8,7 @@
 import javafx.fxml.Initializable;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
+import javafx.scene.control.TextField;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.HBox;
@@ -15,7 +16,7 @@
 
 import com.sun.javafx.scene.control.skin.TextFieldSkin;
 
-public class EditorTextField extends javafx.scene.control.TextField implements Initializable, ContextMenuAddable {
+public class EditorTextField extends TextField implements Initializable, ContextMenuAddable {
 
     public EditorTextField() {
         this("");
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditor.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditor.java
deleted file mode 100644
index 711b3ffc550..00000000000
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditor.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.jabref.gui.fieldeditors;
-
-import java.awt.Color;
-
-import javax.swing.JComponent;
-
-/**
- * FieldEditors is a common interface between the TextField and TextArea.
- */
-public interface FieldEditor {
-
-    String getFieldName();
-
-    /*
-     * Returns the component to be added to a container. Might be a JScrollPane
-     * or the component itself.
-     */
-    JComponent getPane();
-
-    /*
-     * Returns the text component itself.
-     */
-    Object getTextComponent();
-
-    default boolean hasFocus() {
-        if (getTextComponent() instanceof JComponent) {
-            return ((JComponent) getTextComponent()).hasFocus();
-        }
-        return false;
-    }
-
-    void setActiveBackgroundColor();
-
-    void setValidBackgroundColor();
-
-    void setInvalidBackgroundColor();
-
-    void setBackground(Color color);
-
-    String getText();
-
-    /**
-     * Sets the given text on the current field editor and marks this text
-     * editor as modified.
-     *
-     * @param newText
-     */
-    void setText(String newText);
-
-    void append(String text);
-
-    void requestFocus();
-
-    void setEnabled(boolean enabled);
-
-    /**
-     * paste text into component, it should also take some selected text into
-     * account
-     */
-    void paste(String textToInsert);
-
-    /**
-     * normally implemented in JTextArea and JTextField
-     *
-     * @return
-     */
-    String getSelectedText();
-
-    void undo();
-
-    void redo();
-}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFocusListener.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFocusListener.java
deleted file mode 100644
index 4c245020e65..00000000000
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFocusListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jabref.gui.fieldeditors;
-
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-
-import javax.swing.JComponent;
-
-import org.jabref.gui.GUIGlobals;
-
-/**
- * Focus listener that changes the color of the text area when it has focus.
- */
-public class FieldEditorFocusListener implements FocusListener {
-    @Override
-    public void focusGained(FocusEvent event) {
-        if (event.getSource() instanceof FieldEditor) {
-            ((FieldEditor) event.getSource()).setActiveBackgroundColor();
-        } else {
-            ((JComponent) event.getSource()).setBackground(GUIGlobals.activeBackgroundColor);
-        }
-    }
-
-    @Override
-    public void focusLost(FocusEvent event) {
-        if (!(event.getSource() instanceof FieldEditor)) {
-            ((JComponent) event.getSource()).setBackground(GUIGlobals.validFieldBackgroundColor);
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/TextField.java b/src/main/java/org/jabref/gui/fieldeditors/TextField.java
deleted file mode 100644
index 66942a70756..00000000000
--- a/src/main/java/org/jabref/gui/fieldeditors/TextField.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.jabref.gui.fieldeditors;
-
-import java.awt.Color;
-import java.awt.event.ActionEvent;
-import java.lang.reflect.InvocationTargetException;
-
-import javax.swing.AbstractAction;
-import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
-import javax.swing.text.Document;
-import javax.swing.undo.CannotRedoException;
-import javax.swing.undo.CannotUndoException;
-import javax.swing.undo.UndoManager;
-
-import org.jabref.Globals;
-import org.jabref.gui.GUIGlobals;
-import org.jabref.gui.actions.Actions;
-import org.jabref.gui.util.component.JTextFieldWithPlaceholder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * An implementation of the FieldEditor backed by a JTextField. Used for single-line input, only BibTex key at the
- * moment?!
- */
-public class TextField extends JTextFieldWithPlaceholder implements FieldEditor {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TextField.class);
-
-    private final String fieldName;
-    private UndoManager undo;
-
-    public TextField(String fieldName, String content, boolean changeColorOnFocus) {
-        this(fieldName, content, changeColorOnFocus, "");
-    }
-
-    public TextField(String fieldName, String content, boolean changeColorOnFocus, String title) {
-        super(content, title);
-
-        setupPasteListener();
-        setupUndoRedo();
-
-        updateFont();
-
-        // Add the global focus listener, so a menu item can see if this field
-        // was focused when
-        // an action was called.
-        addFocusListener(Globals.getFocusListener());
-        if (changeColorOnFocus) {
-            addFocusListener(new FieldEditorFocusListener());
-        }
-        this.fieldName = fieldName;
-        setBackground(GUIGlobals.validFieldBackgroundColor);
-        setForeground(GUIGlobals.editorTextColor);
-    }
-
-    @Override
-    public void setText(String t) {
-        super.setText(t);
-        if (undo != null) {
-            undo.discardAllEdits();
-        }
-    }
-
-    @Override
-    public void append(String text) {
-        setText(getText() + text);
-    }
-
-    @Override
-    public String getFieldName() {
-        return fieldName;
-    }
-
-    @Override
-    public JComponent getPane() {
-        return this;
-    }
-
-    @Override
-    public JComponent getTextComponent() {
-        return this;
-
-    }
-
-    @Override
-    public void setActiveBackgroundColor() {
-        setBackgroundColor(GUIGlobals.activeBackgroundColor);
-    }
-
-    @Override
-    public void setValidBackgroundColor() {
-        setBackgroundColor(GUIGlobals.validFieldBackgroundColor);
-    }
-
-    @Override
-    public void setInvalidBackgroundColor() {
-        setBackgroundColor(GUIGlobals.invalidFieldBackgroundColor);
-    }
-
-    private void setBackgroundColor(Color color) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            setBackground(color);
-        } else {
-            try {
-                SwingUtilities.invokeAndWait(() -> setBackground(color));
-            } catch (InvocationTargetException | InterruptedException e) {
-                LOGGER.info("Problem setting background color", e);
-            }
-        }
-
-    }
-
-    private void updateFont() {
-        setFont(GUIGlobals.currentFont);
-    }
-
-    @Override
-    // Only replaces selected text if found
-    public void paste(String textToInsert) {
-        replaceSelection(textToInsert);
-    }
-
-    @Override
-    public void undo() {
-        // Nothing
-    }
-
-    @Override
-    public void redo() {
-        // Nothing
-    }
-
-    private void setupPasteListener() {
-        // Bind paste command to KeyBinds.PASTE
-        getInputMap().put(Globals.getKeyPrefs().getKey(org.jabref.gui.keyboard.KeyBinding.PASTE), Actions.PASTE);
-    }
-
-    private void setupUndoRedo() {
-        undo = new UndoManager();
-        Document doc = getDocument();
-
-        // Listen for undo and redo events
-        doc.addUndoableEditListener(evt -> undo.addEdit(evt.getEdit()));
-
-        // Create an undo action and add it to the text component
-        getActionMap().put("Undo", new AbstractAction("Undo") {
-
-            @Override
-            public void actionPerformed(ActionEvent evt) {
-                try {
-                    if (undo.canUndo()) {
-                        undo.undo();
-                    }
-                } catch (CannotUndoException ignored) {
-                    // Ignored
-                }
-            }
-        });
-
-        // Bind the undo action to ctl-Z
-        getInputMap().put(Globals.getKeyPrefs().getKey(org.jabref.gui.keyboard.KeyBinding.UNDO), "Undo");
-
-        // Create a redo action and add it to the text component
-        getActionMap().put("Redo", new AbstractAction(Actions.REDO.name()) {
-
-            @Override
-            public void actionPerformed(ActionEvent evt) {
-                try {
-                    if (undo.canRedo()) {
-                        undo.redo();
-                    }
-                } catch (CannotRedoException ignored) {
-                    // Ignored
-                }
-            }
-        });
-
-        // Bind the redo action to ctl-Y
-        getInputMap().put(Globals.getKeyPrefs().getKey(org.jabref.gui.keyboard.KeyBinding.REDO), "Redo");
-    }
-}
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.java b/src/main/java/org/jabref/gui/groups/GroupDialog.java
index 043ee954af1..b233bd1fe86 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.java
@@ -39,7 +39,6 @@
 import org.jabref.gui.Dialog;
 import org.jabref.gui.JabRefDialog;
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.fieldeditors.TextField;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.search.rules.describer.SearchDescribers;
 import org.jabref.gui.util.TooltipTextUtil;
@@ -103,7 +102,7 @@ class GroupDialog extends JabRefDialog implements Dialog<AbstractGroup> {
 
     // for KeywordGroup
     private final JTextField keywordGroupSearchField = new JTextField(GroupDialog.TEXTFIELD_LENGTH);
-    private final TextField keywordGroupSearchTerm = new TextField(FieldName.KEYWORDS, "", false);
+    private final JTextField keywordGroupSearchTerm = new JTextField(GroupDialog.TEXTFIELD_LENGTH);
     private final JCheckBox keywordGroupCaseSensitive = new JCheckBox(Localization.lang("Case sensitive"));
     private final JCheckBox keywordGroupRegExp = new JCheckBox(Localization.lang("regular expression"));
     // for SearchGroup
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index d69733a48d5..e0fb4494af1 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -274,7 +274,6 @@ public void endSearch() {
         if (currentBasePanel != null) {
             clearSearch();
             MainTable mainTable = frame.getCurrentBasePanel().getMainTable();
-            //Globals.getFocusListener().setFocused(mainTable);
             mainTable.requestFocus();
             //SwingUtilities.invokeLater(() -> mainTable.ensureVisible(mainTable.getSelectedRow()));
         }

From a47e826052c636bc03e1cf548d30680ff9fd8e35 Mon Sep 17 00:00:00 2001
From: razvan05 <razvan_just4u@yahoo.com>
Date: Thu, 13 Sep 2018 12:47:51 +0300
Subject: [PATCH 090/229] Added new keyboard shortcut "ctrl+E" for closing the
 entry editor. (#4222) (#4338)

---
 CHANGELOG.md                                              | 1 +
 src/main/java/org/jabref/gui/entryeditor/EntryEditor.java | 4 ++++
 src/main/java/org/jabref/gui/keyboard/KeyBinding.java     | 1 +
 src/main/resources/l10n/JabRef_en.properties              | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 378e01c4634..378d1f3f998 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We removed the redundant new lines of markings and wrapped the summary in the File annotation tab. [#3823](https://github.com/JabRef/jabref/issues/3823)
 - We add auto url formatting when user paste link to URL field in entry editor. [#254](https://github.com/koppor/jabref/issues/254)
 - We added a minimal height for the entry editor so that it can no longer be hidden by accident. [#4279](https://github.com/JabRef/jabref/issues/4279)
+- We added a new keyboard shortcut so that the entry editor could be closed by <kbd>Ctrl<kbd> + <kbd>E<kbd>. [#4222] (https://github.com/JabRef/jabref/issues/4222)
 
 
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 505aed2298a..9b720e978bb 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -197,6 +197,10 @@ private void setupKeyBindings() {
                         close();
                         event.consume();
                         break;
+                    case CLOSE_ENTRY:
+                        close();
+                        event.consume();
+                        break;
                     default:
                         // Pass other keys to parent
                 }
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index 47aeec972f0..cd6f1c67613 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -11,6 +11,7 @@ public enum KeyBinding {
     CHECK_INTEGRITY("Check integrity", Localization.lang("Check integrity"), "ctrl+F8", KeyBindingCategory.QUALITY),
     CLEANUP("Cleanup", Localization.lang("Cleanup entries"), "alt+F8", KeyBindingCategory.QUALITY),
     CLOSE_DATABASE("Close library", Localization.lang("Close library"), "ctrl+W", KeyBindingCategory.FILE),
+    CLOSE_ENTRY("Close entry", Localization.lang("Close entry"), "ctrl+E", KeyBindingCategory.VIEW),
     CLOSE("Close dialog", Localization.lang("Close dialog"), "Esc", KeyBindingCategory.VIEW),
     COPY("Copy", Localization.lang("Copy"), "ctrl+C", KeyBindingCategory.EDIT),
     COPY_TITLE("Copy title", Localization.lang("Copy title"), "ctrl+shift+alt+T", KeyBindingCategory.EDIT),
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 23785537e34..2080d14f220 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -161,6 +161,8 @@ Clear\ fields=Clear fields
 
 Close=Close
 
+Close\ entry=Close entry
+
 Close\ dialog=Close dialog
 
 Close\ the\ current\ library=Close the current library

From b991648cde18f447099eaee3f605e1b709151dd5 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Thu, 13 Sep 2018 11:50:03 +0200
Subject: [PATCH 091/229] Fix export of corporate author to MSOffice (#4337)

* Fix export of corporate author to MSOffice
Fix tests

* add comment
---
 .../jabref/logic/msbib/MSBibConverter.java    | 21 ++++++++++++-------
 .../exporter/MSBibExportFormatTestFiles.java  |  2 --
 .../logic/exporter/MsBibExportFormatTest2.xml |  4 +---
 .../logic/exporter/MsBibExportFormatTest3.xml |  2 +-
 .../logic/exporter/MsBibExportFormatTest4.xml |  2 +-
 .../logic/exporter/MsBibExportFormatTest5.xml |  2 +-
 .../logic/exporter/MsBibExportFormatTest6.xml |  2 +-
 .../org/jabref/logic/exporter/MsBibLCID.xml   |  2 +-
 .../logic/exporter/MsBibLocationTest.xml      |  2 --
 9 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
index 8615c5f5a10..45d1346b515 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
@@ -67,7 +67,7 @@ public static MSBibEntry convert(BibEntry entry) {
         // Value must be converted
         //Currently only english is supported
         entry.getLatexFreeField(FieldName.LANGUAGE)
-                .ifPresent(lang -> result.fields.put("LCID", String.valueOf(MSBibMapping.getLCID(lang))));
+             .ifPresent(lang -> result.fields.put("LCID", String.valueOf(MSBibMapping.getLCID(lang))));
         StringBuilder sbNumber = new StringBuilder();
         entry.getLatexFreeField(FieldName.ISBN).ifPresent(isbn -> sbNumber.append(" ISBN: " + isbn));
         entry.getLatexFreeField(FieldName.ISSN).ifPresent(issn -> sbNumber.append(" ISSN: " + issn));
@@ -106,21 +106,28 @@ public static MSBibEntry convert(BibEntry entry) {
             result.publicationTitle = entry.getLatexFreeField(FieldName.TITLE).orElse(null);
         }
 
-        entry.getLatexFreeField(FieldName.AUTHOR).ifPresent(authors -> result.authors = getAuthors(authors));
-        entry.getLatexFreeField(FieldName.EDITOR).ifPresent(editors -> result.editors = getAuthors(editors));
-        entry.getLatexFreeField(FieldName.TRANSLATOR).ifPresent(translator -> result.translators = getAuthors(translator));
+        entry.getField(FieldName.AUTHOR).ifPresent(authors -> result.authors = getAuthors(entry, authors, FieldName.AUTHOR));
+        entry.getField(FieldName.EDITOR).ifPresent(editors -> result.editors = getAuthors(entry, editors, FieldName.EDITOR));
+        entry.getField(FieldName.TRANSLATOR).ifPresent(translator -> result.translators = getAuthors(entry, translator, FieldName.EDITOR));
 
         return result;
     }
 
-    private static List<MsBibAuthor> getAuthors(String authors) {
+    private static List<MsBibAuthor> getAuthors(BibEntry entry, String authors, String fieldName) {
         List<MsBibAuthor> result = new ArrayList<>();
         boolean corporate = false;
-        //Only one corporate authors is supported
+        //Only one corporate author is supported
+        //We have the possible rare case that are multiple authors which start and end with latex , this is currently not considered
         if (authors.startsWith("{") && authors.endsWith("}")) {
             corporate = true;
         }
-        AuthorList authorList = AuthorList.parse(authors);
+        //FIXME: #4152 This is an ugly hack because the latex2unicode formatter kills of all curly braces, so no more corporate author parsing possible
+        String authorLatexFree = entry.getLatexFreeField(fieldName).orElse("");
+        if (corporate) {
+            authorLatexFree = "{" + authorLatexFree + "}";
+        }
+
+        AuthorList authorList = AuthorList.parse(authorLatexFree);
 
         for (Author author : authorList.getAuthors()) {
             result.add(new MsBibAuthor(author, corporate));
diff --git a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
index f6775762982..ad8b02d9bd2 100644
--- a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
@@ -18,7 +18,6 @@
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -64,7 +63,6 @@ void setUp(@TempDirectory.TempDir Path testFolder) throws Exception {
         testImporter = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
     }
 
-    @Disabled
     @ParameterizedTest
     @MethodSource("fileNames")
     void testPerformExport(String filename) throws IOException, SaveException {
diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml b/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml
index 81f235d14a8..8dfba00790d 100644
--- a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml
+++ b/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <b:Sources xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" SelectedStyle="">
 <b:Source>
-<b:LCID>0</b:LCID>
+<b:LCID>1033</b:LCID>
 <b:Year>2002</b:Year>
 <b:Volume>44</b:Volume>
 <b:BIBTEX_Entry>phdthesis</b:BIBTEX_Entry>
@@ -16,8 +16,6 @@
 <b:JournalName>Wirtschaftsinformatik</b:JournalName>
 <b:Number>3</b:Number>
 <b:City>a</b:City>
-<b:StateProvince/>
-<b:CountryRegion/>
 <b:ThesisType>type</b:ThesisType>
 </b:Source>
 </b:Sources>
diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml b/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml
index f5a6955a364..649d8e32281 100644
--- a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml
+++ b/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <b:Sources xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" SelectedStyle="">
 <b:Source>
-<b:LCID>0</b:LCID>
+<b:LCID>1033</b:LCID>
 <b:Year>2002</b:Year>
 <b:Volume>44</b:Volume>
 <b:BIBTEX_Entry>manual</b:BIBTEX_Entry>
diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml b/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml
index 6d0d9efb5d9..6319d6dee46 100644
--- a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml
+++ b/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest4.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <b:Sources xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" SelectedStyle="">
 <b:Source>
-<b:LCID>0</b:LCID>
+<b:LCID>1033</b:LCID>
 <b:Year>2002</b:Year>
 <b:Volume>44</b:Volume>
 <b:BIBTEX_Entry>inbook</b:BIBTEX_Entry>
diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml b/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml
index d14983076a8..a959db900b0 100644
--- a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml
+++ b/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest5.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <b:Sources xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" SelectedStyle="">
 <b:Source>
-<b:LCID>0</b:LCID>
+<b:LCID>1033</b:LCID>
 <b:Issue>3</b:Issue>
 <b:Year>2002</b:Year>
 <b:Volume>44</b:Volume>
diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml b/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml
index e750dd62fcb..886d2000f3f 100644
--- a/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml
+++ b/src/test/resources/org/jabref/logic/exporter/MsBibExportFormatTest6.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <b:Sources xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" SelectedStyle="">
 <b:Source>
-<b:LCID>0</b:LCID>
+<b:LCID>1033</b:LCID>
 <b:Year>2002</b:Year>
 <b:Volume>44</b:Volume>
 <b:BIBTEX_Entry>mastersthesis</b:BIBTEX_Entry>
diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml b/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml
index 12661954648..0b0186bc831 100644
--- a/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml
+++ b/src/test/resources/org/jabref/logic/exporter/MsBibLCID.xml
@@ -2,7 +2,7 @@
 <b:Sources xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" SelectedStyle="">
 <b:Source>
 <b:SourceType>JournalArticle</b:SourceType>
-<b:LCID>0</b:LCID>
+<b:LCID>1033</b:LCID>
 <b:Author/>
 <b:BIBTEX_Entry>article</b:BIBTEX_Entry>
 </b:Source>
diff --git a/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml b/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml
index e6c3485a37f..6f1673d1cee 100644
--- a/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml
+++ b/src/test/resources/org/jabref/logic/exporter/MsBibLocationTest.xml
@@ -14,7 +14,5 @@
 </b:Author>
 </b:Author>
 <b:City>Berlin</b:City>
-<b:StateProvince/>
-<b:CountryRegion/>
 </b:Source>
 </b:Sources>

From ed7ea5060ae9c854f840ae335117cab176c615fb Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Thu, 13 Sep 2018 13:51:01 +0200
Subject: [PATCH 092/229] Save sort order column of main table (#4327)

* Save sort order column of main table

* add sort type listener for each column

* fix checkstyle

* remove old method

* refactor code

* store column sort oder for all columns

* fix checkstyle

* remove unused code

* remove old comparator choser
remove old table prefs sort order fields also from prefs

* fix l10n

* fix l10n
restore table sort oder config
---
 src/main/java/org/jabref/gui/JabRefFrame.java |   2 +-
 .../gui/maintable/ColumnPreferences.java      |  10 +-
 .../org/jabref/gui/maintable/MainTable.java   | 102 ++-------------
 .../gui/maintable/MainTableColumnFactory.java |   4 +-
 .../gui/maintable/NormalTableColumn.java      |   4 +-
 .../PersistenceVisualStateTable.java          |  12 ++
 .../preferences/ExportSortingPrefsTab.java    |  14 +-
 .../jabref/gui/preferences/TablePrefsTab.java | 121 +-----------------
 .../jabref/preferences/JabRefPreferences.java |  91 +++++++------
 src/main/resources/l10n/JabRef_en.properties  |   5 -
 10 files changed, 106 insertions(+), 259 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 6c79182fc5b..aa2627c0148 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -1020,7 +1020,7 @@ public void addParserResult(ParserResult pr, boolean focusPanel) {
      */
     @Deprecated
     public void output(final String s) {
-        statusLine.show(s, 3000);
+        DefaultTaskExecutor.runInJavaFXThread(() -> statusLine.show(s, 3000));
     }
 
     private void initActions() {
diff --git a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
index ead48b18a3d..7a6d88ac463 100644
--- a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
@@ -3,6 +3,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javafx.scene.control.TableColumn.SortType;
+
 import org.jabref.model.entry.BibtexSingleField;
 import org.jabref.model.entry.specialfields.SpecialField;
 
@@ -16,8 +18,9 @@ public class ColumnPreferences {
     private final List<SpecialField> specialFieldColumns;
     private final List<String> extraFileColumns;
     private final Map<String, Double> columnWidths;
+    private final Map<String, SortType> columnSortType;
 
-    public ColumnPreferences(boolean showFileColumn, boolean showUrlColumn, boolean preferDoiOverUrl, boolean showEprintColumn, List<String> normalColumns, List<SpecialField> specialFieldColumns, List<String> extraFileColumns, Map<String, Double> columnWidths) {
+    public ColumnPreferences(boolean showFileColumn, boolean showUrlColumn, boolean preferDoiOverUrl, boolean showEprintColumn, List<String> normalColumns, List<SpecialField> specialFieldColumns, List<String> extraFileColumns, Map<String, Double> columnWidths, Map<String, SortType> columnSortType) {
         this.showFileColumn = showFileColumn;
         this.showUrlColumn = showUrlColumn;
         this.preferDoiOverUrl = preferDoiOverUrl;
@@ -26,6 +29,7 @@ public ColumnPreferences(boolean showFileColumn, boolean showUrlColumn, boolean
         this.specialFieldColumns = specialFieldColumns;
         this.extraFileColumns = extraFileColumns;
         this.columnWidths = columnWidths;
+        this.columnSortType = columnSortType;
     }
 
     public boolean showFileColumn() {
@@ -59,4 +63,8 @@ public List<String> getNormalColumns() {
     public double getPrefColumnWidth(String columnName) {
         return columnWidths.getOrDefault(columnName, BibtexSingleField.DEFAULT_FIELD_LENGTH);
     }
+
+    public Map<String, SortType> getSortTypesForColumns() {
+        return columnSortType;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 0c739e23b6a..62167d44da8 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -13,6 +14,8 @@
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.SelectionMode;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumn.SortType;
 import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
 import javafx.scene.input.ClipboardContent;
@@ -62,7 +65,6 @@ public class MainTable extends TableView<BibEntryTableViewModel> {
     private final NewDroppedFileHandler fileHandler;
     private final CustomLocalDragboard localDragboard = GUIGlobals.localDragboard;
 
-
     public MainTable(MainTableDataModel model, JabRefFrame frame,
                      BasePanel panel, BibDatabaseContext database,
                      MainTablePreferences preferences, ExternalFileTypes externalFileTypes, KeyBindingRepository keyBindingRepository) {
@@ -73,14 +75,15 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
         this.undoManager = panel.getUndoManager();
 
         fileHandler = new NewDroppedFileHandler(frame.getDialogService(), database, externalFileTypes,
-                Globals.prefs.getFilePreferences(),
+                                                Globals.prefs.getFilePreferences(),
                                                 Globals.prefs.getImportFormatPreferences(),
                                                 Globals.prefs.getUpdateFieldPreferences(),
-                Globals.getFileUpdateMonitor()
+                                                Globals.getFileUpdateMonitor()
 
         );
 
         this.getColumns().addAll(new MainTableColumnFactory(database, preferences.getColumnPreferences(), externalFileTypes, panel.getUndoManager(), frame.getDialogService()).createColumns());
+
         new ViewModelTableRowFactory<BibEntryTableViewModel>()
                                                               .withOnMouseClickedEvent((entry, event) -> {
                                                                   if (event.getClickCount() == 2) {
@@ -94,13 +97,20 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
                                                               .setOnMouseDragEntered(this::handleOnDragEntered)
                                                               .install(this);
 
+        for (Entry<String, SortType> entries : preferences.getColumnPreferences().getSortTypesForColumns().entrySet()) {
+            Optional<TableColumn<BibEntryTableViewModel, ?>> column = this.getColumns().stream().filter(col -> entries.getKey().equals(col.getText())).findFirst();
+            column.ifPresent(col -> {
+                col.setSortType(entries.getValue());
+                this.getSortOrder().add(col);
+            });
+        }
+
         if (preferences.resizeColumnsToFit()) {
             this.setColumnResizePolicy(new SmartConstrainedResizePolicy());
         }
         this.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
         this.setItems(model.getEntriesFilteredAndSorted());
-
         // Enable sorting
         model.getEntriesFilteredAndSorted().comparatorProperty().bind(this.comparatorProperty());
 
@@ -115,12 +125,6 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
         // Store visual state
         new PersistenceVisualStateTable(this, Globals.prefs);
 
-        // TODO: enable DnD
-        //setDragEnabled(true);
-        //TransferHandler xfer = new EntryTableTransferHandler(this, frame, panel);
-        //setTransferHandler(xfer);
-        //pane.setTransferHandler(xfer);
-
         // TODO: Float marked entries
         //model.updateMarkingState(Globals.prefs.getBoolean(JabRefPreferences.FLOAT_MARKED_ENTRIES));
 
@@ -348,84 +352,6 @@ public List<BibEntry> getSelectedEntries() {
                                   .collect(Collectors.toList());
     }
 
-    /**
-     * This method sets up what Comparators are used for the various table columns.
-     * The ComparatorChooser enables and disables such Comparators as the user clicks
-     * columns, but this is where the Comparators are defined. Also, the ComparatorChooser
-     * is initialized with the sort order defined in Preferences.
-     */
-    private void setupComparatorChooser() {
-        // TODO: Proper sorting
-
-        /*
-        // Set initial sort columns:
-
-        // Default sort order:
-        String[] sortFields = new String[] {
-                Globals.prefs.get(JabRefPreferences.TABLE_PRIMARY_SORT_FIELD),
-                Globals.prefs.get(JabRefPreferences.TABLE_SECONDARY_SORT_FIELD),
-                Globals.prefs.get(JabRefPreferences.TABLE_TERTIARY_SORT_FIELD)
-        };
-        boolean[] sortDirections = new boolean[] {
-                Globals.prefs.getBoolean(JabRefPreferences.TABLE_PRIMARY_SORT_DESCENDING),
-                Globals.prefs.getBoolean(JabRefPreferences.TABLE_SECONDARY_SORT_DESCENDING),
-                Globals.prefs.getBoolean(JabRefPreferences.TABLE_TERTIARY_SORT_DESCENDING)
-        }; // descending
-
-        model.getSortedForUserDefinedTableColumnSorting().getReadWriteLock().writeLock().lock();
-        try {
-            for (int i = 0; i < sortFields.length; i++) {
-                int index = -1;
-
-                // TODO where is this prefix set?
-        //                if (!sortFields[i].startsWith(MainTableFormat.ICON_COLUMN_PREFIX))
-                if (sortFields[i].startsWith("iconcol:")) {
-                    for (int j = 0; j < tableFormat.getColumnCount(); j++) {
-                        if (sortFields[i].equals(tableFormat.getColumnName(j))) {
-                            index = j;
-                            break;
-                        }
-                    }
-                } else {
-                    index = tableFormat.getColumnIndex(sortFields[i]);
-                }
-                if (index >= 0) {
-                    comparatorChooser.appendComparator(index, 0, sortDirections[i]);
-                }
-            }
-        } finally {
-            model.getSortedForUserDefinedTableColumnSorting().getReadWriteLock().writeLock().unlock();
-        }
-
-        // Add action listener so we can remember the sort order:
-        comparatorChooser.addSortActionListener(e -> {
-            // Get the information about the current sort order:
-            List<String> fields = getCurrentSortFields();
-            List<Boolean> order = getCurrentSortOrder();
-            // Update preferences:
-            int count = Math.min(fields.size(), order.size());
-            if (count >= 1) {
-                Globals.prefs.put(JabRefPreferences.TABLE_PRIMARY_SORT_FIELD, fields.get(0));
-                Globals.prefs.putBoolean(JabRefPreferences.TABLE_PRIMARY_SORT_DESCENDING, order.get(0));
-            }
-            if (count >= 2) {
-                Globals.prefs.put(JabRefPreferences.TABLE_SECONDARY_SORT_FIELD, fields.get(1));
-                Globals.prefs.putBoolean(JabRefPreferences.TABLE_SECONDARY_SORT_DESCENDING, order.get(1));
-            } else {
-                Globals.prefs.put(JabRefPreferences.TABLE_SECONDARY_SORT_FIELD, "");
-                Globals.prefs.putBoolean(JabRefPreferences.TABLE_SECONDARY_SORT_DESCENDING, false);
-            }
-            if (count >= 3) {
-                Globals.prefs.put(JabRefPreferences.TABLE_TERTIARY_SORT_FIELD, fields.get(2));
-                Globals.prefs.putBoolean(JabRefPreferences.TABLE_TERTIARY_SORT_DESCENDING, order.get(2));
-            } else {
-                Globals.prefs.put(JabRefPreferences.TABLE_TERTIARY_SORT_FIELD, "");
-                Globals.prefs.putBoolean(JabRefPreferences.TABLE_TERTIARY_SORT_DESCENDING, false);
-            }
-        });
-        */
-    }
-
     private Optional<BibEntryTableViewModel> findEntry(BibEntry entry) {
         return model.getEntriesFilteredAndSorted()
                     .stream()
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
index fa771bc9a3b..ff343bc16c4 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -120,6 +120,7 @@ public MainTableColumnFactory(BibDatabaseContext database, ColumnPreferences pre
         new ValueTableCellFactory<BibEntryTableViewModel, List<AbstractGroup>>()
                 .withGraphic(this::createGroupColorRegion)
                 .install(column);
+        column.setSortable(true);
         return column;
     }
 
@@ -156,6 +157,7 @@ private Node createGroupColorRegion(BibEntryTableViewModel entry, List<AbstractG
             new ValueTableCellFactory<BibEntryTableViewModel, String>()
                     .withText(text -> text)
                     .install(column);
+            column.setSortable(true);
             column.setPrefWidth(preferences.getPrefColumnWidth(columnName));
             columns.add(column);
         }
@@ -199,6 +201,7 @@ private TableColumn<BibEntryTableViewModel, Optional<SpecialFieldValueViewModel>
             column.setComparator(new RankingFieldComparator());
         }
 
+        column.setSortable(true);
         return column;
     }
 
@@ -374,7 +377,6 @@ private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createExtraFileCol
                 new ValueTableCellFactory<BibEntryTableViewModel, List<LinkedFile>>()
                         .withGraphic(linkedFiles -> createFileIcon(linkedFiles.stream().filter(linkedFile -> linkedFile.getFileType().equalsIgnoreCase(externalFileTypeName)).collect(Collectors.toList())))
                         .install(column);
-
         return column;
     }
 
diff --git a/src/main/java/org/jabref/gui/maintable/NormalTableColumn.java b/src/main/java/org/jabref/gui/maintable/NormalTableColumn.java
index 3407e291452..8405327047f 100644
--- a/src/main/java/org/jabref/gui/maintable/NormalTableColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/NormalTableColumn.java
@@ -77,7 +77,7 @@ public ObservableValue<String> getColumnValue(BibEntryTableViewModel entry) {
             return null;
         }
 
-        ObjectBinding[] dependencies = bibtexFields.stream().map(entry::getField).toArray(ObjectBinding[]::new);
+        ObjectBinding<String>[] dependencies = bibtexFields.stream().map(entry::getField).toArray(ObjectBinding[]::new);
         return Bindings.createStringBinding(() -> computeText(entry), dependencies);
     }
 
@@ -99,7 +99,7 @@ private String computeText(BibEntryTableViewModel entry) {
             result = toUnicode.format(MainTableNameFormatter.formatName(result));
         }
 
-        if (result != null && !bibtexFields.contains(BibEntry.KEY_FIELD)) {
+        if ((result != null) && !bibtexFields.contains(BibEntry.KEY_FIELD)) {
             result = toUnicode.format(result).trim();
         }
         return result;
diff --git a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
index 2b6e3708466..131e8b05c2e 100644
--- a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
+++ b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
@@ -1,10 +1,13 @@
 package org.jabref.gui.maintable;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumn.SortType;
 
 import org.jabref.preferences.JabRefPreferences;
 
@@ -16,12 +19,15 @@ public class PersistenceVisualStateTable {
 
     private final MainTable mainTable;
     private final JabRefPreferences preferences;
+    private final Map<String, SortType> columnsSortOrder = new LinkedHashMap<>();
 
     public PersistenceVisualStateTable(final MainTable mainTable, JabRefPreferences preferences) {
         this.mainTable = mainTable;
         this.preferences = preferences;
 
         mainTable.getColumns().addListener(this::onColumnsChanged);
+        mainTable.getColumns().forEach(col -> col.sortTypeProperty().addListener(obs -> updateColumnSortType(col.getText(), col.getSortType())));
+
     }
 
     private void onColumnsChanged(ListChangeListener.Change<? extends TableColumn<BibEntryTableViewModel, ?>> change) {
@@ -33,6 +39,12 @@ private void onColumnsChanged(ListChangeListener.Change<? extends TableColumn<Bi
         if (changed) {
             updateColumnPreferences();
         }
+
+    }
+
+    private void updateColumnSortType(String text, SortType sortType) {
+        columnsSortOrder.put(text, sortType);
+        preferences.setMainTableColumnSortType(columnsSortOrder);
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index cf1e1554819..8ca2d2bc027 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -14,7 +14,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
-
 /**
  * Preference tab for file sorting options.
  */
@@ -26,7 +25,7 @@ class ExportSortingPrefsTab extends Pane implements PrefsTab {
     private final RadioButton exportInTableOrder;
     private final RadioButton exportInSpecifiedOrder;
     private final SaveOrderConfigDisplay exportOrderPanel;
-    private final  GridPane builder = new GridPane();
+    private final GridPane builder = new GridPane();
 
     public ExportSortingPrefsTab(JabRefPreferences prefs) {
         this.prefs = prefs;
@@ -38,9 +37,9 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
 
         exportOrderPanel = new SaveOrderConfigDisplay();
 
-        EventHandler<ActionEvent> listener =  (event) -> {
-                boolean selected = event.getSource() == exportInSpecifiedOrder;
-                exportOrderPanel.setEnabled(selected);
+        EventHandler<ActionEvent> listener = (event) -> {
+            boolean selected = event.getSource() == exportInSpecifiedOrder;
+            exportOrderPanel.setEnabled(selected);
         };
 
         exportInOriginalOrder.setOnAction(listener);
@@ -52,9 +51,9 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
         // create GUI
         builder.add(exportSortOrder, 1, 1);
         builder.add(new Separator(), 2, 1);
-        builder.add(exportInOriginalOrder,  1, 2);
+        builder.add(exportInOriginalOrder, 1, 2);
         builder.add(new Line(), 2, 3);
-        builder.add(exportInTableOrder,  1, 4);
+        builder.add(exportInTableOrder, 1, 4);
         builder.add(new Line(), 2, 5);
         builder.add(exportInSpecifiedOrder, 1, 6);
         builder.add(new Line(), 2, 7);
@@ -64,6 +63,7 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
 
     }
 
+    @Override
     public Node getBuilder() {
         return builder;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
index 9069ac21e09..4ec10405351 100644
--- a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
@@ -1,24 +1,13 @@
 package org.jabref.gui.preferences;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-
-import javafx.collections.FXCollections;
 import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.RadioButton;
-import javafx.scene.control.TextField;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 
-import org.jabref.Globals;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.preferences.JabRefPreferences;
 
 class TablePrefsTab extends Pane implements PrefsTab {
@@ -26,9 +15,6 @@ class TablePrefsTab extends Pane implements PrefsTab {
     private final JabRefPreferences prefs;
 
     private final CheckBox autoResizeMode;
-    private final CheckBox priDesc;
-    private final CheckBox secDesc;
-    private final CheckBox terDesc;
 
     private final RadioButton namesAsIs;
     private final RadioButton namesFf;
@@ -38,13 +24,6 @@ class TablePrefsTab extends Pane implements PrefsTab {
     private final RadioButton noAbbrNames;
     private final RadioButton lastNamesOnly;
 
-    private final TextField priField;
-    private final TextField secField;
-    private final TextField terField;
-    private final TextField numericFields;
-    private final ComboBox priSort;
-    private final ComboBox secSort;
-    private final ComboBox terSort;
     private final GridPane builder = new GridPane();
 
     /**
@@ -62,13 +41,6 @@ public TablePrefsTab(JabRefPreferences prefs) {
          *
          * http://sourceforge.net/tracker/index.php?func=detail&aid=1540646&group_id=92314&atid=600306
          */
-        List<String> fieldNames = InternalBibtexFields.getAllPublicFieldNames();
-        fieldNames.add(BibEntry.KEY_FIELD);
-        Collections.sort(fieldNames);
-        String[] allPlusKey = fieldNames.toArray(new String[fieldNames.size()]);
-        priSort = new ComboBox<>(FXCollections.observableArrayList(allPlusKey));
-        secSort = new ComboBox<>(FXCollections.observableArrayList(allPlusKey));
-        terSort = new ComboBox<>(FXCollections.observableArrayList(allPlusKey));
 
         autoResizeMode = new CheckBox(Localization.lang("Fit table horizontally on screen"));
         namesAsIs = new RadioButton(Localization.lang("Show names unchanged"));
@@ -79,36 +51,6 @@ public TablePrefsTab(JabRefPreferences prefs) {
         abbrNames = new RadioButton(Localization.lang("Abbreviate names"));
         lastNamesOnly = new RadioButton(Localization.lang("Show last names only"));
 
-        priField = new TextField();
-        secField = new TextField();
-        terField = new TextField();
-
-        numericFields = new TextField();
-
-        priSort.setValue(Localization.lang("<select>"));
-        secSort.setValue(Localization.lang("<select>"));
-        terSort.setValue(Localization.lang("<select>"));
-
-        priSort.setOnAction(e -> {
-            if (priSort.getBaselineOffset() > 0) {
-                priField.setText(priSort.getItems().toString());
-            }
-        });
-        secSort.setOnAction(e -> {
-            if (secSort.getBaselineOffset() > 0) {
-                secField.setText(secSort.getItems().toString());
-            }
-        });
-        terSort.setOnAction(e -> {
-            if (terSort.getBaselineOffset() > 0) {
-                terField.setText(terSort.getItems().toString());
-            }
-        });
-
-        priDesc = new CheckBox(Localization.lang("Descending"));
-        secDesc = new CheckBox(Localization.lang("Descending"));
-        terDesc = new CheckBox(Localization.lang("Descending"));
-
         Label formatOfAuthor = new Label(Localization.lang("Format of author and editor names"));
         formatOfAuthor.getStyleClass().add("sectionHeader");
         builder.add(formatOfAuthor, 1, 1);
@@ -123,38 +65,10 @@ public TablePrefsTab(JabRefPreferences prefs) {
         Label label1 = new Label("");
         builder.add(label1, 1, 6);
 
-        Label defaultSortCriteria = new Label(Localization.lang("Default sort criteria"));
-        defaultSortCriteria.getStyleClass().add("sectionHeader");
-        builder.add(defaultSortCriteria, 1, 7);
-        // Create a new panel with its own FormLayout for these items:
-        Label primarySortCriterion = new Label(Localization.lang("Primary sort criterion"));
-        builder.add(primarySortCriterion, 1, 8);
-        builder.add(priSort, 2, 8);
-        builder.add(priField, 3, 8);
-        builder.add(priDesc, 4, 8);
-
-        Label secondarySortCriterion = new Label(Localization.lang("Secondary sort criterion"));
-        builder.add(secondarySortCriterion, 1, 9);
-        builder.add(secSort, 2, 9);
-        builder.add(secField, 3, 9);
-        builder.add(secDesc, 4, 9);
-
-        Label tertiarySortCriterion = new Label(Localization.lang("Tertiary sort criterion"));
-        builder.add(tertiarySortCriterion, 1, 10);
-        builder.add(terSort, 2, 10);
-        builder.add(terField, 3, 10);
-        builder.add(terDesc, 4, 10);
-
-        Label sortFields = new Label(Localization.lang("Sort the following fields as numeric fields") + ':');
-        builder.add(sortFields, 1, 11);
-        builder.add(numericFields, 2, 11);
-
-        builder.add(new Label(""), 1, 12);
-
         Label general = new Label(Localization.lang("General"));
         general.getStyleClass().add("sectionHeader");
-        builder.add(general, 1, 13);
-        builder.add(autoResizeMode, 1, 14);
+        builder.add(general, 1, 7);
+        builder.add(autoResizeMode, 1, 8);
         namesNatbib.setOnAction(e -> {
             abbrNames.setDisable(namesNatbib.isSelected());
             lastNamesOnly.setDisable(namesNatbib.isSelected());
@@ -162,6 +76,7 @@ public TablePrefsTab(JabRefPreferences prefs) {
         });
     }
 
+    @Override
     public Node getBuilder() {
         return builder;
     }
@@ -170,10 +85,6 @@ public Node getBuilder() {
     public void setValues() {
         autoResizeMode.setSelected(prefs.getBoolean(JabRefPreferences.AUTO_RESIZE_MODE));
 
-        priField.setText(prefs.get(JabRefPreferences.TABLE_PRIMARY_SORT_FIELD));
-        secField.setText(prefs.get(JabRefPreferences.TABLE_SECONDARY_SORT_FIELD));
-        terField.setText(prefs.get(JabRefPreferences.TABLE_TERTIARY_SORT_FIELD));
-
         if (prefs.getBoolean(JabRefPreferences.NAMES_AS_IS)) {
             namesAsIs.setSelected(true);
         } else if (prefs.getBoolean(JabRefPreferences.NAMES_FIRST_LAST)) {
@@ -190,21 +101,11 @@ public void setValues() {
         } else {
             noAbbrNames.setSelected(true);
         }
-        priDesc.setSelected(prefs.getBoolean(JabRefPreferences.TABLE_PRIMARY_SORT_DESCENDING));
-        secDesc.setSelected(prefs.getBoolean(JabRefPreferences.TABLE_SECONDARY_SORT_DESCENDING));
-        terDesc.setSelected(prefs.getBoolean(JabRefPreferences.TABLE_TERTIARY_SORT_DESCENDING));
 
         abbrNames.setDisable(namesNatbib.isSelected());
         lastNamesOnly.setDisable(namesNatbib.isSelected());
         noAbbrNames.setDisable(namesNatbib.isSelected());
 
-        String numF = prefs.get(JabRefPreferences.NUMERIC_FIELDS);
-        if (numF == null) {
-            numericFields.setText("");
-        } else {
-            numericFields.setText(numF);
-        }
-
     }
 
     /**
@@ -222,22 +123,6 @@ public void storeSettings() {
         prefs.putBoolean(JabRefPreferences.ABBR_AUTHOR_NAMES, abbrNames.isSelected());
 
         prefs.putBoolean(JabRefPreferences.AUTO_RESIZE_MODE, autoResizeMode.isSelected());
-        prefs.putBoolean(JabRefPreferences.TABLE_PRIMARY_SORT_DESCENDING, priDesc.isSelected());
-        prefs.putBoolean(JabRefPreferences.TABLE_SECONDARY_SORT_DESCENDING, secDesc.isSelected());
-        prefs.putBoolean(JabRefPreferences.TABLE_TERTIARY_SORT_DESCENDING, terDesc.isSelected());
-        prefs.put(JabRefPreferences.TABLE_PRIMARY_SORT_FIELD, priField.getText().toLowerCase(Locale.ROOT).trim());
-        prefs.put(JabRefPreferences.TABLE_SECONDARY_SORT_FIELD, secField.getText().toLowerCase(Locale.ROOT).trim());
-        prefs.put(JabRefPreferences.TABLE_TERTIARY_SORT_FIELD, terField.getText().toLowerCase(Locale.ROOT).trim());
-
-        String oldVal = prefs.get(JabRefPreferences.NUMERIC_FIELDS);
-        String newVal = numericFields.getText().trim();
-        if (newVal.isEmpty()) {
-            newVal = null;
-        }
-        if (!Objects.equals(oldVal, newVal)) {
-            prefs.put(JabRefPreferences.NUMERIC_FIELDS, newVal);
-            InternalBibtexFields.setNumericFields(Globals.prefs.getStringList(JabRefPreferences.NUMERIC_FIELDS));
-        }
 
     }
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index b406dcf8950..2826154551f 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -34,6 +35,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javafx.scene.control.TableColumn.SortType;
+
 import org.jabref.Globals;
 import org.jabref.JabRefException;
 import org.jabref.JabRefMain;
@@ -133,12 +136,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String PROXY_USERNAME = "proxyUsername";
     public static final String PROXY_PASSWORD = "proxyPassword";
     public static final String PROXY_USE_AUTHENTICATION = "useProxyAuthentication";
-    public static final String TABLE_PRIMARY_SORT_FIELD = "priSort";
-    public static final String TABLE_PRIMARY_SORT_DESCENDING = "priDescending";
-    public static final String TABLE_SECONDARY_SORT_FIELD = "secSort";
-    public static final String TABLE_SECONDARY_SORT_DESCENDING = "secDescending";
-    public static final String TABLE_TERTIARY_SORT_FIELD = "terSort";
-    public static final String TABLE_TERTIARY_SORT_DESCENDING = "terDescending";
+
     public static final String REFORMAT_FILE_ON_SAVE_AND_EXPORT = "reformatFileOnSaveAndExport";
     public static final String EXPORT_IN_ORIGINAL_ORDER = "exportInOriginalOrder";
     public static final String EXPORT_IN_SPECIFIED_ORDER = "exportInSpecifiedOrder";
@@ -151,6 +149,9 @@ public class JabRefPreferences implements PreferencesService {
     public static final String NEWLINE = "newline";
     public static final String COLUMN_WIDTHS = "columnWidths";
     public static final String COLUMN_NAMES = "columnNames";
+    public static final String COLUMN_IN_SORT_ORDER = "columnInSortOrder";
+    public static final String COlUMN_IN_SORT_ORDER_TYPE = "columnInSortOrderType";
+
     public static final String SIDE_PANE_COMPONENT_PREFERRED_POSITIONS = "sidePaneComponentPreferredPositions";
     public static final String SIDE_PANE_COMPONENT_NAMES = "sidePaneComponentNames";
     public static final String XMP_PRIVACY_FILTERS = "xmpPrivacyFilters";
@@ -507,14 +508,6 @@ private JabRefPreferences() {
         // system locale as default
         defaults.put(LANGUAGE, Locale.getDefault().getLanguage());
 
-        // Sorting preferences
-        defaults.put(TABLE_PRIMARY_SORT_FIELD, FieldName.AUTHOR);
-        defaults.put(TABLE_PRIMARY_SORT_DESCENDING, Boolean.FALSE);
-        defaults.put(TABLE_SECONDARY_SORT_FIELD, FieldName.YEAR);
-        defaults.put(TABLE_SECONDARY_SORT_DESCENDING, Boolean.TRUE);
-        defaults.put(TABLE_TERTIARY_SORT_FIELD, FieldName.TITLE);
-        defaults.put(TABLE_TERTIARY_SORT_DESCENDING, Boolean.FALSE);
-
         defaults.put(REFORMAT_FILE_ON_SAVE_AND_EXPORT, Boolean.FALSE);
 
         // export order
@@ -536,6 +529,7 @@ private JabRefPreferences() {
 
         defaults.put(COLUMN_NAMES, "entrytype;author/editor;title;year;journal/booktitle;bibtexkey");
         defaults.put(COLUMN_WIDTHS, "75;300;470;60;130;100");
+
         defaults.put(XMP_PRIVACY_FILTERS, "pdf;timestamp;keywords;owner;note;review");
         defaults.put(USE_XMP_PRIVACY_FILTER, Boolean.FALSE);
         defaults.put(WORKING_DIRECTORY, USER_HOME);
@@ -1396,12 +1390,11 @@ public FilePreferences getFilePreferences() {
         Map<String, String> fieldDirectories = Stream.of(FieldName.FILE, FieldName.PDF, FieldName.PS)
                                                      .collect(Collectors.toMap(field -> field, field -> get(field + FilePreferences.DIR_SUFFIX, "")));
         return new FilePreferences(
-                getUser(),
-                fieldDirectories,
-                getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR),
-                get(IMPORT_FILENAMEPATTERN),
-                get(IMPORT_FILEDIRPATTERN)
-        );
+                                   getUser(),
+                                   fieldDirectories,
+                                   getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR),
+                                   get(IMPORT_FILENAMEPATTERN),
+                                   get(IMPORT_FILEDIRPATTERN));
     }
 
     public UpdateFieldPreferences getUpdateFieldPreferences() {
@@ -1529,7 +1522,7 @@ private NameFormatterPreferences getNameFormatterPreferences() {
 
     public FileLinkPreferences getFileLinkPreferences() {
         return new FileLinkPreferences(
-                Collections.singletonList(get(FieldName.FILE + FilePreferences.DIR_SUFFIX)),
+                                       Collections.singletonList(get(FieldName.FILE + FilePreferences.DIR_SUFFIX)),
                                        fileDirForDatabase);
     }
 
@@ -1624,8 +1617,8 @@ public JournalAbbreviationPreferences getJournalAbbreviationPreferences() {
 
     public CleanupPreferences getCleanupPreferences(JournalAbbreviationLoader journalAbbreviationLoader) {
         return new CleanupPreferences(
-                getLayoutFormatterPreferences(journalAbbreviationLoader),
-                getFilePreferences());
+                                      getLayoutFormatterPreferences(journalAbbreviationLoader),
+                                      getFilePreferences());
     }
 
     public CleanupPreset getCleanupPreset() {
@@ -1703,18 +1696,6 @@ public void storeExportSaveOrder(SaveOrderConfig config) {
         put(EXPORT_TERTIARY_SORT_FIELD, config.sortCriteria[2].field);
     }
 
-    public SaveOrderConfig loadTableSaveOrder() {
-        SaveOrderConfig config = new SaveOrderConfig();
-        config.sortCriteria[0].field = get(TABLE_PRIMARY_SORT_FIELD);
-        config.sortCriteria[0].descending = getBoolean(TABLE_PRIMARY_SORT_DESCENDING);
-        config.sortCriteria[1].field = get(TABLE_SECONDARY_SORT_FIELD);
-        config.sortCriteria[1].descending = getBoolean(TABLE_SECONDARY_SORT_DESCENDING);
-        config.sortCriteria[2].field = get(TABLE_TERTIARY_SORT_FIELD);
-        config.sortCriteria[2].descending = getBoolean(TABLE_TERTIARY_SORT_DESCENDING);
-
-        return config;
-    }
-
     public SaveOrderConfig loadExportSaveOrder() {
         SaveOrderConfig config = new SaveOrderConfig();
         config.sortCriteria[0].field = get(EXPORT_PRIMARY_SORT_FIELD);
@@ -1727,6 +1708,26 @@ public SaveOrderConfig loadExportSaveOrder() {
         return config;
     }
 
+    private SaveOrderConfig loadTableSaveOrder() {
+        SaveOrderConfig config = new SaveOrderConfig();
+        List<String> columns = getStringList(COLUMN_IN_SORT_ORDER);
+        List<Boolean> sortTypes = getStringList(COlUMN_IN_SORT_ORDER_TYPE).stream().map(SortType::valueOf).map(type -> type == SortType.DESCENDING ? true : false).collect(Collectors.toList());
+
+        if (columns.size() >= 1) {
+            config.sortCriteria[0].field = columns.get(0);
+            config.sortCriteria[0].descending = sortTypes.get(0);
+        }
+        if (columns.size() >= 2) {
+            config.sortCriteria[1].field = columns.get(1);
+            config.sortCriteria[1].descending = sortTypes.get(1);
+        }
+        if (columns.size() >= 3) {
+            config.sortCriteria[2].field = columns.get(2);
+            config.sortCriteria[2].descending = sortTypes.get(2);
+        }
+        return config;
+    }
+
     public Character getKeywordDelimiter() {
         return get(KEYWORD_SEPARATOR).charAt(0);
     }
@@ -1883,7 +1884,8 @@ public ColumnPreferences getColumnPreferences() {
                                      getStringList(COLUMN_NAMES),
                                      createSpecialFieldColumns(),
                                      createExtraFileColumns(),
-                                     createColumnWidths());
+                                     createColumnWidths(),
+                                     getMainTableColumnSortTypes());
     }
 
     public MainTablePreferences getMainTablePreferences() {
@@ -1959,4 +1961,21 @@ public void setIdBasedFetcherForEntryGenerator(String fetcherName) {
     public String getIdBasedFetcherForEntryGenerator() {
         return get(ID_ENTRY_GENERATOR);
     }
+
+    public void setMainTableColumnSortType(Map<String, SortType> sortOrder) {
+        putStringList(COLUMN_IN_SORT_ORDER, new ArrayList<>(sortOrder.keySet()));
+        List<String> sortTypes = sortOrder.values().stream().map(SortType::name).collect(Collectors.toList());
+        putStringList(COlUMN_IN_SORT_ORDER_TYPE, sortTypes);
+    }
+
+    public Map<String, SortType> getMainTableColumnSortTypes() {
+        List<String> columns = getStringList(COLUMN_IN_SORT_ORDER);
+        List<SortType> sortTypes = getStringList(COlUMN_IN_SORT_ORDER_TYPE).stream().map(SortType::valueOf).collect(Collectors.toList());
+        Map<String, SortType> map = new LinkedHashMap<>();
+        for (int i = 0; i < columns.size(); i++) {
+            map.put(columns.get(i), sortTypes.get(i));
+        }
+        return map;
+    }
+
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 2080d14f220..b5c30ff8deb 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -14,8 +14,6 @@
 
 <field\ name>=<field name>
 
-<select>=<select>
-
 <select\ word>=<select word>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Abbreviate journal names of the selected entries (ISO abbreviation)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Abbreviate journal names of the selected entries (MEDLINE abbreviation)
@@ -253,8 +251,6 @@ Default\ grouping\ field=Default grouping field
 
 Default\ pattern=Default pattern
 
-Default\ sort\ criteria=Default sort criteria
-
 Delete=Delete
 
 Delete\ custom\ format=Delete custom format
@@ -1203,7 +1199,6 @@ Use\ IEEE\ LaTeX\ abbreviations=Use IEEE LaTeX abbreviations
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=When opening file link, search for matching file if no link is defined
 Settings\ for\ %0=Settings for %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Sort the following fields as numeric fields
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Line %0: Found corrupted BibTeX key.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Line %0: Found corrupted BibTeX key (contains whitespaces).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Line %0: Found corrupted BibTeX key (comma missing).

From c858a94de5c5c9410653e1a3d2092c3dde5e96be Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Thu, 13 Sep 2018 14:14:14 +0200
Subject: [PATCH 093/229] Update gradle and junit and mockito (#4340)

---
 build.gradle                             |  12 ++++++------
 gradle/wrapper/gradle-wrapper.jar        | Bin 54413 -> 56172 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index c9c2f90604d..e5cdd3bbb3a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -163,15 +163,15 @@ dependencies {
     compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.1.2'
     compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.1.2'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.0'
-    testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.0'
-    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.0'
-    testCompile 'org.junit.platform:junit-platform-launcher:1.3.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+    testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1'
+    testCompile 'org.junit.platform:junit-platform-launcher:1.3.1'
     testCompile 'org.junit-pioneer:junit-pioneer:0.1.2'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'
-    testCompile 'org.mockito:mockito-core:2.21.0'
+    testCompile 'org.mockito:mockito-core:2.22.0'
     testCompile 'com.github.tomakehurst:wiremock:2.18.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 0d4a9516871afd710a9d84d89e31ba77745607bd..28861d273a5d270fd8f65dd74570c17c9c507736 100644
GIT binary patch
delta 49416
zcmY&;Q*hty^L83GwrwYkZQHip*!VQIZQD*7+qUhb$v0M;|1<B=`#ac~J-qIjo!$FF
zY$e2X8$<#Zta8pviVzqWm`0+o8Z<8W)4j{L<N*u(#1;=YGHwNWPAD)iX1L@6V%+3_
zVLTvKQ_pir66GJ(l%}cp_fc4GVN+=m4<^pil(dktU!)ZKka%Jhu%$H5o2cWebW{31
zee)kZ{)es1{tiY2x{4PUb|3Wb%<qu7sWtofIj6@pnrzK%5B_X?_eRKoFW5d<z<06`
zHj!&d-O-$wHxeIb&Ing8o(L%OVHd&g#7qEWV??y6cPWGpY3FhvC2qP!3{)d-{bUE)
zuw4h8*iOWcG>c>21nfT@+Hj_{9>$d45!cN1Z+|hhm6CW2B$%*5##x71DzUtpf+V16
zElzocPFpPR-eheu_0Co-aw!U1GS!|WRu+eS6=*i-bu&rxIBQLttSh~9sU3AMFX@2x
zq%nmhrmaWTa$Ct!O~!1!WQ2cB>#PVPX^U&i__nHAv8JqMdRZztZj@P>Ije4h7stiA
z5>XAUu`FWqh&*O#H0gDtLkPKb&n>np&pb;FZ;X7U)h8~S>JK>~s4pP{H^-r&Zn?4q
zOe(8!5hij5_EHq0@P7%~wWj&SjB<g%5qRFY4H+$|w4T`E9mA(_c&;u1R#u7U?1<{^
zCm#0|mSQ{=g<Ph>qI%W+<aQUol~ws-h9mbXbrH6En^x0f&5je}n|O|eb@>?e`JBVb
zG!Aj3G~GvDF6jYFTuy5-Rz>CI7@bBJzfB$-8?DU{ry^ryXiS0;mM{k;l5{|%a*d`z
zSlS*6b34IVZGdrG^Da#Ld0zq7k=6_Umc|SF7M0VsB}8v6#1JBv`=mQsAEP@S`TH*#
zBvQLWt%2~4q4~esejaalD^Xq=cc_A8vcB>qZq3tBUvPp01?euaWWVWuw=pb!s1I1Z
z>JMPQCV_Q%$NGB5QcE(S)29J3^%#D!julEoQic^cZJLKyBj((htn@yDwizDk<#CPP
z%Z3Lk*m}zkxB~w6q*b_i-1REBEhkZTD1^IuM2a-8SbLGny;eB?^4pV4K9b+lf9{%T
z7&HZJbvFqAT_B8JGb-Ac7`>cbWmsZNvuV1vsfu4CJ|JsnYoFp|<}d`b=ENRg&+1%1
za%`Q0spPh^84OFPbI^`T>#%3*we>0cvt2OdxbJs|5KRm!rF*Au)Uyj0v3+Gb6my?j
zE1S4hc^7rTRtvmGxHnIyRi`pvmqt~D*?wlMRfZ$4eYh}-2G?iN?9vq#oeuvs#<9oa
za6sXys8k3woL<!Kw%7&6L!1mT*}4<2o_O|l7>d~_SIXc;h<rCeUXj1B<fCJ<ezlR-
zBF;aJJLEDihWm2)4~*m^%TM#`hMzOaC`l@PjpMB|w`~0CX@Mp<@VGA4a7O$QgCkI>
z$0DlfmT^PMmuViF*vMg@(T8lL`A(?1%4HbZ7bSd3bWF#)I?n@;?uh*$(`aNN3r(Tp
zRCp!-r;M%RIQ!mK#HTir7AZ{8FO4?&E_va9H4^biJ?J^oX|ymz(v+NY{al#5Dj3xp
z{Ofv{<}W9AL_p3U*x$Q|L%6_`64Z^k4&2oy>@JlUo(MP`sh|W%r&Mcc6qaCV6QR69
z8kh^Nxo`Y(6`^xLuvc6S(n^Pu`&{xLsHDeWfg<Ckm?75R7V_L*$*ghXUWt!timM3B
zDirUN%hq4nO>pxM)BcZ^Qes=H4Lwog+v~x!d!&_8n@{A>qdp}NL8Wx>qI^~B-q?W=
zUuS%19~TQkFOBs0moFW^!vi_QznpC8&o4@sA!Ss+1r!@pUzYx%4D6njpp$rW#i1Ju
z{g%!igq3xG&*hJ_xkoAc!!5xlQ_`-ug&WRrD*PwtmUNKS5@!p<>}`_aj(7G5D9b@W
zVt|2t|Nh^`6#>&EDj!L<h86*!dxC`aMfJUc*2C7(l9JSYxv+`)#Ug1BSG}iw`7_=O
zZ^zL4@n9j$B49xqyZTfwp=lwYRZdC0L}oc>?2w6B^Ue3cisG7jPAeQ#%T?OCoblG<
zSac0a!mq!Knvf_-!7PgoEq8`KqMM5ySdyTn(i9zqjDLY855La$`F1EsLa++4Sw)3j
zf7lcJtZ=y4hxlKhYcA%!$?`DjfI(H$a=rBrDo8U^QTb$B^rdoIdE*(6aD?C#BlE-L
z-gQZI;Fr*(7fc13tnN;Dr{^D@m)TBNE8ySzGeo~Xe_NvDKv-~4Xe!3fP3;j~xGP!)
zyqC0C#O*fJa4VCgLBg=(W)iqZ*RT$)Z42pTbG07~%fZs!e+aMPpTcg#0SxD>rhy@Y
zI`C#<81&zSZm?UL_fE<;7i|%4^ZUAV&}SMLup02*?er09b#g2BdQn_r2QQenZXx$Z
z;{h15yZS-~1%nOiXg=ACAF3SG4Z@NLc7~1r@__vSiWZ@4^+u=kZwS@9nO2S(@<)wB
ztYQZQWWhb;zEz}#&}Dz80a$fbRRZ%LN*uF^BR}?5f2&<)r0scxHaX3SzzXgh8SPW7
zkyya%At}5B@*EU~N+Fbfb;*Zq6KkmT-)9oCnTJP`#_Rr@EvO#(Cbl^(A!B;^Z757D
zzrY$(yjB+E7I83va41w}S#CxlI;ERkU8R~MPSJg67)vU26w#A~3*0W^I+%w3!-F}E
zCbuk;j<*c-5Y+Jz$=Ko-y@uyuF}G1b3MO_=)U*=+6-{rBK29p6Sf{#d{B|4B=ZZd-
z;hJ3M9<!{a&mHvFyK1{U(&bHs2b`^glj$YJ-o7SuW;F>PbyPQ|J>+Vr<%IMLnkm_R
zLasPMuE9B#p{a6D8Sj6__X_sZz7+`!ES?Yyj5OI9nh0Prvo~>d&DDW5##r<I7hu!M
zrW+fg?aYXyjj%3SK7eEIj6=Z`ND+c10y+9j5?d0wQpe91osi2-mBJ~7??a&|s>Y|d
z&FheZQEn2d;74KOoYnScr$xc1#KGtH#ZF5s;fb#!@{KJ13Ty$_?d#sh?d@MBzmqQJ
zZb;)~eFVVxdp-1gEVEYA%T?7|lx=_*M_;8TFg0xV?UOTLtp64orT-S{?&CEW>>mnH
zl2uQaC8Rl%59tK+Z@GUB!B5~9@23u!$fq|L5ZI?awWmB|l=*rE_78ebeP*xf^cMWp
z_frh)D*{lRxk@#EnxpE)?C;w*Lj25*1dxpx{{h9|mr9Jrhe8mq%%7f^y|G`g`v3@_
zl3bqlT$XXH$mBxkt_*prvn|{Bu1;P>tESLt>xUstCl7*g5=T&zSEECOg=~N@;w+6a
zYQ&Ify<C}>Y$Evup=vid_zSXhHbo+gK~qgmUdMKl72=kQ0wdw1X)r}^xso1H$70-8
z4Hzt|VL8@RTZNuyzLM8*oOHO{-b$r-DzpDlI*=l%mL+e)Svr!U>E2HmX3uV(OzH_o
z(!hJ<Ja!YYF;S9?0qMIl{5G*e>$n{0yCAY9*AbMp+dK5}@hnM(>_%{Y%R`Z%DB><f
zmiKtw;W-^wn&V<2C8FW`)$8y3K@{PZ2dwKMExS$<%f-ZS^IJ%04HDWAI^Ps#Eb$&}
z9v#JPZI)uU!y?4_UbBRgx#c#_ZPc>x2`=J+wypg_roJ%|yKbAaqhc?|bw#4C$xw9_
z$;?Go4`s^{_ENK;##3Gw?&=)#&-Dr5#ryC<-8?-+aA+lUvf;<U`VmHw%Jvq}19+Z3
zs%GVcFBSg0W$rQvn~i2|_!>voC3E<(i_7$9=$T|xr>WO4DlfHF&Qr!@f&_#zowL_8
z^Onr@TH-6Hb42`G4)Ip4Ea6S|P}Ns#XQPDmt$p=uQ<PcOJJ_*2S-~dAh_nkhY9l2G
zxunz=5=T0Q93#HCV7_z6yhpZ)K(?JLKi^T_(dZ3Ms9a~GPPvD(o&w!PN0(HNea0fF
zTy1EG&U8|-O)byMwq{PHNlVRBck0UJkbIZMKQp>9PF$A7WS*D;^TO5Aqho5!AjLxm
zRgX$?8&|zZ_1C@lBs#-HwJY~YY&k#PPUBdIKGw<e$lJ>7>vYkiTDQ$OU@7*8)jXP1
z53y6v>PrBF-v*iQ?@#px+q4C)X-)=4bdHi((fQXK4_038twwy=cZWL8$>6|&&x~HJ
z)teY(>Im}ko04XWhuzl##n7!wxe)Ej;W|R+?rEy_Es!KS`{g}2?;37gqMn^)>|<JS
zq-%?$<vG^S=)sazhfJptFtg*nzGK(bSW%>_FPs`*L2$4NF52h8!Y2psVV!Zk2=9jc
zRg1-79)w(G+IIGM7VB(hlaFCn7mK}?U={bU9T_4Q8YD4xF^<Vl#q2FAJVWSuC<a$j
z%^J)g&Xl7wIroM>fiS2^l@yxXwIc%UN0KDn85}3eHR{bYuD8qsU{T#w*b+7Whzn=v
zkk-9ZPafofza2Jf*{?W@ZI7YfS5Crj+DRhx(wt{SR<F(W-ARbQW<NHR^O*Q4*++S^
zXfi>xVRs<VVSRw^wVCAKl<$=)m+g_eG^=dl!a@&ETH++r$X$@7Xqht7Eogp#>$f-<
z?G+iOe8^=t#dgC0TqOOJ^Eqyy>~RUvv6jgfN8quQ=_6=9?m)YC_Qn@L(GWf;8x^n`
zPxvOMI4&b%AlQz42BC;DsYAkVLOle9ua}~~O~n|tZ8bsLxt9RL;H_*w_=~dKVm^tK
z$0o8k<|k%YCgqUVL=x&s%p|H@QI)48ht<a2c1GwKD5yXbc%!qK$WTs^8}od5a(li;
zexb(IJb;jje-7i24~cdr%i%ujFyT|QNuDKPj=V#_2<Z{$4xcdj33t2p4+$9r=Tcm*
z7F9;Mjqmy$%~p?f5(BRM9)X-OhG&H7K$3X2XmN1^buTY!)J^uC?U440g24}NPM5W=
z#ZOvaE@?0XsMPS)8|PeItaFasu$7UWUFc!^C6<z(x|JqB{$_uS@zW@MPbK+VPH|+6
zypCpQgV}fqCGr$GyX)72{|rJy`xIZ)xr^SFtZ^bqjpbZ>4smpAPTXj??(=%yjY1qB
zq$#hkkp%ph_pfx++FZ{vKAGhlo|<?rO}A-U?gw=yU^`_%?v)BRFT$tz;Z-mTVGP}n
zI}?vsNja?W#~BqY&Oz|lZ})LQ+4D&XZ#m8h4Lr~yZQk_^c<%iUAEUQCWsYQBnyU^$
zb5k*cAmcc~n5AWmcoQW=_P6J#GKW}m`c-PZHR_?KtK_Z6K13)3Ii~S0X;x$^R4v&W
zk6DI#AP0G#^E8Pynh)|;RZ9p_?LCPRGREthw@H~NX6WpK3KvUa<%lN6polr^pN%v4
zAY<o==o)TTY8}=jJ<Q~gdHI=c8UNgw>Lw-x%g4+opYIfej`3{v<)-q}m{441sJVj0
zx{a*{ik9+P*<CM|m%?A`8-*3w%PZ%wWf|%7!1K7;Y)Sz9)!Ax(;rn7}hHiD?Z;+@I
zL%zGEiUD?srvI!MEmkdC*zX?k6}8{Xb%kXT{|s~sY)vpTDie64qSY>Eu`}jYQtc%E
zPIz$CFv3OJt7N;Ra=0EH@{+O1A+0Q!pG_mGYsWv+<xI$_YMEwza^N^?RVFEIe17zr
z0_O@GG07){q1k+r4qQd{_{45ew&gonx+A=$HlN?}gj1M21we0yrAg+f#45j6XXsXt
zh}2oN<U3U2zgf?><>uO!<;-c%B9EfUXoxIOCl07c6($V)3lv|Rdh~&f-^i=gw`lUD
zIH3vAlxdx7l^S(Z;QE(lYVk+@47pw50@yECxY2e=t8N-;nk+kQS8uhtHPIOKd9zc#
zs8o^2bQ`+P^46m|j5elbPiN56UFw}w+c;YN5)wVZp~*kagX)sK=HanYI-qqW!kg;d
z!@I$W&6mq5y}G3}8B3;=*SoYSLRb~Ns5JV`KwDbqlgBwtOzwR=*S&kiclwYT1@vZO
zM*-XiaT~h~n6lbcA#gf$H3KNWNuBn`Tyh3<p3T4}e~dbJ8|Mfs3lOX$SG5QK^VwiF
zLivQ2<_mnVr{=kog7W*+<Ybpsd%!s6@t+>bYKU>bq1q4{G!zR%aUA1&tbd^6AYTv|
zsgi%eXm*)7TwsXybd~rE?xZn<0ZiiI)faXbzTx>HlJ0S+v$Gon=fjU8>}mX1ucK^t
z=XVsab;8Fw@CZ?kPhBst*vR2wVV<h$W~gq-viN;wtD~+Yb8^J6r=(MfWJen)A@aaW
z=U8+K4GzH?T6NWs!f>LShS$><$!RS~sLSC<-^@Jq5mc7StJn*VJwax+0=V=zi>TqP
z*enw`TH9w02H_I2o&7xQ^la+W$;Y3ypSWrP6AF^cS_A*235em_o9T^b^S|z+9;@-A
z3>N(>+mNMH-WD}_RiR*JlKll81i_`uB|I8k*3dzHtYjvWU0=v@oIR+T<)@R4dJiQ=
zN*;ScYJ^9>Nr$z1^kA7?2}riv!>a$Rt=iTltooj5Q$w(>s`E@ST4$z#S1lAYk}tvC
zK^3d#XnZ5=w1ctQ*InY{d_w7K_mo8Uw^moR^?Q4)M!-HSJEtGg$-p~1C&60s>?+;t
zt0P&3U~Du*dYZaWJhV`jnC08yBs*SyW<dU~*at^A-OoV;jgo~$KL8zZ#->FuxYYq(
zwjSSBpk@E$%x%6WY|W-=4aE3&rsJ_3SF?Xd-;sR8BMX3mFsFvNG352Z&TYcqnxE|>
zJRdfEG$kfmk2mA)XSg;WB{Yv9G^KH0q7~?vR{kwoRqhNqx5&{addZyh&VjIB%^g^O
zM9~|l_Dc1q90TH&6FA%LmpM=qp>yifZfO13Q<Aa0gWHXMSt!iDQ~Bf$UL_fmdxfpb
z@=C}I$m}$f`5Avmy#b%FM*d2BsV)(B24cI`P)pVVee+W;tyVu9jO?-JZcK+QXRRDO
zdPSL(2z9fR3e9-^At*Xk(f^N(uH4(HHIN=UV6|Tg@iQlo8bIK;**AmEW1WWrCC;(C
zx(d=QsPBn<uv0$GQBv?LsAU&nR(P}Afo!PsZgNt$iP0J|%LFOs7^U&l{)&=k7lvC)
zr0UxJ+>Z+kW9Nj+R`~2p7Rr8e#Rl5sO|Dk_X5XK}*r0G4poNr@XB%FjR0V^TEOq>N
z;cNNu@yeY%0i}oPI|1zO^2F{%>n?CPm^)5rCpD)J#A}?4!P)&Dn`>JVgxgcDSP#on
z1S|_D7DXO3_7!f#3sYJ#ifN~9k?HJ#^IUI)jm)ux+*b+S3`x`TucXltc)a?lU13cB
z7Ml8DT{KW(exOWba%Db!x=mah`?DJt)Js_-b4TANAVDBq++0rUr5ua=#!W<1FQygJ
z?9gjTD&mPJ;DAYLR1s9Y191{NFl6(XRB(n#&^cL)+WK@}Q%jnkLgx6eBm5<Nml0Hd
z#H=Qr47)bghidu`6~LxxTi_sEs{sAR8s<%pX-BU6%+g3EU&$t41}|S8El+9D_+cGv
zQS!<T2o9m^R{mpdK0BIb)gN(vJiyiEVe?E3_+mic9!qXJa=oS<?#*d`ws6qFA~^O%
zw3)21-;QXqq0Ea@q#8<ryS!Sm4rCS@ffblyoI47=#&i!QKbegkXa_}IA|W;0*!+%M
z8Scc~h#&>~Q{^CcB<@OOTF2U}XgD)AjpnZe1SBx|<um~ik&h-p+o?g?8yV>V#c`Hc
z3@NW+y>pDB6K4;Ns!-nO3c9=H9j|1Dlap^8tSW`xbY8@i*Km1@i@WtDh=ToXGuVF0
z{&YcY@2|n-b_zGfmcN);_m9fSSo^sn5njcvaY+I5e)|}N<@fA$oSDQcoScavc_My5
zgeSiwgxJjF0mCjho()-WfbPJib}KMOSZC*xJ1)J|ieYq`UbmfubRS-~9pxG2T-_hV
zlE^=@2QIG}s&6tcKc%mXXK%QIsc7=Yv>jM0)iMw%iTX<PziNngpnOr`e*(_rf5q}&
zIl5ReTe+B++b5&o@B+eHX%Y$FB~(9Th|40#+06dwMGF?hN3m~uV25|{<g9&wAR7kz
zgU<?;GKQ;|Tquv`W%V*=6tG~&LO=}T#|BYBwcPp7c6<3o--nbncn=M-*i3%^t(2-o
zn;C_yY}9WsY@;$MbR$D!Jj#)%wa{t8`ob7I&z{Qe=GJG6tD%u2ahs1L5XDyfn73OG
z{P_02*lB%AhPt7_z#<WnK{$NCmMgv%?iZoX;^sZC$M$e-))udf-b7?=3zVuk`eBE2
zf*GI9amH_0nYG2p9+0h8ji&Q-t+F(1J9ud*XG+`rqTr8Q8>@<>{lGg&HvXYI?7MYr
z!;HXhFP<KhW9=c8Qi8s-p1mJ0AH6$$pSPX>*xmPC#eLEon}J~N>NIA+nmb(><BWqp
zSD3(Rc|g7E!V+V-xq?QO5qp`nI86splZ~nBMjxE80bN~Vai4ui!MNIVFUkenD5U%+
z9qelb=TXuk*Ivw2t#*Gp+AC{sQok0c6=&J#BXOwK3)*Py4iRzA_O(oS>^!pY=q%i|
zSZeM}2^sk;596Gm$J!8JWox^bHoxz+;$iy>?jTmD22vQyXTPb!um;s8xmEwumJmLM
z<V-c#n&s(zWXfzK8--yQyGMo{R_)aHQ6=F$#-d#pwB>Q>*3C-W4dHQ+vzTMdcrLln
zxzwkY{HqhK%UWE=m7EEhE@EVR$kSnxV|IOX8K~2&k#kvZIxz+cN$68qmRPJxq@<24
zg;8+iL!GsMN`juk%c~qWGJ~!#s`97_h1kqD+nUz%4N;#WFQS|F=`HSEHtw--4!;{T
z?F{DhKPM~{?he*ma4*(DLgS3&$foFD5TZA4!eeIY6lNKGjS&Z0S}?0ObvF8M-=Akz
z>tEi<m!GE%zKQ{DAL$Ocx~@|0x;tAIOIKt#aLC6ux&}$1F2xMKw|}1chsD20Q$xBP
zu}(*)T}VcuzwbXY4r&cyBF@>owh0Hhr&#QfHAIwma~x#^tQ03U21Z`L+Y-EMKOqRn
zxR!FUE#{Nxk1=d%7TC&`>dekix|--BZTyrFRB0`7WGe>@+8rRVNm;+|rimWWIL$%x
zU(-ORcvc%08on5KO4{Tntu2IC^FEvO#Ti~>&udARAMw4`_4nBEfuvWOq8FDy0)9qg
z$anmpWh?Acw@+o%_d9Yzp;36=fTA>P5V(l5-dJT-@ummQEjUcrc9j7;!5SA_9=pFy
zibASX@j3vO<vj3&03~z;{+HFQ8w2mXGEQwAe%q6J99F#Bn^0(Is-`ne%SmAjQqk`9
zzYYW+xEkpcg7XJTY~&tqYo`D`R7Z#XRAI`hJMifwj&*RC(~rxE$__=1*KiC!Bqh%1
zuqw>x!VBFS(edJyqpnH2z1RrV<8~~I?z*+r8o*e0)_UdmbGvL7+horzq3JEaa@F}z
zD0}F^D*iB0AZ?Pyr+U#!E=fMsp>ueWrtVX0L!?E@CqYHl`p>6FoY38t>g}gA+Iq8z
zP@Sr{<54M(D6ReP@}NLl4L>5i+Q}%LRmE_aa{4-hrxTf_e9ZOViDt{`Bxf#2UHA(-
z7C?$kZ#xQ=`x#;9RdJV@#%k%r=P+GciUp^Rt+>u!-sBD=p9+$Kuft-x5mgqogN^1f
zo!DDw6tkRsjTvv9?RTUy_oL7N$Oo7mzZIcjY;W`=X;Q>MqC7I`0yPD+KYS}c4%jBU
z1kF2$_HCm06)qtP&UnS=+K^E$HvWCf+69n9h>?bi^t(F$NWwoGqd(uvLH`hC;g3=Z
zF+vH%MZHcb{Qi<ZTs|(rmbgbA#wpC-7ID7Zi)R`gp=1y~>fnmVm<!9q(P9`bxI49F
z&yHJLc!NizIj2xxpdqkTU+9ZUsOG*gJA*;yX(jfYr$>g5zQHZFvG|}TUY7yGkq9`*
zw0+_RN3E9jywV{tnO><oTCKTnXU9^Sacrl@QXg?pK#Z35Q66zQ0j#5;bXj%V{cWCU
z|0>iU>)3m8Ia4F?Jly^q2kg;tJ?{-O1=^Fz1fkNDXay?rdTj}_f(+Z-&GJ_Dbo`-;
z1ESx)U<5I4rcJumYw~EKBBWu?{DDguB#rtrZF&^AE?5YtkfE9>9?fC%h3I3NW*^Me
zYaPuq@6|I(g5&wW>{jMjj>W`%17Nl(y2B)lL?hwcVE|b;U;_Cy>dauGF7701%`L+m
z7s+%y%o!7r%gywB$28Lg!HsKt%z&yks-WwIfLFU}O)ZD#Jl~J#`L~582-vZ5is;x-
z$jzs$g{55(QG#C9V)>^C#Gyz?d}4}u<q$VZ(bh4`A*tQt(0W^cjhG<jA32VpwG~K+
zF>%L*h$D`1#7J_)eES+m6qFl!MeCB>N<c<%BcQ(Ye*l9}iv>Y`y~S0(%##lg&ig^^
z=rwdb{&9I2hIqdq!SxweGeqVu-1TyQbM=!9BKkz%^!aI8-_I8j*Q?}`663(Wg;8-O
z%3!@gGn)_)$7Qt<uT-zR7boMFr<4kdn8<>t#43cLLL~5n`oA|W_jv-+2OJD6EIFT;
z6WCJR5=Ie#C-sQwTxJ)B!;saJUPQyTmSe_<4Eh%7qynCJkCADPi7*;R5FQnv!HiZw
z_SA^{x2)>22Aw95-&l^Vx%kL+w#F0q`U^tuN5H~(JdBJfhokyIOIk+~5)xCQEfie<
zGe;>;8}VIP*4$teKCzr~S~|l5N1sy@3-Dax3tgE$blIf2wv3fGaj+XQo?nDHZLHiX
zQ(JBR@A90yAdqu8hu%!Dwk2*%V6VpVi>)PHsrxU1T+0lOh5>j-`_s$$yY3V1f8b)i
z{E24Y89OQ83#c7<{F*&l#(D@{=S~O1_1JH6E_6(HtiwM2t0xnry9{-heJv+Wfp_Y;
z8ugCydg!Sgx|h{$@;r~7A>Gg#&-CnfgdUK%zxdRO7DG0A8U0oE$Pi*P+PJjW1j!us
zO_&Ph)oM2xwsx2{eP+tO+Cu!dqWY^++Ysp+bn!uY%zBow0>gC7J1)q+PBpq+Q^gSh
zYXk@`U}P-IBE4e_rL#y2gv1^M)RbQi(w%|=P446P#F73*+uso0740ooU2(Q6RtXB3
zo-?@q_YH~M5HiV#*c0TA)U=}Agp;Nwm3Q0bDHH8*mqk$XEV93jT!+}}Y4H`>6~&J~
z|M|E`Xe%Xe|3ic2QH6?s#o=)jrKb%EJt=Ze);WQf*Fv(B+#C9t<JT|^5Eg8SflO27
z4i@%9o+k*E-`?+&hXkUmwavBVYz+|U5vEa6Cp2og<0&~!qv;jFvKV3+mw_2Ep%LE-
zSBWxnI~l7Fp`@s!KE*>E-uhRdG?)RMDcMJ0nx-FZbq=2RiHlL2e4Qh@@|z~7=!4Ik
z1+R-!S7-!eygl{>_TOCM{C|EQ)xj9n8ypx|Hx3vW-G7D&R<bb}3Bd4i{IK!M{)Z_X
zxR(jN36#C)<vKJ%6XJRXPEvxHpnYHs+hXKGO&z;UHq&C6!f&grx`dY09d6hQ`RqSC
zWxlsPTQUFkaw+Tx_Kg7T+duxdTUY*L=yUv!G{0I+qoZm&<VJM66`AVOr*`1}sHo5l
zlzIgRaruC#n0FaG9RU@PX7@~VyDta{>Q<da&va(A>-eBcV>|kVrb9_079yZN%E2rD
z_${E*Pnd~V-C1as&P#Y8*w9ZpNU+8fR<MYq)Rc!xonf>jD85RYwsSi^97En4)DXqX
zUv#LFlk6Bjabo83)`6XWcbH7q{hG23=nfpw2?ozqd4cDv0U&Qbkr8YVC6tlo9VTY>
zod%}S&|1%HSjk%%_MYmU!`nNd_iG9NXPx<D3HDxcOz-UoGRCL!rc1hh!12h<{hJwc
zK+$3OYi3ZsF9=@dQx3Clu>Ry8AG2@dR{fI*P`;DGgm_IBzIpDs$t|oC`*`nqCfZzB
zTXL^(d=d5pjOu?eyQvEm!W8@1Q>;6VkT)iB22LWer8PWea8yVohY1%%bT``-^zbdO
zWS*$yN^UgQciEA^8|1(+lF@CUMM~7vf>S;r27~7zxn?X{hLf=rbMbhrM<Abv7l)}Y
zB3vzq2oNQHu+N*tN}_>Ri&^?naHFk-7farm>k|_LT!#ZU&mMivR}17Ucqh0=YQ_P7
z2TYS4E`0n#KC2AkpqAOsa((m*CI=!i1{@MA29~No9TQ^orW6$7!jai!E4ZXTH#&%v
zaQt)<tF5^4U_CO-%zW&%@w&D~NsI3raQQ?elZ?ekMZPXVEMjhEqb5z}6G_RDM+n-<
zV)CN_X}wt|B*KL=3b^$}i8y~5dNf4Eq0(HWdVh6~a2`p%siM>I2z8G{Jq*!j(hJLS
zQiJjsr$yGtzC}a;5KMFPU8`(JWGUArCSrOF>~DJiv_8HyH`b7fDF!WqKZXrz&nnm@
z)0-*!qh@hUrldq!ERkAj5BU3bc~j9?$q)ezUvATjN*1w+l&g*x2WA5A9l0|e(XVVe
zrJ=}pppcm^D)P<(VI}VGimA#29f?1ZK@AIeByolDu+vkv+l2T^x=0x%n+N6;yxnWx
z@e`ftqb-~BSCs~g*1gsPF+WokB#j;Zj<{BiOKHtUoQp;lKW}OBNO1I3ROyunBd!7a
zx`^Z*IztK_DnlyU<7w`Vwo7+hpSgMTk4!^jdj#PvJTlX#Dwc6!z<xg5ztV%fS7hfn
z_!J@~Nrc}{J6|g0c>kiy+4*CwF!-wz^Nmjxw04jLSSGjUhZ$6gVB=|468dow%R%~x
zSbx;TGpR5RFtyJQdw*_p7prKNPMHAZ-mF+0PbQpjXU8RB*hic`Dk*1OjAD&??UGyQ
zux2rlc<EkM`gD+&`U&->M{?TR<F7x)9Lz$g=rX-KFGO4kC(|x=X*V=!P1~qWBRaG0
zSc;0Wsv_~WM-5#OhX{>ml@sO2P9xuv>e2)(sIUXcu&f7}vFJ<_sj#9cqqKplNDH!p
zh?6XBQl`QsCgqOD7q{MPh0&Vvj6{JH+ZuCRJJZzVHP;YJThrDG^!3fcG1D?k9M1DN
z7AjE^f)(^gXCF?d;TV|3OK7hi$hhH|M&S&u0}}xg$V*MiOWpg$mfJfOa(kO1Lw4!N
z*evU$!%vZ}hU_Cni?cWDSZl!2+IQwxEShvNB&$L&9fjFYit5qo3&#RkP*#V!K2<{^
z|6(mQO0%yL3CqtAaw)P=ClWM1<S(o?bcLFc*6RbNov_5KAIT+CFUq6THr|Yj>+Vt7
z^^u6C<Wnm8brA|#>oHpx3v^dUmb?euGvcc47A`*sw_|wU1Xz_O0vCV|@5M~6Djn6+
z3I9ej7ENWNQ&nA^y&uWZJ=5~pKAl&u&fl>7Gx3kW32T{Wx=q!UTE?W3%p|9OXV~iW
zx}0*O;mVBK990#?8Q8~ktIFL}T9&PL#1ZnCd-NTba++#)w*Lv5-qGTZpt<0Y*{{Og
zX5rCaSKq>edv=kQ)4c(jOx`cyoo%k8qT}h*(=59CoLrpncHWB;%_N(ZdM%)|%o^8r
z!Z$lZn_#>C1jX$9NuJI<@X7KNSO>=#Y6~hOcAG-hLY+-L@j3M<U3Xz}Cj1L$Fn>PS
zbQiTdpdL9XQkBKy1;TCS4!+)AIjZ5KK0Vp!>9#_w)=D2L$KnD;i+|@>9l{dXSLLhV
z>_GSb&P-hV+*q1N@;>9{T;z>z|IQ~|e&L5*JFc!5)EF&Qvos(|5M|(Ff-r`BPd}Tv
z_4-YF*!?}_6D#L7rY9yxbOV=<FOaX6Pknw;%w8tVru`9Io+qAp++DM+cxyM&`4TxE
z?|Cf7nZHu%qQD#Ie4TaQT6OyMy#~aR8@P3S_&1n|{byqKnW!ChY%a@c1$usu#DiZj
z{*Je$Up(7BV}++c`XXJK?~P4>Sbn}|?|tb(1?@+`QRou$-dHHMmP)WCj+e6q6N?ti
z!iS!IYB$d9HAlOTWyWVyvEAa=?E&Zh&$$msq|DRCV{QS!5GXJ~nQFw+`{uPjM)EAS
zZ~MoxFz2H%r)TnSV2(fK3ykZtMhVJ&bJ&%82;>`vUmB;PFu!pz!J)1tMEapmT~;s{
zVfY(^6wc5vStGZYGiHbYXQWPHnM}%~6X;Q~(9Ig$qL!$S8p@(?PwoACw-{yb{Xf!p
zr5mL}GAIWCPoH)`1Fai?YnI_DZ(TN`vpIVgh^2kiouX3Nsd~i}ohnlnOYx?iRw`Vb
zONOd7>}&T%3+U8Y*X^}Li`LcX+vE-%5&L&f%W!b1#~W#Z{$1YWEn$x@5EH$_9FBg%
zMgy+8{AL%Hcum9Y!B$sS%9Eo2D^@#*s%8xDS{NR9p109DVtuzHL=aUnA^$l*wH>9o
z9mvQXOz(tr({?*b_=R#CLD(Js#=;{Dq?v)E_D=lbAD^34Nl~8l=MJN3eC{8{F@1b{
z`m{=t!{s3ub{;NN*5s2~RPmy95D?l(I`#<j$?caJJxXDeDhR**ERzf8kvD99ttqB1
zSLOni&#Uu=hbYc>H`yy_Vc2gH=;)x`itr5FCOEe$-jL|Gg(;2u2wP)SPhOmL_ru%_
zH4+SxA3WPgx_-MhRS!PHj~|vXL_f0|*48?~*}d95x4s6^>hlIp!EHPpH&o9w9ku&r
z?O+&CKke$ow$j$fnfSxutFCuk8LEesHP`?ZHsINFDw5UpjG>G##(|LUb$9$hwPKX9
zf0H|0z~^|<HOu_LwQ^f6W(pmd%F~fHpo*PtsO=NxzbzXRt62#ppWABQe$yKQb3VKC
zgwGo@Kn#BI>;9FKR=|VkOA4gYTxi`Dl`GfnuY#G)Alr<gG)90JDJMw~LGC5<oz(!y
zS$%WTg9q=YnV};xhsq40Lhm08kLQ{R<Le|GJ0EWhTfr^5Df;7=oGpv|rzV)kT=EwS
z>*5y+NZxB|CrbL_@LRr{a<gk)UVK0La-Gy`q}J&si|M7*=_e{)!EqFOOW78da!=N5
zPnP6T2t3-tNEtUiLUMd<KEt4Nv|b=)KAmL<iiQ3>g>SLWI_Qjcna=BNNxN<z6VC9h
z27&V1wg`>aO7kP~@m4i12r_yg@-@NWdyH&xJ%8wqXYr_v|Ig==1}#Y^w7;zJvMw$=
zMY1vs<}3<lOR8Pp3EgE$uvBA0`Ib!oi=L<}nEcwNr?mzDfLnS9Bk<6$@c_rEZ)`OD
z5c*#V_kM_Tn#{~70t{T$(IG&JEcotBuG8F9EWOzi`GFD3UaMP@P#E2x%{{mSVA=(@
zg;%5`uaR{r%lxGBW!X7KJZeSe;RYB1v`hB6GN`k0A;#{}5-OIuxdM+2w@)L(MZ4(G
z3-?wW^~kVh4ytK*dC~)PL(!r*tJdF#;(LziEVk5`4wHVo|A^00A_N~0Av{LYbz*F1
zTxm61YVLvfLi}I2d|TA~01Oxy7fLcQ6CLp8iLZtEFOOr9=Dx#un@U1q5$}?!NmWlL
zD})<f<|ZX;QqgvdMFzr+L7^majLnpNQZ=n9C9M^u?XaodgqEGL@sNEUJQTcC7~Ue>
z=nb12Mt9$rEs0?&O6HEI*KybPW#_5uML^)=mO2lz0TnP1b&*e!kztT2qiCdbHU-v0
zf}*&_P(rJVaKsRxctFQmv{6Sc{G?invM#bozW;gO2;SWsVeJPuD%<p0yQEsXxFcQ1
ziJoIl#Jl8Le;h|3yz0%p@^gCoFp2wN^gyKiG!x;)uMzr!ghNuGMjSz=)DsY_j9}$q
zA&nsBh#Lm76zBryHwd>Aq(gh-3b63rd1D$WgCsDG(5!{(^bFFH7ixzr4>*@tA?sv`
zm*THzmt-d1JOVW*k~yMxe_g=o8{~GLichc+`cAjnhT9Lx#l|As&$CXXIbRoB)*W9a
zDHZVDbablEt~945@*Z4<2K^VL2yX1lOFcV^wUvB$ADz*Ylv4vI3}lsS2V5&vSl4-o
zBD}nt*INyZHP{$~Jr<T2<?e5OI4o^ZIvJU=jJ}Cjb5_6mY$!6e{QfBTwRmfe`&4SP
z#2F^1h92fCoS)!*E<M#kuxy|<OCKHes0s$YS>T`+T#6kHtyO0<oLPtXs8{%ds!CvC
zCu1*zOQXU<C?!?qCrcM(9RQ1i>rc;dj{7+1Ji#>H+D&EVw6~j#TdX{xYcK0bjmU+v
zVu>%=#=W1@z$i6$zi(1hUO~(Ojki$jtw`!Xz{Nlo)7!E}tC*~%d&?U~-C!CZuZUUY
zd|}VsWY(M9MN{Okyu_9)<})BP_^tu6z%)_;X`~@2)W4~ygE)MQ0K}C127mOim>72R
ziHgi-_xfYii@Z<-cT1Gd%%m&4w)9J@^U_5s%@N7mq->U;2%FT9Cs|HY)B4=T9I`}K
zb1!e|>cg0@`XhWij{^=oPP6E++N5s0E%rx~t}w#&N)xVL8J(vpc0c%f^o};v!1gqG
zdb<uhqJee}KbUwl0IX-WB&^w`7eC&{i(qfXNihkxQ*+cCvl)+RA2!g*QN&XK5&Pu%
z<<8%>wk&&)uXLDNgTM3u=Cv@4_`n8JX!Q=Azxd!kMi-WUq+=;O#C%7vRB({4I$Qrk
zBnJT}?LdZfm>lA&qnzf?nwQ~!_FO>l9;-K=;qWc{e|(Pw0MPl-r2i^TOnPj_t?4w~
zvcTs;s+ONQq4a<+po%f`dJsc>sr-JX{?r*VDuE4V)vm^(r<wdY-P3<5k!++OQ|j1Y
zH5<-AA7Ij>A@K0D?Cr5r8cSZrT36^BkO^yVw|SbySpk(xnvy_R#c1XA;eH|aOEvYu
z#DCJdCb3f!V6fP#dCe0~&TBWW1Q#WW@lkA`a55{>nRBqutF?44h(g}eZ_9|#LAchJ
z<$ICGAgn&d{cvZV>p#zoQ8{L8%zF`kkNN=6xlT=6n<5)JcgrVxxlXg}mm}ZSq&$yi
za3^HX@m*JcCaiKQnXPP=aoKH7oP0LS%88Y#Fs6k8uau!IqiI9e4325*!LC$}DO9%|
zF3B*}s9OP%@7dAT?0O&Fg`_19YUDRjXg%WB-@=iTp^at6)n|4e`(}P}ci)voWwkCE
zB%c2a2(9w&;kM5)cc*I;Qb+8Nz?*lagr0wIP1o5IkytkBb)O65`P6XOU~uSsV70G=
z892cJ95e>7DvdwB{=z*-EEJMXF1oruH9bWI(`4(<vxUc^yTIo9Q9B;eUtx)FZk;H=
zJ8kRYdhflH*XskvwO8@oX>Sl@!(Th=Lrd-Vc0#%ZF8ay(To8%f-q4H_dAK1-&KA(J
ztVDSt+_>@6BuV_pPb@BN1^MiQ5B)v}3AX=$7rg6{n*>LpU8UoqM`aunT7zyc)CI8#
zS8H0c35j8(Tq(OBOOw`D9Z@AQrDtzVhqe_l7E9Vabun=^HTyvc(F3C^%^j!qPEAK9
z6_dC$g}FKO&Dw(9ws^_WmpUp-OXb6<taXIxi&mg0I6J8v1OW?usWMhg=<Mo}*A5rp
zTeVmOePGMgSheNMVVEG0p6+49P1O5K3r^mw{L?3Oe~4@o+eX=iJaw4-k+Pwzh=wRr
zV(m5ai(ey=fa$1=wOQ2v^XznUQc|vf(;3?HB@|zrnwGUe8SYjaTV5>nV&(y3mGCMN
zOU1-7mXxS&6ZP;EPf}nW6M2qIqVWnCJ344aDKd(QVEGrK<|n_deeor%fReoxF~g4P
z9b!F=7U^vYVo!WUY4nPd_6yVY%forYSLzM<)`;gjqPtC%)M4;=gv1i`Hzfz_2nP+>
zRGUA_|Ij%mqMU^;Z|EBc9O-?XZ<4sIoc0RI)Tpq;eff9j`6r)e_>Y($l-r?z|FF0A
zVMEYDh!>=1lG1(zcO+^ITD^`+|F=!TB89JhoD=%xHiV;N_@gJx92np5imM-5KSduY
zOEk7u+Vr{+lq$IIS<|Y$f}^<pq5mCI@4hfX7}zn_@X~hN8#>JR9tA;LH$Di<=72xT
zq^ffewZg$tf}1Y{KSUf)c6NJ0ZF1Q98I@>9{@M2h{=bL%!Q#oD>AwKJIXxH{$^TQ}
z{){04xjHb$>L-L>U#>?6aWJAJ{VYo6=4hN~7>K0O?2r@)5E_0mhDpKrpg)8Zw$-iL
zH3q913%r+uA{y#wKfqT5@waT#TXn5!yISj_%KE-u{xGE<qa-BUe(ZAn^Yu5%dw&lU
z5ND6=yHll)Pq9p4FD}I;pINtO53q?#n{ze<CeO^+iEc>(4oI23y@P5LQY@3wAGnRO
zz?rdK64UFBO>L;`^bbo(`6Zr}R=l#p%YD6}=a#+F(k1WgnTe-d&CArYI`N3lN*n!R
z(&Nv(4e5^1j~~QsCQCB+;-|a=M=^;ED?l<$W{K%k&ZX1&*9U4P^=K~GQ@X9`VIVXB
znK|{}vc2IbhoRvteK$_+vR7)lB?R`WVse>g)(W^utnh1GxKes18@pjOD3gejU!NNN
z$&fb@zl5b{dt3pJ%Z?!7fR|b0-iMj-uwaywnGx$en)~`7!mmY|&FHAPTYX3+*33|s
zwCAK$!!IWMXwfmjvNxT}r8<0z->(fo@m1u^pW4Gr>peSoC=oKEdFvg;_L>O6S@<j<
zc07bHeJdQz?rDkBl5<V8|4bakw)-?=mN0kB0LWkh==A?hPYIpL9Y3Jq{uRY=i5yL5
zMNKxuMao{dFF=jXWTDy%iVC%$uS%;oP}XVo(>eLXoT5)xuQ$+b^FvirT;T=Gf>qGi
z2NfteG}%#pW=$>k@uS7*NUrPJKpvHaGn=`<kSi!yrr4NkP;9C%VsPLESx$^rEG(Kz
z%2h3sDf-}%;SUW&EcCNeEsah>MY<0xnrhEjkg%v@V~iiM5^87l!h}m^)IJS(F*FS5
z<9yGuczUvAXj}h|AJvv5k3t6^`GD<jk3kK7vm;viZxQydak;u!H$7;v@=TE<QZ1=y
z1UBdpBCljFoIqnqKqUH*cPvIgAM>$Xv}8fdZ&$=*NN^31RJ^Q8DGae<Lz-eO<-`!w
zH2KoBu*_q`<7twh<z+k43!u=VW=7CmF0EzWBjaOm+k(AY7cepH(H8+CW#2eo8*EZ*
zv^66cJ1_KXvtn)7tX77_<b#6---B8tVwuO>G;VFmaKlsXUj@s5>7Y-;gD+sH?C@W~
zy<G}N`-!DBpf^jzjj;EE+YXre^M41Gq4G1;Q>T2&?;crm>Sc2O+LN_zQVE=c8=#cj
z+A_2B=f`W<l*JmtGKm1-!4)j0lagbL9=9>#CY|KA!S$EEo1~ILdm3~%s>lo2&G>og
z8Q`}#YD24WCTwE-K)e-O@pG5OFfhY?y28e1oSa2rM%m)%RXsAYb%QD52B)g2n`oIF
zM5LdwE@)&lD3~Hc#o0_T6g{U87JTMl*a5@JX#DT_BdgWTq$mK?9K;Q}HgcLeRLYOA
z=f~)_v=YZx-y4BC>Nf9jNv(rd=<Lss^fa#Qrz^9fp-gXoSV0OgCu2r)JNPEf%i0c9
zb*x0f=;7k0vZjv!OS@<t$4o@q5%d-X<n1@MYz5wSMRGhsWGmezJ-68c+)+_Y<8H}#
z2qT38T6=9!#Ri~-+B5KsiXcyJsf$_LAS7qrxf~M)-k7n@-(APmk{ZO3#!5ZCWogdI
zz!nS5=QmmtCcQ1YQ6t*(0}T;3t(22H_`Bz?CDrixT&lIwg$T&QH<0jr*f67f@W;;t
z%;s=82AQ{u?G)My^i-3Am{C2FuSZ5hK1+tE5U}#TzbXI`Y-r360@bldY4(G#D#P`n
zsvwjkfqVX8!iZY9ki_L59>*vD`A3P`t)vZ2_|pZn16)}m9_tk&hjbgiApE>9vj=RK
zLne?7lUZ#0QQ3XsCoqxo34gJVTDmp6-E>ShU^>XrO2ZOM$)POKnM(u_v?NE79;(TZ
z$Ss~yD#8I3zcAp37Jq4k9FekNo)bnfSOwE=Nb>RFa)&>S)X^-z+NSW(*s%9X9vKa^
zU6C_7*pSBBxEPKqr)NrU5s?aoH*rfTn_qCG#EdCrvW8aDnL*2!O_3w%>eQ;0WYW#F
z{8U$i(l|BG7EfjIFS9M7D6j!P?;wXsF%+XTQ4j*yYsA6|C~9!Qt6!y!YySxHt0Cq4
z;DpDse_FOG-j1@$HB1Ybx|j1Qp)FsNpK2nlRa7|g{mNVC(rLSRWVl(o5PO#{7iiHc
z2Nt(@1!Utd9{qm{mp`2Q<!)ArmCyJwq7bVL(1q76U5LIHDhd@S;2G6FAb#5AIv!`U
z_v!$GKNsFKcdH&8x-la^_vK^r>H2@Jy&?6YGnBY~KdaMG*Nn-6Ne!IcdgXGue?+wD
zg(GPpUJ0J{1nuzd4Q;virr(N{Oy~z$`}NK8br_r>?N&Z81qf#;<`QEd)h&8+^+d`q
z_<QN_+e3+3(iO4gdMBBV=NqcNQY%C#+;aiq(-}epjh_{kjN~ZK_y?T!(PY$86delB
zS`=t4dr`0WsB3>M>0P`VW`sCe>m69D5`TWmU9Otwo(XhoK|UwU_MPO)mlLN%K>oo|
z7XK`ClnR_hejw*Hkea_O{>+&DAi?~p38hnDIAR8rEaXRqNkYKca{GvSiFROdW;p{&
z<JJ#c`1tZbu1(nAG*sKfl0SPm4O!Gm->csR@$U6z!a_$Ml_s@&l<wQb$+@jt-$*Yw
z2Q2h-od*}Gs8<KtjBJeo66gc*P$`-+k+|1b8fiIkw)F_nbnZWnF_NMILyi(hEQ#p`
zRti|7pBEgJ#HCu5fT+DFH!jv+Rc>H1Ngy}L%fAScK_dzr2gs~CdS^KQ?9e_!=M|bz
zviWS8or^fkKlv-YyJOPKfXA^(;c@v%&{O$v`})HBB_cT|X7w1R-PF#6qUcqSF$XWb
z3PT^{lVQ-5;<>^VPDZ0n&}=ok{1)$*Ec}){3!L^9XfC|fo5qN-tyy)vS^?vA&snp~
z_j{15a*LlmFh-T{3TNqWROWt(MPB{%6Al7bKXSiFw?_S3Y13jz1w=)IKtcD?{Obk!
z*iW?jWI6@!dcWz_0W%8S%XBAD)oA_2C$CTle>b}|9t#Uu-*(2xL4it#T7e4gx+J-M
zWc5g+R1EzA5<T6)i7o{v4-liOc*gar5WBbdmjBr{`*rBq(6&(b?iP@~xAf-!4@|;(
zlvk=;=~Zl*mlvR@`r`Vcu1pYo%9te<3;Z-<iBaisZ!3{1<m4CFEn|-SEr@#KUsc>-
zzO2a$jILdN@;FNE^LzD6fwFT@0m)LXn{mfw83<)rdA0w#j<qrXU%>~&Rbcfki0pT~
z)nkIUF3Ti4g<9l#@b8nEg>lJ`!H7YFs*~<X*$ZmI(<Nv)&Fx@c7oi`_eJ@+1cZS)E
zhVWs>7JkHc#Ik?n?c$Fa&-4UhjvvYN49rxo-LVG@ujP6Y?cY~1wUjCeIbAd5MA{QO
zv{Nm*$!P6F@WNPt!(NNjlwfX_5Tbex4?~#Xzx@S=B>Kom<(6Iq<3hvLvFL4UB+spu
z0Rfa1(e3OwY3eE&4GOb633rfIhP~Ze2$#5YD_a&q^i35Xu+&`jti?AS&Q~@~S*Z%}
zOo^HL=2EArFFW}@Pqe(;TA6LWHPT5)j40LLTeUmPf8%Qay2@Jlg8i$HsrHihu574e
z@x_h(8;2G162!Y|SuWXDq-|q9A~HqE)t&z2?S$<$Ojxj^jB5IYR<;ge0^e@kNF+-8
z7#N^9cCZfzaLY*J{xg{;yHYpsl;K)2W0*13noky_>{SFRj$gcIF0dmQrPI7g2CRSm
ziQ{?n#ZyKAAeBxexzQxQ;k0DpWu+fbiiGlJxT?#r8YJu}(QQhS8<WnEf2Y4viY^#h
z6cwI38#~Bkz6x@5dQm;Jk+u{##MZd{d)7hTlqpy*jTVAMZL}AKyp)m5EY};nJ92_b
zx@aE$t2ELy&F0W#AV0f>mM>5yB-OJHlcQ3ovV?IO(D-BUU#9dm%(fI?>OC)pn>~f}
z|G0Xm;LN%&+B@vHW81cE+qTUoPM+9)qE5%|*d2Ck+qR7kI$yq1=i<Eos$I1&_TAdM
z*4pzo#vIe?JY^`fRjI_+G<LOO>ZR&nTprtQ8YZVGD}H59W}yl;ixf&O)1kX=)s9lg
z@3=OV*bXJ*1M28|_3u3AfX#0+$CITLIm<-T>M)HQ+5s$NYHp4aot&pOb|wB~Zpn#L
z1@6(O9WP^r*QyCXgEH2s<c{VuS9&eMnvoM2^J}Yi*vrHlfDj4KY$EeX{zZt=-O|wm
zzJ#(z(x1>*Y>X?C>U<lRHiQ_jnV?Jf{y`h*B>YRB?1y<2zHc0HWvm?FMbQuDRTwKQ
zr_>MXWSnSOI`Lr@44i1~1eqVW9|Y`TlS+3f5rIag{DjRwoXMWEkT+YfZ=rHILe~6;
zsqMx124_S5z`PDn!~)jKhLE<ZsVmH3%lu5F&5B^x$plOybdUj*UaT#J;<rO}jGR~p
z2U@=4S;_|lm4iZF4_d=-G)7sX8RCDwXEWy0pU}B*q4_%%RMy)Q#24DLxXstPtVM&C
z_YiB!xrF_JOh=tMZ7kL=N_UJ`#i-5Ugd7cPtmC{kB!VZjfJ45<nljZvA#MKntiuU_
z(ek5e^7P>dG^pseXP4@NlDS;(;mX?gy9~Po-CTpj>8@j`EVih2|0{#(hwIDYBKgLE
z)k}^kAIQghTgbAedDcq*EQNUE=Fxurj;FUK&nyz4nJY~_L$RohGR&&=jA|2BsVkL+
z&5TY(k*o%?DCbQ50+cJ%35A~YxQ(DE)GcOVBaN72CVyg~Tv)t`iqbY1spb4A2PjaH
zJ4HHEDf&^Y9ZoF7erI9Q10l>E!!cjqmi}b40B17-U8x6l?$QHhfDc*cdSE0zkjSxU
zTSO7)1+K)})?PPRJ-dmwSv2bze`OheMUHpRiPR@j^!67_alvL7d!aj0Y3&!eskt&_
zrj9iLTw}L_X-g6v_l#gm7G&psm)$|zy`-wq2--mj_p8?nb8!nWYioUOFvnJ$Dh!+C
zop*2|U(>2v{l+g0gXP7P*3aD$P{c=>ZD$FTuae@gXGWmLo@Md{>pLB&s)3?rM>dlh
zNK({=vFViR7=AEuMZQ$5dx5f`k<h@nF1iaT{7y#;z>3{gXv-??FD|Va`%y}(1aEJb
zlbLCxeoj~O3-FfRr~B*ND2o(}cfJi|<*58)lBZ+|A;<;&F;p#*B=-eHJ|Vm|8`c@9
zE22&J{TTdjef}G%%YNS!?}I*{wyR<CUV8|Uma4qeo~W+fL)2YUhlasEGdN35xAbW}
z6!24&IYEC(ws99{Sgts;F}$>hzM5%^ef%`@a4g(@Q|8~E!E%$@@99k?_uolI2kzH}
z`wcdWRM;DPX@ySJ@v30IgZe8An(b+T$mL~VmjrRjL9*0El0*i_REM|X<w;Mo`}tlx
z*++1eedGm~)U0lBuCzwuXn0RxStp$ICE9*Rq7$&w<fF6URF+#EoW3!ng|m5(JM(nq
zf}z{iw%vrCjRYj*`1fxnal_7}$4^RlTKbvnwV_Hn6N@<>X4QV&X^VVrN8*z}-a{2O
zkFNaEP`V47c9hvK!NnGV@uFC=IY&d6ew*5BhL%u+($$)EK;N(;`aOLi-S=shB`>{k
z;RzzItTac-Fr0>R*HZUU3(qdpFu_#VueAY>Dl<{18ZbxK!^c?GlA{$nSYThqdHF!7
zJHbmBdbz`hZ3RGGEdR%*m&^j}T;#yGWJLL_Mp<=~G5u{moWns_Uw|=dDm3sr=1PiS
zEkOprTsZN;^9e@MyzdVa@(LN$g1+mAy|5a6^G*`z*`NDFH`vl6qunc;SF|l!Xib*<
zk^2wKVUi;&H&WI&$QHLt1Q-@0e~R&n{(+0vhU51s1{~bLw0kIIyA1%+HeVNY(>5bZ
z1^LSU@Mb!B^BWtWAK5>JFj7|Ae(4r3%HZ^sECSj*(9MG5g|;z`&Yu2^I<kLQ8^!CY
zIfT5xf3PC^$-OTxU@I|&%Wr$x<zdB-s~OG<xYWo4u(xHe6RfLkWfzSE;CQ~k4!qG+
zdFP=Gso;x+Amx0U(H{e<hg%?%c7Df(Z#X~_4hB%KV8`YemUlX^wMPsl_!Pw^l_fB#
zaOraR;>9(DW~b~Y@e;0c@eV-N1MIkEJ%fDUQ-F9;dBL%Q2!<EZBmUocPjR!pA;Cto
z2RT7_e#CBpqeJd^q_`9CuqSVoJYzsMs{3XtUegQ0LVk?iVj=-&P9TXspo1(%w<*xt
zUS&zJt=pSG3ZrxJEzsPu5jN?Fs68Y-QFiAJzjeFABjDU6?@*!qE-^y51-4~PTh)qN
zhV@{YJ!W)i^!=57#Jp}0Vxa$SXi)>M_cG+Qc-b!>hHx-}h&b<jo}6GnW#oraqK2sq
zi+-jDKWCl4UH%06Q9fbUzoH=(XQ1X72fG-B-xw9`p8_OKe}kPm_V~isz8i}8!n6k<
z*9nOze4-=?iG18AqusHMm<!}ceM+?gb{BMBGyfqdB1<^Eg$Y4RjnGjZ$e%V!V0EMl
zX%8_0QoE)Rq~AmS!7xccf3r276^Z||aMA-#H+xdalqCn$%L*8WFXepAO4{uBlYddg
zWV4>O7Lo{Q_X`2f{gDq2W3)<DT=$MBa|CbMOliWSkAzyT_N>n=)u6dCdwC|P&`i_C
zab@jM2+@ta544!`c;Ww#bxoOcb6Vy016lJrBWW@?l@-E94h@|LAsneP84?ZTFQkRZ
z^*!^9#j^sa;F@vAc;G7W_V!(c$qQX@rk}}^I;y6JHn~YlB}(Axl*w@ueo#g-WP1xD
zdWFK~LY78+-$7HY_>LyXug$p6ReoliDPv$~A|K!vii8&lxXRnDd%O9Lyi<f0DUTjJ
zRvl9}QFbYEpyYbk(gu+oEI@-!aNI&32I>z*H!}jlpUUt&h)lG~@U&QmS!6inVo)HH
ztV+hgxV6OMAS0`y3K{OT32+qgHL?}`wE`IBlq%JynF<JiSa{ekLSZ2j_COy3AyZmy
zqzJvs|GX%%=a{2Ek^f5`Z@T%OoWD$|9AAM-#Q$&8h$S-!_ze~$FoFmS2iZH%nP3cm
zB4=ninaAyltWderVH<LH#<H?f$jjWM)R{DRO^<<U8k?#x;*AHD3#6>~5QKw>$GmgZ
za1%J?=jV^zrarxxPOpW9f#5dzxYCHf&00g&Sv6GRiz3=Nyo%fCCtDyidlNzoBThzF
zP?#Y3O?14ibRyoeN!5V7<xeN`4R0Z&o2(4Cb^<&YQ$oTVrxtDI_8S+j!%2RhEPF(_
z<Pm1Wo*tTB-rE>wFp<cSeX9H|H3(&+C|r&?q}rzh_s<5LZ6%e4%d8Atw83K{aZ(1)
zu<qXxf7OgPdoll=p=OeCt(>l7uUzKaQ_{|k3onVb0vzpyA2R~QEy>nS!bpiRhG$?G
z9DYM;7LjN0H~e%Y^ZtcNS1saPI=gNb<#kzK6fG!@m6rKnr$0oIEJhv;l>&c7=}L@@
zA)v5_>L!bEqmxBFCqSuWvW%NP^-_zR7%l}@V~~n=Xpn54d3zm5&}Jrr{gheg29iV6
z4-hAJwPguGE>8kpKo4_F7Hs^$3iVy}Kf>^0zW!&R5V&^cu1zz)jRMJ;wPm@g^r~Li
zq-2`xkmczII}15rFWh4{cnup+U<fO3fsIP#hlyI1B1eSleCz|#!@AK@OB;&DJn)|k
zFlIM=i<qGv=q57|mXv^xv<{0^Q7L?UjdSs(%Ps|JqD=t(R27c&dpPrE?%{sGk+PCX
zY%dArnWskA%aZD|$4#Ur7ZAu<$2AS>+~ZO$5*9dn_Q}Xf*<NBG+^52;RupSJ(=^Mj
zq^3O5x-};tF-J1g%+tLmX5Wq+?wrMxsT{S@xq8tQqpECDIlUWirgN|V1pcQx2w4;?
z%vKnz0UQiW3la>B=l}5WJVhi>`UnoFT^<qGy4d=tbxEm5yr;EE7N8EL3Prji7K<!|
zK{bj(ZRpi+QS?%afhb1&4*rkk^apF|5PWZB4)5=4w#Y8vO8|@sI`J?|NI01QL)J+(
z@7CX!og#%B{0dNBIhSeS8rm_Lmacz3THB)YCB5R!o%*8gUj>~St9D%OW*Z8&KQo2E
z&2+whRCn{6O47NDXuoie9V;~s`NKBHZf-?qdmSD#cdjgvWHYNOG>8Dxc50s}h!kOq
zRZJ=71!<#ilFK-h3aeW}>&q2OlbY#hA^jX_zRai$ljOz`disA8!?v-wEdM!=)|6@J
z2DEpOP2XxM4vjunRi59m!of&zAu@>oQTM?i7@%?bZNP|&gwo-DGCz+vRi#N3Prle!
zQ=an{sIXQtAe;B2ec}>*vO|XrK}r{}LZ!+L6<*#@-NsDAO$GJ^k3V}n{DO&b+Lf>u
z#3+0u+OV(T&uk*Fl44blRqejPgOf9$Wyd#X9VB+JXd=MJ1r%|HuKv-Q;Jy`<K-<iB
zdCb^olyrm(9S#;EHNDcUd&BVmi@4I;DY#vyf3qIVfBl#80p`D3k6L~UH1?M}!SpMu
zh3fylR7{|)IQ}xGAY_VE6u3F=MG$Ekt6~^bxhMW_&S?FX6*-hv2U<@ww)}b={kYWG
zk%%kX^WwJ@Cfl_p#b*y{N3ynp`0i(J0Kb=2Qcx7tUzY35=c7M<Q-)hPe~*D%-snBL
z8}TkW&b_#qs0PFFuqB;{_-s0K@C}BkgY$G3uw+1;jGPo1B^=8i&Qke%=?>0gbtQY~
zs097g<S(h6{GrN`w?ANoVy7i<5QUiMur>TukJeGM2O8M~%J$^x{tygllSS=Tn))lI
zb~E*J56o~&zG~rYr~m!S@&|p$i~NP?5AzOl*lj3_Q7VYJ{G}j<n3jjnP-p%gWHnkp
zx!3?S$6|oiTWdh{Bdg7jlalR?j&(N&&8ySL-mAOQXIQbT)88YwpZ<u2FPvX~{OL<q
ztKYUDfTYu=3hjsvU3qYl-dKD*9ue|1?%tTFpvbVG)O_q9_>&t;J|f^(9VuQeZex<~
z$^<?Ks_#sb!f{B*(aTOsNRI@md^7ocspSMPm0JtRPt<r4KZN-p!(%<Qxf|DINwMK7
zk7=bX6(+6S@_ew+w2bL|>J_JJEx%MTzv%X3Cd8A%n&)l59?jX}oYlGX_wt0n>XM|F
z$Bm;Z%odtU^y-=sJv?5PEo?bSXGKOFt|0{O)La#H%UU?ZW?fer9dqkl3B8qSufsdA
zdesj*kZYt<ujM}DVUCY-Xa;m;A2fI4vL2yIcgkx%H-SqjEt*%R!L~Hka_UgR=4Y%f
z+}eI91K=_w)Xtw7t`XEK<64d@B+gSA4JYaAEUMicIg$LW;+>pnzrI4V!BNUZ*iYA%
zjI86-gYiv9mOU<z)!X#qIj0_xx|s)<Aw&U>wkyeRTzPKjh{xQ3rqNkUBG$1#@$)C>
zU%$CVH#)d1JMt9v*i#ni&#KRWG)^*Vj<`KhB;qe8f$$PbaGs4fgtDE^7Y*kq_33)n
zTe?y2tTIK?HF^kT7#g<{vR}aqq~a4EX2wZPjW8aw!|0y7u}=;R&A`kKcm@EOxr|hA
z^^w>!4-Kakg!1>i@B$NsS)}m(MG4!!u(x1(v=4CEFmXB^&83?kge_JUvcz=57Io9{
zERlS|`<`{UTaL4G#|bj~QNthlb6H_#ukej?TImfopx?t=NjP*%CDL{##6-|t*}VMp
zHo$C62z6BL$6qo1_YpXJu44s^#UIUTiRrd~iKH;WaBd)@ygxRts>#%iNvp=!+Qk|j
z*kTGBsN!eu@ZHpLe{!6B3lIF{?;I2$AQsRm8vfqY?fUzIZy(A2Bfnv$1PEbSpC7S3
zd-z<bp!Y+4<#G2Rcxt0(CdDg$WkMj~U*A5<Ql0hn^=CZFQy^SZSAi<f<?fS%qE@|l
z6L}l2Et_}aUYuV~$2Vko0peEF*1o`vwUVC$JI<I8TdJTc5i6#wE2qZ0-P8&#zTGdt
z+H{j?BZcdPZ*5FjaMU_}a@F3f0o?0#TaB*v>S=EO*2CQ3^gR$0M>*rs|1?Oj)<GJk
z_M&#9I>p?<TeQ;wJChD*eU3sV&oc-tX?$n4m*OVs;iY*Y(N>Id|0obVha!Fw9W%YE
zXLR$As(g0W;(<Zeq^WJMz~+(Sfee7%G4c;fIilSy!r5o|HWUDftgh}sZbp*qPpAl>
zzbuCSX96wL2>nr0vY*@HEK5;9NkPSOy8h0btTFW)eH1>c64nBUCawu(jn+R(Cw2_U
zuaa@7*&35hD3M-ib0}At&$u>Kz~564LaynNjeK=Rv{{C~S#~Zb{wQ8RNT9Fe0n;I_
z>EX1zaVi>Ro?U~u2TSe?A)7+fM-^eX%;ZySU$Z%c(ciDP+kGN=R2W_6q;^iw?*@S-
zEOLyK1s8FL8bJb-;dk^-Rg21c=lR=9<A%8-kVMjd1m9l4Bc%R3KrVcdye*W}!>+KQ
zo1x#=sJhR!bEjfpJEm9|;g{sv#yQG8A`J{bJ~)th7$DpLk(xYDpv?Muy14O*NOfsG
z01!1?u05?_>JLw7ttvii?Ehk@|07zf9CnJ^=g~WLhXDaMl@I0zumXwmKS>|<*o36s
zwT7&}-wXI<-9ca(I!oDINY@=S0OQ<X$0}kH)y><6Uip;eP61R!W%M}S<<FE*p!LzC
zE%>dD%Pp*341l0ts_suJxro_3K-)lPBWIJ6f$OY>ox$L~#GUJBIM+Y-QReW(H$>%_
zNur_CKNG;DVyhi7;@-%X$X5tuO&1{H2an*l0K_@rcp}f4GMbNa>&mjBd>DG~7#vX#
zQ7?Mg{X;aSNu~@enolW>!HSvP>saMupRD8_MXI7(_;1D%JhymREuh)3j<ci=RK+cD
zb*@gv)%$TezCJfMd-`TS+AXhVu-jp{S14J5Q4PN8x~K=i-+m2J{%BH+st0phgU`zw
zWRt9iYNhW^4GOCf|NiF~y?i60-hl!Gs{_?*@B`JgG5&GM@{kfph%D%6#Ax*~)?-&v
z%IIU-(Ll-3M0Kr*^H53m^PY}Ii#R_8)+*;rtwjC-Tqu;WKT&?SEEV!B6&~el-WG}`
zg`4I3QT4TdZ5#PrI#+k4bbo&AD}yQT>Va)$s@%ANA!WjvpsB;}fxi^H@qt0JyWPfQ
zPXg&=XfoAr?7$c^Z_JGn5Y)0kW~^YC$CU5QR-FmlS+`V7GPmgh7PH8VL6j6FI_Y8=
zGqIC0q}4qtF0%Q8^_iLYKigT@`31#Uxrq3s4-Y6WW3WbTtmsl)9QqX`q4kvXt)^xb
ztc}JG0Kr43{T$h<;L7FBMm>IOdZjIZIUviUcc7*0@8hPDIHnw3Sw{BS)d+)(R3mD~
z1E_D*jQp6gt7~pjiB)TQT$Ss|1HMzU+Exy+2*We()|?=#pQIke9%V~(E-V^|%XMV?
zQc{Uem>E99BNC-e49|a&K+7}Dn87BPTvk^1O0yD~CMG$Seh$74jK8c2``K*o4S-9_
zr!tM|e=#>bDtNPu+KZ_P3-RLmAv)-$5_#LJdD9UCrCSIZ1+rq!>Y%gaqX1HjUyCe7
zqVIaXiFw4xRXC?I`0V>6bUa)^nBbs%=Q&xf;NLf!lF`=xShUj+f+(N9SYa|)t)iY!
zYg()@Il3-jbFmBOa}Wv%NAFDi2>enPkZEG;HY)a5a#3v7`Hrj7<?k6HD*7N!H#8HO
zf(4Pkaw~5gF}d962u?eSlnh}n*5UoRocV@gj7&Gw{VLUc$Q!HHAtHwy)*Cvs=i66v
z>YFUr+JC342PD^LYa|b2(rRf|nHqk3NQm*e%?)|h^be{$FdU2=sd#}U1~&S-S%&n%
z3#s1H3aQ`n{!zK5{G)cu`N#B1!$0;K>XrCo6Yip_+G9yVQwn-P4(}Rtc$F!?zGU|c
z-2sU0KrVI4TNj^g4R3ER-GU{X+_S}~e%O%)Ys_YTXrY|K%^FPz@5ub?k7I?JP$B2b
zoO>Y7*0qi#CIWpEp^OAD2M9}bKC?HpJ#v*YL+JA{HY}#u6l0IQ&pmc<Srekoflpa|
zxc7=TYcx+-QN+MqmD9|6w^%>AuH@9~GUpKa=xvdO$KL)U1<Z<ZXgP13`B3hSU%b9O
z%v+7^h5S?8gO?4Nox!E>`+G9Mjw``|Gf7YTZfE2^X$>CAf%b@}D9|S?3s$;!b{UAU
z=Y>5dzj{I!3aeTn3HCZOT@MF|LlN_H(D()o?!6^CVo?7^;R$=^1NBev&#xeqS)OJ%
z%jDdT+uj0*tQVw>Aij$<Q2z51lE*N20h3c<_zB@<HS|SsYzxF%q*KBElL>eS*9<KR
z@mh~l@HtQaC{eJfGjK+~XY1?9Ta9^Lr*~CQjj8d>@T&3&0qm>6e4rk;OHXJx{xjD%
zr#^8ZUsS6dQv$#+NrE}fWM@LBKLKIt+wL%UQ_3(G8x93f(4smc4}1>o$UD2ybPkP@
z6#>WWH{w1WZkJT8@Q&<zi1iJ9LL0@@oIWyNH2nQLO?wnSaBP+Hg1jN}Va+@JGcnf+
z5s#|%9;doEeQlrM;{})chCm&4;8}ok3?nWzMZGEKz+vGd@vu9V3wnBcpVSDN*`;Df
z61t28Bl{2JCoQyf`&FTA?}{)^x481Y)1Gl*WaAaX6Y+oRh%0$~nB*^n@%Jk~0+g!D
z541iL%>x6Mtd41lbWwxOll3l-`DIovvWM>$-bg^J?dG*Opj;9iAI<y@7D%&yu?cb6
zuISIs&d>h2x;@q0{rUb5ogX4?YtZKpk0377FSASZ9J`^>+BQ82>6D(LqqIjF>S^Qm
z$DW(-&!#7il-=+V^}Gwi_R8v(|5(yxHL&(a?qCwKpI+%a$C-wEmfJS}ys#P0x#D8t
z#Mqo$mwR8*yIEcY$Q$E{Dt9&EvX(_c{?IUD#rG}g>_^t6jx#?s(s+O~mtODYC1hi>
zeLI(Mti^<IgJ6VP^(9w)sXb8(!+xWEZmwQUJ@)Hk%l)jArva!D#i`WxFMa^?G%$Va
zZk;`MBbEN~*<~q&gU)~LWVQ7lC#Hbrz0T>j(c+1V_FWtcKk4HWgMS~sjvVN$fAv_#
zuPd?+?K?K6Yx!^ftKi4JqmDccM(^NmseYOvn_A}I+T3=FA344Nzt6>`pA`|P7B~^p
ze^5Ttyzv@FY)0JGccl93A_$zbKY-J<a@vLru9dD1gfBE9pQJ%hWd3B5sDXYvjeW;q
z(+I|}?<_dS)ci_if@AD=^RLJ(g2bm}702d=1ED;q1EbEt?`*5C1EUFKQmR>Ox(aF>
z;c#PiyCh=@$=0nQm3wHR0=0vW*D?Wu#OWv@2(Ir20`c}@ono7)Th-HmWMI39EX*pI
zt<yL3p?)UTU}?P@t%&p10<h>Y5_Y*HvUu$v3Ckol+Xrxx_x_t$XIjxcwvkS>gBCmr
zrcj2IQZ_IOdJ(Hs5^=VX6tsf`JPVm`J_=dXkRomn7FuvANus&*qH=agVTcWKS<T=i
zKHzFvArzKL6=)LLp<j1Jin&fAFf|ks_u!)|<NtoDIy2{z%y3{}d>9}n0~X+4;QSHp
zCtW?cbQIWka5OP{F)(v}C>oWTxnvZn76PMe5%l(wm}&}$VK+-$nGPp<{`UHx)%vzx
zo-iHwTrxV1={a?P=YZ|!Tk40#OCJi-aVeIk(Cu@dt!sDT+V_p_yg;lTtateVd&y3w
zFlh>n-AA%564I!7G^oyG<t-q^-Xv+K<bXb9Cz5l9N-R4X)=pEDmyAx>eDlCxB_g83
zT|@udO#y+Sg+@|=se5$)J0hbl?y%?E_dp^cls*`rz?4zqy~RlJ7uady!(9Vd;{Ct-
z0{&tH)Z#A~^f$IvpK)RQHyD*X{gwBfuMV(z=8w!Q{gSAS0@JL2<D!7_Xf6Bq3W0ik
z0)Kk)r)9jcGAR8~jp294A@H8P%D%z0^GAH^czctI{N^hK`hwy$!M&#7ySYVUt|fw%
z2UKh7r3Hsno(MWCzmDNcQ`nJdR}1O#e<9|Z8&`~nswgR3;R~FQ*3gibe!s%sY;b(D
zu`Ac^xl6t}u(7KH=2rsIX2pL6f$k!5wUN}-5g^i6E3g$A*K<9lWk1@{mcbe2Uzb<2
zv$m%E_R3|?+gu&RdLoE6Gi~x%QWdlug-vOE+Lr@Ya`_o^3kx!{a*O02_uEC?5-M!n
zyRBx*@#i60q{e%lBUS)virA-k!O(n<h_)@|(&N7Z27j?G;%ESebe3HbbF~^GF~s+~
z+($h5-A2obBOx=ZSUgO}H0FkV(>mR2trFAcC%Pb(v~5nW+mRxnU_GjPL0@e{^LAUe
zB0bp)Be&JR%?b^JHGEQcF)BL?jxfbHYcXj?hhh+UENmdKq`6o6+$vUuIA$h$X-_1{
z4dK^0;Vp%H`WAs@BzyE0^#yde2%5xf4Ib2$^goKJ<;C<8?({TE4H`#aHrxDXn-bxk
zD#`v(?ZHc$i*a`0rTBWNrNcn%&3;nbN-Vm;>bg_-9=z(^i=Q2>javoS61F>~1j_x<
zHtoRZ*Fd6o03XaGu|E&6NJ7g(qRszn1p&=Kc;DMCn)U*$5Cd;m{eGryaS!2^hmJ^>
z2ADlhTi+?Gy}-Ef$m^rw_rKbtQ<Eapj#;&jcQ|GwjeijfM|}K8wipm$XCWbS!y_Kk
zD(55FR*i2}t3`uiKWap4N!ehSB~K4;K^}`TbJr~&U3Ifm6J!J3-R0=sf-k?RJVf$G
zsqiBv$95aIV=6P`{zCP5n=%PGnEgxfm(wpe86G}Kxt(NJHL8X{N7Dd`qIs^epQw)%
zn$uErKhd;4ak!c8Kyl8y>kK#i3kgp3K^C2`%;~OR%&D#@n`}e6n;E7WLteLnDWF>o
z`$#pFF9V2hk}DeW*bAvV-M$RnQE?nG>u}<al^sf8DHW#gPqjf>T;Y0FqLf>8D-iL_
z9W8vAo%{=~I?za}E*RJwX3SQwRR&B!=YKTgGUtuy&^QQ7R7MIIyE~P7TBx-scQ~)b
zec^toj@!OHd&Vg-N~5(e(be+S8=_S(9>*?o)`RlZ=;A#%1u`5XvwcwnRr1tZYo!<l
zDM{eF<dE?#H!3jW7WrMh=Z}z}*`fbIn3a-L!moMH8w4ND>UeuQs=`Bm#rAZnRBZaL
zn37WWQn$JNJm0)0gQM|YS#e?0ZU@S(K;*u?v3AV5q31(-dx8a_$|8X!oxl2ZEgE~A
z4>L-%rNH$YE<OI?4}O(U<9Tx3Sok#O$rPZ?U%z34M@(ikYZ6S41#OLh-o!Sv5cfx4
zqc;yp=vsYr3A&9WirH#ZM(0=%{8qeTeJ^25SM+8ldPj0gr;0qwuZQBX#9pyLwG(+V
z>$S<5k06?WP0rQ}T7K?%kKjHW4#1uL=<F3Wes`WhvW4ZsGk!2{$Z6FS7w6^+G$jy!
ze!y8Tk5_AL<1Dfd!1V%<>Bi1@pvz1LRR7t=#*8rI{P5Bd`AoK(jp}Os>B*dLh{-h@
zm}lLc{Y04iA-Cq``}BJ@u-kfD?2TzUkg;#0#g_1B%5idG+}22@!EZ)BJD}-Y0;xJ^
z$OpFnz8o(hyz&?&Q`*J*JEuE}H3P6U5YKT4ATvj^o^gYQ(2fPkv;!p(n;tbu_Q0bx
zQRK<P0G-<#vU{d;hIYWq&^gg(cF0!2hzsC=WbKP8!gVClg&U4b9i-=&mvAm))M$-l
zf;zFF;)>*hFp}trWj2##a7EqKc_%yDFP_xRj;3ZZwY`8)J(^*OwOnHB%m$X}R%MFs
zGh|&frakF40$Rp|IwplWas)7b4BEZb4GI~Uv$m{R+g~;UmR4WgZO$4u>UurJvo~kB
zB3BOYi-Ayyd#n<KFdinX@jpkhI3JYV*wg2_Po-WfaeKL9PCW}ZWL>v|{p!%wSHdIf
ze_mZvh6(b-cHCeL3fs1^hydR#dBXbB<*iSKSWK!{l0%yJ5Pvlov?FSMk|x=ql9MGw
zwPJ@vWz5lbKXJI(AoW!hwxwlbUy~+M)wpe`Oc{uLFsz+ed_}=AtXc1sBt=w@c+3eO
zeC#MkW2NLZQL?2MX`}q!7osV~wnq=S5zv!}BUS7G%dv{m2XMA6^8rIKLtMP)8MutY
zF%X=y`qTUGTg_MWoO1eG#wN}vF<(`b;Zxb{n~Op~x{pLZ(115QY<VPP`VDqO>ye|7
zUQa{ljVq$vImaZAw;NL6)rEHD;*hLdNzq6(?^G4UN~?PCvV^jTpowo;KUvLA(dr-c
z4=s3Wd3YB5XraHz4-iQmGBWxrQ+=O>u-a8qNJ{wC*Tv2iVbZ~LL}}PCt=T_s7=d&c
z0ir~6s%`sf1NrV_Y#cpzT=cmip>w~M0T<)oh1%h?!wY(CFFuvfZ>mGaQzaoeuTe)V
z1lP4PV0?0!<*IA~y-E|jG>y{~!!`R#uJ{SgO{WJSl6vyc1w6#58y;OzVPJwPx1o0&
z@nd5>kVD)BuLQBpg?^s{7prJVMhlcFrH)!Azdbu_s%T&#c4NsaHk_%T9y6oMo$P>!
z52i1-MVz3hA<4|t1z<JT^H4s<smL8*^+6QKSR9h|A*0{1^%(?ftFd*(oRkR!IsgE+
z|NrH&yGSp5g7sD(?X;!H<(48_9!O-0iVR~PeV%$gNdeIPv*^It*b$<{j{n`|!`S{3
zGtg&Xf7ePo!%7+(ytd`V_}&;~ZkY|WxFK8vg0zwWp0AO$GzW?crzWb=DVL(4&Dn5}
zR-?`h44djMJDOx5iWdR<whNg#W(SCO64|y0lT^~19!!t7c>S*1+>f?4g@M3--&CYl
zMIiY3Jdq^o%teOpd;CznbqRS1eF&i=ycZu0bj_oz+{+NxlDF$|weV}KiIM#r^_#pq
z<Yg*=yZW7eW8wH0)cI7x9gq=b{n$#QsGal8@><J`i|dfIt(1xHMu~noK^G&>Q;wvL
zs-`Qg6OYZGdA0uNg?5#izfgZV#iK^_JM72h-K%BzDV-9ALsg~WUK9sd={KYxh!=+=
zL^f417UtWhJglYn3NnnuKeyqmgqYeJ^-S~vw<~dCj6BB95SLQ>9tlbq<?wLhmW>%Y
zm<_k_PgcxZ7d;3Q#|!f5`E|15%iUtG#G3&)TB-=*+EH+TUYl2O(^cn<{KOxXuPww2
ztfo6$;;-%JY^no)qS3x9Z1l@V^dV7&k@D6?oBF}2?y|9~0(KGoTByqu3nFG<1KkLL
zi%FXokL)P^wyd1&h_zVX9i4I|EIqBtPo}mb<id;6vjQ2#f#Faxupj(n7Qc9#vYIME
zmKNrJ5$cE!BwQnxS|QYR3Kj`qOfY2|yqHO88{+tWOZk9rayQ_uP8vt~cZxjl7!!z&
zV<V6cJV`|X^R#qG5ys?Aa-Q%j)B>|r_<vz|pFc#<UJD7L#whK96RA15BsA@<WM`Wb
zeA?iBX71%B)uP^EOs76@2%0m8GFtxr{EyBk3Kkps=xX<c(r^&K!1zIkR(K%saSC9y
z)}}VTCd%ig1t{DSfdUPs05fSJtXRTP-oAjQWML=*SrOWn-m_7+Pi!T=10V5K_~nZC
z&vWx1iCY4}fG6R(qNTQ<NmLHSw8IAnffG52+Y=i<er|vMJ>&+v-qnW_Z>2O-?IUrz
zH<j%p^rzTmn)82SHQodz^)`fIRy_etkn$dO)GhwHbR*=+-k5eF;0xmP9Q!wpM#7L0
zx&4(U`-4(Hh>|^zwE4sOW_a%$v9IvQGR`YodqH*TvwIf6coZ`lZ7Q=u%|M$W=lWct
zcXie=!X9^?t{6T&h1rg_xx5U^t;L+SqS5LH<)oX(q!GvSGbZ`;B2(57I4UR5KAlu!
zCgI0-ZTSQzJVeNPZ!2wH6*b90n&O6p5`1Vg!l$~eB?3uiJD-SIF6$P%Q$YM?g{{MR
zc!Ok8Q9a1yXMQzpx?-z0NeHFaB+IQ^;2zg`snUK8DY=tsb$HNjI!t^e+cpKKK7!Qh
zZ0s+~5)ORf`m%{M1vv<L^^_-IQ$L_YXDOYIQohj<TdmcQBjA-nvRzg)3$2ic%1f$>
z*ZlYGP;7!I9cRM?^OUSdXf^h6ork|qO-sX+kEt*1eesRKlIntBipyivOUhW73WKIb
zb%g$a`IwIuGfvF@(R+t>f?K4?p0&rW({PZ%=;B6ADPN;2b2RCvaq}{;X76Y!EQ36~
z!D>~lnV)akps?{Z_o&^XGr=_CAIR6TGny559|v7j!I_*|EG;>b$~+{`p@_sRGVg@U
z)AFK##>_YZ9OTAS6jp1Yv%~#aiU?!*ZG@+1nT?L;pr6}ATkky$br{32lN~_s_J&EO
zXn9=CSQ|q%3tg$QwTuWXb4|n@GFtK}e;gw6RmZw6hRZ2@Z$<wKB@aN1-4nn)mvLp5
zZEo8BvGNHut4@LFo^$dv!pUH85eHg>>tb=TF5w9?p9JL1IvPcGRbxajbtOOcVg(;5
z$rtF&(j~mT3gtg9xNui9n-ncbZjRWeEjmWX@Yl}2Q__H59y5X3?fp)3jv0STr~(K8
ze49^{2?J}h;jXXxtWf_@d%YLuU%p+cai}|zu{@%$BsSfch7IM*$C+SsIvIY;9)=b{
z@wRt4zI_$wwchhV00BxU_nzkcSy5jw|0sTHVE(%(6#*qxlhtKck+o(QSL;YF4<S^V
z!g3^_%&5NRN~Z!D+@Q=k9XX+{=;VZ@`~wz(%_t_l?@5@PK6rJJ=Q`7NJS$IX#Q4OJ
z`^QSiM-aEoqp^;0a(lhRaj^QnG>1tjvS4Bqxw)24SW;oGT$3=*e=_+oH+3j*u!)u4
z)qxN1#|P>SB(3GlDl($8QEC*WwD1|U-x0!`K}mvS1{=UoA2E)2r~ptHQw)8pgdaHR
zMiEBm{_F3>8)t;;xow4`8Yc8wWNmz(omAXH1NVFK_wb~sb09h8UceJf#J}Pqd?t<v
z-HEn>uGMZ4mLuE2e)sS=SNAy$vcF#~d=k02DW1Q+pM@(K8=k|w%;aGIgZ>XR_zo6O
zJ>?_)<$jR=f?TYi<ZMDv?Kn2b#St60p#@I{-?!73el>5KDP@H=I#FJGSh3Rwb5k%t
z!Km2;Yvl^^bG!CZ9(fx+#}8uXkf$*j4|Bu@U?V{sXCvf3!Jb9_6AUOel8`)kR3DUF
z5yV5oU^>i1)d*l(al}f@#G6qqPRnA3#6$YEN0k>F?$L)Hf^J+fgMdjWJ%IouyD}W(
zDK&E-!KRxqqnfKc4iYRjh+zuGZ=@(FDEa3mI%BkV`I9Y^=C8$(e*a*QRW#LNh89Zd
zE1Noa$I+1UIkS1$*O`l&0EZbeC2S;F_s03jgif2dx`)Pi@W`B*2FZ%<;Q?5h_ffi5
z>R^ZVseh*DORrj6NaNR8EE|%jk~_Cg-^-5!OtMssWdn+=4<4^t_=nXG0{fmk=Kq8f
zPK;r(cztItqvNU?R9rWFgZj_Xf;DdMy@E!aWPt))B_xunurw6j+ok6Xl$#@->aXhp
zFOcu5dtBjY3h;(Ho=1~^o+EzbZPz-3J@a_Y09@o;QWO|lxxxaOvm2oA)l0)Z&04MY
zQ(-7C00M{6aGi7#Cjw09|7<NvkG@aAI#Gn1Q7vb?Xj2Q&m?qDvMVsIZxbCdVdtZhB
zzyki6aY%6!mM!@lddOCmT6Gv&ph&elo~rRmT6<~t#3NS2a5UD8qLeErfV|F`!5{dj
zxUKV)Q%ye)6CPbSGfq8_I;V6A=rBWN`pxhB2d({+5te&B8d>jvy=KBn-4UW7c+s{6
zR<X&U#kw(laNWgWp(jw))t-(}pSQ;pwU#)UoB;cJ^nbuAWF^uE;uloS{tg0f!UXNa
zB7l@#z5`{w=Cv^X9q^=^$5P;+QBR1|Bq+M9b12C6qm(w`1{KS~si-(CqSCY^TSm<J
zl-{Q+dNJZ-m6Y{-<;av(GQDEApHH8h(thMtjofLtwMThu&v$HpTy<>+OkIDmSA?MB
zTSZuWSEHeD6n~!W5G3zvXlz$moeJ-X$Ye1-L?BXathCgS7!DuPcq>^yY(euuGfh=h
zotx-^xW6$b0((@*i&?a^sz43g_4%Hw_|VrBIGH4OANgrZ1hlmwrpo07i`lvOgH$Ud
zIh!AI?7E9|Sy^G1X~vOq^5T<LDeCFJtl2~RA5=8h)eROJmL4Vra<u%E;&JQ>ddTf7
zpMep3eeBsw@U-f`M`fZG`s86xS2bLXnp;yyCX<baCNS?C+nY%Wy0eU@CMeiTv$&cp
z#%4g|ZG)1WKZ)iW*NO=Tj_~E|ebnWDrKhK(;LJ6)b25<P-G>o3bExNVH}!7e!u?A&
z&_gdFn~-pIHDWIt<QC=0P>aW1To_ziMFbvXd-(e%{%oC``PS@4Mf*|>owK<8<k6Sb
z?Cv9bQiV7*#}9ROIGgWYS<1i(ur!!luW8|P8ueBeGaDo+6e)<aQe>jH162K%Qs=LD
z#=C)IE)VZd$fQ6VuuEO&NC~;DyhXRuPqtTfkQ~N9RxaHbdr$l#QJ%cpa*Qwv)j$=F
zOkJ<ZWpc?)8T%s=>TE~VdmqN1M9c8doc#$@=19}ii$kb{aH%Lfr?KNC)dvQmZpw^j
zV=)+}?U6|2UYq)%r8>-!?m2I^+0kb{;`aoq9%wYmL>Wc7t6C?%g#v4k%_+LGF4AV2
zXXuA3=x@Y2Ee&OElI$gf%Y!C>C1Ca%qYCClpZ-DsZ=Y;)T@MXBmuX|%Z_LinOZb*(
z>DraHk{!d&VNvxPp(&b|uT&PBTBnG(L=68p<&}1}hfJgVz(S;hd=r>lRh9&0ObQfp
z)#<eBb_95%q0Eq+668a_G-9Xyu#oASwwn*J-i#Ny-et0f^fJtfke7pZOCY0UVDj3y
zxliLBRg)!qV|IQ(AXS+<{=d`4vIJS!v#Z`IctP(PwIA)dGfpfO!uH*Ck+l-C8vsmr
z6AR8s5yJYlMzN6qKxEM@M#`@=dPmnMM8=<}XjV=|Xj}tQ|HfHG@Un5X;EduE4iG~%
z!cd^`jR<1f?D1OeU;@cMV}Y<FWKGadk@UpR0b)j1?U6u@5XZ(%f9bHhjceC`loubK
zSC?YM%N=d6kcv0=A8PNY#V_VBQ$k|%kT3hfg@3^z4hebd!}7y!4drc;U0}{_!zkWk
zZY18RU*6L5Us(K}NAsSekEBzk9bxa<qAO|EX2O-KsIMn+D9ZMmq<}tqy17yJ10;Rk
z3GY8gT<Jfp&!~kP`Very9PH7blKvX4!Ecx31T;O(Uj<#m5&pCwNb1E0z`n$a%Khpd
z5%1?Yp~yavYvo2*5?+Bx@eCL|`u<ZHu6s4w5Q2B0tDk2tDEmnN2DA^SN&!A^(I0m4
zHH=``v3zQdl^bc*Ru9OFR6oDpVmt8NJyjXiirH)6NBRq1SO(-@fnd*h!PDK1J*X6y
zDyESNUy={5ZeNmN*FNyJNvu_C;-WNP8+`M}HDG88%5|iUAU?JhMZ*#5(wdcYG019<
zwD54R$~>(%7kagkiy)uO$bvNjcPFV#=R@g*<k2?;j~2iKdkS>+7`<p$-mv{%t#1JL
z=;_=VN)rkQh*c>J7#H`Lrh0{{esj7}dV*qz$t!_lZ-njbfc?!N64GjT<_UpdpWS}9
zx)jDZ{n64HkZcv0H$WRXB3etbW-li&wS$fXMOvyQbH_2oV=|nb(A<~+KDFzW^x?JZ
z+<r`@u6B;AJP%wW9QbH)3#g8SI?xD^Ioo;rmc*_cs?gew=R$JW`Uy_PNjp7zoDHMs
zsoC5pBq5D7ASq^0fxvo6bwqeP(pBNAw2W&FSGxeXD)%%h-)Df=xF$=kWJW96m1MKu
zMy}-}$twC;4z`QbkpL5hYux9XW%;+|4(Wh)vvMKnbe2YK;SdWDNII4gyAs`zF|MoU
z-U9evp<@iC*#gAkDFqBQDxiUl389X<RMDS<N;%s#@CHMsEN%7J^*;g%O?3XB+<7Si
zGDK9=!p64M?B8i-eGKf1<be8Gj=W-kLq>C_e4j^=yQM+NIOK0_^{`BoqoMS|rUn%T
zH_hn0<G~m(vCjD{$I@c=3s~7m47oEk0%p!HRQw?=r#5}cu*)C7{DNh&!`?IVw&Hx?
zTy8&l@;_4q8yEuaRlkg-=U;=z<bX=F3=RkwVKH6<F*68V(Ls_;8f`KKCTUQgj_b`#
zsbA6NF||AHFA$kFDzb5(3jP>*y*S4gSTrp&VlwaUN7+Akw+%e4p5EW@AMt}==g9a_
zoQf#P3einbRW|@87|&2~a5%>)Z)8vdPzvywXuCb+sAPK(rO*^OdU4Bgvp{q+92q-b
zq0HqH1JUnR2y!e1j!trROux$S8j7(k1*O(NF%>xKh>hZpi=T@ut8MUID>rnZf(3^b
z5lT}!bdFXQA8o0$C}sR#g;ZZfG5x!N)mmEzqTsD|MAbBn@2pG)o2AUR<IajP-$D}1
zST@`E#m8B7gvdP)3uI3FVqhsBT7;*fB7TZfaSNiPI<$c4NyAe*EgD|fqZ>`zSM3l2
zEjtM_A5l~OSBKNO_0O^9%7Hkj_}FK!;^t)Bwp55$6IHKbg8y_~pHD!fA!So1wPixt
zbZHq85{GN51nW$ifa`qliEAK(#h45+SL%v2%C@@L`Vco9JGn#78W?6h5$$B)(ihGI
z-l#NTYSg1njg@3^Qky{%5#659slu({s9&v$88953{iOwN)MKQ%8$u!s_jDwpL*X&7
zSH_k1(j{(GTmGqHiOc;pj~6}K@a4bs_-msu3`bVxOn4Ubs_9{dsw1ait;R)<9h-ZL
zqG{U{JcQGd)oei%4kUTRx^5&#v^(o`U_sQHir26*oWgtaqSuAUoqga#TkFt6KPFhK
zcYEMi>qJ0O?3S7h%rU*mHrS>9l>xK+DVOufQGQZJ45SuB%^V+u!Mn^d*}soJ0wCuc
zooq-foIVDGOrGCg7oI}qIG&U=hmNl>WUUeqI1qgeq>+_+1-3?w2elQAN(e;QTTF@t
zBx<ch4|Nfnz9DveB4jzfB&3)0AbVVk>f9$6FOGZ8wlu=H#-CsI)*s!YkK?Xjw_Im_
zch_#`CDE6_))!-z@9o!8@ajx2fb`mHjRtoMy>^<Nk`j&F>2>VGrEsEOarTDVaCKF1
zUfsoz<xMcLG7TcM$`2Q>{{gSw7fcH-1YvzN<$M%$4S~bzPQbw`)+*tVHQ_k}s!HTp
zj^3(^#UX>&rr(S*gLr4e8iY*Yj}n3c4ocpxIQ5gwQg*yx|M!3U>Co5`RPP%Iu_*;&
z^+N~t2&8kAXD%cSX)w#S$JiptPS~-qmKBzp<&vtqo&%UFDD`y^izt^Xe{d#h6OLE$
zwERu=L#k|dJ82w9YBxt%?;d9n!o3#Kw34Z5)eJc<Hg){{$I)l{rA0iwH${I}>4#s-
zg1GtIc0E4gsvmQ}xZmB-Z$r{WO;QHu!QFW12+4|7BG8B*Gb8Kh%yA5?*dS*_aOp;z
z97t%fZZUj=Qp+Ee(4p<qDHAw^X<zfAu6R_7nBD=R@TUdu2PygE0yF0EdF|weT7T_n
zVa2vivbYx#S!4>0KCw^ab@HEl8@{INml%#F0vLt!2uC1q`hEy=C^TVya&9KHdW8Bk
zznV-xd;j3?SVAQZW`lniR1k0Z%)g*b@y#C*B9|w&O_Wi$nK-!si*fQ7HOte0{&={O
z4$%^lMqUpaYDpqr2fEA?`eZ{u$eQ5_ma$@pVcVn{$?ciPriFBdF_R&d462N{QJKW;
z_>Xui(9`g_Z6|MVJWR`sAo>Y4gVTf8&3HJ1yOXNOVauq={D~ST_2sS71!?TltG$wH
zg4i8kY^|i#7WFKuWv9mbq{X)a?viiS+g-t0w$pc|DEc*G<v@LDChNr<5w|2omAzwd
ze6%8E?rNqcL7h``-b}Q>pl?jGI{B!7IX)nfCPd!;C!em&ubK+xi?<bj@iu|4!j=NG
zGl>rz)Vfq#m%<RFN06{c#=)MSNna?S3KC}Fq3Fd)ftb{GWvK==QGKLX4yx9b#4&LD
zgbRsnljYb(7At`Mohxh?0^h!0KGYlpMI*8On0QF^e7@TBo6Z&VYX<&%J4XP+#bJv`
z<`>PQ#6>-zFi0oei;1)JCm4X&qO7{@rA7nRxcxq7v)D*-aR<wj)5%C4X2cC$Nm5Bd
z9kNCf%22U5@gl;BUt#F?-fE~kt*F+r^VO@wJ>{%4(w>ytVtG_tbUN`&=*&QzcVS{T
z$h-3bZuWC(uf4m?d*KdnRu-~n??uF0bycnZUUZ9R*zGL&)!b3xc;h-w<JO9ptoZ@_
zV|l)e*s+W8^H59S+hM8g*^{24BZr5Z{tYzlIbM_}-ole%N78&7c7*6S17F1@1`%(B
zrCe)2%fVxp0mrFIRrRlT@kc*SL-k3!_LG$e-ARC6=|_Rr02LzmVvXAw-`?!1ZjEsA
z0iY8O59>SPd>7Rgg1~~5W<lCM4W|!KD4RvB+HqTrxGhpXiwaeqL@~(ptr~U$$n0JN
z8&2K$&OR)R8==E|j&o4B*u;s3tbHUCIgKa`1zpBkVFGn6_Yy)1U~v1p$Bda;N4c9D
zQhUQGzL2N`y}hF!QRQ69f7D_t$kie9@L;MAKV_C(M8{6?UAfLo`zK)2qecig`;bmD
z)gmUPZzj7q!hA-{%EvpKnQaPtS=pizSZ<#Hr6>x`H|?Fbn{u7LguFT<^9)CnK>@s-
ztdL+1>P)3i)YKP-J*kVHxUCi3<N~%4(GpBYn|77WEu5F6Xe!R*$FKA;7}neiZXDY(
zYtOUV*;c@JiV?7=_*9;K?{5QoX6C9HRXcKDl8?ASp?8tw$36wce1dxdPlm?yX#_9R
zI<%F<Ysm}RmFB7{CFENWru?MYo3;DN4VUixf!(6GPk&8cK5_psyMczIV`u~$$sYL3
z3s9J^7Z5~t7IXg@UC*9;i-%mGyB%Og*^55-4k0|N)ARNqIC{L|^H2};fm((37imGw
zA_vB)I<yK_v{;zGz#i+Ve)fUAmM?mdrlZNWg#L+tnMTPi5dKS$612@)N0Sf(G?`-0
zdqLeb94Uc93U$5H&b>0L!w{nV7olDvQt^UVK#172A=x^hT`V=IoqH_+;2zw~4VG|e
zgaV+NGeo+!gi+{AB^UyGsq_K6(|$cqJLj1L7`;bbwr6m#W(cknv`09zpgzPd)A=i@
zaNtXkr&iyF3#`PRzkLVv9p<kzgMTYRzz+eI@z&`5+;Jl_IP4RF%=L~Fwh_OKx}98=
zrTF?N<X?uAT#=`%{t*nUcGMF8s*I#UjHYqzQ1QTkTE>t-4rVHI&^y_}78bO>bT!@B
z{~~(+fX*JZFAjDGx(-$bDmu@Lpah)zx59l#vc=C=(UU9qTc|V!UZ8=A0!OO`FZ0WH
zn_|6gu(`5X{Z{)0xy^+Z4QAj6FpP${u|-ou4HgaNdSdF254&^c+uygyL@=&f5(IRw
z#>`oH_~(ZPr^4cXOLR?iPV{HoIsLh`UM}%MjV*JTmd;?4%u5+<pa3!9Q`p*}U?f?1
z!t(JHk+$0Pz6qN*WkAFs*0bdLWBB>F2vMw4elfp;Po%WLZI3#l);b{Ej(6i3no{7>
z+s+0VlbEOPihqvkg47G9{Y<{bzhJ3Ug$s8gu(gP5Nj?WMaKbUNL!4iXi<<n9>(E;|
z_+cYri5;AWe~ZEr2-(&>-9tmYjO6|K_+2<gGOzNf(2L|%)SXSu>F0`xNK{@$%j`lw
z_tpaL(m&|Qq|>p2@zCU@?#HqSsbG%_WAXK@g-%6{)f#TKfLjGSz+ki+KHsPqRtCdL
zxxP)%+Qg@lrRn#3DjUzl&*$S@^F%1t3FG1@Q^0Ez&e2{au;IKpvZgGoX1dO$w|O>$
z!ac%D=Z91xpI|xe>m;tPr!0=IQd6UiHK+tXNaIj2&g%eYWHxK*|Lf{3fZ}M@whh58
zxG(PR!6CujJ-EBOZEy{?xVyU(+}+(RSa1Tt$-i&Dzs`GdrfRB&;hG-n>FJ$*p8Njv
z3npc>g&e|M`AZiAXCIF?I-hj2QdJgdUFR)MSyA0DkVz!9NO7P<Z4Ee>)^wFy3!Fcz
z6Txnxan6*Br$N6%?*)5jxJzJDjX7<+FiS^ul%w=Y==2)qnoOEep(aeGUT_J0a%~{?
zJ>S`D2HJj*GIoUE8hT|AlUCwOgTAWP5MmaMBmY3no`U7FBh}e<u9Ifz7`c6dxc?!|
z-#wOC7=9K!aFWs!C@xqLSa|ZKXvR3Iue8c;J}D3>a#2T_-b$%Ld?17je?GvqcuGzO
zjeFxBJ6>H`c>sH%S<O-KVi?%(BJhSl9OHdCL8*r!bt>820nSNk@7(UZ-%NRVy2mwu
zv>YBqBS2%x`-DUm-A+X*0-u{h$A_BXwbCb=5C(b3O_}-$S*Dc+7>r~X0uIMd!W1jV
z62&twt|D77A_Q(R>~^8y>;;e#Bj+KYhSWl#{+yy96Nns6y}l;RHXH*Lc_J$QyowIC
z@OtLm^6$c8*^x$IsXvy*&`-XK{9^l_@0-;vU$Q+VWrs{+6NvV9)ebLxF$vt!Zh+CD
zC{D7J*RmEUYZ^)bdfTM%vgQ(8hud3nmnK(fbAb+6aA|)r!e;_ul@&u<Wlb;#0OZvX
z50sxU=<10UXDQFft)@ftso@*H-@9Q5xAPTJtNM=BkC?kj*~#;I*K_5szduj9{ed9r
zrh-FPoz~nr_pDGZk-sSH0axMj<knt%K0$LYV0e-AEsviF_)d7~$RfuK>xLqS<ajk;
zb%qA*n0-HZNqYiA9>sR9GGkF*IzLfzA~pR?l_{&+&-lwMMyakzYJcd_VxndB$mK_S
z<-QN51X&v7T)Fr$J&Sj%yVj|8<<N`KT{pIF?_9#!nu{cfZWXyxO!9OT)YgB*F}$<8
zYiQ=>&f~362m0($hTNgFw1rWO_7)D&Vz<#TD&;Q2Go~h%Y{r<E#f+wDSo6K6H!ZQq
zdd;A?J#jER*0c9c;~~^YuP_<KLO{R02vgemUliFJ<J#Ko8_}Vj3oz~*@uK2hpR+=7
zVKwV>m<=}CxGBVrF=peu&x(GpOJ_n=y|btv@Q4X{4s2v}Bit71Xi^+1(jqHBuVP=T
zRV(gllpAu^B`<(e4j7t$PMj)H|7?<;13mt7en@%Fumw}Su(;+Xv$0@1$VxP*++rDN
zO?$#;nfKWx|NWBvTIJwK!z)kEMJMw<3II!M)rxklC%1u#q8PcNncXr?)LS=-!6PFX
zga7LZ4iLd%%oE9BTq`O(S~Psj6HXc75>Yo3_l9`0nXaN^B9G#^MMhkK@7XuCQDXA<
zUTO5bqgdZFyHHOUyHMY!a%_B(eN22wUOXbfvcdw@LG#A-v08I0jwK*+j>`GyLp0k1
zfI_wQeoS(RwqGc8A7cn6(RYw?A1M>9^}DcsJ@DN*N96^b$WP~)bPG3mc+Sb<AsFV&
z)mI5{%>03Ll>pEVY2lz7`86Zh-jN`RZUc&5@0h{4u^1)(#7umXUUIl>WN}H$ON9eN
zq1&b+BYk9{1Sx*e(>L994Vf#&`3G;-Xd!Q=75_p3)u#TSy6;fq%@kd&5v-x<{aM;O
zuqVNgak||yqu!Q;hx2l@o!OKBd&&|LdIr&BE~(t2pWmkdJx7;%+MB;!{gU-1n*CYU
z3zcpkQ5SBWLeFTd-KaHAp3PJy0==oj7)sz3z44@8%O_E>*sWUU1HnY2;mrPZgl4#$
zc}>H_!VX{7yzLg&c_#tVM4AXGx-20pFpND(!>72m==w*Hh;T&TEvN$TVB^?QeX4UR
zt8BB4!%e`W*j}n8Vcb&h%lP<MYsj|*m<?sCBl@Sc5RrTc`Q0IOtl&XB#C{qyE#c67
zbgZxp3DS@ZNi<|l7zrheYI5u2)QURL&|uv0ZUZh^9U-<cN%^2ZBRZTCgT7<|&=X1%
zbJ`iJ&fnDtd#8Hk@}0+EHtsiuUxMI2p2=@6baaoNJ>x1_ft&)7bDdhQ?{1!Mcmr72
zJp7CvT%<aOotE&%y6gdi9k=dYzdlq&5e~C;L!3&@1{M_7%?OHfQIKwhQofJBzuXgX
z!Xw&)|2Fu1fj}>KnuaM>N3i)FxPI68KG$&6Sf}RGz`Z-g>@jb+PCYI_e2`eJ?!ZY6
z@vJu!Q>!)GNa*=kjpmRYZ4Yyg4^iCr2SKu+c-QW!o_-!$d^Sf{lY4p^-SOvVR?H0J
zVo)A}_$Pz-o#7xF7L{P8{Wn6Bb~rbX?%kKlF$7ZtAc<s?g`4sKCV$u#P^*AvS<e<3
zAR}7KLzGC>7R0UqC!sjcGiB0%-N<9GL#T^pXG<(TxeI)|T3CotHKl%-Quw(jzDj0X
zCHyjd*@!IvWle!5j3?r8Pj+nBfwp{mkNKJ?bnt$K&Og`VId+A`e@OZosSCGzkLEff
zN)s-x1yp|p8|gykZisFV9FPw_mF}xuo?N9!d?x-{`_t*X=VvQ^%R^dSc>OunlGHJO
z2nNFGo5&sA$i?0UyLs0nYM%HI<$IOZy0SKUC3Q|%CtDpn1E)=$^J_B<<sn#ltKDk*
z`zV<qB7f!4)_E3se2+Hq!HTa+n+%2^8?sOw++t(;j&n;1c-&dv4^Cfxd#%RUgzsyl
zE8`4^q+i1QZfhXohsygqWBU_C!k5+QLU1?j9z1;Xf4}VLrU^kP(I`MSb|o~DG-xx_
zkq=@YKVlAs;nAc|7zWlbSEg}oGHv1HUw?JDoqrI)2pPcjhY(J@-e{hHlpRW@KId&Y
zdYLj=1IOvS!m>tT6Cq%^QYy<Oa8@m3@TsIKTToFY?Wca-#|b*L^+~4KOEtms-W_LY
zbCuWr*=oU#rx?O|P(BINTXw}iERV5GBuH4cYiKn4T%=yI`aNI2DH#7jKKl!!Y9h9*
z)|Oysh_3LL7d}zj#WGc)pfN|gk~XU`P2c%q&~ACd;JF(!Q&CtL+hvvbNsK^??lQ(#
z2rq*VedRdq7PGS;nNiNiVR;be3Cty}O!ZUD<xRq*c!Ana$~Gq85jS4G?gur08h!Rc
zA}8p&S;$$)HG_NA7%i6pqtb==N1@|HpL<qGC{w_!`Hj><*)Lsx!I*VqL(lo;nf7P3
zm%(sf+KSI1MmL<y$ljBy@t+S(WSPc}5i;->QK5oHO4mCei7b#A4JUfYFYsD}$6=FM
ziQ(!FpVuiuPxN(w6Rhh#Q25l}T7ryzVD%#qWYuo;6V1H_III^Vs!rW?uzuT)%qpf6
z2({(5Fg<}v4%R6$;zCK_6k7;BHVtp2DHK0WqpyV$LmbQrzlbLwbBXgx6lh`V*%GzD
zusE^hWF6*B*pWpXKjw?AL;Hp$(j?+UQs=;w4coNPZU?9W4$eA4;`+U}lOFMsxTb?D
zL=r~Z9RBF!O|o`x(yA!LOo-R)c!E|!nN<iss>w<mco~X7jh*ToO%mpBKhCxqNd1}D
z+=)qy>A^cZA7Jp?A*Xs{6_;{Flf(i#6p|S#z0VZhODcIb*9gwgXE?#CS$$=z_SAnr
z$rVb~Uz~TFlS7dU3Nw7xk)GA~2aQHA`~pj5U`3(g3})JZ@ZVj(&Z@fWT5ug6g9XJ0
z(}1pGh=F#B^GaC$7aB`d4EE#`xW2t?rnWtXGI6*DU&6^0IMcKPw=bIc7(UC|^Uvn&
zv0O!waH4Z1{4<O^<RaS}KZzA#;C;b+)HdznJ>7ObZLkf5pf%<S<r(5UZY9&)ClCY+
z^u*1_4Hrhzq0l4Jn{y5*sX3_*GKG3h+BdbT16k6Nd*hf_^OY^(^&JR8bmkca4*J-B
z*Z^5&k<ssqPE5_cbNL;&B*<pRi_N}y;1in%?e^YaV#AtER;$(_;IG)Wl!tl_Rmevo
zC!P^FXtc5xUBY2&GmHKhjj>r<8e_)o(pf!VKDa{}XCKf3@yC2>4e6oh=uA7-12Mfd
z1Fhp|HlUFEm6~rOyAMOCTL?nx8RRPJIIlCwCd5T?Hj)aHSC)$Hh%g3XvD??8m|OSu
z&3?`2H@~J{deVIV8lcg<o^M{6aWkNz2R*N%Ciza9$bzk=fW*ReW2iO~hA2u)rLJ=S
zed(l2z+h#EBTAh;;xJQ7g@3wHt)^D_CeS365C5n)UK#aHLDPA|B30PzGd}h215foz
z)-Of^o@*QpTbz>eN43iopY|0y_wSy9xWRrATegJ2v>F+1^%TCl%w_A)ebYnpW9Hbb
z9rv-e%{P{oheC^n*&=uEYFAbT{Jhv=g`9ab*n@DW(L#WCWN_XL07c1SI$o1p447)m
zp0W)!URMKuKz)z)_Wcs(yhuP+)TBVF7CDqQIUjIN=7SCv*Psx~Okq9aU`b$6j@Nxd
zN<@|PMIWgfbH5Uc@g#4JW=OPXjYQ9}!1W_8PkoMNRlbWi+eY&WTM$}cIvGV)C-#dS
z5HkMURpEELrD1KI5Fk%BR?P1jr6BoD+~A(CN<DapxJ(Mubb)~{2+7n%O(OG6_$UdD
z$d-5+>k)U%Bpr>dzJZcm5@+<-;qN-lVYT<%3$D{u;C7k&&lk6=7+BDcc&>N$<{+{J
zCLrTZNFb*<)@_s|iMiPXT^wsoZa55n6nioj<)Bc689u|iH?g7eXfAv{(dlni8E>$n
z0yP)xQdAZ>9LQ>N84lcpJ{x`}XWE7M<vd*dYh1djXQD;lyEz0yC#Lco_}oXW00h;$
z{LG@|w(A>A+M!2IB8(b<mg+@4lkGj7Ngz8{-v?wLgJ3VaR$>pA6kb~Hwxu=YT+K%Y
z_;-qe1bN93^H!tcp`(^zNDuF_nv4)@^2P$3Of8d*mYd2i)7|w@ZK2b~TJSx7z4x44
z=I6539^!-2c^Ik3a+^(FdG-q3aGOEyRBx~+^jBS|x~U0H@3OK2Ms^bGMWN(tlmiv!
ztFBXuE#I^xA9z1yiNFTY2@HltTOczm+xjYv|3W7?wMTp5#m}I#-Q}I!I&f#Tl?Y|T
zCuUhEZV{a4j`g%Si+~qH+^1#Rh$>I-F~g7iE%*u~Vmt=)OSLS`l1j$HG*wT%lEUi^
z_jas(fK|UZ)y$?cG{Uosb<j>!{RqS@xh|<cV%R*}gj3Mur};StgXo}HBEe*my=DCB
z8U%YxL`z035#uh}IB!`r9x`xCXG|g;Zj_oWC^Fh*6#QKcqKDRAL|4>W`S>MZ1f!98
zI+N5N_JoOFd=Jxmip*i!y>zLNgL1H|g_Sw$BX3vuQY;TTaG3QufbLfVwi}Sn@O=T|
z366aWyY>)KLhupP#vt^g!ffwFJf&GPZTqv4JA)~ieqo8l)GW8`Z_L7&8XjXl_+<2M
zU8#B*8^%i1Q~jJe2*-G<cc|ClXXGpa)1r1&^R1swDHj>PzVkAZW>%`Cv_f16XY_MM
z^o&0HpZW=tjdXKZ3Ytn(0G?0}Q7%e#+b&=ggjeiE6~cc|(t+2Jy3TU|nXV|TOpKis
zKH$Fa`qAI^f&+RnE^Xg^A|E&t$mI8!7EJNE*bsi{hH{Kn6k=bw+BNPMo$RL;{nem0
zm&s;I(5{JW&v1bhngq^IFy=f%d<A(>jH#_T#Y$@G%KGF`>izso4MaW|x1lh(3py1$
zj@b?M$L?aFa%I?)CJ%R>i*dsXPQRx>za__S+}n+-=sM@9u9yzz#E-1YSIR(gGMREa
zHi{zqT{vxI;?Z@hsw}Kg$VGr?hS$Zp2K5#OhpuTf!=_VS+g5ALhIL4&SX^#;Sks8E
zt}odKj|zU(uUJhi1BI;D<axNmknd7z%amz|PqH8A&sEAfGNJg5AZ16qOE~~6U5KG`
z3q|7>A8##3Ud45dSJH(MMeT@3t7b9Xjk*~D{FrS&W|>GSqv{&(QKt+L0pC>;?p|?f
zXqlrCuIi9m8$TqfR_?e(R%prAS^uOO_vJtrrgEj;JM+5!!JW#Aqgc@5nUdV8_()PJ
zNSl)P6Wwch7||%gF$=9|gW~UoMK3fAss`M!bbzLlg@MXwf*$MjX4*1L2Kltmk&Q@Z
zbombfkqfDK=yFQPZ|%0+W=`$vXUq~LgEUtxl<y*_g}z)CI$dlA8fHKUyI+6<WH~I%
zFW#PhzS4Z*W%S4=R3(V8LcvcA<^_e88R3{=yAY@)2DdT|_!4-Co#|oUt8G|FUF8nN
zeO}!qX#<`(*O*sJ2J9~qv%5Zg9k~`%!6BNCAm)(6(b?A#97G8<9jsYH7G#LAsJU2b
zIom<mcD7R<ZE0=qg_2y6w_sm$7lHMY$B8x?@!j=uS90>gTXO{u|9qOPgz5OPR(!x`
zK3KEdrio3Z|C6*a=;g%MnpCx+z(Qfg@$pDqzXZtV7h>El(Y{P!@8>y4m=F^QhkP;;
zTcfT7fv2xudiRqq`M@(#u|Xs;B-LcZfHF2O>T@zt=;O@`W059e3P5UotH}+>U3+#E
zv(o<&sV`b;)(Hk2hklD#S6Tq4ZLCi}Tk0zCt~0v#cV3DIQHwPkU$&w2FnlP!mh`Y2
zas|+HOz9hzTj-haOH&omdgN4VOu^6;2}S2a;K~;q34!oF4~53bnQim7!TZ}QuL2_<
z_55|_+`+}Ov|>JQV)W=a#ne0!t-Odi9_jH2y7{z(E`4toKU2Geq}+yK9+AFOzK?UM
zLJ;dIWv}c^(wCq&vf^A2Rh*GDavYFTp&v+E4XJ`@mbxHD7UH@l(I7`_XE^&1YRc>u
z9>aq72I=+_-pa^5A!pVJ{+uB+hUMFo?wPW`i1QCLEx9CtTfCOheON#G#E2Gp`?<jp
z1W1qqdMf+-yvr<CT#A#DI2AS(4OgKhIsJlf(gC(|@+6;Dg)?Hd**C*Q6=3s?J9s70
zu)TQE^5l1LFjhIKl`V}VvM!oJgv>uM=V4<Nak5h07tEC7I${%?n+Bwo{I40qlh0B{
z3b-o!!2JJyA1sJ<76+K6w*61<@9n~_MdZYgTuvM=5dJwJ5mICXK7f%-n|;tURBW5M
z0Do{Up_$^1;p%$^i_bL-hJ19_6F2^T+qsz2aWrcC(eUdO?=~-gi$PcCZ+JuW3cjcK
z`MhyaQGHS6ut>?9)Mdjln*<~R83G*qgwtl5FhXP*=I-%a4Pb{~lu@a9`_lZ<Z1#aL
zuFrd~P#b+wp7y?$qD`mr-2ft1Q}-Crb(hmThxW-x4_8KCbZ?;`WjDR?8Xj_Z#=fdW
zfo`i0esz~x=KXc@eZ&YJ1~@*{FFiLUHPdS5GX(MC;ubDVqE6&;lCAO_63Oj?kMx6{
z%FPL;+c2#i$v{!~_X5I{0H4QxQipQl$e{|Fz1I2jq&|M1FbxVu51$)#6j|i(E5T=`
zq=SXWQ<%^b;3tmT<?~{OzGT4QQx1HS$T}Nv%AvFU6-B0KxifjYw%Kk~uef5P1DV~B
z)XWe+maCH0_SbhU^Z<1?sBx6D8KJswDaQG5A{v>TtiVWQ(I<~B<ci;IqM8YV{l<80
z_BzO_oxc&*Fo&Hpc0b)ZTdrQ*NA|uG6wLZ%{Drt2kr_^QiBy|fS_hvJ5qIZOY8Nk`
zgDy+=Q@Se!><+91X-d@4Ji;4t$V-pLH6Zc{HvI{wyq@j8qAA~8F)y|p+@QGsk}EHf
zDm_P4G62>hQAP$UG}A?3U=x?Hz<It45{O`2X6=8D+vk(<g^(4%M%Rgna)*~b$FY~B
zY;g?ZRQR6E8rq)75oNVOAy0*ZmBsmCRTGa<=<XJ$iDS#kBIycoR4wlTVGZy)HM{&a
zE~mm4(%4ADFTEsnGxc%x4r+4Xi|iYM+%DuM!vM4T9*Hq^LPM*xbM(tAtzl{-LW0!2
zGB?bG(HZ~WZE+hMWi2Q?Q|+DFeZy8JETr&VM^%fRufIg;n<8iLMF_6-PUp|NJ#KSj
zoo{*MjNcJ7UfmW}9JrXyu<K$ILU4>6(tfqJ1EKhS<oE=oI@W?HvRk2}A*_-?+u8C!
zc~#6$XnqZ&)J6>-;nA*<(3KOY(BN~)!^w+^)Uk9zoOeD@em?zSp0Z|}*u4Y1CRO)U
z^SXlbyxCjsjlyMl!e#XN@R>}cl#;l^b^7+!Xa4862Cv`G=ll>}8yaZ+t%2|5TxaNM
zCJI?q_eg6D2{@E>zwQwP>Hcahkz^Z20|Ey&>o2M!AcCHHn%z8B_YUgy%~Q3UbSW%a
zJ1kGy0?iJSvs5D12eIduDq7?D9t1?g+hIkW5AcD#E;ub;H`0&Nn?Ffj_mL$VJ<v8x
zt5)vQNSXFF$~(k=QY5jkRhZGgPIC*rs#h)C`zAhSUDR0C9{X5a6otzRV_)U648(dS
z#ru_=PC3_u`P_Ei(MV$NRc!K`$^wZh6T0}w1OJ;xPD+Yyfy$g+?1H?-2imih#9eQ2
zR!s}#_iQ<fwR6zkN?4-@LFxJjlj!A#@XY!aM!o126j;`dCsY*MY{3I=?X_$ybD7i*
z)_G)#sxK#IHVT7G$M<rxZwqyq2*7Iz?9O9MbA54c40`W4wY*%}K~~rTEhQ(+DCG^~
z)aRoU!x8Sm4-j{p;b!aTY5uK~A;x&}Eo;$v=Au0_qfvwH>)GSWZR&Y`zyc?`k8Wo&
z$g^R!K|;x7l;Wb6Nmxubf^HGM&<U0#^0va~GL1-}%jFeFN;_LrGN$&hTHuE+IIpnx
zl!YV3r1R0h;0d8mMme*SUAeJ-gLHiJ<<NLN_&o*@NNL>|nlf)PSeW_8+L=hzQwg}*
zDi3bw+2P@}4nj3Lf+(K&Qzon*58oA5o>SZ$!aw*BX;lZX#IdVi0lZEquTV)c%c&Ri
zDfjb#lT#1z=V})MoWw=esen!H=xdURnZ6^X@HoFPoqknR7m6h%@y$hzLoUP8Nj;Gl
ze>EFM?QxG$yXzgER&%jdA9SRe;SHSyiyX~$O&KR$^HUg2Sd8a`URcHVQbP!Eey29@
z$gAs<#|GnNXzQXf0RJ(_{x5&*5h~HvA`A!!W%_@F>Yy7jKuUACV0Rub!^Fj=-&qqk
z@?E~R0T2a@=oq6i5M&}+P+~CB5J84o17wd<u%T%@9O!#7vU=8eOGPj?Hdb7V)~6B>
z1uOK`(@R~;UCRgReqDntjhAj-epM=@mmZhg9BI<9n9q_Ioi3NWN7*hHyxl$*DJ|0-
zj({FUFD6`mM;WdXpt{S@fY~t@G_}AnmpJ9{z<VeBy$=H*8htjo)IE-PhPKdD>QGtz
zY%O+1#n5s1MX>8yV#H^vZJGl4=w!A~tW-Q26F+u^SK=Ci?tGqMv69SF5Q4RNzBP4O
z+Ncm+A+vL~Vlf{3q8OX^;*@wORtD{-8pSCKmU%VRd>$EfplUI6B10Q?d0Aoh`|VqS
zvIP8ceDe`G%tiL`I3&4=q}9*~w!*am-?kaCuM_HGKatDW>a@I!x*~L%RG5&EwJnX?
zFj}R|A580R#xR;xPDRDe>(#i%<+PdItX<>DaF2|dboW5mp_OX=vWv+TzA81h_E)3U
zcRpXqY~(rVfW0ZBtTBc0lDQMs2^gYFkKdimmc21Qn*|Z*?SiNevc4AECQKIF#xwZU
zt6TN`Y#mGdV*69NLC2PD0OzA&6@1wFalH~LPJ>BcUB&u-uT(1=F-qv?6mj<^xcmT5
zO6w8#-tT4ssh#A2hW<K30ne|SIZ~{1y9!4(*wNhr9Y7AiDv>+RGITy0{~8|ZfSu@C
z>wb}iHWH$QS=tsEZ7J%I@y42V)z{`9RBI~jg7%VGtEpuCFebMX;=PuPTPt;6z0VPY
zKhqkPbqZoMJx>y1$nfU6dyraNoVClwrLdtNhMsI;MC*5&Z$>Vnd?vI$J#DTo(`%`|
zsD}*zE&^kExB|*!JXzJSn?9cls@uGCvc}G4!9#aS)LTnSWF!CjO=w0TePhVbh6ikv
zI@kAYVi9I)T8VT+=Kwynn;yfi%K9s;j)=Ru3$0dCt(`inE&te*fmm9>yF4XR4?oA)
z%>>7kk00jV3FbKI>*DJb=2MgdnNWw`t&4ofI@SZCA;axQL02ct-Mzc7mx`*oJyJj+
zYHwbhb&FJr>!zOrz*nJ)1^w_ao+ENVQn^V~R9<%akaX8r5x>)yAP;rUbk6drp{Z~*
zFSz5dD~FRN3NKJ+GaIbX%!l5)k-%AwEx=OrFw@-7*oQEUXpU-aI{SsE1gnO~-pKZ+
zp$01uo_thF_5Eaimke${S-SL=l(B>6N9hp+95&oJW6AaYm&}~>DNYdj+}3t2V@cAa
zrz!_EyYtgdu?2zP2M#U1br2-zoU=Z-8}Y&jYpDZtlBa!l-Z&oTt}jTSrh%fp5cl54
z*?=Bh1|tBc0_C1cLwOY9(`w(wLZAkRVhbveYpEf^2`*nbyP4lKZ1t=4Mb7V>Y*&P6
zsX>gzX%bTMWCYc(?wQEArc;b~h-lX;>{oGQniaKq5!d4;0UE^3!mr`h>+5L<3ct`T
zDy3i#V<N;ppINf6W@;B1_$+KyPgC-8u*-L=_ok|>HqBp9cIaZlyE&@H62(X^Uh<Uy
zSw;rd$OWrf$%&k>OSQR7i*L+Viy(zm2gFCM=8&hA(#O0+T#<a1t9yuh7v8ET2oA+x
zk@=8TUu?}y+j;7pr}1C<M*A$_9o~?T$r7eGDW{ynAloP~Os|+|r9rKX7>KKre0cTZ
zJ~*jAueOwivtt4(TF!IPLQ=iilKC=$Z$4L!#_r`>*Y>9?U3yt_50HdRiwxH7=jCD}
z9sSSH%(SY-)n*7ZTA7>7;_PDcLM~$^&Wp&L-0O8(vzhoD(1TP#1!8nHPnm)oPdrET
zQ%IqGytx9>k*OtO4>)m?Wr!0)Qj(2nT*)Grbx@S@n$C=8!$L?NyY@&1N(DZ^Ybs-n
zZJZQnW4n!^xc9Qv@tZhZfi(z-a6t!<?5X0>60*OfXt?8T)LpW2y=T_xZ1PH5Yq-C|
z%GxJpcs6J`H=H$n$7xGqo&OEb)Fy9V($2uZ^q9FpRtj*Pzh&1rcca;Dt#_VJLTX9;
z?3}V;Ke~D2C3_LiqE)Z>3sX@Bh%+pMiG@^>qJ1OYrit!1n(+MH-?&&`bKDx+U_fX|
zETV0UX?{Ev%E~gi^6p3etkgmRT;kk5Y_SyULVmrZ<#N!CnQRw193yWj;5zQC<$J|V
zEtLW2ndy<QbeQ4>Wv_!OEV1zoj)%0A>9N>1DoF?DLG9Cx#t>vp)Y=DBpcbo3xSPiI
zvzXVt@}hvbbc!#(mBl;Ne*W`hF=%$dFxrma6(b452NB4s)&;X4OTfM|6i@~EGkx8A
z+l-Gf&O4x+M5^s18sx|95QCBVWP$luL72T{feP{|JpjXd3+Qa9@MHm+7M+_8z#;YE
zQ{p##sk%OqLBmn>BpZ_kplA-6B=##C4w6+9#-}PSG-LU-x+o8`a(#1@@2UDcRXiW6
zSn(K;gY(^UiyCS}JRDc-)2bUiKee?DC*Z1oSYSj7?vM90$}K8lO&B61b>QKhKbslY
z3$W~P^kCi6;Hh$6b4BvlQ4rOy|K8eRJ94isafWS6kU!8T#j~Kj0t6roL-n#^+c_Ww
zTPbj^=&o!GVcM9758~xmvuxUBeRx%cTH^H;^*0=4kcmg2%D^?~ZhQT<hIX)3OUG5d
z@vW$GAwly1I*ZSeu`bkropv_&^4cpXl4pJ1m-agQb(cByZZ(HrG+?hm;OPh%MFGwi
z3eQ^T{x=3`=>wxfIxug??@%-NreWSfy7MI<mappz`w#FJ*H!C9WOfv%eh#ED%HrDq
z99aej(!)w@i$sP9f=XAz`18dBF5cmk#Ox}@pE*UeYIkp~XP1uEX8@5-_6H>UE8HJ)
zouA)6GHG2xs|t~180oJ;ty>}u5S$4*z2*gnr0`b)qv_}-HGusw8`#Gi#o5!do;RHu
zN(n{G8>K>Mx|`_mgHPy`ih<A!usp{#+}k_n>l?*WY}`wAOv&MkfeF~!HmgSTne%ch
zse{4YhkhA%qN7&>=3}EzL8H-R0<F(}9;|`8I6kr7UhP(Mh;Eq-^%>^YSF={MTIuJO
zLZ@3^5$m+>WkBy3Zzw*|2tsYMoTB#ycm@Iq-dHK7>VBRTL>7YcC0!>AB4nR;6S+;p
zKJVM{$(?-ZkZL8vP$1rsl279-P&hfVR-bY9Z(bS4Sz+FqK+ayWEG+O7RXPXdWZ(Uu
z2#jp73Zii%Cw~r*xLKOF(YMziMD#<fXBCtqi1QAJ9Ro@k9Dzb_mYw;R04UVm#Z46@
zzc(1EQD+ghvfN7~zVG@)-9a88$3}90+bro8u_PdAF}U>2xN<%g3;XGocS)4x-xmbo
z{Dd2hu!_;bk}R+;N>tbUeQ<W#s{=9&FFiu@wqv@`#(csYMmW2+Y`iZOQ`$=1X9)Kf
zmaX{RX){o9hCSK)Yp^2!hONcJh*6D4>Y+uvZcZXMxqSN5B?4K&U<^!wyX+6hB8-k8
zBngfJ)$Sl+s*;8mAjFXo95d8TFK_ve16oPJWU_}2;_ZInu8cd+?jMpdnz8(E#1aHT
z#j9Jx2C}<*;p1kKJItp6B`5G5Vevns4?A+s9aVr3E;~cI(IZZ~kZ<(>Vu5g$hVAi|
zdq@=qFQnC@+G!>RVZ;K$t`gP2j`T7GB)n5JD(KSLPXYsXHO^<|zgd4j<Q^?y{dnS?
zoG8HaKy}XWHvEtz7@KJ_f(Zz4gYN&~!`e|+8F-nDj&d-}notAZvh9al01fw@h-(bj
zm!tq_Baq~;$UOvzD|yL&3AB$E{1PvSw_K<-%<VebpZUvUKNE^4EYTk|V)}e2n4o5R
z{c8keYc@29v)8rT;(MRHT=g%$M3_QawZ_oxtDh;)^pifsY0T8~Sd*^V#cn<rg;=Ne
zo~o{(oWX@4T2eRkGF0*!xIuxKp9a)O5!M~RG28BYyyAnIZIdKM2V==9BLDO_JrheA
zicf7V^>9>JYUu_`U!BEux4t4SDwbY9`fZj9eDUpOv0_&5-L&@h4l3bmA=PZF{DF2j
zNB^ecj=hwcMm`xV#X;rl-EY@6x9F3P6jc^gSdpQ1DROP-O-HUuvKk#)&A~z6&epI8
zv?3y-&(0QyS#QFd7E6tkSTH8i*mG_^Mel(<8^Asm!?f>{DDI~o+B6r4Wb!1|+=E+*
zB-y8biA*FhBz%iDzs(m9?M-%CVaA-L53vNPoW&v4sS=<k$gfcGqs6;7j-#~dTu7)9
zi^^qxzwBROV#!z4A8xu~wof$Jr+yR!+9wI`xj!OZ#BsDT(1e|o8Fv#tE{sRj?4viM
z8nSl<hyny7(Y>c~&668s^Z<N8?ee|c*G#Dx{l;^|BFs%|#hQK_+}v#RgBhODuCQ*7
zo_>vIsK<MmxJ@_jx+de{4sI|7VrY(K57pUGdHKRGS?`C&9j+*|jgu9UP_OlXzOiW!
zuI$%biyQ#K@iZ7bFW3XvY>umrfc_HJ;g24>XIA?PdBFwqTD?m>@u~~wlsH+Yy8eMb
zofZ1VjdZ&BYuys}O+3jU6<l}<So>*RNJ1+rQDx*%NS-Z+-Z%x=G0fpD8Y1H$$uA1R
zpButgqKG?=!{cPu>>ceJM6xM>sp<w>N?sjn=jFe!JP|j-QWs#dwYjz;P2Kh5L@~{e
z4Eybf&3m4)hgl_Olumlkht#QON_C9X#JQQze!P}evXqxxb$sl8I0i|J_28dXctzUa
zQxSUpAjF4}*`5@*mX4-8(v?5#lND3K-TekVEPXUYi}f=Yb+)gm&@=5b@EgK3=3QBP
zV=(2Dy}1zW?H!wkes9IC+)ZUx8fK=lg&_8Ye&ij2=VZ?*?3N*e>-sP)Uy(U#&Hyxf
zXG9BNxovBI2-^P92=(wo5=pNBxf=?)uRkWFM=v^~ZK>R+M>fX%Y46%pA$^to>IM4>
zGF@uGeGCDWz>(X)0zI27kWM0qxz|ivWyBe=j3OK_CQ%n?FEZxMC9?rr+*d(=Pm#KJ
zZx+;G(i-0PjkV38&2Y#0(!}53ZBWt)!6OfmA#r6nzQl|qIKDdp(;is8Ef6ZJ7wHd6
zA-O4CkvJ*CUlU1CwMoe(V`+iqiG`&>B<|M~=2WOf09)T!qNTwAWC8ROOjdIXw~zy?
zo~d+~zN;X84IHwsEco=3KH-<Hf+}Ko&FN2W9tkh@k&F$5i1#L!g3-$i+0uhQnxa3V
z(Ktt7`R9w#IT_=aSfI?3^@Jnr^PW*}35EBI<=YP(D8D3>JrcW|QVg8}T@EQJej@9m
zW7c5!DUL{WP&eRf0A;U28T&KlB3n$kw~}8yCH4Dbzsq+pT%wVIq@GBV_w7QWTGLjl
zjrmi2gk!pm0E8Q_LLEUQ>@mV3=>B5gbT9bOFRf#^7K);_Zt`K@6L`0_6ge%$N%H}-
zNfBFah9217Vq9$Kl&8yb6%J7)g?kn8Z`z#S0b_xN%?}4&z?W!(R#sW!zUhb;d!1hx
z{&_!@&6aI{#bkHOojk@4NLkbvI8DVnkyGspdh40(X5nqghGa4NZuh|Pq5qCJfg|@L
zng~FG6<XK_E{T=Y#-;jV9AN|~ngk9V*=w@o_0Pv*^GsUH(0t(VO&#*Mc^j9WP(HRR
zubGeNyF~W!2Es7-%nZz|X<h28y}@=oGH50d^%vhpA`eDHRt|AolR7itxo2>zm45b*
zB51>LyL*dvayKKPR?s9BA$dMF1HBO`bVuiJ(;wI2->P$M4P$KW%a%D22`$vsg|DgA
zPQAeYR#1HARoHN^M1O<&UFPIK^%g}_rDRX%|8?6k3Yg3)^s8vwJ^c;n+6lQta50Z(
zw$tK_80rqUdEc&B8t(#p&E}TGb@+UA*qTyO>g(Lm(Y5zLuG!SyBY2JGu8GxZvFLg0
zwkw@z`9^GOH`YxbUzt5r01xQ>fa8xCmkv5*dR@*5sd{PdB&>qN<g|OWvUmB3^Q{7I
zQNEm97#L{i7XmwWD{G}<hUmVb!{Q;1Q6)5kog$kf%0+^jTQW4Gsd`+}_P``~&%dM%
z>~Vi#sXkg`dcb_Wx5)1s9w=8#J)u#(U&L!Xc^(s0+^oE;0K_=V+$TkqI97GlY<wpw
zcA1&v{;2$;i!b|IO$^ONg`a?5QupZkC=XOl7cfB~FOp2~k+RqydD;r=_`w2Ak?5o#
z9VoW|tA4f!SyA99xO$nzPE$pHwex#n%JdDBiEt!y{&zem>v6x5e;m!d*g;5IaMk(_
z(Q(T1?086Fi|vBBRd3qJ+W(l=T@bGQ^7>GX*Cmx{aZU2}rIxC16qNp*#d4WdC{U?W
z)c90u{LQ+HuHek%?5H8O;nEO@GI(y@9hRAOR^yh@8uNOWNizHf`-{82JL0r|b$h~}
z<@xglZ)?)4U14|D>ycE8PRGM%hl}6;lMdOyc!Bf^j(9e~0B8L(15XVAn)v?aEEDx|
z@Jh@9)F;#j^^CGJlxq-lNize%5MaLs%Eja0EJhGBzo`d~sEz#RDxFIY`Ksk|&xrH|
zXqoF@@<9Ll&)s)9O29{$92ax<6|*qd?um}0iD#iBznpt#_upQZ=iLxI;lkpxfiT!P
z(d1u3tSOz;2aU0efEL%8o&q&{s>*8o{45JQ^Q{^|xYr4u9hG|=^g@K<L^$~?5t`Ol
zyt=B_j|9GuH4<0i*anevXXDD8dkpkl1mc7^<PYhdK*2zV@O$o%p_br-7Mm*~UCi-I
z#4nd+5B|{01;;%$Tn~`?xO~D`u_O`0r}X}nh9z7M85$peKwGD|skBv2k0It$ByWS>
z4;+5`PcONFKcqRb7SBbdlpMdkoGM$S%{H6}!5KPEj1@i4@d_rfJ(;tcZ)18hI}}P(
zw($yP5O6dM;d|}vpvBu9xkzk{tW9Zjy<AE67mxKH@C(7o<Yuy2FyYammM*ngAKmWi
zeq)vNwO>fu0Y;~RHITZjY>>{%3(S`q!>}3$WU&-hB^0_-*<jnJ>EOR=(TRFaUr{5v
z;C|gu-OC6JWwVi(&YX8C)@sjKe19Y$LaUZpMrzp1V99u`Ky3b**MI(yDn}s~ac{jS
z!%3@p@@?{i{~DRk(!}$z#*V6HQ)DCe6I)?!TW09sBaj?h()TuYYg;frnF!P@^pnv>
zNu(}S{Y7k0F)LYx^*E){?o(8-gl)wN>ep-gZh)00VzM2wg=#@E-OY{xp?|Wv7p}Hj
zaEFw9Z#K&cq7DOc4EBWF7+RX<<O>2vN=dS_KIImRK+e0vl^ro<N7r?nE`81EACJbf
zT!Rc;-+(8oo0S(hhuS4X(wLK>4N>CbOP<o|v07=-Y!uqKOZ*%f-V<7^?E0A8&kPJw
z5B@9pK%dv?Th!MV>io!AyY9&!^Pzse^H)~1OG+mXCzUH3<X?!q>8a4CPtpSGV89A;
zSAjn})1SoqSRRhIx)I)D9l0!SaHda7@uY-~Z-HEVR@lxQLkOyJ0f&eWP<>V?l2;rU
z-#*Pr3kr|NEYCziVUu|BTY3t=x8{isLL^>!;L998i3&7CA?bnRrQz%d$Z^rKe1P#U
zGeYQAL2J+1o>=*%HG5_AA~EQ&ik8u)=_J~JdF2BWwvon*b~-|1a?q00py^)}(aGM!
zfeU15h~p9nDdBp7<n|J_W8?SCqckC~-<6MvVMeiFD>H&F4i(;Oj^rm0f=uX)#-4gk
z!0%O%K26Kl9IlzdV@7QU<QVG_JyvTi)tk`mV-zS7q2Z60d&>6H+uL{&(xKS2>Pg$f
zxSYk0ov3XvwnJe<?>mcSY)QCi(<JF8(*sMUq1%!^*q$qCFpo)o6Qyh_IMa3bwUA=O
z*DdazXqQ-}og^SObwzP4b2Ua}fLhM1-Nu`R_bO!fJmC{$yTS7G(h)Cjhun4Zsre2D
zGp(+^**@|(!`B!M`oojF3T!rxtLqc~V~F-=p<kBM5mW%hqEHTeM1>O*65v?#RSM7@
z9wmQ2FE_RVVr!U-aPu?C-qTg_KMTTv1YNPYIX4iwa%AvH{58}Xxs*$2srsL;-iu)M
zV^v&y+(e_ms-Tm&%q_OSP7l2PPVY|J8Z(b&js1ecPqU;Xne`N)bjePjas4GQz|m%9
zF$zJN{=<7UDtn3rokap2aaA-`S>Wj<V^z18EG#eWZ#7HbW~apgVd%+3orh;XTv30t
zf|ak*X8~V3J@HX@u?HSFfFv<<dz4W1%2ASR!SuQxaf$oG9wbc@!uxq7I+XWfcbr1s
z;Ik7ApaS0kh7mr>kWfbkswQ%EWo0SLl+d+MG%EDxMzUe=(^G%(IaYI$7zASKz7l5r
zrpgw*2Q}_S?}AMCt)3`myb01P-lCIF3<Hr%8CJM>i7<@6V)cte!(THsZY8n?z8`KB
z4L#;r+~)(J1x-&{#9h)~Wa)_#HeBs^T8@k^e3ZIkbaB*@vVY&_qc6(2TI+-FQ=EX}
zb5OyhTaWmjsp>aHTXdMccLb1^)TWdWof54G*J;T-LES6-6Iiafzj6db>66I6Un#L$
zCnXMec8XC+<pP^wqar8@u1y=u%n|1uNU}~!<?H4QbI2`7&<8I`ZmMyTd7`4w3l+yb
zw1=0qUXe6@+W=<DWF9i#mw;_rb#sojC2VET6pequIQE<H&|?Re!~&&rGKiq2yS;HH
z(RQ(PeNk7!h0kb>6u05rVd-eTc0@rXWZDOwvsg7W8)tASP_F2s8c6cEnpnMV?x3*n
zPkz@-)FEu!QmkGZHO1A&lB6k}mk1jO$iFnvzxMFCaP99Ys^7!qw@PtB>1|gU{dMt`
zJm-LWE039i1)ZC=QVi%Z|N0AJvx-phji`NThHY~OKcQ%wqTB~Y4=5kmhbXg5XgWdn
ztNPO;#%6Ys{V<>h1D9yXnioM#60Xn&oz`P^kotSdxaX2ty&^kOusG1}qF7FvJ4DZu
zrWiTLW#k*1;Dxz1CTTPsanC}PJVLgGrY@ay?O|I*Z^8v)76XvkcuD?hi#?fIOq=>(
z<?Il>lkjax25~@(!SR;KbCojCV@jX*28-^iRE~`@4FX0p@Au7yZO7@0OS<=#HC=mD
zcjB7fn(^?C?HUVQxPp*u#lPLg$5T~pr=2i_6+QHK)Lp)&j7Mer`0&(_Bn{#mtkB|o
z?mlwvc5N(d%x5I83Z`WW>5be$`rm$n*EWpn8aPZs9JJET1=Leq_=qLAS#u#7VD_j4
zZG;_crd(e707)KhDW$=t9n{-m<e>uFeqMZzv0HLwyBCF;S_&<_U;#|LR`_hFO?jO+
zpSJEZEqJs6Hi-j=#isUwIO}Q4Q>7>ZjS-1jvx^TxBS$H3IWbz(dYR;?oIZD5mbNl%
z&pWr3>~%%L0TD4iPuMzYerj$UZBE^~3NA|tKAohMN(wPztJ!sgp<v3f2x=H*6lL*=
zsf|wKrI(&Sl=XB$%n!L%hp7{9ml-6YGP+Lry2j_B-{1x!Z%fcKI;3|A76|K2Z6OPn
z&NJl?wdbj{cJ4Gre8qOr)z@pZ;WAgJT9DbqY!*LH0K(pD6hXjjhFmu!Vl^fSYIxlT
zF7^|b6(CwC^3z-42zpa{#w;LLXy5`0l=qWMa!VXP$nwRR4%4*(uVw97xz#=<cdExR
zucMUo<sgi@?*L9f7}BDs-q@~LwR(<#W+pnDV=)D=6gw7jmaE<ed3#n6<MqSbGva+6
zEd|6RP}A<>kZFC~p_VDzV#$508vv@Gt&I#LFlVjE6_%qpeAMZ`72Ev&saUow_T&6?
zGyUQf-cJG?%Dma%gqL)QNq6%4WT@+kv7r~y4DRnPldXz&$CMel4MK7gD`Vz*bYQXl
zL0uJKzw5<LJKa1Wt*kH}irhD;OJ+XtnXf$Oz)@!%7A4d7%4?9TdqRnOWaKu_;r`-h
z4LN@C8jl8n^u}uQlKe~~!&JA=4^XWD<MUvx`9X*9%lvb+h^EYMvEQfna0lMUk>`>0
zIX=+>1V2&-8qEAEW&h!EMirB*Pk(nz`SR(9Qje1A{YmXJsUVveUr{>Q_lUCZdGpfd
zgFvdct-82i5`cYRL>OxTmnN-yQWu<Ywu%_yGUdns<Qlo>y!99!yIAFP$=Ok;r!#k;
zjS$MWPO`n9aT?5y1$w>A3oDZKJM(q7U-rc?hjl><Jmjlh2r5?*(ZB!JV}sCj9}@8e
z%dsJWHADFRzhxrmq)X;qI$i@;w<{zx;xvySsH*2Pq*4Py?+YXr2PXu0L>UeqI;`6m
z3%mh%C>a72-wyzB_A?+TW!@(WgIB17Ec*`-$$8`%K7g$lSr9>*1Ihpm;*!Av@IM#9
zGX;45cglhV?G9msCJ^93v0$6VlL0iqva@LyD)@o?2+pVn@A1E;0J#6aE^zoD*+DeG
zDZ-&`6WDkymIwlZ?7vV5h&_ZqaP%NCv{!&!KB#&S=iL(Ce+t+iqz2G=7xs66BZwoA
zAs{&Z+IR^656Cyf3ds633hfO(oKW!LF#QG1lY${aP&Ww{$YLA~K)pK*b_NHB4&p&T
zfJfN>Yf7a6g96Y`dw7Q+vSFNetIU5&R~RM%@UPPd0KvafxX~aW$p32-2#9``KTtLp
z`e}A&%M8BarVJ1eq<=wy+<%~pVIsi)I$-|GUC91{1V#XWzYGZfCBRGR3V)#g^CP4M
z{AFtQ7nrZ~2fQ4i0Q|?Y2W$nv`WN)7`3D+TBLW$Yq5=Nf+T!nP$e{NJtk5O^wS&Qb
zjRhbeX#Xk^&hQWTGAjJe*9rtQqXHR^(Z5@_0>zAx0saxs6#(BORdAJK`)e~qYY>V#
z2k31K4e*yL>R(WjEf~TFi==V_{?aJ?3(|4|^~M9hl7%#Yf8_S?!B36_c$aj4K^M+{
zpi6tyKfC-_c@7+L@fWDz`Ug~WME-N$|L6=AgMnl4{P%fhdxJp=P|pM|;6DOC;LFYb
zS80(xe<0u_3`oHP8^k(^2KYy!<e$tXI&kIsyKZv=|36F)_)ECruM+73|3EvF41oWn
zs)HW@iNB!8&_9sO6c^w>`NilE5Q2X}A0z%iT~mzE|725vE~aoH<NmCon`Qv~o1F5$
z+tq=<5FIFOni}v|wEtg)cO-)$UXa5S8sJaFHTb3!gPSv+zo5Cae@aS7LI>4MqXGUC
z;R~)Se_xoHj6Zv1orMK0&fpOK8$bEKhc*M6ouvdP()<%pNe%cXObrfvrQ5;RhyAY|
z_vL{LqyQz&k^%k+JKF_A_Tby`Pc!-NgkSgvLe3%nb9jFR>HJH9mo!VjAUWvgAP(T)
zZyWzxuReYQZMKtxn&xl-|LNF(Pn7Ymk^=g`5c8jk_rEWJf4QPT(5HF1|9c6<&*QxF
m8U~fko4u181)(jl0si|P0B-O8Yswl0=`GO1-jDvX?*9SdGW-Yt

delta 47706
zcmZ6y19RqW)I6ApZQHhOb7Gr!Y$v}-CY)$u+fF97lZkEHHs}BByS2OZ?gzN4PF>Y?
zPM_{R7tIhc<q*Gl;9l2Kd_};(z%=4T)nRn+TyI^!f&IphZ}ddE_SH+hh6Dp!gaZR(
zO1#CzPE`6v2<UpvYoUH&j;ByaVq1TMkwqjMoHA3F2g%vMx57bYiJHT5<zo(YdqVz6
z8e^y2#A$y<xmio?PQl4cQTKgY17=0U1+@R5J2_`$xuvf5qzh2|`}}ye1~ckYVHfw-
zA2yv((E05wHcZMqrZY%|mm0q}o`6V_VrkH)+1-gT2*8&X{cNS)Z4aTt+tf*RmKg5%
zE8E%z^Qn{Q%n<S1+P3cRlgr{2{N1vOf`JSNa(|>VT7p(~1r?RI5HCZBrWYrs8Xh&#
zDi-cU83e7*jI*5Xp=7umi7ub6t7)vs6tit7IlDC@4{k;`PfrP-k}<El7gX%%$j;!h
z#d(>a1f)`Fa?CZ`u1;iN?XcVy{wSPnS}=U<&Y00G{4KklVufjC_{)kKn=^Zo|F%pk
zNbsQv4V$!snI%K&S8=7Pu4w6aSCJlOz!Il@vn7p3lZJe{Z7dqwg)Q!cvVpPOVtuP?
ze1WGdxbL~Y0OeK2eQH{l=@BI2BAgCmZ9`SIGvGtXx02R+sl?**IcYVmIN>sWudmw-
zvMW(d$Wx`e%ZOJfx1{LkV}zM-ZlqJ0{5#Znq#@H(RcK*S9a_ur6Su$M2XYLu>l)*K
zuXb!g*RhzVm}q%}RiQXYG2V@S^M8{UlIb(tNX%oP?f-2;zcL5|&)7})?OP*Ol8bR4
z1YnQG>MQNiV(Zcs#v9nzcCUkJzc2ACr!>ce%TlFJ=0!(zn)!9?&9EXQL<Q6T*K}E|
z5q?6uu30B6yzodFjw_SM0$h9Z)WExVU+Rl|pM<~CkImMSuGW%$j22pkln^IO|ETK|
ztP5WwI)Y{`3xQ-z)?ChUUuLs3Ps!3}6QCiYtB;(yIl`L5^>jmCl0(o{xscuF+|rSZ
zU04f0j^Tw^<Yp!ill4o)FE+!Pr>;HXquD1Q)JRl?Q)?S0sv(BTph~Vpk5ZkIZ$<<1
z8tnlmEqjZ3wQ6O>B`4Ghsnjq%K(i@LY=G<t31)g8q46c8jNzpTDXM%S&ac5T3Lv<<
z`b2Uxq(|u<ys*e@W5o=J>`>00YU*RfcF2}z0<)Xx)OBf&nbM0=zOclw{1@fTImxx(
z?Gv|kbLz|ENWs}!9&c7nS>cuP9R6drgl`_YDiPJUBx{<+l5>gOo)WyL>JDyGCoG$8
zYhIBeyTDdm;`dOHCtbIk=zWQlIG`lDe$aq4Lp1FWQ#)t<${LXSnu`LS>(fYFtRL(d
z<oQn$tKXd8-6VSHhr~vlc_V!d*f3ggHZeQ3>@Nlp8otP<k3kJAqH&eo@d!Y4;-!S)
zMjKUDBuGQ7?$;FFE!;t!PG3$Pt{VM{z&^^mgdyc-_U&UnjiK1JA}Jwi1b{yFLVddB
zMZx$L`Xys<&4UQ*eE~ULC=jNs7ykGC8@MZK;=`dxq^UtKtQK0I1NeBvKw-~`v`$n`
zE;ZXB>6kgbi#U2Ok-S8feH?k@{)4_Wr5(-5KTYvThnzt>N{@;Zgw$vL+bz;xvPtt6
zq1~iSNm`@kKc2=_*wWGwFM&!k0BX0m+}f>MeeZ|&iFLFhQUr}RG(9dnQQ6K81!Vu1
zG0CrfmVaOOnBnaCrYtBbtZGsR)7kxq3HmudV83Nh%Z{A-{~~oMb35P;Ce9*b4Rl9)
zRx0qwOXb||*9BiuNfwczi4Si{Oc+-te-Yrlev$iv`K|x~i3tV<3;SO$1QP?Z3AV6G
ztc4Z>!gBgZoXMC4#q1^Q;pF5hx-t<^cJc=?UCsrMgor2nYoGVwNG1Avam~d2n|V^l
z1InpP+ncIqwJ^`+H=s<LIog`LInQV_E17VqLqa`%G0?y>`J77{DvSU?Wi*($E30&S
z4EC0SimU+sazAZgy9T=x?7hfucRW-f|56gBkQs7BacNv=lJJ-TBo8K{0I>hJ(*G%R
z%!%I(1sn`a^uIpN`CktwPHcx^0zxYoU$BsdLrfGEBS2~nW^bIKa8;{UzfFJNMJf8v
z;jG*2q1?#eU4v<g!z~7+`5ouDT?=_xJssCNiGU^Du1KTv5g@x_FQK=B%!vr#?5XSQ
zH}tuio!6x?eGt~MuUH3jU-N5oIVA5xg~D`{xS<BrHc^Jow|0ZRJH3dB0%$GF1cEF3
zV?6IJtR?G#sdYqDanOr7j#1y=k!p&~oQ*>Bzc>Bx>Imj7Zr5O{E%xR>H8Q?cmZ7~4
zy$BCFn4D~YqDLHO%J-t}V$pO1zqkBb7tgY=eUGw%5c*`5NRNHR{=-yAq{XYv3_6Z5
z8Q1j~74O1uRUPSej%UAA8OSe)-y;o`s&I*A3>#`*$~GH`{%B@M3iU(&b#p@a54^Mu
znogHipfwJrWIzHT4)@nTuQbGTk&2QZi)|PjMd6X(Q1rL1@+ybOB<41v5(XC_!m9lP
zf(w#Kn(0Fu$iiqiBL1ai<iy6qGTAxQRLHxaqmAP{*&(jtF+JHG`2yNU(UDwlc7$mx
zzarYCd^r^w@Bhvr^!GopksJSwBvrEW$Nh+iYUHN?H!vV0kbquwaZN6O9uJgx$R-fz
z3nuWY#-Qxp>u0-|RzDP0N*a$HLrd##a%n5IpfG2$Z%&zrU|lln#4;c$sYZU~aZayN
zFhYki2#%?=h*$oA{*M3ufcbwQ^7|HT3I!PqjG7P(jO_n{2*7M^Z|dfjt&3oSx$GgN
zvbKpABTb?uTW4}(){FgyPw<loQ5qc_G67YO@{fsqTq6a@l#60|3fxtnCstyQQ)#2o
zMOfL4Mp^IK_#zAoPWhsQ$#H(^lgA-3aE|-49rUIo0-C$u3T)JKz$|TkJPNo9c<%O_
z?z--NJnnft1*XAQ=$LV3ciMwYJ2eKjtS#<!S34OqwGYl%PF}Ktj0agjFP0F{j=0`f
zJ!U)Fw?3;M8AY!is~=%O>$e$U+Y2}P&>1)D(ETq&5Is@biQ_#inIbc{P!K?bNWvt^
z_)!#ecZdkvP3a5A>W2@KRDkY?G46}PM{-#0$%`EXpnuCF_7}kaMg-XHT;Du5y})!j
z?vUJS5^=a5<sK*-Cvq6i-%P8e1M!nRV@KN-_t$@3QC9s8x&P5&y|EDebJ&6Wk{RJ~
z|ELXf!e0qbb@z`l?%Ssh`Q1goCaXcfOAg)+i%(9;X?T)R7Ox)0Z0lia>zzt{hN#Md
z?>_q%FdV{H3gMb9ifU@NS(1!mUc$r0Irl)D9fEGVmbN8#oExGxv|k#UY>zlIi(+=1
z9nxy+<5sd?9<0u2RRRM)%G+Nt0><P^FB?U@7u;Bw9;`le*KZTmQ?7l%9}CS#P~wmV
z%}}05@JRTmNui<6-VA9j^<za$i`hM!8Vf}MhwYbq2?%qPVQ3W;4T$P2_~MOpyvz=J
zLf5YJE4*p>qKm7j94-+jzfB2Sm)al0w-H>{>Y@2=OHh>pmV6wWY}*R_90uI2f~J0_
zMdz@bQ+`*`)}`|jqm51iuJ=>&nI!Hk{B+Cm(JAq6Ju_W$G^f`%Cw7KX)yWxES*vUS
z8S04_#zLnl?db|ddYjz307$81L3e|Wfy>lKj&Di@`eT(+sSCuFTwc&oVYNN!vVFql
znBkgzdZ0MmFs_<6VYEpf`5<W&-8)&`7C^XuO-w>Cah>7bfkLI;yr$ZK4p$D()|i#_
zU2X*=a(eJwV?3o0j$)AU=lGC3od5w~hauX2B4m)VWH+j?UncvrXg$}wEMR_YDkr02
zRZ>bNUNQBcN<zcIW2LZp?yaRaLh>gY4@l`|Fsay{lqG|FRaJ}cHqpv7_~xp*{y09!
zj!Nh!Um*`wu^G)Wqb4|Y8!eK13$j?x*mu=TxR@MT6f1RCRnVV*YE8vlF|Yzwi4K?c
zZxb_YiYfJ4r{!r%$GVyd3*59S7&k2xu}0kMICt|nF4_4M^+0~lHQ%h|ci)$m;9JWv
zt7ABtbItF<9Dt?bL++#*pC|WUbM0<+MLZ5t26>CF5>7tMyuv=QigP2bS2g=vKMso%
z5-Qq4Dqu6gcXQDDf8S9EoXZ2e8dn5r2nV_Y-q~YCjN8O48M`TCTRMSOmfSLytN}R!
zM(#qyRGsz$P>MlK)mUDv2OA-mlonIflSp@XPLp$LF3bldZg365N~y|EzUqSwXl@)^
zNlb;2tjs2@3RmWP<iyF7nMxD;rWnL?)c&g$&V7T=`;(2ERoByAljDFODcABKvU=k#
zUr>!E`*d@13(R4Jr;>YGfx0`WU>&n1D!ZgrVgs}X*Euu@bK6Mg8QGB*2(LO@D!!zg
zG>rVShEpPmSq`nkvOxyJD|3%{)_jk`dw3ARJ3j39nHT-Iomnm271q0Az43<iFNgwd
zjDV6892hP(lV1{hb#y?i>`+buj)8;P(Ki;3>vcFKLare;Hp&?d#La!FGB`<i><FXA
zxmomK=5n0XgVk^)Hu6|Ivjt3=!8B^K5?;DtB{s4!MHhMeO~%l4x~&i#CA8E@(5&4r
zjz3;K_EUd$yHV0!@II<UzrWEt{DK*h08dqUjEzBzC5(+Ng{uTk;uC3P3hBipQ>`P)
z{Q8~>QY0MapD^75-Ra;Y19<dg+f>=5P#6Fij84_g0}JUncPSZl?)je<3N(0vvx=%F
zRZ(e)dj>48vce?Q3^M-4)ahz{xMSrs)e`oBh|}q2YB{d*l!~TNpd*aYb*cLD8sX%4
zPB!yjx_ycu#$o`U`u0y5_Yj|pa9oz!lY><3n?VKN>5=<b6ulB}hHSc-@(pC)ZDKe-
z9IN&OOCduYx8`4Qa8*9P^7A=^3On{w%64SE?n9P|b;UmSAMK!}2{#ClQazGdNvEJ!
zS5O0+k?bg6hsAUQRIA)i?HeV2U$)cfn!R@m{<GFV&TJq(*Q;EDe5?(MI{IWb(iCbn
zJiXmjY%3YX6;Ha;F-0Zz2qXI;+xk}{B5!hAJM+PPS~|($y}E=WZwqH(+i8u#8s~~W
zw?nyNvx{H5pCA8PyHJ<*XG>v`9lWuH>>qh$Go$i4{?^7$P*X^AVrD9|rG4LRwE|TQ
z?NA^1ITJu#p(maY`TP9^;p|RF^GEv+{a@^3@=g>E?=Y7jhQz(D`uYQ6J?YXXR)u?t
zeHB|%pQ6zi0)*5lwHT}nfm~T%kmhPOb$38&u^8N;nr>5xhou7!sM_Fw@igJsI%yVH
z8IX&q&sQA$gI-a52ahIa9=(cUt;5T_`rHgJB?lbdHRoW{(Y2-}$SeNoL{EfL{C5W)
z&yCNh^skrzN>EcBT7UXMt^i#zE9>#@&}ulbn>IQ%6|7BntXiQ2CY3pEPTobMB%&Zt
z39E$8_z=xivtqtzr2En@Sm(DyIJpyx<yCG|XIf(`hb0SxpD$LE|Md6Fr|Ug7@k@9f
zg=ip>HL(QNS~{nxylRZ!SL3X+8GYD$A<Afurh+TO-}yVb)_wNqYk5*;3Ktp?Ze~W4
zrP1t)$X>~(fm0G3%XUMNvB#6Lg?+l4<qq*(RXU$$@njE~Np%+9$G`efju0DLhGgb@
zlkS^jvbEPR`kRkQ`Y5#?@A^@<3I$a?Um3vXvx5hRn5wA`@dnFch`p_C5B!puC=;jQ
zQ-D?<l`%k*_7g>8hp!>H)IAj|F7k2PG3H5$A7|q}WKam}!mlKFltD<Oi0mEP|J6=T
zp%`P#%WC~>#k8{nNAsr4+RN^rt#DGAfp1huiJ{Zf-FWQxJ~gb^-=+Q7l&px~2*?2Y
zUcM}A5vV+PH$nj_a~#uGNfQx9W4N>P;~sy88@u06<jnPkJ2r%3kT2CBI~=0yC{&g*
z2V&I_P5Z(bx-Y*KyK%HVzuSN_uU332*|Ho=&0=3QohI~K8>2xCgZQ2e2S<HLP5pOG
zjTR3hsXQk1)?X(2Bbp(tc}%05h%vyWmi+qgXLBKOiy4!n1Z4F}2$6iMVH;6YyFK&S
zA6=pb`A5Oxs0+Dj@T@}xy4ppuVyZgsDr1RBqy^(}G@PiiE@(HoRNtX(F#`7jxJ~)y
z^!@R1Y;Qy-GLNaW#b4d|6jAMrXDUriUW^6#{v86Xo7orFYU@&Nj6;Q-J1#({W~5E8
zWoJy5leI{1I@?n&Eo>z|4fcVGw@1~1Z}8>vOxjRJ&WuOM{_-ql=}uFW4RK`1ADdIS
z#wHo?C><Gv+Ur^JAZN+~%X%{Ozh>qt&PohMbAIl8?VuLbhSFv$6+=qg*@hL&ZA0}(
z#-kcjH*6jNb&`b~e=A{#X&I>JBHn6_xMXQr;953lep+Z+sBm&nxYXO=*S_Dfp4obm
z(+JmZSaFe8TJy8z!)Onx`)K4LNYy_R4sAx|r||V~Q^LNS2F|m8g+HA~Lpq7ZK{lM6
zbp|z0F}CN9Eailaoo5)tadv(L_pjM`XH)wT8EbB5odRh#;8#aw;Q;3I+{b%F)aT%G
zz{B-7{$d=z*%9EKE#g}=IvE?`Fk~$23pAdMOk|b0<P0kjdoYa)p-SQz25(SqiCtjM
zLN3LlUBo^DZw$*WVs~`I3p{Ziwu^tZ+jcKrU&{~Jy>F)dYF7XcSNRBoH%#CU<Sq!3
zVSz}^7<86>m|JG?Lx2qWr2}t|E9r^$Fvr?r`0u-fH;OIYE&B8m@xm=-?Viky5ngdY
z4H(VSowFGWOewu;ROyYd214Wkq0ILaZxLb9amFB}RF+S{KXIz<AqOevtwLKVL&|+e
z$X}bIJ%%40Q9uVy{jvP)4%v`%4W&i%j)Vr36dDONRqm$`8ZdppG5gj0B()(l_eu}W
z5^@bHtzz`e2`eY;NsYaR-S#7T--}uy>1K(7aG22R`mmankxVT`3-@j1ToF_{G$m3Z
zC?<GjlVU7x{2W?YH;(T5^iByYCx702DU+vws%~*jQQ0!UM|-EG8ce3~`TAl+M)nGU
z`NNATZ19Ok2#lIJ7g6|Y#KuAK#%lAJ(hjfYh?bJ}Ib%}@^~sW=ADlUNwhQ?SMyaAl
zcLrl<|HV(Nq8Znr_@)}!N#jhke|r-WeXq`<E|>k6aKDG`sB=W)&Rddb)#P2PrW@(p
zr_8Y=iMYTi`Xvg@<v5~kB%);`k`q+$e){@Y^uil&1Sp+Vzo<TeXX(a~4BWe~@nvxF
zJo6HL?!Ul2nMK#-TBwvX(?lHwsHG?1upfS57KZ60^@JaA+zId|T&>^*VsP9!^G<md
z?L#|S`8!ScWd#9w^)ylQ*?e)vWWrO7rZrNA2r9D_*M;=g)(Kx=Ki^N$jjtK$8`SgT
zpE=fU0k^X^c06(Iq}s{@7FD07?!Q7*2~%O$rQ#C14f1U;MXtLrt51;qD5EN@_M<Aa
zf~#c=&!}}lI)c3_tk|Wg=C|KNgqYBO4Lv^Tbh0h<NuNg>4lE?IuLw&t<rIsP95#Kj
zZTU~5HIp0@y})@SQSgP{$-wPmHpDen%EbX{5=2xJ5nUCr=zU@qi<dZ57dWd3uDP47
z!$uKFxoQa_F}j-M8m1Ym$T967Jw~$qFCzb2b68Mj*-SjaRRLz&Ezu~&;}-(w!s+(@
zPNe-?DnL0YB#&v{9NKk6K7I@o{8q(!v*UAuL0w-FWiZOyIHzUhmMGQFW-5rl?vq+z
z!Z20(x%PaF)6c4r9P6EWq?qOioT*kyHn54=GU8OFR?F$oW=BYl^IEIg>84Z-iG;Gg
z9o<p0ATLK#oYSJi5;anU&xFnkKj3@r1pfb|k-!L6G$Uv*utS8zEj$50-wop!FHl%_
zZta|l8<`hvglk5UeI@uol)i&fx=(}D?T^cTi1^Z6c$armWsTMk1r<4kwIT;!`L!_D
z`OG8o`E)C4G}P%3gC>qH$I_m>)V5P4YhTqj|BgTLD6JUNF9O}+#{t{Ne%iq2wG0Ua
zZ^$}-PJbJ+U?d!uqAf2_OA$+lWIP`~$k*f}R$a1wTaaO_MuW3(<H2R1F+hdH(lVen
zjz=U!d&;S~M7r*xJEBF^jn%+^WKx;Qz<;#cSXgk;c6r0EI>h7tQg#aaT}AZMgCw8^
zL)%4Zzyk>ZzngAGT`*h32UPW4&=a)xv7)mJ6|}X7bzYI|!RQ5W3!uF;3kWdIBtLKH
znY8sK9WE4$%9v;uX`>9=fftb0m7nn`_aPMli>?c%u7jSJI}xJfhO`zXkb6G0ibGcg
zmt*RWW6=*Z)p#=WfYGRH3FEfb`;n<&S_6nm|KVfxqRJ_mD81`Qf3f1BVWcKC%XhMy
ze#BlTHbwrA76H&=V5jv4nbFt}5j5+L8GdP*yy4tf3Dca&<l|U=^*)F6$7kFnX=GPX
zVWHHz=C4{_^ys<fy0J+F4eaQx{5`k;xmc>Ff?LYDd?_}+3FbY$>K`m3j0W`3UlSFx
z6IcI!%H$coMn&5j=?Oc%OCHh53Uwc*bjf1^l+6yS%WZ(B7iTHgEOUnuhM4f$_hu(c
zIqV7r%heXPv-r``U5bTeU2<I{d)F|H^g3%phO+ks5|Z?ZYNdzxX^o1%a$yt=LJU9U
z*j+X}35Qaf-NTaC4C=A1EVgcK@9Z~If(G0lg&xq1B&BFr1mqR;gGQF(O*t`)Hd(mN
z+umm{2-JWv=rHGj-atZD)(8l2X*(O}?ocNL!S1(EqUv>J-8bm&pV#;=#71N)VOevX
zLE4LbsNGIGFs+~+F0Kz$9^H#@?x{t?N5a%ZW@pyx#q2+)zCpTo#aOZpw&j!=hg9I{
zsY2TtjqEHKsh}O1_`+qRtX{bw8e%D`pfq5zmjHOF56i`Uq1)p8KG+(Ti}%78NH)WV
z*91M^VPByWIBIQ=E(uajnY2qGV%?f~zf)i<<gtS`f~B^$eMt^#xoHkFCU`+|w0Wrx
z@^V%iV1nowK+-xhePA+02`q8!<7v$JMfS6V+$bB413PphajGhC1Yb&77t6>|&U(o%
z{Xf#X&4i)pd-<prLk+bsfYNy)YjWMrVjfCXprm!AyBzVw5@tAF1GV9~)|3)9tJGV_
z!8KhDa~F*@0cUTBf_r(IG{NE#^;LYreS#yvgK1I&4&>u{P8-HGE?wj@QKe^5*roMI
zPR9Qk!-*HppShI9;U3$XLdt}xu4~|{i~^cBZd-)#2?uV9DXKFJf?Un=vH!wX9_iJT
zmQ8;(lti&c)J^8)lAM>m&^b!LgDgl{dkqo!eKn_d+O?aIrd+m=$i{C;z2=iZ>bW;T
z0;mw{B9itdBjGlFA{xS&6+?VaZW}+5FNUZu2Id9XD7gHIjUxgfLL4Pq)nd&I007On
z0CRJ2Og0Yzb()b}xT_~<kUU}DE6-(hOH`(IDnDpSfK?gkjvGg1h~T6>RKj-a0hxbs
zBLLwu>LlIq?8&hNz1T0+ouq@s6)s+ZJ&6f|gw%7Mzbeu|redE3SJOIRO~1v(8%@6y
z#_#=V=hlEc*=8rwfIZos6boMX1@NQy!C6;>L*|_Iyk~CidEddXG^<;DM1Ip?#$Q?O
zh&umdFd=LW-vs9q8iL^9l-0;r0{1^5E&fNh+}5pl{FyaNZnI(i^)FIIipOn*iMtZd
z5)C8WxyN{NqOoGxt_n*wRH!J3yx*;ATuN)uY<4`U?2j+k(uJnhvC`7913)<J;E&fM
zgADYtZVkZVFX#=@3K0*K^2P%BKY)gSe=sz+U{YuUp!{7#RYIHq+K5YDGSB+9>qEmZ
zFBli<gTGMhCBOV0ZV)+r9cENwtq=Opom%lrWYB85gDDOsiP!v7tQ};dh{^FxFR;JF
z1Z74G*uTOAbB?EH%{6#Z0IrcTpH8{!>D@{)0O8|Urc~~+bU+~QlliU1MCCAUoKPj~
z_*h~>nsR=yv{L1}`ai~FofnO-=$atE6`C97y`g6x!cr5QP3fbz->}A7ge<oo<W9^t
ztDPHW-2|o1dQ#Jpbg0(<{y!(-f5cbFa^FpZ|MYoP$o~ZT|J!8sox}%X)b&;H#W265
z;|-S{)v9Qlnr-zV^;h*SHRlJ%D<U;uN#Rs1Lg8wdJ1lhVKeW3jZEfd9gdb$Mga*_Y
z{{HM3ZJYG!b~~DwxE2u!1lQ@W2v(gK^)A?<%aMzqgEcXdHh76dm98V*Z43Sl)`jY;
zDy?Rt)UN=ifS9QN_Vfmb(HpOg);JYE%!w&ar+Ciix`#QRt?+Vjj@MP{O}Qy`w2!fF
z#xPj^IgQSl#8L3`jW@NKuP4Yc^@AF)b=~U;U4BLo=4`cED|wF37s;Vzh2+kLr;098
z%)I8Y3*VR|2*<_=;I$l}$E~6J@MPT~N=FKl9CNAETjZk0UKR#Aq`RgJ9ZC<0Ia@o<
z7re(@lrubR16tS6tZ`##KA19Mn;rDBSnu>!ZM}*QvP$%i%!0_)qB!UhG$mQZ41|6D
z$VD8WiBWc{)kkANKUyJu1C(yA>dU-;Vqra_TBV)jyi3nF(r;M88qQaGM|myOraT~2
zddHz4-g^<kc-#OzvTrwOsa>((uc~%$@dr$j{qUB_@UNrEuzLci(7PN*y;(@JU4Eam
z2FQomOxCb6ZbkkP0&@|~*$>CP8u42gX54&J^(Fd@_ytP98o~wjCvM6BnEN~*q-5#5
z5($Zzv$7m>5C}LX#`?c$M@<-bV__&YNq*1?QWEuZ5;p;fDtZ<VoC5)=CoET=!M>rQ
z@n!!>)<08!^Go!<K<lP0hmuPol50hHBF4#0k%qOM_oHLeQa@46pY_zF(&_uFYr|r(
z<b}YLfAKBcphmhO0^y8L{f-w@;;to{o=+_Qo3Nc%*(R32|7Q^4f`QTh2TP~K77BLY
zcfj4N{ZD&VazrsO7W>fnkd=^ydL&#60()~aS#jjoIw{KRc;#p-4@x4r%w~7$O%6F4
zIsMg`#NShmr^?S;44Zy&|2hQ5|G57EKA}W5-?v(p-;HuUrU&A_t&nn;uY`4I+7Bum
z+^My7D)xb}sL&09QyIKNNopVVHC>+pTddkXp}>vv5j(6-WvS%BivIJ%T>_0xG$*wi
zD=aSL7bg1V{py6{^@BUlwoZwmfY$%)Y51+vkq*j}P5P95A^5FIGpwyrGrTEU@9#tS
zqldzRMLVB?{-RPu!e!)9aIai+sVJj|rXnRD-jbmtabut6@KY7ugd|$GX#N_&(8!Go
zR&Fl_ym0xBI(_qw99HhI^~Xz9(Q6h-uJ#So>#LN{OOoJ6g2h7;iE&DF_uhy$mcP=P
zYl}hm)d<nuGeMxg`cTV_1Jw5Ien-NKAANTm$=}0p`oIv9$``o6iXCfu=v%j-HKNbU
z?D!gqcj)#vl*^0rQ~re(>$(o0R+|)+uYzQGz(t4;pSVt~{=g<vR4P1OQQvnCe{LU7
zf>c9tYn5wdi|F)h;<nsV_37&T3V%W@but(mE!i=K%6y4C==Bjv0=yg9Eo82OyuN5Q
zQ;v{Z?dRKWD_JsUp|8KJ%Fw|U)LT`(j-H9(pkhpzjQX4G25heE>Ha<-P2V}Nb>-zL
z<jW{m=nwY=&sZa(WB-TAP$ee8xM`&R$C>L^aVaD{QFI#K7I74TU^Ssix?rQ3w4OL*
zQW8inn{6*8_Po5YFK+SGS9-tRIXqqVWE2f_K}--HJyu|K$BQQytbhOqtz67RQBOld
zA15}#iRVLm)QV;PAt(u~xk}%iM0ArH_NFkqUX1J1dwWAOU%Go=7XA^KguG;o$t)~X
zTaD^0K&?lS(>@e$SH_=>wnPVFaK64)b>=P&X$prM`4->)%I2d$YAsF24qs#=R-Hw-
za2l!p*!qq;9$Lfw%8tE&lmEJ}C|9n-Oq39YwY9uG$sxu!Zv72_QKn-0w3xy@mDis5
z9WTFbU|V8|nY8Bu(^n2tk-$D@MUBO^Hb2Pr5Yk(a<+wR|8-4ggu7YT4aF60sdLbf4
zpN}&$pqrZDoF$7|>d2Ujrr`cCgx@4{cVT?5AlM-uoXa5UoHKe)3#nzt3Q5L=qhmG{
zUT%QphSN~<L|GaL0}u%3ju6>0N769y10#*;UYf$TcUlJdsK2{1VsM-^DE*Uxvwa~7
ztldR<DGU|?y>NW>7iG|uW&8S8$&f7HXn!aTY~P|Ffi}u_F>}iM`VHZ~%6E-lT6)z`
zo;}993F8`e1d#<MF-BX<<LY2|X=peFaat5uzO0+qOXz^7lO-KLeh11GRdw|19)lC`
z1s_u5$()qt*7#ezI`?%QvO&QTy+Gd?gYZ9=B~0?o_gK60l99BFA^j2XBAOVMt=SF-
zdSL=h(s_cpl4S)3b0B*hx6|8SWiyh+Wom=qN{pD_q%`abq#4x)&6E~?QMs@A*d~1C
zjHZ4m&iw+YqBrt2D9R#=Gg@WO&IQCdxat)daaNY{X%b7Y@YzmcAu-4>W6n<>c!db~
z%}T^;+R3&E^C{>!(0<(|2vn8EeBWGiHyp3xycF<Xh|tT>A=8qNBvYzN*b6r8NXS%I
zrklQ-wRK^WShowaPx>8&o^ge)L6%6EpM+nVQWFVqnN?FSMe+xY{~fsG$}ifq7e95O
zz!yO0kQT2$;CpGIEil4BYK^^IE$m`-C9(>0ZxG_V#Lza1;%rt$Q_9d`$<U1rwjao7
zg=}Fk`&kvIe;VS(jUm^iYJ_sz>SJbnH%vL6=kzwGqrT0W8r8Dk{@AtQCdi8t)qN`L
zo6`&|9J8~K%+Ftz&nouI>fxv{jc89n%9s_VV<Ol&sID_{OB?x6JuR?l+X;>Y3$k~d
z-qPc9Rek8Yj6TF@3ewVE5mGom5;Ff1WWI=YK!Wn)leDbzTzv$83~lA~d<>O=qaWAX
zF!pW`*tB(<m1QkmwP?14de*OB?h2m@4gCYab$oS3cQJ>a4qyB5SB|WMV-7S2mykS+
zp{Srub?y5cd9bXwGCvVc!W+(<^!>TX*&Nk~9KS8i;Pc+atK<E7v9YLLB|vjz+1Ay`
zh*YVaI*^~jKD^&fD6a-0wlB|B$L$(!Zf}d9`>4RP3Gd`3BmiX(RsJB#n|I%0sw@R6
znI>0?&6diY$&iO?ctyhYVP3~v!&ro8ezi_zC2S|SW!I<1t5fno98+5yyT&vsO+#Mg
zFpaYNoMM}f`S{3nH$ac59l^c!H*_UV7p=psi@HzLZ4(dIM-!L!U>_z5Xxr!yd?T+r
zz~JBa4wYd=_MP#Da*c<nHk9xL*EI)}Ti>F>?x0!P-4M@&t!?zxu6>w`lcyWE)cx;r
zGN0`aD}`Rz&}UoeSi*<zk54W{F}ED0472)nFS!HeecEH#R?o`cLcNc#`aRqR4(_9o
z-TobiF4K0HF9~p)W$;)H<AuLLAW7(i#;id1hLeWX<qq6%ZA?nwJrDT!CBFj@KJV~X
zC`XqJa%2Y(Vdsw_A!IOic||VZdtwBKsLN^ut>8S)i-eFTyc65(l5FCP=uz{S+R7{Y
ziD@{XjKL3L=I$-JBt(_G#zmY5%lr$JH+kYvz&kL{-ed*mJIo*2Y4OZ&+Op2Ykk`55
zSadjzDUb@3m;HIQY*C_ir<6d2esZ3;%_*jB#2?zIA>9RNpFc&5Bo90)<g`2r`r}I~
zdj(otW!%c9tIl=y@Z)XJT8d_ekmBk(T!arQCXbNJIsN#qdYMD*cpYA3y&g=Pov|rP
zvxZ1zQWPnLaGCYQ0<*zg?rU5tqTBYtVkdG2Ve55JUU^t7{aRVW$-F?6=epN^ED+%}
zh`dGN&mB9PYndh*ZOl%Ja{G-h>^12g%uzB+$Ip~Jh%z7$;vdIoaS|c&9<JJV+RE&K
zW89CV=JdD*#J21bqY;<jTVBvO+Q}}Dv6Ew3;Q?1%kH^CS=2;j4#3P1H8sw(_d2q&^
zC<k(Rk(nq>#jI4SeG3qycTv}`qyhf4th!FC*&SjSl-lm2sqCpV)x!a`x|p46c-U+#
zirsRc)7atN)ZDLIb!_aGM}<1ImjGu^Yq6X-Qo}tGTkD>>`RSg$;HS;SZB<VfHK}Wm
zF=W|sEg@wAuOF64?L4GAW`opdS^sFn7~k8Q+$~e@;2pT%O9|9u^m0tKk2R|7oN+W)
zK|M?!)=)FhLg13xN6d&Vn2@MjizJ@lYh8cSA3zmq{{gh@>TWEudQT6#{RQ!57^WF_
z#~D`VTCpm;2uM~#5b3&KIr@WRHCq|R@~@{43Xm%;fUMQ?1fmRu&P&-m6`~)z1b=bn
zf|8ps;ohdMnt^Fw-J1aG(EzHo6Wh}(<aeCbUzRfi*M?8E=Bv`a*dO$TNLcnzO^W5o
ziep@g7u3Fdihyz7OAA|&7n_F{heL5wOw!C?blXp(-<uUg(*yT##&RbJX;Z;zhY!67
zmo~*NrFPH60+FY)!=k#_epg~KiOm}qlLf}U06GK*pXAO#xfC28qb1qIK|g%Q4@xft
zueObr)(wVIR@oA)B-WsSP&^NH;#B$6D3e*aDx7~P|C`kwU+B0co->O9x1E*n5MtjS
zj9S>a<ps{%g)?DDdc)BLlJQ_iQ$Jqs{WnR#uuuF>d|_b&3mB-lRA3WNsgJd%l4w^=
zaYBv9IQ6a7LK-N@bT-XYlhU=UQG~|*0@&)yo<qbMKXfP0CHi$TlZwM=)au4=3Q)ti
z@cVDfS=!`RpOT_lDWktw3y;*pMV-IHw1r?Bj5{cJT&_IWU-tqK|GQkH$e-pCFkoPp
zD2cbs_=$m2$UwICyO)MG)|c{;OZX_1xL%oho{~ez=!^v^=I<NSj2UiESWYrYT3aV8
z=0pUZ=UA_+n=+^BX<Mdl+q3t`I9m{v1npYIVnvf}<syl}xbY{>$53&g-<2YJIwIPH
z9^Y|Jz|-oxfFEF;%fa&bzIqI1-*23nhr<U_1jQ;O0;yKw_zba=y!pEpglsGL)cX<p
zA&7*puI99||B&Oo=P-+Ji|K~gV%1%;hSPDUejSj-cXEVzjV5@F+!A+cQ(oH*z2AOQ
zeaS;4aU2T2+12ugBuPFpXY)50j2pa#^JkBh8CvBPrkXUzpBlP3#TCXFur_}&AT)gG
zR1{=h0=iL;p-VUg^LL~0yNhN#$La(ec<feWs{1!n9OxOxvsjh!K;uf|-r?evCkIsp
zA|^iYJPXn}Tt;_H%Xp6$t5UJ2r840#Z8o80mWIcz$t*r$Cv@(X1}wQ#e$rFi^QA(C
z-&wmJbY`BHD_sK$W+(rK%yw9w%YxMMg`BMj0A*nzaVVN;C{>`J-qTS-XMSQlPyGRD
z9lI+##r(Aci&&YtgjWQ1Qo5<j=)MHI;EKNr^~%dF`t2_IFioO()MZ}4B3glXjUypt
zAk2ES^}oy-Gge+63O};Yigdk=n(H`u=IO>@KsYEm(pJHf>xkz{1>35DWK1qWze+h2
zAb^mP-d09=qxRbM)zDth<Fhlr>FwswZTLQ^=RbF&oMB{QTW+4ww)ewtt=^DgBvfWJ
zr@&={(8eO}sv|VoXRL9Q^{Tjf$|bBlc+1Vu*mUtDEsJSkZ*I2E;`l@93fsOx^uMp2
zxLhPx9sL`0i(#cD$b?sa7rUD(sJGbxe9xakS<Pnh$vJ&F4II|`!RaQjm(p2<7b00}
zRV1^J_7I@F<QY}eA2^@u?1tZ6uwVI-5xeP~7|XO$VV=q9H0Vhbu##_1<9WLBvvyvq
zi-BmnHxtXzwrItWYJ4g^C)R0CpT9finsq?vN{;B*vJ+-|@m9#+cm$=$N6kV67>wf-
zEZzst(TaG$M4Vo}jaK}Ji*wqPqJn>o8a0nU#?NdjJz^<Xx%(?Ncc+v;XW*VcFf7;Z
zB{UZ2Mggg3?zUj%mFvF{9z==5n^{PRxryO5<K!oF&*Du&?DnoDQqS@&%!lfKE?n}P
z60A(gLkE?>@@{LO%&5;_diURS08#h2@+0kFm{Q>he*otP&FWh2ZANSlY={`#QpS)n
zq65#7k?Cc@Xl+mxV>yJ+{o?0uV%=%ZkFoggD_f0}Tujsm$}Y5Yix!}*2NZm82GXqI
z+uv*;?zw;(`(F;>r40hBMZ!#|ny-VQY}-hZ@GUf%izCD0%eGiBw&gXwfF)mq-VoTa
z>)ytHiJQv=Ct}VIIOyTOR+HomZ_-N-6CTTF)az+ci)YlsM`uaYT(%1hIvR=h3IW>t
zOgNKpQImX)nUD_moJ%v@T~Hj3!p3mtotzqWQ)VDpgGF3(`;LjJF{?-+L6|me((BH^
zzdxHIE?dV`Goox5dER~O014USQfcR*zeem&zsF@HA?icexmGg&@mz!rAvh&l-cvm|
zXkPOfagEj-JsZD^)A4bbVunv}aH4tA8zLQLgEzeUnz+WD*Ve;B9+!OaS9k0j>r^bq
z9p^cq**qIVH2NMHjLX&Xt<WQTer!)y{i3^a5^=zLZI@`iY&WM*2H0pDC5}L7`9D#1
zC;g>2BW?6EHyXj-9Tsz*9g2^W^-q1ywS0}nKSELW{t;gso^`x<pfb&@)G9cng~@NS
z#iVFFbBdQsdgJeEkh90g(xYWdb9%t7%`e!CiLBEuLlCg_YSsGJ4hU}`_-xz;7GPJm
zd?2CK*BEsKuf#7%0gXxZ2k?6`%=uinr<RNk#=|Aihp8{_1)Lhgzv!wqze~SkYN_T)
z;wo;i{v=?5WLVGrfh`>8Y=bkhi&sUc#}S$s^`^^pUdoaMo9Z&3rjy%uUQuxgNAI5M
z!jU|tL!?-Pb{~0TS%pM~hFrDDuJx1ar~W&ALucbVdE{Tq4WNWI)bQ@ncL+zaie+u*
zz>{B2vMm)%X;GD&|L0Ww{Xd^>TRyd6g0Tts&)eL@^GXb+p!EYE!4(`3Yj(jXSU#@P
zHY%dT;x5rW;S$q1wxs(CN9FH`1?LdnwpdjZe=2eg+4+m%ddUOuq%-XS+oYaZaV%wC
zoyle#IafD<HXxmhA}&6LkKHBMKv0HSSee;~62q7h$Cym!YbyC){|~*W09&CeExL`$
zH<w)eVKKd_GPVotI5SzHP>3@;#7Z320;6HFM|x!KR<Eoc!RgthfP=ua6z-XGtv~l9
zS(|ZWk~X{F2uY_Y`UmJ`63^r|RD^~`Ht-P5L;NSp!R?XJydu)RB30K==GWn)Rat^t
zG<=9Bi1KR-lS1fx@*G(307etRxun0K2v(d-W=2;7a!uL>tCjAif`8ndU2`I^h3q`B
zj90tbS$bV%AD=k?d*Y_0VClkPfPq!ffq{|!&wb0}6cUiF3+JzK*d#*3kuHG8tWVlo
z7b{EYw-W!uMmAVdLKJ*Z6wA@dF#(}rP{4~+ta2$>=hAFbuaVh9f<d!BA<v}}p{d59
zDYL05>bgt#eeHPtZR`A;;WO9InmX}-oV3Td`+c${>k*jp>W*9fdU|k^<je&K@`$HW
zhiPKSV*ulfU~tZFAn8#RF41B^y<IlqJuhR}?>|PyHh4k9Fs;97WI5P+r3C3jTW&2t
zCA5TyGm<&<=cROlo6{WNf{E62gzz&O!W6v?uZno-6iW5|)=)OsamY6Y%y8eCQpcv*
zL1V?`xI@VX#m-H+$8>_mT8ywW21c~|Q6HT;-GGARMlrjW=MU<8c9G@3UOwMycig}`
z6Q+^!ymI=RzUjdmrRh^CWph4?=Zn!+J>9>u|B>F64rRHy4-Iro2x|JqAD3CIi?j3S
zAKy=a=@@@C490a=0#>~{3Eu*3Q~lj|0O!3;DbPN?M0~gUo9*s2t-st4?$PHtu%<g3
z5hoz=+7m<%Uggq}I}jKfQRn;3%ek~{;m}&5TR<`)8(s#YXdv3gtdMsK4%Cj-%_u6+
zYJ{(jO^wxzsSHI+X1Cv|z<q(u<OjYn?ssrZd}_#yyjpmJr8ro`{on4Xi?f&@Cp3y#
z<)mZSQ4ZQ~ej84SA;8ymSX*hW@mYUcivjG?;4?jKIvUT)u&=8e>lG=s+Ok0IhU7Vo
zjjc_(Q6=soK*}hNlDp>_^?YMV$g1up$Tq&rsB3+py~CrSeKcoK8KA5eAXc(LD@k`m
zAUL1D?=RMGXtyOZs}iD5vhHxu$?bs7EIAX}wV?-H%xM#-c5xFfC5|@f88lc{0-l94
z&izQF$NHv&NOn~7#Z<X@%QSYbuJsB$96smhXxSk9M6~5h^?J|EjWSa;!QZfUvy&O1
zzt<0W%V+F6|Ha?3hInRai%>$83>zMNDL`yYZi{(~ul@N%($-@Oj1*|bMrXX6vKmoJ
zgIK#8J|%PN)KD?xCQkU5bgx~bKs0-d%ij@?O5gb~X-2v+!@0R)CY{bADlBt+60F5@
zH)^bI^Z})T@O13#g)ukj3vg>G-em$StunD}&CFNqLjAyjl-|fKrgc<z?LMY7#L@y*
zr`X;Gg)lWbk0@f5)UAO*=r8=;QRGa2BSbQ`0o|O10lN7*-^yk1C@`}wV78owX?2xM
znPu$GCfci%ab~dz*D9Xu?{d!B32ND~gJGzR-F4_Qmx4Jxn7Ryj2^~d|p5--o%xQMJ
zCPAG2l2TzI&$1Q)I-H5k7VD>U1rIoXqFaD|EzLm5>}Bf&0h?kO$JA=jtBpsZ={X;W
z_Q0=$qYed0zr&2SCHapRkV@gl|8~~?a5Gi(V&yU_3sR{-0#}dZGx~wlRF^zg&|Hd;
z5SfIx<RBO~=hyyNS1faZ2P_0(Y9O=?kZEhyT4lJQQtF4VPZBKdr~T!a!ED6McA1n<
zf0M;QEIl<#pp)CQJ^5C~Sik4H8I3nu1csN-nYCtRnm%C$xsS{ZJp6?=jN;{E14*IN
zF(620KAwf(%`=W0?Zl9W2Pu0A+_}W6E@#4x)>NuVFXRtyDq=`8|Hcb|om#g1>EweA
z`4l_MtCLagh%4eH*DD8Uht4*GcllAKFleSns9Its({GUZSP^f}wa1&9*Hl{Mj)191
znaQ=Pi#l7_exNcB45{gqQK~=reDk>-C%FnXD?zqVSvkXhK_g4b{dLWj_rkcWGv*=L
zP24iERmEa2U~b3ds`hh2HX)ee51%MFjf92aRO<mBndM(o5x#I82|=v+hR8MZsKb~O
zS3O!k_DH8Y*(*>)ED}w-pPMVHx@M%EqigC|AAZ$g{p>*`@aqsf!(o>1{%F$N)>Y^a
z`|&!cw4gJ`XKo_Zs*kktwSVmMKOM(a==zV8QrHYQS>xUV+#$9Qo*sgV@_A7km4sdV
zOobqko<1}WOUfipcK^}*WTlS~0!$kt8uPfy`exf~0$I~TV^i`ZlPA9yYHi7~<|uoz
zQ9-Ka8&*IbFo$-gep>p#kqmu;mn<x^T;`5tSUp$xkS72BYRf8I4X@4}pj;f_UM-(n
z+68Z1cz5hmJNEvf7y3LNcdqdTZd`kZ<S!I^jKRQV-HrNQFlM~RA`xnUgf_`!XUm{k
zMEil2>~v5|Ug3swFi0OUGY-F9bT{cAHP&+HKo7(KJ+TXWMjW*MqKE6R$jLo@UKRd0
z+f0)}^nf~NtM=jh$p|kLG>?<)5EDg-bpzM@)4fBecw4BrjiZaJBW=P=V!n4jeEvrx
zCk64`UYCy5UY(LGcO^Vmk;>NZWLOW<sPG43!nyxW96v7Fx9Asee|{`CUH8_FJ>Nr^
z)xl^2!hgNk4PC{_<~kEi;$eq`vmxn422m>Aar*eT_hdALAuF9z4XyA@1-^x&6Or-Y
z@pJOhx=Oor@@_##x7S31y7HMFQi*MsAHDz1nQgk7gnJTbX=}P{F#ny@`Fl3U$mwfS
zW7j6cv*18oH+zQEH`moaE~aOR57IpKDI-b%3b-sNO$pWAL(IwlP!*-4GG$NxK+81r
z^(z}t92D34%dRe0pQ<jZ8EKZkA<q$#Q9-Sd#TaWnXC^x)mhKwXfQ?dW*MYyTN{Ug@
zgwTkFK@aH9yp)Z_-R{GaXuZO@e0aUc5ib4&H7s#98I5MsljM_BZj5}=lO%7c-{5rt
z46?|L1h?*x@cuc&r~U=t*02}sO<sYm3@M^$d%Er3^<xnJ)!%)j53OJMLUXlWp}y@?
zKCdD0c%;rRrmMepd=$+1%4MX6pCngLY6OPX4xzDVCBgEh=yEp>tG)XDu|J|o)lDa4
zr=%*vVyRRpDnJu(SM?*OWFN9F^Q(IU5Ira-GJY3D{kQjbkJaA(<PBez@nE7Og&)Pz
z21h2A;>9E4?)9{DQ4nVe<pQs9=e4($Ok#+%&?F4a9IL%2fbS{4)Bk856WJj#b8J!H
zFaMwjlsWXm>t=Live$U~4HVp{Xnv))ejR`ON6skVS(AZpFn90Z(We6e&5p8wB{vn%
z_K|XAM<CtSd$K&qED7e9=%MlbBK^NGCy6~lmwp-3OuTq+X;90~Lv1e}*oyLm3lqF4
zou~pn!J)u2rqequoC`oG4;aXu-kg6WnMS!X&tNDR)K26lf`%I}-E(+^7xl$<S?e$D
z#I(Bl*g1Z9tXlu<%55*fvuy&@wWhjO?m(we^3~_n1Jc~c?auJ0f{vQYV!Uw6WGJ{(
zqi|5A0sRb6jsxGfmsp6yzU~bjH;ZX}j?#7#4u3b@M8Z<H)X+PGNS9wlSjjp3{039f
zEvpCVBv&p7M3ZFnUeNTaYMD*$D9EbH6*6r3w??_^8F~`JveY*i5S0SS3o!<{0fObc
z^)-&;pIYP;BWd|f0!i!%NcD~gsUpVV*<F_eW3XrXGVLRpx#T>f2eWLTiy$~5=T%s9
zi_Ob<772J|<iZ3~nrF-7j0;J?!H*qHNw<A)eg>lsXGHkpq)#rvugw?*1kF-`VGw2-
z>-dV5EJM*XQYUobO$hW{ENGL)F@xK@D;2sA+Ktgt=;oFWlLli4aZC%onq%uk|5WzS
z6GW5A#`Z|c(AabBYPqNS?zEON!F8}xIsAh5)0Gtz7K(vSS_eS`bDQYqIzCg{O?UNd
zA8*>fqwzK*E&YiusPxn@@oT<+He!Tm)N!>XaZFv(|EQ0~yC1M?-1vu)t^A~uTO*M^
z#ZUD%&cW*jF00leDB@r{`t>X|HRvh;!%5{y;ZiVzdl26-oE#nuFMh4N>=Nv3+ep%#
z5c_Vp4FprQNfW)js2%VJ{XUyZu)`?XLR~cfI{`LP*1Bb03?PfJHn3IpMo$r>ur$y6
zSR)~Wn-6j*dH^*@VS;Sgut6A`HgY}$N)f8}UK9=I?$D3l>Cg_<e>0adM4UFfB+F>4
z<r`$pvLxyMmofcZ{@P=YzJ{#YR9Vjd1P?Ssf;aL%PI^=qTLpt!gO`aZ)qa-~5-%Jd
zi~Fsn<r3m=nJi;7VVXJcXj7Via%q2oI4jAI!9J0nt^q`E>AFK$jS*%%NWG!QZ(^jc
zTt#a5c&Z%SnLLa?U`0o8%Fv0zcQcH?+g#{z?q`hW6tSH|*WN;R1!(9bvgE>X2}j2v
zzd_rW>FdtmOw`iWUX&IHXFPx_1^TCD70=WoCNYrOQ7IMD%L-4YxWx=GF&xXc$9Ka=
z-huEoB>|qF@;|U=nd)j`{KikT-uO8)p@mRpE_JvvOXi7AUQY;CE{CQB>S0n<Wk?(c
zb-*~@;Y$gNch<gTtZ8kj%x4HGbncJLa(rd{7eCqB<m_Tk+m@M6^^WTFBKp@#o_0+a
zoWOxh{I9Mc&T2_?T-V_fvqDu+;X~>x@4C$ov;}zc6F*?R;u!fPO_kBXVn58<Ukh>4
zmqlkT%UCx<W8r1Yw=Yk_#Pwilyp?&+Fjj&D*Az&fiaAr7zu~X%ipN-~3QQKWB4Xt?
zlw%yRp7^hc5!ldZN!~I@r>X|~vUy^qH^T|!<y~~cNYm#b*suj8UQzYXW^<hjx1&gl
z4+193pATR~xC$L7V*IcT*lG#H{m3l;hpTgn&NSGzc9IS{Ham7Ywv&!++qRuA{9@a-
zjgHf?ZQHi~ob%tDy~lVj-utStYOPswK4mU^V(^MF-j1S8ATSkjCCMec1<Y`Sf2ZV4
zh8$;3MJ{Dc>8*a5NRpe;fZLMB&TX>^CfhVCYn)J;aZL2Pygg#n@>h0r^K5r~ZaktY
zA1z?<<KYBZjcSHsdID=q`N5|qj|XOhbUdK}kjb#ouify%J-e-Sg2yYS_;baLrD8)p
zJe+_vvT*YAp~%G(0|TiVK53}5x-vhf+^Qof;MJpLP7uV<*J=lB0Hd>`Xd=QtnAYYc
ziPokoS53KW1Q37$osHoYGaKKVnq|X%fWxpZRj?f&HVi3X9MIr@f9Ln$**>9aL6({W
zfERcp^5s*d6H?YSs91?rY4FdkcZ$9T|MGCXvf!3=Ov3RC#4Yj-t@)>U0YVFrJe9ny
z>*|NGt2C$mvW`+?CgF>mzoQGIf^k4!dIRC()A$ZjhAyzB)JPno`E>YWgg_bY)wEdV
z8f3m5ud6Lkvd0sDnNH|SJC^}<o9xdUz{fRKw$M@iiSs-MER)}^z!t~*70mO6SX;Gs
zwUOW>mwa<<%ySCc1BGO(N#>3C^Sg1%avl}yEdtpa@+);hh<&;Sk+G$w*Ito3sy;Xb
z<*J!@qFHG6fKlsp33jo^eOKF>m4lb{)rxwDT*?CYsUl9NH-lPQCv0Kf&jo(~=1J4^
zX)Bks3qm~>n--p9X7+OxTQ~h3r?+OsFq??&#Cz<_`NR`&>wnGQ9XPYI|4=O&&K?D6
z3RoNnw()5ckq?q1u(>Fh8aCb`JH`dtiujGX%o_siie)SqZ1N<`3H)3Lf<*B9@@^Sa
zc?4mRt5`#qR6=J|g-=|UEh)|cZs;`4h#+kUl->B#?Z_V)pp{ynh1?(se?b$?wlmbW
z(QmZa{g%STy@I2A^Vb|2y<>DCTIkXRwxGt}w;TO+3zl|zaoS@ybJ=%#&*~m&J%1Us
ztacJC*YYMmoHF*vcW{AjzQ@6@5f48_!>{pp1WOWxYh6nb@-|)17BpS}pjS7=G?hFI
zya<BtE=#<xh^F$a)zMdZbV)rXvcYksK{03a<AsPOw2Bz-QMrw8_tUs1jzGn!TD3H7
zjXGg+hBc=~vC+k^%@S9p%Tnt=mQN^Za1l5hc|smNNfBzDKXZ{}t-B$AbRwwQfgIcQ
z8QT%@c19V0LelzK63-I@YN-dybLPB|yx?-_M^*!Q&1UG2eYEzAG@NLQ^i~f?6WCwx
z!xj-_!LBnP#Zww8`vp`=3ODH_Iw83rNeW##<TpM1$Ro(nZ%JTuUMV4ix|shs^l;Cx
z8CU1Dznw7QUJBH}r3vWqlR=y=3gBG$ZNmJXBH;0jV2~Nf-MWMTd`uAlMN_u*nTWC^
zl0V=<+~00C5LccMxj#4i&)--O+9C2ba9`nR9<;bZd_%0CV{-4kreA-CY!Li8A!)tT
z`*S8Yob?4G2@p)WuCtkeuN}f|PxX!Zcv)tJW$}e-iSEz4A^P}X4Xb5B>xoLqJ=8CA
zFUJN_v}(TyfrQ%)C;<R5(%@DDUSfK-MsnHprF#^4HX}y!+B#6sh1O86@K}oTXR9$?
z@pwMPdJNeOS8#O8KcH6mg)Y8Cdv7t(Y`&oKzS4uiLrq0!fca21$Pp(o@*=Xe8jo$~
zp!(!O4_;0pxJMxZe6kVCeysVmimK5@WBls&&(;BR)<7bF8T5x%dY<4{c5@gQ<H7KF
zHX-3>&b{7=e%YX!>VcG}BSjV0w=rb--Rzj#vEgc-?F;e4&eKVT3-9@yxZkG*^|Gr{
zl~0U%`UN)fLU73InC0X>>672)@S!%E6pw#AvV6&DIVoN#{kb9WJ$FBI#dmpyv*F{u
zCC`lQ8P`nG(ZwvAJ44R(=z{YSTs4(*Y69zA_6>Y6mj@%;<GhI16>?Ij&*^hxP~@I<
zxBI^?v5Gtx+Eu^pj35voAO!y_sS!vc0N(6o<<W+^Q-*%mFb>*Fr=n)Th^PVW7|DUg
z(8vVPrsQu`i5b;W7I|n<U*UjYoPmD???2uPB9EHkQPdk^v%l#BoH=*D0iU0*@Y_go
z3F6zPU@7+0{%fV=3V}4jI-%Tx>q+*60&&y&p)n<pZrIDv{j1FVOzTH*b*B;+fK*)@
zuO94ro&MdLl72q7%`%?^S+>8;#py%kMnAbZBHKy^gYxE^@N{PIT=X3e3JRh{*A?2E
ztDQ;)kXUW9^5ieF%LtSQlxcNN+M*3kXyfE@ZbyU{I^n1hlym$vegFpzz2B5wJiU1i
zk_WY#f+H}qTPS5o7s-u)hU&ON0OrJ%lOV-CR5h1>_gsm+)HWrn2oI(>yf#4NscbGB
zex`rRil5d9!qPa{xW#dTnu5$xUaj;y0yu~Y;sv2%f;<?z&<D_2O#Opj?{=?d+67=O
zlhk3B)!}vY&rf_Z+I)quUXltB-KhPlo3k+5n&4_7^WvYGMys3R>cs=O0PV&c^xd6-
zIlVBdNwH4nU>Khd=;_>(6|}uVfN17D+@gf(2$x`x?;piaXz~<a!rP?EpKRjQB$BsG
zhRfuV$edHR9bw5(JTmeYS<8Y%`dx6T8ZX?$IdShmb06R`Q!6;M$!rasUxSl<vTQT2
zJu)}wvkJ)M%XT7SbazU(6-^#>P?s#x8|?8qZdO0K<YmDasAd73(f#Dxapa#AH#2pu
zU^Qr667h||G2dm}Y{YHBwW3Yp>}D~|c`0|=j+9xrSxc_qSyswI>{+Q`F7(dz>)ppM
z(EpTkEeS1S8xyKz<p9nV4o%IgT8$o|R%ffbT2cZi;6#nV7zEyw((y#H?JMvJG7(>r
zz4F(2{5=FJJj}q^QY7!?G^aN@r{%G3OaMs7Kn3Txe$`JzIhp%$+$o=qdj;}m8`j|%
z<s62s<M13}RgI1slo#Lia%!3DTO-!eb0jvLw99{Zw5wr}0D#5Jl@uNT`Q>I)pU`VU
z*mBT=K)L)jCaClD{zhVE#QH9Fd$GQml!it5H$S|WOj$QHBuby?BFaeK^yvOxzEva&
zhE2`nW0NI<Q&LgTHla*WHCaHBhp}6E(<m*9uhw$h%NN<-Y(<y5!^?1<AuU#H3cZFr
z+mSQUOr#aIRse_y&rc+M-X2`jAJ3@|bpq~gfSB_^O$p)EFn;#G^+~8ODh;EzENqo`
zIXgG}N`K6G?9p(9{*)QhtRmQ<AiiWCopa;1dee((k;vcwlD+o~61+DBe~LUqz@Q09
zQy8B&nMb4{5(uL<F*TyWcnOS(Og17Zux-RQFsVeplM(fv5<a5L{3Lm@R?zC(_SBaa
zclV}P?u6!R`*FS<#;dkM`+V^)3-cYN9qd1s(D2!U`uIDNgY!Q)ivKMilT)aGB-Iza
zUrWeebmE#Cl{Pd+-1_1s(x^nB<r{-GGP}vt%_!iB)C01D7>yWbp-J_B>+{q++hne&
zd1u?7d=eJp)~Ds}yuM1Cw^nqdazn{q1g<8$(%J8_uEsN3zCNeUzQF7ez9M&cB83vG
zhva)iBjc(1;jy#T6cR6FG}M0sBpLtd56fy4V&>PHxEjjujJk>dGk)6+*yCz3T8{ya
zuIniI@cSvQN3i&UF-2Y*!>5MdSFmLFoS3|I2W-&wLU$t=Nv{>r^iU4y$F9*C?^WWu
zFb0-PK1I>CB6qbIy?<>XAJL25Y*2PlQ0S@N_@ML4+grCcR%24g3^h#vn!>G;X&^Kg
z>*2ieOSz+WC^=j_e61ZlEnO@OEPWqFt!=*n5)ORaP8tH<uRvd=DKwXgSdCoJ3WoCS
zYvB<`?G4A22g3n*dt+PQ$FQ=nf!8t;2(2m1D6*m2nnX5{es-f|rkD(oKyu=k^yCv=
z#p!HZZB?Xn%7Zdj=ha3)WZLLqx&i&Em59(g?6b)Rn+cvZa2-CO^sPk7m1ytp=z9Hw
z<4P^FQ~O`W!BVy|i@BM)ecz?s3-ez4r@OjzYm+l7fNA5>gy6uUh@0~@Z6`uUnEj5m
zPYpT*?L?z<DPemt_h2NQu;?AjSp=SI**^wrK+!0HHpHw-L!~}|?d9;iGmt~eShs3<
zfV#awAPo0)R*1Hvk;mJ8&K|c@UpgJ4-vRypMKZchw@${5J7MjO{h{A#ty<Y^t;qob
z#)zkG=yZOuT>;@aj3XPCe36Y!ian}~cBvLO<}mi4t{@hkOlmS<{4MhVYM8cvf@Z=D
z@u$YIc74PHaaRpMX3wNpM<7ykD2*uQ<1=u@Tp1vaG8zb56y9k&Oit~i2Ol*I4PW4{
z+z;iTFhGq%ek}yQblnInVW=RAu+ZJ_OlE!m>BhnXm8I5>J>Wh-a|o~1A0u)^@l1t1
zV*Z>~DSG1s-;H#V(ps?n&Rt_)cSDWdy~q%#v3a__Px2e!Td>peoE5%h_59<rbVu&F
zA%G5XnS8=za6)j=F)ASUHG(p7w<f?`toH^ZO?7&1Ijcs!y3OMJrNJ#<nd%T#bwtLx
zmI1X`rMeZmn?>~BV?|_Y-`2GoyxTV{rCiusZQX^9{SQ3ry3uXm<Y0uF0rRhsjOK8F
zxw{SuL%0rLG28glFrX-jAxn6`bMyBGaq2%U1@W9HebXgdtg{Ye#O{f)k^Yh1Lrb2`
z`GvtwoHNPh%2U$=&YF0V-O*8MEMF}*E=sBsd0Pvj)<Cli99vkSvCk}nm|I3jSb~1_
zG1ZRls+QZ@mR>8bG6nnBuY2rn3ggZv>n!z2Jlq$6e^hzH3pjLK_I68+yrVphdZFUv
z869s>!qOmwF)0B^C~3pzWZ1WRv0kz2)!oR<p`UIeK4m7NGcbm0Z{(L&!_t6pguVC(
zQAxdPw^g>Zsn%N(J^>o=Mo@&FOXl&t9uKdhJtx3sh?UJp_vjp@;mDQ%#2DM`S;aY9
zPyYgNJV??C0&#Uz4lhy7Uu%}N8{-q}nCN94flIJ=+L?(yxuXm}T9JK97R@;Mhd|IB
zi6Fo5Me><pkR!tXrl)6b9&IBPOT0)=NUMJoxetuLNHECb=SOx?LYJ$)1gSq6Avpu~
z@;g0mS*BgdtV-h&(r6LT^5;|`aE?`&4(JNVs~*;y!9lnnZdMe6Qqx2a*%RY%4&hLC
zXar71?7X!PJ)R6cop{d5@5viu4yh?_>|Bb&>u^8Vdm`<m8dC;xNQ%l4$xI6^_tj#q
zq7yjtHm;=-^H!q!=IENzt-7C*H_^o=E7d-O=n%4^7T!WDA{A%#yT>aArF&<BF^vMW
zgE<fjLu)(3QCTxHErfRi2_Ac|Sjet%QQbEClW%RlQvvQAXmaVd@ufSU`#jb*w~!E<
zSJ#=DxM4Z%AyAIa%e>6OcD#Q%I#G!8H*sFMpvv9tDOw`_Nxs7|FMI*bUf`5It9{m^
z9B{>;j4qAqzmvE$KCoR+jGsR}8AAXu*TPUQX+vOjnMEC;Wc2BAT(8J9UdL<uWQehR
zQZ`gA)z0tM=s#i}HU&636Kt=lb~oU4cXe6hn3U!kGfDOuvcG}=&6jzw1P?r=^Xk1S
zHN!6_NYC|Uw631RLqcst61_b|d|bGz*r%|(Y6Jc7F%;O?SW>AD=8=U7%X@&v&0$Ho
z4J*WK16*qd4u6#zLl#})8+wf$H;L^pvTRgQ^0^yh^uQXz^!AA6EN7mBDz2jAy%R5e
zI-naVtw85LF?9;v8RJW}H?K`|!B>{E2W(HDWKMMxmt(K$3uC+!(!~I{O0T24@mys*
zJyBJ>zoTFOC##D5Kfp0#&+)DJ?}!lZH-C)be@{j_bs~V43fd=|1P2lBXeW!fR$)_+
zmLk14S>tasQgkq~pGCT-M499vK&Rai2~fL-S4}-!v(rF3gh`Ic`4ooXNS`OMvMpKS
z{l!t^`o~o(AFqq1?xrQ#&)2sYe$b9kJD=l$!T>6QQ-+g%7isF$n_iMAyO&&jRas)i
zzj@m>5KaJ?Lm%_LLQDltI`KNn0T}{i8VUDG<T3XWWNP)K-Q@NCVoWQ(^})Z29TWp^
zD6aw}m)k-R=>abO&C8nB9-g0*yR&`71NYMV7*S3ct3I@ev*W^)hs(gUpRg=48m5CY
z(q<x3CNBQ3(ETi#R$$dVJ>h;{qpP`19+M0Y=B@xMotBiQheWzS4F}q${1sp(W|S?3
zg)unrh=v<ka(Pu$647Q&ldEbiZ`pQmrUk<$0(EGbxglMmWddy#wO#21or8d~&`LcI
zo1`cN3TCd-s8H}uGySXsIAV0Xn(WsN_lt2(qhy;{nxSrz1Ym67Nl{&b*Uxm~v@z#~
zEe>cvU7_7@9_7?j-<sb;P;eO(@sE!GAc?lMiY80oPvRTZu$2+=SOtp``A64~EUk*)
zpF+p^aDwv0_{-pga?gwXgW#y(0F>f8{A|-U=m*b8Vqht|Xc~E9=H#=R+LfBrwCCv`
znq8vILzz<E8j1<78S|93z$9^5L|AS3LmRNA5CQF9U81Zh+EGF5UkD>KXj`M;=zqEQ
zFQvZN$ohnAvU*fW#x!akXbY>I+H5m+xgmRMYBxH|c6`QLt#zey=%_M4ekl>BSO=j*
zZd@k5M*`6t4u=b&f&P?Nu{?-CFM1f7n;W2mPOyiHp0mr0p0np4PJdk#P^0V}Wd{I<
zl-pDUqfJUt|3h08Wn+t0L%sISb|&uuYJ4{41e3|>n)H|??7mAyO%gcbENv(Tw(w+_
zJE}~|s_jqTyw-57JM=r%of~Z74>6>bvAm&%?CN6kd4~7r!}(|G<?vq0rhEE+zq)B`
zjZEFiN`%RE{7`Py>hE0ACTZm@gP(wwG=fnjeoqt4->7E%Hzv(l<K;V~FTe%jl%@)~
z6H`Gj_0gYiTnRc;XiIL8#H<>QWcy)sABb;aX{<?|klK@0g!V;)x2O>R?l`6hnEX;A
zJPC$iGZ%WNYGM(89FS=W;zEc`ZS(!R@(|}Y@!32U^HZb+Vek`(hR5n-P|ya@bOmOJ
zZ?_1|S6%e8vZn^ViMa#u3HpSDKHiBESw$a3L&O}-x0hO=T-IsPyWd9eJqtqQmk?%z
z@5`DGaW%2>SwouRd>Z+&C-e3|vcP8Ieq>^}2c0RmgAZ=_x*?dYzH>VB_g&BIx8ZsY
z^7<k+<xF$#Kke(7o$&T>VyXh3J~^>G;V@s0#bU#t960%38G#Ngvm}TFBHRZW?hXhO
z`*lfhuOoT{8fQmlp^f02(F(sPXbn&r!jYF7`3MUTu^*s54PGE>w$&mJCA1A2`J7SE
z_vsAok=)W&g`81W#5`>}!c(r9s21!4sl`snni``W?sv_!d#z}K3AU)5mKdZM6li37
z-I7+Dyg~I!9z}J%?)3h%sUL^e6;0sP5ds`72J!{?<>wP$5M}0WGeaY)Fsi_zi+c-I
z+b5G8M6c_x-Y8iRGu{Lf^dOpKc53BTuKi<YZeYI4`MA)2dz+fl13A2=43SD5(PxXm
zjfA^&;2)acVSj4#=$R12iLl@?o_@69zdl!Guhj`LsC6*+Wr81qiL9D<D1i&!d<BG`
zXu%bgmKbr_6iBd^&^~oC2mS!&Z7SdOWa_C~yT)M6>YeYIqr~KI&NHvo1(E^3UELG0
z>Ml=Z*>=m(56xcl^&L;96{wpRmuXoxa}6&Vq^Q0A7tHfG)k|!v*=<{OkyF_o-qs$2
zvioW}M+F;~p5$gk>)vZHi*y|w@_?!lyQw!vr8>{LkcQ+Ug_*hEC3|$$W#<*?A?06>
z<)UJL<IRLukjq-kc1V1;6r+_1WckG=uXu%%%v(!Ch2}0iy%u3Ju6&i7wlzL+;L+h`
zboFfMYFJPIYE8TzURFf0yTAtyGs9*25`9wNu%g8-$?q1AM*%_MMK(DeasYZs)m(bJ
zqG!{quneG|As~vOH(_W4&lh?0KlRYMNWD4lf9PlCoHJy(QcexWobmVEE1rWpbS82L
zFhwdEWPW0d(kI}F##=)`hdU-x=_lqhM#`&3Kq{C<^7Nx?qo-i)d(f5v#179^Y7>z%
zBNEJZ9kfw*$xfqhY<*tA(*RD1+NoKD6BG7*_VZ-q*W$2SqxN|0XoL>f#){BP0(<D+
ze}$qrorpib7~XfaBx4KVm<qt#svsps37rblu6`&Y5hh5+R>IZig0~ewj*Jq<NZb`7
ziYxd@Qwb<C4LgyEtH8&{3nWW4%t95C{;`ydZG=-)3poDP1>ovsNz<2n{)~bdbIq@R
z!2ahJUHuFJ9r_6Zl8Bl>pw9pZ^FsX|H>=`kJT%~jv1%E^Kz<0uGrG0Lqy17^f0d{G
zWjQyfA!X$iR*7DLzRhAG=vjE8v)V}1Dd#!Vs6W#R&6_84^~U!V>zn2Aw^G$G@BZ%S
zX|p5kDPwP9T&wdo2U8ES7VisTrw$1pac_d@^ji3*-008UOgLz{n@KHzpt}{89qi5p
zQ}!UYG0QeKc7y|6klUzwxD!0-3myLEM8DVbwwH%HfzuYjAe1}b6gR>CLP(!`@)6?Q
zbsR(X-V0bm&e4Kc|1;JU!O;$?fp`3o+|Bg~5+CZI*^1v(-Sd&j`9I9%e-Rz8#5G-L
zgDETTHMKozLeDr;dS;IRW}*&4BgDg0ABjQsYZ=H+nmw39lSBvBNIMC0&h-p@{L>2@
z>`OdcECTG)Uvlv9#hyT*7@6>^Y<bDTWM+EKskBycb`BSzfkaCjy{6?RSMi}_deGu;
zziOcqd_+N3W*774(vY_H@H9S8bMK)`-o2AJU+9WKPo=$+o!&e^wx%#*38XAts;B@n
ztq!%Mx<!U={k^u?=my2zFKR`xd)$>RbE#8NiaAn+9LC#(*Tf)NA0X!fr%Cxr=Ay@-
zGOTm;T`R8}Y+8JoW_w(TkW2zl!c*1~`>fV>);zTV#dV;(_bO=FNp&po7|S1`J&H!7
zxlwM)>PJx;^aL(Im122OJSR@UX-HYgY<0!B8?O^hslFdndVxa|AU}1s_ydJ)N&SGJ
zoOXy*+_`ck0i4&2S+n<sLto|$?fCJplZ8p|JWP2R-eN?eI4T(=Hlqvln4y+6gvZ1w
zF81jGEF}&Zvr=0+jF>AtCGeW~Aiu0k1Joiim6I!$dEOc@ngD6QD;HK###~LX?`+p4
zUw?k_gNQ~xw}fTP3QI$TTSbkA2>A_gOH>HGH4=tehuV@HN1#ZbqC$5xcE$u3ajpdW
z@!P8~J=rw;7fk6P+RMs*L15&xjX1Q8n<AybKoH`m4NT7xT04%`c`2h1AARvP=h7dQ
zS}NBH2d#I&xk~10CZ0UDNzGK-Uy)JE1WPKn2C<93)P;<CrL|>QzZE3R%5Vos!R6Ls
zClaTC77u3w#3L%1Npr*=7x7vON<X!*_4;1FbeQ%7T13hIS?=4^_Y<|Kwx<WMbjg%|
zgr|GZ-!N2en`jq&YCE`>CbryTPgF5LOAHm8L-23`BnE}q?PzSHP2q{}fanX8iYL}Z
z>1F!xvi3qSJKQi`5m$A6S4wMbW2Xw&I323J$Q_!!3irR=Qz!5SQUeIKLkcO*s21p&
zN~v0-f5E^Ie);}OFDF$jXRX>EqPc-#&gdM!Z<Mr?ZD%RireG75=#|ru_E4rTJRxS$
z>Yqvlyxsi<!oS0szQ<$B@cG0CEZZbHY9LeE%FZzJF|tNsBhOXgmg!MpndyC#GrD{2
z(BGrgx}nInX027;#_M`Z(8hP?C%hdzi}a_BP9})t){J-o^4DVTR6+dI&#)9C7)C_z
zD!p6RPe`A6+d0oEK|()7l}WwtBW-2G2xd$H7i07ojgfq1Rx731PcA2>>GHajH#o`J
z6I!Pla^C6d)jY>58{2QfDoMPo-6D+mXCh!25S*$>z-CH`=>m=d%}<}6HO`BU2Ro_>
zU!BN#dfG)k{4t}2D-0>t1s=vs73J@RRFM(k-_iUz*{x-Av9Z8fZ<~!;;jWb|T`~x`
z52%u*^MuYY3gpJk2;FLHLXgWC#Qu~;Rxl?_bvD)9yX*?u`uR#ctmPW$#1H;k&v2sJ
zeRZ-04lmaVP7`vV3B~;BE}THPn(3D5@NGS!;@SYol-#Vgq^bo#IdTUFt+h+?%~9C!
zMO@!a)1$xlQXi?#C-b&_`iLxbAUFdYp8*&@MlJrp;`am!cZQd8S(CiRhUkhor-bMV
zIk$v#g&g<ed-Bfk;(L-1ujg9e?cmdzp02Xc6K(h$Q;dM-w=2j|=bC`d9)q2V?!}3i
zfMX!x(iU_@PG|c4DxASs4?>Fy_xV|aIt`EI2udI*ejR_~5tK7@3c(U7y59qkQs-%>
z%<h6IiX>Z7*I1VmBf*%#qKE`vo!*&Aa$X1Fk8Y+rAsm4)H>1-PCE1}R>o8HP<;m^{
z5a)4#kb!2}1)HRZSF0oTP2(_OnKCL;7gfDsiCHjd94}bd)H1qi3hQio+~j@S>_kgF
z=2=|HIJ=mD7p&dbTr<D2LGc1)(C54Saqk{@<m=sZOGNH=4Lgt7)!+$9-E+fCo@tHh
zSoy;b+F}IZD(~zTKX2PU%KNV^rrL{MH^wKm*Eh2tl<NzG2=^bvdJN|AsuHmyXug^u
z_>eH^k$vXmpGpqjcy$NE`56M<6_(p7lM`*ci3_w`VFD3ak3gk>*&QZ8`r(WKw-y!c
z;S6U=>AI@0aCe4p7d|8av62GMdO-5m*bLskP7Z(e*h_X4^xPMs-I%}abB2h-wQ<AE
z9@gEUocJrMgVB4i%bdTH|Bf!}WRQOpI)lg**2j~d;TEB*FafeT%CmEwtZ!E#&auhV
zuFm90kLprBpLBwFdYqsD8?tyN&Lrs)wQ1fKt_#hI@P0iwl<iT4<buf7#cfgE2B`Uc
zl})zA)#!1>)sjzTh5_=n=}CD2&#A2R6#?d71kHD50GkQka|ecV4oZRkLZ_}dPJ;cr
zrjQbzkig3wDrs)Uk+>OwuJOXEkDkvzV)?<<uiHiG?)-vv;|81nGD4Eedbu`e4FBi^
zL8%~8Ct?U<(u|S@rZgLQc`#cLj++zMVTbM91m7KZK^Xa@g;)9OLY3tOEFcvZJ_$Nr
zAxTi<u&CrKkw$hzJ9?NJM%5{}=}0e+oU%L`6d9#T-{XgWa*xY=3;1FD60-DURi_`&
zJ>b?ww)|L2PQ6D}<JKox@>L;xz-YgBPhCc18AuWKl}HhNQBC_lUo>q8R}?dGbXCxE
zZs=m=uTHckfn-b6jl<8}IUCU*+8yj#wlcWckHU=;3mb>W$-}zIfH?qYg11E`c<k_f
zassZUIDoo2)TU}{8u6gOd5tekQ2ghNxnMc+?7txs>?Irh6gZ&*K;KqAJ<H5Lg6$Zl
zO^sOj<i>l0qfJh)t2U>@%?*A4;1kk5l;j8W`SCI<Qg1XU-c-_)pa&<O2Ob2T2+)1t
zL0iKl^zgO>PIKeR9=HHJyGbypnGhMXbc2>)2Y9cYW^4ATyg`?aOkMir&0hx_arK=#
zw^_L9G%Vta8?4k{K6xfDDHywKaUTgfDwr;}jz2Vg<y;+;3n!^oXp^yR;FG`&wGF1Z
z*rw@>IgPiV<*Sb|FaLeSZZY8`0E$PD;m+1KhXzzj%v#Yc@X`!NJ<&352N+oC_Kf##
z0iYPsI*${Ruq&y8&p7>?DJ_f{bbabP^xC`Fr|X97D^9qw$wC6E&-E?X@<*YZ34T}Y
z)rMPQwF^p@!ivrjz+`m0st`1&J=o|iNc8pC0KdaHNy5-?5~&>GyZ8v$;q0kM!1)ex
z;02j*@YuNULJ;%0gPd%JAbcM3`#zTdK*-f;Y0B?)*06V+p+lRa@x>#auz^`f#O;$@
z`8RIU{JoXND>dmK!Q(AtBB_ZyR*Anj8lr5ftsrj#vS@DRQBe9g)Q#jrpz0#w=NnSu
z=`;nCRSMbpZ=$Lse_vqZVlYFq(IiRCgB2ZumN$RiT+P8y8w+?qSI+s8lqzE#$;keu
zvdh}6?fEMw7nHB$?iZ3+F&PKV!A5a}HN>Aj$Y1<Sv2PW`GtltI6PR6>GN7v8^4}M3
zJ061!(%+iY5lljrwGco{?bo*)CCg->pXwM^h@OWYJ0Dc|54NaDVkS}X7d)m6goV{P
zDR$qqG5Mr4!#nhr&X}9tT8e_Ulv>UQ-Y0@fj)XWW`D`MYMyAtaw$IDsrrA{*|JUaQ
zBFI$%(GCh9#!XmIg!tV-bdbt=QZ3Lc^F1-=Qfl~nlFT9Djs&<^!x^D!dA}GU=}BG_
zv4=wSr}n62E+39Xht{-xR)>ZV<1@k)vgkCZVZFy4vjx^#CMpAGDvK+AJy;5`5>N)i
zI0R@Elqxr)EA2T)P%Xcu57>V*qYi{ulqJzw6)MfcoO|nKip=fOL}gfQWSUf?ELCQt
z*3ZlH2vC$*698~~CJ(~L<_)G+z)1$=FjK@tAu<Jpdq-lkjC5V{8Ht!<odwm#a81M1
z%bW4v>6&A^@-x#<jgA|n!#l$kwRqFbXmiBcJjg#-pT-%UEIs1cG^;1$ZHY-N>XxNJ
z`|%KQmW<1Us8^&#Hx_?~xfCTwX6KhVvId6tFew+7oC0Q=70W8DqSDJWlVPcrsWbR&
zvY9pvehWb;SO-Fpum#q63h#*w5iYE%9AX}^v`1`U9+kQ}dQ`hb6n8Lu%h;E8RSL=(
zKSg+oPY)aGtCwwE0PYvwk0)%Nvb9fdko%Ul7zp$ES&^O^a7ACI^}3x&T$sA-oty=>
z7z<uFH2{UmZdu*^X5)@931Hov>o-3X8@nMD`6epTEe`XhDw2XQiu1G3FFzCokRQIB
zpfK3=Q)Un}JG^wbR4~OLSJdsjIr8d{3^X=|HMR@x?SU5%R_A6k)X=|rx$O`o_yZ^H
zQPNGkXu`3x{M7Yrlxe)fGIN?Iisx39Vs*-x6VU%W;-2(`eg=-gdhT6F-%nDwz^ar&
z@`Wla$InpsT6ZyH<<+{HLn?#dY16tFe~T39-0ZH};64`R?1Tl`w3u4hwpcXH$QP(f
zH=#Vb1zfG&csdvIbULM*`KY#PX)pbjKkC|skWQ1r;c{MF6uYr+ET1@KfR$X`^TshD
zfcTMn?;{{_=W`#8&mV2DFVtT5rMXuO1?bf>c4YNuh;vRn@6>#k9upt~{ANov2;CkG
z;ZJXt);DXboIUQ5j=-1X861f>i*6j)cZ98KK(9Z43-vVlJ}&s;9s=azo^Ut<q?@iM
zykM?NxS#CY6;t1S97(E$rWLWhoWZLZfRtSll~Qmu5)m<eck_$*>PO>|(RxiF5!5Ur
z5Sy(UPssEc*~+=K=Nha_tFI6V*MXrO_a}sJpL^zTol)dl-5qmr=xqoXLO_BbB_WT)
zwdmOlfA?Tc98`D2D@+kuVibdkVO;$+(E*Xnvn%w9QQrWGI+1Wh=nTE=ai4mhF>5|V
z<Xnh8*j3xj!P?EiiPP;5_A`(AX5kwhyCr|8<S?heNiYZ7T@rRc%i!!jwFE_WAX)ve
zjU;T{GpsbnPhReVX2r2Psf@1V1vJ~gZ=>D+Iiw$xz~3fVIw%8{k^({l7+PzK-kfoY
z<I;qgm`|<Rez#tOdQ&n=NTJgPXsqvNufJ`e-hSS^LT<xNpuj9M8LWwHhy?a<9tD)}
z2E670<Os?z6_7nYlpT;=V}RhnQk<sXDmk#O83QE6kj`ipMTcX4qC(}ZBS(frS=T|^
z|5AS63yKUO-vt0dy;7K>%dmb82g5X^hTWfX>LXI6<V$T2(ny$_mvw6+HKw?~6~mEB
z@}<2j+B4>A<V!php@SE7jVt$5x81D0jxCpgCMpCO2?poh#i${l`%ZL^36B~zw+h30
ze88F>{22$w)5&^p&Yt@_cPTBPd;Sp~O;*9?a)6-vP{t@+G5eZc#6fAK!wgr!WVUgP
z?a}%7V)6#9EvJ@uqtVU)s-YfYJga}aEF9j-Va|1l@4t)^6yV};@lFze8W}2a1vD@i
z=*^asc54at`i;a-HpEX5Kw_&*9(aNvW^$HC!`1imLq|_%zj}Bl@tpB8Q8G!DV5{Nt
zwqQ%Fd*2hOcDk{uS2zv?puO<qJPg5VV34_D#)1GiX=QDJ%mKe7@=`}wDb^RD5hc})
z8<mN%ARTbsA5pTs42pvR^eh>L>vD=G-Hg0P2?}f(jI7W_t8EQuc!g|T)meifXd-KB
z=!Rj6=Epr=6!(x0-IhF+S&E4VTsv}1O|O__Z8M(G+FRA?L1Pz_88tzd0NB0>*WEyj
zmq_Y{73GXS=K3z_w1TL#85b*+CO2%jzgTPal-JWGhg1>l)&E%$?Ef4Z@VfmkAY0?b
z9BBWydx;$(!LEcb;dliOkfo~ShWdT9k;A94V6UQ>&pBek6hhm~YyQy`plq?E7q_Ao
z39?`+4xE!tm2M3Ue>$Vz9$-HhfU<|K9Mz=D@xC^D7Mj13E>4gjkE0{-G|d_Nd~|#K
ze6;v{e_PrD>F~QUT=s{+wi`g|6Xb5*Gvvl_kWjaa*m1<Y+LpuxsO5zlNQlx!^RQrF
zjZ*%bR(R0FNT#c_Qs}_kTS7`mq6{}2LKBjJTMBL=1J=W7iHZbRCtGjOB$GMI>MGfl
zu7p?pTG5!mPnzbdzzi?fsbhimI&&K;R}!MdsBdU4!h|gtI?gLq&8yExzi3+{<FdKU
z!eO6xOcQHnsg5cF1e@{HBsnEt#>U0|?2`&T8PGP7XyQyDq>b0>Wuh*E*w9U8SRbBh
zgjoqFI)taqV7@<ZZL816xJ&R<$Z!bY@HX<OGPdAcSiD6cHu6+xiIEU5_THheo={AI
zvvJnf6?9)8w<1;vN~^A<u~^JpMh%+Cv>dNUraQbe{O4Q)K%IT-jNpdDlV58TC$gqL
z8~@BUL#>|58j=!}^RX}9B%40Rr~RFx@uU$KqAt*2wiwhv#flU=*)`aNVX!x5`4Uut
z4NX$!rw_T9kU|2=PgL&G_E@s$B7JkSpTzC{rR3XdtMS*a)0iY#wHm8KLr?$7ScLsH
z{o4xCr2GvcdZDV)R)ww9WLvnsHe?8;6e|qxvDMZ1aYDGm1q=x&JsXn`aN{+=I+Ou`
ztt$So?y1^bM6)YPftzp>o{`91)X9{6epSmmThV-r27jophLkPDDWsTnpnTx3#nqTf
zN2e~yni09X2bYD1R)&Cb2+Xe$;V4N?!4~P2J&$()DD~2wtJI3Y{V+Ue4tR198-#-4
z`<ECHW3MKtX2fXhUAc|wJvzIPOYy)okYG&&1@Ts^*URZ$Oc;ok;92&Vt)prWX@-tl
zYCFFvYwI2D0HL=nweyw~P;(O%U?+0CF(s*tcav6Rr8(*PkD*(1Z6%f6MU{ug?dIJg
znew?BARc;p2|LWQl(hN8L>^F~%;CaYwP84KKl3v0rkfORUd{y(TaZpsbg6t@iFB(!
zcWAy*udr50SN8;0rH+JRia}0lEf@8bVid%(%;=5uj)TVzAE+FJ1o5j2hx!m6e(EOY
z8R1hgl#r+qVlkuvX-P;>ce5i0pd4V-u>MXC2)ga~VEJO2^u%03FpRw;n)DU>)%V_&
z><dQqftD8`H~si?=YDGW`e)o~c&3Jka^HNfN~2V3hz*M&%E#W^i5?QZc5oj7!_(Kx
z8PUvY>_ID(LNs?+jxdGiOrXtvCv3sKGjI`Hj%NzhA{$F2vm5w0$2^dQ$tdk>9Gt=c
z0OMGc#U;M$Z$$U4pcd<R>y$pDR48v5btIp(Mw-XxfU1{88QA5cFh@5I{FMvCG}xqO
zKMvs$s3#yOYbH#N@BS3dIrhU@mRp{8!3bY%rAj)gLjB~a72mC|V^krCa~$2Fn70%A
zrs)rnUM^9)nNQ~0#vc?}7KoK)IOF9Vz!Ka(>7Y(5cV(c{BNdnW{iK9x%^4yk_Ki=Z
z46KC#8A?WueuR-Lg{QeGK8XfwOOgg8EUJkFmqxs<t_!^rmvD8HG5p`10<;6FOmhEN
z_i}CGB~H}*^EF>YiM}V_81-VSC!>2>V@Qa&5ZzXMRnVZHsHC!?;5iMtmPRsa0PvgB
z*&`szBIha1zB+33Dd}s+C6ND;-dl|@NePZ~BmX)dBKV%%qa4O{zDgSN4&6ZM1BBC?
zV5d0;N7<uSEt9T>V{XDheV;&Udz^h>#9b2G!C~L|85zZYjP}+s#T%&}$|09i*bQVC
zhNzk?IQ7PM&u&_H5B*jKN4f7szj$&ZYH~~_Q-q$~3uk|@q}Tj~McbascM)PnJD3#W
zC&6Hq_iIp^?f_eQ6Gd&HUaqi(ZiyyMj%7T4OW|AXQZ{T|{9|?mr=}g(;`@I!6-;_2
zF$uMvq5z>Oc{Fg5UetfCrL-1c5)bxtJboc4O4{xAe0Tf=rkiIU?qI`6AwPwLgO06j
zo40MMQfr50)+BW<ttKce@YY;NuHwJFfr8j-XQw?I3yDOgK}B^*rIj@35rPZ5M;=MY
ze?r|f8zz#Rqw$DN;shmh!uE=G@<|H6#3fESf6#cF9Ybt^MS4SGdF8xDy~97yrg{G#
z6Tts?0G1KB)_Hz_fQ%;Oc}W5$n`>)n<&l1GB2)Y8E@KGy5NpcQDQb!*fq&7ORKc30
zSYzIxdxLEKK!yJuc9RnpvnzykbdEuT(H<Q8d^Db!#<`W2mX*f)J;;AR68f7!SH)&n
zgh`nP(!^O0hZwA*G7|6dEk#NoG1Be&heAX1NlV6Fi~lo1rUHtdHK_t%2C%;)!Wyx#
z#r3+%2i^(^B~ewhB6@OG?d^rBWDC;q4?)FNi=_S5-G5)YF`C^w`{+1p`?j;#7FB?3
zbi?P?Rb_`xCRO6`(T#Cx;nd+}H$EE22bWCF#kv~hoCRrQ)GZCFK;!GFvvx~a%p^q#
zvI+$?0wIbW`OL0&y)gi)q7ojoP(<Dl%|K)Q_q&V7#KqXFc$;nEi5Lc*=W=$Gc4%#-
z#}J%mY3aJ+s#1{ayfuB~1U%sy+hG-b1@vaikNe6Z<}3A;i!E-}@x<8-eg=1fd>vly
z(0@6CS{%AapPBw4l^@{-CNjH@cW@QlghQ*Yz}?<I&-hFEf=>hJcFPEuQ_&fZhIq0W
z?^{g*4b~UpFkg#p&rc~5|2$dz=C9u2a<h*6PC^C*D{TjsP#L-`CMq${%Oq)CssiaX
zfN@SuD!h!G?8UC=O1$`U7U6jfPtZw!z0enEz=lFkrALky6scG+N`B*27cfF*POjHA
z=694@-<3H?|G@)j%hLk8Mv3Bd*5vONcUC0hLdkGch6KIbX5HKTTq`q~AK0!0bqcC=
z8}*K`c$%m?l07_5KWgShrUJt8U&mTzy!;@*ymOI{{CkdmO`OTDPRwiy%@ag>2OvcY
zKkdBy@dDLpY<9%U5c!c27&Ad4UQc*3jGy9wUdx#-O=<*a6=>lsy_x~1pHY4$37WbV
z?ameGabqzx<ezo`abOipFJ@R1yW0dURIzmf*|H>+BnF(zuhhHkOF}^zN0^&oJJ-<&
zTCccLoNGJp%fhtGNZHz7A~=9S;EDZo+kv)E{H%}AfQiaMyGUKxO8xa>z@`LBhwmSO
zMaW_5WWcRzIVpnF)PU2#2<Z@fjAoLXq^rF_+9q+ItR_gH0G@s<3|6o$R|Otl_=N29
z^HW?(f0SC^-+Yz&<G;FL_qVgv!f(qu)i-;I86-hrnIu7X9wi|dzz;Cdf*E8v;XPV+
z0vu&}P1yiGUmt(`L6*W%mbMf(Do-KR8E6EOnzE**Dk&&4PQ{kBK5%^l254!3Gx28&
z<LN^c(I%?6Yu=-sKouR%dksVJjk@5AEfcJqNVlBd%%p1Tzk8i#Yn!#Unmf$A*NDdS
zN2=^g#(A|)^B7OAmT};L=bb5C2fQA8Yt^x*<w(gbyVs)q#0xw)2|9lCv}_~ON8vvO
z2Uvmr#p{uh349B+3;ydws@}*p)@@(5senOrtLkSZnZp{mWbTAEKPte4nJPw_2&BeK
zdz=V83py-ZMBP37jb`hWaLC-R6E-rVb!7+Y2$6NuR89p%Cg~jGH|#^XO+4qoJ+~x-
z{0rf~S!zU+F*`yfx?hO!s5S!tnHE~Q4Sn4zzU4b!-NVW1g#!|KQU9(~i{VFtL|zd^
zM6?w%;}en#WDA%m>?{D@pP49n@$-c8+?>r1@#)c{V}p$8Wei8-U$*TeF-m_3C1?tc
zSb&1ZU{SMD65iHzim@rzB0+hLSTGus;E~9gh}ba}5F%oi-0>N}Pi*KkgQ*gd9!U@y
z79Fh~?VpLW5b<d7^t+Csx(MH;XW=<K(N}z7A8t(`eI-u02}57QD*mqidM4H_$J_Wl
z(H7V5f?&j+B;KHWKw?L-)<zMh-#vC_LH__e3oUn!vy6e^kFJ>oPf8;HpC2jaG}EEp
z>7V|Prnw)G|2df|6|<e3eivr%gg*fy02?J#H8fw_dV7Zkb8+~jX7fS;Li!+(-xBh$
z^DQW0Hi>MdHtYs6Y6&`K4Q1btXa;@4a?c@X4mNLb&C!1ld?06K|NSMz;13_o{NboK
z>2t|B<@31S@Kp0%sNw(Md|M;_%`#dtG4-kM4v)mv(vU<*focz;N6Y;)4mMKh0q`Xe
z?fo8VBGNu;CE6qBOJIz2iSCF*V&j0pZNY}TxVjg0jy52+(_BzqP;9Z%ELWUUvNG+g
z##!^&n6|A@6>4w{(p`k#=o+{8S^f1%-p6R?w(ZEA0XLi8R>hc!1dKB6tkiIucZ{OR
z>(EfJ$|x_2@ED_nZim}ZxyZAy04zCI7+_``B+Ee_6dRZ?YRcHKumsS0#790l3sb-=
zKj!lOJK=-vueCt4S*VAVv)*9g=+eh>7_z0&Y#doybpDKc?MyE(6J=Ftq}?bzY^P=3
zod4^M3e|0?66~z=dAyc}kS**8bqOW|`&L}$`=bRf##vm&e1L-{Lt8q!05A*!9J(S+
z>d+|3a=zouK$X#Cxr3YWePkRKX|PbClo3XVb~P{!UWbu2knW}2JZkNa<%y3pywicm
zc#hwrh9I+M6z(8Zwnu!zX3CDc#EF5wE1My~mcwf-+@>K1udu_~g@RJAE1zgLT~^Cc
zX<RJfUvtE^C=#g`Z4J$E0>qV#49?RC+0*mG9*AiU96qc1hu4Ry8?+vK6h8bwU|IDN
zcrJRi-?=yy;161lrIu5XT9Z4@4Sp%mvu{`1Jn=N&Z6yRgbcM@zr%0+&qgTy@(oM`9
zXddtJO|{mgH|t7mDCUIjwoUyBt}I`HJL0lvPrLQBE3t?X5M@X`2ZZ!uK%HPOms}!t
zDtkZ`l{APxRajihkSq66v7Y@Ni9hMR+uV_Cs&Hu?(nY??X`$@L?}oer^n8)o?o#R^
z=Rv8YZW_>Fp&ew2`aTOcm2@vbvHTTq;(w5&`GobZb2o(g%rU?051Gfuw6X^MVT}yx
zicb({leqXZ#^Dy;3?RIaYz;@Sr#*JIh1Cc0uu4~`$kXe}P>cMA-GzxI-2wizg9v9*
z#CRfCsB>3GfV>*49X`i`MAC8VjoDu`?QnuFoA^Gm3k&YXaQj9lNLEL}N!}^i_0%Er
z#KJK%fwVv~sDXfLjScMz&FLDv8Bu}oA(En=(FLTEMzvu~2js;ef?5*+!SQ@D_azK5
z6p=_Z+Fe?~s>J7=#AusK7IW?U53?8;F=r9_8Rbry%^J6l$wVVKuDoMlqhlgCgg$;-
zxW#ApmyDnk`6{AJ9nkFF|CUvV*+%;3<N?3Sm^nb(7hLwGeY*qtpeJ<;_|H<%-3$d?
z&ij3wEGFau<p688bAOO{&$QPeLx7F&^2(Z$xoryUJ_3{q;KG98XrPMaU3T$NE2DMP
zYh};qpG5Q>Xkk$Qm;phpldGyoGKAukqm$>)<7u3GHzikB{2--!lt1tW;8f@1`gmQ|
zm+ETz$nendRPb1V&PrTN=8UA02dF^fH9Qz#Q?>KIJHSXQeTUIz3swA8`w!b3d%1Ei
zTxrOf!l~N1!>(hFE_-k6VW$~bo)dK&H}64S{8s$H83){*CY#H*0F-Q3ohc^T7(^Qb
z1ZxWv*YT{p^4EB;uIq3q%3pA=gdGaM-ij`%_>YPw@Wvuzqh7?@gg7rX2z5%T@5ez+
zV`9Wt<N?v5aFtGBA0l7MZ~=qfh3hjnexO9YW$m6q@LFCz!}9N#Ed7>pnh1#Gl6H4;
z@G@W)8QsA7%%x@Ga_Olo_a8UX<!b7w)NZ-)aK`onJ)qJ*LKv_eQ_A2fzgdY<w>Mv1
z<6Fxl0&u?~&=}8Yb1?cnJ8*_<ha9!#N?+kJU;&H5v;(Jb6SaRMvy1cQ#6&di)5!A5
zIA<nuGbEDPK*~nB&Fw~JVvCro0?wJM<L!h&Dv1!As9E|rJcN%)SG=2C{e`XG;1$=D
z4k${Pi#r5s>BSprhHLE@mSbX@P)r6ZN7sajDieoXZdp!yd*IiFiJyWjZ3kEhhz0lw
zwY187h08_1U<*qC7CgU_hW(Z8hDc+EE$b|s)m@0d#$Tm&*j$f2!2S|_B0LIuVJ`J$
zv*I|Um0Ry%XzZ){{#QE2PMfoP>pLA&`|Swk{r{Z`AdCVK<lKWosV*NmJIl5K8}L(A
zN~Ek2lr{jpg$R4D*SUC7dNqLh_a%2|;sS(-wt$Tk#8O}@?$`I!{VZ1cG$}nx=HKXj
zKbG-y`FHJY!)wcD<m$`&4$n_C5>g(*1QLD?>?g@@A`Cyo-%9xVM3X}7h&YIAX<tOp
z(EOgH$DlL-AhKViZZ_|Ehz2+;8#CFD(mw?BZ)E2`_4)8`_GUmVuhl_f_MkUCnEZ6y
z!?AN7_ppo4>G~SnqeG6!I(pXVZy%*Z+_C?Xb@b)eNV?1Poq^TQSXlu#Ei%&aQ?AJs
z*dhz2>t&Wy8d&qxlP#g=TYi~#@Y(*Z3(_QzF@LB6h|0y}53RE5Y?P)ZTP8=P=#j}E
zYa+EC66aULIbezmg=z@nqSiSCkSgkbD`Aq$LbKJdS<*<QV;5%}zOGGj5~MGQ0~c#a
zd_{Z~R$;HM6ZIB$q9qth=-d|ZyY&)l6&o&sGkXu4Z5bL_8&w)6@R<B<XP{0si_R0a
z7#w<lv<#ngh2bb~+uRZ;(*;vdy$WQKMmnQp@p`iiOIyWevQQLj_Iydh21Cn^$51{|
zDg8~)jpHSq8ggML6I-bI2$W_}Av?ys5qy;vh(%>nV1;FS*{<5`Ye3rfwK3ykxP{m}
zXofT_i?Zz6U}dXijZ!7!)E#xjr7MC^d?z#@NrB2<QI$}R8a0)hj(*L0LD@Qxxnj8X
zuZmNk8ql!@b#<PJWQB?N$|N+X6AbD3?JG9Bt?gG9+T<_u?Yy`Ua{T1m+Q<;A7yQ%!
z92oVIIF^D_TAY%X4!CSCg!D+$bxI>v+wB!CFsDJm6~pvVgf268tDMNQT18RTQxg_I
zu7W6P@~AoxooRK3NZ!XFM=`C@m9X4%NAJ{TiQJrjUw0ud+_8cfjaiwx@R#ebD!!sn
zIKHHbH{M2!5q7u1nk%bhc4ySb`DSk94-U%Ob`iuf-p<G9M)gv?I>FB3nUaBd^<#m4
zI1zgNcG*56><|ZGQSdVpT#=ASw`n54j*kBUC(+e3O+@|Z1TNP%!YR?XsA1|VZZXt>
zDtgqNV2IS4a8C#~<pvo+l7nc^$eVai2|?6JjLE=Cxx(T?wN#IFf$HoFE=THFa8P1!
z8?7tTuTzVUsmpM=doVW0z+b-FFrG1B4vd=ah6~+1-Oxo2DLpG#mAlGHFxM2o#VTvV
z?&bocyx%q1@z>8*4+oY?pBF}Fkh-BUuIeHIHjqmy`BFZ<3Zm{dsC?+cc1ZOXt6$g@
z95Hp>GU-Vowk4dvDJE@L&`gdk_PiX~gyxuw`^-Q4DXLl*7=7c%r7|$}Lg9jPlO$F;
zt6Z%nm(k`~UM|@91jM8ntm6ZKXl_yahL48d)P@fe*Hf@3X{RBL4aJH!6Dz1=v|;m#
zmkT6y1=Cg*?5u!{4%uG7*-{6coR3Msb?YU;c;Wx+>MVfbXtp*C2`&MG!{V^GyIXK~
zcXxN$1b189onXOT65KtwyIX=ol7Ex`*8RTRu9~W;nP+-;rq4{zbf5DcRZVw#9ASlF
zll8~(>Z(zBx;HuuTz5YcM$+^YD3&`Ub}4fNd(6v5U$Il8OZTh$#dP1eK-`mVuvW4#
z3Q2@bo<J@d5v1IFnXqk(yhgTOlWBap-%A{&Ym!cFa>F$S2G+!gMg%TCHo9R}-;w3f
zh$yuBBKVlF2EAP2KeS6KvxM|IPoNh&pQFEQt8SuOhR8({@a$XL7r0<h`aS?eM9!ol
zc_LtU&_BHmS7D0F*98m^?C6BOT8P)Ig3ZQ%&H){cFMap78ti_~#`iN4*;o(Kn-h|K
z1ELg&DSWN%4d<%mTzaWDelm&%LM{K!!9*x}eLvrqp0o1C(s8b{))&j|TWu)TgkXly
zz$;0SPBa++#ielnTNl8@4$Mmb&?MqP+rk`mgfY>|F!zVm+Kuln$UaK(BFSLvUo5h4
zDx;t~NmeCeboMFZK-^%z$C1cVtLy6l+<uR@WY;BTik{d$2QZ%v1Sk~ZRFpaNDe_8h
zvDk8M;zyq6z9lAuO);TINPqQ+yeTxz4rj70(NW3jIi1tq(luDRh%yjGt1!_&mM6X<
zlFRW|p?jre5&wlI2a|}is5NsUb$XBB14%82N7aBorhfO=&;1Hok`k7fYlGaK%7|L=
zeqEoJO<@}XyuSKK#WyZEZv8FE{=&)#p#C2_)Hl&?HzL3AgLeepL>jqhzCeORyk5wE
zI$zlWZ|+n_9rE)J%y4l`DIBSDtPuP7vta~9BQItV_|X<EJEIisgJ=#OahSz`$4NXO
zxb2h76;&gf9)$jK8I_e?ZG*#aC1BY>1NGeA3=bbz@?FOo5p(-nq<4dYiXX1d4A%~m
zzyF8}g;zezSC*FGc&`iN%ovdN{O~IYdQBeSHH$kCI9_(CcxA-)+Pe?;;eTYEdF8h6
ze}AvvLwZ61NTfMfDu@h>us{e#O+*D@<I_aM%LmoNo1-L><ws72<56cCv-D`;E{tbh
z;5Z@AJPdL_+4z%1#`WU{LJ22duQiXOrlO<*&v{!8Unb2~{)~nx_g2KgeB(=^p_Iu~
zIZ+^@9j|C8Ogh*}kKe@!J~;DErP$Fn#tYmYV{UU-XuEKkGH1y}G8v7U02wU0<KtAs
zRpFi{E!sD<I_M2V%~?CERO<Gkyp+a?YSN5WP%&H*i}S9ck+$@pSMqR<T1n%7I_GMZ
ze~fZkc4t%dXm0E3DJi+RVmat)qFJ9gOg+^tBqqHa^VObLy<}+jRi!<K`_*cZ1nk-(
zk{Hq4ycRTUZ2O42C@AAd4{B2gqe=5f*{n-L3647wvG){p|8TeXBbj0W;DSdt&$<b}
z?s`d7$}X~k;Q)+(7i&9pz_rsl0Tsp_fZElfG-4Dp9M0=O&nlnOA1Z3(<+<PdxTG4*
z<~eSudE55|efFf;T4V_SwM7h}b}!NEH0R|nY``7T1yhh;KZ{!?4v2j`uloZExNEhC
zB_L=UCRS1VV*AbU&o5r~YM~ipxxOaupRqeo)x1$M3@3-D;TaH{WGQS3C~YD>BF>Dk
z*eFRyPqU|3!AI;N3uCNPbBZ01ey8!dFn$k7NkBO{yR2;-=SJC+hLt+wLA*=m&KqL;
zD27?*#Fz`$^wrM+Pz@TGafZeXc;g^5>?3(i`x@l{M7q*1Vp58D{*19kO_GL)qSxAk
zUPhTyj4-0bf)R8Xh6uz?ca0%|XjhK0E(ZbicrBe7-=zcyzEg>-`PHJNb#aFL_N+3V
z{Z$`S8k~X&U5EhXnDun+>)Ia_BOEJq_D)M4pRZ-xKiGUOth(gMD9ZdG({If~g~xh}
zNpFI6f~(o9F-v_M>Apkq_lH986MA_D#EdH-X8fO*xhpU+XxVX28C{UuWw+l&hQ>jA
zRCP8Pc#*{QF`0>>r0}DvdO{F+N=sHh4DOKR;+wIuE7;B}sJF21sD$3fi;XKNNT-md
zMWw}99gOpW`Q6S*gg*zs*G6<8QnHqdN+}8{*xa}&^l^M6Kw?oJw^n8?Gc^={g-nN|
zk&Kt*(K5fI2r9DY1&TMHMM0$Mz5BSLJyz+2c6!+fvp_6%D6GFS_V;n%^8K81#K>k&
zArjav_{4jC+uPql>4NKzxjrr@qntJBajFR%aAuKHShP%@)8VGx1m}~lS_}*LZ|i+(
zxQ>bzsortR`}Wkln{GOHkZbkUk*aZQ%^3JpbBqI01F?@_{v-=CVKCa*W%ijlP;Ah?
z4&CQiL{h>l)aS713y>j*JUwfjbPC!_w7f(uM815m&e9!lh;DDQ7}*`UDL5<%io=@a
zQ#6wqVo^M9{osN<#^-1%F;Ef5S;fu}O6MeSt59cwI91bVCz@&EuB=_LZko<de7OBM
z{pH3`3*<Wei80SP45i_hYbxCZWK5XPzsW5+XFgVM<FZFF<eaaM#fjtM^BruBYlp*6
zi;RjN>H#MlZiY2kxoLX3`O*9yF_koFH;<sU`XRxrbD<`%n?;|?C`=cbhp(3;3!N4~
zx@><|jS?yJ&N>9>7uLx}R%kvqI4+dl(@knR4!WRtV*Lm^ubOL7P$yHY{l*MyOgYYW
zI2WEzNtHq@8<&Ncr6!44h1KkUJ^9|C8*fi{-_P6BAQz8m=j}c|lNtHea-TB12AdF>
zth%`QvR3~Fxf_&+mM@!l&d?^A$NPTAEnAZI%uI7*w}^&E;&oN67OW#l=O#7q0B=1U
zEfe+ev#Vz0v<{B5M50l~D@(*gQa#FzQ}e{QU;pzp@^w%a1fEQ_ewFD1=1F4&VO@)f
z60jpZ4HTg@upMAYr)v#2lbWdvCIuBQQP(k;Nqos0)=sGdid!A&9CF=r<L&r(q>0k;
zJ_GwiLRSww8|tjuoni!|ImEHcEVVnr#s-AcWq<Ntu$p_m3Ak9IDs!=J4ZCbbDX(|P
zavWh3n4;`A9dJ3-UFW=GRIAhh=~LME)!s{_FNU3FI9{;9?*kWg`H^nuK(L})<x&)1
z*<AP-+lE>2&z+%-@*B8XuLvptcv4}O_?`xpPfRVRzQz>8>fIBq4PM3z{#|NCsTNi2
z`JwR)aw@nEkzILK!v^pZ(|Y?Jt5;ctjwv9juQzQaKWOiK-5I$ebj$f5L!p-4dxei?
zMB9fj9!U5orB_&lY`Lse`VH5jjH^=CRUM*NhvxRBwV{U`erc;cwfOk;=H8aeck-*d
zLc(nPW=ii!Rq>=Ew++?jVVK60UoMY-of?ZC;z_nQ#li9VGJN##m_rMi_5h4mI+!VQ
z2K*RpfMGx>I=^O&c11b@?Qr~5zw<B2>U#ciY<p;K*e(JYVfy;fVth`oD$j8ms_QjX
zfB*1|V}vI`wR>Aax{$;f1tKfTT!R$NGIvZuHWC!xfI@_wG$T@uFuG3A!hQy3{}gGL
zMVYj}*c9*H`SP3jO!u(jrF)#g5=@#Q+?gi~>YYnGOJSCQz~(|G5bU^#I@x;fxh8O|
zRXpj+|9wX~=_W1Tl3-HtIF5yv@VH|rLx1$m%{cFq<uNGe>ovBNJbVw^P8za|rcG?<
zt;zZ+I}Q{Ro5B_uaiYN<)s@f3Y7YW#>zv}u5*5-Kh7s7P6iS5;1c@a|iqP?iKT!XE
zp1#SUaBnPwhJq@E48-#M|JU&q7!EAGhyhAbHIO3|#S(1LY4B7~Xw2O4ilLRHb;L5F
zB)1m93PMU0c;J!=J0G^xw4|m26$qCpg$g~qekzLc;)2FNw(%sM%;`AH9TW8W`SRlj
z$`-njzj^I(-#}@2Qn*9dS-JXbHmiAsp95SA#yyO9H*HEQ{tds_=6A(+83UGU`zoL;
zJDbbhV!Q5<5R>h@kzwt1mmGw3wzcV+wI)?DZt`5pAex~G?QqeLKFn`LxsxDaviEH#
z%R)u%qx^|{eg0K6Uk@ZvCfeQzCgUG$+>~qF1LZzr-<nD226romZ5OWi?``^^yI{jH
z7L_2Ks?kq|_v&BoX{3z%OB1T>t5Jetu4?<B!q!jB&->cfL)fcW)qjR7#Ohv)cny>^
z%F%Z30+tZn(nS}<L$|G;G+3|<4cgBIqL@%0JqXh9M!`}hGz#QxRKC4TXKA5kR^(cO
z?XV%{td@76o=2Gv!OO|!0lz+=VI4}sJUk$@HgYi(w?-(@GMVrW6i(nWxLHUt1d1KS
z3@m>hh^FY37KqiXOHHjVdqK5D8?`vHH<`Rmq-H=51imx5gZ;ZrQQc$2k|BL$HpCz2
zKT|Wmn-pyc4osMh4Eo)o4v+~v3r3?tYa~sZmgJI%JW>KX`4|{^7Q7ekMmwGQbq7z}
zqWB%m2i&(G-eHn_fy|CswUbT*LxsIAy4Vjl+%Cpnem?KwzDLTv-$jZdz*iH8qr#Xh
zR#{*{mK(^1!=^H!>m4t1QOY(@z7`n}4}(D?Kv_;9`WdMQV!9_-@WtXWG)pX)a*~L<
zOl;WmR%{$+F*p)f%%F8-p{xvCx5U$T5%BY9X|sU8d`Pv6Rt${oAQW(Z2cQPeG-I+I
z+0~nLpoG>4PQ9sMLKDyOti~3$){cF@Xs}w*7N>EWrEoDX5#1tya83#$P<q9N%I|v|
z!k7lq*;hCLvFp=#VrIs@G}r84yvEzmm$q^e!sbQZ|DMf)ZE}GB4Y!9C<w|$rO`pGo
zN!-?aFV(ykc187bhv-D$endgMr+PXzI+2#i(Xgp>`Vb$S3Ho<eodHauXl+wGexs*>
zPrD1}B138nr>&8QaGDD)uQBOzS(BM1a(W(&Kn`|8pidGgYF$>6PHm)v4%t>x?R^pO
zDi0fx&G?e-`i|GHyIePHmko1{Jo%>+qd4c(-MU)Iq=cEoKWh|3&hm_mMbXY>Cbg0I
zy7gf>s3zxoObdwhG7yp4OhTq*<c=ajsEz|>!%dK$bY9`7_S5XUIp7UC6D8zY_Z3qU
z(C*DSfchPTM)9=SK2u~U5EWk10|Uj@1;lhiek5Bp0>qxfu6JWUuoL=GXFt7TER`kp
z?Qk3qjx0mJZ?wktqy3Kl<Wn1nlx-V~O2&m7yeLhK7;c+t8JB;S7rGlCl66i&&92Of
zKP57doc-a-ks>}Magb>3+*oqwu02)Al8aW3o+UlC`Mrw|71H`efPQe8USqHHum6$5
zYD<;k4}=)72E>5>`;zzDfN?-M>QhRXkPM%eo~xlHp;5}%jO3cuwDnl%VzLp%kuqRO
zc@|1v!qH+B9nX=A)Q6fcBU$i%*RLXhgAJhM>xt$<)yBcT$!FG0zsoFcr@PaZ_&n(3
zI$JaJ1}^(9Z5r+L1`|_5=6FViBZs88Pzhv<u)VNv>Ww4DSWz7)mh+&^G!zPt{gK1!
zB0>C4EI%e6$<sjb)(&#zl?%R!Bau*)<?~(X#|=d+ni`$k_&5nta$#fXc>yIj4Xuy@
z$~E70v`j^I^yg3R1fN_H{3tsE49-Fk#PIiOrqoSp3F;&ytdMWTUC04i-U?;GRX4s-
zoKe@i_7)S}@Xl>r?-W1?XfLGX0KXr7+U=^=ewWHzg|ane+6^Mc{SV!T^jhv|k6997
zFQ4=A;k?x6FjeG80(O-`bQ4{3@_wuw30?q8>b+hxrxT`<yF2Wa+F*&2#gLA%QtM2&
z5&P!40hQ#*oXp9FAIUw){ld2bNkTsHr1bLCqhwTe;xGJkvkU~uE!g1nEqOrR{w_e6
z9JrruGG|0zRIOV}p9YK*b2Am(Sl^+|!7Rp7*`+gtQ^umab;I2vk>18D;4IHs6A8Of
zhks9q7fj4#tHk{vi1O{VUWpstfu8mOfBN9TOU*(>27joaV=h_GY8!iXF1bmwaF720
zQvwYJ-*PvDfD8zPbOjUU^Oo1qBn&P8i$n4wda4f}uyK}lg{rtouayYA)=M<Ylc+Zc
zbMdwd@U2xUGh>;2r;X{FbA?s9^ibBwcw){g?!%ptV%`PTn6+O;mU#~4WpkXtX1hJS
z^9aWW`1I0%*Jx(`#PO!Q!C92l!@?2dk}_G8k>gP7niy0h^8Wwh_!z09@C*;J)eeY9
zKilvAlLP#=5a-p`#|FAWIA~#y>4jA;Az=#jUyv{A`(9+utBptBYeIHb#&u;3oNq9d
zKlyCWS~79&qL!pa#G-3k<o(vxKSLAUPIZaOdv}AKidta|;5gR7^u-FGF;$4^3kr@<
zny`r=pkIeZ(2SrXY!{G6ke8HbVCja|8!u9-?H-wjWy&WTT^Z?1W5?6s2EM1~?#6Lk
zYn?Hw?G(&F!Vsf!**@5~SiR5g4!D@u`*GQF3AN{<CyKI*#K$rtTA9rP?%f;cNe;3Z
zf9Jv(WryOryqilr01;$+!SEVu?*P6+IeERhux=5ZHs+gQ0(qN^&EEc2SaOJznxW?@
zOXY~GC9hYrBYCp*9fj<I0A(b_>IHU6XN}9%F4t}aj%WZmTsv&LXk19CE-sHW5q6HN
zO9D<XAiIuN)NjCQ0l#-lF)`{Chqf|hw)8^iAS;#0a1X1sY0?0sb{1^B<Y${C{aWel
zu=)FJVC#NH+>f+u#$@NW>A9O0M;if#hOV))GA)9t+&RnnwPtEzr`0E`8%YU%Y&kY9
zN>OGcvl}+~j;k@OhPxE5qZ{?^tft&}U#?DsIcj}8H=ODl1!?6C(`ijg@g;Sk=f)PY
zqx7aPGYWr{oAF|Tc4Fy#XQ;<JqZ}#KZ%E6<MAM>7P$cW}cYruWtphCgQ*%8m^H{4;
zU*||u9i+^kwz+VlOgPqU*~2nXp~b10aV{PGn2ZiJL+^gX4mLs0*U_`SBk6tfq#c%k
zg<7DY+BkgwmFgRYbYTET-H%5487BE|BQyAf#yY`}#xvqx(8>ex9uZ$c0(n-DJo`@!
zwr7~o07>rWAfY?#vLpG*x5iLbP#`KM^PjT%w2$;E@)3nrE=;X_a)#zI+lx(p<mA2G
zkDa!+99tGV@jXx($O-k$@xxgZTbCZjZE)Qpqv}0wdnMp6!v4+`naX~NG0{Jx)A26f
zTPC{pV<S4GfxfOtSd*x@ej_U)*IrWUU#@9SdaI#%BF)SMuTNM^dK{h3l}aQGwaTkH
z4^JYjHc_sD-IpQ)c@=-1V<!E~7p*aP856>q#~7{ntq&{G498ac#cXniL&GOh;H{~>
zrHf$I%l~+pbm}|lWJ2a`YG{5do4J-Tg4E~Reg$OgD>^cf!Mut=dIw1|0!1aZgo4f~
z`w9=Hk9>oYd*llXrWH_3|HQDeX{8;fYJS$XVt#>>taP?}p;}1q+3-2{(qrb1v3sDT
z+Q7bAY2$K@pFKl{33wO3=61omd7tC-WBpRz@aIuR5fsiCxNRx8<?F7)t+&*W56D}q
z&&mDa>Qmh2ju&6r=G>JZDrmTm<eHj@Z(}hrTG;L(I?mreA^h`BpTG-=kZQbHX2Onc
z;`_a$bS7ejPCm;>X41ghPvue~DtjkKxPqiUwgbxXw6;{jq-y2SSTN?9z)(KfYbK@C
z<IM4Cl`yZ@s{JaK6+;XIta^e$vY;=BvKNsjE=jX<2U%chHw$8t2W7A+k%wzN@Vf^C
z7&bH6TD8I~G`q0K5QlD*O<~ldssOiGOe%P#94xC);a*iHQl9DqU0$G7ta;9WL|UP!
zQ$;N2&a0uQ)=-l9b>E~Yn>fKDlR<0F*JCg0eU-Xz4brgfZMP(t-Mx{v2ZZ{Nz^*ff
zPSdbro(hD_IT<d`e>7{!F1NIT-Lv1%0UAsux_K;<PC(lf0As@KzgmFp-wgZMHfVqu
zUm?VlO7}-qBWGQ=V&jglEkUAYD5@j1X=b~a+G`eLG9s<z!QWxOFJ!n>(!OmWzg8x9
zkK|01R^D>9`sRQ=E+kyf4SKsy;=;w9QP+xXr;v^)2X+v+UfVr0AWc80Ujx$Ez8TmR
zSXp+6@L1JrEGeKj8OWY*1+K!fpQW&i*LfE<)#Uh|vs2_?)h?Vw4OX$9W}Zp&=bL=S
zZ>XPKryU;CU4kTO@1jcYc9}~pjb-f6BgiE5a<W~jFS+i-5q0h(27Q0q(9Dd1v^ZGh
zcq(!ZWEZU_r-xB1imSJKR%0u*ROZg=Djsn_^^h8WXB30OWqJ9@-LTKHxMKmM)>NEh
z!C;k$oxe}hL5fE`tI<K6#*}yTleR*}+_*DO`)6MFFDLTta``Wu>xNTNxL&1cAI~C|
zoleDF8U*cUB7de7NP}qVbhl{ft&+P=3v*Iu^QfC{&h1)E^{@)^oy8mbP@Fi;$Zm7>
zZ-BmH$pXL3zItRUSOj$00(rXZhrIp9hGc7(`PlcA#SDjz=qFq-#I<b&rcFvz55;=w
z>rpCzgL1S&ZM!IX+r?I}WeV2jBdr2uSf8<v%^lfU6y$@f=|FSI;s#&S5=7i0aKPM|
z0;^_ph`a@F7sMnlmhNhWw2IRjCd|Wb;yA~tbR7pzxy<Ux?SNc@t4A5jBeR=XvUn}l
zt;L^ZFHpgyIqDpTu?t9b<QX#8VZ+w@$;q*pd#OY1jMfy$b$0b5XTU+bK~t16ZhHwH
z`BOZ-EfOOQ84$WOHS#<&fSNovR=ip>2&K%jrYajSd(_p);1alYW{Do0k!W*tZV|?>
zA@RaesH4qCL2%k=T2Ah&nWEdpS~>Pc!nTA|yc)Hjb@pq+;t93AzG>LA_s6LyO4F0B
z8T{ya*2aEAP5qhf5Lpo|RGkkmre_Tw`1SfT$}ML1tU$C1`~D`r!9`YiJ|eZoRqzIL
zE#@(zLu7i}mSL;#Jt=<2{UmR-gf4TfBk-H+8G=Cu9DruNvxtt8Mr7^Bh@W)B8Pd&l
z0cfE#YYp7H$I3B+!37a|$Ekgr8;kQLrfhy|qITy*9{Ood(^jBJDcDa{%3;+mEz%B(
zvmcf8XF$iQUnk<;&=WK3v|A_UH`<$`(;SxZ9eycPnY4)d{&mDT&W>4?Je3~fLyEau
z_ld7vBlAKJu}s0`xJ#04GT?Q~4$f=t9pLLcwFc%bF0t7o46CebV&b9^M{%aNvmgv3
z94w`f_FeN@T@D-WVsSp72<;P5^y;ju)18$g+6$1Qf-g!S$Gvs^VnXd1J0-bF@5mB5
z!7M%Q-1_`{SbvC(j^K7dhQmj`=<+fRt;<&D`A@RqPkW}~Oo>0j011KOOetd#gcf!?
z`!Z1)oY-OdOj<OBO8BlN`V#hy_w&sw1BWiiewll^x1TbREJ1L#CB99A+6)Bjd$uJv
zRo9>a3?#3Lc8nE|Sbe);57#cTJk7XPQ6~01cGn^@?h%bJf1DP4*9Lz@upUaAh72L$
z7Z(|a;lq98vqpVmRjLuMhF6_bmO3c4#@Ce3#WT;L-!2?ZTsp|ShI457!Atndb{;_X
zgneF_Z8Im%ur(?#tBhIn=!_po8Jv&gm_?w9r7yzUd8oV}0p8LVtb1~<Ex>z%hdTe|
zgy+H9vYwTMXN^H0x!sb)s(!cp>4X~TuL*tMG>BDgrH<|7i@jayOj-7zHSE~eMU}wt
z*gv5BKE!B7<S#gcEvwy~?{c%QU)B$}$TJ&i6Bua&qHwde(=9yjaJ|0i5!Uh9CF6jM
zv>XG66T&q(zt*r*Bw80Pot-hnSzcxC#TIMw0W!UNW2mC;!`})HAXnlp;I%^M&Fm3|
z36RIzepArEc!uEz($?`1Al~D8y`w;6$0{i760{6C=ocdzAQFtxhF4>ld{MVr?z;%(
zB+05(yyARJC5xw(P^4RJJNTB<mBtAQp}mhHI@Y<pFu>jq6JS!BhRD^w^}AvRQf6KW
zb@_{740Y%#0XNr~H-f10UfS94X@n+A0*?2#+}DT#>u&|_fXpACD7}(KwgT>Ipi+j)
zylA_ESX;&1Z?jxNnJTcCSi42(NH#AOM_%C~)$$w3W*TS)b`sNhXTMQw+Gzl-)pV~d
z^GD*C?eNd{r}Ylp*@W&k8ArdB-7r85)H$$Nvq2uJdCTiJ?j7wxYVymt2X2(G&d4%3
zrNg5D_IdoLr$=lomFi+eAzRu{$By=oMr&4KyJiTg+vK8iJT*Vgg=QYG&yQ4kCSvcK
zhQPd9>I-`-U_}+143l0@T+E-KRJ)I-XgH4}eaYZ+5+)pl9YcYGpEaT6ISbGpqIa{!
zK<r(h*PJ`yyEE6fRUXI_)PnrXj~bDAm7n4R=emE?{WP#3Da$KN7a`B=?oVy2$lY|H
zT1tzlsNok>SW@-gJsjxfpD`<=B}%}JZG1;j4u!LnOv_G?5}4~a&!4jcO7(M$%z?)7
zoZH{VO&j@26n%H=h+OW5%w8b6{zGGfF}w8}7@rSLN7abkZ)&QKpm#g|14(MMV(={Y
zk&O=L#mn2oyx8|~;){CMaoRMu4O%trW6W;XBa~fxn|8OW7b7I=_FO4m{&ZycY43kD
z1Sw!{UF+qL5WZyd9q+#AgIIhuCgndM8Vi1>4h65#`Ee}!8*F#;G-YldC<LAWGdf11
zzkO3Gw)0f&D5MbowEDwnO{O~LPT;icisRG3ncdmPe2=qZ-N+iv;=a*uiG3SqEY;45
zYuQQMoZ^{J-0-X=b5Y@@npRJx#pwC*gu3u^^W9g0@-rPT3Gv`Mc+esA)i%uhhHGk(
z;{dw<Lhk0cuwlaaW3??qdbOjAf1Vh@M&@H@j+5Q?cFZca_?2eNmqjj^UvtAgYX_ad
zQ~s(@a@zxJ@)Orvirx5c&@Ot{0W}9y&!pukof-f)o&!yF;tyOAU(9So1GCC!a9HNZ
zWRa8`#9PCkjds??u0e)BuMZ}RXurDQPK+1fT_U)yO6Ip{2!v*v>>-93qnOBkNBFi%
zS7DBzrbid9^5ry$`-o_eqes+7Vgd<vbKu6;$YYv20v~>VCcmcE8l4@j&={s+1?%)I
z6}l~LtVcB48J#+T?TF$!GMJ})gX9Ly^bH~tb&q~lKJbWMn-dh_;}IBMAAvOxrHO1S
z+U>(!@1q2q(=pF<V$ZRk^9_(ujY55Tv1#{FGVUS6N^B4L8lJ!%q#CxHe3=mX?l#cE
zb6Pkil=tRdo@y*lU}oWsu)^r4MSEFB86S^Zgi)H0owcUuDN(Ji=o+>H<wEEvD1}d?
zNWmYH+tgvX%lAQ<I7SAJDxX|+&P^DKH2l>(u@_I5$#09L1sUs0_uKXHdG6Mr7L;*E
z)VbS)-_J(gsJ?3_s+VAVO~P0~+`mJYqD0J}mn(vum&KYDS_@Te{RJmG`1|7;66R_x
zE^a=FL+jgBoj3gHUi{Zkp4+tg5uf`UU+{3Zaf|(5pL>&lh<L&jGhWGA7RVjs>qX5_
z>@QK2nbkCsGw|0c-I3CD9i`Aa*R6%53q-UE^xl`%8Fj}7`aq|RRz4(mhSKkQwQBx+
zf4X1ODk{_)%gf84l=2)*Q*0Qx7XJL$iTV8s8*p$2E#I`rVQb0L@pYhJ&U?k*AKNIH
z$)$?y++<G`RO#u*{l(1<+~C?70xwgh0w2yTGPcnNwfJJ4V0Gm&>Hje~Z;MP|+}6yX
z<Rqa%`~l9+skt*&>WZe){lg2vW`E1k_aW6#CpE!bjp{c?0zHr5o0`{*a&3ilhLu-B
zs7eDg=trK{n_^Us6C#+5<sr`V8X+;5F8mT}+vGd8AOQvDRq}qh3C>UF>aDCHR1+zT
z^HQgsxqL>6HN$@CR62W*jO#VB^9$v?c!M^)OP)FLkI%mIEU8Gk6+|pORVS3GUui?i
z3Hpy;4{cQ8O^iI=a2=&V1+b+(G)0&Znbl^nZVaY7SfQkJ^W)dFjlZU*<74-UcsL|m
zO5H{{26d)~sSX~pFs{i*nF#bXX{4JCjho3yn;a^}EG^+1AAks_X4%W7dFiDbr~|`g
zSBbCfiv<eHUz}maR_MZOv#)fNv<+q?vGjREG#KY?{D}r_+f8BYj@sEzy5^g?Pa;iZ
zK%Iq_GT{$Itf;c%x>0qB3D}>RsLTaJIqK^<K~l1gEZnpfm6=pzx>}^Fr(Go9gQ2-&
z@CP%nxZe8|txD{+#0%n~VC8ziSbfK;m@e+`elMVRM`j&*=-fj%j(XC^vsiS5%S!e&
z+%&je$L3IL#Mq8oYa(gIMnWi5sYz;D|Io~rCN=e%q01&Ub`-g9$-H4TJWpGrb@`cL
z5@h%NW2~m=DQWX`{=NpS-((rB1WZ?T=qjMdUuVx@qxfC;_0oiVA2P90*;a`>L#?-)
zPPb^PBX6`9qM9kD+=6+eq;}!6j)_;D^o3alz@qm@%<-*U>1dXGo>%KP=(&9ge<gSS
zyo85rtSuj2ROVrPZ<U2@s^dX4b78|&J<xTOKs?EaoVSJ{nSIIDIa3vN|Jy2OY-p_#
zd#0&Cgv}!V*s{&I%U#~m!z`Mf@5N*L<!)C&6Lpd8C|6VQzC7sryUSsyftlk?V>>2d
zX51z(5-;!VvS?=v)nsz$kS7fXH`({y_IW#lNa_)SzF`HvLlw{_zu(g6txHQ4lmm5X
zWRw^3#ugPF3K!qLNCj26Ehx1f4D)2BUaO^+d<u+JxD)=oBQ5AWiLin<em=1=pTgX0
z<UJV{WpXxbFRz?wFMkr?_J*t_>cd7`wQRtdXL*Lz?U%Ymyk%raHWbMe#wLU-^&IMh
zUC!SADFk9+>gkstk?(wyTZi_HP1d0Pnse)_QZ5bq7Q?>J)6JxZGSi1;-;73({qEeJ
zG<ybgWgn>+r)dv8$lc+NR&Sh~-SdBH!7M}PZojuj6D+C{(p}c~aBnJ`)Z5E(!+Wlb
z>XbVP;HrO0>XLSb=~zW#mc@BrbBi!e*4WUeBC(OUatY}81;enP@k!L3M0OT*6I0SQ
zDfgw@1;)dn;uawGv27GCPyQuWFNevZraG;KE)>d1JvPwrWQppvlL_1gu=sP|<URMz
zgwwKeXE@UfahlsD!Am5uZ(hos)xs|$Z9$Uaf&e&Qd+U3Z4GpfwL+8Ly)N|seM^(a=
zuDu-7!=|(eM;U^Z_|k$O)^ArpPA2{u3VT>ES56Q2dy93cMNu)|Y7Y}x1MX&HE(_6q
z6~H7t3hTJ;X1EP<9bb(9+V`!O-!ad8**vC~%ISKY%|he{SC{5|M)ZF1J0%WQSiJEj
zxR$tO_5IA{i)yJ4k<~A=yqnKQO(u?X1@`gP+OLPAeK4Y2V%+q5SbOT?Rd%V8>+*J?
zUGLmFzgF(D#ih9g;0)381V-(qtW6zyV-HpG8tzW?Gy!TTe%u0t720DTC=9<H{uKUu
zj!MtlF+CX)Iy8g<i5JHPf9k~m2eu=CmO+G&1a6Y6!?W+|G=}2Vff{o>sTRCpl+)hj
z(Yrtez$&eajI%BhrX9Ibf>rX&aHO8BT)}i`NeOIbY5;rmhhh#ypl~Yp!}TPgQ|FZy
zdN)5if!snXD>G!$iua!X(BG<UR`}=hknrmVmJOwR%rF%859l#Cdn&0ev>!f#I%@li
z$omxY2iD7hbs=Li`aSjD0u;MC_<3^q*pjbSul3*NL8N}BsIOmjqYp*1b*FFDF;h*)
zrJ4KlesIKd@t5c{irdA$4%D#j1S$q{M%HZCYX=%Y`HK&px^yOrpmk^TXL-vV`O67(
zGZH(EJj8{ZTP{PAZ@QZMEHt}=iiUH_qfe6fw3}{cw;FYc6Q|iKaZ%?#>1Kw2V~wQN
zEo3;Of|<SyC);4dN2lu2*aUy43b=Baudoh9baPSRL{e)n$Z=(ei^1U4Xl{(MT)NOK
znR%$PRNL<v%z+AilTgB#DW}^5FKeS^FGti8H7~K_R@C&yO11{!sEe=}#MKiQdlKdt
zFLN}$K$~65DJN(&EBQ1j9U-3%tKdC#Wmyq@$a#u*tsv$*nyn>gr7nkS=hQH;pA8HV
z11lhs1=NJx@m&JUnr*JLR6QTuU#BFj)2+w!-AtY>djqBUO_`5Upw@x@C!?0JcXy;=
zl<pj}wfdh_TzEu4Hy0P6$i^5L3o|(@iNT#_9r}kmdn4ty$#NQV3xlz}#pTF_!C(@1
zHqGk<3$2d`7nPoEwsJ?de9pxcX-JvU)m2(?$C{zKv%HDR`B$&#-QCC9Km2TF_?V(A
zcs|T!cQcc<06SmVHs@HDNJ>n|ooYwjQSSlEZ;~pz(%IL-)751T!YON{s@}V|lB%r_
z(ccPJctwKHj1PEfLwz@2xatevgw6SU6xNpXNki#}`SN08n+(+ISFs*Zfuhuk72r*S
zev#b8J<iD@0*FuK{$l?ZD5SDgyveer%w_>5e{QkAN~h_d$*kS_Dh~MYqt^yD{F)2V
zfcm&qS7$4<&=~3&lqKYRMc?U!M#B^G`t60zFFr?|lX_C^9;qu8d@bzGU@r@Qt)Ba<
z09fHKXjJAG2i)w<oSIlK2*Rn?m|Xpm7Zxw-JyTb1i11x5JlV(Pd+f2ei5-jHdXZgl
zU(^nn>l3iYw~~XfUxKuzfNH^B5<*2=X%E=pk~KlJ5UFY?(BltIO^X-F9%|OIt(FHO
zDWCNi<1(yy)rra?tpm>Z@SIOd85_B>PJ=Ax@}eDIj*y=v2APIiOSkwmu{*=duwIBO
zC-%5lsmZdjJrW&rRkHiqy_)LO2{KDBM&-CKUA0}G#uN15bE=70vn6&}ydo*z1?8Mh
z<u=2KUrfa~fKUlh?KG)kdFGy-oAEn+sHcOMVCQtzBU!Pgo0S4thMy)1Q^zt@v`PG9
zgYCapQVBT`G*?6)dBOCPBG{v47Nd0194+Cx)6k5o?=J27C^Bq&7qA%8sW{7#pj~O%
zQiI+}CEyUDAqMM*UXguTKKl7Yx){z?^?QYk@=*vBLpIv?p5r}>`9)_^2P~}@VL_W7
z!lp=wX|m}V+@1%kVqK`|4qVa?J7r4w!^K*KUXASHgrqAi`@FVT&67q{DL6;+t}s7J
z6seBFTti9eIMZimhI=7$gSt<{1fC%-p8J!ZH7`27awbDqdk>*${5{$Ch+e8UMa#j$
z6JBhfJwMjSXO?J#+B!n!oxsiz6hoj)k$_7!^s@A}Neo$7*-W(573<HTbgCVmICQ6^
z2Tbo|PvYL8oEkDw=(rucE$Mg+iC)A}q|J-TVx=7!*=&G+l9+#xW{4uFo#Kw#eKOQ7
zMy@+Fr@;+_3`oRE*WZf%>-{IYH!%paf-Acqo{P+r`!$3}mjg@0U)%f;ef-rUV9ULt
z)S&*)aEc(o@MUqaZ|SiYzVMO$Pu*Ed9$a}F=bi0^9+g*1qdA`sopyfO39Ucpj2?*t
zcqxx0QnAyls)@{}`zQmlJv_6q6kV+{Ie`K=FjjT&@oG`^vyuQdie9z6@wsB{1pGtL
z$eg@b#L>_-j1BT421DcI1592?zvvl;e-J;ps6*S&tl@0zGqxvqG3{F$c^;(R94WvM
z-`eYLOo#D%ylu+tXQ(A_mNQBdr486S8G-%%6NPTr*8woAYKvs+O>b=SM(Ws!JEN@4
zJs|DSR~d-JCtdil%u%&2obs%srt1czoj!@tnDquRxX^+<aQ*J_;$~Z|>i(%6n?LW)
z<_8Lup{L;sc40_poV7S#2lu-}-LmhXzDdaFrrc#T&-@xQ(jAWPuOy?Il}1dH4+^C!
z-6GVu0BUw7;~a4&VcO;@>n`;D@9FpH1n%jt3kzkqn%|XwqADcLCzSZ06f3z7q9MMm
z|A>GtnP_pVznSobP3~FM;1%|!D6GVgC=1lOI7cVUh2xfmWU|3VhIIf3Ywd;8D59=>
zHeK0lQXV7ugQq9|oV05(;?N<ME|F~ia`Z!$)idhUoifP5^XV2`T}jf;RvV@tu}Z7b
zqJI<K5A);D_sEe|u#fDKVcjQ=r{&A{>}TeOi}M|tfF;^e7{AY&^5WfN;&Daf;#BZ%
z*Z&i?1<vWj?u1N!l7iEFIYD}VX6Bn)7|+Q|^sz)~a0?hmqi{QwD`8m4Z2F7gf}O<q
zb;9huvep?fKuA--?uYzH*@SlicT)IMXG|qnGX5Dkyw5q8{+qn)pMUxPf;PsWr!`kr
zR*@$Q5<`1p$t&Csi^`H=C{B2vJIKfYbkPgE{MbtW`F^jyc&9rG1dsIAZ`|HROSH6p
z>@I!dTS&Q9$SEWJQ8`kdso~f*l4W~fT2R9XgLsW^Ty4xgTM4CX?^{D1Q4XUeb#%R^
z)8sWR3>?smt-aeJ_9_=`QuPw2r6Zfvup3^C4}Vbd9(}XfQCQyzaM7-G+K6pv|5l@8
z##qxp)qz9ML{FUwWaI3lMxe}+&YYe0j#v@>UAEu{_sncT+|Dn$ne(UgaWl5gV`?nP
z!tqIQ;40LSpK?mB;cW$`wljpV<rV9$wl8f7M0g!vPJ+y5Swc);Uzgcx0m9GaMhKn~
z=becfkbsJnpR$15={mRRLyH>=ty2;a?>V$u+Oit#nOpkqK;CgW&%D3b7>32v=!k8-
zVUh$0dS!e*&9Dj1aQM7;N7U^#YZq8o<V?PP*QZ8nefMk7C(OdkFKzK-c-mxK*hK{W
z25gsJSxOkaRNV&e6KRUOl#Q`LFw(D)?#f;RJC3dZ`Pr<I>EOZ-BTTbi?-emn$QAu;
zd8^ZCRV9->ML?zA2qoSz!wY1EMi|d$MK#lOn`AT;lDrg+bFTzGnSMPa>1#@;#CL^g
zx|0RI-!P+Wu0J755{@=P=NCi64<HFsquxHkn8kPrx+^zuN#_W%Emtqfdl)JgBgQ0}
zPg|KEq9wkrJatd{wUcz4%&-k##-Frn;yRrG7yz<j>#BH5V%TVbDZfh{#cp|c(H|rL
zc`3S;NeI7<taDiU<GWjl531786W(kk1-<@Qhi3j_mNxkKCU&{GhnFPf*Z*i+M~iaW
zgIfl4UlCw7U=F%N!+@dqGr-Y9deHA04u@W#F&khYIuq~+-W2p^m=J$@$Rs5cSab#e
z#vG+bd|XNO6^3k32TP6aBVGFHrd>kZ1LhIITw^K#>mYN>BFN5p$U*^G{wbPp;4c%{
z;7K@i@bDNqVAP4v4GnU4i9n9!_=ke5@xlKGL<D!h<ALeM(E$n97?Wtf^FINgpveA$
zvk?CSBY?RkaR6Txnb!*-z$j#4{R=$C{V#}yj|1kNKnDayuwWQMT&?$!f4h?XyDa1V
zf$=9;05Ijg>-v!YsRH?*jQ?h!B1j+*A^80SCE&Em7F>!1IT1W4D7wEOW^xE50CRYz
z?Upo&^NNV^PsNOrBml$6U`V_o6cj|t5Q_Y-W8j(oKmiaaJr!FA5z+!xw2<e}Ur-e1
zA7}!S4d<@}dw)SQ(tjWld6YjV{3jb4G!&HPA9u)qljd@Nz{x38@RA}PICcsh@K@fg
zf3r}I3jcvA0Dq+*`3uTa{{t~;6M==N(E+~&{}UmX@ey*p|GtdAI)A|T({zA;B-f#!
zAammXDw_KLf#AWy#&5t^({!)QEWm&nrB}TcV22qpz;6vx0Z9F75U;Ag8~)k?TxX9D
z7Pch-ug{<Z{t>8zg5v+zFF+#ots$V`ALzHNoD}3j$w6xTyEZZh@XRa#oZx~B&V-!S
zZ`m|_2xtWXAx-qJ(&7jK`2qh(he53OU%R28aGn3ubhHcr{1%)kh3q_nEPtOjvF9K0
ziM%;nz<-rqAlY92{^Lkqf1nXR0x;TFbim)@761OtJl{W{;a76Nf8_}vw*Na~=AV)r
z@CW+*l^*c9`9E>X5Zjmhhk&dtefR^>&T|6(jzIl4<rDG;0!0GAaSP}$zk_tZ6Z5#x
z(SJ50EYJh~4tV(Yv2}5Opeyj7V*$S%%X=W#xEf+U-2djFN)rDA!hv@eNCAI){QjHl
zNd7M<y+{W5+mH0$U~B4s!QWn`jf*&dzkT-p4d-P13kCxIc9{A%=$Q=x-vNHRJ8eTw
z#1V4m|9*)6Qzml3bxSIMznnt;*$Y`iE`-!T4i;I)0sJ$-@V{1d+yKt$C5H?*z=1QD
z(E<N`hk@J{41d+u(*XgQz{+#zfZx4=Kg5WUA&&*Vzo4ORaL<6i?_1*kdkE(hoL5<2
kz!57JuN-^9mn*D*fA<iOhu^=-=U%YDDjghN-|ubz2Lp85uK)l5

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 115e6ac0aab..5c1b6c95b82 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From e83680f18d815ebebc779d239a6eacd8930150fe Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Thu, 13 Sep 2018 21:36:12 +0200
Subject: [PATCH 094/229] Completely rework save operation (#4309)

* Make FileHistory use Paths instead of strings

* Almost completely rewrite save infrastructure

* Fix build

* Fix tests

* Remove file lock

* Improve comments

* Fix build

* Implement feedback and fix tests

* Fix build
---
 .../org/jabref/benchmarks/Benchmarks.java     |  26 +-
 .../org/jabref/cli/ArgumentProcessor.java     |  70 +--
 src/main/java/org/jabref/gui/BasePanel.java   | 153 +-----
 src/main/java/org/jabref/gui/JabRefFrame.java |   3 +-
 .../jabref/gui/SaveOrderConfigDisplay.java    |  35 +-
 .../org/jabref/gui/collab/ChangeScanner.java  |  12 +-
 .../gui/collab/DatabaseChangeMonitor.java     |  16 -
 .../DatabasePropertiesDialog.java             |   2 +-
 .../jabref/gui/dialogs/AutosaveUIManager.java |   2 +-
 .../jabref/gui/exporter/SaveAllAction.java    |  27 +-
 .../gui/exporter/SaveDatabaseAction.java      | 462 +++++-------------
 .../importer/actions/OpenDatabaseAction.java  |  33 +-
 .../org/jabref/gui/menus/FileHistoryMenu.java |  30 +-
 .../SharedDatabaseLoginDialogViewModel.java   |   2 +-
 .../autosaveandbackup/BackupManager.java      |  15 +-
 .../exporter/AtomicFileOutputStream.java      | 237 +++++++++
 .../logic/exporter/AtomicFileWriter.java      |  53 ++
 .../logic/exporter/BibDatabaseWriter.java     | 174 ++++---
 .../logic/exporter/BibtexDatabaseWriter.java  | 178 +++----
 .../logic/exporter/FileSaveSession.java       | 129 -----
 .../jabref/logic/exporter/MSBibExporter.java  |   7 +-
 .../logic/exporter/SavePreferences.java       |  38 +-
 .../jabref/logic/exporter/SaveSession.java    |  68 ---
 .../logic/exporter/StringSaveSession.java     |  54 --
 .../logic/exporter/TemplateExporter.java      |  18 +-
 .../logic/exporter/VerifyingWriter.java       |  52 --
 .../jabref/logic/importer/OpenDatabase.java   |   7 -
 .../jabref/logic/util/io/FileBasedLock.java   | 127 -----
 .../org/jabref/logic/util/io/FileHistory.java |  32 +-
 .../org/jabref/logic/util/io/FileUtil.java    |   3 +-
 .../model/metadata/SaveOrderConfig.java       | 167 +++----
 .../jabref/preferences/JabRefPreferences.java |  96 ++--
 src/main/resources/l10n/JabRef_en.properties  |  21 +-
 .../java/org/jabref/gui/AbstractUITest.java   |   9 +-
 .../java/org/jabref/gui/EntryTableTest.java   |   2 +-
 .../logic/bibtex/BibEntryWriterTest.java      |  21 +-
 .../exporter/BibtexDatabaseWriterTest.java    | 280 +++++------
 .../importer/fileformat/BibtexParserTest.java |   9 +-
 .../logic/shared/DBMSProcessorTest.java       |  19 +-
 .../jabref/logic/util/io/FileHistoryTest.java |  69 ++-
 .../model/entry/FileFieldBibEntryTest.java    |  61 ---
 41 files changed, 1035 insertions(+), 1784 deletions(-)
 create mode 100644 src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
 create mode 100644 src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java
 delete mode 100644 src/main/java/org/jabref/logic/exporter/FileSaveSession.java
 delete mode 100644 src/main/java/org/jabref/logic/exporter/SaveSession.java
 delete mode 100644 src/main/java/org/jabref/logic/exporter/StringSaveSession.java
 delete mode 100644 src/main/java/org/jabref/logic/exporter/VerifyingWriter.java
 delete mode 100644 src/main/java/org/jabref/logic/util/io/FileBasedLock.java
 delete mode 100644 src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java

diff --git a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
index c261a64589c..c17b4c6e76b 100644
--- a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
+++ b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.io.StringWriter;
 import java.util.List;
 import java.util.Random;
 import java.util.stream.Collectors;
@@ -9,9 +10,7 @@
 import org.jabref.Globals;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
 import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.exporter.StringSaveSession;
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
-import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.logic.layout.format.HTMLChars;
@@ -37,6 +36,8 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.runner.RunnerException;
 
+import static org.mockito.Mockito.mock;
+
 @State(Scope.Thread)
 public class Benchmarks {
 
@@ -61,11 +62,11 @@ public void init() throws Exception {
             entry.setField("rnd", "2" + randomizer.nextInt());
             database.insertEntry(entry);
         }
-        BibtexDatabaseWriter<StringSaveSession> databaseWriter = new BibtexDatabaseWriter<>(StringSaveSession::new);
-        StringSaveSession saveSession = databaseWriter.savePartOfDatabase(
-                new BibDatabaseContext(database, new MetaData(), new Defaults()), database.getEntries(),
-                new SavePreferences());
-        bibtexString = saveSession.getStringValue();
+        StringWriter outputWriter = new StringWriter();
+        BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(outputWriter, mock(SavePreferences.class));
+        databaseWriter.savePartOfDatabase(
+                new BibDatabaseContext(database, new MetaData(), new Defaults()), database.getEntries());
+        bibtexString = outputWriter.toString();
 
         latexConversionString = "{A} \\textbf{bold} approach {\\it to} ${{\\Sigma}}{\\Delta}$ modulator \\textsuperscript{2} \\$";
 
@@ -80,11 +81,10 @@ public ParserResult parse() throws IOException {
 
     @Benchmark
     public String write() throws Exception {
-        BibtexDatabaseWriter<StringSaveSession> databaseWriter = new BibtexDatabaseWriter<>(StringSaveSession::new);
-        StringSaveSession saveSession = databaseWriter.savePartOfDatabase(
-                new BibDatabaseContext(database, new MetaData(), new Defaults()), database.getEntries(),
-                new SavePreferences());
-        return saveSession.getStringValue();
+        StringWriter outputWriter = new StringWriter();
+        BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(outputWriter, mock(SavePreferences.class));
+        databaseWriter.savePartOfDatabase(new BibDatabaseContext(database, new MetaData(), new Defaults()), database.getEntries());
+        return outputWriter.toString();
     }
 
     @Benchmark
@@ -125,7 +125,7 @@ public String htmlToLatexConversion() {
     }
 
     @Benchmark
-    public boolean keywordGroupContains() throws ParseException {
+    public boolean keywordGroupContains() {
         KeywordGroup group = new WordKeywordGroup("testGroup", GroupHierarchyType.INDEPENDENT, "keyword", "testkeyword", false, ',', false);
         return group.containsAll(database.getEntries());
     }
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index 9d2509b922a..a487e1cb348 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -16,14 +16,12 @@
 import org.jabref.JabRefException;
 import org.jabref.gui.externalfiles.AutoSetLinks;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
+import org.jabref.logic.exporter.AtomicFileWriter;
 import org.jabref.logic.exporter.BibDatabaseWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
 import org.jabref.logic.exporter.Exporter;
 import org.jabref.logic.exporter.ExporterFactory;
-import org.jabref.logic.exporter.FileSaveSession;
-import org.jabref.logic.exporter.SaveException;
 import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.exporter.SaveSession;
 import org.jabref.logic.exporter.TemplateExporter;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportException;
@@ -374,27 +372,7 @@ private boolean generateAux(List<ParserResult> loaded, String[] data) {
             // write an output, if something could be resolved
             if ((newBase != null) && newBase.hasEntries()) {
                 String subName = StringUtil.getCorrectFileName(data[1], "bib");
-
-                try {
-                    System.out.println(Localization.lang("Saving") + ": " + subName);
-                    SavePreferences prefs = Globals.prefs.loadForSaveFromPreferences();
-                    BibDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new);
-                    Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode());
-                    SaveSession session = databaseWriter.saveDatabase(new BibDatabaseContext(newBase, defaults), prefs);
-
-                    // Show just a warning message if encoding did not work for all characters:
-                    if (!session.getWriter().couldEncodeAll()) {
-                        System.err.println(Localization.lang("Warning") + ": "
-                                + Localization.lang(
-                                "The chosen encoding '%0' could not encode the following characters:",
-                                session.getEncoding().displayName())
-                                + " " + session.getWriter().getProblemCharacters());
-                    }
-                    session.commit(subName);
-                } catch (SaveException ex) {
-                    System.err.println(Localization.lang("Could not save file.") + "\n" + ex.getLocalizedMessage());
-                }
-
+                saveDatabase(newBase, subName);
                 notSavedMsg = true;
             }
 
@@ -407,6 +385,28 @@ private boolean generateAux(List<ParserResult> loaded, String[] data) {
         }
     }
 
+    private void saveDatabase(BibDatabase newBase, String subName) {
+        try {
+            System.out.println(Localization.lang("Saving") + ": " + subName);
+            SavePreferences prefs = Globals.prefs.loadForSaveFromPreferences();
+            AtomicFileWriter fileWriter = new AtomicFileWriter(Paths.get(subName), prefs.getEncoding());
+            BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter(fileWriter, prefs);
+            Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode());
+            databaseWriter.saveDatabase(new BibDatabaseContext(newBase, defaults));
+
+            // Show just a warning message if encoding did not work for all characters:
+            if (fileWriter.hasEncodingProblems()) {
+                System.err.println(Localization.lang("Warning") + ": "
+                        + Localization.lang(
+                        "The chosen encoding '%0' could not encode the following characters:",
+                        prefs.getEncoding().displayName())
+                        + " " + fileWriter.getEncodingProblems());
+            }
+        } catch (IOException ex) {
+            System.err.println(Localization.lang("Could not save file.") + "\n" + ex.getLocalizedMessage());
+        }
+    }
+
     private void exportFile(List<ParserResult> loaded, String[] data) {
         if (data.length == 1) {
             // This signals that the latest import should be stored in BibTeX
@@ -414,27 +414,7 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
             if (!loaded.isEmpty()) {
                 ParserResult pr = loaded.get(loaded.size() - 1);
                 if (!pr.isInvalid()) {
-                    try {
-                        System.out.println(Localization.lang("Saving") + ": " + data[0]);
-                        SavePreferences prefs = Globals.prefs.loadForSaveFromPreferences();
-                        Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode());
-                        BibDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(
-                                FileSaveSession::new);
-                        SaveSession session = databaseWriter.saveDatabase(
-                                new BibDatabaseContext(pr.getDatabase(), pr.getMetaData(), defaults), prefs);
-
-                        // Show just a warning message if encoding did not work for all characters:
-                        if (!session.getWriter().couldEncodeAll()) {
-                            System.err.println(Localization.lang("Warning") + ": "
-                                    + Localization.lang(
-                                    "The chosen encoding '%0' could not encode the following characters:",
-                                    session.getEncoding().displayName())
-                                    + " " + session.getWriter().getProblemCharacters());
-                        }
-                        session.commit(data[0]);
-                    } catch (SaveException ex) {
-                        System.err.println(Localization.lang("Could not save file.") + "\n" + ex.getLocalizedMessage());
-                    }
+                    saveDatabase(pr.getDatabase(), data[0]);
                 }
             } else {
                 System.err.println(Localization.lang("The output option depends on a valid import option."));
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 66f4b7647e5..0f04e04de82 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -4,8 +4,6 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.InvocationTargetException;
-import java.nio.charset.Charset;
-import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,8 +15,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.swing.JOptionPane;
-import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 import javax.swing.undo.CannotRedoException;
 import javax.swing.undo.CannotUndoException;
@@ -73,27 +69,17 @@
 import org.jabref.gui.undo.UndoableChangeType;
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.gui.undo.UndoableInsertEntry;
-import org.jabref.gui.undo.UndoableKeyChange;
 import org.jabref.gui.undo.UndoableRemoveEntry;
 import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.worker.CitationStyleToClipboardWorker;
 import org.jabref.gui.worker.SendAsEMailAction;
-import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
 import org.jabref.logic.citationstyle.CitationStyleCache;
 import org.jabref.logic.citationstyle.CitationStyleOutputFormat;
-import org.jabref.logic.exporter.BibtexDatabaseWriter;
-import org.jabref.logic.exporter.FileSaveSession;
-import org.jabref.logic.exporter.SaveException;
-import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.exporter.SaveSession;
-import org.jabref.logic.l10n.Encodings;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.Layout;
 import org.jabref.logic.layout.LayoutHelper;
 import org.jabref.logic.pdf.FileAnnotationCache;
 import org.jabref.logic.search.SearchQuery;
-import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.util.UpdateField;
 import org.jabref.logic.util.io.FileFinder;
 import org.jabref.logic.util.io.FileFinders;
@@ -116,13 +102,10 @@
 import org.jabref.model.entry.event.EntryEventSource;
 import org.jabref.model.entry.specialfields.SpecialField;
 import org.jabref.model.entry.specialfields.SpecialFieldValue;
-import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreviewPreferences;
 
 import com.google.common.eventbus.Subscribe;
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.Subscription;
 import org.slf4j.Logger;
@@ -298,11 +281,11 @@ private void setupActions() {
         actions.put(Actions.EDIT, this::showAndEdit);
 
         // The action for saving a database.
-        actions.put(Actions.SAVE, saveAction);
+        actions.put(Actions.SAVE, saveAction::save);
 
         actions.put(Actions.SAVE_AS, saveAction::saveAs);
 
-        actions.put(Actions.SAVE_SELECTED_AS_PLAIN, new SaveSelectedAction(SavePreferences.DatabaseSaveType.PLAIN_BIBTEX));
+        actions.put(Actions.SAVE_SELECTED_AS_PLAIN, saveAction::saveSelectedAsPlain);
 
         // The action for copying selected entries.
         actions.put(Actions.COPY, this::copy);
@@ -670,87 +653,9 @@ public void runCommand(final Actions command) {
         }
     }
 
-    /**
-     * FIXME: high code duplication with {@link SaveDatabaseAction#saveDatabase(File, boolean, Charset)}
-     */
-    private boolean saveDatabase(File file, boolean selectedOnly, Charset encoding,
-                                 SavePreferences.DatabaseSaveType saveType)
-        throws SaveException {
-        SaveSession session;
-        final String SAVE_DATABASE = Localization.lang("Save library");
-        try {
-            SavePreferences prefs = Globals.prefs.loadForSaveFromPreferences()
-                                                 .withEncoding(encoding)
-                                                 .withSaveType(saveType);
-
-            BibtexDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(
-                                                                                          FileSaveSession::new);
-            if (selectedOnly) {
-                session = databaseWriter.savePartOfDatabase(bibDatabaseContext, mainTable.getSelectedEntries(), prefs);
-            } else {
-                session = databaseWriter.saveDatabase(bibDatabaseContext, prefs);
-            }
-
-            registerUndoableChanges(session);
-        }
-        // FIXME: not sure if this is really thrown anywhere
-        catch (UnsupportedCharsetException ex) {
-            frame.getDialogService().showErrorDialogAndWait(Localization.lang("Save library"), Localization.lang("Could not save file.")
-                                                                                               + Localization.lang("Character encoding '%0' is not supported.", encoding.displayName()));
-            throw new SaveException("rt");
-        } catch (SaveException ex) {
-            if (ex.specificEntry()) {
-                // Error occurred during processing of the entry. Highlight it:
-                clearAndSelect(ex.getEntry());
-                showAndEdit(ex.getEntry());
-            } else {
-                LOGGER.warn("Could not save", ex);
-            }
-
-            dialogService.showErrorDialogAndWait(SAVE_DATABASE, Localization.lang("Could not save file."), ex);
-            throw new SaveException("rt");
-        }
-
-        boolean commit = true;
-        if (!session.getWriter().couldEncodeAll()) {
-            FormBuilder builder = FormBuilder.create()
-                    .layout(new FormLayout("left:pref, 4dlu, fill:pref", "pref, 4dlu, pref"));
-            JTextArea ta = new JTextArea(session.getWriter().getProblemCharacters());
-            ta.setEditable(false);
-            builder.add(Localization.lang("The chosen encoding '%0' could not encode the following characters:", session.getEncoding().displayName())).xy(1, 1);
-            builder.add(ta).xy(3, 1);
-            builder.add(Localization.lang("What do you want to do?")).xy(1, 3);
-            String tryDiff = Localization.lang("Try different encoding");
-            int answer = JOptionPane.showOptionDialog(null, builder.getPanel(), SAVE_DATABASE, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, new String[] {Localization.lang("Save"), tryDiff, Localization.lang("Cancel")}, tryDiff);
-
-            if (answer == JOptionPane.NO_OPTION) {
-
-                // The user wants to use another encoding.
-                Object choice = JOptionPane.showInputDialog(null, Localization.lang("Select encoding"), SAVE_DATABASE, JOptionPane.QUESTION_MESSAGE, null, Encodings.ENCODINGS_DISPLAYNAMES, encoding);
-                if (choice == null) {
-                    commit = false;
-                } else {
-                    Charset newEncoding = Charset.forName((String) choice);
-                    return saveDatabase(file, selectedOnly, newEncoding, saveType);
-                }
-            } else if (answer == JOptionPane.CANCEL_OPTION) {
-                commit = false;
-            }
-        }
-
-        if (commit) {
-            session.commit(file.toPath());
-            this.bibDatabaseContext.getMetaData().setEncoding(encoding); // Make sure to remember which encoding we used.
-        } else {
-            session.cancel();
-        }
-
-        return commit;
-    }
-
-    public void registerUndoableChanges(SaveSession session) {
+    public void registerUndoableChanges(List<FieldChange> changes) {
         NamedCompound ce = new NamedCompound(Localization.lang("Save actions"));
-        for (FieldChange change : session.getFieldChanges()) {
+        for (FieldChange change : changes) {
             ce.addEdit(new UndoableFieldChange(change));
         }
         ce.end();
@@ -1207,30 +1112,6 @@ public boolean showDeleteConfirmationDialog(int numberOfEntries) {
         }
     }
 
-    /**
-     * If the relevant option is set, autogenerate keys for all entries that are lacking keys.
-     */
-    public void autoGenerateKeysBeforeSaving() {
-        if (Globals.prefs.getBoolean(JabRefPreferences.GENERATE_KEYS_BEFORE_SAVING)) {
-            NamedCompound ce = new NamedCompound(Localization.lang("Autogenerate BibTeX keys"));
-
-            BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibDatabaseContext, Globals.prefs.getBibtexKeyPatternPreferences());
-            for (BibEntry bes : bibDatabaseContext.getDatabase().getEntries()) {
-                Optional<String> oldKey = bes.getCiteKeyOptional();
-                if (StringUtil.isBlank(oldKey)) {
-                    Optional<FieldChange> change = keyGenerator.generateAndSetKey(bes);
-                    change.ifPresent(fieldChange -> ce.addEdit(new UndoableKeyChange(fieldChange)));
-                }
-            }
-
-            // Store undo information, if any:
-            if (ce.hasEdits()) {
-                ce.end();
-                getUndoManager().addEdit(ce);
-            }
-        }
-    }
-
     /**
      * Depending on whether a preview or an entry editor is showing, save the current divider location in the correct preference setting.
      */
@@ -1597,30 +1478,4 @@ public void action() {
             preview.print();
         }
     }
-
-    private class SaveSelectedAction implements BaseAction {
-
-        private final SavePreferences.DatabaseSaveType saveType;
-
-        public SaveSelectedAction(SavePreferences.DatabaseSaveType saveType) {
-            this.saveType = saveType;
-        }
-
-        @Override
-        public void action() throws SaveException {
-            FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                    .withDefaultExtension(StandardFileType.BIBTEX_DB)
-                    .addExtensionFilter(String.format("%1s %2s", "BibTex", Localization.lang("Library")), StandardFileType.BIBTEX_DB)
-                    .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-                    .build();
-
-            Optional<Path> chosenFile = dialogService.showFileSaveDialog(fileDialogConfiguration);
-            if (chosenFile.isPresent()) {
-                Path path = chosenFile.get();
-                saveDatabase(path.toFile(), true, Globals.prefs.getDefaultEncoding(), saveType);
-                frame.getFileHistory().newFile(path.toString());
-                frame.output(Localization.lang("Saved selected to '%0'.", path.toString()));
-            }
-        }
-    }
 }
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index aa2627c0148..a08ac19915e 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -1337,8 +1337,7 @@ private boolean confirmClose(BasePanel panel) {
             // The user wants to save.
             try {
                 SaveDatabaseAction saveAction = new SaveDatabaseAction(panel);
-                saveAction.runCommand();
-                if (saveAction.isCanceled() || !saveAction.isSuccess()) {
+                if (!saveAction.save()) {
                     // The action was either canceled or unsuccessful.
                     output(Localization.lang("Unable to save library"));
                     return false;
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
index c55dd92fd35..72bd104f5c8 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
@@ -83,30 +83,29 @@ public void setEnabled(boolean enabled) {
         saveTerDesc.setDisable(!enabled);
     }
 
-    public void setSaveOrderConfig(SaveOrderConfig saveOrderConfig) {
-        Objects.requireNonNull(saveOrderConfig);
-
-        savePriSort.setValue(saveOrderConfig.sortCriteria[0].field);
-        savePriDesc.setSelected(saveOrderConfig.sortCriteria[0].descending);
-        saveSecSort.setValue(saveOrderConfig.sortCriteria[1].field);
-        saveSecDesc.setSelected(saveOrderConfig.sortCriteria[1].descending);
-        saveTerSort.setValue(saveOrderConfig.sortCriteria[2].field);
-        saveTerDesc.setSelected(saveOrderConfig.sortCriteria[2].descending);
-
-    }
-
     public SaveOrderConfig getSaveOrderConfig() {
         SaveOrderConfig saveOrderConfig = new SaveOrderConfig();
-        saveOrderConfig.sortCriteria[0].field = getSelectedItemAsLowerCaseTrim(savePriSort);
-        saveOrderConfig.sortCriteria[0].descending = savePriDesc.isSelected();
-        saveOrderConfig.sortCriteria[1].field = getSelectedItemAsLowerCaseTrim(saveSecSort);
-        saveOrderConfig.sortCriteria[1].descending = saveSecDesc.isSelected();
-        saveOrderConfig.sortCriteria[2].field = getSelectedItemAsLowerCaseTrim(saveTerSort);
-        saveOrderConfig.sortCriteria[2].descending = saveTerDesc.isSelected();
+        saveOrderConfig.getSortCriteria().get(0).field = getSelectedItemAsLowerCaseTrim(savePriSort);
+        saveOrderConfig.getSortCriteria().get(0).descending = savePriDesc.isSelected();
+        saveOrderConfig.getSortCriteria().get(1).field = getSelectedItemAsLowerCaseTrim(saveSecSort);
+        saveOrderConfig.getSortCriteria().get(1).descending = saveSecDesc.isSelected();
+        saveOrderConfig.getSortCriteria().get(2).field = getSelectedItemAsLowerCaseTrim(saveTerSort);
+        saveOrderConfig.getSortCriteria().get(2).descending = saveTerDesc.isSelected();
 
         return saveOrderConfig;
     }
 
+    public void setSaveOrderConfig(SaveOrderConfig saveOrderConfig) {
+        Objects.requireNonNull(saveOrderConfig);
+
+        savePriSort.setValue(saveOrderConfig.getSortCriteria().get(0).field);
+        savePriDesc.setSelected(saveOrderConfig.getSortCriteria().get(0).descending);
+        saveSecSort.setValue(saveOrderConfig.getSortCriteria().get(1).field);
+        saveSecDesc.setSelected(saveOrderConfig.getSortCriteria().get(1).descending);
+        saveTerSort.setValue(saveOrderConfig.getSortCriteria().get(2).field);
+        saveTerDesc.setSelected(saveOrderConfig.getSortCriteria().get(2).descending);
+    }
+
     private String getSelectedItemAsLowerCaseTrim(ComboBox<String> sortBox) {
         return sortBox.getValue().toLowerCase(Locale.ROOT).trim();
     }
diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
index ba99990d46d..7fb1b74e388 100644
--- a/src/main/java/org/jabref/gui/collab/ChangeScanner.java
+++ b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.collab;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Comparator;
 import java.util.List;
@@ -16,12 +17,10 @@
 import org.jabref.logic.bibtex.comparator.BibDatabaseDiff;
 import org.jabref.logic.bibtex.comparator.BibEntryDiff;
 import org.jabref.logic.bibtex.comparator.BibStringDiff;
+import org.jabref.logic.exporter.AtomicFileWriter;
 import org.jabref.logic.exporter.BibDatabaseWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
-import org.jabref.logic.exporter.FileSaveSession;
-import org.jabref.logic.exporter.SaveException;
 import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.exporter.SaveSession;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.ParserResult;
@@ -105,10 +104,9 @@ private void storeTempDatabase() {
                                                                         .getEncoding()
                                                                         .orElse(Globals.prefs.getDefaultEncoding()));
 
-                BibDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new);
-                SaveSession ss = databaseWriter.saveDatabase(databaseInTemp, prefs);
-                ss.commit(tempFile);
-            } catch (SaveException ex) {
+                BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter(new AtomicFileWriter(tempFile, prefs.getEncoding()), prefs);
+                databaseWriter.saveDatabase(databaseInTemp);
+            } catch (IOException ex) {
                 LOGGER.warn("Problem updating tmp file after accepting external changes", ex);
             }
         });
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
index 7c300bcc5d8..701679fed5f 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
@@ -11,7 +11,6 @@
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.SidePaneManager;
 import org.jabref.gui.SidePaneType;
-import org.jabref.logic.util.io.FileBasedLock;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateListener;
@@ -61,21 +60,6 @@ public void fileUpdated() {
         updatedExternally = true;
 
         final ChangeScanner scanner = new ChangeScanner(panel.frame(), panel, database.getDatabasePath().orElse(null), tmpFile);
-
-        // Test: running scan automatically in background
-        if (database.getDatabasePath().isPresent() && !FileBasedLock.waitForFileLock(database.getDatabasePath().get())) {
-            // The file is locked even after the maximum wait. Do nothing.
-            LOGGER.error("File updated externally, but change scan failed because the file is locked.");
-
-            // Wait a bit and then try again
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                // Nothing to do
-            }
-            fileUpdated();
-            return;
-        }
         JabRefExecutorService.INSTANCE.executeInterruptableTaskAndWait(scanner);
 
         // Adding the sidepane component is Swing work, so we must do this in the Swing
diff --git a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
index 3199b30b423..1a908f2814b 100644
--- a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
+++ b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
@@ -238,7 +238,7 @@ private void setValues() {
         } else {
             SaveOrderConfig saveOrderConfig = storedSaveOrderConfig.get();
             oldSaveOrderConfig = saveOrderConfig;
-            if (saveOrderConfig.saveInOriginalOrder) {
+            if (saveOrderConfig.saveInOriginalOrder()) {
                 saveInOriginalOrder.setSelected(true);
                 selected = false;
             } else {
diff --git a/src/main/java/org/jabref/gui/dialogs/AutosaveUIManager.java b/src/main/java/org/jabref/gui/dialogs/AutosaveUIManager.java
index 312258be7b3..1fb08fbb184 100644
--- a/src/main/java/org/jabref/gui/dialogs/AutosaveUIManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/AutosaveUIManager.java
@@ -25,7 +25,7 @@ public AutosaveUIManager(BasePanel panel) {
     @Subscribe
     public void listen(@SuppressWarnings("unused") AutosaveEvent event) {
         try {
-            new SaveDatabaseAction(panel).runCommand();
+            new SaveDatabaseAction(panel).save();
         } catch (Throwable e) {
             LOGGER.error("Problem occured while saving.", e);
         }
diff --git a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
index 8b075676ebb..7a58e2895b4 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
@@ -6,37 +6,26 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.logic.l10n.Localization;
 
-public class SaveAllAction extends SimpleCommand implements Runnable {
+public class SaveAllAction extends SimpleCommand {
 
     private final JabRefFrame frame;
-    private int databases;
 
-
-    /** Creates a new instance of SaveAllAction */
     public SaveAllAction(JabRefFrame frame) {
         this.frame = frame;
     }
 
     @Override
     public void execute() {
-        databases = frame.getBasePanelCount();
         frame.output(Localization.lang("Saving all libraries..."));
-        run();
-        frame.output(Localization.lang("Save all finished."));
-    }
+        for (BasePanel panel : frame.getBasePanelList()) {
+            if (!panel.getBibDatabaseContext().getDatabasePath().isPresent()) {
+                frame.showBasePanel(panel);
 
-    @Override
-    public void run() {
-        for (int i = 0; i < databases; i++) {
-            if (i < frame.getBasePanelCount()) {
-                BasePanel panel = frame.getBasePanelAt(i);
-                if (!panel.getBibDatabaseContext().getDatabaseFile().isPresent()) {
-                    frame.showBasePanelAt(i);
-                }
-                panel.runCommand(Actions.SAVE);
-                // TODO: can we find out whether the save was actually done or not?
+                // TODO: Ask for path
             }
+            panel.runCommand(Actions.SAVE);
+            // TODO: can we find out whether the save was actually done or not?
         }
+        frame.output(Localization.lang("Save all finished."));
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 9187ecee7b8..60d43a613cb 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -1,140 +1,134 @@
 package org.jabref.gui.exporter;
 
-import java.io.File;
+import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Path;
 import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
-import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.ButtonBar.ButtonData;
+import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.DialogPane;
-import javafx.scene.control.TextArea;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 
 import org.jabref.Globals;
-import org.jabref.JabRefExecutorService;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.SidePaneType;
-import org.jabref.gui.actions.BaseAction;
-import org.jabref.gui.collab.ChangeScanner;
 import org.jabref.gui.dialogs.AutosaveUIManager;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.autosaveandbackup.AutosaveManager;
 import org.jabref.logic.autosaveandbackup.BackupManager;
+import org.jabref.logic.exporter.AtomicFileWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
-import org.jabref.logic.exporter.FileSaveSession;
 import org.jabref.logic.exporter.SaveException;
 import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.exporter.SaveSession;
 import org.jabref.logic.l10n.Encodings;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
 import org.jabref.logic.util.StandardFileType;
-import org.jabref.logic.util.io.FileBasedLock;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.event.ChangePropagation;
 import org.jabref.model.database.shared.DatabaseLocation;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Action for the "Save" and "Save as" operations called from BasePanel. This class is also used for
- * save operations when closing a database or quitting the applications.
+ * Action for the "Save" and "Save as" operations called from BasePanel. This class is also used for save operations
+ * when closing a database or quitting the applications.
  *
- * The save operation is loaded off of the GUI thread using {@link BackgroundTask}.
- * Callers can query whether the operation was canceled, or whether it was successful.
+ * The save operation is loaded off of the GUI thread using {@link BackgroundTask}. Callers can query whether the
+ * operation was canceled, or whether it was successful.
  */
-public class SaveDatabaseAction implements BaseAction {
-
+public class SaveDatabaseAction {
     private static final Logger LOGGER = LoggerFactory.getLogger(SaveDatabaseAction.class);
 
     private final BasePanel panel;
     private final JabRefFrame frame;
-    private boolean success;
-    private boolean canceled;
-    private boolean fileLockedError;
-
-    private Optional<Path> filePath;
+    private final DialogService dialogService;
 
     public SaveDatabaseAction(BasePanel panel) {
         this.panel = panel;
         this.frame = panel.frame();
-        this.filePath = Optional.empty();
+        this.dialogService = frame.getDialogService();
     }
 
-    /**
-     * @param panel BasePanel which contains the database to be saved
-     * @param filePath Path to the file the database should be saved to
-     */
-    public SaveDatabaseAction(BasePanel panel, Path filePath) {
-        this(panel);
-        this.filePath = Optional.ofNullable(filePath);
-    }
+    private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding, SavePreferences.DatabaseSaveType saveType) throws SaveException {
+        try {
+            SavePreferences preferences = Globals.prefs.loadForSaveFromPreferences()
+                                                       .withEncoding(encoding)
+                                                       .withSaveType(saveType);
 
-    public void init() throws Exception {
-        success = false;
-        canceled = false;
-        fileLockedError = false;
-        if (panel.getBibDatabaseContext().getDatabaseFile().isPresent()) {
-            // Check for external modifications: if true, save not performed so do not tell the user a save is underway but return instead.
-            if (checkExternalModification()) {
-                return;
+            AtomicFileWriter fileWriter = new AtomicFileWriter(file, preferences.getEncoding(), preferences.makeBackup());
+            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(fileWriter, preferences);
+
+            if (selectedOnly) {
+                databaseWriter.savePartOfDatabase(panel.getBibDatabaseContext(), panel.getSelectedEntries());
+            } else {
+                databaseWriter.saveDatabase(panel.getBibDatabaseContext());
             }
 
-            panel.frame().output(Localization.lang("Saving library") + "...");
-            panel.setSaving(true);
-        } else if (filePath.isPresent()) {
-            // save as directly if the target file location is known
-            saveAs(filePath.get().toFile());
-        } else {
-            saveAs();
-        }
-    }
+            panel.registerUndoableChanges(databaseWriter.getSaveActionsFieldChanges());
 
-    private void doSave() {
-        if (canceled || !panel.getBibDatabaseContext().getDatabaseFile().isPresent()) {
-            return;
+            if (fileWriter.hasEncodingProblems()) {
+                saveWithDifferentEncoding(file, selectedOnly, preferences.getEncoding(), fileWriter.getEncodingProblems(), saveType);
+            }
+        } catch (UnsupportedCharsetException ex) {
+            throw new SaveException(Localization.lang("Character encoding '%0' is not supported.", encoding.displayName()), ex);
+        } catch (IOException ex) {
+            throw new SaveException(ex);
         }
 
-        try {
-            // If set in preferences, generate missing BibTeX keys
-            panel.autoGenerateKeysBeforeSaving();
-
-            if (FileBasedLock.waitForFileLock(panel.getBibDatabaseContext().getDatabaseFile().get().toPath())) {
-                // Check for external modifications to alleviate multiuser concurrency issue when near
-                // simultaneous saves occur to a shared database file: if true, do not perform the save
-                // rather return instead.
-                if (checkExternalModification()) {
-                    return;
-                }
+        return true;
+    }
 
-                // Save the database
-                success = saveDatabase(panel.getBibDatabaseContext().getDatabaseFile().get(), false,
-                        panel.getBibDatabaseContext()
-                                .getMetaData()
-                                .getEncoding()
-                                .orElse(Globals.prefs.getDefaultEncoding()));
+    private void saveWithDifferentEncoding(Path file, boolean selectedOnly, Charset encoding, Set<Character> encodingProblems, SavePreferences.DatabaseSaveType saveType) throws SaveException {
+        DialogPane pane = new DialogPane();
+        VBox vbox = new VBox();
+        vbox.getChildren().addAll(
+                new Text(Localization.lang("The chosen encoding '%0' could not encode the following characters:", encoding.displayName())),
+                new Text(encodingProblems.stream().map(Object::toString).collect(Collectors.joining("."))),
+                new Text(Localization.lang("What do you want to do?"))
+        );
+        pane.setContent(vbox);
+
+        ButtonType tryDifferentEncoding = new ButtonType(Localization.lang("Try different encoding"), ButtonBar.ButtonData.OTHER);
+        ButtonType ignore = new ButtonType(Localization.lang("Ignore"), ButtonBar.ButtonData.APPLY);
+        boolean saveWithDifferentEncoding = frame.getDialogService()
+                                                 .showCustomDialogAndWait(Localization.lang("Save library"), pane, ignore, tryDifferentEncoding)
+                                                 .filter(buttonType -> buttonType.equals(tryDifferentEncoding))
+                                                 .isPresent();
+        if (saveWithDifferentEncoding) {
+            Optional<Charset> newEncoding = frame.getDialogService().showChoiceDialogAndWait(Localization.lang("Save library"), Localization.lang("Select new encoding"), Localization.lang("Save library"), encoding, Encodings.getCharsets());
+            if (newEncoding.isPresent()) {
+                saveDatabase(file, selectedOnly, newEncoding.get(), saveType);
 
-                panel.updateTimeStamp();
-            } else {
-                success = false;
-                fileLockedError = true;
+                // Make sure to remember which encoding we used.
+                panel.getBibDatabaseContext().getMetaData().setEncoding(newEncoding.get(), ChangePropagation.DO_NOT_POST_EVENT);
             }
+        }
+    }
 
-            // release panel from save status
-            panel.setSaving(false);
+    private boolean doSave() {
+        Path targetPath = panel.getBibDatabaseContext().getDatabasePath().get();
+        try {
+            // Save the database
+            boolean success = saveDatabase(targetPath, false,
+                    panel.getBibDatabaseContext()
+                         .getMetaData()
+                         .getEncoding()
+                         .orElse(Globals.prefs.getDefaultEncoding()),
+                    SavePreferences.DatabaseSaveType.ALL);
 
             if (success) {
+                panel.updateTimeStamp();
                 panel.getUndoManager().markUnchanged();
                 // (Only) after a successful save the following
                 // statement marks that the base is unchanged
@@ -142,209 +136,86 @@ private void doSave() {
                 panel.setNonUndoableChange(false);
                 panel.setBaseChanged(false);
                 panel.markExternalChangesAsResolved();
-            }
-        } catch (SaveException ex) {
-            if (ex == SaveException.FILE_LOCKED) {
-                success = false;
-                fileLockedError = true;
-                return;
-            }
-            LOGGER.error("Problem saving file", ex);
-        }
 
-        if (success) {
-            DefaultTaskExecutor.runInJavaFXThread(() -> {
-                // Reset title of tab
-                frame.setTabTitle(panel, panel.getTabTitle(),
-                        panel.getBibDatabaseContext().getDatabaseFile().get().getAbsolutePath());
-                frame.output(Localization.lang("Saved library") + " '"
-                        + panel.getBibDatabaseContext().getDatabaseFile().get().getPath() + "'.");
-                frame.setWindowTitle();
-                frame.updateAllTabTitles();
-            });
-        } else if (!canceled) {
-            if (fileLockedError) {
-                // TODO: user should have the option to override the lock file.
-                frame.output(Localization.lang("Could not save, file locked by another JabRef instance."));
-            } else {
-                frame.output(Localization.lang("Save failed"));
+                DefaultTaskExecutor.runInJavaFXThread(() -> {
+                    // Reset title of tab
+                    frame.setTabTitle(panel, panel.getTabTitle(),
+                            panel.getBibDatabaseContext().getDatabaseFile().get().getAbsolutePath());
+                    frame.output(Localization.lang("Saved library") + " '"
+                            + panel.getBibDatabaseContext().getDatabaseFile().get().getPath() + "'.");
+                    frame.setWindowTitle();
+                    frame.updateAllTabTitles();
+                });
             }
-        }
-    }
-
-    private boolean saveDatabase(File file, boolean selectedOnly, Charset encoding) throws SaveException {
-        SaveSession session;
-
-        try {
-            SavePreferences prefs = Globals.prefs.loadForSaveFromPreferences().withEncoding(encoding);
-            BibtexDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new);
-
-            if (selectedOnly) {
-                session = databaseWriter.savePartOfDatabase(panel.getBibDatabaseContext(), panel.getSelectedEntries(),
-                        prefs);
-            } else {
-                session = databaseWriter.saveDatabase(panel.getBibDatabaseContext(), prefs);
-            }
-
-            panel.registerUndoableChanges(session);
-
-        } catch (UnsupportedCharsetException ex) {
-            frame.getDialogService().showErrorDialogAndWait(Localization.lang("Save library"), Localization.lang("Could not save file.")
-                    + Localization.lang("Character encoding '%0' is not supported.", encoding.displayName()));
-            throw new SaveException(ex.getMessage(), ex);
+            return success;
         } catch (SaveException ex) {
-            if (ex == SaveException.FILE_LOCKED) {
-                throw ex;
-            }
-            if (ex.specificEntry()) {
-                BibEntry entry = ex.getEntry();
-                // Error occured during processing of an entry. Highlight it!
-                panel.clearAndSelect(entry);
-            } else {
-                LOGGER.error("A problem occured when trying to save the file", ex);
-            }
-
+            LOGGER.error("A problem occurred when trying to save the file " + targetPath, ex);
             frame.getDialogService().showErrorDialogAndWait(Localization.lang("Save library"), Localization.lang("Could not save file."), ex);
-            throw ex;
-        }
-
-        // handle encoding problems
-        boolean success = true;
-        if (!session.getWriter().couldEncodeAll()) {
-
-            DialogPane pane = new DialogPane();
-            TextArea area = new TextArea(session.getWriter().getProblemCharacters());
-            VBox vbox = new VBox();
-            vbox.getChildren().addAll(
-                    new Text(Localization.lang("The chosen encoding '%0' could not encode the following characters:",
-                            session.getEncoding().displayName())),
-                    area,
-                    new Text(Localization.lang("What do you want to do?"))
-
-            );
-            pane.setContent(vbox);
-
-            ButtonType tryDiff = new ButtonType(Localization.lang("Try different encoding"), ButtonData.OTHER);
-            ButtonType save = new ButtonType(Localization.lang("Save"), ButtonData.APPLY);
-
-            Optional<ButtonType> clickedBtn = frame.getDialogService().showCustomDialogAndWait(Localization.lang("Save library"), pane, save, tryDiff, ButtonType.CANCEL);
-
-            if (clickedBtn.isPresent() && clickedBtn.get().equals(tryDiff)) {
-                Optional<Charset> selectedCharSet = frame.getDialogService().showChoiceDialogAndWait(Localization.lang("Save library"), Localization.lang("Select encoding"), Localization.lang("Save library"), encoding, Encodings.getCharsets());
-
-                if (selectedCharSet.isPresent()) {
-
-                    Charset newEncoding = selectedCharSet.get();
-                    return saveDatabase(file, selectedOnly, newEncoding);
-                } else {
-                    success = false;
-                }
-            }
-        }
-
-        // backup file?
-        try {
-            if (success) {
-                session.commit(file.toPath());
-                // Make sure to remember which encoding we used.
-                panel.getBibDatabaseContext().getMetaData().setEncoding(encoding, ChangePropagation.DO_NOT_POST_EVENT);
-            } else {
-                session.cancel();
-            }
-        } catch (SaveException e) {
-            LOGGER.debug("Problems saving during backup creationg", e);
-            boolean saveWithoutBackupClicked = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Unable to create backup"),
-                    Localization.lang("Save failed during backup creation") + ". " + Localization.lang("Save without backup?"),
-                    Localization.lang("Save without backup"), Localization.lang("Cancel"));
-
-            if (saveWithoutBackupClicked) {
-                session.setUseBackup(false);
-
-                session.commit(file.toPath());
-                panel.getBibDatabaseContext().getMetaData().setEncoding(encoding, ChangePropagation.DO_NOT_POST_EVENT);
-            } else {
-                success = false;
-            }
+            return false;
+        } finally {
+            // release panel from save status
+            panel.setSaving(false);
         }
-
-        return success;
     }
 
-    /**
-     * Run the "Save" operation. This method offloads the actual save operation to a background thread.
-     */
-    public void runCommand() throws Exception {
-        action();
+    public boolean save() {
+        if (panel.getBibDatabaseContext().getDatabasePath().isPresent()) {
+            panel.frame().output(Localization.lang("Saving library") + "...");
+            panel.setSaving(true);
+            return doSave();
+        }
+        return false;
     }
 
-    public void save() throws Exception {
-        runCommand();
+    public void saveAs() {
+        getSavePath().ifPresent(this::saveAs);
     }
 
-    public void saveAs() throws Exception {
-        // configure file dialog
-
+    private Optional<Path> getSavePath() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.BIBTEX_DB)
                 .withDefaultExtension(StandardFileType.BIBTEX_DB)
                 .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
                 .build();
-        DialogService dialogService = frame.getDialogService();
-        Optional<Path> path = dialogService.showFileSaveDialog(fileDialogConfiguration);
-        if (path.isPresent()) {
-            saveAs(path.get().toFile());
-        } else {
-            canceled = true;
-            return;
-        }
+        Optional<Path> selectedPath = dialogService.showFileSaveDialog(fileDialogConfiguration);
+        selectedPath.ifPresent(path -> Globals.prefs.setWorkingDir(path.getParent()));
+        return selectedPath;
     }
 
-    /**
-     * Run the "Save as" operation. This method offloads the actual save operation to a background thread.
-     */
-    public void saveAs(File file) throws Exception {
+    public void saveAs(Path file) {
         BibDatabaseContext context = panel.getBibDatabaseContext();
 
-        if (context.getLocation() == DatabaseLocation.SHARED) {
-            // Save all properties dependent on the ID. This makes it possible to restore them.
-            new SharedDatabasePreferences(context.getDatabase().generateSharedDatabaseID())
-                    .putAllDBMSConnectionProperties(context.getDBMSSynchronizer().getConnectionProperties());
-
-        }
-
-        context.setDatabaseFile(file);
-        if (file.getParent() != null) {
-            Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, file.getParent());
-        }
-        runCommand();
-        // If the operation failed, revert the file field and return:
-        if (!success) {
-            return;
-        }
-
+        // Close AutosaveManager and BackupManager for original library
         Optional<Path> databasePath = context.getDatabasePath();
         if (databasePath.isPresent()) {
             final Path oldFile = databasePath.get();
             context.setDatabaseFile(oldFile.toFile());
-            //closing AutosaveManager and BackupManager for original library
             AutosaveManager.shutdown(context);
             BackupManager.shutdown(context);
-        } else {
-            LOGGER.info("Old file not found, just creating a new file");
+        }
+
+        // Set new location
+        if (context.getLocation() == DatabaseLocation.SHARED) {
+            // Save all properties dependent on the ID. This makes it possible to restore them.
+            new SharedDatabasePreferences(context.getDatabase().generateSharedDatabaseID())
+                    .putAllDBMSConnectionProperties(context.getDBMSSynchronizer().getConnectionProperties());
         }
         context.setDatabaseFile(file);
-        panel.resetChangeMonitor();
 
+        // Save
+        save();
+
+        // Reinstall AutosaveManager and BackupManager
+        panel.resetChangeMonitor();
         if (readyForAutosave(context)) {
             AutosaveManager autosaver = AutosaveManager.start(context);
             autosaver.registerListener(new AutosaveUIManager(panel));
         }
-
         if (readyForBackup(context)) {
             BackupManager.start(context);
         }
 
-        context.getDatabaseFile().ifPresent(presentFile -> frame.getFileHistory().newFile(presentFile.getPath()));
+        context.getDatabasePath().ifPresent(presentFile -> frame.getFileHistory().newFile(presentFile));
     }
 
     private boolean readyForAutosave(BibDatabaseContext context) {
@@ -352,108 +223,23 @@ private boolean readyForAutosave(BibDatabaseContext context) {
                 ((context.getLocation() == DatabaseLocation.LOCAL)
                         && Globals.prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)))
                 &&
-                context.getDatabaseFile().isPresent();
+                context.getDatabasePath().isPresent();
     }
 
     private boolean readyForBackup(BibDatabaseContext context) {
-        return (context.getLocation() == DatabaseLocation.LOCAL) && context.getDatabaseFile().isPresent();
-    }
-
-    /**
-     * Query whether the last operation was successful.
-     *
-     * @return true if the last Save/SaveAs operation completed successfully, false otherwise.
-     */
-    public boolean isSuccess() {
-        return success;
-    }
-
-    /**
-     * Query whether the last operation was canceled.
-     *
-     * @return true if the last Save/SaveAs operation was canceled from the file dialog or from another
-     * query dialog, false otherwise.
-     */
-    public boolean isCanceled() {
-        return canceled;
+        return (context.getLocation() == DatabaseLocation.LOCAL) && context.getDatabasePath().isPresent();
     }
 
-    /**
-     * Check whether or not the external database has been modified. If so need to alert the user to accept external updates prior to
-     * saving the database. This is necessary to avoid overwriting other users work when using a multiuser database file.
-     *
-     * @return true if the external database file has been modified and the user must choose to accept the changes and false if no modifications
-     * were found or there is no requested protection for the database file.
-     */
-    private boolean checkExternalModification() {
-        // Check for external modifications:
-        if (panel.isUpdatedExternally()) {
-
-            ButtonType save = new ButtonType(Localization.lang("Save"));
-            ButtonType reviewChanges = new ButtonType(Localization.lang("Review changes"));
-
-            Optional<ButtonType> buttonPressed = DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showCustomButtonDialogAndWait(AlertType.CONFIRMATION, Localization.lang("File updated externally"),
-                    Localization.lang("File has been updated externally. " + "What do you want to do?"),
-                    reviewChanges,
-                    save,
-                    ButtonType.CANCEL));
-
-            if (buttonPressed.isPresent()) {
-                if (buttonPressed.get() == ButtonType.CANCEL) {
-                    canceled = true;
-                    return true;
-                }
-                if (buttonPressed.get().equals(reviewChanges)) {
-                    canceled = true;
-
-                    JabRefExecutorService.INSTANCE.execute(() -> {
-
-                        if (!FileBasedLock
-                                          .waitForFileLock(panel.getBibDatabaseContext().getDatabasePath().get())) {
-                            // TODO: GUI handling of the situation when the externally modified file keeps being locked.
-                            LOGGER.error("File locked, this will be trouble.");
-                        }
-
-                        ChangeScanner scanner = new ChangeScanner(panel.frame(), panel,
-                                                                  panel.getBibDatabaseContext().getDatabasePath().orElse(null), panel.getTempFile());
-                        JabRefExecutorService.INSTANCE.executeInterruptableTaskAndWait(scanner);
-                        if (scanner.changesFound()) {
-                            scanner.displayResult(resolved -> {
-                                if (resolved) {
-                                    panel.markExternalChangesAsResolved();
-                                    DefaultTaskExecutor.runInJavaFXThread(() -> panel.getSidePaneManager().hide(SidePaneType.FILE_UPDATE_NOTIFICATION));
-                                } else {
-                                    canceled = true;
-                                }
-                            });
-                        }
-                    });
-
-                    return true;
-                } else { // User indicated to store anyway.
-                    if (panel.getBibDatabaseContext().getMetaData().isProtected()) {
-
-                        frame.getDialogService().showErrorDialogAndWait(Localization.lang("Protected library"),
-                                Localization.lang("Library is protected. Cannot save until external changes have been reviewed."));
-
-                        canceled = true;
-                    } else {
-                        panel.markExternalChangesAsResolved();
-                        panel.getSidePaneManager().hide(SidePaneType.FILE_UPDATE_NOTIFICATION);
-                    }
-                }
+    public void saveSelectedAsPlain() {
+        getSavePath().ifPresent(path -> {
+            try {
+                saveDatabase(path, true, Globals.prefs.getDefaultEncoding(), SavePreferences.DatabaseSaveType.PLAIN_BIBTEX);
+                frame.getFileHistory().newFile(path);
+                frame.output(Localization.lang("Saved selected to '%0'.", path.toString()));
+            } catch (SaveException ex) {
+                LOGGER.error("A problem occurred when trying to save the file", ex);
+                frame.getDialogService().showErrorDialogAndWait(Localization.lang("Save library"), Localization.lang("Could not save file."), ex);
             }
-        }
-
-        // Return false as either no external database file modifications have been found or overwrite is requested any way
-        return false;
-    }
-
-    @Override
-    public void action() throws Exception {
-        init();
-        BackgroundTask
-                .wrap(this::doSave)
-                .executeWith(Globals.TASK_EXECUTOR);
+        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
index ef98593fc5a..0fdba4fd411 100644
--- a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
@@ -3,7 +3,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.attribute.FileTime;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,7 +35,6 @@
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.logic.shared.exception.NotASharedDatabaseException;
 import org.jabref.logic.util.StandardFileType;
-import org.jabref.logic.util.io.FileBasedLock;
 import org.jabref.migrations.FileLinksUpgradeWarning;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.shared.DatabaseNotSupportedException;
@@ -175,7 +173,7 @@ public void openFiles(List<Path> filesToOpen, boolean raisePanel) {
                 }
             });
             for (Path theFile : theFiles) {
-                frame.getFileHistory().newFile(theFile.toString());
+                frame.getFileHistory().newFile(theFile);
             }
         }
         // If no files are remaining to open, this could mean that a file was
@@ -199,37 +197,8 @@ private void openTheFile(Path file, boolean raisePanel) {
 
             frame.output(Localization.lang("Opening") + ": '" + file + "'");
 
-            String fileName = file.getFileName().toString();
             Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, fileToLoad.getParent().toString());
 
-            if (FileBasedLock.hasLockFile(file)) {
-                Optional<FileTime> modificationTime = FileBasedLock.getLockFileTimeStamp(file);
-                if ((modificationTime.isPresent()) && ((System.currentTimeMillis()
-                        - modificationTime.get().toMillis()) > FileBasedLock.LOCKFILE_CRITICAL_AGE)) {
-                    // The lock file is fairly old, so we can offer to "steal" the file:
-
-                    boolean overWriteFileLockPressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("File locked"),
-                            Localization.lang("Error opening file") + " '" + fileName + "'. "
-                                    + Localization.lang("File is locked by another JabRef instance.") + "\n"
-                                    + Localization.lang("Do you want to override the file lock?"),
-                            Localization.lang("Overwrite file lock"),
-                            Localization.lang("Cancel"));
-
-                    if (overWriteFileLockPressed) {
-                        FileBasedLock.deleteLockFile(file);
-                    } else {
-                        return;
-                    }
-                } else if (!FileBasedLock.waitForFileLock(file)) {
-
-                    frame.getDialogService().showErrorDialogAndWait(Localization.lang("Error"),
-                            Localization.lang("Error opening file") + " '" + fileName + "'. "
-                                    + Localization.lang("File is locked by another JabRef instance."));
-
-                    return;
-                }
-            }
-
             if (BackupManager.checkForBackupFile(fileToLoad)) {
                 BackupUIManager.showRestoreBackupDialog(frame.getDialogService(), fileToLoad);
             }
diff --git a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
index 83cd9613807..a5b8d48454a 100644
--- a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
+++ b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
@@ -2,7 +2,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
@@ -38,26 +37,24 @@ public FileHistoryMenu(JabRefPreferences preferences, JabRefFrame frame) {
     /**
      * Adds the filename to the top of the menu. If it already is in
      * the menu, it is merely moved to the top.
-     *
-     * @param filename a <code>String</code> value
      */
-    public void newFile(String filename) {
-        history.newFile(filename);
+    public void newFile(Path file) {
+        history.newFile(file);
         setItems();
         setDisable(false);
     }
 
     private void setItems() {
         getItems().clear();
-        for (int count = 0; count < history.size(); count++) {
-            addItem(history.getFileName(count), count + 1);
+        for (int index = 0; index < history.size(); index++) {
+            addItem(history.getFileAt(index), index + 1);
         }
     }
 
-    private void addItem(String fileName, int num) {
+    private void addItem(Path file, int num) {
         String number = Integer.toString(num);
-        MenuItem item = new MenuItem(number + ". " + fileName);
-        item.setOnAction(event -> openFile(fileName));
+        MenuItem item = new MenuItem(number + ". " + file);
+        item.setOnAction(event -> openFile(file));
         getItems().add(item);
     }
 
@@ -65,19 +62,16 @@ public void storeHistory() {
         preferences.storeFileHistory(history);
     }
 
-    public void openFile(String fileName) {
-        final Path fileToOpen = Paths.get(fileName);
-
-        // the existence check has to be done here (and not in open.openIt) as we have to call "removeItem" if the file does not exist
-        if (!Files.exists(fileToOpen)) {
+    public void openFile(Path file) {
+        if (!Files.exists(file)) {
             dialogService.showErrorDialogAndWait(
                     Localization.lang("File not found"),
-                    Localization.lang("File not found") + ": " + fileName);
-            history.removeItem(fileName);
+                    Localization.lang("File not found") + ": " + file);
+            history.removeItem(file);
             setItems();
             return;
         }
-        JabRefExecutorService.INSTANCE.execute(() -> frame.getOpenDatabaseAction().openFile(fileToOpen, true));
+        JabRefExecutorService.INSTANCE.execute(() -> frame.getOpenDatabaseAction().openFile(file, true));
 
     }
 
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index d03300bba12..18d0c881baf 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -161,7 +161,7 @@ private void openSharedDatabase(DBMSConnectionProperties connectionProperties) {
 
             if (!folder.getValue().isEmpty()) {
                 try {
-                    new SaveDatabaseAction(panel, Paths.get(folder.getValue())).runCommand();
+                    new SaveDatabaseAction(panel).saveAs(Paths.get(folder.getValue()));
                 } catch (Throwable e) {
                     LOGGER.error("Error while saving the database", e);
                 }
diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java b/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
index 4fdb9d05f18..35ffdc314a7 100644
--- a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
+++ b/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
@@ -16,9 +16,8 @@
 import java.util.concurrent.TimeUnit;
 
 import org.jabref.logic.bibtex.InvalidFieldValueException;
+import org.jabref.logic.exporter.AtomicFileWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
-import org.jabref.logic.exporter.FileSaveSession;
-import org.jabref.logic.exporter.SaveException;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
@@ -121,14 +120,14 @@ private void performBackup(Path backupPath) {
             Charset charset = bibDatabaseContext.getMetaData().getEncoding().orElse(preferences.getDefaultEncoding());
             SavePreferences savePreferences = preferences.loadForSaveFromPreferences().withEncoding
                     (charset).withMakeBackup(false);
-            new BibtexDatabaseWriter<>(FileSaveSession::new).saveDatabase(bibDatabaseContext, savePreferences).commit
-                    (backupPath);
-        } catch (SaveException e) {
-            logIfCritical(e);
+            new BibtexDatabaseWriter(new AtomicFileWriter(backupPath, savePreferences.getEncoding()), savePreferences)
+                    .saveDatabase(bibDatabaseContext);
+        } catch (IOException e) {
+            logIfCritical(backupPath, e);
         }
     }
 
-    private void logIfCritical(SaveException e) {
+    private void logIfCritical(Path backupPath, IOException e) {
         Throwable innermostCause = e;
         while (innermostCause.getCause() != null) {
             innermostCause = innermostCause.getCause();
@@ -137,7 +136,7 @@ private void logIfCritical(SaveException e) {
 
         // do not print errors in field values into the log during autosave
         if (!isErrorInField) {
-            LOGGER.error("Error while saving file.", e);
+            LOGGER.error("Error while saving to file" + backupPath, e);
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java b/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
new file mode 100644
index 00000000000..22ceec6004a
--- /dev/null
+++ b/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
@@ -0,0 +1,237 @@
+package org.jabref.logic.exporter;
+
+import java.io.FileOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.nio.channels.FileLock;
+import java.nio.channels.OverlappingFileLockException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.jabref.logic.util.io.FileUtil;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A file output stream that is similar to the standard {@link FileOutputStream}, except that all writes are first
+ * redirected to a temporary file. When the stream is closed, the temporary file (atomically) replaces the target file.
+ *
+ * In detail, the strategy is to:
+ * <ol>
+ * <li>Write to a temporary file (with .tmp suffix) in the same directory as the destination file.</li>
+ * <li>Create a backup (with .bak suffix) of the original file (if it exists) in the same directory.</li>
+ * <li>Move the temporary file to the correct place, overwriting any file that already exists at that location.</li>
+ * <li>Delete the backup file (if configured to do so).</li>
+ * </ol>
+ * If all goes well, no temporary or backup files will remain on disk after closing the stream.
+ *
+ * Errors are handled as follows:
+ * <ol>
+ * <li>If anything goes wrong while writing to the temporary file, the temporary file will be deleted (leaving the
+ * original file untouched).</li>
+ * <li>If anything goes wrong while copying the temporary file to the target file, the backup of the original file is
+ * kept.</li>
+ * </ol>
+ *
+ * Implementation inspired by code from <a href="https://github.com/martylamb/atomicfileoutputstream/blob/master/src/main/java/com/martiansoftware/io/AtomicFileOutputStream.java">Marty
+ * Lamb</a> and <a href="https://github.com/apache/zookeeper/blob/master/src/java/main/org/apache/zookeeper/common/AtomicFileOutputStream.java">Apache</a>.
+ */
+public class AtomicFileOutputStream extends FilterOutputStream {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AtomicFileOutputStream.class);
+
+    private static final String TEMPORARY_EXTENSION = ".tmp";
+    private static final String BACKUP_EXTENSION = ".bak";
+
+    /**
+     * The file we want to create/replace.
+     */
+    private final Path targetFile;
+
+    /**
+     * The file to which writes are redirected to.
+     */
+    private final Path temporaryFile;
+    private final FileLock temporaryFileLock;
+    /**
+     * A backup of the target file (if it exists), created when the stream is closed
+     */
+    private final Path backupFile;
+    private final boolean keepBackup;
+
+    /**
+     * Creates a new output stream to write to or replace the file at the specified path.
+     *
+     * @param path the path of the file to write to or replace
+     * @param keepBackup whether to keep the backup file after a successful write process
+     */
+    public AtomicFileOutputStream(Path path, boolean keepBackup) throws IOException {
+        super(Files.newOutputStream(getPathOfTemporaryFile(path)));
+
+        this.targetFile = path;
+        this.temporaryFile = getPathOfTemporaryFile(path);
+        this.backupFile = getPathOfBackupFile(path);
+        this.keepBackup = keepBackup;
+
+        try {
+            // Lock files (so that at least not another JabRef instance writes at the same time to the same tmp file)
+            if (out instanceof FileOutputStream) {
+                temporaryFileLock = ((FileOutputStream) out).getChannel().lock();
+            } else {
+                temporaryFileLock = null;
+            }
+        } catch (OverlappingFileLockException exception) {
+            throw new IOException("Could not obtain write access to " + temporaryFile + ". Maybe another instance of JabRef is currently writing to the same file?", exception);
+        }
+    }
+
+    /**
+     * Creates a new output stream to write to or replace the file at the specified path. The backup file is deleted
+     * when the write was successful.
+     *
+     * @param path the path of the file to write to or replace
+     */
+    public AtomicFileOutputStream(Path path) throws IOException {
+        this(path, false);
+    }
+
+    private static Path getPathOfTemporaryFile(Path targetFile) {
+        return FileUtil.addExtension(targetFile, TEMPORARY_EXTENSION);
+    }
+
+    private static Path getPathOfBackupFile(Path targetFile) {
+        return FileUtil.addExtension(targetFile, BACKUP_EXTENSION);
+    }
+
+    /**
+     * Returns the path of the backup copy of the original file (may not exist)
+     */
+    public Path getBackup() {
+        return backupFile;
+    }
+
+    /**
+     * Override for performance reasons.
+     */
+    @Override
+    public void write(byte b[], int off, int len) throws IOException {
+        try {
+            out.write(b, off, len);
+        } catch (IOException exception) {
+            cleanup();
+            throw exception;
+        }
+    }
+
+    /**
+     * Closes the write process to the temporary file but does not commit to the target file.
+     */
+    public void abort() {
+        try {
+            super.close();
+            Files.deleteIfExists(temporaryFile);
+            Files.deleteIfExists(backupFile);
+        } catch (IOException exception) {
+            LOGGER.debug("Unable to abort writing to file " + temporaryFile, exception);
+        }
+    }
+
+    private void cleanup() {
+        try {
+            Files.deleteIfExists(temporaryFile);
+        } catch (IOException exception) {
+            LOGGER.debug("Unable to delete file " + temporaryFile, exception);
+        }
+
+        try {
+            if (temporaryFileLock != null) {
+                temporaryFileLock.release();
+            }
+        } catch (IOException exception) {
+            LOGGER.warn("Unable to release lock on file " + temporaryFile, exception);
+        }
+    }
+
+    // perform the final operations to move the temporary file to its final destination
+    @Override
+    public void close() throws IOException {
+        try {
+            try {
+                // Make sure we have written everything to the temporary file
+                flush();
+                if (out instanceof FileOutputStream) {
+                    ((FileOutputStream) out).getFD().sync();
+                }
+            } catch (IOException exception) {
+                // Try to close nonetheless
+                super.close();
+                throw exception;
+            }
+            super.close();
+
+            // We successfully wrote everything to the temporary file, lets copy it to the correct place
+            // First, make backup of original file and try to save file permissions to restore them later (by default: 664)
+            Set<PosixFilePermission> oldFilePermissions = EnumSet.of(PosixFilePermission.OWNER_READ,
+                    PosixFilePermission.OWNER_WRITE,
+                    PosixFilePermission.GROUP_READ,
+                    PosixFilePermission.GROUP_WRITE,
+                    PosixFilePermission.OTHERS_READ);
+            if (Files.exists(targetFile)) {
+                Files.copy(targetFile, backupFile, StandardCopyOption.REPLACE_EXISTING);
+                if (FileUtil.IS_POSIX_COMPILANT) {
+                    try {
+                        oldFilePermissions = Files.getPosixFilePermissions(targetFile);
+                    } catch (IOException exception) {
+                        LOGGER.warn("Error getting file permissions for file {}.", targetFile, exception);
+                    }
+                }
+            }
+
+            // Move temporary file (replace original if it exists)
+            Files.move(temporaryFile, targetFile, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
+
+            // Restore file permissions
+            if (FileUtil.IS_POSIX_COMPILANT) {
+                try {
+                    Files.setPosixFilePermissions(targetFile, oldFilePermissions);
+                } catch (IOException exception) {
+                    LOGGER.warn("Error writing file permissions to file {}.", targetFile, exception);
+                }
+            }
+
+            if (!keepBackup) {
+                // Remove backup file
+                Files.deleteIfExists(backupFile);
+            }
+        } finally {
+            // Remove temporary file (but not the backup!)
+            cleanup();
+        }
+    }
+
+    @Override
+    public void flush() throws IOException {
+        try {
+            super.flush();
+        } catch (IOException exception) {
+            cleanup();
+            throw exception;
+        }
+    }
+
+    @Override
+    public void write(int b) throws IOException {
+        try {
+            super.write(b);
+        } catch (IOException exception) {
+            cleanup();
+            throw exception;
+        }
+    }
+}
+
diff --git a/src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java b/src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java
new file mode 100644
index 00000000000..19274cbeafa
--- /dev/null
+++ b/src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java
@@ -0,0 +1,53 @@
+package org.jabref.logic.exporter;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * Writer that similar to the built-in {@link java.io.FileWriter} but uses the {@link AtomicFileOutputStream} as the
+ * underlying output stream. In this way, we make sure that the errors during the write process do not destroy the
+ * contents of the target file.
+ * Moreover, this writer checks if the chosen encoding supports all text that is written. Characters whose encoding
+ * was problematic can be retrieved by {@link #getEncodingProblems()}.
+ */
+public class AtomicFileWriter extends OutputStreamWriter {
+
+    private final CharsetEncoder encoder;
+    private final Set<Character> problemCharacters = new TreeSet<>();
+
+    public AtomicFileWriter(Path file, Charset encoding) throws IOException {
+        this(file, encoding, false);
+    }
+
+    public AtomicFileWriter(Path file, Charset encoding, boolean keepBackup) throws IOException {
+        super(new AtomicFileOutputStream(file, keepBackup), encoding);
+        encoder = encoding.newEncoder();
+    }
+
+    @Override
+    public void write(String str) throws IOException {
+        super.write(str);
+        if (!encoder.canEncode(str)) {
+            for (int i = 0; i < str.length(); i++) {
+                char character = str.charAt(i);
+                if (!encoder.canEncode(character)) {
+                    problemCharacters.add(character);
+                }
+            }
+        }
+    }
+
+    public boolean hasEncodingProblems() {
+        return !problemCharacters.isEmpty();
+    }
+
+    public Set<Character> getEncodingProblems() {
+        return Collections.unmodifiableSet(problemCharacters);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
index b43e8663924..28ad14efc19 100644
--- a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.exporter;
 
 import java.io.IOException;
+import java.io.Writer;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -17,12 +17,12 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.bibtex.LatexFieldFormatterPreferences;
 import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
 import org.jabref.logic.bibtex.comparator.CrossRefEntryComparator;
 import org.jabref.logic.bibtex.comparator.FieldComparator;
 import org.jabref.logic.bibtex.comparator.FieldComparatorStack;
 import org.jabref.logic.bibtex.comparator.IdComparator;
+import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
 import org.jabref.model.EntryTypes;
 import org.jabref.model.FieldChange;
 import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern;
@@ -36,20 +36,18 @@
 import org.jabref.model.entry.EntryType;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.strings.StringUtil;
 
-public abstract class BibDatabaseWriter<E extends SaveSession> {
+public abstract class BibDatabaseWriter {
 
     private static final Pattern REFERENCE_PATTERN = Pattern.compile("(#[A-Za-z]+#)"); // Used to detect string references in strings
-    private final SaveSessionFactory<E> saveSessionFactory;
+    protected final Writer writer;
+    protected final SavePreferences preferences;
+    protected final List<FieldChange> saveActionsFieldChanges = new ArrayList<>();
 
-    private E session;
-
-    public BibDatabaseWriter(SaveSessionFactory<E> saveSessionFactory) {
-        this.saveSessionFactory = saveSessionFactory;
-    }
-
-    public interface SaveSessionFactory<E extends SaveSession> {
-        E createSaveSession(Charset encoding, Boolean makeBackup) throws SaveException;
+    public BibDatabaseWriter(Writer writer, SavePreferences preferences) {
+        this.writer = Objects.requireNonNull(writer);
+        this.preferences = preferences;
     }
 
     private static List<FieldChange> applySaveActions(List<BibEntry> toChange, MetaData metaData) {
@@ -67,64 +65,56 @@ private static List<FieldChange> applySaveActions(List<BibEntry> toChange, MetaD
     }
 
     public static List<FieldChange> applySaveActions(BibEntry entry, MetaData metaData) {
-        return applySaveActions(Arrays.asList(entry), metaData);
+        return applySaveActions(Collections.singletonList(entry), metaData);
     }
 
-    private static List<Comparator<BibEntry>> getSaveComparators(SavePreferences preferences, MetaData metaData) {
-
+    private static List<Comparator<BibEntry>> getSaveComparators(MetaData metaData, SavePreferences preferences) {
         List<Comparator<BibEntry>> comparators = new ArrayList<>();
-        Optional<SaveOrderConfig> saveOrder = getSaveOrder(preferences, metaData);
+        Optional<SaveOrderConfig> saveOrder = getSaveOrder(metaData, preferences);
 
         // Take care, using CrossRefEntry-Comparator, that referred entries occur after referring
         // ones. This is a necessary requirement for BibTeX to be able to resolve referenced entries correctly.
         comparators.add(new CrossRefEntryComparator());
 
-        if (! saveOrder.isPresent()) {
+        if (!saveOrder.isPresent()) {
             // entries will be sorted based on their internal IDs
             comparators.add(new IdComparator());
         } else {
             // use configured sorting strategy
-            comparators.add(new FieldComparator(saveOrder.get().sortCriteria[0]));
-            comparators.add(new FieldComparator(saveOrder.get().sortCriteria[1]));
-            comparators.add(new FieldComparator(saveOrder.get().sortCriteria[2]));
-
+            List<FieldComparator> fieldComparators = saveOrder.get()
+                                                              .getSortCriteria().stream()
+                                                              .map(FieldComparator::new)
+                                                              .collect(Collectors.toList());
+            comparators.addAll(fieldComparators);
             comparators.add(new FieldComparator(BibEntry.KEY_FIELD));
         }
 
         return comparators;
     }
 
-    /*
-     * We have begun to use getSortedEntries() for both database save operations
-     * and non-database save operations.  In a non-database save operation
-     * (such as the exportDatabase call), we do not wish to use the
-     * global preference of saving in standard order.
-    */
-    public static List<BibEntry> getSortedEntries(BibDatabaseContext bibDatabaseContext, List<BibEntry> entriesToSort,
-            SavePreferences preferences) {
+    /**
+     * We have begun to use getSortedEntries() for both database save operations and non-database save operations.  In a
+     * non-database save operation (such as the exportDatabase call), we do not wish to use the global preference of
+     * saving in standard order.
+     */
+    public static List<BibEntry> getSortedEntries(BibDatabaseContext bibDatabaseContext, List<BibEntry> entriesToSort, SavePreferences preferences) {
         Objects.requireNonNull(bibDatabaseContext);
         Objects.requireNonNull(entriesToSort);
 
         //if no meta data are present, simply return in original order
         if (bibDatabaseContext.getMetaData() == null) {
-            List<BibEntry> result = new LinkedList<>();
-            result.addAll(entriesToSort);
-            return result;
+            return new LinkedList<>(entriesToSort);
         }
 
-        List<Comparator<BibEntry>> comparators = BibDatabaseWriter.getSaveComparators(preferences,
-                bibDatabaseContext.getMetaData());
+        List<Comparator<BibEntry>> comparators = getSaveComparators(bibDatabaseContext.getMetaData(), preferences);
         FieldComparatorStack<BibEntry> comparatorStack = new FieldComparatorStack<>(comparators);
 
-        List<BibEntry> sorted = new ArrayList<>();
-        sorted.addAll(entriesToSort);
-
-        Collections.sort(sorted, comparatorStack);
-
+        List<BibEntry> sorted = new ArrayList<>(entriesToSort);
+        sorted.sort(comparatorStack);
         return sorted;
     }
 
-    private static Optional<SaveOrderConfig> getSaveOrder(SavePreferences preferences, MetaData metaData) {
+    private static Optional<SaveOrderConfig> getSaveOrder(MetaData metaData, SavePreferences preferences) {
         /* three options:
          * 1. original order
          * 2. order specified in metaData
@@ -135,29 +125,28 @@ private static Optional<SaveOrderConfig> getSaveOrder(SavePreferences preference
             return Optional.empty();
         }
 
-        if (preferences.getTakeMetadataSaveOrderInAccount()) {
+        if (preferences.takeMetadataSaveOrderInAccount()) {
             return metaData.getSaveOrderConfig();
         }
 
         return Optional.ofNullable(preferences.getSaveOrder());
     }
 
+    public List<FieldChange> getSaveActionsFieldChanges() {
+        return Collections.unmodifiableList(saveActionsFieldChanges);
+    }
+
     /**
      * Saves the complete database.
      */
-    public E saveDatabase(BibDatabaseContext bibDatabaseContext, SavePreferences preferences)
-            throws SaveException {
-        return savePartOfDatabase(bibDatabaseContext, bibDatabaseContext.getDatabase().getEntries(), preferences);
+    public void saveDatabase(BibDatabaseContext bibDatabaseContext) throws IOException {
+        savePartOfDatabase(bibDatabaseContext, bibDatabaseContext.getDatabase().getEntries());
     }
 
     /**
      * Saves the database, including only the specified entries.
      */
-    public E savePartOfDatabase(BibDatabaseContext bibDatabaseContext,
-            List<BibEntry> entries, SavePreferences preferences) throws SaveException {
-
-        session = saveSessionFactory.createSaveSession(preferences.getEncodingOrDefault(), preferences.getMakeBackup());
-
+    public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEntry> entries) throws IOException {
         Optional<String> sharedDatabaseIDOptional = bibDatabaseContext.getDatabase().getSharedDatabaseID();
 
         if (sharedDatabaseIDOptional.isPresent()) {
@@ -176,13 +165,16 @@ public E savePartOfDatabase(BibDatabaseContext bibDatabaseContext,
         writePreamble(bibDatabaseContext.getDatabase().getPreamble().orElse(""));
 
         // Write strings if there are any.
-        writeStrings(bibDatabaseContext.getDatabase(), preferences.isReformatFile(),
-                preferences.getLatexFieldFormatterPreferences());
+        writeStrings(bibDatabaseContext.getDatabase());
 
         // Write database entries.
         List<BibEntry> sortedEntries = getSortedEntries(bibDatabaseContext, entries, preferences);
         List<FieldChange> saveActionChanges = applySaveActions(sortedEntries, bibDatabaseContext.getMetaData());
-        session.addFieldChanges(saveActionChanges);
+        saveActionsFieldChanges.addAll(saveActionChanges);
+        if (preferences.generateBibtexKeysBeforeSaving()) {
+            List<FieldChange> keyChanges = generateBibtexKeys(bibDatabaseContext, sortedEntries);
+            saveActionsFieldChanges.addAll(keyChanges);
+        }
 
         for (BibEntry entry : sortedEntries) {
             // Check if we must write the type definition for this
@@ -195,8 +187,7 @@ public E savePartOfDatabase(BibDatabaseContext bibDatabaseContext,
                         entryType -> typesToWrite.put(entryType.getName(), entryType));
             }
 
-            writeEntry(entry, bibDatabaseContext.getMode(), preferences.isReformatFile(),
-                    preferences.getLatexFieldFormatterPreferences());
+            writeEntry(entry, bibDatabaseContext.getMode());
         }
 
         if (preferences.getSaveType() != SavePreferences.DatabaseSaveType.PLAIN_BIBTEX) {
@@ -210,25 +201,19 @@ public E savePartOfDatabase(BibDatabaseContext bibDatabaseContext,
         //finally write whatever remains of the file, but at least a concluding newline
         writeEpilogue(bibDatabaseContext.getDatabase().getEpilog());
 
-        try {
-            session.getWriter().close();
-        } catch (IOException e) {
-            throw new SaveException(e);
-        }
-        return session;
+        writer.close();
     }
 
-    protected abstract void writePrelogue(BibDatabaseContext bibDatabaseContext, Charset encoding) throws SaveException;
+    protected abstract void writePrelogue(BibDatabaseContext bibDatabaseContext, Charset encoding) throws IOException;
 
-    protected abstract void writeEntry(BibEntry entry, BibDatabaseMode mode, Boolean isReformatFile,
-            LatexFieldFormatterPreferences latexFieldFormatterPreferences) throws SaveException;
+    protected abstract void writeEntry(BibEntry entry, BibDatabaseMode mode) throws IOException;
 
-    protected abstract void writeEpilogue(String epilogue) throws SaveException;
+    protected abstract void writeEpilogue(String epilogue) throws IOException;
 
     /**
      * Writes all data to the specified writer, using each object's toString() method.
      */
-    protected void writeMetaData(MetaData metaData, GlobalBibtexKeyPattern globalCiteKeyPattern) throws SaveException {
+    protected void writeMetaData(MetaData metaData, GlobalBibtexKeyPattern globalCiteKeyPattern) throws IOException {
         Objects.requireNonNull(metaData);
 
         Map<String, String> serializedMetaData = MetaDataSerializer.getSerializedStringMap(metaData,
@@ -239,23 +224,24 @@ protected void writeMetaData(MetaData metaData, GlobalBibtexKeyPattern globalCit
         }
     }
 
-    protected abstract void writeMetaDataItem(Map.Entry<String, String> metaItem) throws SaveException;
+    protected abstract void writeMetaDataItem(Map.Entry<String, String> metaItem) throws IOException;
 
-    protected abstract void writePreamble(String preamble) throws SaveException;
+    protected abstract void writePreamble(String preamble) throws IOException;
 
-    protected abstract void writeDatabaseID(String sharedDatabaseID) throws SaveException;
+    protected abstract void writeDatabaseID(String sharedDatabaseID) throws IOException;
 
     /**
-     * Write all strings in alphabetical order, modified to produce a safe (for
-     * BibTeX) order of the strings if they reference each other.
+     * Write all strings in alphabetical order, modified to produce a safe (for BibTeX) order of the strings if they
+     * reference each other.
      *
      * @param database The database whose strings we should write.
      */
-    private void writeStrings(BibDatabase database, Boolean reformatFile,
-            LatexFieldFormatterPreferences latexFieldFormatterPreferences) throws SaveException {
-        List<BibtexString> strings = database.getStringKeySet().stream().map(database::getString).collect(
-                Collectors.toList());
-        strings.sort(new BibtexStringComparator(true));
+    private void writeStrings(BibDatabase database) throws IOException {
+        List<BibtexString> strings = database.getStringKeySet()
+                                             .stream()
+                                             .map(database::getString)
+                                             .sorted(new BibtexStringComparator(true))
+                                             .collect(Collectors.toList());
         // First, make a Map of all entries:
         Map<String, BibtexString> remaining = new HashMap<>();
         int maxKeyLength = 0;
@@ -268,17 +254,15 @@ private void writeStrings(BibDatabase database, Boolean reformatFile,
             boolean isFirstStringInType = true;
             for (BibtexString bs : strings) {
                 if (remaining.containsKey(bs.getName()) && (bs.getType() == t)) {
-                    writeString(bs, isFirstStringInType, remaining, maxKeyLength, reformatFile,
-                            latexFieldFormatterPreferences);
+                    writeString(bs, isFirstStringInType, remaining, maxKeyLength);
                     isFirstStringInType = false;
                 }
             }
         }
     }
 
-    protected void writeString(BibtexString bibtexString, boolean isFirstString, Map<String, BibtexString> remaining, int maxKeyLength,
-            Boolean reformatFile, LatexFieldFormatterPreferences latexFieldFormatterPreferences)
-            throws SaveException {
+    protected void writeString(BibtexString bibtexString, boolean isFirstString, Map<String, BibtexString> remaining, int maxKeyLength)
+            throws IOException {
         // First remove this from the "remaining" list so it can't cause problem with circular refs:
         remaining.remove(bibtexString.getName());
 
@@ -296,19 +280,17 @@ protected void writeString(BibtexString bibtexString, boolean isFirstString, Map
             // If the label we found exists as a key in the "remaining" Map, we go on and write it now:
             if (remaining.containsKey(label)) {
                 BibtexString referred = remaining.get(label);
-                writeString(referred, isFirstString, remaining, maxKeyLength, reformatFile,
-                        latexFieldFormatterPreferences);
+                writeString(referred, isFirstString, remaining, maxKeyLength);
             }
         }
 
-        writeString(bibtexString, isFirstString, maxKeyLength, reformatFile, latexFieldFormatterPreferences);
+        writeString(bibtexString, isFirstString, maxKeyLength);
     }
 
-    protected abstract void writeString(BibtexString bibtexString, boolean isFirstString, int maxKeyLength,
-            Boolean reformatFile, LatexFieldFormatterPreferences latexFieldFormatterPreferences)
-            throws SaveException;
+    protected abstract void writeString(BibtexString bibtexString, boolean isFirstString, int maxKeyLength)
+            throws IOException;
 
-    protected void writeEntryTypeDefinitions(Map<String, EntryType> types) throws SaveException {
+    protected void writeEntryTypeDefinitions(Map<String, EntryType> types) throws IOException {
         for (EntryType type : types.values()) {
             if (type instanceof CustomEntryType) {
                 writeEntryTypeDefinition((CustomEntryType) type);
@@ -316,9 +298,21 @@ protected void writeEntryTypeDefinitions(Map<String, EntryType> types) throws Sa
         }
     }
 
-    protected abstract void writeEntryTypeDefinition(CustomEntryType customType) throws SaveException;
+    protected abstract void writeEntryTypeDefinition(CustomEntryType customType) throws IOException;
 
-    protected SaveSession getActiveSession() {
-        return session;
+    /**
+     * Generate keys for all entries that are lacking keys.
+     */
+    protected List<FieldChange> generateBibtexKeys(BibDatabaseContext databaseContext, List<BibEntry> entries) {
+        List<FieldChange> changes = new ArrayList<>();
+        BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(databaseContext, preferences.getBibtexKeyPatternPreferences());
+        for (BibEntry bes : entries) {
+            Optional<String> oldKey = bes.getCiteKeyOptional();
+            if (StringUtil.isBlank(oldKey)) {
+                Optional<FieldChange> change = keyGenerator.generateAndSetKey(bes);
+                change.ifPresent(changes::add);
+            }
+        }
+        return changes;
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
index 32ea57162a2..a3811090472 100644
--- a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
@@ -8,7 +8,6 @@
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.InvalidFieldValueException;
 import org.jabref.logic.bibtex.LatexFieldFormatter;
-import org.jabref.logic.bibtex.LatexFieldFormatterPreferences;
 import org.jabref.logic.util.OS;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
@@ -18,159 +17,118 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.strings.StringUtil;
 
-public class BibtexDatabaseWriter<E extends SaveSession> extends BibDatabaseWriter<E> {
+public class BibtexDatabaseWriter extends BibDatabaseWriter {
 
     public static final String DATABASE_ID_PREFIX = "DBID:";
     private static final String STRING_PREFIX = "@String";
     private static final String COMMENT_PREFIX = "@Comment";
     private static final String PREAMBLE_PREFIX = "@Preamble";
 
-    public BibtexDatabaseWriter(SaveSessionFactory<E> saveSessionFactory) {
-        super(saveSessionFactory);
+    public BibtexDatabaseWriter(Writer writer, SavePreferences preferences) {
+        super(writer, preferences);
     }
 
     @Override
-    protected void writeEpilogue(String epilogue) throws SaveException {
+    protected void writeEpilogue(String epilogue) throws IOException {
         if (!StringUtil.isNullOrEmpty(epilogue)) {
-            try {
-                getWriter().write(OS.NEWLINE);
-                getWriter().write(epilogue);
-                getWriter().write(OS.NEWLINE);
-            } catch (IOException e) {
-                throw new SaveException(e);
-            }
+            writer.write(OS.NEWLINE);
+            writer.write(epilogue);
+            writer.write(OS.NEWLINE);
         }
     }
 
     @Override
-    protected void writeMetaDataItem(Map.Entry<String, String> metaItem) throws SaveException {
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(OS.NEWLINE);
-        stringBuilder.append(COMMENT_PREFIX + "{").append(MetaData.META_FLAG).append(metaItem.getKey()).append(":");
-        stringBuilder.append(metaItem.getValue());
-        stringBuilder.append("}");
-        stringBuilder.append(OS.NEWLINE);
-
-        try {
-            getWriter().write(stringBuilder.toString());
-        } catch (IOException e) {
-            throw new SaveException(e);
-        }
+    protected void writeMetaDataItem(Map.Entry<String, String> metaItem) throws IOException {
+        writer.write(OS.NEWLINE);
+        writer.write(COMMENT_PREFIX + "{");
+        writer.write(MetaData.META_FLAG);
+        writer.write(metaItem.getKey());
+        writer.write(":");
+        writer.write(metaItem.getValue());
+        writer.write("}");
+        writer.write(OS.NEWLINE);
     }
 
     @Override
-    protected void writePreamble(String preamble) throws SaveException {
+    protected void writePreamble(String preamble) throws IOException {
         if (!StringUtil.isNullOrEmpty(preamble)) {
-            try {
-                getWriter().write(OS.NEWLINE);
-                getWriter().write(PREAMBLE_PREFIX + "{");
-                getWriter().write(preamble);
-                getWriter().write('}' + OS.NEWLINE);
-            } catch (IOException e) {
-                throw new SaveException(e);
-            }
+            writer.write(OS.NEWLINE);
+            writer.write(PREAMBLE_PREFIX + "{");
+            writer.write(preamble);
+            writer.write('}' + OS.NEWLINE);
         }
     }
 
     @Override
-    protected void writeString(BibtexString bibtexString, boolean isFirstString, int maxKeyLength, Boolean reformatFile,
-            LatexFieldFormatterPreferences latexFieldFormatterPreferences) throws SaveException {
-        try {
-            // If the string has not been modified, write it back as it was
-            if (!reformatFile && !bibtexString.hasChanged()) {
-                getWriter().write(bibtexString.getParsedSerialization());
-                return;
-            }
+    protected void writeString(BibtexString bibtexString, boolean isFirstString, int maxKeyLength) throws IOException {
+        // If the string has not been modified, write it back as it was
+        if (!preferences.isReformatFile() && !bibtexString.hasChanged()) {
+            writer.write(bibtexString.getParsedSerialization());
+            return;
+        }
 
-            // Write user comments
-            String userComments = bibtexString.getUserComments();
-            if (!userComments.isEmpty()) {
-                getWriter().write(userComments + OS.NEWLINE);
-            }
+        // Write user comments
+        String userComments = bibtexString.getUserComments();
+        if (!userComments.isEmpty()) {
+            writer.write(userComments + OS.NEWLINE);
+        }
 
-            if (isFirstString) {
-                getWriter().write(OS.NEWLINE);
-            }
+        if (isFirstString) {
+            writer.write(OS.NEWLINE);
+        }
 
-            getWriter().write(STRING_PREFIX + "{" + bibtexString.getName() + StringUtil
-                    .repeatSpaces(maxKeyLength - bibtexString.getName().length()) + " = ");
-            if (bibtexString.getContent().isEmpty()) {
-                getWriter().write("{}");
-            } else {
-                try {
-                    String formatted = new LatexFieldFormatter(latexFieldFormatterPreferences)
-                                    .format(bibtexString.getContent(),
-                            LatexFieldFormatter.BIBTEX_STRING);
-                    getWriter().write(formatted);
-                } catch (InvalidFieldValueException ex) {
-                    throw new SaveException(ex);
-                }
+        writer.write(STRING_PREFIX + "{" + bibtexString.getName() + StringUtil
+                .repeatSpaces(maxKeyLength - bibtexString.getName().length()) + " = ");
+        if (bibtexString.getContent().isEmpty()) {
+            writer.write("{}");
+        } else {
+            try {
+                String formatted = new LatexFieldFormatter(preferences.getLatexFieldFormatterPreferences())
+                        .format(bibtexString.getContent(),
+                                LatexFieldFormatter.BIBTEX_STRING);
+                writer.write(formatted);
+            } catch (InvalidFieldValueException ex) {
+                throw new IOException(ex);
             }
-
-            getWriter().write("}" + OS.NEWLINE);
-        } catch (IOException e) {
-            throw new SaveException(e);
         }
+
+        writer.write("}" + OS.NEWLINE);
     }
 
     @Override
-    protected void writeEntryTypeDefinition(CustomEntryType customType) throws SaveException {
-        try {
-            getWriter().write(OS.NEWLINE);
-            getWriter().write(COMMENT_PREFIX + "{");
-            getWriter().write(customType.getAsString());
-            getWriter().write("}");
-            getWriter().write(OS.NEWLINE);
-        } catch (IOException e) {
-            throw new SaveException(e);
-        }
+    protected void writeEntryTypeDefinition(CustomEntryType customType) throws IOException {
+        writer.write(OS.NEWLINE);
+        writer.write(COMMENT_PREFIX + "{");
+        writer.write(customType.getAsString());
+        writer.write("}");
+        writer.write(OS.NEWLINE);
     }
 
     @Override
-    protected void writePrelogue(BibDatabaseContext bibDatabaseContext, Charset encoding) throws SaveException {
+    protected void writePrelogue(BibDatabaseContext bibDatabaseContext, Charset encoding) throws IOException {
         if (encoding == null) {
             return;
         }
 
         // Writes the file encoding information.
-        try {
-            getWriter().write("% ");
-            getWriter().write(SavePreferences.ENCODING_PREFIX + encoding);
-            getWriter().write(OS.NEWLINE);
-
-        } catch (IOException e) {
-            throw new SaveException(e);
-        }
+        writer.write("% ");
+        writer.write(SavePreferences.ENCODING_PREFIX + encoding);
+        writer.write(OS.NEWLINE);
     }
 
     @Override
-    protected void writeDatabaseID(String sharedDatabaseID) throws SaveException {
-        try {
-            StringBuilder stringBuilder = new StringBuilder()
-                    .append("% ")
-                    .append(DATABASE_ID_PREFIX)
-                    .append(" ")
-                    .append(sharedDatabaseID)
-                    .append(OS.NEWLINE);
-            getWriter().write(stringBuilder.toString());
-        } catch (IOException e) {
-            throw new SaveException(e);
-        }
+    protected void writeDatabaseID(String sharedDatabaseID) throws IOException {
+        writer.write("% " +
+                DATABASE_ID_PREFIX +
+                " " +
+                sharedDatabaseID +
+                OS.NEWLINE);
     }
 
     @Override
-    protected void writeEntry(BibEntry entry, BibDatabaseMode mode, Boolean isReformatFile,
-            LatexFieldFormatterPreferences latexFieldFormatterPreferences) throws SaveException {
+    protected void writeEntry(BibEntry entry, BibDatabaseMode mode) throws IOException {
         BibEntryWriter bibtexEntryWriter = new BibEntryWriter(
-                new LatexFieldFormatter(latexFieldFormatterPreferences), true);
-        try {
-            bibtexEntryWriter.write(entry, getWriter(), mode, isReformatFile);
-        } catch (IOException e) {
-            throw new SaveException(e, entry);
-        }
-    }
-
-    private Writer getWriter() {
-        return getActiveSession().getWriter();
+                new LatexFieldFormatter(preferences.getLatexFieldFormatterPreferences()), true);
+        bibtexEntryWriter.write(entry, writer, mode, preferences.isReformatFile());
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/FileSaveSession.java b/src/main/java/org/jabref/logic/exporter/FileSaveSession.java
deleted file mode 100644
index 697c319c69b..00000000000
--- a/src/main/java/org/jabref/logic/exporter/FileSaveSession.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.jabref.logic.exporter;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.PosixFilePermission;
-import java.util.EnumSet;
-import java.util.Set;
-
-import org.jabref.logic.util.io.FileBasedLock;
-import org.jabref.logic.util.io.FileUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Class used to handle safe storage to disk.
- * <p>
- * Usage: create a SaveSession giving the file to save to, the encoding, and whether to make a backup. The SaveSession
- * will provide a Writer to store to, which actually goes to a temporary file. The Writer keeps track of whether all
- * characters could be saved, and if not, which characters were not encodable.
- * <p>
- * After saving is finished, the client should close the Writer. If the save should be put into effect, call commit(),
- * otherwise call cancel(). When canceling, the temporary file is simply deleted and the target file remains unchanged.
- * When committing, the temporary file is copied to the target file after making a backup if requested and if the target
- * file already existed, and finally the temporary file is deleted.
- * <p>
- * If committing fails, the temporary file will not be deleted.
- */
-public class FileSaveSession extends SaveSession {
-    private static final Logger LOGGER = LoggerFactory.getLogger(FileSaveSession.class);
-
-    // Filenames.
-    private static final String BACKUP_EXTENSION = ".bak";
-    private static final String TEMP_PREFIX = "jabref";
-    private static final String TEMP_SUFFIX = "save.bib";
-    private final Path temporaryFile;
-
-    public FileSaveSession(Charset encoding, boolean backup) throws SaveException {
-        this(encoding, backup, createTemporaryFile());
-    }
-
-    public FileSaveSession(Charset encoding, boolean backup, Path temporaryFile) throws SaveException {
-        super(encoding, backup, getWriterForFile(encoding, temporaryFile));
-        this.temporaryFile = temporaryFile;
-    }
-
-    private static VerifyingWriter getWriterForFile(Charset encoding, Path file) throws SaveException {
-        try {
-            return new VerifyingWriter(Files.newOutputStream(file), encoding);
-        } catch (IOException e) {
-            throw new SaveException(e);
-        }
-    }
-
-    private static Path createTemporaryFile() throws SaveException {
-        try {
-            return Files.createTempFile(FileSaveSession.TEMP_PREFIX, FileSaveSession.TEMP_SUFFIX);
-        } catch (IOException e) {
-            throw new SaveException(e);
-        }
-    }
-
-    @Override
-    public void commit(Path file) throws SaveException {
-        if (file == null) {
-            return;
-        }
-        if (backup && Files.exists(file)) {
-            Path backupFile = FileUtil.addExtension(file, BACKUP_EXTENSION);
-            FileUtil.copyFile(file, backupFile, true);
-        }
-        try {
-            // Always use a lock file
-            try {
-                if (FileBasedLock.createLockFile(file)) {
-                    // Oops, the lock file already existed. Try to wait it out:
-                    if (!FileBasedLock.waitForFileLock(file)) {
-                        throw SaveException.FILE_LOCKED;
-                    }
-                }
-            } catch (IOException ex) {
-                LOGGER.error("Error when creating lock file.", ex);
-            }
-
-            // Try to save file permissions to restore them later (by default: 664)
-            Set<PosixFilePermission> oldFilePermissions = EnumSet.of(PosixFilePermission.OWNER_READ,
-                    PosixFilePermission.OWNER_WRITE,
-                    PosixFilePermission.GROUP_READ,
-                    PosixFilePermission.GROUP_WRITE,
-                    PosixFilePermission.OTHERS_READ);
-            if (FileUtil.IS_POSIX_COMPILANT && Files.exists(file)) {
-                try {
-                    oldFilePermissions = Files.getPosixFilePermissions(file);
-                } catch (IOException exception) {
-                    LOGGER.warn("Error getting file permissions.", exception);
-                }
-            }
-
-            FileUtil.copyFile(temporaryFile, file, true);
-
-            // Restore file permissions
-            if (FileUtil.IS_POSIX_COMPILANT) {
-                try {
-                    Files.setPosixFilePermissions(file, oldFilePermissions);
-                } catch (IOException exception) {
-                    throw new SaveException(exception);
-                }
-            }
-        } finally {
-            FileBasedLock.deleteLockFile(file);
-        }
-        try {
-            Files.deleteIfExists(temporaryFile);
-        } catch (IOException e) {
-            LOGGER.warn("Cannot delete temporary file", e);
-        }
-    }
-
-    @Override
-    public void cancel() {
-        try {
-            Files.deleteIfExists(temporaryFile);
-        } catch (IOException e) {
-            LOGGER.warn("Cannot delete temporary file", e);
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/logic/exporter/MSBibExporter.java b/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
index 0196abb051f..9a4ff1a2088 100644
--- a/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
@@ -38,11 +38,11 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
         if (entries.isEmpty()) {
             return;
         }
-        // forcing to use UTF8 output format for some problems with xml export in other encodings
-        SaveSession session = new FileSaveSession(StandardCharsets.UTF_8, false);
+
         MSBibDatabase msBibDatabase = new MSBibDatabase(databaseContext.getDatabase(), entries);
 
-        try (VerifyingWriter ps = session.getWriter()) {
+        // forcing to use UTF8 output format for some problems with xml export in other encodings
+        try (AtomicFileWriter ps = new AtomicFileWriter(file, StandardCharsets.UTF_8)) {
             try {
                 DOMSource source = new DOMSource(msBibDatabase.getDomForExport());
                 StreamResult result = new StreamResult(ps);
@@ -52,7 +52,6 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
             } catch (TransformerException | IllegalArgumentException | TransformerFactoryConfigurationError e) {
                 throw new SaveException(e);
             }
-            session.finalize(file);
         } catch (IOException ex) {
             throw new SaveException(ex);
         }
diff --git a/src/main/java/org/jabref/logic/exporter/SavePreferences.java b/src/main/java/org/jabref/logic/exporter/SavePreferences.java
index c9d68b0c7b6..d3258a26156 100644
--- a/src/main/java/org/jabref/logic/exporter/SavePreferences.java
+++ b/src/main/java/org/jabref/logic/exporter/SavePreferences.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.exporter;
 
 import java.nio.charset.Charset;
-import java.util.Collections;
 
 import org.jabref.logic.bibtex.LatexFieldFormatterPreferences;
+import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
 import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern;
 import org.jabref.model.metadata.SaveOrderConfig;
 
@@ -21,15 +21,13 @@ public class SavePreferences {
     private final boolean takeMetadataSaveOrderInAccount;
     private final LatexFieldFormatterPreferences latexFieldFormatterPreferences;
     private final GlobalBibtexKeyPattern globalCiteKeyPattern;
-
-    public SavePreferences() {
-        this(true, null, null, false, DatabaseSaveType.ALL, true, false, new LatexFieldFormatterPreferences(),
-                new GlobalBibtexKeyPattern(Collections.emptyList()));
-    }
+    private final Boolean generateBibtexKeysBeforeSaving;
+    private final BibtexKeyPatternPreferences bibtexKeyPatternPreferences;
 
     public SavePreferences(Boolean saveInOriginalOrder, SaveOrderConfig saveOrder, Charset encoding, Boolean makeBackup,
-            DatabaseSaveType saveType, Boolean takeMetadataSaveOrderInAccount, Boolean reformatFile,
-            LatexFieldFormatterPreferences latexFieldFormatterPreferences, GlobalBibtexKeyPattern globalCiteKeyPattern) {
+                           DatabaseSaveType saveType, Boolean takeMetadataSaveOrderInAccount, Boolean reformatFile,
+                           LatexFieldFormatterPreferences latexFieldFormatterPreferences, GlobalBibtexKeyPattern globalCiteKeyPattern,
+                           Boolean generateBibtexKeysBeforeSaving, BibtexKeyPatternPreferences bibtexKeyPatternPreferences) {
         this.saveInOriginalOrder = saveInOriginalOrder;
         this.saveOrder = saveOrder;
         this.encoding = encoding;
@@ -39,9 +37,11 @@ public SavePreferences(Boolean saveInOriginalOrder, SaveOrderConfig saveOrder, C
         this.reformatFile = reformatFile;
         this.latexFieldFormatterPreferences = latexFieldFormatterPreferences;
         this.globalCiteKeyPattern = globalCiteKeyPattern;
+        this.generateBibtexKeysBeforeSaving = generateBibtexKeysBeforeSaving;
+        this.bibtexKeyPatternPreferences = bibtexKeyPatternPreferences;
     }
 
-    public Boolean getTakeMetadataSaveOrderInAccount() {
+    public Boolean takeMetadataSaveOrderInAccount() {
         return takeMetadataSaveOrderInAccount;
     }
 
@@ -56,17 +56,17 @@ public boolean isSaveInOriginalOrder() {
     public SavePreferences withSaveInOriginalOrder(Boolean newSaveInOriginalOrder) {
         return new SavePreferences(newSaveInOriginalOrder, this.saveOrder, this.encoding, this.makeBackup, this.saveType,
                 this.takeMetadataSaveOrderInAccount, this.reformatFile, this.latexFieldFormatterPreferences,
-                globalCiteKeyPattern);
+                this.globalCiteKeyPattern, this.generateBibtexKeysBeforeSaving, this.bibtexKeyPatternPreferences);
     }
 
-    public boolean getMakeBackup() {
+    public boolean makeBackup() {
         return makeBackup;
     }
 
     public SavePreferences withMakeBackup(Boolean newMakeBackup) {
         return new SavePreferences(this.saveInOriginalOrder, this.saveOrder, this.encoding, newMakeBackup, this.saveType,
                 this.takeMetadataSaveOrderInAccount, this.reformatFile, this.latexFieldFormatterPreferences,
-                globalCiteKeyPattern);
+                this.globalCiteKeyPattern, this.generateBibtexKeysBeforeSaving, this.bibtexKeyPatternPreferences);
     }
 
     public Charset getEncoding() {
@@ -76,7 +76,7 @@ public Charset getEncoding() {
     public SavePreferences withEncoding(Charset newEncoding) {
         return new SavePreferences(this.saveInOriginalOrder, this.saveOrder, newEncoding, this.makeBackup, this.saveType,
                 this.takeMetadataSaveOrderInAccount, this.reformatFile, this.latexFieldFormatterPreferences,
-                globalCiteKeyPattern);
+                this.globalCiteKeyPattern, this.generateBibtexKeysBeforeSaving, this.bibtexKeyPatternPreferences);
     }
 
     public DatabaseSaveType getSaveType() {
@@ -86,7 +86,7 @@ public DatabaseSaveType getSaveType() {
     public SavePreferences withSaveType(DatabaseSaveType newSaveType) {
         return new SavePreferences(this.saveInOriginalOrder, this.saveOrder, this.encoding, this.makeBackup, newSaveType,
                 this.takeMetadataSaveOrderInAccount, this.reformatFile, this.latexFieldFormatterPreferences,
-                globalCiteKeyPattern);
+                this.globalCiteKeyPattern, this.generateBibtexKeysBeforeSaving, this.bibtexKeyPatternPreferences);
     }
 
     public Boolean isReformatFile() {
@@ -96,7 +96,7 @@ public Boolean isReformatFile() {
     public SavePreferences withReformatFile(boolean newReformatFile) {
         return new SavePreferences(this.saveInOriginalOrder, this.saveOrder, this.encoding, this.makeBackup,
                 this.saveType, this.takeMetadataSaveOrderInAccount, newReformatFile, this.latexFieldFormatterPreferences,
-                globalCiteKeyPattern);
+                this.globalCiteKeyPattern, this.generateBibtexKeysBeforeSaving, this.bibtexKeyPatternPreferences);
     }
 
     public Charset getEncodingOrDefault() {
@@ -111,6 +111,14 @@ public GlobalBibtexKeyPattern getGlobalCiteKeyPattern() {
         return globalCiteKeyPattern;
     }
 
+    public Boolean generateBibtexKeysBeforeSaving() {
+        return generateBibtexKeysBeforeSaving;
+    }
+
+    public BibtexKeyPatternPreferences getBibtexKeyPatternPreferences() {
+        return bibtexKeyPatternPreferences;
+    }
+
     public enum DatabaseSaveType {
         ALL,
         PLAIN_BIBTEX
diff --git a/src/main/java/org/jabref/logic/exporter/SaveSession.java b/src/main/java/org/jabref/logic/exporter/SaveSession.java
deleted file mode 100644
index 225e2fab267..00000000000
--- a/src/main/java/org/jabref/logic/exporter/SaveSession.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.jabref.logic.exporter;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import org.jabref.model.FieldChange;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class SaveSession {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(SaveSession.class);
-
-    protected boolean backup;
-    protected final Charset encoding;
-    protected final VerifyingWriter writer;
-    private final List<FieldChange> undoableFieldChanges = new ArrayList<>();
-
-    protected SaveSession(Charset encoding, boolean backup, VerifyingWriter writer) {
-        this.encoding = Objects.requireNonNull(encoding);
-        this.backup = backup;
-        this.writer = Objects.requireNonNull(writer);
-    }
-
-    public VerifyingWriter getWriter() {
-        return writer;
-    }
-
-    public Charset getEncoding() {
-        return encoding;
-    }
-
-    public void setUseBackup(boolean useBackup) {
-        this.backup = useBackup;
-    }
-
-    public abstract void commit(Path file) throws SaveException;
-
-    public void commit(String path) throws SaveException {
-        commit(Paths.get(path));
-    }
-
-    public abstract void cancel();
-
-    public List<FieldChange> getFieldChanges() {
-        return undoableFieldChanges;
-    }
-
-    public void addFieldChanges(List<FieldChange> newUndoableFieldChanges) {
-        this.undoableFieldChanges.addAll(newUndoableFieldChanges);
-    }
-
-    public void finalize(Path file) throws SaveException, IOException {
-        getWriter().flush();
-        getWriter().close();
-
-        if (!getWriter().couldEncodeAll()) {
-            LOGGER.warn("Could not encode...");
-        }
-        commit(file);
-    }
-}
diff --git a/src/main/java/org/jabref/logic/exporter/StringSaveSession.java b/src/main/java/org/jabref/logic/exporter/StringSaveSession.java
deleted file mode 100644
index 7948e98f94f..00000000000
--- a/src/main/java/org/jabref/logic/exporter/StringSaveSession.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.jabref.logic.exporter;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class StringSaveSession extends SaveSession {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(StringSaveSession.class);
-
-    private final ByteArrayOutputStream outputStream;
-
-    public StringSaveSession(Charset encoding, boolean backup) {
-        this(encoding, backup, new ByteArrayOutputStream());
-    }
-
-    private StringSaveSession(Charset encoding, boolean backup, ByteArrayOutputStream outputStream) {
-        super(encoding, backup, new VerifyingWriter(outputStream, encoding));
-        this.outputStream = outputStream;
-    }
-
-    public String getStringValue() {
-        try {
-            return outputStream.toString(encoding.name());
-        } catch (UnsupportedEncodingException e) {
-            LOGGER.warn("Encoding problem", e);
-            return "";
-        }
-    }
-
-    @Override
-    public void commit(Path file) throws SaveException {
-        try {
-            Files.write(file, outputStream.toByteArray());
-        } catch (IOException e) {
-            throw new SaveException(e);
-        }
-    }
-
-    @Override
-    public void cancel() {
-        try {
-            outputStream.close();
-        } catch (IOException e) {
-            LOGGER.warn("Error while cancel", e);
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
index cf7d465602f..de3a7ab022c 100644
--- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
@@ -180,22 +180,8 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
         if (entries.isEmpty()) { // Do not export if no entries to export -- avoids exports with only template text
             return;
         }
-        SaveSession saveSession = null;
-        if (this.encoding != null) {
-            try {
-                saveSession = new FileSaveSession(this.encoding, false);
-            } catch (SaveException ex) {
-                // Perhaps the overriding encoding doesn't work?
-                // We will fall back on the default encoding.
-                LOGGER.warn("Cannot get save session.", ex);
-            }
-        }
-        if (saveSession == null) {
-            saveSession = new FileSaveSession(encoding, false);
-        }
-
-        try (VerifyingWriter ps = saveSession.getWriter()) {
 
+        try (AtomicFileWriter ps = new AtomicFileWriter(file, encoding)) {
             Layout beginLayout = null;
 
             // Check if this export filter has bundled name formatters:
@@ -305,9 +291,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
                 sb.append(String.join(", ", missingFormatters));
                 LOGGER.warn("Formatters not found", sb);
             }
-            saveSession.finalize(file);
         }
-
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/exporter/VerifyingWriter.java b/src/main/java/org/jabref/logic/exporter/VerifyingWriter.java
deleted file mode 100644
index a55bf9a6740..00000000000
--- a/src/main/java/org/jabref/logic/exporter/VerifyingWriter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.jabref.logic.exporter;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * Writer that extends OutputStreamWriter, but also checks if the chosen
- * encoding supports all text that is written. Currently only a boolean value is
- * stored to remember whether everything has gone well or not.
- */
-public class VerifyingWriter extends OutputStreamWriter {
-
-    private final CharsetEncoder encoder;
-    private boolean couldEncodeAll = true;
-    private final Set<Character> problemCharacters = new TreeSet<>();
-
-
-    public VerifyingWriter(OutputStream out, Charset encoding) {
-        super(out, encoding);
-        encoder = encoding.newEncoder();
-    }
-
-    @Override
-    public void write(String str) throws IOException {
-        super.write(str);
-        if (!encoder.canEncode(str)) {
-            for (int i = 0; i < str.length(); i++) {
-                if (!encoder.canEncode(str.charAt(i))) {
-                    problemCharacters.add(str.charAt(i));
-                }
-            }
-            couldEncodeAll = false;
-        }
-    }
-
-    public boolean couldEncodeAll() {
-        return couldEncodeAll;
-    }
-
-    public String getProblemCharacters() {
-        StringBuilder chars = new StringBuilder();
-        for (Character ch : problemCharacters) {
-            chars.append(ch.charValue());
-        }
-        return chars.toString();
-    }
-}
diff --git a/src/main/java/org/jabref/logic/importer/OpenDatabase.java b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
index ed777ef8211..a47ab79be74 100644
--- a/src/main/java/org/jabref/logic/importer/OpenDatabase.java
+++ b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
@@ -8,7 +8,6 @@
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.specialfields.SpecialFieldsUtils;
-import org.jabref.logic.util.io.FileBasedLock;
 import org.jabref.migrations.ConvertLegacyExplicitGroups;
 import org.jabref.migrations.ConvertMarkingToGroups;
 import org.jabref.migrations.PostOpenMigration;
@@ -44,12 +43,6 @@ public static ParserResult loadDatabase(String name, ImportFormatPreferences imp
         }
 
         try {
-            if (!FileBasedLock.waitForFileLock(file.toPath())) {
-                LOGGER.error(Localization.lang("Error opening file") + " '" + name + "'. "
-                             + "File is locked by another JabRef instance.");
-                return new ParserResult();
-            }
-
             ParserResult pr = OpenDatabase.loadDatabase(file, importFormatPreferences, fileMonitor);
             pr.setFile(file);
             if (pr.hasWarnings()) {
diff --git a/src/main/java/org/jabref/logic/util/io/FileBasedLock.java b/src/main/java/org/jabref/logic/util/io/FileBasedLock.java
deleted file mode 100644
index a271879d184..00000000000
--- a/src/main/java/org/jabref/logic/util/io/FileBasedLock.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.jabref.logic.util.io;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileTime;
-import java.util.Optional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class FileBasedLock {
-    /**
-     * The age in ms of a lock file before JabRef will offer to "steal" the locked file.
-     */
-    public static final long LOCKFILE_CRITICAL_AGE = 60000;
-    private static final Logger LOGGER = LoggerFactory.getLogger(FileBasedLock.class);
-    private static final String LOCKFILE_SUFFIX = ".lock";
-
-    // default retry count for acquiring file lock
-    private static final int AQUIRE_LOCK_RETRY = 10;
-
-    private FileBasedLock() {
-    }
-
-    /**
-     * This method checks whether there is a lock file for the given file. If
-     * there is, it waits for 500 ms. This is repeated until the lock is gone
-     * or we have waited the maximum number of times.
-     *
-     * @param file         The file to check the lock for.
-     * @param maxWaitCount The maximum number of times to wait.
-     * @return true if the lock file is gone, false if it is still there.
-     */
-    private static boolean waitForFileLock(Path file, int maxWaitCount) {
-        // Check if the file is locked by another JabRef user:
-        int lockCheckCount = 0;
-        while (hasLockFile(file)) {
-
-            if (lockCheckCount++ == maxWaitCount) {
-                return false;
-            }
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException ignored) {
-                // Ignored
-            }
-        }
-        return true;
-    }
-
-    public static boolean waitForFileLock(Path file) {
-        return waitForFileLock(file, AQUIRE_LOCK_RETRY);
-    }
-
-    /**
-     * Check whether a lock file exists for this file.
-     *
-     * @param file The file to check.
-     * @return true if a lock file exists, false otherwise.
-     */
-    public static boolean hasLockFile(Path file) {
-        Path lockFile = getLockFilePath(file);
-        return Files.exists(lockFile);
-    }
-
-    /**
-     * Find the lock file's last modified time, if it has a lock file.
-     *
-     * @param file The file to check.
-     * @return the last modified time if lock file exists, empty optional otherwise.
-     */
-    public static Optional<FileTime> getLockFileTimeStamp(Path file) {
-        Path lockFile = getLockFilePath(file);
-        try {
-            return Files.exists(lockFile) ?
-                    Optional.of(Files.readAttributes(lockFile, BasicFileAttributes.class).lastModifiedTime()) :
-                    Optional.empty();
-        } catch (IOException e) {
-            return Optional.empty();
-        }
-    }
-
-    /**
-     * Check if a lock file exists, and delete it if it does.
-     *
-     * @return true if the lock file existed, false otherwise.
-     */
-    public static boolean deleteLockFile(Path file) {
-        Path lockFile = getLockFilePath(file);
-        if (!Files.exists(lockFile)) {
-            return false;
-        }
-        try {
-            Files.delete(lockFile);
-        } catch (IOException e) {
-            LOGGER.warn("Cannot delete lock file", e);
-        }
-        return true;
-    }
-
-    /**
-     * Check if a lock file exists, and create it if it doesn't.
-     *
-     * @return true if the lock file already existed
-     * @throws IOException if something happens during creation.
-     */
-    public static boolean createLockFile(Path file) throws IOException {
-        Path lockFile = getLockFilePath(file);
-        if (Files.exists(lockFile)) {
-            return true;
-        }
-
-        try {
-            Files.write(lockFile, "0".getBytes());
-        } catch (IOException ex) {
-            LOGGER.error("Error when creating lock file.", ex);
-        }
-        lockFile.toFile().deleteOnExit();
-        return false;
-    }
-
-    private static Path getLockFilePath(Path file) {
-        return file.resolveSibling(file.getFileName() + LOCKFILE_SUFFIX);
-    }
-}
diff --git a/src/main/java/org/jabref/logic/util/io/FileHistory.java b/src/main/java/org/jabref/logic/util/io/FileHistory.java
index 387dee3347c..0cb63cd4ca4 100644
--- a/src/main/java/org/jabref/logic/util/io/FileHistory.java
+++ b/src/main/java/org/jabref/logic/util/io/FileHistory.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.util.io;
 
+import java.nio.file.Path;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
@@ -8,11 +10,10 @@ public class FileHistory {
 
     private static final int HISTORY_SIZE = 8;
 
-    private final LinkedList<String> history;
+    private final LinkedList<Path> history;
 
-
-    public FileHistory(List<String> fileList) {
-        history = new LinkedList<>(Objects.requireNonNull(fileList));
+    public FileHistory(List<Path> files) {
+        history = new LinkedList<>(Objects.requireNonNull(files));
     }
 
     public int size() {
@@ -24,28 +25,25 @@ public boolean isEmpty() {
     }
 
     /**
-     * Adds the filename to the top of the list. If it already is in the list, it is merely moved to the top.
-     *
-     * @param filename a <code>String</code> value
+     * Adds the file to the top of the list. If it already is in the list, it is merely moved to the top.
      */
-
-    public void newFile(String filename) {
-        removeItem(filename);
-        history.addFirst(filename);
+    public void newFile(Path file) {
+        removeItem(file);
+        history.addFirst(file);
         while (size() > HISTORY_SIZE) {
             history.removeLast();
         }
     }
 
-    public String getFileName(int i) {
-        return history.get(i);
+    public Path getFileAt(int index) {
+        return history.get(index);
     }
 
-    public void removeItem(String filename) {
-        history.remove(filename);
+    public void removeItem(Path file) {
+        history.remove(file);
     }
 
-    public List<String> getHistory() {
-        return history;
+    public List<Path> getHistory() {
+        return Collections.unmodifiableList(history);
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/io/FileUtil.java b/src/main/java/org/jabref/logic/util/io/FileUtil.java
index 10a28fb45cd..3f17313bff9 100644
--- a/src/main/java/org/jabref/logic/util/io/FileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/FileUtil.java
@@ -97,8 +97,7 @@ public static String getValidFileName(String fileName) {
      * @return the with the modified file name
      */
     public static Path addExtension(Path path, String extension) {
-        Path fileName = path.getFileName();
-        return path.resolveSibling(fileName + extension);
+        return path.resolveSibling(path.getFileName() + extension);
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
index 1f88c5640f5..63b43eb4d45 100644
--- a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
+++ b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
@@ -1,7 +1,7 @@
 package org.jabref.model.metadata;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 
@@ -14,26 +14,18 @@ public class SaveOrderConfig {
 
     private static final String ORIGINAL = "original";
     private static final String SPECIFIED = "specified";
-
-    public boolean saveInOriginalOrder;
-
-    // quick hack for outside modifications
-    public final SortCriterion[] sortCriteria = new SortCriterion[3];
+    private final LinkedList<SortCriterion> sortCriteria = new LinkedList<>();
+    private boolean saveInOriginalOrder;
 
     public SaveOrderConfig() {
-        // fill default values
         setSaveInOriginalOrder();
-        sortCriteria[0] = new SortCriterion();
-        sortCriteria[1] = new SortCriterion();
-        sortCriteria[2] = new SortCriterion();
     }
 
-    public SaveOrderConfig(boolean saveInOriginalOrder, SortCriterion first, SortCriterion second,
-                           SortCriterion third) {
+    public SaveOrderConfig(boolean saveInOriginalOrder, SortCriterion first, SortCriterion second, SortCriterion third) {
         this.saveInOriginalOrder = saveInOriginalOrder;
-        sortCriteria[0] = first;
-        sortCriteria[1] = second;
-        sortCriteria[2] = third;
+        sortCriteria.add(first);
+        sortCriteria.add(second);
+        sortCriteria.add(third);
     }
 
     private SaveOrderConfig(List<String> data) {
@@ -50,72 +42,27 @@ private SaveOrderConfig(List<String> data) {
             setSaveInSpecifiedOrder();
         }
 
-        if (data.size() >= 3) {
-            sortCriteria[0] = new SortCriterion(data.get(1), data.get(2));
-        } else {
-            sortCriteria[0] = new SortCriterion();
-        }
-        if (data.size() >= 5) {
-            sortCriteria[1] = new SortCriterion(data.get(3), data.get(4));
-        } else {
-            sortCriteria[1] = new SortCriterion();
-        }
-        if (data.size() >= 7) {
-            sortCriteria[2] = new SortCriterion(data.get(5), data.get(6));
-        } else {
-            sortCriteria[2] = new SortCriterion();
+        for (int index = 1; index < data.size(); index = index + 2) {
+            sortCriteria.addLast(new SortCriterion(data.get(index), data.get(index + 1)));
         }
     }
+
     public static SaveOrderConfig parse(List<String> orderedData) {
         return new SaveOrderConfig(orderedData);
     }
 
-    public static class SortCriterion {
-
-        public String field;
-
-        public boolean descending;
-
-        public SortCriterion() {
-            this.field = "";
-        }
-
-        public SortCriterion(String field, String descending) {
-            this.field = field;
-            this.descending = Boolean.parseBoolean(descending);
-        }
-
-        public SortCriterion(String field, boolean descending) {
-            this.field = field;
-            this.descending = descending;
-        }
-        @Override
-        public String toString() {
-            final StringBuilder sb = new StringBuilder("SortCriterion{");
-            sb.append("field='").append(field).append('\'');
-            sb.append(", descending=").append(descending);
-            sb.append('}');
-            return sb.toString();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if ((o == null) || (getClass() != o.getClass())) {
-                return false;
-            }
-            SortCriterion that = (SortCriterion) o;
-            return Objects.equals(descending, that.descending) &&
-                    Objects.equals(field, that.field);
-        }
+    public static SaveOrderConfig getDefaultSaveOrder() {
+        SaveOrderConfig standard = new SaveOrderConfig();
+        standard.setSaveInOriginalOrder();
+        return standard;
+    }
 
-        @Override
-        public int hashCode() {
-            return Objects.hash(field, descending);
-        }
+    public boolean saveInOriginalOrder() {
+        return saveInOriginalOrder;
+    }
 
+    public LinkedList<SortCriterion> getSortCriteria() {
+        return sortCriteria;
     }
 
     @Override
@@ -125,26 +72,21 @@ public boolean equals(Object o) {
         }
         if (o instanceof SaveOrderConfig) {
             SaveOrderConfig that = (SaveOrderConfig) o;
-            boolean sortCriteriaEquals = sortCriteria[0].equals(that.sortCriteria[0])
-                    && sortCriteria[1].equals(that.sortCriteria[1]) && sortCriteria[2].equals(that.sortCriteria[2]);
-
-            return Objects.equals(saveInOriginalOrder, that.saveInOriginalOrder) && sortCriteriaEquals;
+            return Objects.equals(sortCriteria, that.sortCriteria) && Objects.equals(saveInOriginalOrder, that.saveInOriginalOrder);
         }
         return false;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(saveInOriginalOrder, Arrays.hashCode(sortCriteria));
+        return Objects.hash(saveInOriginalOrder, sortCriteria);
     }
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("SaveOrderConfig{");
-        sb.append("saveInOriginalOrder=").append(saveInOriginalOrder);
-        sb.append(", sortCriteria=").append(Arrays.toString(sortCriteria));
-        sb.append('}');
-        return sb.toString();
+        return "SaveOrderConfig{" + "saveInOriginalOrder=" + saveInOriginalOrder +
+                ", sortCriteria=" + sortCriteria +
+                '}';
     }
 
     public void setSaveInOriginalOrder() {
@@ -166,20 +108,59 @@ public List<String> getAsStringList() {
             res.add(SPECIFIED);
         }
 
-        res.add(sortCriteria[0].field);
-        res.add(Boolean.toString(sortCriteria[0].descending));
-        res.add(sortCriteria[1].field);
-        res.add(Boolean.toString(sortCriteria[1].descending));
-        res.add(sortCriteria[2].field);
-        res.add(Boolean.toString(sortCriteria[2].descending));
+        for (SortCriterion sortCriterion : sortCriteria) {
+            res.add(sortCriterion.field);
+            res.add(Boolean.toString(sortCriterion.descending));
+        }
 
         return res;
     }
 
-    public static SaveOrderConfig getDefaultSaveOrder() {
-        SaveOrderConfig standard = new SaveOrderConfig();
-        standard.setSaveInOriginalOrder();
-        return standard;
+    public static class SortCriterion {
+
+        public String field;
+
+        public boolean descending;
+
+        public SortCriterion(String field, String descending) {
+            this.field = field;
+            this.descending = Boolean.parseBoolean(descending);
+        }
+
+        public SortCriterion(String field, boolean descending) {
+            this.field = field;
+            this.descending = descending;
+        }
+
+        public SortCriterion() {
+
+        }
+
+        @Override
+        public String toString() {
+            return "SortCriterion{" + "field='" + field + '\'' +
+                    ", descending=" + descending +
+                    '}';
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if ((o == null) || (getClass() != o.getClass())) {
+                return false;
+            }
+            SortCriterion that = (SortCriterion) o;
+            return Objects.equals(descending, that.descending) &&
+                    Objects.equals(field, that.field);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(field, descending);
+        }
+
     }
 
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 2826154551f..c37ddb11e9a 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -1376,12 +1376,12 @@ public void setDefaultEncoding(Charset encoding) {
     }
 
     public FileHistory getFileHistory() {
-        return new FileHistory(getStringList(RECENT_DATABASES));
+        return new FileHistory(getStringList(RECENT_DATABASES).stream().map(Paths::get).collect(Collectors.toList()));
     }
 
     public void storeFileHistory(FileHistory history) {
         if (!history.isEmpty()) {
-            putStringList(RECENT_DATABASES, history.getHistory());
+            putStringList(RECENT_DATABASES, history.getHistory().stream().map(Path::toAbsolutePath).map(Path::toString).collect(Collectors.toList()));
         }
     }
 
@@ -1433,29 +1433,33 @@ public SavePreferences loadForExportFromPreferences() {
                 saveOrder = this.loadTableSaveOrder();
             }
         }
-        Charset encoding = this.getDefaultEncoding();
-        Boolean makeBackup = this.getBoolean(JabRefPreferences.BACKUP);
-        SavePreferences.DatabaseSaveType saveType = SavePreferences.DatabaseSaveType.ALL;
-        Boolean takeMetadataSaveOrderInAccount = false;
-        Boolean reformatFile = this.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT);
-        LatexFieldFormatterPreferences latexFieldFormatterPreferences = this.getLatexFieldFormatterPreferences();
-        GlobalBibtexKeyPattern globalCiteKeyPattern = this.getKeyPattern();
-        return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType,
-                                   takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern);
+        return new SavePreferences(
+                saveInOriginalOrder,
+                saveOrder,
+                this.getDefaultEncoding(),
+                this.getBoolean(JabRefPreferences.BACKUP),
+                SavePreferences.DatabaseSaveType.ALL,
+                false,
+                this.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT),
+                this.getLatexFieldFormatterPreferences(),
+                this.getKeyPattern(),
+                getBoolean(JabRefPreferences.GENERATE_KEYS_BEFORE_SAVING),
+                getBibtexKeyPatternPreferences());
     }
 
     public SavePreferences loadForSaveFromPreferences() {
-        Boolean saveInOriginalOrder = false;
-        SaveOrderConfig saveOrder = null;
-        Charset encoding = this.getDefaultEncoding();
-        Boolean makeBackup = this.getBoolean(JabRefPreferences.BACKUP);
-        SavePreferences.DatabaseSaveType saveType = SavePreferences.DatabaseSaveType.ALL;
-        Boolean takeMetadataSaveOrderInAccount = true;
-        Boolean reformatFile = this.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT);
-        LatexFieldFormatterPreferences latexFieldFormatterPreferences = this.getLatexFieldFormatterPreferences();
-        GlobalBibtexKeyPattern globalCiteKeyPattern = this.getKeyPattern();
-        return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType,
-                                   takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern);
+        return new SavePreferences(
+                false,
+                null,
+                this.getDefaultEncoding(),
+                this.getBoolean(JabRefPreferences.BACKUP),
+                SavePreferences.DatabaseSaveType.ALL,
+                true,
+                this.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT),
+                this.getLatexFieldFormatterPreferences(),
+                this.getKeyPattern(),
+                getBoolean(JabRefPreferences.GENERATE_KEYS_BEFORE_SAVING),
+                getBibtexKeyPatternPreferences());
     }
 
     public ExporterFactory getExporterFactory(JournalAbbreviationLoader abbreviationLoader) {
@@ -1687,47 +1691,35 @@ public void setRemotePreferences(RemotePreferences remotePreferences) {
     }
 
     public void storeExportSaveOrder(SaveOrderConfig config) {
-        putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, config.sortCriteria[0].descending);
-        putBoolean(EXPORT_SECONDARY_SORT_DESCENDING, config.sortCriteria[1].descending);
-        putBoolean(EXPORT_TERTIARY_SORT_DESCENDING, config.sortCriteria[2].descending);
-
-        put(EXPORT_PRIMARY_SORT_FIELD, config.sortCriteria[0].field);
-        put(EXPORT_SECONDARY_SORT_FIELD, config.sortCriteria[1].field);
-        put(EXPORT_TERTIARY_SORT_FIELD, config.sortCriteria[2].field);
-    }
+        putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, config.getSortCriteria().get(0).descending);
+        putBoolean(EXPORT_SECONDARY_SORT_DESCENDING, config.getSortCriteria().get(1).descending);
+        putBoolean(EXPORT_TERTIARY_SORT_DESCENDING, config.getSortCriteria().get(2).descending);
 
-    public SaveOrderConfig loadExportSaveOrder() {
-        SaveOrderConfig config = new SaveOrderConfig();
-        config.sortCriteria[0].field = get(EXPORT_PRIMARY_SORT_FIELD);
-        config.sortCriteria[0].descending = getBoolean(EXPORT_PRIMARY_SORT_DESCENDING);
-        config.sortCriteria[1].field = get(EXPORT_SECONDARY_SORT_FIELD);
-        config.sortCriteria[1].descending = getBoolean(EXPORT_SECONDARY_SORT_DESCENDING);
-        config.sortCriteria[2].field = get(EXPORT_TERTIARY_SORT_FIELD);
-        config.sortCriteria[2].descending = getBoolean(EXPORT_TERTIARY_SORT_DESCENDING);
-
-        return config;
+        put(EXPORT_PRIMARY_SORT_FIELD, config.getSortCriteria().get(0).field);
+        put(EXPORT_SECONDARY_SORT_FIELD, config.getSortCriteria().get(1).field);
+        put(EXPORT_TERTIARY_SORT_FIELD, config.getSortCriteria().get(2).field);
     }
 
     private SaveOrderConfig loadTableSaveOrder() {
         SaveOrderConfig config = new SaveOrderConfig();
         List<String> columns = getStringList(COLUMN_IN_SORT_ORDER);
-        List<Boolean> sortTypes = getStringList(COlUMN_IN_SORT_ORDER_TYPE).stream().map(SortType::valueOf).map(type -> type == SortType.DESCENDING ? true : false).collect(Collectors.toList());
+        List<Boolean> sortTypes = getStringList(COlUMN_IN_SORT_ORDER_TYPE).stream().map(SortType::valueOf).map(type -> type == SortType.DESCENDING).collect(Collectors.toList());
 
-        if (columns.size() >= 1) {
-            config.sortCriteria[0].field = columns.get(0);
-            config.sortCriteria[0].descending = sortTypes.get(0);
-        }
-        if (columns.size() >= 2) {
-            config.sortCriteria[1].field = columns.get(1);
-            config.sortCriteria[1].descending = sortTypes.get(1);
-        }
-        if (columns.size() >= 3) {
-            config.sortCriteria[2].field = columns.get(2);
-            config.sortCriteria[2].descending = sortTypes.get(2);
+        for (int i = 0; i < columns.size(); i++) {
+            config.getSortCriteria().add(new SaveOrderConfig.SortCriterion(columns.get(i), sortTypes.get(i)));
         }
+
         return config;
     }
 
+    public SaveOrderConfig loadExportSaveOrder() {
+        return new SaveOrderConfig(true,
+                new SaveOrderConfig.SortCriterion(get(EXPORT_PRIMARY_SORT_FIELD), getBoolean(EXPORT_PRIMARY_SORT_DESCENDING)),
+                new SaveOrderConfig.SortCriterion(get(EXPORT_SECONDARY_SORT_FIELD), getBoolean(EXPORT_SECONDARY_SORT_DESCENDING)),
+                new SaveOrderConfig.SortCriterion(get(EXPORT_TERTIARY_SORT_FIELD), getBoolean(EXPORT_TERTIARY_SORT_DESCENDING))
+        );
+    }
+
     public Character getKeywordDelimiter() {
         return get(KEYWORD_SEPARATOR).charAt(0);
     }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index b5c30ff8deb..bff30cd317d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -430,13 +430,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=File directory is not set
 
 File\ exists=File exists
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=File has been updated externally. What do you want to do?
-
 File\ not\ found=File not found
 File\ type=File type
-
-File\ updated\ externally=File updated externally
-
 filename=filename
 
 Files\ opened=Files opened
@@ -923,10 +918,6 @@ Save\ library\ as...=Save library as...
 
 Save\ entries\ in\ their\ original\ order=Save entries in their original order
 
-Save\ failed=Save failed
-
-Save\ failed\ during\ backup\ creation=Save failed during backup creation
-
 Saved\ library=Saved library
 
 Saved\ selected\ to\ '%0'.=Saved selected to '%0'.
@@ -947,8 +938,7 @@ Searching\ for\ files=Searching for files
 Secondary\ sort\ criterion=Secondary sort criterion
 
 Select\ all=Select all
-
-Select\ encoding=Select encoding
+Select\ new\ encoding=Select new encoding
 
 Select\ entry\ type=Select entry type
 
@@ -1178,9 +1168,6 @@ Error\ while\ fetching\ from\ %0=Error while fetching from %0
 Show\ search\ results\ in\ a\ window=Show search results in a window
 Show\ global\ search\ results\ in\ a\ window=Show global search results in a window
 Search\ in\ all\ open\ libraries=Search in all open libraries
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=Library is protected. Cannot save until external changes have been reviewed.
-Protected\ library=Protected library
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Refuse to save the library before external changes have been reviewed.
 Library\ protection=Library protection
 Unable\ to\ save\ library=Unable to save library
@@ -1231,9 +1218,6 @@ Formatter\ not\ found\:\ %0=Formatter not found: %0
 Clear\ inputarea=Clear inputarea
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Could not save, file locked by another JabRef instance.
-File\ is\ locked\ by\ another\ JabRef\ instance.=File is locked by another JabRef instance.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Do you want to override the file lock?
-File\ locked=File locked
 Current\ tmp\ value=Current tmp value
 Metadata\ change=Metadata change
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Changes have been made to the following metadata elements
@@ -1242,7 +1226,6 @@ Generate\ groups\ for\ author\ last\ names=Generate groups for author last names
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Generate groups from keywords in a BibTeX field
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Enforce legal characters in BibTeX keys
 
-Save\ without\ backup?=Save without backup?
 Unable\ to\ create\ backup=Unable to create backup
 Move\ file\ to\ file\ directory=Move file to file directory
 Rename\ file\ to=Rename file to
@@ -2168,8 +2151,6 @@ Restore\ from\ backup=Restore from backup
 Continue=Continue
 Generate\ key=Generate key
 Overwrite\ file=Overwrite file
-Overwrite\ file\ lock=Overwrite file lock
-Save\ without\ backup=Save without backup
 Shared\ database\ connection=Shared database connection
 
 Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\ correct\ server\ name.=Could not connect to Vim server. Make sure that Vim is running with correct server name.
diff --git a/src/test/java/org/jabref/gui/AbstractUITest.java b/src/test/java/org/jabref/gui/AbstractUITest.java
index f5982cb4ff1..579729783d2 100644
--- a/src/test/java/org/jabref/gui/AbstractUITest.java
+++ b/src/test/java/org/jabref/gui/AbstractUITest.java
@@ -49,14 +49,9 @@ protected void onSetUp() {
      * The backlashes are replaced with forwardslashes b/c assertJ can't type the former one on windows
      * @param relativePath the relative path to the resource database
      */
-    protected String getAbsolutePath(String relativePath) {
+    protected String getAbsolutePath(String relativePath) throws URISyntaxException {
         final URL resource = this.getClass().getClassLoader().getResource(relativePath);
-        try {
-            return Paths.get(resource.toURI()).toAbsolutePath().toString().replace("\\", "/");
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
-        }
-        return null;
+        return Paths.get(resource.toURI()).toAbsolutePath().toString().replace("\\", "/");
     }
 
     /**
diff --git a/src/test/java/org/jabref/gui/EntryTableTest.java b/src/test/java/org/jabref/gui/EntryTableTest.java
index 61a4cd4ea91..42dd811c1b3 100644
--- a/src/test/java/org/jabref/gui/EntryTableTest.java
+++ b/src/test/java/org/jabref/gui/EntryTableTest.java
@@ -26,7 +26,7 @@ public class EntryTableTest extends AbstractUITest{
     private final static int TITLE_COLUMN_INDEX = 5;
 
     @Test
-    public void scrollThroughEntryList() {
+    public void scrollThroughEntryList() throws Exception {
         String path = getAbsolutePath(TEST_FILE_NAME);
 
         importBibIntoNewDatabase(path);
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
index 71aeae47d96..68a31d6eb54 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
@@ -12,6 +12,8 @@
 import org.jabref.logic.util.OS;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BiblatexEntryTypes;
+import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
 
@@ -85,7 +87,24 @@ public void writeOtherTypeTest() throws Exception {
     }
 
     @Test
-    public void writeReallyunknownTypeTest() throws Exception {
+    void writeEntryWithFile() throws Exception {
+        BibEntry entry = new BibEntry(BiblatexEntryTypes.ARTICLE);
+        LinkedFile file = new LinkedFile("test", "/home/uers/test.pdf", "PDF");
+        entry.addFile(file);
+
+        StringWriter stringWriter = new StringWriter();
+        writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX);
+
+        assertEquals(OS.NEWLINE +
+                "@Article{,"
+                + OS.NEWLINE
+                + "  file = {test:/home/uers/test.pdf:PDF},"
+                + OS.NEWLINE
+                + "}" + OS.NEWLINE, stringWriter.toString());
+    }
+
+    @Test
+    public void writeReallyUnknownTypeTest() throws Exception {
         String expected = OS.NEWLINE + "@Reallyunknowntype{test," + OS.NEWLINE +
                 "  comment = {testentry}," + OS.NEWLINE +
                 "}" + OS.NEWLINE;
diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
index 00a96b5d7fa..1d988120573 100644
--- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -1,7 +1,7 @@
 package org.jabref.logic.exporter;
 
-import java.io.IOException;
 import java.io.StringReader;
+import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
@@ -45,20 +45,27 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-public class BibtexDatabaseWriterTest {
+class BibtexDatabaseWriterTest {
 
-    private BibtexDatabaseWriter<StringSaveSession> databaseWriter;
+    private StringWriter stringWriter;
+    private BibtexDatabaseWriter databaseWriter;
     private BibDatabase database;
     private MetaData metaData;
     private BibDatabaseContext bibtexContext;
     private ImportFormatPreferences importFormatPreferences;
     private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
+    private SavePreferences preferences;
 
     @BeforeEach
-    public void setUp() {
-        // Write to a string instead of to a file
-        databaseWriter = new BibtexDatabaseWriter<>(StringSaveSession::new);
+    void setUp() {
+        stringWriter = new StringWriter();
+        preferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(preferences.getSaveOrder()).thenReturn(new SaveOrderConfig());
+        when(preferences.getEncoding()).thenReturn(null);
+        when(preferences.takeMetadataSaveOrderInAccount()).thenReturn(true);
+        databaseWriter = new BibtexDatabaseWriter(stringWriter, preferences);
 
         database = new BibDatabase();
         metaData = new MetaData();
@@ -67,151 +74,146 @@ public void setUp() {
     }
 
     @Test
-    public void writeWithNullContextThrowsException() throws Exception {
-        assertThrows(NullPointerException.class, () -> databaseWriter.savePartOfDatabase(null, Collections.emptyList(), new SavePreferences()));
+    void writeWithNullContextThrowsException() throws Exception {
+        assertThrows(NullPointerException.class, () -> databaseWriter.savePartOfDatabase(null, Collections.emptyList()));
     }
 
     @Test
-    public void writeWithNullEntriesThrowsException() throws Exception {
-        assertThrows(NullPointerException.class, () -> databaseWriter.savePartOfDatabase(bibtexContext, null, new SavePreferences()));
+    void writeWithNullEntriesThrowsException() throws Exception {
+        assertThrows(NullPointerException.class, () -> databaseWriter.savePartOfDatabase(bibtexContext, null));
     }
 
     @Test
-    public void writeWithNullPreferencesThrowsException() throws Exception {
-        assertThrows(NullPointerException.class, () -> databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), null));
-    }
-
-    @Test
-    public void writeEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
+    void writeEncoding() throws Exception {
+        when(preferences.getEncoding()).thenReturn(StandardCharsets.US_ASCII);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), preferences);
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("% Encoding: US-ASCII" + OS.NEWLINE, session.getStringValue());
+        assertEquals("% Encoding: US-ASCII" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writePreamble() throws Exception {
+    void writePreamble() throws Exception {
         database.setPreamble("Test preamble");
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals(OS.NEWLINE + "@Preamble{Test preamble}" + OS.NEWLINE, session.getStringValue());
+        assertEquals(OS.NEWLINE + "@Preamble{Test preamble}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writePreambleAndEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
+    void writePreambleAndEncoding() throws Exception {
+        when(preferences.getEncoding()).thenReturn(StandardCharsets.US_ASCII);
         database.setPreamble("Test preamble");
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), preferences);
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals("% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE +
-                "@Preamble{Test preamble}" + OS.NEWLINE, session.getStringValue());
+                "@Preamble{Test preamble}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writeEntry() throws Exception {
+    void writeEntry() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setType(BibtexEntryTypes.ARTICLE);
         database.insertEntry(entry);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
         assertEquals(OS.NEWLINE +
                 "@Article{," + OS.NEWLINE + "}" + OS.NEWLINE + OS.NEWLINE
                 + "@Comment{jabref-meta: databaseType:bibtex;}"
-                + OS.NEWLINE, session.getStringValue());
+                + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writeEncodingAndEntry() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
+    void writeEncodingAndEntry() throws Exception {
+        when(preferences.getEncoding()).thenReturn(StandardCharsets.US_ASCII);
         BibEntry entry = new BibEntry();
         entry.setType(BibtexEntryTypes.ARTICLE);
         database.insertEntry(entry);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry), preferences);
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
         assertEquals("% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE +
                 "@Article{," + OS.NEWLINE + "}"
                 + OS.NEWLINE + OS.NEWLINE
                 + "@Comment{jabref-meta: databaseType:bibtex;}"
-                + OS.NEWLINE, session.getStringValue());
+                + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writeEpilogue() throws Exception {
+    void writeEpilogue() throws Exception {
         database.setEpilog("Test epilog");
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals(OS.NEWLINE + "Test epilog" + OS.NEWLINE, session.getStringValue());
+        assertEquals(OS.NEWLINE + "Test epilog" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writeEpilogueAndEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
+    void writeEpilogueAndEncoding() throws Exception {
+        when(preferences.getEncoding()).thenReturn(StandardCharsets.US_ASCII);
         database.setEpilog("Test epilog");
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), preferences);
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals("% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE +
-                "Test epilog" + OS.NEWLINE, session.getStringValue());
+                "Test epilog" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writeMetadata() throws Exception {
+    void writeMetadata() throws Exception {
         DatabaseBibtexKeyPattern bibtexKeyPattern = new DatabaseBibtexKeyPattern(mock(GlobalBibtexKeyPattern.class));
         bibtexKeyPattern.setDefaultValue("test");
         metaData.setCiteKeyPattern(bibtexKeyPattern);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(OS.NEWLINE + "@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE,
-                session.getStringValue());
+                stringWriter.toString());
     }
 
     @Test
-    public void writeMetadataAndEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
+    void writeMetadataAndEncoding() throws Exception {
+        when(preferences.getEncoding()).thenReturn(StandardCharsets.US_ASCII);
         DatabaseBibtexKeyPattern bibtexKeyPattern = new DatabaseBibtexKeyPattern(mock(GlobalBibtexKeyPattern.class));
         bibtexKeyPattern.setDefaultValue("test");
         metaData.setCiteKeyPattern(bibtexKeyPattern);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), preferences);
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals("% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE
                 +
-                "@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE, session.getStringValue());
+                "@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writeGroups() throws Exception {
+    void writeGroups() throws Exception {
         GroupTreeNode groupRoot = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
         groupRoot.addSubgroup(new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ','));
         metaData.setGroups(groupRoot);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         // @formatter:off
         assertEquals(OS.NEWLINE
                 + "@Comment{jabref-meta: grouping:" + OS.NEWLINE
                 + "0 AllEntriesGroup:;" + OS.NEWLINE
                 + "1 StaticGroup:test\\;2\\;1\\;\\;\\;\\;;" + OS.NEWLINE
-                + "}" + OS.NEWLINE, session.getStringValue());
+                + "}" + OS.NEWLINE, stringWriter.toString());
         // @formatter:on
     }
 
     @Test
-    public void writeGroupsAndEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
+    void writeGroupsAndEncoding() throws Exception {
+        when(preferences.getEncoding()).thenReturn(StandardCharsets.US_ASCII);
 
         GroupTreeNode groupRoot = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
         groupRoot.addChild(GroupTreeNode.fromGroup(new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ',')));
         metaData.setGroups(groupRoot);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), preferences);
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         // @formatter:off
         assertEquals(
@@ -220,39 +222,39 @@ public void writeGroupsAndEncoding() throws Exception {
                         + "@Comment{jabref-meta: grouping:" + OS.NEWLINE
                 + "0 AllEntriesGroup:;" + OS.NEWLINE
                         + "1 StaticGroup:test\\;2\\;1\\;\\;\\;\\;;" + OS.NEWLINE
-                + "}" + OS.NEWLINE, session.getStringValue());
+                        + "}" + OS.NEWLINE, stringWriter.toString());
         // @formatter:on
     }
 
     @Test
-    public void writeString() throws Exception {
+    void writeString() throws Exception {
         database.addString(new BibtexString("name", "content"));
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals(OS.NEWLINE + "@String{name = {content}}" + OS.NEWLINE, session.getStringValue());
+        assertEquals(OS.NEWLINE + "@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writeStringAndEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
+    void writeStringAndEncoding() throws Exception {
+        when(preferences.getEncoding()).thenReturn(StandardCharsets.US_ASCII);
         database.addString(new BibtexString("name", "content"));
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), preferences);
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals("% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE +
-                "@String{name = {content}}" + OS.NEWLINE, session.getStringValue());
+                "@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration() throws Exception {
+    void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration() throws Exception {
         try {
             EntryTypes.addOrModifyCustomEntryType(new CustomEntryType("customizedType", "required", "optional"), BibDatabaseMode.BIBTEX);
             BibEntry entry = new BibEntry();
             entry.setType("customizedType");
             database.insertEntry(entry);
 
-            StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry), new SavePreferences());
+            databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
             assertEquals(
                     OS.NEWLINE +
@@ -260,46 +262,48 @@ public void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration() throws Excep
                             + "@Comment{jabref-meta: databaseType:bibtex;}"
                             + OS.NEWLINE + OS.NEWLINE
                             + "@Comment{jabref-entrytype: Customizedtype: req[required] opt[optional]}" + OS.NEWLINE,
-                    session.getStringValue());
+                    stringWriter.toString());
         } finally {
             EntryTypes.removeAllCustomEntryTypes();
         }
     }
 
     @Test
-    public void roundtrip() throws Exception {
+    void roundtrip() throws Exception {
         Path testBibtexFile = Paths.get("src/test/resources/testbib/complex.bib");
         Charset encoding = StandardCharsets.UTF_8;
         ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile, encoding));
 
-        SavePreferences preferences = new SavePreferences().withEncoding(encoding).withSaveInOriginalOrder(true);
+        when(preferences.getEncoding()).thenReturn(encoding);
+        when(preferences.isSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData(),
                 new Defaults(BibDatabaseMode.BIBTEX));
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries(), preferences);
-        try (Scanner scanner = new Scanner(testBibtexFile,encoding.name())) {
-            assertEquals(scanner.useDelimiter("\\A").next(), session.getStringValue());
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
+        try (Scanner scanner = new Scanner(testBibtexFile, encoding.name())) {
+            assertEquals(scanner.useDelimiter("\\A").next(), stringWriter.toString());
         }
     }
 
     @Test
-    public void roundtripWithUserComment() throws Exception {
+    void roundtripWithUserComment() throws Exception {
         Path testBibtexFile = Paths.get("src/test/resources/testbib/bibWithUserComments.bib");
         Charset encoding = StandardCharsets.UTF_8;
         ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile, encoding));
 
-        SavePreferences preferences = new SavePreferences().withEncoding(encoding).withSaveInOriginalOrder(true);
+        when(preferences.getEncoding()).thenReturn(encoding);
+        when(preferences.isSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData(),
                 new Defaults(BibDatabaseMode.BIBTEX));
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries(), preferences);
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
         try (Scanner scanner = new Scanner(testBibtexFile,encoding.name())) {
-            assertEquals(scanner.useDelimiter("\\A").next(), session.getStringValue());
+            assertEquals(scanner.useDelimiter("\\A").next(), stringWriter.toString());
         }
     }
 
     @Test
-    public void roundtripWithUserCommentAndEntryChange() throws Exception {
+    void roundtripWithUserCommentAndEntryChange() throws Exception {
         Path testBibtexFile = Paths.get("src/test/resources/testbib/bibWithUserComments.bib");
         Charset encoding = StandardCharsets.UTF_8;
         ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile, encoding));
@@ -307,19 +311,20 @@ public void roundtripWithUserCommentAndEntryChange() throws Exception {
         BibEntry entry = result.getDatabase().getEntryByKey("1137631").get();
         entry.setField("author", "Mr. Author");
 
-        SavePreferences preferences = new SavePreferences().withEncoding(encoding).withSaveInOriginalOrder(true);
+        when(preferences.getEncoding()).thenReturn(encoding);
+        when(preferences.isSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData(),
                 new Defaults(BibDatabaseMode.BIBTEX));
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries(), preferences);
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
 
-        try (Scanner scanner = new Scanner(Paths.get("src/test/resources/testbib/bibWithUserCommentAndEntryChange.bib"),encoding.name())) {
-            assertEquals(scanner.useDelimiter("\\A").next(), session.getStringValue());
+        try (Scanner scanner = new Scanner(Paths.get("src/test/resources/testbib/bibWithUserCommentAndEntryChange.bib"), encoding.name())) {
+            assertEquals(scanner.useDelimiter("\\A").next(), stringWriter.toString());
         }
     }
 
     @Test
-    public void roundtripWithUserCommentBeforeStringAndChange() throws Exception {
+    void roundtripWithUserCommentBeforeStringAndChange() throws Exception {
         Path testBibtexFile = Paths.get("src/test/resources/testbib/complex.bib");
         Charset encoding = StandardCharsets.UTF_8;
         ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile, encoding));
@@ -329,35 +334,37 @@ public void roundtripWithUserCommentBeforeStringAndChange() throws Exception {
             string.setContent(string.getContent());
         }
 
-        SavePreferences preferences = new SavePreferences().withEncoding(encoding).withSaveInOriginalOrder(true);
+        when(preferences.getEncoding()).thenReturn(encoding);
+        when(preferences.isSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData(),
                 new Defaults(BibDatabaseMode.BIBTEX));
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries(), preferences);
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
 
         try (Scanner scanner = new Scanner(testBibtexFile,encoding.name())) {
-            assertEquals(scanner.useDelimiter("\\A").next(), session.getStringValue());
+            assertEquals(scanner.useDelimiter("\\A").next(), stringWriter.toString());
         }
     }
 
     @Test
-    public void roundtripWithUnknownMetaData() throws Exception {
+    void roundtripWithUnknownMetaData() throws Exception {
         Path testBibtexFile = Paths.get("src/test/resources/testbib/unknownMetaData.bib");
         Charset encoding = StandardCharsets.UTF_8;
         ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile, encoding));
 
-        SavePreferences preferences = new SavePreferences().withEncoding(encoding).withSaveInOriginalOrder(true);
+        when(preferences.getEncoding()).thenReturn(encoding);
+        when(preferences.isSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData(),
                 new Defaults(BibDatabaseMode.BIBTEX));
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries(), preferences);
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
         try (Scanner scanner = new Scanner(testBibtexFile,encoding.name())) {
-            assertEquals(scanner.useDelimiter("\\A").next(), session.getStringValue());
+            assertEquals(scanner.useDelimiter("\\A").next(), stringWriter.toString());
         }
     }
 
     @Test
-    public void writeSavedSerializationOfEntryIfUnchanged() throws Exception {
+    void writeSavedSerializationOfEntryIfUnchanged() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setType(BibtexEntryTypes.ARTICLE);
         entry.setField("author", "Mr. author");
@@ -365,14 +372,14 @@ public void writeSavedSerializationOfEntryIfUnchanged() throws Exception {
         entry.setChanged(false);
         database.insertEntry(entry);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
         assertEquals("presaved serialization" + OS.NEWLINE + "@Comment{jabref-meta: databaseType:bibtex;}"
-                + OS.NEWLINE, session.getStringValue());
+                + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void reformatEntryIfAskedToDoSo() throws Exception {
+    void reformatEntryIfAskedToDoSo() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setType(BibtexEntryTypes.ARTICLE);
         entry.setField("author", "Mr. author");
@@ -380,116 +387,117 @@ public void reformatEntryIfAskedToDoSo() throws Exception {
         entry.setChanged(false);
         database.insertEntry(entry);
 
-        SavePreferences preferences = new SavePreferences().withReformatFile(true);
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry), preferences);
+        when(preferences.isReformatFile()).thenReturn(true);
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
         assertEquals(OS.NEWLINE +
                         "@Article{," + OS.NEWLINE + "  author = {Mr. author}," + OS.NEWLINE + "}"
                         + OS.NEWLINE + OS.NEWLINE
                         + "@Comment{jabref-meta: databaseType:bibtex;}"
                         + OS.NEWLINE,
-                session.getStringValue());
+                stringWriter.toString());
     }
 
     @Test
-    public void writeSavedSerializationOfStringIfUnchanged() throws Exception {
+    void writeSavedSerializationOfStringIfUnchanged() throws Exception {
         BibtexString string = new BibtexString("name", "content");
         string.setParsedSerialization("serialization");
         database.addString(string);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("serialization", session.getStringValue());
+        assertEquals("serialization", stringWriter.toString());
     }
 
     @Test
-    public void reformatStringIfAskedToDoSo() throws Exception {
+    void reformatStringIfAskedToDoSo() throws Exception {
         BibtexString string = new BibtexString("name", "content");
         string.setParsedSerialization("wrong serialization");
         database.addString(string);
 
-        SavePreferences preferences = new SavePreferences().withReformatFile(true);
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), preferences);
+        when(preferences.isReformatFile()).thenReturn(true);
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals(OS.NEWLINE + "@String{name = {content}}" + OS.NEWLINE, session.getStringValue());
+        assertEquals(OS.NEWLINE + "@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
 
     }
 
     @Test
-    public void writeSaveActions() throws Exception {
+    void writeSaveActions() throws Exception {
         FieldFormatterCleanups saveActions = new FieldFormatterCleanups(true,
                 Collections.singletonList(new FieldFormatterCleanup("title", new LowerCaseFormatter())));
         metaData.setSaveActions(saveActions);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(OS.NEWLINE + "@Comment{jabref-meta: saveActions:enabled;" + OS.NEWLINE
-                + "title[lower_case]" + OS.NEWLINE + ";}" + OS.NEWLINE, session.getStringValue());
+                + "title[lower_case]" + OS.NEWLINE + ";}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writeSaveOrderConfig() throws Exception {
+    void writeSaveOrderConfig() throws Exception {
         SaveOrderConfig saveOrderConfig = new SaveOrderConfig(false, new SaveOrderConfig.SortCriterion("author", false),
                 new SaveOrderConfig.SortCriterion("year", true),
                 new SaveOrderConfig.SortCriterion("abstract", false));
         metaData.setSaveOrderConfig(saveOrderConfig);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(OS.NEWLINE
                 + "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}"
-                + OS.NEWLINE, session.getStringValue());
+                + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writeCustomKeyPattern() throws Exception {
+    void writeCustomKeyPattern() throws Exception {
         AbstractBibtexKeyPattern pattern = new DatabaseBibtexKeyPattern(mock(GlobalBibtexKeyPattern.class));
         pattern.setDefaultValue("test");
         pattern.addBibtexKeyPattern("article", "articleTest");
         metaData.setCiteKeyPattern(pattern);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(OS.NEWLINE + "@Comment{jabref-meta: keypattern_article:articleTest;}" + OS.NEWLINE
                         + OS.NEWLINE + "@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE,
-                session.getStringValue());
+                stringWriter.toString());
     }
 
     @Test
-    public void writeBiblatexMode() throws Exception {
+    void writeBiblatexMode() throws Exception {
         metaData.setMode(BibDatabaseMode.BIBLATEX);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(OS.NEWLINE + "@Comment{jabref-meta: databaseType:biblatex;}" + OS.NEWLINE,
-                session.getStringValue());
+                stringWriter.toString());
     }
 
     @Test
-    public void writeProtectedFlag() throws Exception {
+    void writeProtectedFlag() throws Exception {
         metaData.markAsProtected();
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(OS.NEWLINE + "@Comment{jabref-meta: protectedFlag:true;}" + OS.NEWLINE,
-                session.getStringValue());
+                stringWriter.toString());
     }
 
     @Test
-    public void writeFileDirectories() throws Exception {
+    void writeFileDirectories() throws Exception {
         metaData.setDefaultFileDirectory("\\Literature\\");
         metaData.setUserFileDirectory("defaultOwner-user", "D:\\Documents");
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(OS.NEWLINE + "@Comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}" + OS.NEWLINE +
                 OS.NEWLINE + "@Comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"
-                + OS.NEWLINE, session.getStringValue());
+                + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    public void writeEntriesSorted() throws Exception {
-        SaveOrderConfig saveOrderConfig = new SaveOrderConfig(false, new SaveOrderConfig.SortCriterion("author", false),
+    void writeEntriesSorted() throws Exception {
+        SaveOrderConfig saveOrderConfig = new SaveOrderConfig(false,
+                new SaveOrderConfig.SortCriterion("author", false),
                 new SaveOrderConfig.SortCriterion("year", true),
                 new SaveOrderConfig.SortCriterion("abstract", false));
         metaData.setSaveOrderConfig(saveOrderConfig);
@@ -497,12 +505,12 @@ public void writeEntriesSorted() throws Exception {
         BibEntry firstEntry = new BibEntry();
         firstEntry.setType(BibtexEntryTypes.ARTICLE);
         firstEntry.setField("author", "A");
-        firstEntry.setField("year", "2000");
+        firstEntry.setField("year", "2010");
 
         BibEntry secondEntry = new BibEntry();
         secondEntry.setType(BibtexEntryTypes.ARTICLE);
         secondEntry.setField("author", "A");
-        secondEntry.setField("year", "2010");
+        secondEntry.setField("year", "2000");
 
         BibEntry thirdEntry = new BibEntry();
         thirdEntry.setType(BibtexEntryTypes.ARTICLE);
@@ -513,17 +521,17 @@ public void writeEntriesSorted() throws Exception {
         database.insertEntry(thirdEntry);
         database.insertEntry(firstEntry);
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, database.getEntries(), new SavePreferences());
+        databaseWriter.savePartOfDatabase(bibtexContext, database.getEntries());
 
         assertEquals(
                 OS.NEWLINE +
                 "@Article{," + OS.NEWLINE +
                 "  author = {A}," + OS.NEWLINE +
-                "  year   = {2000}," + OS.NEWLINE +
+                        "  year   = {2010}," + OS.NEWLINE +
                 "}"  + OS.NEWLINE + OS.NEWLINE +
                 "@Article{," + OS.NEWLINE +
                 "  author = {A}," + OS.NEWLINE +
-                "  year   = {2010}," + OS.NEWLINE +
+                        "  year   = {2000}," + OS.NEWLINE +
                 "}" + OS.NEWLINE + OS.NEWLINE +
                 "@Article{," + OS.NEWLINE +
                 "  author = {B}," + OS.NEWLINE +
@@ -532,12 +540,12 @@ public void writeEntriesSorted() throws Exception {
                 "@Comment{jabref-meta: databaseType:bibtex;}"
                  + OS.NEWLINE + OS.NEWLINE +
                 "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}" +
-                OS.NEWLINE
-                , session.getStringValue());
+                        OS.NEWLINE,
+                stringWriter.toString());
     }
 
     @Test
-    public void writeEntriesInOriginalOrderWhenNoSaveOrderConfigIsSetInMetadata() throws Exception {
+    void writeEntriesInOriginalOrderWhenNoSaveOrderConfigIsSetInMetadata() throws Exception {
         BibEntry firstEntry = new BibEntry();
         firstEntry.setType(BibtexEntryTypes.ARTICLE);
         firstEntry.setField("author", "A");
@@ -557,8 +565,8 @@ public void writeEntriesInOriginalOrderWhenNoSaveOrderConfigIsSetInMetadata() th
         database.insertEntry(secondEntry);
         database.insertEntry(thirdEntry);
 
-        SavePreferences preferences = new SavePreferences().withSaveInOriginalOrder(false);
-        StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, database.getEntries(), preferences);
+        when(preferences.isSaveInOriginalOrder()).thenReturn(false);
+        databaseWriter.savePartOfDatabase(bibtexContext, database.getEntries());
 
         assertEquals(
                 OS.NEWLINE +
@@ -577,23 +585,23 @@ public void writeEntriesInOriginalOrderWhenNoSaveOrderConfigIsSetInMetadata() th
                         + OS.NEWLINE + OS.NEWLINE +
                         "@Comment{jabref-meta: databaseType:bibtex;}"
                         + OS.NEWLINE
-                , session.getStringValue());
+                , stringWriter.toString());
     }
 
     @Test
-    public void roundtripWithContentSelectorsAndUmlauts() throws IOException, SaveException {
+    void roundtripWithContentSelectorsAndUmlauts() throws Exception {
         String fileContent = "% Encoding: UTF-8" + OS.NEWLINE + OS.NEWLINE + "@Comment{jabref-meta: selector_journal:Test {\\\\\"U}mlaut;}" + OS.NEWLINE;
         Charset encoding = StandardCharsets.UTF_8;
 
         ParserResult firstParse = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(fileContent));
 
-        SavePreferences preferences = new SavePreferences().withEncoding(encoding).withSaveInOriginalOrder(true);
+        when(preferences.getEncoding()).thenReturn(encoding);
+        when(preferences.isSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData(),
                 new Defaults(BibDatabaseMode.BIBTEX));
 
-        StringSaveSession session = databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries(), preferences);
+        databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
-        assertEquals(fileContent, session.getStringValue());
+        assertEquals(fileContent, stringWriter.toString());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index 10cb4a4d7bb..0da7422a378 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -52,9 +52,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- * Test the BibtexParser
- */
 class BibtexParserTest {
 
     private ImportFormatPreferences importFormatPreferences;
@@ -1450,7 +1447,7 @@ void parseOtherTypeTest() throws Exception {
     void parseRecognizesDatabaseID() throws Exception {
         String expectedDatabaseID = "q1w2e3r4t5z6";
         StringBuilder sharedDatabaseFileContent = new StringBuilder()
-                .append("% DBID: ").append(expectedDatabaseID)
+                .append("\\% DBID: ").append(expectedDatabaseID)
                 .append(OS.NEWLINE)
                 .append("@Article{a}");
 
@@ -1463,8 +1460,8 @@ void parseRecognizesDatabaseID() throws Exception {
     @Test
     void parseDoesNotRecognizeDatabaseIDasUserComment() throws Exception {
         StringBuilder sharedDatabaseFileContent = new StringBuilder()
-                .append("% Encoding: UTF-8").append(OS.NEWLINE)
-                .append("% DBID: q1w2e3r4t5z6").append(OS.NEWLINE)
+                .append("\\% Encoding: UTF-8").append(OS.NEWLINE)
+                .append("\\% DBID: q1w2e3r4t5z6").append(OS.NEWLINE)
                 .append("@Article{a}");
 
         ParserResult parserResult = parser.parse(new StringReader(sharedDatabaseFileContent.toString()));
diff --git a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
index c099ace2c7c..72df4f9301e 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
@@ -2,7 +2,13 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
@@ -24,19 +30,14 @@
 @DatabaseTest
 class DBMSProcessorTest {
 
-    private static Stream<Object[]> getTestingDatabaseSystems() {
-        Stream<DBMSType> dbmsTypeStream = TestManager.getDBMSTypeTestParameter().stream();
+    private static Stream<Object[]> getTestingDatabaseSystems() throws InvalidDBMSConnectionPropertiesException, SQLException {
         Collection<Object[]> result = new ArrayList<>();
-        dbmsTypeStream.forEach(dbmsType -> {
-            try {
+        for (DBMSType dbmsType : TestManager.getDBMSTypeTestParameter()) {
                 result.add(new Object[] {
                         dbmsType,
                         TestConnector.getTestDBMSConnection(dbmsType),
                         DBMSProcessor.getProcessorInstance(TestConnector.getTestDBMSConnection(dbmsType))});
-            } catch (SQLException | InvalidDBMSConnectionPropertiesException e) {
-                e.printStackTrace();
-            }
-        });
+        }
         return result.stream();
     }
 
diff --git a/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java b/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java
index 715e461dee9..af895b2bcfc 100644
--- a/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java
@@ -1,52 +1,45 @@
 package org.jabref.logic.util.io;
 
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class FileHistoryTest {
+class FileHistoryTest {
+    private FileHistory history;
+
+    @BeforeEach
+    void setUp() {
+        history = new FileHistory(new ArrayList<>());
+    }
+
+    @Test
+    void newItemsAreAddedInRightOrder() {
+        history.newFile(Paths.get("aa"));
+        history.newFile(Paths.get("bb"));
+        assertEquals(Arrays.asList(Paths.get("bb"), Paths.get("aa")), history.getHistory());
+    }
 
     @Test
-    public void testFileHistory() {
-        FileHistory fh = new FileHistory(new ArrayList<>());
-
-        fh.newFile("aa");
-        assertEquals("aa", fh.getFileName(0));
-        fh.newFile("bb");
-        assertEquals("bb", fh.getFileName(0));
-
-        fh.newFile("aa");
-        assertEquals("aa", fh.getFileName(0));
-
-        fh.newFile("cc");
-        assertEquals("cc", fh.getFileName(0));
-        assertEquals("aa", fh.getFileName(1));
-        assertEquals("bb", fh.getFileName(2));
-
-        fh.newFile("dd");
-        assertEquals("dd", fh.getFileName(0));
-        assertEquals("cc", fh.getFileName(1));
-        assertEquals("aa", fh.getFileName(2));
-        fh.newFile("ee");
-        fh.newFile("ff");
-        fh.newFile("gg");
-        fh.newFile("hh");
-        assertEquals("bb", fh.getFileName(7));
-        assertEquals(8, fh.size());
-        fh.newFile("ii");
-        assertEquals("aa", fh.getFileName(7));
-        fh.removeItem("ff");
-        assertEquals(7, fh.size());
-        fh.removeItem("ee");
-        fh.removeItem("dd");
-        fh.removeItem("cc");
-        fh.removeItem("cc");
-        fh.removeItem("aa");
-
-        assertEquals(Arrays.asList("ii", "hh", "gg"), fh.getHistory());
+    void itemsAlreadyInListIsMovedToTop() {
+        history.newFile(Paths.get("aa"));
+        history.newFile(Paths.get("bb"));
+        history.newFile(Paths.get("aa"));
+        assertEquals(Arrays.asList(Paths.get("aa"), Paths.get("bb")), history.getHistory());
     }
 
+    @Test
+    void removeItemsLeavesOtherItemsInRightOrder() {
+        history.newFile(Paths.get("aa"));
+        history.newFile(Paths.get("bb"));
+        history.newFile(Paths.get("cc"));
+
+        history.removeItem(Paths.get("bb"));
+
+        assertEquals(Arrays.asList(Paths.get("cc"), Paths.get("aa")), history.getHistory());
+    }
 }
diff --git a/src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java b/src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java
deleted file mode 100644
index c6505dc437d..00000000000
--- a/src/test/java/org/jabref/model/entry/FileFieldBibEntryTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.jabref.model.entry;
-
-import org.jabref.logic.exporter.BibtexDatabaseWriter;
-import org.jabref.logic.exporter.SaveException;
-import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.exporter.StringSaveSession;
-import org.jabref.logic.util.OS;
-import org.jabref.model.Defaults;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.metadata.MetaData;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class FileFieldBibEntryTest {
-
-    private BibEntry emptyEntry;
-
-    @BeforeEach
-    public void setUp() {
-        emptyEntry = new BibEntry();
-        emptyEntry.setType("article");
-        emptyEntry.setChanged(false);
-    }
-
-    @Test
-    public void testFileFieldSerialization() {
-        LinkedFile file = new LinkedFile("test", "/home/uers/test.pdf", "PDF");
-        emptyEntry.addFile(file);
-
-        assertEquals("@article{,\n" +
-                "  file = {test:/home/uers/test.pdf:PDF}\n" +
-                "}", emptyEntry.toString());
-    }
-
-    @Test
-    public void testFileFieldSerializationDatabase() throws SaveException {
-        BibDatabase database = new BibDatabase();
-
-        LinkedFile file = new LinkedFile("test", "/home/uers/test.pdf", "PDF");
-        emptyEntry.addFile(file);
-        database.insertEntries(emptyEntry);
-
-        BibtexDatabaseWriter<StringSaveSession> databaseWriter = new BibtexDatabaseWriter<>(StringSaveSession::new);
-        StringSaveSession saveSession = databaseWriter.savePartOfDatabase(
-                new BibDatabaseContext(database, new MetaData(), new Defaults()), database.getEntries(),
-                new SavePreferences());
-
-        assertEquals(OS.NEWLINE +
-                "@Article{,"
-                + OS.NEWLINE
-                + "  file = {test:/home/uers/test.pdf:PDF},"
-                + OS.NEWLINE
-                + "}" + OS.NEWLINE
-                + OS.NEWLINE
-                + "@Comment{jabref-meta: databaseType:bibtex;}" + OS.NEWLINE, saveSession.getStringValue());
-    }
-}

From cad925494d19ac067aeb23704d5f161fc4dfc339 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 18 Sep 2018 10:20:42 +0200
Subject: [PATCH 095/229] Fix freezes in entry editor (#4351)

Fixes https://github.com/JabRef/jabref/issues/4323 and probably fixes https://github.com/JabRef/jabref/issues/4294 as well.
The reason for the freezes were the pull-request https://bitbucket.org/controlsfx/controlsfx/pull-requests/710. These changes mess up the layout for some reason. The fix is to inject a DecorationPane ourselves directly from the beginning. Although this fix started as a workaround for this bug in controlsfx, I think, we should keep it permanently for performance reasons.
---
 src/main/java/org/jabref/JabRefGUI.java                   | 8 +++++++-
 .../java/org/jabref/gui/fieldeditors/PersonsEditor.java   | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
index b8669181f8e..ac996a79899 100644
--- a/src/main/java/org/jabref/JabRefGUI.java
+++ b/src/main/java/org/jabref/JabRefGUI.java
@@ -29,6 +29,7 @@
 import org.jabref.model.database.shared.DatabaseNotSupportedException;
 import org.jabref.preferences.JabRefPreferences;
 
+import impl.org.controlsfx.skin.DecorationPane;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -143,7 +144,12 @@ private void openWindow(Stage mainStage) {
             mainStage.setHeight(Globals.prefs.getDouble(JabRefPreferences.SIZE_Y));
         }
 
-        Scene scene = new Scene(JabRefGUI.mainFrame, 800, 800);
+        // We create a decoration pane ourselves for performance reasons
+        // (otherwise it has to be injected later, leading to a complete redraw/relayout of the complete scene)
+        DecorationPane root = new DecorationPane();
+        root.getChildren().add(JabRefGUI.mainFrame);
+
+        Scene scene = new Scene(root, 800, 800);
         Globals.getThemeLoader().installBaseCss(scene, Globals.prefs);
         mainStage.setTitle(JabRefFrame.FRAME_TITLE);
         mainStage.getIcons().addAll(IconTheme.getLogoSetFX());
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
index 44f3cebc292..684d5a85dec 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
@@ -3,7 +3,6 @@
 import javafx.scene.Parent;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
 
 import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
@@ -27,7 +26,7 @@ public PersonsEditor(final String fieldName,
         textInput = isSingleLine
                 ? new EditorTextField()
                 : new EditorTextArea();
-        HBox.setHgrow(textInput, Priority.ALWAYS);
+
         textInput.textProperty().bindBidirectional(viewModel.textProperty());
         ((ContextMenuAddable) textInput).addToContextMenu(EditorMenus.getNameMenu(textInput));
         this.getChildren().add(textInput);

From d8f6c5cecb61a6f3b64be5db98b143978e41c9bd Mon Sep 17 00:00:00 2001
From: Songyu-Wang <36670132+Songyu-Wang@users.noreply.github.com>
Date: Wed, 19 Sep 2018 00:55:02 -0700
Subject: [PATCH 096/229] Auto trim url field (#4355)

* add url field auto trim whitespace feature

* add test, edit JabRef_en file and update change log

* update tests name

* fix ci error
---
 CHANGELOG.md                                  |  1 +
 .../jabref/gui/fieldeditors/UrlEditor.java    |  3 +-
 .../fieldeditors/contextmenu/EditorMenus.java |  2 +-
 .../bibtexfields/TrimWhitespaceFormatter.java | 38 ++++++++++++
 src/main/resources/l10n/JabRef_en.properties  |  5 ++
 .../TrimWhitespaceFormatterTest.java          | 61 +++++++++++++++++++
 6 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
 create mode 100644 src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 378d1f3f998..0d3501585a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ## [Unreleased]
 
 ### Changed
+- URL field formatting is updated. All whitespace chars, located at the beginning/ending of the url, are trimmed automatically
 - We changed the behavior of the field formatting dialog such that the `bibtexkey` is not changed when formatting all fields or all text fields.
 - We added a "Move file to file directory and rename file" option for simultaneously moving and renaming of document file. [#4166](https://github.com/JabRef/jabref/issues/4166)
 - Use integrated graphics card instead of discrete on macOS [#4070](https://github.com/JabRef/jabref/issues/4070)
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
index f004099dd00..85f460c2e44 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
@@ -13,6 +13,7 @@
 import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.fieldeditors.contextmenu.EditorMenus;
 import org.jabref.logic.formatter.bibtexfields.CleanupURLFormatter;
+import org.jabref.logic.formatter.bibtexfields.TrimWhitespaceFormatter;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
@@ -37,7 +38,7 @@ public UrlEditor(String fieldName, DialogService dialogService, AutoCompleteSugg
 
         // init paste handler for URLEditor to format pasted url link in textArea
         textArea.setPasteActionHandler(()->
-        textArea.setText(new CleanupURLFormatter().format(textArea.getText())));
+        textArea.setText(new CleanupURLFormatter().format(new TrimWhitespaceFormatter().format(textArea.getText()))));
 
 
         new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
index 8068b8a3f4a..575403025f0 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
@@ -87,7 +87,7 @@ public static Supplier<List<MenuItem>> getDOIMenu(TextArea textArea) {
     }
 
     /**
-     * The default context menu with a specific menu item to cleanup  URL.
+     * The default context menu with a specific menu item to cleanup URL.
      *
      * @param textArea text-area that this menu will be connected to
      * @return menu containing items of the default menu and an item to cleanup a URL
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
new file mode 100644
index 00000000000..6fefcb15b40
--- /dev/null
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
@@ -0,0 +1,38 @@
+package org.jabref.logic.formatter.bibtexfields;
+
+import java.util.Objects;
+
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.cleanup.Formatter;
+
+/**
+ * Trim all whitespace characters(defined in java) in the string.
+ */
+public class TrimWhitespaceFormatter extends Formatter {
+
+    @Override
+    public String getName() {
+        return Localization.lang("Trim whitespace characters");
+    }
+
+    @Override
+    public String getKey() {
+        return "trim_whitespace";
+    }
+
+    @Override
+    public String format(String value) {
+        Objects.requireNonNull(value);
+        return value.trim();
+    }
+
+    @Override
+    public String getDescription() {
+        return Localization.lang("Trim all whitespace characters in the field content.");
+    }
+
+    @Override
+    public String getExampleInput() {
+        return "\r\n InCDMA\n\r ";
+    }
+}
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index bff30cd317d..f403c7c34ad 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1067,6 +1067,11 @@ This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=This operat
 
 Toggle\ entry\ preview=Toggle entry preview
 Toggle\ groups\ interface=Toggle groups interface
+
+Trim\ all\ whitespace\ characters\ in\ the\ field\ content.=Trim all whitespace characters in the field content.
+
+Trim\ whitespace\ characters=Trim whitespace characters
+
 Try\ different\ encoding=Try different encoding
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Unabbreviate journal names of the selected entries
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
new file mode 100644
index 00000000000..d0554334a0e
--- /dev/null
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
@@ -0,0 +1,61 @@
+
+package org.jabref.logic.formatter.bibtexfields;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class TrimWhitespaceFormatterTest {
+
+    private TrimWhitespaceFormatter formatter;
+
+    @BeforeEach
+    public void setUp() {
+        formatter = new TrimWhitespaceFormatter();
+    }
+
+    @Test
+    public void removeHorizontalTabulations() {
+        assertEquals("whitespace", formatter.format("\twhitespace"));
+        assertEquals("whitespace", formatter.format("whitespace\t"));
+        assertEquals("whitespace", formatter.format("\twhitespace\t\t"));
+    }
+
+    @Test
+    public void removeLineFeeds() {
+        assertEquals("whitespace", formatter.format("\nwhitespace"));
+        assertEquals("whitespace", formatter.format("whitespace\n"));
+        assertEquals("whitespace", formatter.format("\nwhitespace\n\n"));
+    }
+
+    @Test
+    public void removeFormFeeds() {
+        assertEquals("whitespace", formatter.format("\fwhitespace"));
+        assertEquals("whitespace", formatter.format("whitespace\f"));
+        assertEquals("whitespace", formatter.format("\fwhitespace\f\f"));
+    }
+
+    @Test
+    public void removeCarriageReturnFeeds() {
+        assertEquals("whitespace", formatter.format("\rwhitespace"));
+        assertEquals("whitespace", formatter.format("whitespace\r"));
+        assertEquals("whitespace", formatter.format("\rwhitespace\r\r"));
+    }
+
+    @Test
+    public void removeSeparatorSpaces() {
+        assertEquals("whitespace", formatter.format(" whitespace"));
+        assertEquals("whitespace", formatter.format("whitespace "));
+        assertEquals("whitespace", formatter.format(" whitespace  "));
+    }
+
+    @Test
+    public void removeMixedWhitespaceChars() {
+        assertEquals("whitespace", formatter.format(" \r\t\fwhitespace"));
+        assertEquals("whitespace", formatter.format("whitespace \n \r"));
+        assertEquals("whitespace", formatter.format("   \f\t whitespace  \r \n"));
+    }
+
+
+}

From 5dca3b67034d289fcc98b7ddda5acd0892592cfc Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sun, 23 Sep 2018 21:01:14 +0200
Subject: [PATCH 097/229] Fix JavaFX thread exception when fetching new infos
 (#4354)

* Fix JavaFX thread exception when fetching new infos

Fixes by reworking the SwingWorker using JavaFX BackgroundTasks.

* Fix checkstyle

* Improve code

* fix checkstyle
---
 src/main/java/org/jabref/gui/BasePanel.java   |  2 +-
 .../jabref/gui/entryeditor/EntryEditor.java   | 13 ++-
 .../IdentifierEditorViewModel.java            |  5 +-
 .../EntryFetchAndMergeWorker.java             | 64 -------------
 .../gui/mergeentries/FetchAndMergeEntry.java  | 91 ++++++++++++++-----
 .../gui/mergeentries/FetchAndMergeWorker.java | 76 ----------------
 .../MergeWithFetchedEntryAction.java          |  3 +-
 7 files changed, 82 insertions(+), 172 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java
 delete mode 100644 src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 0f04e04de82..b94f9886756 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -203,7 +203,7 @@ public BasePanel(JabRefFrame frame, BasePanelPreferences preferences, BibDatabas
 
         this.getDatabase().registerListener(new UpdateTimestampListener(Globals.prefs));
 
-        this.entryEditor = new EntryEditor(this, preferences.getEntryEditorPreferences(), Globals.getFileUpdateMonitor(), dialogService, externalFileTypes);
+        this.entryEditor = new EntryEditor(this, preferences.getEntryEditorPreferences(), Globals.getFileUpdateMonitor(), dialogService, externalFileTypes, Globals.TASK_EXECUTOR);
 
         this.preview = new PreviewPanel(this, getBibDatabaseContext(), preferences.getKeyBindings(), preferences.getPreviewPreferences(), dialogService, externalFileTypes);
         frame().getGlobalSearchBar().getSearchQueryHighlightObservable().addSearchListener(preview);
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 9b720e978bb..75070434db0 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -36,10 +36,11 @@
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.menus.ChangeEntryTypeMenu;
-import org.jabref.gui.mergeentries.EntryFetchAndMergeWorker;
+import org.jabref.gui.mergeentries.FetchAndMergeEntry;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.ColorUtil;
 import org.jabref.gui.util.DefaultTaskExecutor;
+import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.TypedBibEntry;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.EntryBasedFetcher;
@@ -91,14 +92,16 @@ public class EntryEditor extends BorderPane {
     private final EntryEditorPreferences preferences;
     private final DialogService dialogService;
     private final NewDroppedFileHandler fileHandler;
+    private final TaskExecutor taskExecutor;
 
-    public EntryEditor(BasePanel panel, EntryEditorPreferences preferences, FileUpdateMonitor fileMonitor, DialogService dialogService, ExternalFileTypes externalFileTypes) {
+    public EntryEditor(BasePanel panel, EntryEditorPreferences preferences, FileUpdateMonitor fileMonitor, DialogService dialogService, ExternalFileTypes externalFileTypes, TaskExecutor taskExecutor) {
         this.panel = panel;
         this.databaseContext = panel.getBibDatabaseContext();
         this.undoManager = panel.getUndoManager();
         this.preferences = Objects.requireNonNull(preferences);
         this.fileMonitor = fileMonitor;
         this.dialogService = dialogService;
+        this.taskExecutor = taskExecutor;
 
         fileHandler = new NewDroppedFileHandler(dialogService, databaseContext, externalFileTypes,
                 Globals.prefs.getFilePreferences(),
@@ -340,7 +343,7 @@ private void setupToolBar() {
         ContextMenu fetcherMenu = new ContextMenu();
         for (EntryBasedFetcher fetcher : WebFetchers.getEntryBasedFetchers(preferences.getImportFormatPreferences())) {
             MenuItem fetcherMenuItem = new MenuItem(fetcher.getName());
-            fetcherMenuItem.setOnAction(event -> new EntryFetchAndMergeWorker(panel, getEntry(), fetcher).execute());
+            fetcherMenuItem.setOnAction(event -> fetchAndMerge(fetcher));
             fetcherMenu.getItems().add(fetcherMenuItem);
         }
         fetcherButton.setOnMouseClicked(event -> fetcherMenu.show(fetcherButton, Side.RIGHT, 0, 0));
@@ -353,6 +356,10 @@ private void setupToolBar() {
                         generateCiteKeyButton);
     }
 
+    private void fetchAndMerge(EntryBasedFetcher fetcher) {
+        new FetchAndMergeEntry(panel, taskExecutor).fetchAndMerge(entry, fetcher);
+    }
+
     void addSearchListener(SearchQueryHighlightListener listener) {
         // TODO: Highlight search text in entry editors
         searchListeners.add(listener);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java
index f714e0764b4..c3c3f0654db 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java
@@ -8,6 +8,7 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
+import org.jabref.JabRefGUI;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.desktop.JabRefDesktop;
@@ -86,8 +87,8 @@ public BooleanProperty identifierLookupInProgressProperty() {
         return identifierLookupInProgress;
     }
 
-    public FetchAndMergeEntry fetchInformationByIdentifier(BibEntry entry) {
-        return new FetchAndMergeEntry(entry, fieldName);
+    public void fetchInformationByIdentifier(BibEntry entry) {
+        new FetchAndMergeEntry(JabRefGUI.getMainFrame().getCurrentBasePanel(), taskExecutor).fetchAndMerge(entry, fieldName);
     }
 
     public void lookupIdentifier(BibEntry entry) {
diff --git a/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java b/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java
deleted file mode 100644
index 1a5b7f93eba..00000000000
--- a/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.jabref.gui.mergeentries;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-
-import javax.swing.SwingWorker;
-
-import org.jabref.gui.BasePanel;
-import org.jabref.logic.importer.EntryBasedFetcher;
-import org.jabref.logic.importer.FetcherException;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class EntryFetchAndMergeWorker extends SwingWorker<Optional<BibEntry>, Void> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(EntryFetchAndMergeWorker.class);
-
-    private final BasePanel panel;
-    private final BibEntry entry;
-    private final EntryBasedFetcher fetcher;
-
-    public EntryFetchAndMergeWorker(BasePanel panel, BibEntry entry, EntryBasedFetcher fetcher) {
-        this.panel = Objects.requireNonNull(panel);
-        this.entry = Objects.requireNonNull(entry);
-        this.fetcher = Objects.requireNonNull(fetcher);
-    }
-
-    @Override
-    protected Optional<BibEntry> doInBackground() throws Exception {
-        try {
-            List<BibEntry> fetchedEntries = fetcher.performSearch(entry);
-            return fetchedEntries.stream().findFirst();
-        } catch (FetcherException e) {
-            LOGGER.error("Info cannot be found", e);
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    protected void done() {
-        if (isCancelled()) {
-            return;
-        }
-
-        try {
-            Optional<BibEntry> fetchedEntry = get();
-            if (fetchedEntry.isPresent()) {
-                MergeFetchedEntryDialog dialog = new MergeFetchedEntryDialog(panel, entry, fetchedEntry.get(),
-                        fetcher.getName());
-                dialog.setVisible(true);
-            } else {
-                panel.frame().setStatus(Localization.lang("Could not find any bibliographic information."));
-            }
-        } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error("Error while fetching Entry", e);
-        }
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
index add51e29eb4..38a332e6dd3 100644
--- a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
+++ b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
@@ -1,52 +1,93 @@
 package org.jabref.gui.mergeentries;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
-import org.jabref.JabRefGUI;
+import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.importer.EntryBasedFetcher;
+import org.jabref.logic.importer.IdBasedFetcher;
+import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
- * Class for fetching and merging information based on a specific field
- *
+ * Class for fetching and merging bibliographic information
  */
 public class FetchAndMergeEntry {
 
     // A list of all field which are supported
     public static List<String> SUPPORTED_FIELDS = Arrays.asList(FieldName.DOI, FieldName.EPRINT, FieldName.ISBN);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FetchAndMergeEntry.class);
+    private final BasePanel panel;
+    private final DialogService dialogService;
+    private final TaskExecutor taskExecutor;
+
+    public FetchAndMergeEntry(BasePanel panel, TaskExecutor taskExecutor) {
+        this.dialogService = panel.frame().getDialogService();
+        this.panel = panel;
+        this.taskExecutor = taskExecutor;
+    }
 
-    /**
-     * Convenience constructor for a single field
-     *
-     * @param entry - BibEntry to fetch information for
-     * @param panel - current BasePanel
-     * @param field - field to get information from
-     */
-    public FetchAndMergeEntry(BibEntry entry, BasePanel panel, String field) {
-        this(entry, panel, Arrays.asList(field));
+    public void fetchAndMerge(BibEntry entry) {
+        fetchAndMerge(entry, SUPPORTED_FIELDS);
     }
 
-    public FetchAndMergeEntry(BibEntry entry, String field) {
-        this(entry, JabRefGUI.getMainFrame().getCurrentBasePanel(), field);
+    public void fetchAndMerge(BibEntry entry, String field) {
+        fetchAndMerge(entry, Collections.singletonList(field));
     }
 
-    /**
-     * Default constructor
-     *
-     * @param entry - BibEntry to fetch information for
-     * @param panel - current BasePanel
-     * @param fields - List of fields to get information from, one at a time in given order
-     */
-    public FetchAndMergeEntry(BibEntry entry, BasePanel panel, List<String> fields) {
+    public void fetchAndMerge(BibEntry entry, List<String> fields) {
         for (String field : fields) {
-            if (entry.hasField(field)) {
-                new FetchAndMergeWorker(panel, entry, field).execute();
+            Optional<String> fieldContent = entry.getField(field);
+            if (fieldContent.isPresent()) {
+                Optional<IdBasedFetcher> fetcher = WebFetchers.getIdBasedFetcherForField(field, Globals.prefs.getImportFormatPreferences());
+                if (fetcher.isPresent()) {
+                    BackgroundTask.wrap(() -> fetcher.get().performSearchById(fieldContent.get()))
+                                  .onSuccess(fetchedEntry -> {
+                                      String type = FieldName.getDisplayName(field);
+                                      if (fetchedEntry.isPresent()) {
+                                          MergeFetchedEntryDialog dialog = new MergeFetchedEntryDialog(panel, entry, fetchedEntry.get(), type);
+                                          dialog.setVisible(true);
+                                      } else {
+                                          panel.frame().setStatus(Localization.lang("Cannot get info based on given %0: %1", type, fieldContent.get()));
+                                      }
+                                  })
+                                  .onFailure(exception -> {
+                                      LOGGER.error("Error while fetching bibliographic information", exception);
+                                      dialogService.showErrorDialogAndWait(exception);
+                                  })
+                                  .executeWith(Globals.TASK_EXECUTOR);
+                }
             } else {
-                panel.frame().setStatus(Localization.lang("No %0 found", FieldName.getDisplayName(field)));
+                dialogService.notify(Localization.lang("No %0 found", FieldName.getDisplayName(field)));
             }
         }
     }
+
+    public void fetchAndMerge(BibEntry entry, EntryBasedFetcher fetcher) {
+        BackgroundTask.wrap(() -> fetcher.performSearch(entry).stream().findFirst())
+                      .onSuccess(fetchedEntry -> {
+                          if (fetchedEntry.isPresent()) {
+                              MergeFetchedEntryDialog dialog = new MergeFetchedEntryDialog(panel, entry, fetchedEntry.get(), fetcher.getName());
+                              dialog.setVisible(true);
+                          } else {
+                              dialogService.notify(Localization.lang("Could not find any bibliographic information."));
+                          }
+                      })
+                      .onFailure(exception -> {
+                          LOGGER.error("Error while fetching entry with " + fetcher.getName(), exception);
+                          dialogService.showErrorDialogAndWait(Localization.lang("Error while fetching from %0", fetcher.getName()), exception);
+                      })
+                      .executeWith(taskExecutor);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java
deleted file mode 100644
index 97059269167..00000000000
--- a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.jabref.gui.mergeentries;
-
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-
-import javax.swing.SwingWorker;
-
-import org.jabref.Globals;
-import org.jabref.gui.BasePanel;
-import org.jabref.logic.importer.FetcherException;
-import org.jabref.logic.importer.IdBasedFetcher;
-import org.jabref.logic.importer.WebFetchers;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.FieldName;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class FetchAndMergeWorker extends SwingWorker<Optional<BibEntry>, Void> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(FetchAndMergeWorker.class);
-
-    private final BasePanel panel;
-    private final BibEntry entry;
-    private final String field;
-    private final Optional<String> fieldContent;
-
-
-    public FetchAndMergeWorker(BasePanel panel, BibEntry entry, String field) {
-        this.panel = Objects.requireNonNull(panel);
-        this.entry = Objects.requireNonNull(entry);
-        this.field = Objects.requireNonNull(field);
-
-        this.fieldContent = entry.getField(field);
-    }
-
-    @Override
-    protected Optional<BibEntry> doInBackground() throws Exception {
-        Optional<IdBasedFetcher> fetcher = WebFetchers.getIdBasedFetcherForField(field, Globals.prefs.getImportFormatPreferences());
-
-        try {
-            Optional<String> fieldContentValue = fieldContent;
-            if (fieldContentValue.isPresent() && fetcher.isPresent()) {
-                return fetcher.get().performSearchById(fieldContentValue.get());
-            } else {
-                return Optional.empty();
-            }
-        } catch (FetcherException e) {
-            LOGGER.error("Info cannot be found", e);
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    protected void done() {
-        if (isCancelled()) {
-            return;
-        }
-
-        try {
-            String type = FieldName.getDisplayName(field);
-            Optional<BibEntry> fetchedEntry = get();
-            if (fetchedEntry.isPresent()) {
-                MergeFetchedEntryDialog dialog = new MergeFetchedEntryDialog(panel, entry, fetchedEntry.get(), type);
-                dialog.setVisible(true);
-            } else {
-                panel.frame().setStatus(Localization.lang("Cannot get info based on given %0: %1", type, fieldContent.get()));
-            }
-        } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error("Error while fetching Entry", e);
-        }
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java b/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java
index 5d0d016e3d1..9400a071f9b 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.mergeentries;
 
+import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.BaseAction;
@@ -21,7 +22,7 @@ public MergeWithFetchedEntryAction(BasePanel basePanel, DialogService dialogServ
     public void action() {
         if (basePanel.getMainTable().getSelectedEntries().size() == 1) {
             BibEntry originalEntry = basePanel.getMainTable().getSelectedEntries().get(0);
-            new FetchAndMergeEntry(originalEntry, basePanel, FetchAndMergeEntry.SUPPORTED_FIELDS);
+            new FetchAndMergeEntry(basePanel, Globals.TASK_EXECUTOR).fetchAndMerge(originalEntry);
         } else {
             dialogService.showInformationDialogAndWait(Localization.lang("Merge entry with %0 information",
                     FieldName.orFields(FieldName.getDisplayName(FieldName.DOI),

From 2f433d2a6f14f68af2db6819babebcfa140daa53 Mon Sep 17 00:00:00 2001
From: NorwayMaple <abepolk@gmail.com>
Date: Tue, 25 Sep 2018 09:00:27 -0400
Subject: [PATCH 098/229] Completed General Fields Customizer conversion to
 JavaFX (#4346)

* temp commit 09 06 18

* starting work on converting Customize General Fields dialog from Swing to JavaFX

* More work on converting JavaFX dialog

* Even more work on converting JavaFX dialog

* more work JavaFX

* Further work, now cannot load

* Cleaned up comments

* create newlines at ends of files

* fix missing ids change bidirectional binding use string property

* Fix default and help

* Got the dialog running, but it is not saving

* Removed _def

* fix bug

* Reformat customize general fields dialog as JavaFX

* Small code fixes

* make fxml support multiple languages

* minor code fixes

* added javadoc

* change class name and code fix

* Add English localization

* remove old Swing dialog

* comment fix

* English localization change

* fix indentation

* remove cancelButton from controller
---
 CHANGELOG.md                                  |   1 +
 .../org/jabref/gui/GenFieldsCustomizer.java   | 175 ------------------
 src/main/java/org/jabref/gui/JabRefFrame.java |   2 +-
 .../gui/actions/SetupGeneralFieldsAction.java |  12 +-
 .../CustomizeGeneralFieldsDialog.fxml         |  24 +++
 .../CustomizeGeneralFieldsDialogView.java     |  71 +++++++
 ...CustomizeGeneralFieldsDialogViewModel.java |  88 +++++++++
 .../jabref/preferences/JabRefPreferences.java |  44 ++++-
 .../preferences/PreferencesService.java       |  14 ++
 src/main/resources/l10n/JabRef_en.properties  |  13 +-
 10 files changed, 252 insertions(+), 192 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/GenFieldsCustomizer.java
 create mode 100644 src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d3501585a6..61f77c603d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ## [Unreleased]
 
 ### Changed
+- We updated the dialog for setting up general fields.
 - URL field formatting is updated. All whitespace chars, located at the beginning/ending of the url, are trimmed automatically
 - We changed the behavior of the field formatting dialog such that the `bibtexkey` is not changed when formatting all fields or all text fields.
 - We added a "Move file to file directory and rename file" option for simultaneously moving and renaming of document file. [#4166](https://github.com/JabRef/jabref/issues/4166)
diff --git a/src/main/java/org/jabref/gui/GenFieldsCustomizer.java b/src/main/java/org/jabref/gui/GenFieldsCustomizer.java
deleted file mode 100644
index f913bbe5cc8..00000000000
--- a/src/main/java/org/jabref/gui/GenFieldsCustomizer.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
-import org.jabref.Globals;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.JabRefPreferences;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.layout.Sizes;
-
-public class GenFieldsCustomizer extends JabRefDialog {
-
-    private final JPanel buttons = new JPanel();
-    private final JButton ok = new JButton();
-    private final JButton cancel = new JButton();
-    private final JButton helpBut;
-    private final JLabel jLabel1 = new JLabel();
-    private final JPanel jPanel3 = new JPanel();
-    private final JPanel jPanel4 = new JPanel();
-    private final GridBagLayout gridBagLayout1 = new GridBagLayout();
-    private final JScrollPane jScrollPane1 = new JScrollPane();
-    private final JLabel jLabel2 = new JLabel();
-    private final JTextArea fieldsArea = new JTextArea();
-    private final GridBagLayout gridBagLayout2 = new GridBagLayout();
-    private final JButton revert = new JButton();
-
-    public GenFieldsCustomizer(JabRefFrame frame) {
-        super(Localization.lang("Set general fields"), false, GenFieldsCustomizer.class);
-        helpBut = new HelpAction(HelpFile.GENERAL_FIELDS).getHelpButton();
-        jbInit();
-        setSize(new Dimension(650, 300));
-    }
-
-    private void jbInit() {
-        ok.setText(Localization.lang("OK"));
-        ok.addActionListener(e -> okActionPerformed());
-        cancel.setText(Localization.lang("Cancel"));
-        cancel.addActionListener(e -> dispose());
-        jLabel1.setText(Localization.lang("Delimit fields with semicolon, ex.") + ": url;pdf;note");
-        jPanel3.setLayout(gridBagLayout2);
-        jPanel4.setBorder(BorderFactory.createEtchedBorder());
-        jPanel4.setLayout(gridBagLayout1);
-        jLabel2.setText(Localization.lang("General fields"));
-
-        setFieldsText();
-
-        revert.setText(Localization.lang("Default"));
-        revert.addActionListener(e -> revertActionPerformed());
-        this.getContentPane().add(buttons, BorderLayout.SOUTH);
-        ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-        buttons.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-        bb.addGlue();
-        bb.addButton(ok);
-        bb.addButton(revert);
-        bb.addButton(cancel);
-        bb.addStrut(Sizes.DLUX5);
-        bb.addButton(helpBut);
-        bb.addGlue();
-
-        this.getContentPane().add(jPanel3, BorderLayout.CENTER);
-        jPanel3.add(jLabel1, new GridBagConstraints(0, 1, 1, 1, 1.0, 0.0
-                , GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
-        jPanel3.add(jPanel4, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0
-                , GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 318, 193));
-        jPanel4.add(jScrollPane1, new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0
-                , GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 0, 0));
-        jScrollPane1.getViewport().add(fieldsArea, null);
-        jPanel4.add(jLabel2, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0
-                , GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
-
-        // Key bindings:
-        ActionMap am = buttons.getActionMap();
-        InputMap im = buttons.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        });
-
-    }
-
-    private void okActionPerformed() {
-        String[] lines = fieldsArea.getText().split("\n");
-        int i = 0;
-        for (; i < lines.length; i++) {
-            String[] parts = lines[i].split(":");
-            if (parts.length != 2) {
-                // Report error and exit.
-                String field = Localization.lang("field");
-                JOptionPane.showMessageDialog(this, Localization.lang("Each line must be on the following form") + " '" +
-                        Localization.lang("Tabname") + ':' + field + "1;" + field + "2;...;" + field + "N'",
-                        Localization.lang("Error"), JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-            String testString = BibtexKeyGenerator.cleanKey(parts[1],
-                    Globals.prefs.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
-            if (!testString.equals(parts[1]) || (parts[1].indexOf('&') >= 0)) {
-                // Report error and exit.
-                JOptionPane.showMessageDialog(this, Localization.lang("Field names are not allowed to contain white space or the following "
-                                + "characters") + ": # { } ~ , ^ &",
-                        Localization.lang("Error"), JOptionPane.ERROR_MESSAGE);
-
-                return;
-            }
-
-            Globals.prefs.put((JabRefPreferences.CUSTOM_TAB_NAME + i), parts[0]);
-            Globals.prefs.put((JabRefPreferences.CUSTOM_TAB_FIELDS + i), parts[1].toLowerCase(Locale.ROOT));
-        }
-        Globals.prefs.purgeSeries(JabRefPreferences.CUSTOM_TAB_NAME, i);
-        Globals.prefs.purgeSeries(JabRefPreferences.CUSTOM_TAB_FIELDS, i);
-        Globals.prefs.updateEntryEditorTabList();
-
-        dispose();
-    }
-
-    private void setFieldsText() {
-        StringBuilder sb = new StringBuilder();
-
-        for (Map.Entry<String, List<String>> tab : Globals.prefs.getEntryEditorTabList().entrySet()) {
-            sb.append(tab.getKey());
-            sb.append(':');
-            sb.append(String.join(";", tab.getValue()));
-            sb.append('\n');
-        }
-
-        fieldsArea.setText(sb.toString());
-    }
-
-    private void revertActionPerformed() {
-        StringBuilder sb = new StringBuilder();
-        String name;
-        String fields;
-        int i = 0;
-        while ((name = (String) Globals.prefs.defaults.get
-                (JabRefPreferences.CUSTOM_TAB_NAME + "_def" + i)) != null) {
-            sb.append(name);
-            fields = (String) Globals.prefs.defaults.get
-                    (JabRefPreferences.CUSTOM_TAB_FIELDS + "_def" + i);
-            sb.append(':');
-            sb.append(fields);
-            sb.append('\n');
-            i++;
-        }
-        fieldsArea.setText(sb.toString());
-
-    }
-}
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index a08ac19915e..d4ee5712de2 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -927,7 +927,7 @@ private MenuBar createMenu() {
 
                 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_EXTERNAL_FILETYPES, new EditExternalFileTypesAction()),
diff --git a/src/main/java/org/jabref/gui/actions/SetupGeneralFieldsAction.java b/src/main/java/org/jabref/gui/actions/SetupGeneralFieldsAction.java
index 3f75fc14c20..a6254ef288c 100644
--- a/src/main/java/org/jabref/gui/actions/SetupGeneralFieldsAction.java
+++ b/src/main/java/org/jabref/gui/actions/SetupGeneralFieldsAction.java
@@ -1,20 +1,12 @@
 package org.jabref.gui.actions;
 
-import org.jabref.gui.GenFieldsCustomizer;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.customizefields.CustomizeGeneralFieldsDialogView;
 
 public class SetupGeneralFieldsAction extends SimpleCommand {
 
-    private final JabRefFrame jabRefFrame;
-
-    public SetupGeneralFieldsAction(JabRefFrame jabRefFrame) {
-        this.jabRefFrame = jabRefFrame;
-    }
-
     @Override
     public void execute() {
-        GenFieldsCustomizer gf = new GenFieldsCustomizer(jabRefFrame);
-        gf.setVisible(true);
+        new CustomizeGeneralFieldsDialogView().show();
 
     }
 
diff --git a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialog.fxml b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialog.fxml
new file mode 100644
index 00000000000..0e848e4c13a
--- /dev/null
+++ b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialog.fxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.VBox?>
+<DialogPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="org.jabref.gui.customizefields.CustomizeGeneralFieldsDialogView">
+    <content>
+        <VBox prefHeight="300.0" prefWidth="650.0">
+            <children>
+                <Label text="%General Fields" />
+                <Label text="%Create custom fields for each BibTeX entry" />
+                <TextArea fx:id="fieldsTextArea" minHeight="200.0" minWidth="628.0" />
+                <Label text="%Format: Tab:field;field;... (e.g. General:url;pdf;note...)" />
+            </children>
+        </VBox>
+    </content>
+    <ButtonType fx:id="okButton" fx:constant="OK" />
+    <ButtonType fx:id="resetButton" buttonData="LEFT" text="%Default" />
+    <ButtonType fx:id="helpButton" text="%Help" />
+    <ButtonType fx:constant="CANCEL" />
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogView.java b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogView.java
new file mode 100644
index 00000000000..a36f44bb86d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogView.java
@@ -0,0 +1,71 @@
+package org.jabref.gui.customizefields;
+
+import javax.inject.Inject;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.TextArea;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
+import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class CustomizeGeneralFieldsDialogView extends BaseDialog<Void> {
+
+    @FXML private ButtonType resetButton;
+    @FXML private ButtonType helpButton;
+    @FXML private ButtonType okButton;
+    @FXML private TextArea fieldsTextArea;
+
+    @Inject private DialogService dialogService;
+    @Inject private PreferencesService preferences;
+    private CustomizeGeneralFieldsDialogViewModel viewModel;
+
+    public CustomizeGeneralFieldsDialogView() {
+        this.setTitle(Localization.lang("Set General Fields"));
+        this.setResizable(true);
+        this.getDialogPane().setPrefSize(300, 650);
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        HelpAction helpCommand = new HelpAction(HelpFile.GENERAL_FIELDS);
+        //HelpAction is written with Swing, not JavaFX, so runCommand() cannot be used normally.  Here I am reaching into
+        //the command and running execute.  When HelpAction is converted to JavaFX,
+        //the following will need to be changed.
+        ControlHelper.setAction(helpButton, getDialogPane(), event -> helpCommand.getCommand().execute());
+        ControlHelper.setAction(resetButton, getDialogPane(), event -> resetFields());
+        ControlHelper.setAction(okButton, getDialogPane(), event -> saveFieldsAndCloseDialog());
+
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new CustomizeGeneralFieldsDialogViewModel(dialogService, preferences);
+        fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsTextProperty());
+
+    }
+
+    @FXML
+    private void closeDialog() {
+        close();
+    }
+
+    @FXML
+    private void saveFieldsAndCloseDialog() {
+        viewModel.saveFields();
+        closeDialog();
+    }
+
+    private void resetFields() {
+        viewModel.resetFields();
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java
new file mode 100644
index 00000000000..1d388df6555
--- /dev/null
+++ b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java
@@ -0,0 +1,88 @@
+package org.jabref.gui.customizefields;
+
+import java.util.List;
+import java.util.Map;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.DialogService;
+import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.JabRefPreferences;
+import org.jabref.preferences.PreferencesService;
+
+public class CustomizeGeneralFieldsDialogViewModel {
+
+    private final DialogService dialogService;
+    private final PreferencesService preferences;
+    private final StringProperty fieldsText = new SimpleStringProperty("");
+
+    public CustomizeGeneralFieldsDialogViewModel(DialogService dialogService, PreferencesService preferences) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        setInitialFieldsText();
+    }
+
+    private void setInitialFieldsText() {
+        StringBuilder sb = new StringBuilder();
+
+        for (Map.Entry<String, List<String>> tab : preferences.getEntryEditorTabList().entrySet()) {
+            sb.append(tab.getKey());
+            sb.append(':');
+            sb.append(String.join(";", tab.getValue()));
+            sb.append('\n');
+        }
+        fieldsText.set(sb.toString());
+    }
+
+    public StringProperty fieldsTextProperty() {
+        return fieldsText;
+    }
+
+    public void saveFields() {
+        String[] lines = fieldsText.get().split("\n");
+        int i = 0;
+        for (; i < lines.length; i++) {
+            String[] parts = lines[i].split(":");
+            if (parts.length != 2) {
+                // Report error and exit.
+                String field = Localization.lang("field");
+                String title = Localization.lang("Error");
+                String content = Localization.lang("Each line must be of the following form") + " '" +
+                                 Localization.lang("Tabname") + ':' + field + "1;" + field + "2;...;" + field + "N'";
+                dialogService.showInformationDialogAndWait(title, content);
+                return;
+            }
+
+            String testString = BibtexKeyGenerator.cleanKey(parts[1], preferences.getEnforceLegalKeys());
+            if (!testString.equals(parts[1]) || (parts[1].indexOf('&') >= 0)) {
+                String title = Localization.lang("Error");
+                String content = Localization.lang("Field names are not allowed to contain white space or the following "
+                                                   + "characters")
+                                 + ": # { } ~ , ^ &";
+                dialogService.showInformationDialogAndWait(title, content);
+                return;
+            }
+            preferences.setCustomTabsNameAndFields(parts[0], parts[1], i);
+
+        }
+        preferences.purgeSeries(JabRefPreferences.CUSTOM_TAB_NAME, i);
+        preferences.purgeSeries(JabRefPreferences.CUSTOM_TAB_FIELDS, i);
+        preferences.updateEntryEditorTabList();
+    }
+
+    public void resetFields() {
+
+        StringBuilder sb = new StringBuilder();
+        Map<String,String> customTabNamesFields = preferences.getCustomTabsNamesAndFields();
+        for (Map.Entry<String,String>entry : customTabNamesFields.entrySet()) {
+            sb.append(entry.getKey());
+            sb.append(':');
+            sb.append(entry.getValue());
+            sb.append('\n');
+        }
+        fieldsText.set(sb.toString());
+
+    }
+}
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index c37ddb11e9a..0c898045a68 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -935,6 +935,40 @@ public String getUser() {
         }
     }
 
+    /**
+     * Get a Map of default tab names to deafult tab fields.
+     * The fields are returned as a String with fields separated by ;
+     * They are combined into one string in order to feed into CustomizeGeneralFieldsDialogViewModel.resetFields()
+     * so that they do not have to be parsed in order to fit there
+     *
+     * @return A map of keys with tab names and values as a string containing
+     * fields for the given name separated by ;
+     */
+    @Override
+    public Map<String, String> getCustomTabsNamesAndFields() {
+        Map<String, String> customTabsMap = new HashMap<>();
+
+        int defNumber = 0;
+        while (true) {
+            //Saved as CUSTOMTABNAME_def{number} and ; separated
+            String name = (String) defaults.get(CUSTOM_TAB_NAME + "_def" + defNumber);
+            String fields = (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber);
+
+            if (StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(fields)) {
+                break;
+            }
+            customTabsMap.put(name, fields);
+            defNumber++;
+        }
+        return customTabsMap;
+    }
+
+    @Override
+    public void setCustomTabsNameAndFields(String name, String fields, int defNumber) {
+        prefs.put(CUSTOM_TAB_NAME + defNumber, name);
+        prefs.put(CUSTOM_TAB_FIELDS + defNumber, fields);
+    }
+
     public List<String> getCustomTabFieldNames() {
         List<String> customFields = new ArrayList<>();
 
@@ -943,7 +977,7 @@ public List<String> getCustomTabFieldNames() {
             // saved as CUSTOMTABNAME_def{number} and ; separated
             String fields = (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber);
 
-            if ((fields == null) || fields.isEmpty()) {
+            if (StringUtil.isNullOrEmpty(fields)) {
                 break;
             }
 
@@ -1295,6 +1329,7 @@ private Object getObject(String key) {
      *
      * @param number or higher.
      */
+    @Override
     public void purgeSeries(String prefix, int number) {
         int n = number;
         while (get(prefix + n) != null) {
@@ -1303,6 +1338,7 @@ public void purgeSeries(String prefix, int number) {
         }
     }
 
+    @Override
     public Map<String, List<String>> getEntryEditorTabList() {
         if (tabList == null) {
             updateEntryEditorTabList();
@@ -1310,6 +1346,12 @@ public Map<String, List<String>> getEntryEditorTabList() {
         return tabList;
     }
 
+    @Override
+    public Boolean getEnforceLegalKeys() {
+        return getBoolean(ENFORCE_LEGAL_BIBTEX_KEY);
+    }
+
+    @Override
     public void updateEntryEditorTabList() {
         tabList = EntryEditorTabList.create(this);
     }
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 7e869e518d5..0458c688759 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -1,6 +1,8 @@
 package org.jabref.preferences;
 
 import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
 
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
@@ -21,4 +23,16 @@ public interface PreferencesService {
 
     void setWorkingDir(Path dir);
 
+    Map<String, List<String>> getEntryEditorTabList();
+
+    Boolean getEnforceLegalKeys();
+
+    Map<String, String> getCustomTabsNamesAndFields();
+
+    void setCustomTabsNameAndFields(String name, String fields, int defNumber);
+
+    public void purgeSeries(String prefix, int number);
+
+    public void updateEntryEditorTabList();
+
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index f403c7c34ad..f41a4a761a2 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -216,6 +216,8 @@ Could\ not\ run\ the\ 'vim'\ program.=Could not run the 'vim' program.
 Could\ not\ save\ file.=Could not save file.
 Character\ encoding\ '%0'\ is\ not\ supported.=Character encoding '%0' is not supported.
 
+Create\ custom\ fields\ for\ each\ BibTeX\ entry=Create custom fields for each BibTeX entry
+
 crossreferenced\ entries\ included=crossreferenced entries included
 
 Current\ content=Current content
@@ -271,8 +273,6 @@ Deleted=Deleted
 
 Permanently\ delete\ local\ file=Permanently delete local file
 
-Delimit\ fields\ with\ semicolon,\ ex.=Delimit fields with semicolon, ex.
-
 Descending=Descending
 
 Description=Description
@@ -327,7 +327,7 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Dynamically gr
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Dynamically group entries by searching a field for a keyword
 
-Each\ line\ must\ be\ on\ the\ following\ form=Each line must be on the following form
+Each\ line\ must\ be\ of\ the\ following\ form=Each line must be of the following form
 
 Edit=Edit
 
@@ -454,6 +454,8 @@ Float=Float
 
 for=for
 
+Format\:\ Tab\:field;field;...\ (e.g.\ General\:url;pdf;note...)=Format\: Tab\:field;field;... (e.g. General\:url;pdf;note...)
+
 Format\ of\ author\ and\ editor\ names=Format of author and editor names
 Format\ string=Format string
 
@@ -466,7 +468,7 @@ Full\ name=Full name
 
 General=General
 
-General\ fields=General fields
+General\ Fields=General Fields
 
 Generate=Generate
 
@@ -949,7 +951,8 @@ Selected\ entries=Selected entries
 Set\ field=Set field
 Set\ fields=Set fields
 
-Set\ general\ fields=Set general fields
+Set\ General\ Fields=Set General Fields
+
 Set\ main\ external\ file\ directory=Set main external file directory
 
 Settings=Settings

From 933b2346fbe5daed4a8c1cd611fa8374eef80680 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sat, 29 Sep 2018 16:02:52 +0200
Subject: [PATCH 099/229] UPDATE gradle to 4.10.2 (#4358)

update errorprone, wiremock and applicationinsights
---
 build.gradle                             |  10 +++++-----
 gradle/wrapper/gradle-wrapper.jar        | Bin 56172 -> 56177 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index e5cdd3bbb3a..41737ff9652 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ plugins {
     id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
     id "com.simonharrer.modernizer" version '1.6.0-1'
     id 'me.champeau.gradle.jmh' version '0.4.7'
-    id 'net.ltgt.errorprone' version '0.0.16'
+    id 'net.ltgt.errorprone' version '0.6'
     id 'com.github.ben-manes.versions' version '0.20.0'
 }
 
@@ -158,10 +158,10 @@ dependencies {
 
     compile 'com.github.tomtung:latex2unicode_2.12:0.2.2'
 
-    errorprone 'com.google.errorprone:error_prone_core:2.3.1'
+    errorproneJavac 'com.google.errorprone:javac:1.8.0-beta-132'
 
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.1.2'
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.1.2'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.2.0'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.0'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1'
@@ -172,7 +172,7 @@ dependencies {
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'
     testCompile 'org.mockito:mockito-core:2.22.0'
-    testCompile 'com.github.tomakehurst:wiremock:2.18.0'
+    testCompile 'com.github.tomakehurst:wiremock:2.19.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.6.2'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 28861d273a5d270fd8f65dd74570c17c9c507736..13536770052936a92b204cc34e72284a03a6903c 100644
GIT binary patch
delta 692
zcmYk4Ur19?9LMkZDf<&M2ie%}7DhdFt>p?@=4>mKB4bVrl|tK7lq^E&DT+y0v4_Rt
z3sH=fJw(!z!q`g>OTlQ<J9jrXxAo^Gf;~vMo_pweSjz*K^Z9<h_g?sM&Q_wSmS~DN
z^>=RH63z>PF#61MMK4w@zo%={Oo)h!aYw2xd$L*Z4QO@B`vrqZeW^`-a89vdU%KP}
zm$;A~W-&z54z>h2eVT2dW;VgLDp5PbM|nTSSNmvA!!e^V;<MV!YU@#t4_Y&%HHm)e
z>q>`H852TlB9+Yz)oL-JOE#ja>Xe0Ri+qWS2UWCUMn21;NXn!1)y}(PnJ)TtoZ|x(
zA2~V787I{SIJRFl@c+$wjRtkB`igmZnOSc^$!kV<U81+Xy6PcejH7+*0Nh!L?BhJn
zWcz53zm8hC{d=*Ul~@o~#mBxQptz`I5{m%~+>;`{DH6R1sIf;yBSvx}yN0RU1gjyN
z8=;}QP;xd@%QpD)BE7kXq0(Wz&O2BbO8zD}gIr8(xajCZj>(OF3P0v}q%cUmA&$Y2
z4Nr?kqzWP>B3$W;{S*hsZS1rXC7;)$20w~tsPM88FK%{IKH7+_B@N=6os@sIOL^D|
ze5LEmhJ{jquD(;NL-3S4Sudu_!!)~$*s>kIyb;Y6k>*#hwBq7J2Pz`Fk0+HIY!JUH
XC#<{gm-*jO@O=*5Uph2@Qaj-<GZ`T=

delta 717
zcmYk4Ur19?9LMkZS<acsP1@M5%jPDOS8y5P!VDL*q9!&dF^D93=nwg#L=aj_ABw~W
z<y+B~+BOWKhe84aDJ`R7)9L=XbbHWxDhR=#?4{^<GW0xsKHu*-m-D-v<&ms!BUwFm
zt-EjKZmlFq4ZV(&o9V~*R@VEvaQH<<s6dk3E=|s++vDf9^Pa1O#jpv6aM}7H)P+wl
zAN=78Hime3ANz`BvmV8hDw!Bqt`2Udpq*=fHrE|^H@TNOGy-2~jId3q^jXW*iW?kL
z2GM+&a?pDtM;(eH$0%VI=!qPn2i7&r#$seY&6gu!*CXGS&yUMU+T=Wb&9(K`#!D0a
z*mAHkCnGSeP^X<o7A#DwwB!<BGS5_zuO4sQ7G&xTcoLTpoKYy~=Fx8aO3C=i^>?G#
zyeoQy%FYN}jB3ywJwTeXYg)_NVUD?31}(7~mW!vcCc4**XE7rp%_VTfRXWvzWv>Z{
zAEc#Lfi>}+*p^VJ{)*6}i7GaLn~4VMYU6<wQ*8<sk}{m0je}KsM0wRyAO@@Ml(+n!
zS&~ZOPhO&~TVhN3>~V735g433OwW4+ZcRC97#vG+J>{U6_XU1QRa4x{u^LSuRf;|o
zsi7|q<EuLGPao-_&Z#sJz^6bZ#%5*s<`gmx^45yegGC~`IJEJ)jYGV&z&XE%9Ha10
zSm5Q@F~PB1{BUhrVUJOgzQC@bJAIz&Lbx0%hAtx)ZhU=)^&vU+!;vY=UJ0#+e*s)7
B6KDVc

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5c1b6c95b82..e0b3fb8d70b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 0b45ab51cf440754464be00fd34053911415e619 Mon Sep 17 00:00:00 2001
From: 1160300614 <36831317+1160300614@users.noreply.github.com>
Date: Wed, 3 Oct 2018 00:50:54 +0900
Subject: [PATCH 100/229] Convert Part of the Issue#3861 Quality->Cleanup
 entries (#4268)

* Convert Part of the Issue#3861 Quality->Cleanup entries

* Revise code

* Merge branch 'master' of https://github.com/JabRef/jabref into pr/4268

# Conflicts:
#	src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
#	src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelTest.java

* Fix build

* Revert "Merge branch 'master' of https://github.com/JabRef/jabref into pr/4268"

This reverts commit 17cefe525a809ccfed6be772112d7d90e4e184ca.

* Fix build

* Fix display (still ugly)
---
 .../org/jabref/gui/cleanup/CleanupDialog.java |   9 +-
 .../gui/cleanup/CleanupPresetPanel.java       | 112 +++----
 .../cleanup/FieldFormatterCleanupsPanel.java  | 317 +++++++-----------
 .../DatabasePropertiesDialog.java             |   2 +-
 .../org/jabref/gui/util/ControlHelper.java    |   1 -
 5 files changed, 165 insertions(+), 276 deletions(-)

diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
index 4ac358e8434..4e672761366 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
@@ -1,11 +1,8 @@
 package org.jabref.gui.cleanup;
 
-import javax.swing.JScrollPane;
-
 import javafx.scene.control.ButtonType;
 
 import org.jabref.gui.util.BaseDialog;
-import org.jabref.gui.util.ControlHelper;
 import org.jabref.logic.cleanup.CleanupPreset;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
@@ -18,9 +15,7 @@ public CleanupDialog(BibDatabaseContext databaseContext, CleanupPreset initialPr
         getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
 
         CleanupPresetPanel presetPanel = new CleanupPresetPanel(databaseContext, initialPreset);
-        presetPanel.getScrollPane().setVisible(true);
-        JScrollPane scrollPane = presetPanel.getScrollPane();
-
+        getDialogPane().setContent(presetPanel);
         setResultConverter(button -> {
             if (button == ButtonType.OK) {
                 return presetPanel.getCleanupPreset();
@@ -28,7 +23,5 @@ public CleanupDialog(BibDatabaseContext databaseContext, CleanupPreset initialPr
                 return null;
             }
         });
-
-        ControlHelper.setSwingContent(getDialogPane(), scrollPane);
     }
 }
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
index b5127707c6c..4bd64ec1f62 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -6,11 +6,11 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.swing.ButtonGroup;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
+import javafx.scene.Group;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.GridPane;
 
 import org.jabref.Globals;
 import org.jabref.logic.cleanup.CleanupPreset;
@@ -20,25 +20,20 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-public class CleanupPresetPanel {
+public class CleanupPresetPanel extends ScrollPane {
 
     private final BibDatabaseContext databaseContext;
-    private JCheckBox cleanUpDOI;
-    private JCheckBox cleanUpISSN;
-    private JCheckBox cleanUpMovePDF;
-    private JCheckBox cleanUpMakePathsRelative;
-    private JCheckBox cleanUpRenamePDF;
-    private JCheckBox cleanUpRenamePDFonlyRelativePaths;
-    private JCheckBox cleanUpUpgradeExternalLinks;
-    private JCheckBox cleanUpBiblatex;
-    private JCheckBox cleanUpBibtex;
+    private CheckBox cleanUpDOI;
+    private CheckBox cleanUpISSN;
+    private CheckBox cleanUpMovePDF;
+    private CheckBox cleanUpMakePathsRelative;
+    private CheckBox cleanUpRenamePDF;
+    private CheckBox cleanUpRenamePDFonlyRelativePaths;
+    private CheckBox cleanUpUpgradeExternalLinks;
+    private CheckBox cleanUpBiblatex;
+    private CheckBox cleanUpBibtex;
     private FieldFormatterCleanupsPanel cleanUpFormatters;
 
-    private JPanel panel;
-    private JScrollPane scrollPane;
     private CleanupPreset cleanupPreset;
 
     public CleanupPresetPanel(BibDatabaseContext databaseContext, CleanupPreset cleanupPreset) {
@@ -48,76 +43,69 @@ public CleanupPresetPanel(BibDatabaseContext databaseContext, CleanupPreset clea
     }
 
     private void init() {
-        cleanUpDOI = new JCheckBox(
+        cleanUpDOI = new CheckBox(
                 Localization.lang("Move DOIs from note and URL field to DOI field and remove http prefix"));
-        cleanUpISSN = new JCheckBox(Localization.lang("Reformat ISSN"));
-
+        cleanUpISSN = new CheckBox(Localization.lang("Reformat ISSN"));
         Optional<Path> firstExistingDir = databaseContext
                 .getFirstExistingFileDir(JabRefPreferences.getInstance().getFilePreferences());
         if (firstExistingDir.isPresent()) {
-            cleanUpMovePDF = new JCheckBox(Localization.lang("Move linked files to default file directory %0",
+            cleanUpMovePDF = new CheckBox(Localization.lang("Move linked files to default file directory %0",
                     firstExistingDir.get().toString()));
         } else {
-            cleanUpMovePDF = new JCheckBox(Localization.lang("Move linked files to default file directory %0", "..."));
-            cleanUpMovePDF.setEnabled(false);
+            cleanUpMovePDF = new CheckBox(Localization.lang("Move linked files to default file directory %0", "..."));
+            cleanUpMovePDF.setDisable(true);
             // Since the directory does not exist, we cannot move it to there. So, this option is not checked - regardless of the presets stored in the preferences.
             cleanUpMovePDF.setSelected(false);
         }
-
-        cleanUpMakePathsRelative = new JCheckBox(
+        cleanUpMakePathsRelative = new CheckBox(
                 Localization.lang("Make paths of linked files relative (if possible)"));
-        cleanUpRenamePDF = new JCheckBox(Localization.lang("Rename PDFs to given filename format pattern"));
-        cleanUpRenamePDF.addChangeListener(
-                event -> cleanUpRenamePDFonlyRelativePaths.setEnabled(cleanUpRenamePDF.isSelected()));
-        cleanUpRenamePDFonlyRelativePaths = new JCheckBox(Localization.lang("Rename only PDFs having a relative path"));
-        cleanUpUpgradeExternalLinks = new JCheckBox(
+        cleanUpRenamePDF = new CheckBox(Localization.lang("Rename PDFs to given filename format pattern"));
+        cleanUpRenamePDF.selectedProperty().addListener(
+                                                        event -> cleanUpRenamePDFonlyRelativePaths.setDisable(!cleanUpRenamePDF.isSelected()));
+        cleanUpRenamePDFonlyRelativePaths = new CheckBox(Localization.lang("Rename only PDFs having a relative path"));
+        cleanUpUpgradeExternalLinks = new CheckBox(
                 Localization.lang("Upgrade external PDF/PS links to use the '%0' field.", FieldName.FILE));
-        cleanUpBiblatex = new JCheckBox(Localization.lang(
+        cleanUpBiblatex = new CheckBox(Localization.lang(
                 "Convert to biblatex format (for example, move the value of the 'journal' field to 'journaltitle')"));
-        cleanUpBibtex = new JCheckBox(Localization.lang(
+        cleanUpBibtex = new CheckBox(Localization.lang(
                 "Convert to BibTeX format (for example, move the value of the 'journaltitle' field to 'journal')"));
-        ButtonGroup biblatexConversion = new ButtonGroup(); // Only make "to Biblatex" or "to BibTeX" selectable
-        biblatexConversion.add(cleanUpBiblatex);
-        biblatexConversion.add(cleanUpBibtex);
+        Group biblatexConversion = new Group(); // Only make "to Biblatex" or "to BibTeX" selectable
+        biblatexConversion.getChildren().add(cleanUpBiblatex);
+        biblatexConversion.getChildren().add(cleanUpBibtex);
 
         cleanUpFormatters = new FieldFormatterCleanupsPanel(Localization.lang("Run field formatter:"),
                 Cleanups.DEFAULT_SAVE_ACTIONS);
 
         updateDisplay(cleanupPreset);
 
-        FormLayout layout = new FormLayout("left:15dlu, fill:pref:grow",
-                "pref, pref, pref, pref, pref, fill:pref:grow, pref,pref, pref, pref,190dlu, fill:pref:grow,");
-
-        FormBuilder builder = FormBuilder.create().layout(layout);
-        builder.add(cleanUpDOI).xyw(1, 1, 2);
-        builder.add(cleanUpUpgradeExternalLinks).xyw(1, 2, 2);
-        builder.add(cleanUpMovePDF).xyw(1, 3, 2);
-        builder.add(cleanUpMakePathsRelative).xyw(1, 4, 2);
-        builder.add(cleanUpRenamePDF).xyw(1, 5, 2);
+        GridPane container = new GridPane();
+        container.add(cleanUpDOI, 0, 0);
+        container.add(cleanUpUpgradeExternalLinks, 0, 1);
+        container.add(cleanUpMovePDF, 0, 2);
+        container.add(cleanUpMakePathsRelative, 0, 3);
+        container.add(cleanUpRenamePDF, 0, 4);
         String currentPattern = Localization.lang("Filename format pattern").concat(": ");
         currentPattern = currentPattern.concat(Globals.prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
-        builder.add(new JLabel(currentPattern)).xy(2, 6);
-        builder.add(cleanUpRenamePDFonlyRelativePaths).xy(2, 7);
-        builder.add(cleanUpBibtex).xyw(1, 8, 2);
-        builder.add(cleanUpBiblatex).xyw(1, 9, 2);
-        builder.add(cleanUpISSN).xyw(1, 10, 2);
-        builder.add(cleanUpFormatters).xyw(1, 11, 2);
-        panel = builder.build();
-        scrollPane = new JScrollPane(panel);
-        scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-        scrollPane.setVisible(true);
-        scrollPane.setBorder(null);
+        container.add(new Label(currentPattern), 0, 5);
+        container.add(cleanUpRenamePDFonlyRelativePaths, 0, 6);
+        container.add(cleanUpBibtex, 0, 7);
+        container.add(cleanUpBiblatex, 0, 8);
+        container.add(cleanUpISSN, 0, 9);
+        container.add(cleanUpFormatters, 0, 10);
+
+        setContent(container);
+        setVbarPolicy(ScrollBarPolicy.AS_NEEDED);
     }
 
     private void updateDisplay(CleanupPreset preset) {
         cleanUpDOI.setSelected(preset.isCleanUpDOI());
-        if (cleanUpMovePDF.isEnabled()) {
+        if (!cleanUpMovePDF.isDisabled()) {
             cleanUpMovePDF.setSelected(preset.isMovePDF());
         }
         cleanUpMakePathsRelative.setSelected(preset.isMakePathsRelative());
         cleanUpRenamePDF.setSelected(preset.isRenamePDF());
         cleanUpRenamePDFonlyRelativePaths.setSelected(preset.isRenamePdfOnlyRelativePaths());
-        cleanUpRenamePDFonlyRelativePaths.setEnabled(cleanUpRenamePDF.isSelected());
+        cleanUpRenamePDFonlyRelativePaths.setDisable(!cleanUpRenamePDF.isSelected());
         cleanUpUpgradeExternalLinks.setSelected(preset.isCleanUpUpgradeExternalLinks());
         cleanUpBiblatex.setSelected(preset.isConvertToBiblatex());
         cleanUpBibtex.setSelected(preset.isConvertToBibtex());
@@ -125,10 +113,6 @@ private void updateDisplay(CleanupPreset preset) {
         cleanUpFormatters.setValues(preset.getFormatterCleanups());
     }
 
-    public JScrollPane getScrollPane() {
-        return scrollPane;
-    }
-
     public CleanupPreset getCleanupPreset() {
 
         Set<CleanupPreset.CleanupStep> activeJobs = EnumSet.noneOf(CleanupPreset.CleanupStep.class);
diff --git a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
index 9f91f376465..b2aaec4108c 100644
--- a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
@@ -1,32 +1,27 @@
 package org.jabref.gui.cleanup;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionAdapter;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JTextArea;
-import javax.swing.ListSelectionModel;
-import javax.swing.UIManager;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
+
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.RowConstraints;
 
 import org.jabref.Globals;
 import org.jabref.JabRefGUI;
+import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.cleanup.Cleanups;
 import org.jabref.logic.formatter.casechanger.ProtectTermsFormatter;
 import org.jabref.logic.l10n.Localization;
@@ -38,30 +33,29 @@
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.model.metadata.MetaData;
 
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
+import org.fxmisc.easybind.EasyBind;
 
-public class FieldFormatterCleanupsPanel extends JPanel {
+public class FieldFormatterCleanupsPanel extends GridPane {
 
     private static final String DESCRIPTION = Localization.lang("Description") + ": ";
-    private final JCheckBox cleanupEnabled;
+    private final CheckBox cleanupEnabled;
     private FieldFormatterCleanups fieldFormatterCleanups;
-    private JList<?> actionsList;
-    private JComboBox<?> formattersCombobox;
-    private JComboBox<String> selectFieldCombobox;
-    private JButton addButton;
-    private JTextArea descriptionAreaText;
-    private JButton removeButton;
-    private JButton resetButton;
-    private JButton recommendButton;
+    private ListView<FieldFormatterCleanup> actionsList;
+    private ComboBox<Formatter> formattersCombobox;
+    private ComboBox<String> selectFieldCombobox;
+    private Button addButton;
+    private Label descriptionAreaText;
+    private Button removeButton;
+    private Button resetButton;
+    private Button recommendButton;
 
     private final FieldFormatterCleanups defaultFormatters;
-    private List<Formatter> availableFormatters;
-
+    private final List<Formatter> availableFormatters;
+    private ObservableList<FieldFormatterCleanup> actions;
 
     public FieldFormatterCleanupsPanel(String description, FieldFormatterCleanups defaultFormatters) {
         this.defaultFormatters = Objects.requireNonNull(defaultFormatters);
-        cleanupEnabled = new JCheckBox(description);
+        cleanupEnabled = new CheckBox(description);
         availableFormatters = Cleanups.getBuiltInFormatters();
         availableFormatters.add(new ProtectTermsFormatter(Globals.protectedTermsLoader));
     }
@@ -76,127 +70,84 @@ public void setValues(FieldFormatterCleanups formatterCleanups) {
         fieldFormatterCleanups = formatterCleanups;
 
         // first clear existing content
-        this.removeAll();
+        this.getChildren().clear();
 
         List<FieldFormatterCleanup> configuredActions = fieldFormatterCleanups.getConfiguredActions();
-        //The copy is necessary because the original List is unmodifiable
-        List<FieldFormatterCleanup> actionsToDisplay = new ArrayList<>(configuredActions);
-        buildLayout(actionsToDisplay);
-
+        actions = FXCollections.observableArrayList(configuredActions);
+        buildLayout();
     }
 
-    private void buildLayout(List<FieldFormatterCleanup> actionsToDisplay) {
-        FormBuilder builder = FormBuilder.create().layout(new FormLayout(
-                "left:pref, 13dlu, left:pref:grow, 4dlu, pref, 4dlu, pref",
-                "pref, 2dlu, pref, 2dlu, pref, 4dlu, pref, 2dlu, fill:pref:grow, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu"));
-        builder.add(cleanupEnabled).xyw(1, 1, 7);
-
-        actionsList = new JList<>(new CleanupActionsListModel(actionsToDisplay));
-        actionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        actionsList.addMouseMotionListener(new MouseMotionAdapter() {
-
-            @Override
-            public void mouseMoved(MouseEvent e) {
-                super.mouseMoved(e);
-                CleanupActionsListModel m = (CleanupActionsListModel) actionsList.getModel();
-                int index = actionsList.locationToIndex(e.getPoint());
-                if (index > -1) {
-                    actionsList.setToolTipText(m.getElementAt(index).getFormatter().getDescription());
-                }
-            }
-        });
-
-        actionsList.getModel().addListDataListener(new ListDataListener() {
-
-            @Override
-            public void intervalRemoved(ListDataEvent e) {
-                //index0 is sufficient, because of SingleSelection
-                if (e.getIndex0() == 0) {
-                    //when an item gets deleted, the next one becomes the new 0
-                    actionsList.setSelectedIndex(e.getIndex0());
-                }
-                if (e.getIndex0() > 0) {
-                    actionsList.setSelectedIndex(e.getIndex0() - 1);
-                }
-
-            }
-
-            @Override
-            public void intervalAdded(ListDataEvent e) {
-                //empty, not needed
-
-            }
-
-            @Override
-            public void contentsChanged(ListDataEvent e) {
-                //empty, not needed
-
-            }
-        });
-
-        builder.add(actionsList).xyw(3, 5, 5);
-
-        resetButton = new JButton(Localization.lang("Reset"));
-        resetButton.addActionListener(e -> ((CleanupActionsListModel) actionsList.getModel()).reset(defaultFormatters));
+    private void buildLayout() {
+        ColumnConstraints first = new ColumnConstraints();
+        first.setPrefWidth(25);
+        ColumnConstraints second = new ColumnConstraints();
+        second.setPrefWidth(175);
+        ColumnConstraints third = new ColumnConstraints();
+        third.setPrefWidth(200);
+        ColumnConstraints fourth = new ColumnConstraints();
+        fourth.setPrefWidth(200);
+        getColumnConstraints().addAll(first, second, third, fourth);
+        RowConstraints firstR = new RowConstraints();
+        firstR.setPrefHeight(25);
+        RowConstraints secondR = new RowConstraints();
+        secondR.setPrefHeight(100);
+        RowConstraints thirdR = new RowConstraints();
+        thirdR.setPrefHeight(50);
+        RowConstraints fourthR = new RowConstraints();
+        fourthR.setPrefHeight(50);
+        RowConstraints fifthR = new RowConstraints();
+        fifthR.setPrefHeight(50);
+        getRowConstraints().addAll(firstR, secondR, thirdR, fourthR, fifthR);
+        add(cleanupEnabled, 0, 0, 4, 1);
+
+        actionsList = new ListView<>(actions);
+        actionsList.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
+        new ViewModelListCellFactory<FieldFormatterCleanup>()
+                .withText(action -> action.getFormatter().getName())
+                .withTooltip(action -> action.getFormatter().getDescription())
+                .install(actionsList);
+        add(actionsList, 1, 1, 3, 1);
+
+        resetButton = new Button(Localization.lang("Reset"));
+        resetButton.setOnAction(e -> actions.setAll(defaultFormatters.getConfiguredActions()));
 
         BibDatabaseContext databaseContext = JabRefGUI.getMainFrame().getCurrentBasePanel().getBibDatabaseContext();
 
-        recommendButton = new JButton(Localization.lang("Recommended for %0", databaseContext.getMode().getFormattedName()));
+        recommendButton = new Button(Localization.lang("Recommended for %0", databaseContext.getMode().getFormattedName()));
         boolean isBiblatex = databaseContext.isBiblatexMode();
 
-        recommendButton.addActionListener(e -> {
+        recommendButton.setOnAction(e -> {
             if (isBiblatex) {
-                ((CleanupActionsListModel) actionsList.getModel()).reset(Cleanups.RECOMMEND_BIBLATEX_ACTIONS);
+                actions.setAll(Cleanups.RECOMMEND_BIBLATEX_ACTIONS.getConfiguredActions());
             } else {
-                ((CleanupActionsListModel) actionsList.getModel()).reset(Cleanups.RECOMMEND_BIBTEX_ACTIONS);
+                actions.setAll(Cleanups.RECOMMEND_BIBTEX_ACTIONS.getConfiguredActions());
             }
         });
 
-        removeButton = new JButton(Localization.lang("Remove selected"));
-        removeButton.addActionListener(
-                e -> ((CleanupActionsListModel) actionsList.getModel()).removeAtIndex(actionsList.getSelectedIndex()));
+        removeButton = new Button(Localization.lang("Remove selected"));
+        removeButton.setOnAction(e -> actions.remove(actionsList.getSelectionModel().getSelectedItem()));
+        descriptionAreaText = new Label(DESCRIPTION);
+        descriptionAreaText.setWrapText(true);
 
-        builder.add(removeButton).xy(7, 11);
-        builder.add(resetButton).xy(3, 11);
-        builder.add(recommendButton).xy(5, 11);
-        builder.add(getSelectorPanel()).xyw(3, 15, 5);
-
-        makeDescriptionTextAreaLikeJLabel();
-        builder.add(descriptionAreaText).xyw(3, 17, 5);
-        this.setLayout(new BorderLayout());
-        this.add(builder.getPanel(), BorderLayout.WEST);
+        add(removeButton, 3, 2, 1, 1);
+        add(resetButton, 1, 2, 1, 1);
+        add(recommendButton, 2, 2, 1, 1);
+        add(getSelectorPanel(), 1, 3, 3, 1);
+        add(descriptionAreaText, 1, 4, 3, 1);
 
         updateDescription();
 
         // make sure the layout is set according to the checkbox
-        cleanupEnabled.addActionListener(new EnablementStatusListener(fieldFormatterCleanups.isEnabled()));
+        cleanupEnabled.selectedProperty().addListener(new EnablementStatusListener<>(fieldFormatterCleanups.isEnabled()));
         cleanupEnabled.setSelected(fieldFormatterCleanups.isEnabled());
-
-    }
-
-    /**
-     * Create a TextArea that looks and behaves like a JLabel. Has the advantage of supporting multine and wordwrap
-     */
-    private void makeDescriptionTextAreaLikeJLabel() {
-
-        descriptionAreaText = new JTextArea(DESCRIPTION);
-        descriptionAreaText.setLineWrap(true);
-        descriptionAreaText.setWrapStyleWord(true);
-        descriptionAreaText.setColumns(6);
-        descriptionAreaText.setEditable(false);
-        descriptionAreaText.setOpaque(false);
-        descriptionAreaText.setFocusable(false);
-        descriptionAreaText.setCursor(null);
-        descriptionAreaText.setFont(UIManager.getFont("Label.font"));
-
     }
 
     private void updateDescription() {
         FieldFormatterCleanup formatterCleanup = getFieldFormatterCleanup();
-        if (formatterCleanup != null) {
+        if (formatterCleanup.getFormatter() != null) {
             descriptionAreaText.setText(DESCRIPTION + formatterCleanup.getFormatter().getDescription());
         } else {
-            Formatter selectedFormatter = getFieldFormatter();
+            Formatter selectedFormatter = formattersCombobox.getValue();
             if (selectedFormatter != null) {
                 descriptionAreaText.setText(DESCRIPTION + selectedFormatter.getDescription());
             } else {
@@ -207,55 +158,35 @@ private void updateDescription() {
 
     /**
      * This panel contains the two comboboxes and the Add button
-     * @return Returns the created JPanel
      */
-    private JPanel getSelectorPanel() {
-        FormBuilder builder = FormBuilder.create()
-                .layout(new FormLayout("left:pref:grow, 4dlu, left:pref:grow, 4dlu, fill:pref:grow, 4dlu, right:pref",
-                        "fill:pref:grow, 2dlu, pref, 2dlu"));
-
+    private GridPane getSelectorPanel() {
+        GridPane builder = new GridPane();
         List<String> fieldNames = InternalBibtexFields.getAllPublicAndInternalFieldNames();
         fieldNames.add(BibEntry.KEY_FIELD);
         Collections.sort(fieldNames);
-        String[] allPlusKey = fieldNames.toArray(new String[fieldNames.size()]);
-
-        selectFieldCombobox = new JComboBox<>(allPlusKey);
+        selectFieldCombobox = new ComboBox<>(FXCollections.observableArrayList(fieldNames));
         selectFieldCombobox.setEditable(true);
-        builder.add(selectFieldCombobox).xy(1, 1);
-
-        List<String> formatterNames = availableFormatters.stream()
-                .map(Formatter::getName).collect(Collectors.toList());
-        List<String> formatterDescriptions = availableFormatters.stream()
-                .map(Formatter::getDescription).collect(Collectors.toList());
-        formattersCombobox = new JComboBox<>(formatterNames.toArray());
-        formattersCombobox.setRenderer(new DefaultListCellRenderer() {
-
-            @Override
-            public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected,
-                    boolean cellHasFocus) {
-                if ((-1 < index) && (index < formatterDescriptions.size()) && (value != null)) {
-                    setToolTipText(formatterDescriptions.get(index));
-
-                }
-                return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            }
-        });
-        formattersCombobox.addItemListener(e -> updateDescription());
-        builder.add(formattersCombobox).xy(3, 1);
-
-        addButton = new JButton(Localization.lang("Add"));
-        addButton.addActionListener(e -> {
+        builder.add(selectFieldCombobox, 1, 1);
+
+        formattersCombobox = new ComboBox<>(FXCollections.observableArrayList(availableFormatters));
+        new ViewModelListCellFactory<Formatter>()
+                .withText(Formatter::getName)
+                .withTooltip(Formatter::getDescription)
+                .install(formattersCombobox);
+        EasyBind.subscribe(formattersCombobox.valueProperty(), e -> updateDescription());
+        builder.add(formattersCombobox, 3, 1);
+
+        addButton = new Button(Localization.lang("Add"));
+        addButton.setOnAction(e -> {
             FieldFormatterCleanup newAction = getFieldFormatterCleanup();
-            if (newAction == null) {
-                return;
-            }
-
-            ((CleanupActionsListModel) actionsList.getModel()).addCleanupAction(newAction);
 
+            if (!actions.contains(newAction)) {
+                actions.add(newAction);
+            }
         });
-        builder.add(addButton).xy(5, 1);
+        builder.add(addButton, 5, 1);
 
-        return builder.getPanel();
+        return builder;
     }
 
     public void storeSettings(MetaData metaData) {
@@ -273,7 +204,6 @@ public void storeSettings(MetaData metaData) {
     }
 
     public FieldFormatterCleanups getFormatterCleanups() {
-        List<FieldFormatterCleanup> actions = ((CleanupActionsListModel) actionsList.getModel()).getAllActions();
         return new FieldFormatterCleanups(cleanupEnabled.isSelected(), actions);
     }
 
@@ -286,47 +216,30 @@ public boolean isDefaultSaveActions() {
     }
 
     private FieldFormatterCleanup getFieldFormatterCleanup() {
-        Formatter selectedFormatter = getFieldFormatter();
-
-        String fieldKey = selectFieldCombobox.getSelectedItem().toString();
+        Formatter selectedFormatter = formattersCombobox.getValue();
+        String fieldKey = selectFieldCombobox.getValue();
         return new FieldFormatterCleanup(fieldKey, selectedFormatter);
-
-    }
-
-    private Formatter getFieldFormatter() {
-        Formatter selectedFormatter = null;
-        String selectedFormatterName = formattersCombobox.getSelectedItem().toString();
-        for (Formatter formatter : availableFormatters) {
-            if (formatter.getName().equals(selectedFormatterName)) {
-                selectedFormatter = formatter;
-                break;
-            }
-        }
-        return selectedFormatter;
     }
 
-    class EnablementStatusListener implements ActionListener {
+    class EnablementStatusListener<T> implements ChangeListener<T> {
 
         public EnablementStatusListener(boolean initialStatus) {
             setStatus(initialStatus);
         }
 
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            boolean enablementStatus = cleanupEnabled.isSelected();
-            setStatus(enablementStatus);
-
-        }
-
         private void setStatus(boolean status) {
-            actionsList.setEnabled(status);
-            selectFieldCombobox.setEnabled(status);
-            formattersCombobox.setEnabled(status);
-            addButton.setEnabled(status);
-            removeButton.setEnabled(status);
-            resetButton.setEnabled(status);
-            recommendButton.setEnabled(status);
+            actionsList.setDisable(!status);
+            selectFieldCombobox.setDisable(!status);
+            formattersCombobox.setDisable(!status);
+            addButton.setDisable(!status);
+            removeButton.setDisable(!status);
+            resetButton.setDisable(!status);
+            recommendButton.setDisable(!status);
+        }
 
+        @Override
+        public void changed(ObservableValue<? extends T> observable, T oldValue, T newValue) {
+            setStatus(cleanupEnabled.isSelected());
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
index 1a908f2814b..f1a58b0be7c 100644
--- a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
+++ b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java
@@ -141,7 +141,7 @@ private void init() {
         fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
                 Cleanups.DEFAULT_SAVE_ACTIONS);
         builder.addSeparator(Localization.lang("Save actions")).xyw(1, 27, 5);
-        builder.add(fieldFormatterCleanupsPanel).xyw(1, 29, 5);
+        builder.add(CustomJFXPanel.wrap(new Scene(fieldFormatterCleanupsPanel))).xyw(1, 29, 5);
 
         ButtonBarBuilder bb = new ButtonBarBuilder();
         bb.addGlue();
diff --git a/src/main/java/org/jabref/gui/util/ControlHelper.java b/src/main/java/org/jabref/gui/util/ControlHelper.java
index 88d03df9bdb..b5d139b338a 100644
--- a/src/main/java/org/jabref/gui/util/ControlHelper.java
+++ b/src/main/java/org/jabref/gui/util/ControlHelper.java
@@ -28,7 +28,6 @@ public static void setSwingContent(DialogPane dialogPane, JComponent content) {
         SwingNode node = new SwingNode();
         node.setContent(content);
         node.setVisible(true);
-
         dialogPane.setContent(node);
     }
 

From 0f838e3e282a42cbd5e7dffe192f74d6d6a2a53b Mon Sep 17 00:00:00 2001
From: Fabian Bauer <fmbba@web.de>
Date: Tue, 9 Oct 2018 13:01:39 +0200
Subject: [PATCH 101/229] group RadioButtons in ExportSortingPrefsTab to
 prevent the selection of multiple or no order types

---
 .../org/jabref/gui/preferences/ExportSortingPrefsTab.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index 8ca2d2bc027..c567619ee61 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -6,6 +6,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Separator;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.shape.Line;
@@ -35,6 +36,11 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
         exportInTableOrder = new RadioButton(Localization.lang("Export in current table sort order"));
         exportInSpecifiedOrder = new RadioButton(Localization.lang("Export entries ordered as specified"));
 
+        final ToggleGroup group = new ToggleGroup();
+        exportInOriginalOrder.setToggleGroup(group);
+        exportInTableOrder.setToggleGroup(group);
+        exportInSpecifiedOrder.setToggleGroup(group);
+
         exportOrderPanel = new SaveOrderConfigDisplay();
 
         EventHandler<ActionEvent> listener = (event) -> {

From 29838ee5961ac6bd955d43f29fc5e530f381af0b Mon Sep 17 00:00:00 2001
From: Fabian Bauer <fmbba@web.de>
Date: Tue, 9 Oct 2018 13:11:53 +0200
Subject: [PATCH 102/229] fix IndexOutOfBoundsException when saving preferences

---
 .../java/org/jabref/gui/SaveOrderConfigDisplay.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
index 72bd104f5c8..5103fba8d29 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
@@ -17,6 +17,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrderConfig.SortCriterion;
 
 public class SaveOrderConfigDisplay {
 
@@ -85,12 +86,12 @@ public void setEnabled(boolean enabled) {
 
     public SaveOrderConfig getSaveOrderConfig() {
         SaveOrderConfig saveOrderConfig = new SaveOrderConfig();
-        saveOrderConfig.getSortCriteria().get(0).field = getSelectedItemAsLowerCaseTrim(savePriSort);
-        saveOrderConfig.getSortCriteria().get(0).descending = savePriDesc.isSelected();
-        saveOrderConfig.getSortCriteria().get(1).field = getSelectedItemAsLowerCaseTrim(saveSecSort);
-        saveOrderConfig.getSortCriteria().get(1).descending = saveSecDesc.isSelected();
-        saveOrderConfig.getSortCriteria().get(2).field = getSelectedItemAsLowerCaseTrim(saveTerSort);
-        saveOrderConfig.getSortCriteria().get(2).descending = saveTerDesc.isSelected();
+        SortCriterion primary = new SortCriterion(getSelectedItemAsLowerCaseTrim(savePriSort), savePriDesc.isSelected());
+        saveOrderConfig.getSortCriteria().add(primary);
+        SortCriterion secondary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveSecSort), saveSecDesc.isSelected());
+        saveOrderConfig.getSortCriteria().add(secondary);
+        SortCriterion tertiary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveTerSort), saveTerDesc.isSelected());
+        saveOrderConfig.getSortCriteria().add(tertiary);
 
         return saveOrderConfig;
     }

From d8d3807a6c35557843717a6fc197b6eec991527e Mon Sep 17 00:00:00 2001
From: ayachi_nene <1710082010@qq.com>
Date: Wed, 10 Oct 2018 02:00:32 +0800
Subject: [PATCH 103/229] Fix issue 3861 : XMP Dialog, Add new Groups dialog,
 Append Library dialog to javafx (#4264)

* issue_3861

* issue #3861

* Revise append database dialog

* Move replace string dialog to new package (and remove duplicate JavaFX conversion)

* Revise mass set field dialog

* Revise mass set field dialog

* Move mass set field dialog

* Revise group dialog

* Revise group dialog

* Fix checkstyle

* Update JabRef_en.properties

* Update JabRef_en.properties

* Update AppendDatabaseDialog.java

Co-authored-by: Tobias Diez <5037600+tobiasdiez@users.noreply.github.com>
---
 src/main/java/org/jabref/gui/BasePanel.java   |   1 +
 src/main/java/org/jabref/gui/JabRefFrame.java |   5 +-
 src/main/java/org/jabref/gui/MergeDialog.java | 117 ---
 .../gui/actions/MassSetFieldAction.java       | 366 ---------
 .../jabref/gui/actions/WriteXMPAction.java    | 153 ++--
 .../jabref/gui/edit/MassSetFieldsAction.java  |  38 +
 .../jabref/gui/edit/MassSetFieldsDialog.java  | 241 ++++++
 .../jabref/gui/{ => edit}/ReplaceString.fxml  |  16 +-
 .../gui/{ => edit}/ReplaceStringAction.java   |   3 +-
 .../gui/{ => edit}/ReplaceStringView.java     |   3 +-
 .../{ => edit}/ReplaceStringViewModel.java    |   7 +-
 .../org/jabref/gui/groups/GroupDialog.java    | 771 +++++++++---------
 .../jabref/gui/groups/GroupTreeViewModel.java | 110 ++-
 .../gui/importer/AppendDatabaseDialog.java    |  65 ++
 .../actions/AppendDatabaseAction.java         |  18 +-
 .../java/org/jabref/gui/util/BaseDialog.java  |   2 +-
 .../org/jabref/model/util/OptionalUtil.java   |   4 +
 src/main/resources/l10n/JabRef_en.properties  |   8 +-
 18 files changed, 865 insertions(+), 1063 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/MergeDialog.java
 delete mode 100644 src/main/java/org/jabref/gui/actions/MassSetFieldAction.java
 create mode 100644 src/main/java/org/jabref/gui/edit/MassSetFieldsAction.java
 create mode 100644 src/main/java/org/jabref/gui/edit/MassSetFieldsDialog.java
 rename src/main/java/org/jabref/gui/{ => edit}/ReplaceString.fxml (87%)
 rename src/main/java/org/jabref/gui/{ => edit}/ReplaceStringAction.java (86%)
 rename src/main/java/org/jabref/gui/{ => edit}/ReplaceStringView.java (97%)
 rename src/main/java/org/jabref/gui/{ => edit}/ReplaceStringViewModel.java (96%)
 create mode 100644 src/main/java/org/jabref/gui/importer/AppendDatabaseDialog.java

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index b94f9886756..324b6805ccd 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -44,6 +44,7 @@
 import org.jabref.gui.collab.FileUpdatePanel;
 import org.jabref.gui.contentselector.ContentSelectorDialog;
 import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.gui.edit.ReplaceStringAction;
 import org.jabref.gui.entryeditor.EntryEditor;
 import org.jabref.gui.exporter.SaveDatabaseAction;
 import org.jabref.gui.externalfiles.FindFullTextAction;
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index d4ee5712de2..4803df84fa1 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -70,7 +70,6 @@
 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.NewDatabaseAction;
 import org.jabref.gui.actions.NewEntryAction;
@@ -85,6 +84,7 @@
 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;
@@ -152,7 +152,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
     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);
 
@@ -831,7 +830,7 @@ private MenuBar createMenu() {
         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))
 
         );
 
diff --git a/src/main/java/org/jabref/gui/MergeDialog.java b/src/main/java/org/jabref/gui/MergeDialog.java
deleted file mode 100644
index 09ddfb6677d..00000000000
--- a/src/main/java/org/jabref/gui/MergeDialog.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-
-import org.jabref.Globals;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.logic.l10n.Localization;
-
-/**
- * Asks for details about merge database operation.
- */
-public class MergeDialog extends JabRefDialog {
-
-    private final JPanel panel1 = new JPanel();
-    private final BorderLayout borderLayout1 = new BorderLayout();
-    private final JPanel jPanel1 = new JPanel();
-    private final JPanel jPanel2 = new JPanel();
-    private final JButton ok = new JButton();
-    private final JButton cancel = new JButton();
-    private final JCheckBox entries = new JCheckBox();
-    private final JCheckBox strings = new JCheckBox();
-    private final GridBagLayout gridBagLayout1 = new GridBagLayout();
-    private final JCheckBox groups = new JCheckBox();
-    private final JCheckBox selector = new JCheckBox();
-
-
-    private boolean okPressed;
-
-    public MergeDialog(JabRefFrame frame, String title, boolean modal) {
-        super(title, modal, MergeDialog.class);
-        jbInit();
-        pack();
-    }
-
-    public boolean isOkPressed() {
-        return okPressed;
-    }
-
-    private void jbInit() {
-        panel1.setLayout(borderLayout1);
-        ok.setText(Localization.lang("OK"));
-        ok.addActionListener(e -> {
-                okPressed = true;
-                dispose();
-        });
-        cancel.setText(Localization.lang("Cancel"));
-        cancel.addActionListener(e -> dispose());
-        jPanel1.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        jPanel1.setLayout(gridBagLayout1);
-        entries.setSelected(true);
-        entries.setText(Localization.lang("Import entries"));
-        strings.setSelected(true);
-        strings.setText(Localization.lang("Import strings"));
-        groups.setText(Localization.lang("Import group definitions"));
-        selector.setText(Localization.lang("Import word selector definitions"));
-
-        this.setModal(true);
-        this.setResizable(false);
-        getContentPane().add(panel1);
-        panel1.add(jPanel2, BorderLayout.SOUTH);
-        jPanel2.add(ok, null);
-        jPanel2.add(cancel, null);
-        panel1.add(jPanel1, BorderLayout.CENTER);
-        jPanel1.add(entries, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0
-                , GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-        jPanel1.add(strings, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0
-                , GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        jPanel1.add(groups, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0
-                , GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        jPanel1.add(selector, new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.WEST,
-                GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-
-        // Key bindings:
-        ActionMap am = jPanel1.getActionMap();
-        InputMap im = jPanel1.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        });
-
-    }
-
-    public boolean importEntries() {
-        return entries.isSelected();
-    }
-
-    public boolean importGroups() {
-        return groups.isSelected();
-    }
-
-    public boolean importStrings() {
-        return strings.isSelected();
-    }
-
-    public boolean importSelectorWords() {
-        return selector.isSelected();
-    }
-}
-
-
diff --git a/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java b/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java
deleted file mode 100644
index a93aaebe2b8..00000000000
--- a/src/main/java/org/jabref/gui/actions/MassSetFieldAction.java
+++ /dev/null
@@ -1,366 +0,0 @@
-package org.jabref.gui.actions;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-import java.util.Set;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-import javax.swing.undo.UndoableEdit;
-
-import org.jabref.Globals;
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableFieldChange;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-/**
- * An Action for launching mass field.
- *
- * Functionality:
- * * Defaults to selected entries, or all entries if none are selected.
- * * Input field name
- * * Either set field, or clear field.
- */
-public class MassSetFieldAction extends SimpleCommand {
-
-    private final JabRefFrame frame;
-    private JDialog diag;
-    private JRadioButton all;
-    private JRadioButton selected;
-    private JRadioButton clear;
-    private JRadioButton set;
-    private JRadioButton append;
-    private JRadioButton rename;
-    private JComboBox<String> field;
-    private JTextField textFieldSet;
-    private JTextField textFieldAppend;
-    private JTextField textFieldRename;
-    private boolean canceled = true;
-    private JCheckBox overwrite;
-
-    public MassSetFieldAction(JabRefFrame frame) {
-        this.frame = frame;
-    }
-
-    /**
-     * Set a given field to a given value for all entries in a Collection. This method DOES NOT update any UndoManager,
-     * but returns a relevant CompoundEdit that should be registered by the caller.
-     *
-     * @param entries         The entries to set the field for.
-     * @param field           The name of the field to set.
-     * @param textToSet       The value to set. This value can be null, indicating that the field should be cleared.
-     * @param overwriteValues Indicate whether the value should be set even if an entry already has the field set.
-     * @return A CompoundEdit for the entire operation.
-     */
-    private static UndoableEdit massSetField(Collection<BibEntry> entries, String field, String textToSet,
-                                             boolean overwriteValues) {
-
-        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Set field"));
-        for (BibEntry entry : entries) {
-            Optional<String> oldValue = entry.getField(field);
-            // If we are not allowed to overwrite values, check if there is a
-            // nonempty
-            // value already for this entry:
-            if (!overwriteValues && (oldValue.isPresent()) && !oldValue.get().isEmpty()) {
-                continue;
-            }
-            if (textToSet == null) {
-                entry.clearField(field);
-            } else {
-                entry.setField(field, textToSet);
-            }
-            compoundEdit.addEdit(new UndoableFieldChange(entry, field, oldValue.orElse(null), textToSet));
-        }
-        compoundEdit.end();
-        return compoundEdit;
-    }
-
-    private void prepareDialog(boolean selection) {
-        selected.setEnabled(selection);
-        if (selection) {
-            selected.setSelected(true);
-        } else {
-            all.setSelected(true);
-        }
-        // Make sure one of the following ones is selected:
-        if (!set.isSelected() && !clear.isSelected() && !rename.isSelected()) {
-            set.setSelected(true);
-        }
-    }
-
-    @Override
-    public void execute() {
-        BasePanel bp = frame.getCurrentBasePanel();
-        if (bp == null) {
-            return;
-        }
-        List<BibEntry> entries = bp.getSelectedEntries();
-        // Lazy creation of the dialog:
-        if (diag == null) {
-            createDialog();
-        }
-        canceled = true;
-        prepareDialog(!entries.isEmpty());
-        if (diag != null) {
-            diag.setVisible(true);
-        }
-        if (canceled) {
-            return;
-        }
-
-        Collection<BibEntry> entryList;
-        // If all entries should be treated, change the entries array:
-        if (all.isSelected()) {
-            entryList = bp.getDatabase().getEntries();
-        } else {
-            entryList = entries;
-        }
-
-        String toSet = textFieldSet.getText();
-        if (toSet.isEmpty()) {
-            toSet = null;
-        }
-
-        String[] fields = getFieldNames(((String) field.getSelectedItem()).trim().toLowerCase(Locale.ROOT));
-        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Set field"));
-        if (rename.isSelected()) {
-            if (fields.length > 1) {
-                frame.getDialogService().showErrorDialogAndWait(Localization.lang("You can only rename one field at a time"));
-                return; // Do not close the dialog.
-            } else {
-                compoundEdit.addEdit(MassSetFieldAction.massRenameField(entryList, fields[0], textFieldRename.getText(),
-                        overwrite.isSelected()));
-            }
-        } else if (append.isSelected()) {
-            for (String field : fields) {
-                compoundEdit.addEdit(MassSetFieldAction.massAppendField(entryList, field, textFieldAppend.getText()));
-            }
-        } else {
-            for (String field : fields) {
-                compoundEdit.addEdit(MassSetFieldAction.massSetField(entryList, field,
-                        set.isSelected() ? toSet : null,
-                        overwrite.isSelected()));
-            }
-        }
-        compoundEdit.end();
-        bp.getUndoManager().addEdit(compoundEdit);
-        bp.markBaseChanged();
-    }
-
-    /**
-     * Append a given value to a given field for all entries in a Collection. This method DOES NOT update any UndoManager,
-     * but returns a relevant CompoundEdit that should be registered by the caller.
-     *
-     * @param entries      The entries to process the operation for.
-     * @param field        The name of the field to append to.
-     * @param textToAppend The value to set. A null in this case will simply preserve the current field state.
-     * @return A CompoundEdit for the entire operation.
-     */
-    private static UndoableEdit massAppendField(Collection<BibEntry> entries, String field, String textToAppend) {
-
-        String newValue = "";
-
-        if (textToAppend != null) {
-            newValue = textToAppend;
-        }
-
-        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Append field"));
-        for (BibEntry entry : entries) {
-            Optional<String> oldValue = entry.getField(field);
-            entry.setField(field, oldValue.orElse("") + newValue);
-            compoundEdit.addEdit(new UndoableFieldChange(entry, field, oldValue.orElse(null), newValue));
-        }
-        compoundEdit.end();
-        return compoundEdit;
-    }
-
-    /**
-     * Move contents from one field to another for a Collection of entries.
-     *
-     * @param entries         The entries to do this operation for.
-     * @param field           The field to move contents from.
-     * @param newField        The field to move contents into.
-     * @param overwriteValues If true, overwrites any existing values in the new field. If false, makes no change for
-     *                        entries with existing value in the new field.
-     * @return A CompoundEdit for the entire operation.
-     */
-    private static UndoableEdit massRenameField(Collection<BibEntry> entries, String field, String newField,
-                                                boolean overwriteValues) {
-        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Rename field"));
-        for (BibEntry entry : entries) {
-            Optional<String> valToMove = entry.getField(field);
-            // If there is no value, do nothing:
-            if ((!valToMove.isPresent()) || valToMove.get().isEmpty()) {
-                continue;
-            }
-            // If we are not allowed to overwrite values, check if there is a
-            // non-empty value already for this entry for the new field:
-            Optional<String> valInNewField = entry.getField(newField);
-            if (!overwriteValues && (valInNewField.isPresent()) && !valInNewField.get().isEmpty()) {
-                continue;
-            }
-
-            entry.setField(newField, valToMove.get());
-            compoundEdit.addEdit(new UndoableFieldChange(entry, newField, valInNewField.orElse(null), valToMove.get()));
-            entry.clearField(field);
-            compoundEdit.addEdit(new UndoableFieldChange(entry, field, valToMove.get(), null));
-        }
-        compoundEdit.end();
-        return compoundEdit;
-    }
-
-    private void createDialog() {
-        diag = new JDialog((JFrame) null, Localization.lang("Set/clear/append/rename fields"), true);
-
-        field = new JComboBox<>();
-        field.setEditable(true);
-        textFieldSet = new JTextField();
-        textFieldSet.setEnabled(false);
-        textFieldAppend = new JTextField();
-        textFieldAppend.setEnabled(false);
-        textFieldRename = new JTextField();
-        textFieldRename.setEnabled(false);
-
-        JButton ok = new JButton(Localization.lang("OK"));
-        JButton cancel = new JButton(Localization.lang("Cancel"));
-
-        all = new JRadioButton(Localization.lang("All entries"));
-        selected = new JRadioButton(Localization.lang("Selected entries"));
-        clear = new JRadioButton(Localization.lang("Clear fields"));
-        set = new JRadioButton(Localization.lang("Set fields"));
-        append = new JRadioButton(Localization.lang("Append to fields"));
-        rename = new JRadioButton(Localization.lang("Rename field to") + ":");
-        rename.setToolTipText(Localization.lang("Move contents of a field into a field with a different name"));
-
-        Set<String> allFields = frame.getCurrentBasePanel().getDatabase().getAllVisibleFields();
-
-        for (String f : allFields) {
-            field.addItem(f);
-        }
-
-        set.addChangeListener(e ->
-                // Entering a setText is only relevant if we are setting, not clearing:
-                textFieldSet.setEnabled(set.isSelected()));
-
-        append.addChangeListener(e -> {
-            // Text to append is only required if we are appending:
-            textFieldAppend.setEnabled(append.isSelected());
-            // Overwrite protection makes no sense if we are appending to a field:
-            overwrite.setEnabled(!clear.isSelected() && !append.isSelected());
-        });
-
-        clear.addChangeListener(e ->
-                // Overwrite protection makes no sense if we are clearing the field:
-                overwrite.setEnabled(!clear.isSelected() && !append.isSelected()));
-
-        rename.addChangeListener(e ->
-                // Entering a setText is only relevant if we are renaming
-                textFieldRename.setEnabled(rename.isSelected()));
-
-        overwrite = new JCheckBox(Localization.lang("Overwrite existing field values"), true);
-        ButtonGroup bg = new ButtonGroup();
-        bg.add(all);
-        bg.add(selected);
-        bg = new ButtonGroup();
-        bg.add(clear);
-        bg.add(set);
-        bg.add(append);
-        bg.add(rename);
-        FormBuilder builder = FormBuilder.create().layout(new FormLayout(
-                "left:pref, 4dlu, fill:100dlu:grow", "pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref"));
-        builder.addSeparator(Localization.lang("Field name")).xyw(1, 1, 3);
-        builder.add(Localization.lang("Field name")).xy(1, 3);
-        builder.add(field).xy(3, 3);
-        builder.addSeparator(Localization.lang("Include entries")).xyw(1, 5, 3);
-        builder.add(all).xyw(1, 7, 3);
-        builder.add(selected).xyw(1, 9, 3);
-        builder.addSeparator(Localization.lang("New field value")).xyw(1, 11, 3);
-        builder.add(set).xy(1, 13);
-        builder.add(textFieldSet).xy(3, 13);
-        builder.add(clear).xyw(1, 15, 3);
-        builder.add(append).xy(1, 17);
-        builder.add(textFieldAppend).xy(3, 17);
-        builder.add(rename).xy(1, 19);
-        builder.add(textFieldRename).xy(3, 19);
-        builder.add(overwrite).xyw(1, 21, 3);
-
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-        bb.addButton(ok);
-        bb.addButton(cancel);
-        bb.addGlue();
-        builder.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        bb.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        diag.getContentPane().add(builder.getPanel(), BorderLayout.CENTER);
-        diag.getContentPane().add(bb.getPanel(), BorderLayout.SOUTH);
-        diag.pack();
-
-        ok.addActionListener(e -> {
-            // Check that any field name is set
-            String fieldText = (String) field.getSelectedItem();
-            if ((fieldText == null) || fieldText.trim().isEmpty()) {
-
-                frame.getDialogService().showErrorDialogAndWait(Localization.lang("You must enter at least one field name"));
-
-                return; // Do not close the dialog.
-            }
-
-            // Check if the user tries to rename multiple fields:
-            if (rename.isSelected()) {
-                String[] fields = getFieldNames(fieldText);
-                if (fields.length > 1) {
-
-                    frame.getDialogService().showErrorDialogAndWait(Localization.lang("You can only rename one field at a time"));
-
-                    return; // Do not close the dialog.
-                }
-            }
-            canceled = false;
-            diag.dispose();
-        });
-
-        Action cancelAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                canceled = true;
-                diag.dispose();
-            }
-        };
-        cancel.addActionListener(cancelAction);
-
-        // Key bindings:
-        ActionMap am = builder.getPanel().getActionMap();
-        InputMap im = builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", cancelAction);
-    }
-
-    private static String[] getFieldNames(String s) {
-        return s.split("[\\s;,]");
-    }
-}
diff --git a/src/main/java/org/jabref/gui/actions/WriteXMPAction.java b/src/main/java/org/jabref/gui/actions/WriteXMPAction.java
index 9d77d998195..de4face8b53 100644
--- a/src/main/java/org/jabref/gui/actions/WriteXMPAction.java
+++ b/src/main/java/org/jabref/gui/actions/WriteXMPAction.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.actions;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
@@ -11,31 +7,29 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingUtilities;
+import javafx.application.Platform;
+import javafx.geometry.Insets;
+import javafx.scene.control.Button;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextArea;
+import javafx.scene.input.KeyCode;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.layout.GridPane;
+import javafx.scene.paint.Color;
+import javafx.stage.Stage;
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.keyboard.KeyBinding;
+import org.jabref.gui.FXDialog;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.xmp.XmpUtilWriter;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-
 public class WriteXMPAction extends SimpleCommand {
 
     private final BasePanel basePanel;
@@ -116,49 +110,49 @@ private void writeXMP() {
                                     .map(Optional::get)
                                     .collect(Collectors.toList());
 
-            SwingUtilities.invokeLater(() -> optionsDialog.getProgressArea()
-                                                          .append(entry.getCiteKeyOptional().orElse(Localization.lang("undefined")) + "\n"));
+            Platform.runLater(() -> optionsDialog.getProgressArea()
+                                                 .appendText(entry.getCiteKeyOptional().orElse(Localization.lang("undefined")) + "\n"));
 
             if (files.isEmpty()) {
                 skipped++;
-                SwingUtilities.invokeLater(() -> optionsDialog.getProgressArea()
-                                                              .append("  " + Localization.lang("Skipped - No PDF linked") + ".\n"));
+                Platform.runLater(() -> optionsDialog.getProgressArea()
+                                                     .appendText("  " + Localization.lang("Skipped - No PDF linked") + ".\n"));
             } else {
                 for (Path file : files) {
                     if (Files.exists(file)) {
                         try {
                             XmpUtilWriter.writeXmp(file, entry, database, Globals.prefs.getXMPPreferences());
-                            SwingUtilities.invokeLater(
-                                    () -> optionsDialog.getProgressArea().append("  " + Localization.lang("OK") + ".\n"));
+                            Platform.runLater(
+                                              () -> optionsDialog.getProgressArea().appendText("  " + Localization.lang("OK") + ".\n"));
                             entriesChanged++;
                         } catch (Exception e) {
-                            SwingUtilities.invokeLater(() -> {
-                                optionsDialog.getProgressArea().append("  " + Localization.lang("Error while writing") + " '"
+                            Platform.runLater(() -> {
+                                optionsDialog.getProgressArea().appendText("  " + Localization.lang("Error while writing") + " '"
                                         + file.toString() + "':\n");
-                                optionsDialog.getProgressArea().append("    " + e.getLocalizedMessage() + "\n");
+                                optionsDialog.getProgressArea().appendText("    " + e.getLocalizedMessage() + "\n");
                             });
                             errors++;
                         }
                     } else {
                         skipped++;
-                        SwingUtilities.invokeLater(() -> {
+                        Platform.runLater(() -> {
                             optionsDialog.getProgressArea()
-                                         .append("  " + Localization.lang("Skipped - PDF does not exist") + ":\n");
-                            optionsDialog.getProgressArea().append("    " + file.toString() + "\n");
+                                         .appendText("  " + Localization.lang("Skipped - PDF does not exist") + ":\n");
+                            optionsDialog.getProgressArea().appendText("    " + file.toString() + "\n");
                         });
                     }
                 }
             }
 
             if (optionsDialog.isCanceled()) {
-                SwingUtilities.invokeLater(
-                        () -> optionsDialog.getProgressArea().append("\n" + Localization.lang("Operation canceled.") + "\n"));
+                Platform.runLater(
+                                  () -> optionsDialog.getProgressArea().appendText("\n" + Localization.lang("Operation canceled.") + "\n"));
                 break;
             }
         }
-        SwingUtilities.invokeLater(() -> {
+        Platform.runLater(() -> {
             optionsDialog.getProgressArea()
-                         .append("\n"
+                         .appendText("\n"
                            + Localization.lang("Finished writing XMP for %0 file (%1 skipped, %2 errors).", String
                            .valueOf(entriesChanged), String.valueOf(skipped), String.valueOf(errors)));
             optionsDialog.done();
@@ -172,92 +166,71 @@ private void writeXMP() {
                 String.valueOf(entriesChanged), String.valueOf(skipped), String.valueOf(errors)));
     }
 
-    class OptionsDialog extends JabRefDialog {
+    class OptionsDialog extends FXDialog {
 
-        private final JButton okButton = new JButton(Localization.lang("OK"));
-        private final JButton cancelButton = new JButton(Localization.lang("Cancel"));
+        private final Button okButton = new Button(Localization.lang("OK"));
+        private final Button cancelButton = new Button(Localization.lang("Cancel"));
 
         private boolean isCancelled;
 
-        private final JTextArea progressArea;
+        private final TextArea progressArea;
 
         public OptionsDialog() {
-            super(Localization.lang("Writing XMP-metadata for selected entries..."), false, WriteXMPAction.OptionsDialog.class);
-            okButton.setEnabled(false);
-
-            okButton.addActionListener(e -> dispose());
-
-            AbstractAction cancel = new AbstractAction() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
+            super(AlertType.NONE, Localization.lang("Writing XMP-metadata for selected entries..."), false);
+            okButton.setDisable(true);
+            okButton.setOnAction(e -> dispose());
+            okButton.setPrefSize(100, 30);
+            cancelButton.setOnAction(e -> isCancelled = true);
+            cancelButton.setOnKeyPressed(e -> {
+                if (e.getCode() == KeyCode.ESCAPE) {
                     isCancelled = true;
                 }
-            };
-            cancelButton.addActionListener(cancel);
-
-            InputMap im = cancelButton.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-            ActionMap am = cancelButton.getActionMap();
-            im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-            am.put("close", cancel);
-
-            progressArea = new JTextArea(15, 60);
-
-            JScrollPane scrollPane = new JScrollPane(progressArea,
-                    ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-            Dimension d = progressArea.getPreferredSize();
-            d.height += scrollPane.getHorizontalScrollBar().getHeight() + 15;
-            d.width += scrollPane.getVerticalScrollBar().getWidth() + 15;
-
-            progressArea.setBackground(Color.WHITE);
+            });
+            cancelButton.setPrefSize(100, 30);
+            progressArea = new TextArea();
+            ScrollPane scrollPane = new ScrollPane(progressArea);
+            progressArea.setBackground(new Background(new BackgroundFill(Color.WHITE, CornerRadii.EMPTY, Insets.EMPTY)));
             progressArea.setEditable(false);
-            progressArea.setBorder(BorderFactory.createEmptyBorder(3, 3, 3,
-                    3));
             progressArea.setText("");
 
-            JPanel tmpPanel = new JPanel();
-            tmpPanel.setBorder(BorderFactory.createEmptyBorder(3, 2, 3, 2));
-            tmpPanel.add(scrollPane);
-
-            // progressArea.setPreferredSize(new Dimension(300, 300));
-
-            ButtonBarBuilder bb = new ButtonBarBuilder();
-            bb.addGlue();
-            bb.addButton(okButton);
-            bb.addRelatedGap();
-            bb.addButton(cancelButton);
-            bb.addGlue();
-            JPanel bbPanel = bb.getPanel();
-            bbPanel.setBorder(BorderFactory.createEmptyBorder(0, 3, 3, 3));
-            getContentPane().add(tmpPanel, BorderLayout.CENTER);
-            getContentPane().add(bbPanel, BorderLayout.SOUTH);
-
-            pack();
+            GridPane tmpPanel = new GridPane();
+            getDialogPane().setContent(tmpPanel);
+            tmpPanel.setHgap(450);
+            tmpPanel.setVgap(10);
+            tmpPanel.add(scrollPane, 0, 0, 2, 1);
+            tmpPanel.add(okButton, 0, 1);
+            tmpPanel.add(cancelButton, 1, 1);
+            tmpPanel.setGridLinesVisible(false);
             this.setResizable(false);
 
         }
 
+        private void dispose() {
+            ((Stage) (getDialogPane().getScene().getWindow())).close();
+        }
+
         public void done() {
-            okButton.setEnabled(true);
-            cancelButton.setEnabled(false);
+            okButton.setDisable(false);
+            cancelButton.setDisable(true);
         }
 
         public void open() {
             progressArea.setText("");
             isCancelled = false;
 
-            okButton.setEnabled(false);
-            cancelButton.setEnabled(true);
+            okButton.setDisable(true);
+            cancelButton.setDisable(false);
 
             okButton.requestFocus();
 
-            optionsDialog.setVisible(true);
+            optionsDialog.show();
         }
 
         public boolean isCanceled() {
             return isCancelled;
         }
 
-        public JTextArea getProgressArea() {
+        public TextArea getProgressArea() {
             return progressArea;
         }
     }
diff --git a/src/main/java/org/jabref/gui/edit/MassSetFieldsAction.java b/src/main/java/org/jabref/gui/edit/MassSetFieldsAction.java
new file mode 100644
index 00000000000..31abaec6000
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/MassSetFieldsAction.java
@@ -0,0 +1,38 @@
+package org.jabref.gui.edit;
+
+import java.util.List;
+
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.model.entry.BibEntry;
+
+/**
+ * An Action for launching mass field.
+ *
+ * Functionality:
+ * * Defaults to selected entries, or all entries if none are selected.
+ * * Input field name
+ * * Either set field, or clear field.
+ */
+public class MassSetFieldsAction extends SimpleCommand {
+
+    private final JabRefFrame frame;
+
+    public MassSetFieldsAction(JabRefFrame frame) {
+        this.frame = frame;
+    }
+
+    @Override
+    public void execute() {
+        BasePanel bp = frame.getCurrentBasePanel();
+        if (bp == null) {
+            return;
+        }
+
+        List<BibEntry> entries = bp.getSelectedEntries();
+        MassSetFieldsDialog dialog = new MassSetFieldsDialog(entries, bp);
+        dialog.showAndWait();
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/edit/MassSetFieldsDialog.java b/src/main/java/org/jabref/gui/edit/MassSetFieldsDialog.java
new file mode 100644
index 00000000000..bef87619d19
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/MassSetFieldsDialog.java
@@ -0,0 +1,241 @@
+package org.jabref.gui.edit;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoableEdit;
+
+import javafx.application.Platform;
+import javafx.geometry.Insets;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.GridPane;
+
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.strings.StringUtil;
+
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.Severity;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.Validator;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+public class MassSetFieldsDialog extends BaseDialog<Void> {
+
+    private final List<BibEntry> entries;
+    private final BasePanel bp;
+    private final DialogService dialogService;
+
+    private RadioButton clearRadioButton;
+    private RadioButton setRadioButton;
+    private RadioButton appendRadioButton;
+    private RadioButton renameRadioButton;
+    private ComboBox<String> fieldComboBox;
+    private TextField setTextField;
+    private TextField appendTextField;
+    private TextField renameTextField;
+    private CheckBox overwriteCheckBox;
+
+    MassSetFieldsDialog(List<BibEntry> entries, BasePanel bp) {
+        this.entries = entries;
+        this.bp = bp;
+        this.dialogService = bp.frame().getDialogService();
+
+        init();
+        this.setTitle("Set/clear/append/rename fields");
+        this.getDialogPane().getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
+        this.setResultConverter(button -> {
+            if (button == ButtonType.OK) {
+                performEdits();
+            }
+            return null;
+        });
+    }
+
+    /**
+     * Append a given value to a given field for all entries in a Collection. This method DOES NOT update any UndoManager,
+     * but returns a relevant CompoundEdit that should be registered by the caller.
+     *
+     * @param entries      The entries to process the operation for.
+     * @param field        The name of the field to append to.
+     * @param textToAppend The value to set. A null in this case will simply preserve the current field state.
+     * @return A CompoundEdit for the entire operation.
+     */
+    private static UndoableEdit massAppendField(Collection<BibEntry> entries, String field, String textToAppend) {
+
+        String newValue = "";
+
+        if (textToAppend != null) {
+            newValue = textToAppend;
+        }
+
+        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Append field"));
+        for (BibEntry entry : entries) {
+            Optional<String> oldValue = entry.getField(field);
+            entry.setField(field, oldValue.orElse("") + newValue);
+            compoundEdit.addEdit(new UndoableFieldChange(entry, field, oldValue.orElse(null), newValue));
+        }
+        compoundEdit.end();
+        return compoundEdit;
+    }
+
+    /**
+     * Move contents from one field to another for a Collection of entries.
+     *
+     * @param entries         The entries to do this operation for.
+     * @param field           The field to move contents from.
+     * @param newField        The field to move contents into.
+     * @param overwriteValues If true, overwrites any existing values in the new field. If false, makes no change for
+     *                        entries with existing value in the new field.
+     * @return A CompoundEdit for the entire operation.
+     */
+    private static UndoableEdit massRenameField(Collection<BibEntry> entries, String field, String newField,
+                                                boolean overwriteValues) {
+        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Rename field"));
+        for (BibEntry entry : entries) {
+            Optional<String> valToMove = entry.getField(field);
+            // If there is no value, do nothing:
+            if ((!valToMove.isPresent()) || valToMove.get().isEmpty()) {
+                continue;
+            }
+            // If we are not allowed to overwrite values, check if there is a
+            // non-empty value already for this entry for the new field:
+            Optional<String> valInNewField = entry.getField(newField);
+            if (!overwriteValues && (valInNewField.isPresent()) && !valInNewField.get().isEmpty()) {
+                continue;
+            }
+
+            entry.setField(newField, valToMove.get());
+            compoundEdit.addEdit(new UndoableFieldChange(entry, newField, valInNewField.orElse(null), valToMove.get()));
+            entry.clearField(field);
+            compoundEdit.addEdit(new UndoableFieldChange(entry, field, valToMove.get(), null));
+        }
+        compoundEdit.end();
+        return compoundEdit;
+    }
+
+    /**
+     * Set a given field to a given value for all entries in a Collection. This method DOES NOT update any UndoManager,
+     * but returns a relevant CompoundEdit that should be registered by the caller.
+     *
+     * @param entries         The entries to set the field for.
+     * @param field           The name of the field to set.
+     * @param textToSet       The value to set. This value can be null, indicating that the field should be cleared.
+     * @param overwriteValues Indicate whether the value should be set even if an entry already has the field set.
+     * @return A CompoundEdit for the entire operation.
+     */
+    private static UndoableEdit massSetField(Collection<BibEntry> entries, String field, String textToSet,
+                                             boolean overwriteValues) {
+
+        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Set field"));
+        for (BibEntry entry : entries) {
+            Optional<String> oldValue = entry.getField(field);
+            // If we are not allowed to overwrite values, check if there is a
+            // nonempty
+            // value already for this entry:
+            if (!overwriteValues && (oldValue.isPresent()) && !oldValue.get().isEmpty()) {
+                continue;
+            }
+            if (textToSet == null) {
+                entry.clearField(field);
+            } else {
+                entry.setField(field, textToSet);
+            }
+            compoundEdit.addEdit(new UndoableFieldChange(entry, field, oldValue.orElse(null), textToSet));
+        }
+        compoundEdit.end();
+        return compoundEdit;
+    }
+
+    private void init() {
+        fieldComboBox = new ComboBox<>();
+        fieldComboBox.setEditable(true);
+        fieldComboBox.getItems().addAll(bp.getDatabase().getAllVisibleFields());
+
+        ToggleGroup toggleGroup = new ToggleGroup();
+        clearRadioButton = new RadioButton(Localization.lang("Clear fields"));
+        clearRadioButton.setToggleGroup(toggleGroup);
+        renameRadioButton = new RadioButton(Localization.lang("Rename field to") + ":");
+        renameRadioButton.setTooltip(new Tooltip(Localization.lang("Move contents of a field into a field with a different name")));
+        renameRadioButton.setToggleGroup(toggleGroup);
+        setRadioButton = new RadioButton(Localization.lang("Set fields") + ":");
+        setRadioButton.setToggleGroup(toggleGroup);
+        appendRadioButton = new RadioButton(Localization.lang("Append to fields") + ":");
+        appendRadioButton.setToggleGroup(toggleGroup);
+
+        setTextField = new TextField();
+        setTextField.disableProperty().bind(setRadioButton.selectedProperty().not());
+        appendTextField = new TextField();
+        appendTextField.disableProperty().bind(appendRadioButton.selectedProperty().not());
+        renameTextField = new TextField();
+        renameTextField.disableProperty().bind(renameRadioButton.selectedProperty().not());
+
+        overwriteCheckBox = new CheckBox("Overwrite existing field values");
+
+        GridPane main = new GridPane();
+        main.add(new Label(Localization.lang("Field name")), 0, 0);
+        main.add(fieldComboBox, 1, 0);
+        main.add(setRadioButton, 0, 2);
+        main.add(setTextField, 1, 2);
+        main.add(appendRadioButton, 0, 3);
+        main.add(appendTextField, 1, 3);
+        main.add(renameRadioButton, 0, 4);
+        main.add(renameTextField, 1, 4);
+        main.add(clearRadioButton, 0, 5);
+        main.add(overwriteCheckBox, 0, 7);
+
+        main.setPadding(new Insets(15, 15, 0, 15));
+        main.setGridLinesVisible(false);
+        main.setVgap(4);
+        main.setHgap(10);
+        getDialogPane().setContent(main);
+
+        Validator fieldNameValidator = new FunctionBasedValidator<>(
+                fieldComboBox.valueProperty(),
+                StringUtil::isNotBlank,
+                new ValidationMessage(Severity.ERROR, Localization.lang("You must enter at least one field name"))
+        );
+        Platform.runLater(() -> {
+            // Need to run this async, otherwise the dialog does not work
+            ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
+            visualizer.setDecoration(new IconValidationDecorator());
+            visualizer.initVisualization(fieldNameValidator.getValidationStatus(), fieldComboBox, true);
+        });
+    }
+
+    private void performEdits() {
+        String toSet = setTextField.getText();
+        if (toSet.isEmpty()) {
+            toSet = null;
+        }
+
+        String fieldName = fieldComboBox.getValue();
+
+        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Set field"));
+        if (renameRadioButton.isSelected()) {
+            compoundEdit.addEdit(massRenameField(entries, fieldName, renameTextField.getText(), overwriteCheckBox.isSelected()));
+        } else if (appendRadioButton.isSelected()) {
+            compoundEdit.addEdit(massAppendField(entries, fieldName, appendTextField.getText()));
+        } else {
+            compoundEdit.addEdit(massSetField(entries, fieldName,
+                    setRadioButton.isSelected() ? toSet : null,
+                    overwriteCheckBox.isSelected()));
+        }
+        compoundEdit.end();
+        bp.getUndoManager().addEdit(compoundEdit);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/ReplaceString.fxml b/src/main/java/org/jabref/gui/edit/ReplaceString.fxml
similarity index 87%
rename from src/main/java/org/jabref/gui/ReplaceString.fxml
rename to src/main/java/org/jabref/gui/edit/ReplaceString.fxml
index 7d1c6a3488b..1800ac172fa 100644
--- a/src/main/java/org/jabref/gui/ReplaceString.fxml
+++ b/src/main/java/org/jabref/gui/edit/ReplaceString.fxml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
 <DialogPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8"
-            fx:controller="org.jabref.gui.ReplaceStringView">
+            fx:controller="org.jabref.gui.edit.ReplaceStringView">
     <content>
         <BorderPane>
             <center>
diff --git a/src/main/java/org/jabref/gui/ReplaceStringAction.java b/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
similarity index 86%
rename from src/main/java/org/jabref/gui/ReplaceStringAction.java
rename to src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
index e115e8f8377..ae759a01648 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringAction.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
@@ -1,5 +1,6 @@
-package org.jabref.gui;
+package org.jabref.gui.edit;
 
+import org.jabref.gui.BasePanel;
 import org.jabref.gui.actions.SimpleCommand;
 
 public class ReplaceStringAction extends SimpleCommand
diff --git a/src/main/java/org/jabref/gui/ReplaceStringView.java b/src/main/java/org/jabref/gui/edit/ReplaceStringView.java
similarity index 97%
rename from src/main/java/org/jabref/gui/ReplaceStringView.java
rename to src/main/java/org/jabref/gui/edit/ReplaceStringView.java
index 64c6950b024..e03b70b0167 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringView.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringView.java
@@ -1,4 +1,4 @@
-package org.jabref.gui;
+package org.jabref.gui.edit;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
@@ -6,6 +6,7 @@
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
 
+import org.jabref.gui.BasePanel;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.IconValidationDecorator;
diff --git a/src/main/java/org/jabref/gui/ReplaceStringViewModel.java b/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
similarity index 96%
rename from src/main/java/org/jabref/gui/ReplaceStringViewModel.java
rename to src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
index 624fbd4b43e..89fff7fa8b7 100644
--- a/src/main/java/org/jabref/gui/ReplaceStringViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui;
+package org.jabref.gui.edit;
 
 import java.util.Objects;
 
@@ -7,6 +7,8 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.BasePanel;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.l10n.Localization;
@@ -56,8 +58,7 @@ public int replace() {
     /**
      * Does the actual operation on a Bibtex entry based on the
      * settings specified in this same dialog. Returns the number of
-     * occurences replaced.
-     * Copied and Adapted from org.jabref.gui.ReplaceStringDialog.java
+     * occurrences replaced.
      */
     private int replaceItem(BibEntry entry, NamedCompound compound) {
         int counter = 0;
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.java b/src/main/java/org/jabref/gui/groups/GroupDialog.java
index b233bd1fe86..85f320b0040 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.java
@@ -1,46 +1,41 @@
 package org.jabref.gui.groups;
 
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ItemListener;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingConstants;
-import javax.swing.event.CaretListener;
-
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.HPos;
+import javafx.geometry.Insets;
 import javafx.scene.Node;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.ScrollPane.ScrollBarPolicy;
+import javafx.scene.control.TextField;
+import javafx.scene.control.Toggle;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontPosture;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
+import javafx.scene.web.WebView;
 
 import org.jabref.Globals;
 import org.jabref.JabRefGUI;
-import org.jabref.gui.Dialog;
-import org.jabref.gui.JabRefDialog;
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.search.rules.describer.SearchDescribers;
+import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.TooltipTextUtil;
 import org.jabref.logic.auxparser.DefaultAuxParser;
 import org.jabref.logic.l10n.Localization;
@@ -61,83 +56,62 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
 /**
  * Dialog for creating or modifying groups. Operates directly on the Vector
  * containing group information.
  */
-class GroupDialog extends JabRefDialog implements Dialog<AbstractGroup> {
+class GroupDialog extends BaseDialog<AbstractGroup> {
 
     private static final int INDEX_EXPLICIT_GROUP = 0;
     private static final int INDEX_KEYWORD_GROUP = 1;
     private static final int INDEX_SEARCH_GROUP = 2;
     private static final int INDEX_AUTO_GROUP = 3;
     private static final int INDEX_TEX_GROUP = 4;
-    private static final int TEXTFIELD_LENGTH = 30;
+    private static final int TEXTFIELD_LENGTH = 40;
+    private static final int HGAP = 7;
+    private static final int VGAP = 5;
+    private static final Insets PADDING = new Insets(5, 5, 5, 5);
+
     // for all types
-    private final JTextField nameField = new JTextField(GroupDialog.TEXTFIELD_LENGTH);
-    private final JRadioButton explicitRadioButton = new JRadioButton(
-            Localization.lang("Statically group entries by manual assignment"));
-    private final JRadioButton keywordsRadioButton = new JRadioButton(
-            Localization.lang("Dynamically group entries by searching a field for a keyword"));
-    private final JRadioButton searchRadioButton = new JRadioButton(
-            Localization.lang("Dynamically group entries by a free-form search expression"));
-    private final JRadioButton autoRadioButton = new JRadioButton(
-            Localization.lang("Automatically create groups"));
-    private final JRadioButton texRadioButton = new JRadioButton(
-            Localization.lang("Group containing entries cited in a given TeX file"));
-    private final JRadioButton independentButton = new JRadioButton(
-            Localization.lang("Independent group: When selected, view only this group's entries"));
-    private final JRadioButton intersectionButton = new JRadioButton(
-            Localization.lang("Refine supergroup: When selected, view entries contained in both this group and its supergroup"));
-    private final JRadioButton unionButton = new JRadioButton(
-            Localization.lang("Include subgroups: When selected, view entries contained in this group or its subgroups"));
-    private final JTextField colorField = new JTextField(GroupDialog.TEXTFIELD_LENGTH);
-    private final JTextField descriptionField = new JTextField(GroupDialog.TEXTFIELD_LENGTH);
-    private final JTextField iconField = new JTextField(GroupDialog.TEXTFIELD_LENGTH);
+    private final TextField nameField = new TextField();
+    private final TextField descriptionField = new TextField();
+    private final TextField colorField = new TextField();
+    private final TextField iconField = new TextField();
+    private final RadioButton explicitRadioButton = new RadioButton(Localization.lang("Statically group entries by manual assignment"));
+    private final RadioButton keywordsRadioButton = new RadioButton(Localization.lang("Dynamically group entries by searching a field for a keyword"));
+    private final RadioButton searchRadioButton = new RadioButton(Localization.lang("Dynamically group entries by a free-form search expression"));
+    private final RadioButton autoRadioButton = new RadioButton(Localization.lang("Automatically create groups"));
+    private final RadioButton texRadioButton = new RadioButton(Localization.lang("Group containing entries cited in a given TeX file"));
+    private final RadioButton independentButton = new RadioButton(Localization.lang("Independent group: When selected, view only this group's entries"));
+    private final RadioButton intersectionButton = new RadioButton(Localization.lang("Refine supergroup: When selected, view entries contained in both this group and its supergroup"));
+    private final RadioButton unionButton = new RadioButton(Localization.lang("Include subgroups: When selected, view entries contained in this group or its subgroups"));
 
     // for KeywordGroup
-    private final JTextField keywordGroupSearchField = new JTextField(GroupDialog.TEXTFIELD_LENGTH);
-    private final JTextField keywordGroupSearchTerm = new JTextField(GroupDialog.TEXTFIELD_LENGTH);
-    private final JCheckBox keywordGroupCaseSensitive = new JCheckBox(Localization.lang("Case sensitive"));
-    private final JCheckBox keywordGroupRegExp = new JCheckBox(Localization.lang("regular expression"));
+    private final TextField keywordGroupSearchTerm = new TextField();
+    private final TextField keywordGroupSearchField = new TextField();
+    private final CheckBox keywordGroupCaseSensitive = new CheckBox(Localization.lang("Case sensitive"));
+    private final CheckBox keywordGroupRegExp = new CheckBox(Localization.lang("regular expression"));
+
     // for SearchGroup
-    private final JTextField searchGroupSearchExpression = new JTextField(GroupDialog.TEXTFIELD_LENGTH);
-    private final JCheckBox searchGroupCaseSensitive = new JCheckBox(Localization.lang("Case sensitive"));
-    private final JCheckBox searchGroupRegExp = new JCheckBox(Localization.lang("regular expression"));
+    private final TextField searchGroupSearchExpression = new TextField();
+    private final CheckBox searchGroupCaseSensitive = new CheckBox(Localization.lang("Case sensitive"));
+    private final CheckBox searchGroupRegExp = new CheckBox(Localization.lang("regular expression"));
+
     // for AutoGroup
-    private final JRadioButton autoGroupKeywordsOption = new JRadioButton(
-            Localization.lang("Generate groups from keywords in a BibTeX field"));
-    private final JTextField autoGroupKeywordsField = new JTextField(60);
-    private final JTextField autoGroupKeywordsDeliminator = new JTextField(60);
-    private final JTextField autoGroupKeywordsHierarchicalDeliminator = new JTextField(60);
-    private final JRadioButton autoGroupPersonsOption = new JRadioButton(
-            Localization.lang("Generate groups for author last names"));
-    private final JTextField autoGroupPersonsField = new JTextField(60);
+    private final RadioButton autoGroupKeywordsOption = new RadioButton(Localization.lang("Generate groups from keywords in a BibTeX field"));
+    private final TextField autoGroupKeywordsField = new TextField();
+    private final TextField autoGroupKeywordsDeliminator = new TextField();
+    private final TextField autoGroupKeywordsHierarchicalDeliminator = new TextField();
+    private final RadioButton autoGroupPersonsOption = new RadioButton(Localization.lang("Generate groups for author last names"));
+    private final TextField autoGroupPersonsField = new TextField();
+
     // for TexGroup
-    private final JTextField texGroupFilePath = new JTextField(60);
+    private final TextField texGroupFilePath = new TextField();
 
     // for all types
-    private final JButton okButton = new JButton(Localization.lang("OK"));
-    private final JPanel optionsPanel = new JPanel();
-    private final JLabel descriptionLabel = new JLabel() {
-
-        @Override
-        public Dimension getPreferredSize() {
-            Dimension d = super.getPreferredSize();
-            // width must be smaller than width of enclosing JScrollPane
-            // to prevent a horizontal scroll bar
-            d.width = 1;
-            return d;
-        }
-    };
-    private final CardLayout optionsLayout = new CardLayout();
-    private boolean isOkPressed;
-    private AbstractGroup resultingGroup;
+    private final WebView descriptionWebView = new WebView();
+    private final StackPane optionsPanel = new StackPane();
+
 
     /**
      * Shows a group add/edit dialog.
@@ -147,306 +121,333 @@ public Dimension getPreferredSize() {
      *                    created.
      */
     public GroupDialog(JabRefFrame jabrefFrame, AbstractGroup editedGroup) {
-        super(Localization.lang("Edit group"), true, GroupDialog.class);
+        this.setTitle(Localization.lang("Edit group"));
+
+        nameField.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
+        descriptionField.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
+        colorField.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
+        iconField.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
+        explicitRadioButton.setSelected(true);
+        keywordGroupSearchTerm.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
+        keywordGroupSearchField.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
+        searchGroupSearchExpression.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
+        autoGroupKeywordsField.setPrefColumnCount(10);
+        autoGroupKeywordsDeliminator.setPrefColumnCount(10);
+        autoGroupKeywordsDeliminator.setPrefColumnCount(10);
+        autoGroupPersonsField.setPrefColumnCount(10);
+        texGroupFilePath.setPrefColumnCount(TEXTFIELD_LENGTH);
+        descriptionWebView.setPrefWidth(585);
+        optionsPanel.setPadding(PADDING);
+        optionsPanel.setStyle("-fx-content-display:top;"
+                              + "-fx-border-insets:0 0 0 0;"
+                              + "-fx-border-color:#D3D3D3");
 
         // set default values (overwritten if editedGroup != null)
         keywordGroupSearchField.setText(jabrefFrame.prefs().get(JabRefPreferences.GROUPS_DEFAULT_FIELD));
 
         // configure elements
-        ButtonGroup groupType = new ButtonGroup();
-        groupType.add(explicitRadioButton);
-        groupType.add(keywordsRadioButton);
-        groupType.add(searchRadioButton);
-        groupType.add(autoRadioButton);
-        groupType.add(texRadioButton);
-        ButtonGroup groupHierarchy = new ButtonGroup();
-        groupHierarchy.add(independentButton);
-        groupHierarchy.add(intersectionButton);
-        groupHierarchy.add(unionButton);
-        descriptionLabel.setVerticalAlignment(SwingConstants.TOP);
-        getRootPane().setDefaultButton(okButton);
+        ToggleGroup groupType = new ToggleGroup();
+        explicitRadioButton.setToggleGroup(groupType);
+        keywordsRadioButton.setToggleGroup(groupType);
+        searchRadioButton.setToggleGroup(groupType);
+        autoRadioButton.setToggleGroup(groupType);
+        texRadioButton.setToggleGroup(groupType);
+        ToggleGroup groupHierarchy = new ToggleGroup();
+        independentButton.setToggleGroup(groupHierarchy);
+        intersectionButton.setToggleGroup(groupHierarchy);
+        unionButton.setToggleGroup(groupHierarchy);
 
         // build individual layout cards for each group
-        optionsPanel.setLayout(optionsLayout);
+        GridPane explicitPanel = new GridPane();
+        GridPane keywordPanel = new GridPane();
+        GridPane searchPanel = new GridPane();
+        GridPane autoPanel = new GridPane();
+        GridPane texPanel = new GridPane();
         // ... for explicit group
-        optionsPanel.add(new JPanel(), String.valueOf(GroupDialog.INDEX_EXPLICIT_GROUP));
+        optionsPanel.getChildren().add(explicitPanel);
+        explicitPanel.setVisible(true);
         // ... for keyword group
-        FormLayout layoutKG = new FormLayout(
-                "right:pref, 4dlu, fill:1dlu:grow, 2dlu, left:pref");
-        DefaultFormBuilder builderKG = new DefaultFormBuilder(layoutKG);
-        builderKG.append(Localization.lang("Field"));
-        builderKG.append(keywordGroupSearchField, 3);
-        builderKG.nextLine();
-        builderKG.append(Localization.lang("Keyword"));
-        builderKG.append(keywordGroupSearchTerm);
-        builderKG.nextLine();
-        builderKG.append(keywordGroupCaseSensitive, 3);
-        builderKG.nextLine();
-        builderKG.append(keywordGroupRegExp, 3);
-        optionsPanel.add(builderKG.getPanel(), String.valueOf(GroupDialog.INDEX_KEYWORD_GROUP));
+        optionsPanel.getChildren().add(keywordPanel);
+        keywordPanel.setVisible(false);
+        keywordPanel.setHgap(HGAP);
+        keywordPanel.setVgap(VGAP);
+        keywordPanel.setPadding(PADDING);
+        ColumnConstraints keywordPanelLCol = new ColumnConstraints();
+        keywordPanelLCol.setHalignment(HPos.RIGHT);
+        keywordPanel.getColumnConstraints().add(keywordPanelLCol);
+        ColumnConstraints keywordPanelRCol = new ColumnConstraints();
+        keywordPanelRCol.setHalignment(HPos.LEFT);
+        keywordPanel.getColumnConstraints().add(keywordPanelRCol);
+        keywordPanel.add(new Label(Localization.lang("Field")), 0, 0);
+        keywordPanel.add(keywordGroupSearchField, 1, 0);
+        keywordPanel.add(new Label(Localization.lang("Keyword")), 0, 1);
+        keywordPanel.add(keywordGroupSearchTerm, 1, 1);
+        GridPane.setHalignment(keywordGroupCaseSensitive, HPos.LEFT);
+        keywordPanel.add(keywordGroupCaseSensitive, 0, 2, 2, 1);
+        GridPane.setHalignment(keywordGroupRegExp, HPos.LEFT);
+        keywordPanel.add(keywordGroupRegExp, 0, 3, 2, 1);
         // ... for search group
-        FormLayout layoutSG = new FormLayout("right:pref, 4dlu, fill:1dlu:grow");
-        DefaultFormBuilder builderSG = new DefaultFormBuilder(layoutSG);
-        builderSG.append(Localization.lang("Search expression"));
-        builderSG.append(searchGroupSearchExpression);
-        builderSG.nextLine();
-        builderSG.append(searchGroupCaseSensitive, 3);
-        builderSG.nextLine();
-        builderSG.append(searchGroupRegExp, 3);
-        optionsPanel.add(builderSG.getPanel(), String.valueOf(GroupDialog.INDEX_SEARCH_GROUP));
-
-        // for auto group
-        ButtonGroup bg = new ButtonGroup();
-        bg.add(autoGroupKeywordsOption);
-        bg.add(autoGroupPersonsOption);
-
-        FormLayout layoutAutoGroup = new FormLayout("left:20dlu, 4dlu, left:pref, 4dlu, fill:60dlu",
-                "p, 2dlu, p, 2dlu, p, p, 2dlu, p, 2dlu, p");
-        FormBuilder builderAutoGroup = FormBuilder.create();
-        builderAutoGroup.layout(layoutAutoGroup);
-        builderAutoGroup.add(autoGroupKeywordsOption).xyw(1, 1, 5);
-        builderAutoGroup.add(Localization.lang("Field to group by") + ":").xy(3, 3);
-        builderAutoGroup.add(autoGroupKeywordsField).xy(5, 3);
-        builderAutoGroup.add(Localization.lang("Use the following delimiter character(s):")).xy(3, 5);
-        builderAutoGroup.add(autoGroupKeywordsDeliminator).xy(5, 5);
-        builderAutoGroup.add(autoGroupKeywordsHierarchicalDeliminator).xy(5, 6);
-        builderAutoGroup.add(autoGroupPersonsOption).xyw(1, 8, 5);
-        builderAutoGroup.add(Localization.lang("Field to group by") + ":").xy(3, 10);
-        builderAutoGroup.add(autoGroupPersonsField).xy(5, 10);
-        optionsPanel.add(builderAutoGroup.build(), String.valueOf(GroupDialog.INDEX_AUTO_GROUP));
-
+        optionsPanel.getChildren().add(searchPanel);
+        searchPanel.setVisible(false);
+        searchPanel.setHgap(HGAP);
+        searchPanel.setVgap(VGAP);
+        searchPanel.setPadding(PADDING);
+        searchPanel.add(new Label(Localization.lang("Search expression")), 0, 0);
+        searchPanel.add(searchGroupSearchExpression, 1, 0, 2, 1);
+        searchPanel.add(searchGroupCaseSensitive, 0, 1, 2, 1);
+        searchPanel.add(searchGroupRegExp, 0, 2, 2, 1);
+        // ... for auto group
+        optionsPanel.getChildren().add(autoPanel);
+        autoPanel.setVisible(false);
+        autoPanel.setHgap(HGAP);
+        autoPanel.setVgap(VGAP);
+        autoPanel.setPadding(PADDING);
+        ToggleGroup tg = new ToggleGroup();
+        autoGroupKeywordsOption.setToggleGroup(tg);
+        autoGroupPersonsOption.setToggleGroup(tg);
+        Label placeholderLabel = new Label();
+        placeholderLabel.setPrefWidth(30);
+        autoPanel.add(autoGroupKeywordsOption, 0, 0, 3, 1);
+        autoPanel.add(placeholderLabel, 0, 1);
+        autoPanel.add(new Label(Localization.lang("Field to group by") + ":"), 1, 1);
+        autoPanel.add(autoGroupKeywordsField, 2, 1);
+        autoPanel.add(new Label(Localization.lang("Use the following delimiter character(s):")), 1, 2);
+        autoPanel.add(autoGroupKeywordsDeliminator, 2, 2);
+        autoPanel.add(autoGroupKeywordsHierarchicalDeliminator, 2, 3);
+        autoPanel.add(autoGroupPersonsOption, 0, 4, 3, 1);
+        autoPanel.add(new Label(Localization.lang("Field to group by") + ":"), 1, 5);
+        autoPanel.add(autoGroupPersonsField, 2, 5);
         autoGroupKeywordsOption.setSelected(true);
         autoGroupKeywordsField.setText(Globals.prefs.get(JabRefPreferences.GROUPS_DEFAULT_FIELD));
         autoGroupKeywordsDeliminator.setText(Globals.prefs.get(JabRefPreferences.KEYWORD_SEPARATOR));
         autoGroupKeywordsHierarchicalDeliminator.setText(Keyword.DEFAULT_HIERARCHICAL_DELIMITER.toString());
         autoGroupPersonsField.setText(FieldName.AUTHOR);
-
         // ... for tex group
-        FormLayout layoutTG = new FormLayout("right:pref, 4dlu, fill:1dlu:grow");
-        DefaultFormBuilder builderTG = new DefaultFormBuilder(layoutTG);
-        builderTG.append(Localization.lang("Aux file"));
-        builderTG.append(texGroupFilePath);
-        optionsPanel.add(builderTG.getPanel(), String.valueOf(GroupDialog.INDEX_TEX_GROUP));
+        optionsPanel.getChildren().add(texPanel);
+        texPanel.setVisible(false);
+        texPanel.setHgap(HGAP);
+        texPanel.setVgap(VGAP);
+        texPanel.setPadding(PADDING);
+        texPanel.add(new Label(Localization.lang("Aux file")), 0, 0);
+        texPanel.add(texGroupFilePath, 1, 0);
 
         // ... for buttons panel
-        FormLayout layoutBP = new FormLayout("pref, 4dlu, pref", "p");
-        layoutBP.setColumnGroups(new int[][] {{1, 3}});
-        ButtonBarBuilder builderBP = new ButtonBarBuilder();
-        builderBP.addGlue();
-        builderBP.addButton(okButton);
-        JButton mCancel = new JButton(Localization.lang("Cancel"));
-        builderBP.addButton(mCancel);
-        builderBP.addGlue();
-        builderBP.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+        getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
+
+        // General panel
+        GridPane generalPanel = new GridPane();
+        GridPane textFieldPanel = new GridPane();
+        GridPane selectPanel = new GridPane();
+        generalPanel.add(textFieldPanel, 0, 0);
+        generalPanel.add(selectPanel, 0, 1);
+        generalPanel.setVgap(VGAP);
+        generalPanel.setPadding(PADDING);
+        generalPanel.setStyle("-fx-content-display:top;"
+                              + "-fx-border-insets:0 0 0 0;"
+                              + "-fx-border-color:#D3D3D3");
+
+        ColumnConstraints columnLabel = new ColumnConstraints();
+        columnLabel.setHalignment(HPos.RIGHT);
+        textFieldPanel.getColumnConstraints().add(columnLabel);
+        ColumnConstraints columnTextField = new ColumnConstraints();
+        columnTextField.setHalignment(HPos.LEFT);
+        textFieldPanel.getColumnConstraints().add(columnTextField);
+        textFieldPanel.setVgap(VGAP);
+        textFieldPanel.setHgap(HGAP);
+        textFieldPanel.add(new Label(Localization.lang("Name")), 0, 0);
+        textFieldPanel.add(nameField, 1, 0);
+        textFieldPanel.add(new Label(Localization.lang("Description")), 0, 1);
+        textFieldPanel.add(descriptionField, 1, 1);
+        textFieldPanel.add(new Label(Localization.lang("Color")), 0, 2);
+        textFieldPanel.add(colorField, 1, 2);
+        textFieldPanel.add(new Label(Localization.lang("Icon")), 0, 3);
+        textFieldPanel.add(iconField, 1, 3);
+
+        selectPanel.setVgap(VGAP);
+        selectPanel.add(explicitRadioButton, 0, 0);
+        selectPanel.add(keywordsRadioButton, 0, 1);
+        selectPanel.add(searchRadioButton, 0, 2);
+        selectPanel.add(autoRadioButton, 0, 3);
+        selectPanel.add(texRadioButton, 0, 4);
+
+        // Context panel
+        GridPane contextPanel = new GridPane();
+        contextPanel.setVgap(VGAP);
+        contextPanel.setHgap(HGAP);
+        contextPanel.setPadding(PADDING);
+        contextPanel.setStyle("-fx-content-display:top;"
+                              + "-fx-border-insets:0 0 0 0;"
+                              + "-fx-border-color:#D3D3D3");
+        contextPanel.add(independentButton, 0, 0);
+        contextPanel.add(intersectionButton, 0, 1);
+        contextPanel.add(unionButton, 0, 2);
+
+        // Description panel
+        ScrollPane sp = new ScrollPane(descriptionWebView);
+        sp.setPadding(PADDING);
+        sp.setHbarPolicy(ScrollBarPolicy.AS_NEEDED);
+        sp.setVbarPolicy(ScrollBarPolicy.AS_NEEDED);
+        sp.setStyle("-fx-content-display:top;"
+                    + "-fx-border-insets:0 0 0 0;"
+                    + "-fx-border-color:#D3D3D3");
+
+        // create border
+        HBox title1 = new HBox();
+        HBox title2 = new HBox();
+        HBox title3 = new HBox();
+        HBox title4 = new HBox();
+        Label title1Label = new Label(Localization.lang("General"));
+        Label title2Label = new Label(Localization.lang("Hierarchical context"));
+        Label title3Label = new Label(Localization.lang("Options"));
+        Label title4Label = new Label(Localization.lang("Description"));
+        title1Label.setTextFill(Color.web("#778899"));
+        title2Label.setTextFill(Color.web("#778899"));
+        title3Label.setTextFill(Color.web("#778899"));
+        title4Label.setTextFill(Color.web("#778899"));
+        title1.setPadding(new Insets(10, 0, 0, 0));
+        title2.setPadding(new Insets(10, 0, 0, 0));
+        title3.setPadding(new Insets(10, 0, 0, 0));
+        title4.setPadding(new Insets(10, 0, 0, 0));
+        title1.getChildren().add(title1Label);
+        title2.getChildren().add(title2Label);
+        title3.getChildren().add(title3Label);
+        title4.getChildren().add(title4Label);
 
         // create layout
-        FormLayout layoutAll = new FormLayout(
-                "right:pref, 4dlu, fill:600px, 4dlu, fill:pref",
-                "p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 0dlu, p, 0dlu, p, 0dlu, p, 0dlu, p, 3dlu, p, 3dlu, p, "
-                        + "0dlu, p, 0dlu, p, 3dlu, p, 3dlu, "
-                        + "p, 3dlu, p, 3dlu, top:80dlu, 9dlu, p, 9dlu, p");
-
-        DefaultFormBuilder builderAll = new DefaultFormBuilder(layoutAll);
-        builderAll.appendSeparator(Localization.lang("General"));
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(Localization.lang("Name"));
-        builderAll.append(nameField);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(Localization.lang("Description"));
-        builderAll.append(descriptionField);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(Localization.lang("Color"));
-        builderAll.append(colorField);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(Localization.lang("Icon"));
-        builderAll.append(iconField);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(explicitRadioButton, 5);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(keywordsRadioButton, 5);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(searchRadioButton, 5);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(autoRadioButton, 5);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(texRadioButton, 5);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.appendSeparator(Localization.lang("Hierarchical context"));
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(independentButton, 5);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(intersectionButton, 5);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(unionButton, 5);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.appendSeparator(Localization.lang("Options"));
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.append(optionsPanel, 5);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.appendSeparator(Localization.lang("Description"));
-        builderAll.nextLine();
-        builderAll.nextLine();
-        JScrollPane sp = new JScrollPane(descriptionLabel,
-                ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED) {
-
-            @Override
-            public Dimension getPreferredSize() {
-                return getMaximumSize();
-            }
-        };
-        builderAll.append(sp, 5);
-        builderAll.nextLine();
-        builderAll.nextLine();
-        builderAll.appendSeparator();
-        builderAll.nextLine();
-        builderAll.nextLine();
-
-        Container cp = getContentPane();
-        cp.add(builderAll.getPanel(), BorderLayout.CENTER);
-        cp.add(builderBP.getPanel(), BorderLayout.SOUTH);
-        pack();
-        setResizable(false);
+        GridPane mainPanel = new GridPane();
+        getDialogPane().setContent(mainPanel);
+        mainPanel.setPrefHeight(810);
+        mainPanel.setPrefWidth(630);
+        mainPanel.setPadding(new Insets(5, 15, 5, 5));
+        mainPanel.add(title1, 0, 0);
+        mainPanel.add(generalPanel, 0, 1);
+        mainPanel.add(title2, 0, 2);
+        mainPanel.add(contextPanel, 0, 3);
+        mainPanel.add(title3, 0, 4);
+        mainPanel.add(optionsPanel, 0, 5);
+        mainPanel.add(title4, 0, 6);
+        mainPanel.add(sp, 0, 7);
+
         updateComponents();
-        setLayoutForSelectedGroup();
 
         // add listeners
-        ItemListener radioButtonItemListener = e -> {
-            setLayoutForSelectedGroup();
-            updateComponents();
-        };
-        explicitRadioButton.addItemListener(radioButtonItemListener);
-        keywordsRadioButton.addItemListener(radioButtonItemListener);
-        searchRadioButton.addItemListener(radioButtonItemListener);
-        autoRadioButton.addItemListener(radioButtonItemListener);
-        texRadioButton.addItemListener(radioButtonItemListener);
-
-        Action cancelAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
+        groupType.selectedToggleProperty().addListener((ObservableValue<? extends Toggle> ov, Toggle old_Toggle,
+                                                        Toggle new_Toggle) -> {
+            int select = INDEX_EXPLICIT_GROUP;
+            if (groupType.getSelectedToggle() == explicitRadioButton) {
+                select = INDEX_EXPLICIT_GROUP;
+            } else if (groupType.getSelectedToggle() == keywordsRadioButton) {
+                select = INDEX_KEYWORD_GROUP;
+            } else if (groupType.getSelectedToggle() == searchRadioButton) {
+                select = INDEX_SEARCH_GROUP;
+            } else if (groupType.getSelectedToggle() == autoRadioButton) {
+                select = INDEX_AUTO_GROUP;
+            } else if (groupType.getSelectedToggle() == texRadioButton) {
+                select = INDEX_TEX_GROUP;
             }
-        };
-        mCancel.addActionListener(cancelAction);
-        builderAll.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-                  .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        builderAll.getPanel().getActionMap().put("close", cancelAction);
-
-        okButton.addActionListener(e -> {
-            isOkPressed = true;
-            try {
-                String groupName = nameField.getText().trim();
-                if (explicitRadioButton.isSelected()) {
-                    Character keywordDelimiter = Globals.prefs.getKeywordDelimiter();
-                    if (groupName.contains(Character.toString(keywordDelimiter))) {
-                        jabrefFrame.showMessage(
-                                Localization.lang("The group name contains the keyword separator \"%0\" and thus probably does not work as expected.", Character.toString(keywordDelimiter)));
-                    }
+            for (Node n : optionsPanel.getChildren()) {
+                n.setVisible(false);
+            }
+            optionsPanel.getChildren().get(select).setVisible(true);
+            updateComponents();
+        });
 
-                    Optional<GroupTreeNode> rootGroup = jabrefFrame.getCurrentBasePanel().getBibDatabaseContext().getMetaData().getGroups();
-                    if (rootGroup.isPresent()) {
-                        int groupsWithSameName = rootGroup.get().findChildrenSatisfying(group -> group.getName().equals(groupName)).size();
-                        boolean warnAboutSameName = false;
-                        if (editedGroup == null && groupsWithSameName > 0) {
-                            // New group but there is already one group with the same name
-                            warnAboutSameName = true;
-                        }
-                        if (editedGroup != null && !editedGroup.getName().equals(groupName) && groupsWithSameName > 0) {
-                            // Edit group, changed name to something that is already present
-                            warnAboutSameName = true;
+        setResultConverter(button -> {
+            if (button == ButtonType.OK) {
+                AbstractGroup resultingGroup = null;
+                try {
+                    String groupName = nameField.getText().trim();
+                    if (explicitRadioButton.isSelected()) {
+                        Character keywordDelimiter = Globals.prefs.getKeywordDelimiter();
+                        if (groupName.contains(Character.toString(keywordDelimiter))) {
+                            jabrefFrame.showMessage(
+                                    Localization.lang("The group name contains the keyword separator \"%0\" and thus probably does not work as expected.", Character.toString(keywordDelimiter)));
                         }
 
-                        if (warnAboutSameName) {
-                            jabrefFrame.showMessage(
-                                    Localization.lang("There exists already a group with the same name.", Character.toString(keywordDelimiter)));
-                            return;
+                        Optional<GroupTreeNode> rootGroup = jabrefFrame.getCurrentBasePanel().getBibDatabaseContext().getMetaData().getGroups();
+                        if (rootGroup.isPresent()) {
+                            int groupsWithSameName = rootGroup.get().findChildrenSatisfying(group -> group.getName().equals(groupName)).size();
+                            boolean warnAboutSameName = false;
+                            if ((editedGroup == null) && (groupsWithSameName > 0)) {
+                                // New group but there is already one group with the same name
+                                warnAboutSameName = true;
+                            }
+                            if ((editedGroup != null) && !editedGroup.getName().equals(groupName) && (groupsWithSameName > 0)) {
+                                // Edit group, changed name to something that is already present
+                                warnAboutSameName = true;
+                            }
+
+                            if (warnAboutSameName) {
+                                jabrefFrame.showMessage(
+                                        Localization.lang("There exists already a group with the same name.", Character.toString(keywordDelimiter)));
+                                return null;
+                            }
                         }
-                    }
 
-                    resultingGroup = new ExplicitGroup(groupName, getContext(),
-                            keywordDelimiter);
-                } else if (keywordsRadioButton.isSelected()) {
-                    // regex is correct, otherwise OK would have been disabled
-                    // therefore I don't catch anything here
-                    if (keywordGroupRegExp.isSelected()) {
-                        resultingGroup = new RegexKeywordGroup(groupName, getContext(),
-                                keywordGroupSearchField.getText().trim(), keywordGroupSearchTerm.getText().trim(),
-                                keywordGroupCaseSensitive.isSelected());
-                    } else {
-                        resultingGroup = new WordKeywordGroup(groupName, getContext(),
-                                keywordGroupSearchField.getText().trim(), keywordGroupSearchTerm.getText().trim(),
-                                keywordGroupCaseSensitive.isSelected(), Globals.prefs.getKeywordDelimiter(), false);
-                    }
-                } else if (searchRadioButton.isSelected()) {
-                    try {
-                        // regex is correct, otherwise OK would have been
-                        // disabled
+                        resultingGroup = new ExplicitGroup(groupName, getContext(),
+                                keywordDelimiter);
+                    } else if (keywordsRadioButton.isSelected()) {
+                        // regex is correct, otherwise OK would have been disabled
                         // therefore I don't catch anything here
+                        if (keywordGroupRegExp.isSelected()) {
+                            resultingGroup = new RegexKeywordGroup(groupName, getContext(),
+                                    keywordGroupSearchField.getText().trim(), keywordGroupSearchTerm.getText().trim(),
+                                    keywordGroupCaseSensitive.isSelected());
+                        } else {
+                            resultingGroup = new WordKeywordGroup(groupName, getContext(),
+                                    keywordGroupSearchField.getText().trim(), keywordGroupSearchTerm.getText().trim(),
+                                    keywordGroupCaseSensitive.isSelected(), Globals.prefs.getKeywordDelimiter(), false);
+                        }
+                    } else if (searchRadioButton.isSelected()) {
                         resultingGroup = new SearchGroup(groupName, getContext(), searchGroupSearchExpression.getText().trim(),
                                 isCaseSensitive(), isRegex());
-                    } catch (Exception e1) {
-                        // should never happen
+                    } else if (autoRadioButton.isSelected()) {
+                        if (autoGroupKeywordsOption.isSelected()) {
+                            resultingGroup = new AutomaticKeywordGroup(
+                                    groupName, getContext(),
+                                    autoGroupKeywordsField.getText().trim(),
+                                    autoGroupKeywordsDeliminator.getText().charAt(0),
+                                    autoGroupKeywordsHierarchicalDeliminator.getText().charAt(0));
+                        } else {
+                            resultingGroup = new AutomaticPersonsGroup(groupName, getContext(),
+                                    autoGroupPersonsField.getText().trim());
+                        }
+                    } else if (texRadioButton.isSelected()) {
+                        resultingGroup = new TexGroup(groupName, getContext(),
+                                Paths.get(texGroupFilePath.getText().trim()), new DefaultAuxParser(new BibDatabase()), Globals.getFileUpdateMonitor());
                     }
-                } else if (autoRadioButton.isSelected()) {
-                    if (autoGroupKeywordsOption.isSelected()) {
-                        resultingGroup = new AutomaticKeywordGroup(
-                                groupName, getContext(),
-                                autoGroupKeywordsField.getText().trim(),
-                                autoGroupKeywordsDeliminator.getText().charAt(0),
-                                autoGroupKeywordsHierarchicalDeliminator.getText().charAt(0));
-                    } else {
-                        resultingGroup = new AutomaticPersonsGroup(groupName, getContext(),
-                                autoGroupPersonsField.getText().trim());
+                    try {
+                        resultingGroup.setColor(Color.valueOf(colorField.getText()));
+                    } catch (IllegalArgumentException ex) {
+                        // Ignore invalid color (we should probably notify the user instead...)
                     }
-                } else if (texRadioButton.isSelected()) {
-                    resultingGroup = new TexGroup(groupName, getContext(),
-                            Paths.get(texGroupFilePath.getText().trim()), new DefaultAuxParser(new BibDatabase()), Globals.getFileUpdateMonitor());
+                    resultingGroup.setDescription(descriptionField.getText());
+                    resultingGroup.setIconName(iconField.getText());
+                    return resultingGroup;
+                } catch (IllegalArgumentException | IOException exception) {
+                    jabrefFrame.showMessage(exception.getLocalizedMessage());
+                    return null;
                 }
-                try {
-                    resultingGroup.setColor(Color.valueOf(colorField.getText()));
-                } catch (IllegalArgumentException ex) {
-                    // Ignore invalid color (we should probably notify the user instead...)
-                }
-                resultingGroup.setDescription(descriptionField.getText());
-                resultingGroup.setIconName(iconField.getText());
-
-                dispose();
-            } catch (IllegalArgumentException | IOException exception) {
-                jabrefFrame.showMessage(exception.getLocalizedMessage());
             }
+            return null;
         });
 
-        CaretListener caretListener = e -> updateComponents();
-        ItemListener itemListener = e -> updateComponents();
-
-        nameField.addCaretListener(caretListener);
-        colorField.addCaretListener(caretListener);
-        descriptionField.addCaretListener(caretListener);
-        iconField.addCaretListener(caretListener);
-        keywordGroupSearchField.addCaretListener(caretListener);
-        keywordGroupSearchTerm.addCaretListener(caretListener);
-        keywordGroupCaseSensitive.addItemListener(itemListener);
-        keywordGroupRegExp.addItemListener(itemListener);
-        searchGroupSearchExpression.addCaretListener(caretListener);
-        searchGroupRegExp.addItemListener(itemListener);
-        searchGroupCaseSensitive.addItemListener(itemListener);
+        ChangeListener<String> caretListener = (ObservableValue<? extends String> ov, String oldValue,
+                                                String newValue) -> updateComponents();
+        ChangeListener<Boolean> itemListener = (ObservableValue<? extends Boolean> ov, Boolean oldBoolean,
+                                                Boolean newBoolean) -> updateComponents();
+
+        nameField.textProperty().addListener(caretListener);
+        colorField.textProperty().addListener(caretListener);
+        descriptionField.textProperty().addListener(caretListener);
+        iconField.textProperty().addListener(caretListener);
+        keywordGroupSearchField.textProperty().addListener(caretListener);
+        keywordGroupSearchTerm.textProperty().addListener(caretListener);
+        keywordGroupCaseSensitive.selectedProperty().addListener(itemListener);
+        keywordGroupRegExp.selectedProperty().addListener(itemListener);
+        searchGroupSearchExpression.textProperty().addListener(caretListener);
+        searchGroupRegExp.selectedProperty().addListener(itemListener);
+        searchGroupRegExp.selectedProperty().addListener(itemListener);
 
         // configure for current type
         if (editedGroup == null) {
@@ -526,11 +527,11 @@ private static String formatRegExException(String regExp, Exception e) {
             sb.append(StringUtil.quoteForHTML(sa[i]));
         }
         String s = Localization.lang(
-                "The regular expression <b>%0</b> is invalid:",
-                StringUtil.quoteForHTML(regExp))
-                + "<p><tt>"
-                + sb
-                + "</tt>";
+                                     "The regular expression <b>%0</b> is invalid:",
+                                     StringUtil.quoteForHTML(regExp))
+                   + "<p><tt>"
+                   + sb
+                   + "</tt>";
         if (!(e instanceof PatternSyntaxException)) {
             return s;
         }
@@ -542,34 +543,12 @@ private static String formatRegExException(String regExp, Exception e) {
         return s;
     }
 
-    public boolean okPressed() {
-        return isOkPressed;
-    }
-
-    public AbstractGroup getResultingGroup() {
-        return resultingGroup;
-    }
-
-    private void setLayoutForSelectedGroup() {
-        if (explicitRadioButton.isSelected()) {
-            optionsLayout.show(optionsPanel, String.valueOf(GroupDialog.INDEX_EXPLICIT_GROUP));
-        } else if (keywordsRadioButton.isSelected()) {
-            optionsLayout.show(optionsPanel, String.valueOf(GroupDialog.INDEX_KEYWORD_GROUP));
-        } else if (searchRadioButton.isSelected()) {
-            optionsLayout.show(optionsPanel, String.valueOf(GroupDialog.INDEX_SEARCH_GROUP));
-        } else if (autoRadioButton.isSelected()) {
-            optionsLayout.show(optionsPanel, String.valueOf(GroupDialog.INDEX_AUTO_GROUP));
-        } else if (texRadioButton.isSelected()) {
-            optionsLayout.show(optionsPanel, String.valueOf(GroupDialog.INDEX_TEX_GROUP));
-        }
-    }
-
     private void updateComponents() {
         // all groups need a name
         boolean okEnabled = !nameField.getText().trim().isEmpty();
         if (!okEnabled) {
             setDescription(Localization.lang("Please enter a name for the group."));
-            okButton.setEnabled(false);
+            //TODO: okButton.setDisable(true);
             return;
         }
         String s1;
@@ -584,18 +563,18 @@ private void updateComponents() {
                     try {
                         Pattern.compile(s2);
                         setDescription(GroupDescriptions.getDescriptionForPreview(s1, s2, keywordGroupCaseSensitive.isSelected(),
-                                keywordGroupRegExp.isSelected()));
+                                                                                  keywordGroupRegExp.isSelected()));
                     } catch (PatternSyntaxException e) {
                         okEnabled = false;
                         setDescription(formatRegExException(s2, e));
                     }
                 } else {
                     setDescription(GroupDescriptions.getDescriptionForPreview(s1, s2, keywordGroupCaseSensitive.isSelected(),
-                            keywordGroupRegExp.isSelected()));
+                                                                              keywordGroupRegExp.isSelected()));
                 }
             } else {
                 setDescription(Localization.lang(
-                        "Please enter the field to search (e.g. <b>keywords</b>) and the keyword to search it for (e.g. <b>electrical</b>)."));
+                                                 "Please enter the field to search (e.g. <b>keywords</b>) and the keyword to search it for (e.g. <b>electrical</b>)."));
             }
             setNameFontItalic(true);
         } else if (searchRadioButton.isSelected()) {
@@ -603,7 +582,8 @@ private void updateComponents() {
             okEnabled = okEnabled & !s1.isEmpty();
             if (okEnabled) {
                 setDescription(fromTextFlowToHTMLString(SearchDescribers.getSearchDescriberFor(
-                        new SearchQuery(s1, isCaseSensitive(), isRegex())).getDescription()));
+                                                                                               new SearchQuery(s1, isCaseSensitive(), isRegex()))
+                                                                        .getDescription()));
 
                 if (isRegex()) {
                     try {
@@ -615,24 +595,25 @@ private void updateComponents() {
                 }
             } else {
                 setDescription(Localization
-                        .lang("Please enter a search term. For example, to search all fields for <b>Smith</b>, enter:<p>"
-                                + "<tt>smith</tt><p>"
-                                + "To search the field <b>Author</b> for <b>Smith</b> and the field <b>Title</b> for <b>electrical</b>, enter:<p>"
-                                + "<tt>author=smith and title=electrical</tt>"));
+                                           .lang("Please enter a search term. For example, to search all fields for <b>Smith</b>, enter:<p>"
+                                                 + "<tt>smith</tt><p>"
+                                                 + "To search the field <b>Author</b> for <b>Smith</b> and the field <b>Title</b> for <b>electrical</b>, enter:<p>"
+                                                 + "<tt>author=smith and title=electrical</tt>"));
             }
             setNameFontItalic(true);
         } else if (explicitRadioButton.isSelected()) {
             setDescription(GroupDescriptions.getDescriptionForPreview());
             setNameFontItalic(false);
         }
-        okButton.setEnabled(okEnabled);
+        //TODO: okButton.setDisable(!okEnabled);
     }
 
     private String fromTextFlowToHTMLString(TextFlow textFlow) {
         StringBuilder htmlStringBuilder = new StringBuilder();
         for (Node node : textFlow.getChildren()) {
-            if (node instanceof Text)
+            if (node instanceof Text) {
                 htmlStringBuilder.append(TooltipTextUtil.textToHTMLString((Text) node));
+            }
         }
         return htmlStringBuilder.toString();
     }
@@ -646,7 +627,7 @@ private boolean isCaseSensitive() {
     }
 
     private void setDescription(String description) {
-        descriptionLabel.setText("<html>" + description + "</html>");
+        descriptionWebView.getEngine().loadContent("<html>" + description + "</html>");
     }
 
     /**
@@ -654,9 +635,10 @@ private void setDescription(String description) {
      */
     private void setNameFontItalic(boolean italic) {
         Font f = nameField.getFont();
-        if (f.isItalic() != italic) {
-            f = f.deriveFont(italic ? Font.ITALIC : Font.PLAIN);
-            nameField.setFont(f);
+        if (italic) {
+            Font.font(f.getFamily(), FontPosture.ITALIC, f.getSize());
+        } else {
+            Font.font(f.getFamily(), FontPosture.REGULAR, f.getSize());
         }
     }
 
@@ -685,15 +667,4 @@ private void setContext(GroupHierarchyType context) {
             independentButton.setSelected(true);
         }
     }
-
-    @Override
-    public Optional<AbstractGroup> showAndWait() {
-        this.setVisible(true);
-        if (this.okPressed()) {
-            AbstractGroup newGroup = getResultingGroup();
-            return Optional.of(newGroup);
-        } else {
-            return Optional.empty();
-        }
-    }
 }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
index 5ff2106d2ed..356a6989995 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -7,9 +7,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import javax.swing.SwingUtilities;
-
-import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -118,13 +115,13 @@ private void onActiveDatabaseChanged(Optional<BibDatabaseContext> newDatabase) {
             GroupNodeViewModel newRoot = newDatabase
                     .map(BibDatabaseContext::getMetaData)
                     .flatMap(MetaData::getGroups)
-                                                    .map(root -> new GroupNodeViewModel(newDatabase.get(), stateManager, taskExecutor, root, localDragboard))
-                                                    .orElse(GroupNodeViewModel.getAllEntriesGroup(newDatabase.get(), stateManager, taskExecutor, localDragboard));
+                    .map(root -> new GroupNodeViewModel(newDatabase.get(), stateManager, taskExecutor, root, localDragboard))
+                    .orElse(GroupNodeViewModel.getAllEntriesGroup(newDatabase.get(), stateManager, taskExecutor, localDragboard));
 
             rootGroup.setValue(newRoot);
             this.selectedGroups.setAll(
                     stateManager.getSelectedGroup(newDatabase.get()).stream()
-                                                   .map(selectedGroup -> new GroupNodeViewModel(newDatabase.get(), stateManager, taskExecutor, selectedGroup, localDragboard))
+                                .map(selectedGroup -> new GroupNodeViewModel(newDatabase.get(), stateManager, taskExecutor, selectedGroup, localDragboard))
                                 .collect(Collectors.toList()));
         } else {
             rootGroup.setValue(GroupNodeViewModel.getAllEntriesGroup(new BibDatabaseContext(), stateManager, taskExecutor, localDragboard));
@@ -137,21 +134,19 @@ private void onActiveDatabaseChanged(Optional<BibDatabaseContext> newDatabase) {
      * Opens "New Group Dialog" and add the resulting group to the specified group
      */
     public void addNewSubgroup(GroupNodeViewModel parent) {
-        SwingUtilities.invokeLater(() -> {
-            Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(new GroupDialog());
-            newGroup.ifPresent(group -> {
-                parent.addSubgroup(group);
+        Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(new GroupDialog());
+        newGroup.ifPresent(group -> {
+            parent.addSubgroup(group);
 
-                // TODO: Add undo
-                //UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(parent, new GroupTreeNodeViewModel(newGroupNode), UndoableAddOrRemoveGroup.ADD_NODE);
-                //panel.getUndoManager().addEdit(undo);
+            // TODO: Add undo
+            //UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(parent, new GroupTreeNodeViewModel(newGroupNode), UndoableAddOrRemoveGroup.ADD_NODE);
+            //panel.getUndoManager().addEdit(undo);
 
-                // TODO: Expand parent to make new group visible
-                //parent.expand();
+            // TODO: Expand parent to make new group visible
+            //parent.expand();
 
-                dialogService.notify(Localization.lang("Added group \"%0\".", group.getName()));
-                writeGroupChangesToMetaData();
-            });
+            dialogService.notify(Localization.lang("Added group \"%0\".", group.getName()));
+            writeGroupChangesToMetaData();
         });
     }
 
@@ -163,47 +158,42 @@ private void writeGroupChangesToMetaData() {
      * Opens "Edit Group Dialog" and changes the given group to the edited one.
      */
     public void editGroup(GroupNodeViewModel oldGroup) {
-        SwingUtilities.invokeLater(() -> {
-            Optional<AbstractGroup> newGroup = dialogService
-                    .showCustomDialogAndWait(new GroupDialog(oldGroup.getGroupNode().getGroup()));
-            newGroup.ifPresent(group -> {
-
-                Platform.runLater(() -> {
-                    // TODO: Keep assignments
-                    boolean keepPreviousAssignments = dialogService.showConfirmationDialogAndWait(
-                            Localization.lang("Change of Grouping Method"),
-                            Localization.lang("Assign the original group's entries to this group?"));
-                    //        WarnAssignmentSideEffects.warnAssignmentSideEffects(newGroup, panel.frame());
-                    boolean removePreviousAssignents = (oldGroup.getGroupNode().getGroup() instanceof ExplicitGroup)
-                            && (group instanceof ExplicitGroup);
-
-                    oldGroup.getGroupNode().setGroup(
-                            group,
-                            keepPreviousAssignments,
-                            removePreviousAssignents,
-                            stateManager.getEntriesInCurrentDatabase());
-
-                    // TODO: Add undo
-                    // Store undo information.
-                    // AbstractUndoableEdit undoAddPreviousEntries = null;
-                    // UndoableModifyGroup undo = new UndoableModifyGroup(GroupSelector.this, groupsRoot, node, newGroup);
-                    // if (undoAddPreviousEntries == null) {
-                    //    panel.getUndoManager().addEdit(undo);
-                    //} else {
-                    //    NamedCompound nc = new NamedCompound("Modify Group");
-                    //    nc.addEdit(undo);
-                    //    nc.addEdit(undoAddPreviousEntries);
-                    //    nc.end();/
-                    //      panel.getUndoManager().addEdit(nc);
-                    //}
-                    //if (!addChange.isEmpty()) {
-                    //    undoAddPreviousEntries = UndoableChangeEntriesOfGroup.getUndoableEdit(null, addChange);
-                    //}
-
-                    dialogService.notify(Localization.lang("Modified group \"%0\".", group.getName()));
-                    writeGroupChangesToMetaData();
-                });
-            });
+        Optional<AbstractGroup> newGroup = dialogService
+                .showCustomDialogAndWait(new GroupDialog(oldGroup.getGroupNode().getGroup()));
+        newGroup.ifPresent(group -> {
+            // TODO: Keep assignments
+            boolean keepPreviousAssignments = dialogService.showConfirmationDialogAndWait(
+                    Localization.lang("Change of Grouping Method"),
+                    Localization.lang("Assign the original group's entries to this group?"));
+            //        WarnAssignmentSideEffects.warnAssignmentSideEffects(newGroup, panel.frame());
+            boolean removePreviousAssignents = (oldGroup.getGroupNode().getGroup() instanceof ExplicitGroup)
+                    && (group instanceof ExplicitGroup);
+
+            oldGroup.getGroupNode().setGroup(
+                    group,
+                    keepPreviousAssignments,
+                    removePreviousAssignents,
+                    stateManager.getEntriesInCurrentDatabase());
+
+            // TODO: Add undo
+            // Store undo information.
+            // AbstractUndoableEdit undoAddPreviousEntries = null;
+            // UndoableModifyGroup undo = new UndoableModifyGroup(GroupSelector.this, groupsRoot, node, newGroup);
+            // if (undoAddPreviousEntries == null) {
+            //    panel.getUndoManager().addEdit(undo);
+            //} else {
+            //    NamedCompound nc = new NamedCompound("Modify Group");
+            //    nc.addEdit(undo);
+            //    nc.addEdit(undoAddPreviousEntries);
+            //    nc.end();/
+            //      panel.getUndoManager().addEdit(nc);
+            //}
+            //if (!addChange.isEmpty()) {
+            //    undoAddPreviousEntries = UndoableChangeEntriesOfGroup.getUndoableEdit(null, addChange);
+            //}
+
+            dialogService.notify(Localization.lang("Modified group \"%0\".", group.getName()));
+            writeGroupChangesToMetaData();
         });
     }
 
@@ -232,7 +222,7 @@ public void removeGroupKeepSubgroups(GroupNodeViewModel group) {
             //panel.getUndoManager().addEdit(undo);
             GroupTreeNode groupNode = group.getGroupNode();
             groupNode.getParent()
-                    .ifPresent(parent -> groupNode.moveAllChildrenTo(parent, parent.getIndexOfChild(groupNode).get()));
+                     .ifPresent(parent -> groupNode.moveAllChildrenTo(parent, parent.getIndexOfChild(groupNode).get()));
             groupNode.removeFromParent();
 
             dialogService.notify(Localization.lang("Removed group \"%0\".", group.getDisplayName()));
diff --git a/src/main/java/org/jabref/gui/importer/AppendDatabaseDialog.java b/src/main/java/org/jabref/gui/importer/AppendDatabaseDialog.java
new file mode 100644
index 00000000000..10a86d95d15
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/AppendDatabaseDialog.java
@@ -0,0 +1,65 @@
+package org.jabref.gui.importer;
+
+import javafx.geometry.Insets;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.CheckBox;
+import javafx.scene.layout.GridPane;
+
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.l10n.Localization;
+
+/**
+ * Asks for details about merge database operation.
+ */
+public class AppendDatabaseDialog extends BaseDialog<Boolean> {
+
+    private final CheckBox entries = new CheckBox();
+    private final CheckBox strings = new CheckBox();
+    private final CheckBox groups = new CheckBox();
+    private final CheckBox selector = new CheckBox();
+
+    public AppendDatabaseDialog() {
+        this.setTitle(Localization.lang("Append library"));
+
+        this.getDialogPane().getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
+        this.setResultConverter(button -> button == ButtonType.OK);
+        init();
+    }
+
+    private void init() {
+        entries.setSelected(true);
+        entries.setText(Localization.lang("Import entries"));
+        strings.setSelected(true);
+        strings.setText(Localization.lang("Import strings"));
+        groups.setText(Localization.lang("Import group definitions"));
+        selector.setText(Localization.lang("Import word selector definitions"));
+
+        GridPane container = new GridPane();
+        getDialogPane().setContent(container);
+        container.setHgap(10);
+        container.setVgap(10);
+        container.setPadding(new Insets(15, 5, 0, 0));
+        container.add(entries, 0, 0);
+        container.add(strings, 0, 1);
+        container.add(groups, 0, 2);
+        container.add(selector, 0, 3);
+        container.setPadding(new Insets(15, 5, 0, 0));
+        container.setGridLinesVisible(false);
+    }
+
+    public boolean importEntries() {
+        return entries.isSelected();
+    }
+
+    public boolean importGroups() {
+        return groups.isSelected();
+    }
+
+    public boolean importStrings() {
+        return strings.isSelected();
+    }
+
+    public boolean importSelectorWords() {
+        return selector.isSelected();
+    }
+}
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 03834a8e1ed..fbb5d71222e 100644
--- a/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java
@@ -4,6 +4,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import javax.swing.undo.CompoundEdit;
 
@@ -12,12 +13,11 @@
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.MergeDialog;
 import org.jabref.gui.actions.BaseAction;
+import org.jabref.gui.importer.AppendDatabaseDialog;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableInsertEntry;
 import org.jabref.gui.undo.UndoableInsertString;
-import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.ParserResult;
@@ -35,6 +35,7 @@
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.metadata.ContentSelector;
 import org.jabref.model.metadata.MetaData;
+import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.JabRefPreferences;
 
 import org.slf4j.Logger;
@@ -146,24 +147,21 @@ private static void addGroups(GroupTreeNode newGroups, CompoundEdit ce) {
     @Override
     public void action() {
         filesToOpen.clear();
-        final MergeDialog dialog = new MergeDialog(frame, Localization.lang("Append library"), true);
-        dialog.setVisible(true);
-        if (dialog.isOkPressed()) {
-
+        final AppendDatabaseDialog dialog = new AppendDatabaseDialog();
+        Optional<Boolean> response = dialog.showAndWait();
+        if (OptionalUtil.isPresentAndTrue(response)) {
             FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                     .withDefaultExtension(StandardFileType.BIBTEX_DB)
                     .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
                     .build();
 
-            List<Path> chosen = DefaultTaskExecutor
-                    .runInJavaFXThread(() -> dialogService.showFileOpenDialogAndGetMultipleFiles(fileDialogConfiguration));
+            List<Path> chosen = dialogService.showFileOpenDialogAndGetMultipleFiles(fileDialogConfiguration);
             if (chosen.isEmpty()) {
                 return;
             }
             filesToOpen.addAll(chosen);
 
-            // Run the actual open in a thread to prevent the program
-            // locking until the file is loaded.
+            // Run the actual open in a thread to prevent the program locking until the file is loaded.
             JabRefExecutorService.INSTANCE.execute(
                     () -> openIt(dialog.importEntries(), dialog.importStrings(), dialog.importGroups(), dialog.importSelectorWords()));
         }
diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index 44a4a116a62..41dda14d551 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -9,7 +9,7 @@
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
-public class BaseDialog<T> extends Dialog<T> {
+public class BaseDialog<T> extends Dialog<T> implements org.jabref.gui.Dialog<T> {
 
     protected BaseDialog() {
         getDialogPane().getScene().setOnKeyPressed(event -> {
diff --git a/src/main/java/org/jabref/model/util/OptionalUtil.java b/src/main/java/org/jabref/model/util/OptionalUtil.java
index 75471caf7f6..525477f415e 100644
--- a/src/main/java/org/jabref/model/util/OptionalUtil.java
+++ b/src/main/java/org/jabref/model/util/OptionalUtil.java
@@ -48,6 +48,10 @@ public static <T> Boolean isPresentAnd(Optional<T> value, Predicate<T> check) {
         return value.isPresent() && check.test(value.get());
     }
 
+    public static <T> Boolean isPresentAndTrue(Optional<Boolean> value) {
+        return value.isPresent() && value.get();
+    }
+
     public static <T, S, R> Optional<R> combine(Optional<T> valueOne, Optional<S> valueTwo, BiFunction<T, S, R> combine) {
         if (valueOne.isPresent() && valueTwo.isPresent()) {
             return Optional.ofNullable(combine.apply(valueOne.get(), valueTwo.get()));
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index f41a4a761a2..65d77c60098 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -554,8 +554,6 @@ Importing=Importing
 
 Importing\ in\ unknown\ format=Importing in unknown format
 
-Include\ entries=Include entries
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Include subgroups: When selected, view entries contained in this group or its subgroups
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Independent group: When selected, view only this group's entries
@@ -675,8 +673,6 @@ New\ content=New content
 
 New\ library\ created.=New library created.
 
-New\ field\ value=New field value
-
 New\ group=New group
 
 New\ string=New string
@@ -755,7 +751,6 @@ Override\ the\ BibTeX\ field\ by\ the\ selected\ text=Override the BibTeX field
 
 
 Overwrite=Overwrite
-Overwrite\ existing\ field\ values=Overwrite existing field values
 
 Overwrite\ keys=Overwrite keys
 
@@ -947,7 +942,7 @@ Select\ entry\ type=Select entry type
 Select\ file\ from\ ZIP-archive=Select file from ZIP-archive
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Select the tree nodes to view and accept or reject changes
-Selected\ entries=Selected entries
+
 Set\ field=Set field
 Set\ fields=Set fields
 
@@ -1206,7 +1201,6 @@ Append\ field=Append field
 Append\ to\ fields=Append to fields
 Rename\ field\ to=Rename field to
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Move contents of a field into a field with a different name
-You\ can\ only\ rename\ one\ field\ at\ a\ time=You can only rename one field at a time
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Cannot use port %0 for remote operation; another application may be using it. Try specifying another port.
 

From 0a55a82cb61d7aadcaea874f5184aba507d5b0d5 Mon Sep 17 00:00:00 2001
From: Sascha Zeller <zeller.dev@gmail.com>
Date: Wed, 10 Oct 2018 09:51:12 +0200
Subject: [PATCH 104/229] ArXiv fetcher support http url (#4367)

* ArXiv fetcher support http url

* add changelog entry and add some tests for the arxiv fether

* Keep comment
---
 CHANGELOG.md                                    |  1 +
 .../jabref/logic/importer/fetcher/ArXiv.java    | 17 +++++++++--------
 .../logic/importer/fetcher/ArXivTest.java       | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61f77c603d8..61130cb9435 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where files added via the "Attach file" contextmenu of an entry were not made relative. [#4201](https://github.com/JabRef/jabref/issues/4201) and [#4241](https://github.com/JabRef/jabref/issues/4241)
 - We fixed an issue where author list parser can't generate bibtex for Chinese author. [#4169](https://github.com/JabRef/jabref/issues/4169)
 - We fixed an issue where the list of XMP Exclusion fields in the preferences was not be saved [#4072](https://github.com/JabRef/jabref/issues/4072)
+- We fixed an issue where the ArXiv Fetcher did not support HTTP URLs [#4367](https://github.com/JabRef/jabref/pull/4367)
 
 
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java b/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
index bab25ab4aa7..ed7ff8aaf5c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
@@ -263,8 +263,8 @@ public List<BibEntry> performSearch(String query) throws FetcherException {
 
     @Override
     public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
-        String cleanedIdentifier = identifier.trim();
-        cleanedIdentifier = identifier.replaceAll(" ", "");
+        String cleanedIdentifier = identifier.replaceAll(" ", "");
+        cleanedIdentifier = ArXivEntry.createIdString(cleanedIdentifier);
 
         return searchForEntryById(cleanedIdentifier).map((arXivEntry) -> arXivEntry.toBibEntry(importFormatPreferences.getKeywordSeparator()));
     }
@@ -372,17 +372,18 @@ public Optional<URL> getPdfUrl() {
          * Returns the arXiv identifier
          */
         public Optional<String> getIdString() {
+            return urlAbstractPage.map(ArXivEntry::createIdString);
+        }
 
-            return urlAbstractPage.map(abstractUrl -> {
-                Matcher matcher = URL_PATTERN.matcher(abstractUrl);
+        public static String createIdString(String id) {
+                Matcher matcher = URL_PATTERN.matcher(id);
                 if (matcher.find()) {
-                    // remove leading http(s)://arxiv.org/abs/ from abstract url to get arXiv ID
-                    return abstractUrl.substring(matcher.group(1).length());
+                    // Remove leading http(s)://arxiv.org/abs/ from abstract url to get arXiv ID
+                    return id.substring(matcher.group(1).length());
                 } else {
-                    return abstractUrl;
+                    return id;
                 }
 
-            });
         }
 
         public Optional<ArXivIdentifier> getId() {
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
index 4c3fd88b745..e988822af5a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
@@ -191,8 +191,24 @@ public void searchIdentifierForSlicePaper() throws Exception {
 
         assertEquals(ArXivIdentifier.parse("1405.2249v1"), finder.findIdentifier(sliceTheoremPaper));
     }
+
     @Test
     public void searchEmptyId() throws Exception {
         assertEquals(Optional.empty(), finder.performSearchById(""));
     }
+
+    @Test
+    public void searchWithHttpUrl() throws Exception{
+        assertEquals(Optional.of(sliceTheoremPaper), finder.performSearchById("http://arxiv.org/abs/1405.2249"));
+    }
+
+    @Test
+    public void searchWithHttpsUrl() throws Exception{
+        assertEquals(Optional.of(sliceTheoremPaper), finder.performSearchById("https://arxiv.org/abs/1405.2249"));
+    }
+
+    @Test
+    public void searchWithHttpsUrlNotTrimmed() throws Exception{
+        assertEquals(Optional.of(sliceTheoremPaper), finder.performSearchById("https : // arxiv . org / abs / 1405 . 2249 "));
+    }
 }

From 79ba040700c13d3aac42b4106fba80f84a568aa0 Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus@lynyus.de>
Date: Wed, 10 Oct 2018 20:56:56 +0200
Subject: [PATCH 105/229] Update Libraries (#4366)

---
 build.gradle | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 41737ff9652..ae67cf00cb6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 plugins {
     id 'com.gradle.build-scan' version '1.16'
     id 'com.install4j.gradle' version '7.0.7'
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
+    id 'com.github.johnrengelman.shadow' version '4.0.0'
     id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
     id "com.simonharrer.modernizer" version '1.6.0-1'
     id 'me.champeau.gradle.jmh' version '0.4.7'
@@ -65,7 +65,7 @@ sourceSets {
             srcDirs = ["src/main/java", "src/main/resources"]
         }
     }
-    test{
+    test {
         java {
             srcDirs = ["src/test/java"]
         }
@@ -96,9 +96,9 @@ dependencies {
     compile 'com.jgoodies:jgoodies-common:1.8.1'
     compile 'com.jgoodies:jgoodies-forms:1.9.0'
 
-    compile 'org.apache.pdfbox:pdfbox:2.0.11'
-    compile 'org.apache.pdfbox:fontbox:2.0.11'
-    compile 'org.apache.pdfbox:xmpbox:2.0.11'
+    compile 'org.apache.pdfbox:pdfbox:2.0.12'
+    compile 'org.apache.pdfbox:fontbox:2.0.12'
+    compile 'org.apache.pdfbox:xmpbox:2.0.12'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
     compile 'org.bouncycastle:bcprov-jdk15on:1.60'
@@ -158,7 +158,7 @@ dependencies {
 
     compile 'com.github.tomtung:latex2unicode_2.12:0.2.2'
 
-    errorproneJavac 'com.google.errorprone:javac:1.8.0-beta-132'
+    errorproneJavac 'com.google.errorprone:javac:1.8.0-u20'
 
     compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.2.0'
     compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.0'
@@ -168,10 +168,10 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1'
     testCompile 'org.junit.platform:junit-platform-launcher:1.3.1'
-    testCompile 'org.junit-pioneer:junit-pioneer:0.1.2'
+    testCompile 'org.junit-pioneer:junit-pioneer:0.2.1'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'
-    testCompile 'org.mockito:mockito-core:2.22.0'
+    testCompile 'org.mockito:mockito-core:2.23.0'
     testCompile 'com.github.tomakehurst:wiremock:2.19.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'
@@ -181,7 +181,7 @@ dependencies {
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:8.12'
+    checkstyle 'com.puppycrawl.tools:checkstyle:8.13'
 }
 
 jacoco {
@@ -199,7 +199,7 @@ dependencyUpdates.revision = 'integration'
 dependencyUpdates.resolutionStrategy = {
     componentSelection { rules ->
         rules.all { ComponentSelection selection ->
-            if ( selection.candidate.module!="javax.inject"  && selection.candidate.version ==~ /[0-9].*SNAPSHOT/ ) {
+            if (selection.candidate.version ==~ /[0-9].*SNAPSHOT/) {
                 selection.reject("Ignore SNAPSHOT releases")
             }
         }
@@ -209,20 +209,36 @@ dependencyUpdates.resolutionStrategy = {
             }
         }
         rules.withModule("com.github.tomtung:latex2unicode_2.12") { ComponentSelection selection ->
-            if (selection.candidate.version ==~ /0.2.2/) { // Reject version higher than 2.0.2
+            if (selection.candidate.version ==~ /0.2.[3,4]/) {
+                // Reject version higher than 2.0.2. see https://github.com/JabRef/jabref/pull/3781
                 selection.reject("Cannot be updated to 0.2.4 until JabRef is prepared for it")
             }
         }
+        rules.withModule("com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin") { ComponentSelection selection ->
+            if (selection.candidate.version == /4.0.1/) {
+                selection.reject("Version 4.0.1 breaks the release process.")
+            }
+        }
         rules.withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection ->
             if (selection.candidate.version ==~ /2.*/) {
                 selection.reject("Cannot be upgraded to version 2")
             }
         }
-         rules.withModule("com.jfoenix:jfoenix") { ComponentSelection selection ->
+        rules.withModule("com.jfoenix:jfoenix") { ComponentSelection selection ->
             if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher
                 selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9")
             }
         }
+        rules.withModule("com.google.errorprone:javac") { ComponentSelection selection ->
+            if (selection.candidate.version ==~ /1.9.*/ || selection.candidate.version ==~ /9.*/) {
+                selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9")
+            }
+        }
+        rules.withModule("com.sun.xml.bind:jaxb-xjc") { ComponentSelection selection ->
+            if (!(selection.candidate.version ==~ /2.2.4.*/) || selection.candidate.version ==~ /2.[3-9].*/) {
+                selection.reject("Cannot be updated to 2.2.5 or higher.")
+            }
+        }
     }
 }
 

From 73ec321895fb07e131bfd3cc560d0d8f4214cf3c Mon Sep 17 00:00:00 2001
From: Nivedha <nivedha.sunderraj@gmail.com>
Date: Mon, 15 Oct 2018 03:11:26 +0530
Subject: [PATCH 106/229] Fixed testExportAsModsAndThenImportAsMods (#4369)

* Fixed testExportAsModsAndThenImportAsMods

* Fixed indentation

* Fixed indentation
---
 .../exporter/ModsExportFormatTestFiles.java   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
index dfce7d716e1..1c0bbbca22f 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.exporter;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -16,7 +19,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -24,15 +26,13 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
+import org.mockito.Mockito;
 import org.xmlunit.builder.Input;
 import org.xmlunit.builder.Input.Builder;
 import org.xmlunit.diff.DefaultNodeMatcher;
 import org.xmlunit.diff.ElementSelectors;
 import org.xmlunit.matchers.CompareMatcher;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-
 @ExtendWith(TempDirectory.class)
 public class ModsExportFormatTestFiles {
 
@@ -65,8 +65,10 @@ public void setUp(@TempDirectory.TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ARandomlyNamedFile.tmp");
         Files.createFile(path);
         tempFile = path.toAbsolutePath();
-        bibtexImporter = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
-        modsImporter = new ModsImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        ImportFormatPreferences mock = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        bibtexImporter = new BibtexImporter(mock, new DummyFileUpdateMonitor());
+        Mockito.when(mock.getKeywordSeparator()).thenReturn(',');
+        modsImporter = new ModsImporter(mock);
     }
 
     @Disabled
@@ -78,17 +80,16 @@ public final void testPerformExport(String filename) throws Exception {
         Path tempFilename = tempFile.toAbsolutePath();
         List<BibEntry> entries = bibtexImporter.importDatabase(importFile, charset).getDatabase().getEntries();
         Path xmlFile = Paths.get(ModsExportFormatTestFiles.class.getResource(xmlFileName).toURI());
-
+       
         modsExportFormat.export(databaseContext, tempFile, charset, entries);
 
         Builder control = Input.from(Files.newInputStream(xmlFile));
         Builder test = Input.from(Files.newInputStream(tempFilename));
-
         assertThat(test, CompareMatcher.isSimilarTo(control)
                 .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
     }
 
-    @Disabled
+    
     @ParameterizedTest
     @MethodSource("fileNames")
     public final void testExportAsModsAndThenImportAsMods(String filename) throws Exception {

From 3c7ef87d59be59cbe49502133c79c35c480a133f Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus@lynyus.de>
Date: Mon, 15 Oct 2018 22:15:35 +0200
Subject: [PATCH 107/229] Update junit-pioneer from 0.2.1 -> 0.2.2 (#4374)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ae67cf00cb6..79387f7c926 100644
--- a/build.gradle
+++ b/build.gradle
@@ -168,7 +168,7 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1'
     testCompile 'org.junit.platform:junit-platform-launcher:1.3.1'
-    testCompile 'org.junit-pioneer:junit-pioneer:0.2.1'
+    testCompile 'org.junit-pioneer:junit-pioneer:0.2.2'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'
     testCompile 'org.mockito:mockito-core:2.23.0'

From 78926c7d18bd5aa1a6b1ad873075c1ec3a0e99ed Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 16 Oct 2018 10:07:12 +0200
Subject: [PATCH 108/229] Extend list of journal abbreviations by a few math
 journals (#4376)

---
 src/main/resources/journals/journalList.txt | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/journals/journalList.txt b/src/main/resources/journals/journalList.txt
index a1d9b69831d..3d019b4bfa6 100644
--- a/src/main/resources/journals/journalList.txt
+++ b/src/main/resources/journals/journalList.txt
@@ -1136,6 +1136,7 @@ Annales des Ponts et Chausses = Ann. Ponts Chaussees
 Annales des Sciences Naturelles - Zoologie et Biologie Animale = Ann. Sci. Nat. Zool. Biol. Anim.
 Annales Francaises d'Anesthesie et de Reanimation = Ann. Fr. Anesth. Reanim.
 Annales Geophysicae = Ann. Geophys.
+Annales Henri Poincaré = Ann. Henri Poincaré
 Annales Hydrographiques = Ann. Hydrogr.
 Annales Immunologiae Hungaricae = Ann. Immunol. Hung.
 Annales Medicales de Nancy = Ann. Med. Nancy
@@ -1195,6 +1196,7 @@ Annals of Hepatology = Ann. Hepatol.
 Annals of Human Biology = Ann. Hum. Biol.
 Annals of Human Genetics = Ann. Hum. Genet.
 Annals of Internal Medicine = Ann. Intern. Med.
+Annals of Mathematics = Ann. of Math.
 Annals of Medicine = Ann. Med.
 Annals of Neurology = Ann. Neurol.
 Annals of Noninvasive Electrocardiology = Ann. Noninvasive Electrocardiol.
@@ -4258,6 +4260,7 @@ Dianhuaxue = Dianhuaxue
 Diastema = Diastema
 Dicle University Tip Fakultesi Dergisitesi = Dicle Univ. Tip Fakul. Derg.
 DICP = DICP
+Differential Geometry and its Applications = Differential Geom. Appl.
 Differentiation (Malden, MA, United States) = Differentiation (Malden, MA, U. S.)
 Differentiation = Differentiation
 Diffusion and Defect Data--Solid State Data, Pt. A: Defect and Diffusion Forum = Diffus. Defect Data, Pt. A
@@ -4291,6 +4294,7 @@ Diseases of the Colon and Rectum = Dis. Colon Rectum
 Diseases of the Esophagus = Dis. Esophagus
 Diseases of the Nervous System = Dis. Nerv. Syst.
 Diskussionsforum Medizinische Ethik = Diskussionsforum Med. Ethik
+Dissertationes Mathematicae = Dissertationes Math.
 Distributed Systems Engineering = Distrib. Sys. Eng.
 District Nursing = Dist. Nurs.
 Diversity and Distributions = Divers. Distrib.
@@ -7146,6 +7150,7 @@ Japanese Journal of Forensic Toxicology = Jpn. J. Forensic Toxicol.
 Japanese Journal of Genetics = Jpn. J. Genet.
 Japanese Journal of Human Genetics = Jpn. J. Hum. Genet.
 Japanese Journal of Infectious Diseases = Jpn. J. Infect. Dis.
+Japanese Journal of Mathematics = Japan. J. Math.
 Japanese Journal of Medical Science and Biology = Jpn. J. Med. Sci. Biol.
 Japanese Journal of Medicine = Jpn. J. Med.
 Japanese Journal of Microbiology = Jpn. J. Microbiol.
@@ -8875,6 +8880,7 @@ Journal of Surveying Engineering = J. Surv. Eng.
 Journal of Sustainable Forestry = J. Sustainable For.
 Journal of Sustainable Product Design = J. Sustainable Prod. Des.
 Journal of Sustainable Science and Management = J. Sustainable Sci. Manage.
+Journal of Symplectic Geometry = J. Symplectic Geom.
 Journal of Synchrotron Radiat. = J. Synchrotron Radiat.
 Journal of Synthetic Lubrication = J. Synth. Lubr.
 Journal of Synthetic Organic Chemistry, Japan = J. Synth. Org. Chem Jpn.
@@ -9907,7 +9913,7 @@ Mathematical Modeling and Computation = Math. Model. Comput.
 Mathematical Modelling: Theory and Applications = Math. Modell. Theory Appl.
 Mathematical Models and Computer Simulations = Math. Models Comput. Simul.
 Mathematical Models and Methods in Applied Sciences = Math. Models Methods Appl. Sci.
-Mathematical Physics Analysis and Geometry = Math. Phys. Anal. Geom.
+Mathematical Physics, Analysis and Geometry = Math. Phys. Anal. Geom.
 Mathematical Population Studies = Math. Popul. Stud.
 Mathematical Proceedings of the Cambridge Philosophical Society = Math. Proc. Cambridge Philos. Soc.
 Mathematical Programming = Math. Program.
@@ -9915,6 +9921,7 @@ Mathematics and Computers in Simulation = Math. Comput. Simul
 Mathematics of Computation = Math. Comput.
 Mathematics of Operations Research = Math. Oper. Res.
 Mathematicsl Methods in the Applied Sciences = Math. Methods Appl. Sci.
+Mathematische Annalen = Math. Ann.
 Mathematische und Naturwissenschaftliche Unterricht = Math. Naturwiss. Unterr.
 Mathematische Zeitschrift = Math. Z.
 Matrix = Matrix
@@ -11813,6 +11820,7 @@ Physical Review B = Phys. Rev. B
 Physical Review B: Condensed Matter = Phys. Rev. B: Condens. Matter
 Physical Review B: Condensed Matter and Materials Physics = Phys. Rev. B: Condens. Matter Mater. Phys.
 Physical Review C: Nuclear Physics = Phys. Rev. C: Nucl. Phys.
+Physical Review D = Phys. Rev. D
 Physical Review D: Particles and Fields = Phys. Rev. D: Part. Fields
 Physical Review E: Statistical Physics, Plasmas, Fluids, and Related Interdisciplinary Topics = Phys. Rev. E: Stat. Phys. Plasmas Fluids Relat. Interdisciplin. Top.
 Physical Review E: Statistical, Nonlinear, and Soft Matter Physics = Phys. Rev. E: Stat., Nonlinear, Soft Matter Phys.
@@ -12151,6 +12159,7 @@ Proceedings - United States Naval Institute = Proc. U.S. Nav. Inst.
 Proceedings and Papers of the Annual Conference of the California Mosquito Control Association = Proc. Pap. Annu. Conf. Calif. Mosq. Control Assoc.
 Proceedings in Applied Mathematics and Mechanics = Proc. Appl. Math. Mech.
 Proceedings of SPIE The International Society for Optical Engineering = Proc. SPIE Int. Soc. Opt. Eng.
+Proceedings of the American Mathematical Society = Proc. Amer. Math. Soc.
 Proceedings of the American Society of Brewing Chemists = Proc. Am. Soc. Brew. Chem.
 Proceedings of the American Thoracic Society = Proc. Am. Thorac. Soc.
 Proceedings of the Analytical Division of the Chemical Society = Proc. Anal. Div. Chem. Soc.

From 6e5b7b2b4b4ef5628c8a1785bb924c12697888ec Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus@lynyus.de>
Date: Tue, 16 Oct 2018 10:18:21 +0200
Subject: [PATCH 109/229] Downgrade shadow plugin from 4.0.0 -> 2.0.4

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 79387f7c926..5f06b384566 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 plugins {
     id 'com.gradle.build-scan' version '1.16'
     id 'com.install4j.gradle' version '7.0.7'
-    id 'com.github.johnrengelman.shadow' version '4.0.0'
+    id 'com.github.johnrengelman.shadow' version '2.0.4'
     id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
     id "com.simonharrer.modernizer" version '1.6.0-1'
     id 'me.champeau.gradle.jmh' version '0.4.7'

From c2d9832e33bc30af1a4d3e2ad5d8f280e42555ac Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 16 Oct 2018 13:45:56 +0200
Subject: [PATCH 110/229] Color special column icons in lighter gray on mouse
 hover (#4377)

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

diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.css b/src/main/java/org/jabref/gui/maintable/MainTable.css
index 6096c5379f6..5855a86c120 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.css
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.css
@@ -14,7 +14,7 @@
 
 .table-row-cell:hover .empty-special-field {
     visibility: visible;
-    /*-fx-fill: -jr-grayed-text;*/
+    -fx-fill: -jr-gray-2;
 }
 
 .rating > .container {

From 453e7b50adda6fc27bd7c5d83f31be086409e8b5 Mon Sep 17 00:00:00 2001
From: Ali <alijakparov.kz@gmail.com>
Date: Wed, 17 Oct 2018 13:35:05 +0600
Subject: [PATCH 111/229] Provide access to dark theme in preferences (#4372)

Fixes #4130.
---
 CHANGELOG.md                                  |  2 +-
 src/main/java/org/jabref/Globals.java         |  4 +--
 .../gui/preferences/AppearancePrefsTab.java   | 36 ++++++++++++++++---
 .../java/org/jabref/gui/util/ThemeLoader.java | 36 ++++++++++++-------
 .../jabref/preferences/JabRefPreferences.java |  1 +
 .../jabref/styletester/StyleTesterMain.java   |  5 +--
 6 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61130cb9435..adc97d7c507 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We add auto url formatting when user paste link to URL field in entry editor. [#254](https://github.com/koppor/jabref/issues/254)
 - We added a minimal height for the entry editor so that it can no longer be hidden by accident. [#4279](https://github.com/JabRef/jabref/issues/4279)
 - We added a new keyboard shortcut so that the entry editor could be closed by <kbd>Ctrl<kbd> + <kbd>E<kbd>. [#4222] (https://github.com/JabRef/jabref/issues/4222)
-
+- We added an option in the preference dialog box, that allows user to pick the dark or light theme option. [#4130] (https://github.com/JabRef/jabref/issues/4130)
 
 
 
diff --git a/src/main/java/org/jabref/Globals.java b/src/main/java/org/jabref/Globals.java
index 60a1d626acf..b86cc83cbd2 100644
--- a/src/main/java/org/jabref/Globals.java
+++ b/src/main/java/org/jabref/Globals.java
@@ -75,11 +75,11 @@ public static synchronized KeyBindingRepository getKeyPrefs() {
     }
 
     // Background tasks
-    public static void startBackgroundTasks() {
+    public static void startBackgroundTasks() throws JabRefException {
         Globals.fileUpdateMonitor = new DefaultFileUpdateMonitor();
         JabRefExecutorService.INSTANCE.executeInterruptableTask(Globals.fileUpdateMonitor, "FileUpdateMonitor");
 
-        themeLoader = new ThemeLoader(fileUpdateMonitor);
+        themeLoader = new ThemeLoader(fileUpdateMonitor, prefs);
 
         if (Globals.prefs.shouldCollectTelemetry() && !GraphicsEnvironment.isHeadless()) {
             startTelemetryClient();
diff --git a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
index c13de2563c3..92c62d12864 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
@@ -4,7 +4,9 @@
 import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
@@ -16,12 +18,16 @@
 
 class AppearancePrefsTab extends Pane implements PrefsTab {
 
+    public static final String BASE_CSS = "Base.css";
+    public static final String DARK_CSS = "Dark.css";
     private final JabRefPreferences prefs;
     private final CheckBox fontTweaksLAF;
     private final TextField fontSize;
     private final CheckBox overrideFonts;
     private final VBox container = new VBox();
     private final DialogService dialogService;
+    private final RadioButton lightTheme;
+    private final RadioButton darkTheme;
 
     /**
      * Customization of appearance parameters.
@@ -41,7 +47,18 @@ public AppearancePrefsTab(DialogService dialogService, JabRefPreferences prefs)
         fontSizeContainer.disableProperty().bind(overrideFonts.selectedProperty().not());
         fontTweaksLAF = new CheckBox(Localization.lang("Tweak font rendering for entry editor on Linux"));
 
-        container.getChildren().addAll(overrideFonts, fontSizeContainer, fontTweaksLAF);
+        ToggleGroup themeGroup = new ToggleGroup();
+        lightTheme = new RadioButton("Light theme");
+        lightTheme.setToggleGroup(themeGroup);
+        darkTheme = new RadioButton("Dark theme");
+        darkTheme.setToggleGroup(themeGroup);
+
+        if (prefs.get(JabRefPreferences.FX_THEME).equals(BASE_CSS))
+            lightTheme.setSelected(true);
+        else if (prefs.get(JabRefPreferences.FX_THEME).equals(DARK_CSS))
+            darkTheme.setSelected(true);
+
+        container.getChildren().addAll(overrideFonts, fontSizeContainer, fontTweaksLAF, lightTheme, darkTheme);
 
     }
 
@@ -68,10 +85,21 @@ public void storeSettings() {
         int newFontSize = Integer.parseInt(fontSize.getText());
         prefs.putInt(JabRefPreferences.MAIN_FONT_SIZE, newFontSize);
 
+        boolean isThemeChanged = false;
+
+        if (lightTheme.isSelected() && !prefs.get(JabRefPreferences.FX_THEME).equals(BASE_CSS)) {
+            prefs.put(JabRefPreferences.FX_THEME, BASE_CSS);
+            isThemeChanged = true;
+        } else if (darkTheme.isSelected() && !prefs.get(JabRefPreferences.FX_THEME).equals(DARK_CSS)) {
+            prefs.put(JabRefPreferences.FX_THEME, DARK_CSS);
+            isThemeChanged = true;
+        }
+
         boolean isRestartRequired =
-                oldFxTweakValue != fontTweaksLAF.isSelected()
-                        || oldOverrideDefaultFontSize != overrideFonts.isSelected()
-                        || oldFontSize != newFontSize;
+                (oldFxTweakValue != fontTweaksLAF.isSelected())
+                        || (oldOverrideDefaultFontSize != overrideFonts.isSelected())
+                        || (oldFontSize != newFontSize)
+                        || isThemeChanged;
         if (isRestartRequired) {
             dialogService.showWarningDialogAndWait(Localization.lang("Settings"),
                     Localization.lang("Some appearance settings you changed require to restart JabRef to come into effect."));
diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 87eeb0a83e9..7a7004d3445 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -11,6 +11,7 @@
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 
+import org.jabref.JabRefException;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -21,28 +22,39 @@
 
 /**
  * Installs the style file and provides live reloading.
- *
+ * <p>
  * The live reloading has to be turned on by setting the <code>-Djabref.theme.css</code> property.
  * There two possible modes:
- *  (1) When only <code>-Djabref.theme.css</code> is specified, then the standard <code>Base.css</code> that is found will be watched
- *      and on changes in that file, the style-sheet will be reloaded and changes are immediately visible.
- *  (2) When a path to a css file is passed to <code>-Djabref.theme.css</code>, then the given style is loaded in addition to the base css file.
- *      Changes in the specified css file lead to an immediate redraw of the interface.
- *
+ * (1) When only <code>-Djabref.theme.css</code> is specified, then the standard <code>Base.css</code> that is found will be watched
+ * and on changes in that file, the style-sheet will be reloaded and changes are immediately visible.
+ * (2) When a path to a css file is passed to <code>-Djabref.theme.css</code>, then the given style is loaded in addition to the base css file.
+ * Changes in the specified css file lead to an immediate redraw of the interface.
+ * <p>
  * When working from an IDE, this usually means that the <code>Base.css</code> is located in the build folder.
  * To use the css-file that is located in the sources directly, the full path can be given as value for the "VM option":
  * <code>-Djabref.theme.css="/path/to/src/Base.css"</code>
- *
  */
 public class ThemeLoader {
 
     private static final String DEFAULT_PATH_MAIN_CSS = JabRefFrame.class.getResource("Base.css").toExternalForm();
-    private static final String CSS_SYSTEM_PROPERTY = System.getProperty("jabref.theme.css");
     private static final Logger LOGGER = LoggerFactory.getLogger(ThemeLoader.class);
+    private String cssProperty = System.getProperty("jabref.theme.css");
     private final FileUpdateMonitor fileUpdateMonitor;
 
-    public ThemeLoader(FileUpdateMonitor fileUpdateMonitor) {
+    public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRefPreferences) throws JabRefException {
         this.fileUpdateMonitor = Objects.requireNonNull(fileUpdateMonitor);
+
+        if (StringUtil.isNullOrEmpty(cssProperty)) {
+            String cssFileName = jabRefPreferences.get(JabRefPreferences.FX_THEME);
+            if (cssFileName != null) {
+                try {
+                    cssProperty = Paths.get(JabRefFrame.class.getResource(cssFileName).toURI()).toString();
+                } catch (URISyntaxException e) {
+                    LOGGER.warn("can't get css file URI");
+                    throw new JabRefException("can't set custom theme");
+                }
+            }
+        }
     }
 
     /**
@@ -52,8 +64,8 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor) {
     public void installBaseCss(Scene scene, JabRefPreferences preferences) {
         addAndWatchForChanges(scene, DEFAULT_PATH_MAIN_CSS, 0);
 
-        if (StringUtil.isNotBlank(CSS_SYSTEM_PROPERTY)) {
-            final Path path = Paths.get(CSS_SYSTEM_PROPERTY);
+        if (StringUtil.isNotBlank(cssProperty)) {
+            final Path path = Paths.get(cssProperty);
             if (Files.isReadable(path)) {
                 String cssUrl = path.toUri().toString();
                 addAndWatchForChanges(scene, cssUrl, 1);
@@ -69,7 +81,7 @@ private void addAndWatchForChanges(Scene scene, String cssUrl, int index) {
         try {
             // If -Djabref.theme.css is defined and the resources are not part of a .jar bundle,
             // we watch the file for changes and turn on live reloading
-            if (!cssUrl.startsWith("jar:") && CSS_SYSTEM_PROPERTY != null) {
+            if (!cssUrl.startsWith("jar:") && cssProperty != null) {
                 Path cssFile = Paths.get(new URL(cssUrl).toURI());
                 LOGGER.info("Enabling live reloading of " + cssFile);
                 fileUpdateMonitor.addListenerForFile(cssFile, () -> {
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 0c898045a68..ea96020a5fb 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -119,6 +119,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String EXTERNAL_FILE_TYPES = "externalFileTypes";
     public static final String FONT_FAMILY = "fontFamily";
     public static final String FX_FONT_RENDERING_TWEAK = "fxFontRenderingTweak";
+    public static final String FX_THEME = "fxTheme";
     public static final String LANGUAGE = "language";
     public static final String NAMES_LAST_ONLY = "namesLastOnly";
     public static final String ABBR_AUTHOR_NAMES = "abbrAuthorNames";
diff --git a/src/main/java/org/jabref/styletester/StyleTesterMain.java b/src/main/java/org/jabref/styletester/StyleTesterMain.java
index 1bd2cc75d9c..68a7331b989 100644
--- a/src/main/java/org/jabref/styletester/StyleTesterMain.java
+++ b/src/main/java/org/jabref/styletester/StyleTesterMain.java
@@ -4,6 +4,7 @@
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
+import org.jabref.JabRefException;
 import org.jabref.JabRefExecutorService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
@@ -20,7 +21,7 @@ public static void main(String[] args) {
     }
 
     @Override
-    public void start(Stage stage) {
+    public void start(Stage stage) throws JabRefException {
         StyleTesterView view = new StyleTesterView();
 
         IconTheme.loadFonts();
@@ -29,7 +30,7 @@ public void start(Stage stage) {
         JabRefExecutorService.INSTANCE.executeInterruptableTask(fileUpdateMonitor, "FileUpdateMonitor");
 
         Scene scene = new Scene(view.getContent());
-        new ThemeLoader(fileUpdateMonitor).installBaseCss(scene, JabRefPreferences.getInstance());
+        new ThemeLoader(fileUpdateMonitor, JabRefPreferences.getInstance()).installBaseCss(scene, JabRefPreferences.getInstance());
         stage.setScene(scene);
         stage.show();
     }

From e7780ed8038fd2a9193573eca03750777f9f7bec Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 17 Oct 2018 11:05:51 +0200
Subject: [PATCH 112/229] Enable checkstyle for tests and fix style issues
 (#4378)

* Enable checkstyle for tests

* Correct imports

* Reformat code

* Reformat code
---
 build.gradle                                  |   8 +-
 config/checkstyle/suppressions.xml            |   1 -
 .../org/jabref/CatchExceptionsFromThread.java |   4 +-
 .../org/jabref/JabRefPreferencesTest.java     |   1 -
 .../architecture/MainArchitectureTests.java   |   4 +-
 .../MainArchitectureTestsWithArchUnit.java    |  14 +-
 .../architecture/TestArchitectureTests.java   |  39 ++--
 .../cleanup/CleanupActionsListModelTest.java  |   3 -
 .../org/jabref/cli/AuxCommandLineTest.java    |   1 -
 .../java/org/jabref/cli/JabRefCLITest.java    |   6 +-
 .../org/jabref/gui/AWTExceptionHandler.java   |   1 -
 .../java/org/jabref/gui/AbstractUITest.java   |   7 +-
 src/test/java/org/jabref/gui/DialogTest.java  |   2 +-
 .../java/org/jabref/gui/EntryTableTest.java   |  16 +-
 .../org/jabref/gui/IdFetcherDialogTest.java   |   2 -
 .../gui/ParameterizedDialogNewEntryTest.java  |   1 -
 .../jabref/gui/ParameterizedDialogTest.java   |  13 +-
 .../gui/ParameterizedMenuNewEntryTest.java    |   1 -
 .../PersonNameSuggestionProviderTest.java     |   2 +-
 .../FileAnnotationViewModelTest.java          |  10 +-
 .../AutoSetFileLinksUtilTest.java             |   1 -
 .../gui/groups/GroupNodeViewModelTest.java    |   2 +-
 .../gui/groups/GroupTreeViewModelTest.java    |   2 +-
 .../EntryFromFileCreatorManagerTest.java      |   3 +-
 .../gui/importer/EntryFromPDFCreatorTest.java |   1 -
 ...nageJournalAbbreviationsViewModelTest.java |   8 +-
 .../KeyBindingsDialogViewModelTest.java       |   1 -
 .../jabref/gui/search/SearchResultsTest.java  |   2 -
 .../gui/util/FileDialogConfigurationTest.java |   3 -
 .../gui/util/RecursiveTreeItemTest.java       |   1 -
 .../autosaveandbackup/BackupManagerTest.java  |   1 -
 .../jabref/logic/bibtex/BibEntryAssert.java   |  38 ++--
 .../logic/bibtex/BibEntryWriterTest.java      |   1 -
 .../logic/bibtex/FieldContentParserTest.java  |   1 -
 .../bibtex/LatexFieldFormatterTests.java      |   5 +-
 .../comparator/BibDatabaseDiffTest.java       |   1 -
 .../BibtexStringComparatorTest.java           |   3 -
 .../bibtex/comparator/MetaDataDiffTest.java   |   1 -
 .../BibtexKeyGeneratorTest.java               |   8 +-
 .../MakeLabelWithDatabaseTest.java            |   1 -
 .../MakeLabelWithoutDatabaseTest.java         |   2 -
 .../logic/bst/BibtexCaseChangersTest.java     |   2 -
 .../logic/bst/BibtexNameFormatterTest.java    |   2 -
 .../org/jabref/logic/bst/BibtexWidthTest.java |   2 -
 .../java/org/jabref/logic/bst/TestVM.java     |   5 +-
 .../logic/bst/TextPrefixFunctionTest.java     |   1 -
 .../CitationStyleGeneratorTest.java           |   2 -
 .../citationstyle/CitationStyleTest.java      |   1 -
 .../logic/cleanup/CleanupWorkerTest.java      |   1 -
 .../cleanup/FieldFormatterCleanupTest.java    |   4 +-
 .../jabref/logic/cleanup/ISSNCleanupTest.java |   1 -
 .../exporter/BibTeXMLExporterTestFiles.java   |  10 +-
 .../exporter/BibtexDatabaseWriterTest.java    |  37 ++--
 .../logic/exporter/CsvExportFormatTest.java   |  21 +--
 .../jabref/logic/exporter/ExporterTest.java   |   4 +-
 .../exporter/FieldFormatterCleanupsTest.java  |   1 -
 .../logic/exporter/GroupSerializerTest.java   |   1 -
 .../logic/exporter/HtmlExportFormatTest.java  |   4 +-
 .../exporter/MSBibExportFormatTestFiles.java  |   3 +-
 .../exporter/ModsExportFormatTestFiles.java   |  20 +-
 .../logic/exporter/XmpExporterTest.java       | 176 +++++++++---------
 .../jabref/logic/formatter/FormatterTest.java |  19 +-
 .../bibtexfields/AddBracesFormatterTest.java  |   3 +-
 .../bibtexfields/CleanupUrlFormatterTest.java |   4 +-
 .../bibtexfields/ClearFormatterTest.java      |   1 -
 .../HtmlToUnicodeFormatterTest.java           |   1 -
 .../LatexCleanupFormatterTest.java            |   1 -
 .../NormalizeMonthFormatterTest.java          |   1 -
 .../NormalizePagesFormatterTest.java          |   1 -
 .../RemoveBracesFormatterTest.java            |   1 -
 .../TrimWhitespaceFormatterTest.java          |   2 -
 .../bibtexfields/UnicodeConverterTest.java    |   3 +-
 .../UnitsToLatexFormatterTest.java            |   1 -
 .../casechanger/CapitalizeFormatterTest.java  |   1 -
 .../casechanger/LowerCaseFormatterTest.java   |   1 -
 .../ProtectTermsFormatterTest.java            |   4 +-
 .../SentenceCaseFormatterTest.java            |   1 -
 .../casechanger/TitleCaseFormatterTest.java   |   1 -
 .../casechanger/UpperCaseFormatterTest.java   |   1 -
 .../minifier/MinifyNameListFormatterTest.java |   1 -
 .../importer/BibDatabaseTestsWithFiles.java   |   3 +-
 .../importer/DatabaseFileLookupTest.java      |   4 +-
 .../jabref/logic/importer/ImportDataTest.java |   2 -
 .../ImportFormatReaderIntegrationTest.java    |  17 +-
 .../ImportFormatReaderTestParameterless.java  |   3 -
 .../jabref/logic/importer/ImporterTest.java   |  24 ++-
 .../logic/importer/OpenDatabaseTest.java      |   2 +-
 .../logic/importer/fetcher/ACSTest.java       |   2 +-
 .../fetcher/AbstractIsbnFetcherTest.java      |   1 -
 .../logic/importer/fetcher/ArXivTest.java     |   7 +-
 .../importer/fetcher/DBLPFetcherTest.java     |   8 +-
 .../logic/importer/fetcher/DiVATest.java      |   2 +-
 .../importer/fetcher/DoiFetcherTest.java      |   2 -
 .../fetcher/IacrEprintFetcherTest.java        |   2 +-
 .../importer/fetcher/IsbnFetcherTest.java     |   7 +-
 .../fetcher/IsbnViaChimboriFetcherTest.java   |   5 +-
 .../fetcher/IsbnViaEbookDeFetcherTest.java    |   5 +-
 .../importer/fetcher/MathSciNetTest.java      |   2 +-
 .../importer/fetcher/MrDLibFetcherTest.java   |   1 -
 .../importer/fetcher/TitleFetcherTest.java    |   1 -
 .../fileformat/BibTeXMLImporterTest.java      |   1 -
 .../fileformat/BibTeXMLImporterTestFiles.java |   1 -
 .../fileformat/BibTeXMLImporterTestTypes.java |   3 +-
 .../fileformat/BiblioscapeImporterTest.java   |   1 -
 .../BiblioscapeImporterTestTypes.java         |   4 +-
 .../fileformat/BibtexImporterTest.java        |  24 +--
 .../importer/fileformat/BibtexParserTest.java |   6 +-
 .../fileformat/CopacImporterTest.java         |   2 -
 .../fileformat/CopacImporterTestFiles.java    |   1 -
 .../fileformat/EndnoteImporterTest.java       |   2 +-
 .../fileformat/ImporterTestEngine.java        |   2 +-
 .../fileformat/InspecImporterTest.java        |  14 +-
 .../importer/fileformat/IsiImporterTest.java  |   6 +-
 .../fileformat/MedlineImporterTest.java       |  12 +-
 .../fileformat/MedlineImporterTestFiles.java  |   2 -
 .../fileformat/MedlinePlainImporterTest.java  |  10 +-
 .../fileformat/MsBibImporterTest.java         |   1 -
 .../fileformat/MsBibImporterTestFiles.java    |   1 -
 .../importer/fileformat/OvidImporterTest.java |   5 +-
 .../fileformat/PdfContentImporterTest.java    |   1 -
 .../PdfContentImporterTestFiles.java          |   1 -
 .../importer/fileformat/RISImporterTest.java  |   1 -
 .../fileformat/SilverPlatterImporterTest.java |   2 -
 .../logic/importer/util/GroupsParserTest.java |   1 -
 .../logic/integrity/BracesCorrectorTest.java  |   1 -
 .../logic/integrity/IntegrityCheckTest.java   |   9 +-
 .../integrity/NoBibTexFieldCheckerTest.java   |   2 -
 .../journals/AbbreviationParserTest.java      |   2 +-
 .../logic/journals/AbbreviationTest.java      |   1 -
 .../logic/journals/AbbreviationsTest.java     |  10 +-
 .../JournalAbbreviationRepositoryTest.java    |   3 -
 ...ippedJournalAbbreviationDuplicateTest.java |   1 -
 .../l10n/LocalizationConsistencyTest.java     |  34 ++--
 .../jabref/logic/l10n/LocalizationEntry.java  |   3 +-
 .../logic/l10n/LocalizationKeyParamsTest.java |   1 -
 .../logic/l10n/LocalizationKeyTest.java       |   1 -
 .../jabref/logic/l10n/LocalizationParser.java |  22 +--
 .../logic/l10n/LocalizationParserTest.java    |   1 -
 .../jabref/logic/l10n/LocalizationTest.java   |   1 -
 .../jabref/logic/layout/LayoutEntryTest.java  |  24 +--
 .../org/jabref/logic/layout/LayoutTest.java   |   2 +-
 .../layout/format/AuthorAbbreviatorTest.java  |   5 +-
 .../AuthorAndToSemicolonReplacerTest.java     |   4 +-
 .../format/AuthorAndsCommaReplacerTest.java   |   6 +-
 .../layout/format/AuthorAndsReplacerTest.java |   7 +-
 .../format/AuthorFirstAbbrLastCommasTest.java |   4 +-
 .../AuthorFirstAbbrLastOxfordCommasTest.java  |   4 +-
 .../format/AuthorFirstFirstCommasTest.java    |   7 +-
 .../layout/format/AuthorFirstFirstTest.java   |   7 +-
 .../format/AuthorFirstLastCommasTest.java     |   4 +-
 .../AuthorFirstLastOxfordCommasTest.java      |   4 +-
 .../layout/format/AuthorLF_FFAbbrTest.java    |   7 +-
 .../logic/layout/format/AuthorLF_FFTest.java  |   7 +-
 .../format/AuthorLastFirstAbbrCommasTest.java |   5 +-
 .../AuthorLastFirstAbbrOxfordCommasTest.java  |   4 +-
 .../AuthorLastFirstAbbreviatorTester.java     |   4 +-
 .../format/AuthorLastFirstCommasTest.java     |   7 +-
 .../AuthorLastFirstOxfordCommasTest.java      |   4 +-
 .../layout/format/AuthorLastFirstTest.java    |   4 +-
 .../logic/layout/format/AuthorNatBibTest.java |  10 +-
 .../logic/layout/format/AuthorOrgSciTest.java |   4 +-
 .../logic/layout/format/AuthorsTest.java      |   4 +-
 .../layout/format/CompositeFormatTest.java    |   6 +-
 .../logic/layout/format/DOICheckTest.java     |   4 +-
 .../logic/layout/format/DOIStripTest.java     |   5 +-
 .../layout/format/DateFormatterTest.java      |   4 +-
 .../logic/layout/format/DefaultTest.java      |   4 +-
 .../layout/format/EntryTypeFormatterTest.java |   2 -
 .../logic/layout/format/FileLinkTest.java     |   3 +-
 .../logic/layout/format/FirstPageTest.java    |   3 +-
 .../logic/layout/format/HTMLCharsTest.java    |   1 -
 .../layout/format/HTMLParagraphsTest.java     |   5 +-
 .../logic/layout/format/IfPluralTest.java     |   3 +-
 .../logic/layout/format/LastPageTest.java     |   3 +-
 .../format/LatexToUnicodeFormatterTest.java   |   4 -
 .../layout/format/NameFormatterTest.java      |   5 +-
 .../NoSpaceBetweenAbbreviationsTest.java      |   4 +-
 .../logic/layout/format/RTFCharsTest.java     | 105 ++++++-----
 .../logic/layout/format/RemoveTildeTest.java  |   3 +-
 .../logic/layout/format/ReplaceTest.java      |   3 +-
 .../logic/layout/format/RisKeywordsTest.java  |   1 -
 .../logic/layout/format/RisMonthTest.java     |   1 -
 .../logic/layout/format/ToLowerCaseTest.java  |   1 -
 .../logic/layout/format/ToUpperCaseTest.java  |   1 -
 .../logic/layout/format/WrapContentTest.java  |   3 +-
 .../layout/format/WrapFileLinksTest.java      |   3 -
 .../jabref/logic/msbib/MsBibAuthorTest.java   |   1 -
 .../org/jabref/logic/net/URLDownloadTest.java |   1 -
 .../logic/openoffice/OOBibStyleTest.java      |  16 +-
 .../logic/openoffice/OOPreFormatterTest.java  |   2 -
 .../logic/openoffice/StyleLoaderTest.java     |  15 +-
 .../logic/pdf/PdfAnnotationImporterTest.java  |   1 -
 .../ProtectedTermsListTest.java               |   3 +-
 .../ProtectedTermsLoaderTest.java             |  19 +-
 .../logic/remote/RemoteCommunicationTest.java |   4 +-
 .../logic/remote/RemotePreferencesTest.java   |   2 -
 .../logic/search/DatabaseSearcherTest.java    |   1 -
 .../SearchQueryHighlightObservableTest.java   |   4 +-
 .../jabref/logic/search/SearchQueryTest.java  |   3 -
 .../logic/shared/DBMSConnectionTest.java      |   2 +-
 .../logic/shared/DBMSProcessorTest.java       |   8 +-
 .../logic/shared/DBMSSynchronizerTest.java    |  17 +-
 .../org/jabref/logic/shared/DBMSTypeTest.java |   1 -
 .../SynchronizationTestEventListener.java     |   1 -
 .../shared/SynchronizationTestSimulator.java  |  15 +-
 .../org/jabref/logic/shared/TestManager.java  |  14 +-
 .../logic/util/DevelopmentStageTest.java      |   3 -
 .../jabref/logic/util/JavaVersionTest.java    |  16 +-
 .../jabref/logic/util/UpdateFieldTest.java    |   3 -
 .../org/jabref/logic/util/VersionTest.java    |   2 -
 .../util/io/CiteKeyBasedFileFinderTest.java   |   5 +-
 .../jabref/logic/util/io/FileUtilTest.java    |  47 +++--
 .../util/io/RegExpBasedFileFinderTests.java   |  13 +-
 .../strings/StringLengthComparatorTest.java   |   2 -
 .../jabref/logic/xmp/XmpUtilReaderTest.java   |   8 +-
 .../jabref/logic/xmp/XmpUtilWriterTest.java   |   7 +-
 .../migrations/PreferencesMigrationsTest.java |  85 ++++-----
 .../java/org/jabref/model/EntryTypesTest.java |   5 +-
 .../java/org/jabref/model/TreeNodeTest.java   |   1 -
 .../org/jabref/model/TreeNodeTestData.java    |  30 +--
 .../BibDatabaseModeDetectionTest.java         |   1 -
 .../model/database/BibDatabaseTest.java       |   4 -
 .../database/DuplicationCheckerTest.java      |   9 +-
 .../model/database/KeyChangeListenerTest.java |   3 -
 .../model/entry/AuthorListParameterTest.java  |   1 -
 .../jabref/model/entry/AuthorListTest.java    |  43 ++---
 .../org/jabref/model/entry/AuthorTest.java    |   1 -
 .../org/jabref/model/entry/BibEntryTest.java  |   2 -
 .../org/jabref/model/entry/BibEntryTests.java |   4 -
 .../jabref/model/entry/BibtexStringTest.java  |   1 -
 .../model/entry/CanonicalBibEntryTest.java    |   1 -
 .../jabref/model/entry/EntryLinkListTest.java |   8 +-
 .../org/jabref/model/entry/FieldNameTest.java |   1 -
 .../model/entry/FileFieldWriterTest.java      |  10 +-
 .../model/entry/IEEETranEntryTypesTest.java   |   1 -
 .../jabref/model/entry/IdGeneratorTest.java   |   2 -
 .../jabref/model/entry/KeywordListTest.java   |   1 -
 .../org/jabref/model/entry/MonthTest.java     |   2 +-
 .../model/entry/identifier/DOITest.java       |   2 -
 .../model/entry/identifier/ISBNTest.java      |   1 -
 .../entry/specialfields/SpecialFieldTest.java |   1 -
 .../jabref/model/event/TestEventListener.java |   2 -
 .../jabref/model/groups/SearchGroupTest.java  |   1 -
 .../jabref/model/pdf/FileAnnotationTest.java  |   1 -
 .../search/matchers/MatcherSetsTest.java      |   2 -
 .../rules/ContainBasedSearchRuleTest.java     |   1 -
 .../search/rules/SentenceAnalyzerTest.java    |   5 +-
 .../jabref/model/strings/StringUtilTest.java  |   4 +-
 .../performance/BibtexEntryGenerator.java     |   1 -
 .../org/jabref/support/CIServerCondition.java |   4 +-
 .../java/org/jabref/testutils/TestUtils.java  |   4 +-
 251 files changed, 675 insertions(+), 985 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5f06b384566..8796658b173 100644
--- a/build.gradle
+++ b/build.gradle
@@ -177,7 +177,8 @@ dependencies {
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.6.2'
     testCompile 'org.xmlunit:xmlunit-matchers:2.6.2'
-    testCompile 'com.tngtech.archunit:archunit-junit:0.8.3'
+    testCompile 'com.tngtech.archunit:archunit-junit5-api:0.9.1'
+    testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.9.1'
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 
@@ -402,12 +403,7 @@ jacocoTestReport {
 
 // Code quality tasks
 checkstyle {
-    // do not use other packages for checkstyle, excluding gen(erated) sources
-    checkstyleMain.source = "src/main/java"
-    toolVersion = '8.5'
 
-    // do not perform checkstyle checks by default
-    sourceSets = []
 }
 
 modernizer {
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
index 7e853704d9d..71943814250 100644
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -6,5 +6,4 @@
 
 <suppressions>
     <suppress checks="[a-zA-Z0-9]*" files="[\\/]gen[\\/]" />
-    <suppress checks="[a-zA-Z0-9]*" files="[\\/]test[\\/]" />
 </suppressions>
diff --git a/src/test/java/org/jabref/CatchExceptionsFromThread.java b/src/test/java/org/jabref/CatchExceptionsFromThread.java
index 16cb2c6845c..dc3b523e280 100644
--- a/src/test/java/org/jabref/CatchExceptionsFromThread.java
+++ b/src/test/java/org/jabref/CatchExceptionsFromThread.java
@@ -3,8 +3,8 @@
 import org.junit.rules.ExternalResource;
 
 /**
- * JUnit by default ignores exceptions, which are reported via {@link Thread.UncaughtExceptionHandler}.
- * With this rule also these kind of exceptions result in a failure of the test.
+ * JUnit by default ignores exceptions, which are reported via {@link Thread.UncaughtExceptionHandler}. With this rule
+ * also these kind of exceptions result in a failure of the test.
  */
 public class CatchExceptionsFromThread extends ExternalResource {
     @Override
diff --git a/src/test/java/org/jabref/JabRefPreferencesTest.java b/src/test/java/org/jabref/JabRefPreferencesTest.java
index 91f441936bf..187bab026a6 100644
--- a/src/test/java/org/jabref/JabRefPreferencesTest.java
+++ b/src/test/java/org/jabref/JabRefPreferencesTest.java
@@ -26,5 +26,4 @@ void getDefaultEncodingReturnsPreviouslyStoredEncoding() {
         prefs.setDefaultEncoding(StandardCharsets.UTF_8);
         assertEquals(StandardCharsets.UTF_8, prefs.getDefaultEncoding());
     }
-
 }
diff --git a/src/test/java/org/jabref/architecture/MainArchitectureTests.java b/src/test/java/org/jabref/architecture/MainArchitectureTests.java
index 85983851bb3..042b72a6610 100644
--- a/src/test/java/org/jabref/architecture/MainArchitectureTests.java
+++ b/src/test/java/org/jabref/architecture/MainArchitectureTests.java
@@ -84,8 +84,8 @@ void firstPackageIsIndependentOfSecondPackage(String firstPackage, String second
         Predicate<String> isExceptionPackage = (s) -> (s.startsWith("import " + secondPackage)
                 || s.startsWith("import static " + secondPackage))
                 && exceptions.getOrDefault(firstPackage, Collections.emptyList())
-                        .stream()
-                        .noneMatch(exception -> s.startsWith("import " + exception));
+                             .stream()
+                             .noneMatch(exception -> s.startsWith("import " + exception));
 
         Predicate<String> isPackage = (s) -> s.startsWith("package " + firstPackage);
 
diff --git a/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java b/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java
index 6120da6b808..ab22b7dd5aa 100644
--- a/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java
+++ b/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java
@@ -1,20 +1,18 @@
 package org.jabref.architecture;
 
+import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchTest;
-import com.tngtech.archunit.junit.ArchUnitRunner;
-import com.tngtech.archunit.lang.ArchRule;
-import org.junit.runner.RunWith;
 
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
 
-@RunWith(ArchUnitRunner.class)
 @AnalyzeClasses(packages = "org.jabref")
 public class MainArchitectureTestsWithArchUnit {
 
     @ArchTest
-    public static final ArchRule doNotUseApacheCommonsLang3 =
-            noClasses().that().areNotAnnotatedWith(ApacheCommonsLang3Allowed.class)
-            .should().accessClassesThat().resideInAPackage("org.apache.commons.lang3");
-
+    public static void doNotUseApacheCommonsLang3(JavaClasses classes) {
+        noClasses().that().areNotAnnotatedWith(ApacheCommonsLang3Allowed.class)
+                   .should().accessClassesThat().resideInAPackage("org.apache.commons.lang3")
+                   .check(classes);
+    }
 }
diff --git a/src/test/java/org/jabref/architecture/TestArchitectureTests.java b/src/test/java/org/jabref/architecture/TestArchitectureTests.java
index 1e98148ca4c..c37c450d8a0 100644
--- a/src/test/java/org/jabref/architecture/TestArchitectureTests.java
+++ b/src/test/java/org/jabref/architecture/TestArchitectureTests.java
@@ -39,15 +39,14 @@ public TestArchitectureTests() {
         exceptions.add(CLASS_ORG_JABREF_UPDATE_TIMESTAMP_LISTENER_TEST);
         exceptions.add(CLASS_ORG_JABREF_ENTRY_EDITOR_TEST);
         exceptions.add(CLASS_ORG_JABREF_LINKED_FILE_VIEW_MODEL_TEST);
-
     }
 
     public static Stream<String[]> data() {
         return Stream.of(
-                         new String[][] {
-                                         {CLASS_ORG_JABREF_PREFERENCES},
-                                         {CLASS_ORG_JABREF_GLOBALS}
-                         });
+                new String[][]{
+                        {CLASS_ORG_JABREF_PREFERENCES},
+                        {CLASS_ORG_JABREF_GLOBALS}
+                });
     }
 
     @ParameterizedTest
@@ -58,21 +57,21 @@ public void testsAreIndependent(String forbiddenPackage) throws IOException {
 
         try (Stream<Path> pathStream = Files.walk(Paths.get("src/test/"))) {
             List<Path> files = pathStream
-                                         .filter(p -> p.toString().endsWith(".java"))
-                                         .filter(p -> {
-                                             try {
-                                                 return Files.readAllLines(p, StandardCharsets.UTF_8).stream().noneMatch(isExceptionClass);
-                                             } catch (IOException e) {
-                                                 return false;
-                                             }
-                                         })
-                                         .filter(p -> {
-                                             try {
-                                                 return Files.readAllLines(p, StandardCharsets.UTF_8).stream().anyMatch(isForbiddenPackage);
-                                             } catch (IOException e) {
-                                                 return false;
-                                             }
-                                         }).collect(Collectors.toList());
+                    .filter(p -> p.toString().endsWith(".java"))
+                    .filter(p -> {
+                        try {
+                            return Files.readAllLines(p, StandardCharsets.UTF_8).stream().noneMatch(isExceptionClass);
+                        } catch (IOException e) {
+                            return false;
+                        }
+                    })
+                    .filter(p -> {
+                        try {
+                            return Files.readAllLines(p, StandardCharsets.UTF_8).stream().anyMatch(isForbiddenPackage);
+                        } catch (IOException e) {
+                            return false;
+                        }
+                    }).collect(Collectors.toList());
 
             assertEquals(Collections.emptyList(), files, "The following classes are not allowed to depend on " + forbiddenPackage);
         }
diff --git a/src/test/java/org/jabref/cleanup/CleanupActionsListModelTest.java b/src/test/java/org/jabref/cleanup/CleanupActionsListModelTest.java
index 885a6d1e109..b44b0c572aa 100644
--- a/src/test/java/org/jabref/cleanup/CleanupActionsListModelTest.java
+++ b/src/test/java/org/jabref/cleanup/CleanupActionsListModelTest.java
@@ -68,7 +68,6 @@ public void removedAtIndexOkay() {
         ArgumentCaptor<ListDataEvent> argument = ArgumentCaptor.forClass(ListDataEvent.class);
         verify(listener).intervalRemoved(argument.capture());
         assertEquals(ListDataEvent.INTERVAL_REMOVED, argument.getValue().getType());
-
     }
 
     @Test
@@ -91,7 +90,5 @@ public void removedAtIndexgreaterListSizeDoesNothing() {
         model.removeAtIndex((getDefaultFieldFormatterCleanups().size() + 1));
 
         verifyZeroInteractions(listener);
-
     }
-
 }
diff --git a/src/test/java/org/jabref/cli/AuxCommandLineTest.java b/src/test/java/org/jabref/cli/AuxCommandLineTest.java
index 81e81952062..c366e54ffba 100644
--- a/src/test/java/org/jabref/cli/AuxCommandLineTest.java
+++ b/src/test/java/org/jabref/cli/AuxCommandLineTest.java
@@ -45,5 +45,4 @@ public void test() throws URISyntaxException, IOException {
             assertEquals(2, newDB.getEntries().size());
         }
     }
-
 }
diff --git a/src/test/java/org/jabref/cli/JabRefCLITest.java b/src/test/java/org/jabref/cli/JabRefCLITest.java
index f3c43c05fed..cd79ca7cecf 100644
--- a/src/test/java/org/jabref/cli/JabRefCLITest.java
+++ b/src/test/java/org/jabref/cli/JabRefCLITest.java
@@ -11,7 +11,7 @@ class JabRefCLITest {
 
     @Test
     void parsingLongOptions() {
-        JabRefCLI cli = new JabRefCLI(new String[] {"--nogui", "--import=some/file", "--output=some/export/file"});
+        JabRefCLI cli = new JabRefCLI(new String[]{"--nogui", "--import=some/file", "--output=some/export/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
         assertEquals("some/file", cli.getFileImport());
@@ -21,7 +21,7 @@ void parsingLongOptions() {
 
     @Test
     void parsingShortOptions() {
-        JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-i=some/file", "-o=some/export/file"});
+        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-i=some/file", "-o=some/export/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
         assertEquals("some/file", cli.getFileImport());
@@ -31,7 +31,7 @@ void parsingShortOptions() {
 
     @Test
     void preferencesExport() {
-        JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-x=some/file"});
+        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-x=some/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
         assertEquals("some/file", cli.getPreferencesExport());
diff --git a/src/test/java/org/jabref/gui/AWTExceptionHandler.java b/src/test/java/org/jabref/gui/AWTExceptionHandler.java
index a6e25848e4b..74586f4d709 100644
--- a/src/test/java/org/jabref/gui/AWTExceptionHandler.java
+++ b/src/test/java/org/jabref/gui/AWTExceptionHandler.java
@@ -21,5 +21,4 @@ public void assertNoExceptions() {
             throw new AssertionError("Uncaught exception in EDT", list.get(0));
         }
     }
-
 }
diff --git a/src/test/java/org/jabref/gui/AbstractUITest.java b/src/test/java/org/jabref/gui/AbstractUITest.java
index 579729783d2..dfc33236d98 100644
--- a/src/test/java/org/jabref/gui/AbstractUITest.java
+++ b/src/test/java/org/jabref/gui/AbstractUITest.java
@@ -45,8 +45,9 @@ protected void onSetUp() {
     }
 
     /**
-     * Returns the absolute Path of the given relative Path
-     * The backlashes are replaced with forwardslashes b/c assertJ can't type the former one on windows
+     * Returns the absolute Path of the given relative Path The backlashes are replaced with forwardslashes b/c assertJ
+     * can't type the former one on windows
+     *
      * @param relativePath the relative path to the resource database
      */
     protected String getAbsolutePath(String relativePath) throws URISyntaxException {
@@ -94,7 +95,7 @@ protected void takeScreenshot(AbstractWindowFixture<?, ?, ?> dialog, String file
         screenshotTaker.saveComponentAsPng(dialog.target(), file.toString());
     }
 
-    protected void assertColumnValue(JTableFixture table, int rowIndex, int columnIndex, String selectionValue){
+    protected void assertColumnValue(JTableFixture table, int rowIndex, int columnIndex, String selectionValue) {
         String[][] tableContent;
         tableContent = table.contents();
 
diff --git a/src/test/java/org/jabref/gui/DialogTest.java b/src/test/java/org/jabref/gui/DialogTest.java
index fb038b8588b..e97eb1a56dc 100644
--- a/src/test/java/org/jabref/gui/DialogTest.java
+++ b/src/test/java/org/jabref/gui/DialogTest.java
@@ -3,13 +3,13 @@
 import javax.swing.JButton;
 import javax.swing.JDialog;
 
-
 import org.assertj.swing.core.GenericTypeMatcher;
 import org.assertj.swing.dependency.jsr305.Nonnull;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.swing.finder.WindowFinder.findDialog;
+
 /**
  * This test has been split to work, the other part can be found at DialogTest2
  */
diff --git a/src/test/java/org/jabref/gui/EntryTableTest.java b/src/test/java/org/jabref/gui/EntryTableTest.java
index 42dd811c1b3..d5f4fbfa861 100644
--- a/src/test/java/org/jabref/gui/EntryTableTest.java
+++ b/src/test/java/org/jabref/gui/EntryTableTest.java
@@ -11,13 +11,12 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
- * Specific Use-Case:
- * I import a database. Then I doubleclick on the first entry in the table to open the entry editor.
- * Then I click on the first entry again, and scroll through all of the lists entries, without having to click
- * on the table again.
+ * Specific Use-Case: I import a database. Then I doubleclick on the first entry in the table to open the entry editor.
+ * Then I click on the first entry again, and scroll through all of the lists entries, without having to click on the
+ * table again.
  */
 @Tag("GUITest")
-public class EntryTableTest extends AbstractUITest{
+public class EntryTableTest extends AbstractUITest {
 
     private final static int SCROLL_ACTION_EXECUTION = 5;
     private final static String TEST_FILE_NAME = "testbib/testjabref.bib";
@@ -48,20 +47,19 @@ public void scrollThroughEntryList() throws Exception {
         assertColumnValue(entryTable, 0, TITLE_COLUMN_INDEX, entryTable.selectionValue());
 
         //go throught the table and check if the entry with the correct index is selected
-        for (int i=0; i < SCROLL_ACTION_EXECUTION; i++) {
+        for (int i = 0; i < SCROLL_ACTION_EXECUTION; i++) {
             robot().pressAndReleaseKey(DOWN);
             assertNotNull(entryTable.selectionValue());
-            assertColumnValue(entryTable, i+1, TITLE_COLUMN_INDEX, entryTable.selectionValue());
+            assertColumnValue(entryTable, i + 1, TITLE_COLUMN_INDEX, entryTable.selectionValue());
         }
         //do the same going up again
         for (int i = SCROLL_ACTION_EXECUTION; i > 0; i--) {
             robot().pressAndReleaseKey(UP);
             assertNotNull(entryTable.selectionValue());
-            assertColumnValue(entryTable, i-1, TITLE_COLUMN_INDEX, entryTable.selectionValue());
+            assertColumnValue(entryTable, i - 1, TITLE_COLUMN_INDEX, entryTable.selectionValue());
         }
 
         closeDatabase();
         exitJabRef();
     }
-
 }
diff --git a/src/test/java/org/jabref/gui/IdFetcherDialogTest.java b/src/test/java/org/jabref/gui/IdFetcherDialogTest.java
index 023d2c5f0fa..65a1330b25a 100644
--- a/src/test/java/org/jabref/gui/IdFetcherDialogTest.java
+++ b/src/test/java/org/jabref/gui/IdFetcherDialogTest.java
@@ -110,7 +110,6 @@ public boolean test() {
         entryTable.requireRowCount(1);
     }
 
-
     public static Stream<Object[]> instancesToTest() {
         return Stream.of(
                 new Object[]{"BibTeX", "DOI", "10.1002/9781118257517"},
@@ -119,5 +118,4 @@ public static Stream<Object[]> instancesToTest() {
                 new Object[]{"biblatex", "ISBN", "9780321356680"}
         );
     }
-
 }
diff --git a/src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java b/src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java
index 6ce2bb71083..2cfd70baa8a 100644
--- a/src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java
+++ b/src/test/java/org/jabref/gui/ParameterizedDialogNewEntryTest.java
@@ -188,5 +188,4 @@ public static Stream<Object[]> instancesToTest() {
         );
         // @formatter:on
     }
-
 }
diff --git a/src/test/java/org/jabref/gui/ParameterizedDialogTest.java b/src/test/java/org/jabref/gui/ParameterizedDialogTest.java
index 07d1f0a63e8..de3d6dcfc43 100644
--- a/src/test/java/org/jabref/gui/ParameterizedDialogTest.java
+++ b/src/test/java/org/jabref/gui/ParameterizedDialogTest.java
@@ -36,13 +36,13 @@ protected boolean isMatching(JDialog dialog) {
             findDialog(matcher).withTimeout(10_000).using(robot()).close();
         } else {
             findDialog(matcher).withTimeout(10_000).using(robot())
-                    .button(new GenericTypeMatcher<JButton>(JButton.class) {
+                               .button(new GenericTypeMatcher<JButton>(JButton.class) {
 
-                        @Override
-                        protected boolean isMatching(@Nonnull JButton jButton) {
-                            return buttonName.equals(jButton.getText());
-                        }
-                    }).click();
+                                   @Override
+                                   protected boolean isMatching(@Nonnull JButton jButton) {
+                                       return buttonName.equals(jButton.getText());
+                                   }
+                               }).click();
         }
         if (createDatabase) {
             closeDatabase();
@@ -130,5 +130,4 @@ public static Stream<Object[]> instancesToTest() {
         );
         // @formatter:on
     }
-
 }
diff --git a/src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java b/src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java
index 31a66bb3b6c..67efff9e04b 100644
--- a/src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java
+++ b/src/test/java/org/jabref/gui/ParameterizedMenuNewEntryTest.java
@@ -61,5 +61,4 @@ public static Stream<Object[]> instancesToTest() {
         );
         // @formatter:on
     }
-
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
index dcb9d07e32c..2ae76c383b6 100644
--- a/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
@@ -16,7 +16,7 @@
 
 public class PersonNameSuggestionProviderTest {
 
-    private static final Author vassilisKostakos = new Author("Vassilis", "V.", "", "Kostakos", "");
+    private final Author vassilisKostakos = new Author("Vassilis", "V.", "", "Kostakos", "");
     private PersonNameSuggestionProvider autoCompleter;
     private BibEntry entry;
 
diff --git a/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java b/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
index 57279df9b55..32450d93cc4 100644
--- a/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
@@ -16,8 +16,8 @@ public class FileAnnotationViewModelTest {
     public void removeOnlyLineBreaksNotPrecededByPeriodOrColon() {
         String content = "This is content";
         String marking = String.format("This is paragraph 1.%n" +
-                                       "This is paragr-%naph 2, and it crosses%nseveral lines,%nnow you can see next paragraph:%n"
-                                       + "This is paragraph%n3.");
+                "This is paragr-%naph 2, and it crosses%nseveral lines,%nnow you can see next paragraph:%n"
+                + "This is paragraph%n3.");
 
         FileAnnotation linkedFileAnnotation = new FileAnnotation("John", LocalDateTime.now(), 3, content, FileAnnotationType.FREETEXT, Optional.empty());
         FileAnnotation annotation = new FileAnnotation("Jaroslav Kucha ˇr", LocalDateTime.parse("2017-07-20T10:11:30"), 1, marking, FileAnnotationType.HIGHLIGHT, Optional.of(linkedFileAnnotation));
@@ -30,8 +30,8 @@ public void removeOnlyLineBreaksNotPrecededByPeriodOrColon() {
         assertEquals("This is content", annotationViewModel.getContent());
 
         assertEquals(String.format("This is paragraph 1.%n" +
-                                   "This is paragraph 2, and it crosses several lines, now you can see next paragraph:%n"
-                                   + "This is paragraph 3."),
-                     annotationViewModel.getMarking());
+                        "This is paragraph 2, and it crosses several lines, now you can see next paragraph:%n"
+                        + "This is paragraph 3."),
+                annotationViewModel.getMarking());
     }
 }
diff --git a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
index c2e2773a31f..e25495e99f2 100644
--- a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
@@ -51,5 +51,4 @@ public void test() throws Exception {
         List<LinkedFile> actual = util.findAssociatedNotLinkedFiles(entry);
         assertEquals(expected, actual);
     }
-
 }
diff --git a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
index 05941f3a4ab..aa369649d73 100644
--- a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
@@ -154,7 +154,7 @@ public void draggedOnTopOfGroupAddsBeforeItWhenSourceGroupWasBefore() throws Exc
     @Test
     public void entriesAreAddedCorrectly() {
         String groupName = "group";
-        ExplicitGroup group = new ExplicitGroup(groupName, GroupHierarchyType.INDEPENDENT,',');
+        ExplicitGroup group = new ExplicitGroup(groupName, GroupHierarchyType.INDEPENDENT, ',');
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
diff --git a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
index afa4ad53eba..4b0c57c6448 100644
--- a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
@@ -44,7 +44,7 @@ public void rootGroupIsAllEntriesByDefault() throws Exception {
 
     @Test
     public void explicitGroupsAreRemovedFromEntriesOnDelete() {
-        ExplicitGroup group = new ExplicitGroup("group", GroupHierarchyType.INDEPENDENT,',');
+        ExplicitGroup group = new ExplicitGroup("group", GroupHierarchyType.INDEPENDENT, ',');
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
diff --git a/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java b/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java
index 38301e769ef..ec04c0d99e7 100644
--- a/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java
+++ b/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java
@@ -41,7 +41,6 @@ public class EntryFromFileCreatorManagerTest {
     public void setUp() {
         externalFileTypes = mock(ExternalFileTypes.class, Answers.RETURNS_DEEP_STUBS);
         when(externalFileTypes.getExternalFileTypeByExt("pdf")).thenReturn(Optional.empty());
-
     }
 
     @Test
@@ -58,7 +57,7 @@ public void testGetCreator() {
     @Test
     public void testAddEntrysFromFiles() throws IOException {
         try (FileInputStream stream = new FileInputStream(ImportDataTest.UNLINKED_FILES_TEST_BIB);
-                InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
+             InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
             ParserResult result = new BibtexParser(prefs, new DummyFileUpdateMonitor()).parse(reader);
             BibDatabase database = result.getDatabase();
 
diff --git a/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java b/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java
index 17817eeb6b4..575d82852b0 100644
--- a/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java
+++ b/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java
@@ -55,6 +55,5 @@ public void testCreationOfEntryNotInDatabase() {
         assertTrue(entry.get().getField("file").get().endsWith(":PDF"));
         assertEquals(Optional.of(ImportDataTest.FILE_NOT_IN_DATABASE.getName()),
                 entry.get().getField("title"));
-
     }
 }
diff --git a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelTest.java b/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelTest.java
index 5c47dec695e..77e7d20cc36 100644
--- a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelTest.java
+++ b/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelTest.java
@@ -209,7 +209,7 @@ void testBuiltInListsIncludeAllBuiltInAbbreviations() {
                 .observableArrayList(JournalAbbreviationLoader.getBuiltInAbbreviations());
         ObservableList<Abbreviation> actualAbbreviations = FXCollections
                 .observableArrayList(viewModel.abbreviationsProperty().stream()
-                        .map(AbbreviationViewModel::getAbbreviationObject).collect(Collectors.toList()));
+                                              .map(AbbreviationViewModel::getAbbreviationObject).collect(Collectors.toList()));
 
         assertEquals(expected, actualAbbreviations);
     }
@@ -224,7 +224,7 @@ void testBuiltInListsStandardIEEEIncludesAllBuiltIEEEAbbreviations() throws Exce
                 .observableArrayList(JournalAbbreviationLoader.getOfficialIEEEAbbreviations());
         ObservableList<Abbreviation> actualAbbreviations = FXCollections
                 .observableArrayList(viewModel.abbreviationsProperty().stream()
-                        .map(AbbreviationViewModel::getAbbreviationObject).collect(Collectors.toList()));
+                                              .map(AbbreviationViewModel::getAbbreviationObject).collect(Collectors.toList()));
 
         assertEquals(expected, actualAbbreviations);
     }
@@ -443,7 +443,7 @@ void testSaveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations() throw
     void testSaveExternalFilesListToPreferences() throws Exception {
         addFourTestFileToViewModelAndPreferences();
         List<String> expected = Stream.of(testFile1Entries, testFile3Entries, testFile4Entries, testFile5EntriesWithDuplicate)
-                .map(Path::toString).collect(Collectors.toList());
+                                      .map(Path::toString).collect(Collectors.toList());
         verify(abbreviationPreferences).setExternalJournalLists(expected);
     }
 
@@ -478,6 +478,6 @@ private void addFourTestFileToViewModelAndPreferences() throws Exception {
      */
     private void selectLastAbbreviation() {
         viewModel.currentAbbreviationProperty()
-                .set(viewModel.abbreviationsProperty().get(viewModel.abbreviationsCountProperty().get() - 1));
+                 .set(viewModel.abbreviationsProperty().get(viewModel.abbreviationsCountProperty().get() - 1));
     }
 }
diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java b/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java
index 7878cb9c678..c9c34e25e0e 100644
--- a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java
+++ b/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java
@@ -50,7 +50,6 @@ public void testInvalidKeyBindingIsNotSaved() {
         assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.COPY, shortcutKeyEvent));
     }
 
-
     @Test
     public void testSpecialKeysValidKeyBindingIsSaved() {
         setKeyBindingViewModel(KeyBinding.IMPORT_INTO_NEW_DATABASE);
diff --git a/src/test/java/org/jabref/gui/search/SearchResultsTest.java b/src/test/java/org/jabref/gui/search/SearchResultsTest.java
index 6daafde1f70..1e2badcc2ad 100644
--- a/src/test/java/org/jabref/gui/search/SearchResultsTest.java
+++ b/src/test/java/org/jabref/gui/search/SearchResultsTest.java
@@ -21,7 +21,6 @@ public class SearchResultsTest extends AssertJSwingJUnitTestCase {
 
     private FrameFixture frameFixture;
 
-
     @BeforeAll
     public static void before() {
         FailOnThreadViolationRepaintManager.uninstall();
@@ -94,5 +93,4 @@ public void testSearchInvalidQuery() {
         Assert.assertTrue(entries.stream().noneMatch(entry -> entry.isSearchHit()));
         */
     }
-
 }
diff --git a/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java b/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
index 74c90fd5f9b..2a19e5593a6 100644
--- a/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
+++ b/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
@@ -30,7 +30,6 @@ void testWithValidDirectoryString(@TempDirectory.TempDir Path folder) {
         assertEquals(Optional.of(Paths.get(tempFolder)), fileDialogConfiguration.getInitialDirectory());
     }
 
-
     @Test
     void testWithValidDirectoryPath(@TempDirectory.TempDir Path tempFolder) {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
@@ -74,10 +73,8 @@ void testSingleExtension() {
         assertEquals(filter.getExtensions(), fileDialogConfiguration.getDefaultExtension().getExtensions());
     }
 
-
     private FileChooser.ExtensionFilter toFilter(String description, FileType extension) {
         return new FileChooser.ExtensionFilter(description,
                 extension.getExtensions().stream().map(ending -> "*." + ending).collect(Collectors.toList()));
     }
-
 }
diff --git a/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java b/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
index 912ad78feb7..343ed8d63b1 100644
--- a/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
+++ b/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
@@ -16,7 +16,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 class RecursiveTreeItemTest {
 
     private RecursiveTreeItem<TreeNodeTestData.TreeNodeMock> rootTreeItem;
diff --git a/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java b/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java
index 744682b6f9c..fea23323f6c 100644
--- a/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java
+++ b/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java
@@ -15,5 +15,4 @@ public void backupFileNameIsCorrectlyGeneratedWithinTmpDirectory() {
         Path savPath = BackupManager.getBackupPath(bibPath);
         assertEquals(Paths.get("tmp", "test.bib.sav"), savPath);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java b/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
index e5cd84faa34..c745a684457 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
@@ -19,11 +19,11 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import org.junit.jupiter.api.Assertions;
 import org.mockito.Answers;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.mock;
 
 public class BibEntryAssert {
@@ -32,9 +32,9 @@ public class BibEntryAssert {
      * Reads a single entry from the resource using `getResourceAsStream` from the given class. The resource has to
      * contain a single entry
      *
-     * @param clazz the class where to call `getResourceAsStream`
+     * @param clazz        the class where to call `getResourceAsStream`
      * @param resourceName the resource to read
-     * @param entry the entry to compare with
+     * @param entry        the entry to compare with
      */
     public static void assertEquals(Class<?> clazz, String resourceName, BibEntry entry)
             throws IOException {
@@ -50,9 +50,9 @@ public static void assertEquals(Class<?> clazz, String resourceName, BibEntry en
      * Reads a single entry from the resource using `getResourceAsStream` from the given class. The resource has to
      * contain a single entry
      *
-     * @param clazz the class where to call `getResourceAsStream`
+     * @param clazz        the class where to call `getResourceAsStream`
      * @param resourceName the resource to read
-     * @param asIsEntries a list containing a single entry to compare with
+     * @param asIsEntries  a list containing a single entry to compare with
      */
     public static void assertEquals(Class<?> clazz, String resourceName, List<BibEntry> asIsEntries)
             throws IOException {
@@ -79,7 +79,7 @@ private static List<BibEntry> getListFromInputStream(InputStream is) throws IOEx
      * Reads a bibtex database from the given InputStream. The list is compared with the given list.
      *
      * @param expectedInputStream the inputStream reading the entry from
-     * @param actualEntries a list containing a single entry to compare with
+     * @param actualEntries       a list containing a single entry to compare with
      */
     public static void assertEquals(InputStream expectedInputStream, List<BibEntry> actualEntries)
             throws IOException {
@@ -102,7 +102,7 @@ public static void assertEquals(List<BibEntry> expectedEntries, InputStream actu
      * compared to the given entry
      *
      * @param expected the inputStream reading the entry from
-     * @param actual the entry to compare with
+     * @param actual   the entry to compare with
      */
     public static void assertEquals(InputStream expected, BibEntry actual)
             throws IOException {
@@ -110,11 +110,13 @@ public static void assertEquals(InputStream expected, BibEntry actual)
     }
 
     /**
-     * Compares two InputStreams. For each InputStream a list will be created. expectedIs is read directly, actualIs is filtered through importer to convert to a list of BibEntries.
-     * @param expectedIs A BibtexImporter InputStream.
+     * Compares two InputStreams. For each InputStream a list will be created. expectedIs is read directly, actualIs is
+     * filtered through importer to convert to a list of BibEntries.
+     *
+     * @param expectedIs   A BibtexImporter InputStream.
      * @param fileToImport The path to the file to be imported.
-     * @param importer The fileformat you want to use to read the passed file to get the list of expected BibEntries
-     * @throws IOException
+     * @param importer     The fileformat you want to use to read the passed file to get the list of expected
+     *                     BibEntries
      */
     public static void assertEquals(InputStream expectedIs, Path fileToImport, Importer importer)
             throws IOException {
@@ -127,16 +129,18 @@ public static void assertEquals(InputStream expectedIs, URL fileToImport, Import
     }
 
     /**
-     * Compares a list of BibEntries to an InputStream. actualIs is filtered through importerForActualIs to convert to a list of BibEntries.
-     * @param expected A BibtexImporter InputStream.
+     * Compares a list of BibEntries to an InputStream. actualIs is filtered through importerForActualIs to convert to a
+     * list of BibEntries.
+     *
+     * @param expected     A BibtexImporter InputStream.
      * @param fileToImport The path to the file to be imported.
-     * @param importer The fileformat you want to use to read the passed file to get the list of expected BibEntries
-     * @throws IOException
+     * @param importer     The fileformat you want to use to read the passed file to get the list of expected
+     *                     BibEntries
      */
     public static void assertEquals(List<BibEntry> expected, Path fileToImport, Importer importer)
             throws IOException {
         List<BibEntry> actualEntries = importer.importDatabase(fileToImport, StandardCharsets.UTF_8)
-                .getDatabase().getEntries();
+                                               .getDatabase().getEntries();
         // explicit reference of Assertions is needed here to disambiguate from the methods defined by this class
         Assertions.assertEquals(expected, actualEntries);
     }
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
index 68a31d6eb54..a340fdc7b59 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
@@ -509,5 +509,4 @@ public void roundTripWithPrecedingCommentAndModificationTest() throws IOExceptio
 
         assertEquals(expected, actual);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java b/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java
index b63242b6f30..a2d40588f96 100644
--- a/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FieldContentParserTest.java
@@ -13,7 +13,6 @@ public class FieldContentParserTest {
 
     private FieldContentParser parser;
 
-
     @BeforeEach
     public void setUp() throws Exception {
         FieldContentParserPreferences prefs = new FieldContentParserPreferences(Collections.emptyList());
diff --git a/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java b/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java
index 7b822bb1b98..aafd1e80c8e 100644
--- a/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java
+++ b/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java
@@ -28,7 +28,7 @@ public void normalizeNewlineInAbstractField() throws Exception {
 
         // The newlines are normalized according to the globally configured newline setting in the formatter
         String expected = "{" + "lorem" + OS.NEWLINE + " ipsum lorem ipsum" + OS.NEWLINE
- + "lorem ipsum "
+                + "lorem ipsum "
                 + OS.NEWLINE + "lorem ipsum"
                 + OS.NEWLINE + "test" + "}";
 
@@ -69,7 +69,7 @@ public void preserveNewlineInReviewField() throws Exception {
         String text = "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum" + OS.NEWLINE;
 
         String result = formatter.format(text, fieldName);
-        String expected = "{"+text+"}";
+        String expected = "{" + text + "}";
 
         assertEquals(expected, result);
     }
@@ -126,5 +126,4 @@ public void hashEnclosedWordsGetRealStringsInMonthFieldBecauseMonthIsStandardFie
         String text = "#jan# - #feb#";
         assertEquals("jan #{ - } # feb", formatter.format(text, "month"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java
index cdf7115824c..3061f648959 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java
@@ -19,5 +19,4 @@ public void compareOfEmptyDatabasesReportsNoDifferences() throws Exception {
         assertEquals(Collections.emptyList(), diff.getBibStringDifferences());
         assertEquals(Collections.emptyList(), diff.getEntryDifferences());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java
index 9a6d3bbbb26..d256f4472b4 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java
@@ -12,7 +12,6 @@ public class BibtexStringComparatorTest {
     private final BibtexStringComparator bsc1 = new BibtexStringComparator(false);
     private final BibtexStringComparator bsc2 = new BibtexStringComparator(true);
 
-
     @Test
     public void test() {
         BibtexString bs1 = new BibtexString("VLSI", "Very Large Scale Integration");
@@ -42,7 +41,5 @@ public void test() {
         // bs4 after bs1 if considering that bs4 contains bs1
         assertTrue(bsc2.compare(bs1, bs4) < 0);
         assertTrue(bsc2.compare(bs4, bs1) > 0);
-
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java
index 38c9b152f61..89c212c3839 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java
@@ -19,5 +19,4 @@ public void compareWithSameContentSelectorsDoesNotReportAnyDiffs() throws Except
 
         assertEquals(Optional.empty(), MetaDataDiff.compare(one, two));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java b/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java
index 17134b98dc8..4ed5b5bb728 100644
--- a/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java
@@ -227,8 +227,8 @@ public void testMakeLabelAndCheckLegalKeysAccentGrave() throws ParseException {
     }
 
     /**
-     * Tests if checkLegalKey replaces Non-ASCII chars.
-     * There are quite a few chars that should be replaced. Perhaps there is a better method than the current.
+     * Tests if checkLegalKey replaces Non-ASCII chars. There are quite a few chars that should be replaced. Perhaps
+     * there is a better method than the current.
      *
      * @see BibtexKeyGenerator#checkLegalKey(String)
      */
@@ -799,8 +799,8 @@ public void shortTitle() {
     }
 
     /**
-    * Tests [camel]
-    */
+     * Tests [camel]
+     */
     @Test
     public void camel() {
         // camel capitalises and concatenates all the words of the title
diff --git a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
index 20f7c634dcf..a28d412bc35 100644
--- a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
@@ -12,7 +12,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 class MakeLabelWithDatabaseTest {
 
     private BibDatabase database;
diff --git a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java
index 3ca979b9be3..10c02b89016 100644
--- a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithoutDatabaseTest.java
@@ -7,7 +7,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 class MakeLabelWithoutDatabaseTest {
 
     private BibEntry entry;
@@ -36,5 +35,4 @@ void makeEditorLabelForFileSearch() {
         String label = BibtexKeyGenerator.generateKey(localEntry, "auth");
         assertEquals("Doe", label);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java b/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java
index a6214a7f0c8..bcdcac3b4ce 100644
--- a/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java
+++ b/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java
@@ -77,7 +77,6 @@ public void testChangeCase() {
 
         assertCaseChangerTitleLowers("On notions of information transfer in {VLSI} circuits",
                 "On Notions of Information Transfer in {VLSI} Circuits");
-
     }
 
     @Test
@@ -123,7 +122,6 @@ public void testTitleCase() {
 
     private void assertCaseChangerTitleLowers(final String string, final String string2) {
         assertEquals(string, BibtexCaseChanger.changeCase(string2, FORMAT_MODE.TITLE_LOWERS));
-
     }
 
     private void assertCaseChangerAllLowers(final String string, final String string2) {
diff --git a/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java b/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java
index 8fd58e42ff1..5a457bc0f7d 100644
--- a/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java
+++ b/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java
@@ -54,7 +54,6 @@ public void testFormatName() {
         assertNameFormatB("P.~{\\'E}. Victor", "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\’\\i}u, Juan");
         assertNameFormatC("Paul~{\\'E}mile Victor",
                 "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\’\\i}u, Juan");
-
     }
 
     private void assertNameFormat(String string, String string2, int which, String format) {
@@ -114,5 +113,4 @@ public void testNumberOfChars() {
         assertEquals(8, BibtexNameFormatter.numberOfChars("Vall{e}e", -1));
         assertEquals(6, BibtexNameFormatter.numberOfChars("Vall{\\'e this will be skipped}e", -1));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java b/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java
index 924165bf5e0..015eb900300 100644
--- a/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java
+++ b/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java
@@ -1,7 +1,5 @@
 package org.jabref.logic.bst;
 
-
-
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/jabref/logic/bst/TestVM.java b/src/test/java/org/jabref/logic/bst/TestVM.java
index a1e853b8c83..54bf2f0b7c1 100644
--- a/src/test/java/org/jabref/logic/bst/TestVM.java
+++ b/src/test/java/org/jabref/logic/bst/TestVM.java
@@ -58,7 +58,6 @@ public void testVMSimple() throws RecognitionException, IOException {
         assertEquals(1, vm.getEntries().size());
         assertEquals(5, vm.getEntries().get(0).getFields().size());
         assertEquals(38, vm.getFunctions().size());
-
     }
 
     @Test
@@ -76,7 +75,6 @@ public void testLabel() throws RecognitionException, IOException {
         assertEquals("Effective work practices for floss development: A model and propositions", vm
                 .getStack()
                 .pop());
-
     }
 
     @Test
@@ -171,8 +169,8 @@ public void testVMArithmetic() throws RecognitionException {
         assertEquals(3, vm.getStack().pop());
         assertEquals(2, vm.getStack().pop());
         assertEquals(0, vm.getStack().size());
-
     }
+
     @Test
     public void testVMArithmetic2() throws RecognitionException {
         VM vm = new VM("FUNCTION {test} { " + "#1 \"HELLO\" + #5 #2 - }" + "EXECUTE {test}");
@@ -666,5 +664,4 @@ public void testHypthenatedName() throws RecognitionException, IOException {
     private BibEntry t1BibtexEntry() throws IOException {
         return TestVM.bibtexString2BibtexEntry(t1BibtexString());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java b/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java
index 353a7643314..d91eadd8920 100644
--- a/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java
+++ b/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java
@@ -23,5 +23,4 @@ public void testPrefix() {
     private static void assertPrefix(final String string, final String string2) {
         assertEquals(string, BibtexTextPrefix.textPrefix(5, string2, s -> fail("Should not Warn! text.prefix$ should be " + string + " for (5) " + string2)));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java b/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
index 890eed33bea..3b9189afed5 100644
--- a/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
@@ -9,7 +9,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 public class CitationStyleGeneratorTest {
 
     @Test
@@ -116,5 +115,4 @@ public void testXslFoFormat() {
         String actualCitation = CitationStyleGenerator.generateCitation(entry, style, format);
         assertEquals(expectedCitation, actualCitation);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java b/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java
index b63d9d94f0e..040f7a7155d 100644
--- a/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java
@@ -27,5 +27,4 @@ public void testDefaultCitation() {
 
         assertEquals(expected, citation);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
index 124e08b2304..567dffd1f6a 100644
--- a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
@@ -350,5 +350,4 @@ void cleanupWithDisabledFieldFormatterChangesNothing() {
         worker.cleanup(preset, entry);
         assertEquals(Optional.of("01"), entry.getField("month"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
index 57a87a1493d..196263f76ea 100644
--- a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
@@ -3,8 +3,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jabref.logic.formatter.casechanger.UpperCaseFormatter;
 import org.jabref.logic.formatter.bibtexfields.UnicodeToLatexFormatter;
+import org.jabref.logic.formatter.casechanger.UpperCaseFormatter;
 import org.jabref.model.cleanup.FieldFormatterCleanup;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibtexEntryTypes;
@@ -34,7 +34,6 @@ public void setUp() {
         fieldMap.put("doi", "jabrefdoi");
         fieldMap.put("issn", "jabrefissn");
         entry.setField(fieldMap);
-
     }
 
     @Test
@@ -91,5 +90,4 @@ public void testCleanupKeyFieldCleansUpKeyField() throws Exception {
 
         assertEquals("Fran{\\c{c}}ois-Marie Arouet", entry.getField(BibEntry.KEY_FIELD).get());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
index fbe92bc4a65..aa6dc774647 100644
--- a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
@@ -52,5 +52,4 @@ public void cleanupISSNJunkStaysJunk() {
         worker.cleanup(preset, entry);
         assertEquals(Optional.of("Banana"), entry.getField("issn"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java b/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java
index a683dd2bff5..85051a17351 100644
--- a/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java
@@ -35,21 +35,19 @@
 @ExtendWith(TempDirectory.class)
 public class BibTeXMLExporterTestFiles {
 
+    private static Path resourceDir;
     public BibDatabaseContext databaseContext;
     public Charset charset;
     public Path tempFile;
     public BibTeXMLExporter bibtexmlExportFormat;
     public BibtexImporter testImporter;
 
-    private static Path resourceDir;
-
     public static Stream<String> fileNames() throws IOException, URISyntaxException {
         resourceDir = Paths.get(MSBibExportFormatTestFiles.class.getResource("BibTeXMLExporterTestArticle.bib").toURI()).getParent();
-//        System.out.println(resourceDir);
 
         try (Stream<Path> stream = Files.list(resourceDir)) {
             return stream.map(n -> n.getFileName().toString()).filter(n -> n.endsWith(".bib"))
-                    .filter(n -> n.startsWith("BibTeXML")).collect(Collectors.toList()).stream();
+                         .filter(n -> n.startsWith("BibTeXML")).collect(Collectors.toList()).stream();
         }
     }
 
@@ -71,7 +69,7 @@ public final void testPerformExport(String filename) throws IOException, SaveExc
         String tempFilePath = tempFile.toAbsolutePath().toString();
 
         List<BibEntry> entries = testImporter.importDatabase(importFile, StandardCharsets.UTF_8).getDatabase()
-                .getEntries();
+                                             .getEntries();
 
         bibtexmlExportFormat.export(databaseContext, tempFile, charset, entries);
 
@@ -79,6 +77,6 @@ public final void testPerformExport(String filename) throws IOException, SaveExc
         Builder test = Input.from(Files.newInputStream(Paths.get(tempFilePath)));
 
         assertThat(test, CompareMatcher.isSimilarTo(control)
-                .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
+                                       .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
index 1d988120573..e30ecf77ca8 100644
--- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -218,9 +218,9 @@ void writeGroupsAndEncoding() throws Exception {
         // @formatter:off
         assertEquals(
                 "% Encoding: US-ASCII" + OS.NEWLINE +
-                OS.NEWLINE
+                        OS.NEWLINE
                         + "@Comment{jabref-meta: grouping:" + OS.NEWLINE
-                + "0 AllEntriesGroup:;" + OS.NEWLINE
+                        + "0 AllEntriesGroup:;" + OS.NEWLINE
                         + "1 StaticGroup:test\\;2\\;1\\;\\;\\;\\;;" + OS.NEWLINE
                         + "}" + OS.NEWLINE, stringWriter.toString());
         // @formatter:on
@@ -297,7 +297,7 @@ void roundtripWithUserComment() throws Exception {
                 new Defaults(BibDatabaseMode.BIBTEX));
 
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
-        try (Scanner scanner = new Scanner(testBibtexFile,encoding.name())) {
+        try (Scanner scanner = new Scanner(testBibtexFile, encoding.name())) {
             assertEquals(scanner.useDelimiter("\\A").next(), stringWriter.toString());
         }
     }
@@ -341,7 +341,7 @@ void roundtripWithUserCommentBeforeStringAndChange() throws Exception {
 
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
 
-        try (Scanner scanner = new Scanner(testBibtexFile,encoding.name())) {
+        try (Scanner scanner = new Scanner(testBibtexFile, encoding.name())) {
             assertEquals(scanner.useDelimiter("\\A").next(), stringWriter.toString());
         }
     }
@@ -358,7 +358,7 @@ void roundtripWithUnknownMetaData() throws Exception {
                 new Defaults(BibDatabaseMode.BIBTEX));
 
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
-        try (Scanner scanner = new Scanner(testBibtexFile,encoding.name())) {
+        try (Scanner scanner = new Scanner(testBibtexFile, encoding.name())) {
             assertEquals(scanner.useDelimiter("\\A").next(), stringWriter.toString());
         }
     }
@@ -419,7 +419,6 @@ void reformatStringIfAskedToDoSo() throws Exception {
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(OS.NEWLINE + "@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
-
     }
 
     @Test
@@ -525,21 +524,21 @@ void writeEntriesSorted() throws Exception {
 
         assertEquals(
                 OS.NEWLINE +
-                "@Article{," + OS.NEWLINE +
-                "  author = {A}," + OS.NEWLINE +
+                        "@Article{," + OS.NEWLINE +
+                        "  author = {A}," + OS.NEWLINE +
                         "  year   = {2010}," + OS.NEWLINE +
-                "}"  + OS.NEWLINE + OS.NEWLINE +
-                "@Article{," + OS.NEWLINE +
-                "  author = {A}," + OS.NEWLINE +
+                        "}" + OS.NEWLINE + OS.NEWLINE +
+                        "@Article{," + OS.NEWLINE +
+                        "  author = {A}," + OS.NEWLINE +
+                        "  year   = {2000}," + OS.NEWLINE +
+                        "}" + OS.NEWLINE + OS.NEWLINE +
+                        "@Article{," + OS.NEWLINE +
+                        "  author = {B}," + OS.NEWLINE +
                         "  year   = {2000}," + OS.NEWLINE +
-                "}" + OS.NEWLINE + OS.NEWLINE +
-                "@Article{," + OS.NEWLINE +
-                "  author = {B}," + OS.NEWLINE +
-                "  year   = {2000}," + OS.NEWLINE +
-                "}" + OS.NEWLINE + OS.NEWLINE +
-                "@Comment{jabref-meta: databaseType:bibtex;}"
-                 + OS.NEWLINE + OS.NEWLINE +
-                "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}" +
+                        "}" + OS.NEWLINE + OS.NEWLINE +
+                        "@Comment{jabref-meta: databaseType:bibtex;}"
+                        + OS.NEWLINE + OS.NEWLINE +
+                        "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}" +
                         OS.NEWLINE,
                 stringWriter.toString());
     }
diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
index 776b1d84235..a2e7cd9ccfa 100644
--- a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
@@ -15,9 +15,9 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
@@ -28,9 +28,9 @@
 @ExtendWith(TempDirectory.class)
 public class CsvExportFormatTest {
 
-    private Exporter exportFormat;
     public BibDatabaseContext databaseContext;
     public Charset charset;
+    private Exporter exportFormat;
 
     @BeforeEach
     public void setUp() {
@@ -64,8 +64,8 @@ public void testPerformExportForSingleAuthor(@TempDirectory.TempDir Path testFol
         List<String> lines = Files.readAllLines(path);
         assertEquals(2, lines.size());
         assertEquals(
-                     "10,\"\",\"\",\"Someone, Van Something\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                     lines.get(1));
+                "10,\"\",\"\",\"Someone, Van Something\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+                lines.get(1));
     }
 
     @Test
@@ -81,8 +81,8 @@ public void testPerformExportForMultipleAuthors(@TempDirectory.TempDir Path test
         List<String> lines = Files.readAllLines(path);
         assertEquals(2, lines.size());
         assertEquals(
-                     "10,\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                     lines.get(1));
+                "10,\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+                lines.get(1));
     }
 
     @Test
@@ -98,8 +98,8 @@ public void testPerformExportForSingleEditor(@TempDirectory.TempDir Path testFol
         List<String> lines = Files.readAllLines(tmpFile.toPath());
         assertEquals(2, lines.size());
         assertEquals(
-                     "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"Someone, Van Something\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                     lines.get(1));
+                "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"Someone, Van Something\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+                lines.get(1));
     }
 
     @Test
@@ -115,8 +115,7 @@ public void testPerformExportForMultipleEditors(@TempDirectory.TempDir Path test
         List<String> lines = Files.readAllLines(tmpFile.toPath());
         assertEquals(2, lines.size());
         assertEquals(
-                     "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                     lines.get(1));
+                "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+                lines.get(1));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/exporter/ExporterTest.java b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
index e5978b76343..842319f2bb3 100644
--- a/src/test/java/org/jabref/logic/exporter/ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
@@ -68,7 +68,7 @@ public void testExportingEmptyDatabaseYieldsEmptyFile(Exporter exportFormat, Str
     @ParameterizedTest
     @MethodSource("exportFormats")
     public void testExportingNullDatabaseThrowsNPE(Exporter exportFormat, String name, @TempDirectory.TempDir Path testFolder) {
-        assertThrows(NullPointerException.class, ()->{
+        assertThrows(NullPointerException.class, () -> {
             Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
             Files.createFile(tmpFile);
             exportFormat.export(null, tmpFile, charset, entries);
@@ -78,7 +78,7 @@ public void testExportingNullDatabaseThrowsNPE(Exporter exportFormat, String nam
     @ParameterizedTest
     @MethodSource("exportFormats")
     public void testExportingNullEntriesThrowsNPE(Exporter exportFormat, String name, @TempDirectory.TempDir Path testFolder) {
-        assertThrows(NullPointerException.class, ()->{
+        assertThrows(NullPointerException.class, () -> {
             Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
             Files.createFile(tmpFile);
             exportFormat.export(databaseContext, tmpFile, charset, null);
diff --git a/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java b/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java
index ae6a864d198..9cea5c9c203 100644
--- a/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java
+++ b/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java
@@ -24,7 +24,6 @@ public class FieldFormatterCleanupsTest {
 
     private BibEntry entry;
 
-
     @BeforeEach
     public void setUp() {
         entry = new BibEntry();
diff --git a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java b/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
index 92549163859..b1560a3aa65 100644
--- a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
+++ b/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
@@ -157,5 +157,4 @@ public void getTreeAsStringInComplexTree() throws Exception {
         );
         assertEquals(expected, groupSerializer.serializeTree(root));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
index 87433f65fb6..7fe930f9fd5 100644
--- a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
@@ -14,9 +14,9 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
@@ -26,10 +26,10 @@
 
 @ExtendWith(TempDirectory.class)
 public class HtmlExportFormatTest {
-    private Exporter exportFormat;
     public BibDatabaseContext databaseContext;
     public Charset charset;
     public List<BibEntry> entries;
+    private Exporter exportFormat;
 
     @BeforeEach
     public void setUp() {
diff --git a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
index ad8b02d9bd2..e1de292326a 100644
--- a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
@@ -35,14 +35,13 @@
 @ExtendWith(TempDirectory.class)
 public class MSBibExportFormatTestFiles {
 
+    private static Path resourceDir;
     public BibDatabaseContext databaseContext;
     public Charset charset;
     public Path tempFile;
     public MSBibExporter msBibExportFormat;
     public BibtexImporter testImporter;
 
-    private static Path resourceDir;
-
     static Stream<String> fileNames() throws IOException, URISyntaxException {
         //we have to point it to one existing file, otherwise it will return the default class path
         resourceDir = Paths.get(MSBibExportFormatTestFiles.class.getResource("MsBibExportFormatTest1.bib").toURI()).getParent();
diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
index 1c0bbbca22f..7a0d8ac6b6f 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.exporter;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -19,6 +16,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -33,9 +31,13 @@
 import org.xmlunit.diff.ElementSelectors;
 import org.xmlunit.matchers.CompareMatcher;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+
 @ExtendWith(TempDirectory.class)
 public class ModsExportFormatTestFiles {
 
+    private static Path resourceDir;
     public Charset charset;
     private BibDatabaseContext databaseContext;
     private Path tempFile;
@@ -44,8 +46,6 @@ public class ModsExportFormatTestFiles {
     private ModsImporter modsImporter;
     private Path importFile;
 
-    private static Path resourceDir;
-
     public static Stream<String> fileNames() throws Exception {
         resourceDir = Paths.get(MSBibExportFormatTestFiles.class.getResource("ModsExportFormatTestAllFields.bib").toURI()).getParent();
         System.out.println(resourceDir);
@@ -53,7 +53,7 @@ public static Stream<String> fileNames() throws Exception {
         try (Stream<Path> stream = Files.list(resourceDir)) {
             //            stream.forEach(n -> System.out.println(n));
             return stream.map(n -> n.getFileName().toString()).filter(n -> n.endsWith(".bib"))
-                    .filter(n -> n.startsWith("Mods")).collect(Collectors.toList()).stream();
+                         .filter(n -> n.startsWith("Mods")).collect(Collectors.toList()).stream();
         }
     }
 
@@ -80,16 +80,15 @@ public final void testPerformExport(String filename) throws Exception {
         Path tempFilename = tempFile.toAbsolutePath();
         List<BibEntry> entries = bibtexImporter.importDatabase(importFile, charset).getDatabase().getEntries();
         Path xmlFile = Paths.get(ModsExportFormatTestFiles.class.getResource(xmlFileName).toURI());
-       
+
         modsExportFormat.export(databaseContext, tempFile, charset, entries);
 
         Builder control = Input.from(Files.newInputStream(xmlFile));
         Builder test = Input.from(Files.newInputStream(tempFilename));
         assertThat(test, CompareMatcher.isSimilarTo(control)
-                .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
+                                       .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
     }
 
-    
     @ParameterizedTest
     @MethodSource("fileNames")
     public final void testExportAsModsAndThenImportAsMods(String filename) throws Exception {
@@ -117,7 +116,6 @@ public final void testImportAsModsAndExportAsMods(String filename) throws Except
         Builder test = Input.from(Files.newInputStream(tempFilename));
 
         assertThat(test, CompareMatcher.isSimilarTo(control)
-                .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
+                                       .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
index 4174683a69e..7038e8f436e 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
@@ -59,20 +59,20 @@ public void exportSingleEntry(@TempDirectory.TempDir Path testFolder) throws Exc
         exporter.export(databaseContext, file, encoding, Collections.singletonList(entry));
         String actual = Files.readAllLines(file).stream().collect(Collectors.joining("\n")); //we are using \n to join, so we need it in the expected string as well, \r\n would fail
         String expected = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
-                          "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                          "      <dc:creator>\n" +
-                          "        <rdf:Seq>\n" +
-                          "          <rdf:li>Alan Turing</rdf:li>\n" +
-                          "        </rdf:Seq>\n" +
-                          "      </dc:creator>\n" +
-                          "      <dc:format>application/pdf</dc:format>\n" +
-                          "      <dc:type>\n" +
-                          "        <rdf:Bag>\n" +
-                          "          <rdf:li>Misc</rdf:li>\n" +
-                          "        </rdf:Bag>\n" +
-                          "      </dc:type>\n" +
-                          "    </rdf:Description>\n" +
-                          "  </rdf:RDF>";
+                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                "      <dc:creator>\n" +
+                "        <rdf:Seq>\n" +
+                "          <rdf:li>Alan Turing</rdf:li>\n" +
+                "        </rdf:Seq>\n" +
+                "      </dc:creator>\n" +
+                "      <dc:format>application/pdf</dc:format>\n" +
+                "      <dc:type>\n" +
+                "        <rdf:Bag>\n" +
+                "          <rdf:li>Misc</rdf:li>\n" +
+                "        </rdf:Bag>\n" +
+                "      </dc:type>\n" +
+                "    </rdf:Description>\n" +
+                "  </rdf:RDF>";
         assertEquals(expected, actual);
     }
 
@@ -93,38 +93,38 @@ public void writeMultipleEntriesInASingleFile(@TempDirectory.TempDir Path testFo
         String actual = Files.readAllLines(file).stream().collect(Collectors.joining("\n")); //we are using \n to join, so we need it in the expected string as well, \r\n would fail
 
         String expected = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
-                          "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                          "      <dc:creator>\n" +
-                          "        <rdf:Seq>\n" +
-                          "          <rdf:li>Alan Turing</rdf:li>\n" +
-                          "        </rdf:Seq>\n" +
-                          "      </dc:creator>\n" +
-                          "      <dc:format>application/pdf</dc:format>\n" +
-                          "      <dc:type>\n" +
-                          "        <rdf:Bag>\n" +
-                          "          <rdf:li>Misc</rdf:li>\n" +
-                          "        </rdf:Bag>\n" +
-                          "      </dc:type>\n" +
-                          "    </rdf:Description>\n" +
-                          "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                          "      <dc:creator>\n" +
-                          "        <rdf:Seq>\n" +
-                          "          <rdf:li>Michael Armbrust</rdf:li>\n" +
-                          "        </rdf:Seq>\n" +
-                          "      </dc:creator>\n" +
-                          "      <dc:relation>\n" +
-                          "        <rdf:Bag>\n" +
-                          "          <rdf:li>bibtex/bibtexkey/Armbrust2010</rdf:li>\n" +
-                          "        </rdf:Bag>\n" +
-                          "      </dc:relation>\n" +
-                          "      <dc:format>application/pdf</dc:format>\n" +
-                          "      <dc:type>\n" +
-                          "        <rdf:Bag>\n" +
-                          "          <rdf:li>Misc</rdf:li>\n" +
-                          "        </rdf:Bag>\n" +
-                          "      </dc:type>\n" +
-                          "    </rdf:Description>\n" +
-                          "  </rdf:RDF>";
+                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                "      <dc:creator>\n" +
+                "        <rdf:Seq>\n" +
+                "          <rdf:li>Alan Turing</rdf:li>\n" +
+                "        </rdf:Seq>\n" +
+                "      </dc:creator>\n" +
+                "      <dc:format>application/pdf</dc:format>\n" +
+                "      <dc:type>\n" +
+                "        <rdf:Bag>\n" +
+                "          <rdf:li>Misc</rdf:li>\n" +
+                "        </rdf:Bag>\n" +
+                "      </dc:type>\n" +
+                "    </rdf:Description>\n" +
+                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                "      <dc:creator>\n" +
+                "        <rdf:Seq>\n" +
+                "          <rdf:li>Michael Armbrust</rdf:li>\n" +
+                "        </rdf:Seq>\n" +
+                "      </dc:creator>\n" +
+                "      <dc:relation>\n" +
+                "        <rdf:Bag>\n" +
+                "          <rdf:li>bibtex/bibtexkey/Armbrust2010</rdf:li>\n" +
+                "        </rdf:Bag>\n" +
+                "      </dc:relation>\n" +
+                "      <dc:format>application/pdf</dc:format>\n" +
+                "      <dc:type>\n" +
+                "        <rdf:Bag>\n" +
+                "          <rdf:li>Misc</rdf:li>\n" +
+                "        </rdf:Bag>\n" +
+                "      </dc:type>\n" +
+                "    </rdf:Description>\n" +
+                "  </rdf:RDF>";
         assertEquals(expected, actual);
     }
 
@@ -150,20 +150,20 @@ public void writeMultipleEntriesInDifferentFiles(@TempDirectory.TempDir Path tes
         String actualTuring = Files.readAllLines(fileTuring).stream().collect(Collectors.joining("\n")); //we are using \n to join, so we need it in the expected string as well, \r\n would fail
 
         String expectedTuring = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
-                                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                                "      <dc:creator>\n" +
-                                "        <rdf:Seq>\n" +
-                                "          <rdf:li>Alan Turing</rdf:li>\n" +
-                                "        </rdf:Seq>\n" +
-                                "      </dc:creator>\n" +
-                                "      <dc:format>application/pdf</dc:format>\n" +
-                                "      <dc:type>\n" +
-                                "        <rdf:Bag>\n" +
-                                "          <rdf:li>Misc</rdf:li>\n" +
-                                "        </rdf:Bag>\n" +
-                                "      </dc:type>\n" +
-                                "    </rdf:Description>\n" +
-                                "  </rdf:RDF>";
+                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                "      <dc:creator>\n" +
+                "        <rdf:Seq>\n" +
+                "          <rdf:li>Alan Turing</rdf:li>\n" +
+                "        </rdf:Seq>\n" +
+                "      </dc:creator>\n" +
+                "      <dc:format>application/pdf</dc:format>\n" +
+                "      <dc:type>\n" +
+                "        <rdf:Bag>\n" +
+                "          <rdf:li>Misc</rdf:li>\n" +
+                "        </rdf:Bag>\n" +
+                "      </dc:type>\n" +
+                "    </rdf:Description>\n" +
+                "  </rdf:RDF>";
 
         assertEquals(expectedTuring, actualTuring);
 
@@ -171,25 +171,25 @@ public void writeMultipleEntriesInDifferentFiles(@TempDirectory.TempDir Path tes
         String actualArmbrust = Files.readAllLines(fileArmbrust).stream().collect(Collectors.joining("\n")); //we are using \n to join, so we need it in the expected string as well, \r\n would fail
 
         String expectedArmbrust = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
-                                  "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                                  "      <dc:creator>\n" +
-                                  "        <rdf:Seq>\n" +
-                                  "          <rdf:li>Michael Armbrust</rdf:li>\n" +
-                                  "        </rdf:Seq>\n" +
-                                  "      </dc:creator>\n" +
-                                  "      <dc:relation>\n" +
-                                  "        <rdf:Bag>\n" +
-                                  "          <rdf:li>bibtex/bibtexkey/Armbrust2010</rdf:li>\n" +
-                                  "        </rdf:Bag>\n" +
-                                  "      </dc:relation>\n" +
-                                  "      <dc:format>application/pdf</dc:format>\n" +
-                                  "      <dc:type>\n" +
-                                  "        <rdf:Bag>\n" +
-                                  "          <rdf:li>Misc</rdf:li>\n" +
-                                  "        </rdf:Bag>\n" +
-                                  "      </dc:type>\n" +
-                                  "    </rdf:Description>\n" +
-                                  "  </rdf:RDF>";
+                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                "      <dc:creator>\n" +
+                "        <rdf:Seq>\n" +
+                "          <rdf:li>Michael Armbrust</rdf:li>\n" +
+                "        </rdf:Seq>\n" +
+                "      </dc:creator>\n" +
+                "      <dc:relation>\n" +
+                "        <rdf:Bag>\n" +
+                "          <rdf:li>bibtex/bibtexkey/Armbrust2010</rdf:li>\n" +
+                "        </rdf:Bag>\n" +
+                "      </dc:relation>\n" +
+                "      <dc:format>application/pdf</dc:format>\n" +
+                "      <dc:type>\n" +
+                "        <rdf:Bag>\n" +
+                "          <rdf:li>Misc</rdf:li>\n" +
+                "        </rdf:Bag>\n" +
+                "      </dc:type>\n" +
+                "    </rdf:Description>\n" +
+                "  </rdf:RDF>";
 
         assertEquals(expectedArmbrust, actualArmbrust);
     }
@@ -208,15 +208,15 @@ public void exportSingleEntryWithPrivacyFilter(@TempDirectory.TempDir Path testF
         exporter.export(databaseContext, file, encoding, Collections.singletonList(entry));
         String actual = Files.readAllLines(file).stream().collect(Collectors.joining("\n"));
         String expected = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
-                          "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                          "      <dc:format>application/pdf</dc:format>\n" +
-                          "      <dc:type>\n" +
-                          "        <rdf:Bag>\n" +
-                          "          <rdf:li>Misc</rdf:li>\n" +
-                          "        </rdf:Bag>\n" +
-                          "      </dc:type>\n" +
-                          "    </rdf:Description>\n" +
-                          "  </rdf:RDF>";
+                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
+                "      <dc:format>application/pdf</dc:format>\n" +
+                "      <dc:type>\n" +
+                "        <rdf:Bag>\n" +
+                "          <rdf:li>Misc</rdf:li>\n" +
+                "        </rdf:Bag>\n" +
+                "      </dc:type>\n" +
+                "    </rdf:Description>\n" +
+                "  </rdf:RDF>";
         assertEquals(expected, actual);
     }
 }
diff --git a/src/test/java/org/jabref/logic/formatter/FormatterTest.java b/src/test/java/org/jabref/logic/formatter/FormatterTest.java
index 90ffd962d72..316fc9142c7 100644
--- a/src/test/java/org/jabref/logic/formatter/FormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/FormatterTest.java
@@ -33,19 +33,20 @@ static void setUp() {
     }
 
     /**
-     * When a new formatter is added by copy and pasting another formatter, it may happen that the <code>getKey()</code> method is not adapted. This results in duplicate keys, which this test tests for.
+     * When a new formatter is added by copy and pasting another formatter, it may happen that the <code>getKey()</code>
+     * method is not adapted. This results in duplicate keys, which this test tests for.
      */
     @Test
     public void allFormatterKeysAreUnique() {
         // idea for uniqueness checking by https://stackoverflow.com/a/44032568/873282
-       assertEquals(Collections.emptyList(),
-               getFormatters().collect(Collectors.groupingBy(
-                 formatter -> formatter.getKey(),
-                 Collectors.counting()))
-               .entrySet().stream()
-               .filter(e -> e.getValue() > 1)
-               .map(Map.Entry::getKey)
-               .collect(Collectors.toList()));
+        assertEquals(Collections.emptyList(),
+                getFormatters().collect(Collectors.groupingBy(
+                        formatter -> formatter.getKey(),
+                        Collectors.counting()))
+                               .entrySet().stream()
+                               .filter(e -> e.getValue() > 1)
+                               .map(Map.Entry::getKey)
+                               .collect(Collectors.toList()));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatterTest.java
index 7bb7788e462..85b6ef5003e 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatterTest.java
@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
@@ -72,5 +72,4 @@ public void formatDoesNotRemoveBracesInBrokenString() {
     public void formatExample() {
         assertEquals("{In CDMA}", formatter.format(formatter.getExampleInput()));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
index f6bd4e789fa..46e4bea3508 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
@@ -6,7 +6,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
- *  Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
+ * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
 class CleanupUrlFormatterTest {
 
@@ -32,7 +32,7 @@ void extractURLFormLink() {
     @Test
     void formatExample() {
         assertEquals("http://www.focus.de/" +
-                "gesundheit/ratgeber/herz/test/lebenserwartung-werden-sie-100-jahre-alt_aid_363828.html",
+                        "gesundheit/ratgeber/herz/test/lebenserwartung-werden-sie-100-jahre-alt_aid_363828.html",
                 formatter.format(formatter.getExampleInput()));
     }
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java
index 3c2fe1b9f67..ea4f8407eb5 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java
@@ -9,7 +9,6 @@
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
 
-
 public class ClearFormatterTest {
 
     private ClearFormatter formatter;
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java
index 13ce11e3d05..81997715f25 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java
@@ -39,7 +39,6 @@ public void testUmlauts() {
         assertEquals("ä", formatter.format("&auml;"));
         assertEquals("ä", formatter.format("&#228;"));
         assertEquals("ä", formatter.format("&#xe4;"));
-
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java
index 4e24f6ccaa2..202aaa8ddb3 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java
@@ -45,5 +45,4 @@ public void escapePercentSignOnlnyOnceWithNumber() {
     public void formatExample() {
         assertEquals("{VLSI DSP}", formatter.format(formatter.getExampleInput()));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java
index c6253e15112..31c3f935989 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java
@@ -21,5 +21,4 @@ public void setUp() {
     public void formatExample() {
         assertEquals("#dec#", formatter.format(formatter.getExampleInput()));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java
index 77468ca156f..b0b019ddbe0 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java
@@ -108,5 +108,4 @@ public void keepFormattedACMPages() {
     public void formatExample() {
         assertEquals("1--2", formatter.format(formatter.getExampleInput()));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java
index 7ffb7179bd5..b2f417cd587 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java
@@ -72,5 +72,4 @@ public void formatDoesNotRemoveBracesInBrokenString() {
     public void formatExample() {
         assertEquals("In CDMA", formatter.format(formatter.getExampleInput()));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
index d0554334a0e..3154a1a91fb 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
@@ -56,6 +56,4 @@ public void removeMixedWhitespaceChars() {
         assertEquals("whitespace", formatter.format("whitespace \n \r"));
         assertEquals("whitespace", formatter.format("   \f\t whitespace  \r \n"));
     }
-
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java
index fe4d723ad06..a4d7f3fa7cb 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java
@@ -10,7 +10,7 @@
  */
 public class UnicodeConverterTest {
 
-    private  UnicodeToLatexFormatter formatter;
+    private UnicodeToLatexFormatter formatter;
 
     @BeforeEach
     public void setUp() {
@@ -38,5 +38,4 @@ public void testUnicode() {
     public void testUnicodeSingle() {
         assertEquals("a", formatter.format("a"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java
index 43d1338831a..292a79b7869 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java
@@ -27,5 +27,4 @@ public void test() {
     public void formatExample() {
         assertEquals("1~{Hz}", formatter.format(formatter.getExampleInput()));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java
index 437f42b096a..61d7fdd9837 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java
@@ -28,5 +28,4 @@ public void test() {
     public void formatExample() {
         assertEquals("I Have {a} Dream", formatter.format(formatter.getExampleInput()));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java
index abc194048c6..0629e48a3fe 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java
@@ -28,5 +28,4 @@ public void test() {
     public void formatExample() {
         assertEquals("kde {Amarok}", formatter.format(formatter.getExampleInput()));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
index a21eb71c99c..5840c12a4c6 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
@@ -20,8 +20,8 @@ public class ProtectTermsFormatterTest {
     @BeforeEach
     public void setUp() {
         formatter = new ProtectTermsFormatter(
-                        new ProtectedTermsLoader(new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(),
-                                Collections.emptyList(), Collections.emptyList(), Collections.emptyList())));
+                new ProtectedTermsLoader(new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(),
+                        Collections.emptyList(), Collections.emptyList(), Collections.emptyList())));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java
index 9e03374df67..9116062136f 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java
@@ -29,5 +29,4 @@ public void test() {
     public void formatExample() {
         assertEquals("I have {Aa} dream", formatter.format(formatter.getExampleInput()));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
index faccd196267..11e22b1123d 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
@@ -84,5 +84,4 @@ public void testTwoExperiencesTitle() {
     public void formatExample() {
         assertEquals("{BPMN} Conformance in Open Source Engines", formatter.format(formatter.getExampleInput()));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java
index fd1a2aa2b7a..2c669a6a5d2 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java
@@ -5,7 +5,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
diff --git a/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java b/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java
index 99a3146e3ed..28d6140e248 100644
--- a/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.formatter.minifier;
 
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java b/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java
index f8317b118c6..0bfe55d3a03 100644
--- a/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java
+++ b/src/test/java/org/jabref/logic/importer/BibDatabaseTestsWithFiles.java
@@ -28,7 +28,7 @@ public void setUp() {
     @Test
     public void resolveStrings() throws IOException {
         try (FileInputStream stream = new FileInputStream("src/test/resources/org/jabref/util/twente.bib");
-                InputStreamReader fr = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
+             InputStreamReader fr = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
             ParserResult result = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(fr);
 
             BibDatabase db = result.getDatabase();
@@ -41,5 +41,4 @@ public void resolveStrings() throws IOException {
             assertEquals("#unknown#", db.resolveForStrings("#unknown#"));
         }
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java b/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
index 29313bb46e0..fdb97e6ed88 100644
--- a/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
+++ b/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
@@ -26,11 +26,10 @@ public class DatabaseFileLookupTest {
     private BibEntry entry1;
     private BibEntry entry2;
 
-
     @BeforeEach
     public void setUp() throws Exception {
         try (FileInputStream stream = new FileInputStream(ImportDataTest.UNLINKED_FILES_TEST_BIB);
-                InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
+             InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
             ParserResult result = new BibtexParser(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor()).parse(reader);
             database = result.getDatabase();
             entries = database.getEntries();
@@ -50,5 +49,4 @@ public void testTestDatabase() {
         assertNotNull(entry1);
         assertNotNull(entry2);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/ImportDataTest.java b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
index a2fa5889d09..dc457791f75 100644
--- a/src/test/java/org/jabref/logic/importer/ImportDataTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
@@ -23,7 +23,6 @@ public class ImportDataTest {
     public static final File UNLINKED_FILES_TEST_BIB = Paths
             .get("src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib").toFile();
 
-
     /**
      * Tests the testing environment.
      */
@@ -45,5 +44,4 @@ public void testOpenNotExistingDirectory() {
         assertFalse(ImportDataTest.NOT_EXISTING_FOLDER.exists());
         assertFalse(ImportDataTest.NOT_EXISTING_PDF.exists());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
index e861f07b999..0550e3b8ec3 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
@@ -57,15 +57,14 @@ void testImportUnknownFormatFromString(String resource, String format, int count
 
     private static Stream<Object[]> importFormats() {
         Collection<Object[]> result = new ArrayList<>();
-        result.add(new Object[] {"fileformat/RisImporterTest1.ris", "ris", 1});
-        result.add(new Object[] {"fileformat/IsiImporterTest1.isi", "isi", 1});
-        result.add(new Object[] {"fileformat/SilverPlatterImporterTest1.txt", "silverplatter", 1});
-        result.add(new Object[] {"fileformat/RepecNepImporterTest2.txt", "repecnep", 1});
-        result.add(new Object[] {"fileformat/OvidImporterTest3.txt", "ovid", 1});
-        result.add(new Object[] {"fileformat/Endnote.entries.enw", "refer", 5});
-        result.add(new Object[] {"fileformat/MsBibImporterTest4.xml", "msbib", 1});
-        result.add(new Object[] {"fileformat/MsBibImporterTest4.bib", "bibtex", 1});
+        result.add(new Object[]{"fileformat/RisImporterTest1.ris", "ris", 1});
+        result.add(new Object[]{"fileformat/IsiImporterTest1.isi", "isi", 1});
+        result.add(new Object[]{"fileformat/SilverPlatterImporterTest1.txt", "silverplatter", 1});
+        result.add(new Object[]{"fileformat/RepecNepImporterTest2.txt", "repecnep", 1});
+        result.add(new Object[]{"fileformat/OvidImporterTest3.txt", "ovid", 1});
+        result.add(new Object[]{"fileformat/Endnote.entries.enw", "refer", 5});
+        result.add(new Object[]{"fileformat/MsBibImporterTest4.xml", "msbib", 1});
+        result.add(new Object[]{"fileformat/MsBibImporterTest4.bib", "bibtex", 1});
         return result.stream();
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java b/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java
index fc057c3f331..9ddc2962ef0 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java
@@ -38,18 +38,15 @@ void importUnknownFormatThrowsExceptionIfNoMatchingImporterWasFound() throws Exc
     @Test
     void importUnknownFormatThrowsExceptionIfPathIsNull() throws Exception {
         assertThrows(NullPointerException.class, () -> reader.importUnknownFormat(null, fileMonitor));
-
     }
 
     @Test
     void importUnknownFormatThrowsExceptionIfDataIsNull() throws Exception {
         assertThrows(NullPointerException.class, () -> reader.importUnknownFormat(null));
-
     }
 
     @Test
     void importFromFileWithUnknownFormatThrowsException() throws Exception {
         assertThrows(ImportException.class, () -> reader.importFromFile("someunknownformat", Paths.get("somepath")));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/ImporterTest.java b/src/test/java/org/jabref/logic/importer/ImporterTest.java
index c16eb4a2fb2..348cce8217d 100644
--- a/src/test/java/org/jabref/logic/importer/ImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImporterTest.java
@@ -29,9 +29,9 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -41,50 +41,50 @@ public class ImporterTest {
     @ParameterizedTest
     @MethodSource("instancesToTest")
     public void isRecognizedFormatWithNullForBufferedReaderThrowsException(Importer format) {
-        assertThrows(NullPointerException.class, ()-> format.isRecognizedFormat((BufferedReader) null));
+        assertThrows(NullPointerException.class, () -> format.isRecognizedFormat((BufferedReader) null));
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
     public void isRecognizedFormatWithNullForStringThrowsException(Importer format) {
-        assertThrows(NullPointerException.class, ()-> format.isRecognizedFormat((String) null));
+        assertThrows(NullPointerException.class, () -> format.isRecognizedFormat((String) null));
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
     public void importDatabaseWithNullForBufferedReaderThrowsException(Importer format) {
-        assertThrows(NullPointerException.class, ()-> format.importDatabase((BufferedReader) null));
+        assertThrows(NullPointerException.class, () -> format.importDatabase((BufferedReader) null));
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
     public void importDatabaseWithNullForStringThrowsException(Importer format) {
-        assertThrows(NullPointerException.class, ()-> format.importDatabase((String) null));
+        assertThrows(NullPointerException.class, () -> format.importDatabase((String) null));
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
     public void getFormatterNameDoesNotReturnNull(Importer format) {
-         assertNotNull(format.getName());
+        assertNotNull(format.getName());
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
     public void getFileTypeDoesNotReturnNull(Importer format) {
-         assertNotNull(format.getFileType());
+        assertNotNull(format.getFileType());
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
     public void getIdDoesNotReturnNull(Importer format) {
-         assertNotNull(format.getId());
+        assertNotNull(format.getId());
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
     public void getIdDoesNotContainWhitespace(Importer format) {
         Pattern whitespacePattern = Pattern.compile("\\s");
-         assertFalse(whitespacePattern.matcher(format.getId()).find());
+        assertFalse(whitespacePattern.matcher(format.getId()).find());
     }
 
     @ParameterizedTest
@@ -92,16 +92,15 @@ public void getIdDoesNotContainWhitespace(Importer format) {
     public void getIdStripsSpecialCharactersAndConvertsToLowercase(Importer format) {
         Importer importer = mock(Importer.class, Mockito.CALLS_REAL_METHODS);
         when(importer.getName()).thenReturn("*Test-Importer");
-         assertEquals("testimporter", importer.getId());
+        assertEquals("testimporter", importer.getId());
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
     public void getDescriptionDoesNotReturnNull(Importer format) {
-         assertNotNull(format.getDescription());
+        assertNotNull(format.getDescription());
     }
 
-
     public static Stream<Importer> instancesToTest() {
         // all classes implementing {@link Importer}
         // sorted alphabetically
@@ -131,5 +130,4 @@ public static Stream<Importer> instancesToTest() {
         );
         // @formatter:on
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
index 47ca7b116dc..d722690e7a3 100644
--- a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
@@ -38,7 +38,7 @@ public OpenDatabaseTest() throws URISyntaxException {
         bibWrongHeader = Paths.get(OpenDatabaseTest.class.getResource("wrong-header.bib").toURI()).toFile();
         bibHeader = Paths.get(OpenDatabaseTest.class.getResource("encoding-header.bib").toURI()).toFile();
         bibHeaderAndSignature = Paths.get(OpenDatabaseTest.class.getResource("jabref-header.bib").toURI())
-                .toFile();
+                                     .toFile();
         bibEncodingWithoutNewline = Paths
                 .get(OpenDatabaseTest.class.getResource("encodingWithoutNewline.bib").toURI()).toFile();
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
index c11b94cb2bb..6bf36592f56 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
@@ -31,7 +31,7 @@ void findByDOI() throws IOException {
         entry.setField("doi", "10.1021/bk-2006-STYG.ch014");
 
         assertEquals(
-                     Optional.of(new URL("https://pubs.acs.org/doi/pdf/10.1021/bk-2006-STYG.ch014")),
+                Optional.of(new URL("https://pubs.acs.org/doi/pdf/10.1021/bk-2006-STYG.ch014")),
                 finder.findFullText(entry)
         );
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
index 096f11e840a..ffad948cba1 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
@@ -51,5 +51,4 @@ public void searchByIdThrowsExceptionForLongInvalidISB() {
     public void searchByIdThrowsExceptionForInvalidISBN() {
         assertThrows(FetcherException.class, () -> fetcher.performSearchById("jabref-4-ever"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
index e988822af5a..ae71b8849c7 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
@@ -64,7 +64,6 @@ public void findFullTextByDOI() throws IOException {
         entry.setField(FieldName.TITLE, "Pause Point Spectra in DNA Constant-Force Unzipping");
 
         assertEquals(Optional.of(new URL("http://arxiv.org/pdf/cond-mat/0406246v1")), finder.findFullText(entry));
-
     }
 
     @Test
@@ -198,17 +197,17 @@ public void searchEmptyId() throws Exception {
     }
 
     @Test
-    public void searchWithHttpUrl() throws Exception{
+    public void searchWithHttpUrl() throws Exception {
         assertEquals(Optional.of(sliceTheoremPaper), finder.performSearchById("http://arxiv.org/abs/1405.2249"));
     }
 
     @Test
-    public void searchWithHttpsUrl() throws Exception{
+    public void searchWithHttpsUrl() throws Exception {
         assertEquals(Optional.of(sliceTheoremPaper), finder.performSearchById("https://arxiv.org/abs/1405.2249"));
     }
 
     @Test
-    public void searchWithHttpsUrlNotTrimmed() throws Exception{
+    public void searchWithHttpsUrlNotTrimmed() throws Exception {
         assertEquals(Optional.of(sliceTheoremPaper), finder.performSearchById("https : // arxiv . org / abs / 1405 . 2249 "));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
index 51e1ba7ad97..dcf548eca80 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
@@ -28,24 +28,23 @@ public class DBLPFetcherTest {
     public void setUp() {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
         when(importFormatPreferences.getFieldContentParserPreferences())
-                                                                        .thenReturn(mock(FieldContentParserPreferences.class));
+                .thenReturn(mock(FieldContentParserPreferences.class));
         dblpFetcher = new DBLPFetcher(importFormatPreferences);
         entry = new BibEntry();
 
         entry.setType(BibtexEntryTypes.ARTICLE.getName());
         entry.setCiteKey("DBLP:journals/stt/GeigerHL16");
         entry.setField(FieldName.TITLE,
-                       "Process Engine Benchmarking with Betsy in the Context of {ISO/IEC} Quality Standards");
+                "Process Engine Benchmarking with Betsy in the Context of {ISO/IEC} Quality Standards");
         entry.setField(FieldName.AUTHOR, "Matthias Geiger and Simon Harrer and J{\\\"{o}}rg Lenhard");
         entry.setField(FieldName.JOURNAL, "Softwaretechnik-Trends");
         entry.setField(FieldName.VOLUME, "36");
         entry.setField(FieldName.NUMBER, "2");
         entry.setField(FieldName.YEAR, "2016");
         entry.setField(FieldName.URL,
-                       "http://pi.informatik.uni-siegen.de/stt/36_2/./03_Technische_Beitraege/ZEUS2016/beitrag_2.pdf");
+                "http://pi.informatik.uni-siegen.de/stt/36_2/./03_Technische_Beitraege/ZEUS2016/beitrag_2.pdf");
         entry.setField("biburl", "https://dblp.org/rec/bib/journals/stt/GeigerHL16");
         entry.setField("bibsource", "dblp computer science bibliography, https://dblp.org");
-
     }
 
     @Test
@@ -68,5 +67,4 @@ public void findSingleEntryUsingComplexOperators() throws FetcherException {
     public void findNothing() throws Exception {
         assertEquals(Collections.emptyList(), dblpFetcher.performSearch(""));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
index fa76e65b9b4..8fbfd9277ea 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
@@ -44,7 +44,7 @@ public void testPerformSearchById() throws Exception {
         entry.setField("institution", "Linköping University, The Institute of Technology");
         entry.setCiteKey("Gustafsson260746");
         entry.setField("journal",
-                       "IEEE transactions on circuits and systems. 2, Analog and digital signal processing (Print)");
+                "IEEE transactions on circuits and systems. 2, Analog and digital signal processing (Print)");
         entry.setField("number", "11");
         entry.setField("pages", "974--978");
         entry.setField("title", "Lower bounds for constant multiplication problems");
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
index d6411540e39..3c8c4d130f0 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
@@ -48,7 +48,6 @@ public void setUp() {
         bibEntryDecker2007.setField("doi", "10.1109/icws.2007.59");
     }
 
-
     @Test
     public void testGetName() {
         assertEquals("DOI", fetcher.getName());
@@ -79,7 +78,6 @@ public void testPerformSearchEmptyDOI() {
     @Test
     public void testPerformSearchInvalidDOI() {
         assertThrows(FetcherException.class, () -> fetcher.performSearchById("10.1002/9781118257517F"));
-
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
index e03a54eb7ec..7b887663a76 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
@@ -161,7 +161,7 @@ public void searchByIdWithOldHtmlFormatWithoutDateCheck(String id) throws Fetche
     /**
      * Helper method for allNonWithdrawnIdsWithOldHtmlFormat.
      *
-     * @param year The year of the generated IDs (e.g. 1996)
+     * @param year  The year of the generated IDs (e.g. 1996)
      * @param maxId The maximum ID to generate in the given year (e.g. 112)
      * @return A list of IDs in the from yyyy/iii (e.g. [1996/001, 1996/002, ..., 1996/112]
      */
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
index a8a6f0fd40a..ed140ff3dc8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
@@ -38,7 +38,6 @@ public void setUp() {
         bibEntry.setField("ean", "9780134685991");
         bibEntry.setField("isbn", "0134685997");
         bibEntry.setField("url", "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html");
-
     }
 
     @Test
@@ -85,14 +84,12 @@ public void searchByIdThrowsExceptionForInvalidISBN() {
     }
 
     /**
-     * This test searches for a valid ISBN. See https://www.amazon.de/dp/3728128155/?tag=jabref-21
-     * However, this ISBN is not available on ebook.de. The fetcher should something as it falls back to Chimbori
-     * @throws FetcherException
+     * This test searches for a valid ISBN. See https://www.amazon.de/dp/3728128155/?tag=jabref-21 However, this ISBN is
+     * not available on ebook.de. The fetcher should something as it falls back to Chimbori
      */
     @Test
     public void searchForIsbnAvailableAtChimboriButNonOnEbookDe() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3728128155");
         assertNotEquals(Optional.empty(), fetchedEntry);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java
index 7371043febc..5eb46520f88 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java
@@ -30,7 +30,7 @@ public void setUp() {
         bibEntry.setField("author", "Joshua Bloch");
         bibEntry.setField("isbn", "978-0321356680");
         bibEntry.setField("url",
-                          "https://www.amazon.com/Effective-Java-2nd-Joshua-Bloch/dp/0321356683?SubscriptionId=AKIAIOBINVZYXZQZ2U3A&tag=chimbori05-20&linkCode=xm2&camp=2025&creative=165953&creativeASIN=0321356683");
+                "https://www.amazon.com/Effective-Java-2nd-Joshua-Bloch/dp/0321356683?SubscriptionId=AKIAIOBINVZYXZQZ2U3A&tag=chimbori05-20&linkCode=xm2&camp=2025&creative=165953&creativeASIN=0321356683");
 
         fetcher = new IsbnViaChimboriFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
     }
@@ -77,7 +77,7 @@ public void authorsAreCorrectlyFormatted() throws Exception {
         bibEntry.setField("author", "Marlon Dumas and Marcello La Rosa and Jan Mendling and Hajo A. Reijers");
         bibEntry.setField("isbn", "3642434738");
         bibEntry.setField("url",
-                          "https://www.amazon.com/Fundamentals-Business-Process-Management-Marlon/dp/3642434738?SubscriptionId=AKIAIOBINVZYXZQZ2U3A&tag=chimbori05-20&linkCode=xm2&camp=2025&creative=165953&creativeASIN=3642434738");
+                "https://www.amazon.com/Fundamentals-Business-Process-Management-Marlon/dp/3642434738?SubscriptionId=AKIAIOBINVZYXZQZ2U3A&tag=chimbori05-20&linkCode=xm2&camp=2025&creative=165953&creativeASIN=3642434738");
 
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3642434738");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
@@ -88,5 +88,4 @@ public void searchForIsbnAvailableAtChimboriButNonOnEbookDe() throws Exception {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3728128155");
         assertNotEquals(Optional.empty(), fetchedEntry);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
index a20318709b1..f84fe58799d 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
@@ -80,13 +80,12 @@ public void authorsAreCorrectlyFormatted() throws Exception {
     }
 
     /**
-     * This test searches for a valid ISBN. See https://www.amazon.de/dp/3728128155/?tag=jabref-21
-     * However, this ISBN is not available on ebook.de. The fetcher should return nothing rather than throwing an exeption.
+     * This test searches for a valid ISBN. See https://www.amazon.de/dp/3728128155/?tag=jabref-21 However, this ISBN is
+     * not available on ebook.de. The fetcher should return nothing rather than throwing an exeption.
      */
     @Test
     public void searchForValidButNotFoundISBN() throws Exception {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3728128155");
         assertEquals(Optional.empty(), fetchedEntry);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
index 5c2f2787854..e66d81f0948 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
@@ -28,7 +28,7 @@ class MathSciNetTest {
     void setUp() throws Exception {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
         when(importFormatPreferences.getFieldContentParserPreferences()).thenReturn(
-                                                                                    mock(FieldContentParserPreferences.class));
+                mock(FieldContentParserPreferences.class));
         fetcher = new MathSciNet(importFormatPreferences);
 
         ratiuEntry = new BibEntry();
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
index 82a7116f7a2..c35684edf48 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
@@ -56,5 +56,4 @@ public void testPerformSearchForHornecker2006() throws FetcherException {
     public void testGetName() {
         assertEquals("MDL_FETCHER", fetcher.getName());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
index 728ef5de1b9..715c1fb6220 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
@@ -63,5 +63,4 @@ public void testPerformSearchInvalidTitle() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("An unknown title where noi DOI can be determined");
         assertEquals(Optional.empty(), fetchedEntry);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java
index 6b904f75ffd..0b2b490c0e7 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTest.java
@@ -7,7 +7,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 public class BibTeXMLImporterTest {
 
     private BibTeXMLImporter importer;
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java b/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java
index 6ab7a54ce7d..e25c020989f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestFiles.java
@@ -41,5 +41,4 @@ public void testIsNotRecognizedFormat(String fileName) throws IOException {
     public void testImportEntries(String fileName) throws Exception {
         ImporterTestEngine.testImportEntries(new BibTeXMLImporter(), fileName, FILE_ENDING);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java b/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java
index 84f9035a8e8..bf66acaf56a 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java
@@ -38,7 +38,6 @@ public static Collection<String> types() {
         });
     }
 
-
     @ParameterizedTest
     @MethodSource("types")
     public void importConvertsToCorrectBibType(String type) throws IOException {
@@ -49,7 +48,7 @@ public void importConvertsToCorrectBibType(String type) throws IOException {
                 + type + ">\n" + "</bibtex:entry>\n" + "</bibtex:file>";
 
         List<BibEntry> bibEntries = new BibTeXMLImporter().importDatabase(new BufferedReader(new StringReader(bibteXMLInput)))
-                .getDatabase().getEntries();
+                                                          .getDatabase().getEntries();
 
         BibEntry entry = new BibEntry();
         entry.setField("author", "Max Mustermann");
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
index 2a979f5030d..2ee415b14ab 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
@@ -16,7 +16,6 @@ public class BiblioscapeImporterTest {
 
     private BiblioscapeImporter importer;
 
-
     @BeforeEach
     public void setUp() throws Exception {
         importer = new BiblioscapeImporter();
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java
index 12c3d195189..7e37160a023 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java
@@ -17,7 +17,7 @@
 public class BiblioscapeImporterTestTypes {
 
     private static Stream<String[]> types() {
-        return Arrays.stream(new String[][] {
+        return Arrays.stream(new String[][]{
                 {"journal", "article"},
                 {"book section", "inbook"},
                 {"book", "book"},
@@ -36,7 +36,7 @@ public void importConvertsToCorrectBibType(String biblioscapeType, String bibtex
                 + "--RT-- " + biblioscapeType + "\n" + "------";
 
         List<BibEntry> bibEntries = new BiblioscapeImporter().importDatabase(new BufferedReader(new StringReader(bsInput)))
-                .getDatabase().getEntries();
+                                                             .getDatabase().getEntries();
 
         BibEntry entry = new BibEntry();
         entry.setField("author", "Baklouti, F.");
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
index 6e631a788c2..77330b76028 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
@@ -22,18 +22,14 @@
 import static org.mockito.Mockito.mock;
 
 /**
- * This class tests the BibtexImporter.
- * That importer is only used for --importToOpen, which is currently untested
+ * This class tests the BibtexImporter. That importer is only used for --importToOpen, which is currently untested
  * <p>
- * TODO:
- * 1. Add test for --importToOpen
- * 2. Move these tests to the code opening a bibtex file
+ * TODO: 1. Add test for --importToOpen 2. Move these tests to the code opening a bibtex file
  */
 public class BibtexImporterTest {
 
     private BibtexImporter importer;
 
-
     @BeforeEach
     public void setUp() {
         importer = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
@@ -68,23 +64,23 @@ public void testImportEntries() throws IOException, URISyntaxException {
                 assertEquals(Optional.of("13"), entry.getField("number"));
                 assertEquals(Optional.of("3027-3036"), entry.getField("pages"));
                 assertEquals(Optional
-                        .of("Effect of immobilization on catalytic characteristics of saturated {Pd-N}-heterocyclic "
-                                + "carbenes in {Mizoroki-Heck} reactions"),
+                                .of("Effect of immobilization on catalytic characteristics of saturated {Pd-N}-heterocyclic "
+                                        + "carbenes in {Mizoroki-Heck} reactions"),
                         entry.getField("title"));
                 assertEquals(Optional.of("691"), entry.getField("volume"));
             } else if (entry.getCiteKeyOptional().get().equals("stdmodel")) {
                 assertEquals(Optional
-                        .of("A \\texttt{set} with three members discussing the standard model of particle physics. "
-                                + "The \\texttt{crossref} field in the \\texttt{@set} entry and the \\texttt{entryset} field in "
-                                + "each set member entry is needed only when using BibTeX as the backend"),
+                                .of("A \\texttt{set} with three members discussing the standard model of particle physics. "
+                                        + "The \\texttt{crossref} field in the \\texttt{@set} entry and the \\texttt{entryset} field in "
+                                        + "each set member entry is needed only when using BibTeX as the backend"),
                         entry.getField("annotation"));
                 assertEquals(Optional.of("stdmodel"), entry.getField("bibtexkey"));
                 assertEquals(Optional.of("glashow,weinberg,salam"), entry.getField("entryset"));
             } else if (entry.getCiteKeyOptional().get().equals("set")) {
                 assertEquals(Optional
-                        .of("A \\texttt{set} with three members. The \\texttt{crossref} field in the \\texttt{@set} "
-                                + "entry and the \\texttt{entryset} field in each set member entry is needed only when using "
-                                + "BibTeX as the backend"),
+                                .of("A \\texttt{set} with three members. The \\texttt{crossref} field in the \\texttt{@set} "
+                                        + "entry and the \\texttt{entryset} field in each set member entry is needed only when using "
+                                        + "BibTeX as the backend"),
                         entry.getField("annotation"));
                 assertEquals(Optional.of("set"), entry.getField("bibtexkey"));
                 assertEquals(Optional.of("herrmann,aksin,yoon"), entry.getField("entryset"));
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index 0da7422a378..866a5a39e57 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -326,7 +326,7 @@ void parseRecognizesEntryWithAtInField() throws IOException {
         List<BibEntry> parsed = result.getDatabase().getEntries();
 
         BibEntry expected = new BibEntry("article").withField(BibEntry.KEY_FIELD, "test")
-                .withField("author", "Ed von T@st");
+                                                   .withField("author", "Ed von T@st");
 
         assertEquals(Collections.singletonList(expected), parsed);
     }
@@ -938,7 +938,6 @@ void parseRecognizesStringAndEntry() throws IOException {
                         + "	Isbn = 2707318256," + "	Publisher = {Minuit}," + "	Title = {Questions de sociologie},"
                         + "	Year = 2002" + "}"));
 
-
         BibtexString parsedString = result.getDatabase().getStringValues().iterator().next();
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1339,7 +1338,7 @@ void integrationTestSaveOrderConfig() throws IOException {
         Optional<SaveOrderConfig> saveOrderConfig = result.getMetaData().getSaveOrderConfig();
 
         assertEquals(new SaveOrderConfig(false, new SaveOrderConfig.SortCriterion("author", false),
-                new SaveOrderConfig.SortCriterion("year", true), new SaveOrderConfig.SortCriterion("abstract", false)),
+                        new SaveOrderConfig.SortCriterion("year", true), new SaveOrderConfig.SortCriterion("abstract", false)),
                 saveOrderConfig.get());
     }
 
@@ -1442,7 +1441,6 @@ void parseOtherTypeTest() throws Exception {
         assertEquals(Collections.singletonList(expectedEntry), entries);
     }
 
-
     @Test
     void parseRecognizesDatabaseID() throws Exception {
         String expectedDatabaseID = "q1w2e3r4t5z6";
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
index 3baafe04f27..262291911d8 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
@@ -26,7 +26,6 @@ public void setUp() throws Exception {
     @Test
     public void testsGetExtensions() {
         assertEquals(StandardFileType.TXT, importer.getFileType());
-
     }
 
     @Test
@@ -34,7 +33,6 @@ public void testGetDescription() {
         assertEquals("Importer for COPAC format.", importer.getDescription());
     }
 
-
     @Test
     public void testImportEmptyEntries() throws Exception {
         Path path = Paths.get(CopacImporterTest.class.getResource("Empty.txt").toURI());
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java
index dd67ddcb7b7..7b66dc89513 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTestFiles.java
@@ -39,5 +39,4 @@ public void testIsNotRecognizedFormat(String fileName) throws IOException {
     public void testImportEntries(String fileName) throws Exception {
         ImporterTestEngine.testImportEntries(new CopacImporter(), fileName, FILE_ENDING);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
index 835708db5d5..bec95cbb8a4 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
@@ -126,7 +126,7 @@ public void testImportEntries0() throws IOException, URISyntaxException {
     public void testImportEntries1() throws IOException {
         String medlineString = "%O Artn\\\\s testO\n%A testA,\n%E testE0, testE1";
         List<BibEntry> bibEntries = importer.importDatabase(new BufferedReader(new StringReader(medlineString))).getDatabase()
-                .getEntries();
+                                            .getEntries();
 
         BibEntry entry = bibEntries.get(0);
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java b/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java
index c2eaa089a38..00e6b6aef81 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java
@@ -69,7 +69,7 @@ private static Path getPath(String fileName) throws IOException {
 
     public static void testImportMalformedFiles(Importer importer, String fileName) throws IOException {
         List<BibEntry> entries = importer.importDatabase(getPath(fileName), StandardCharsets.UTF_8).getDatabase()
-                .getEntries();
+                                         .getEntries();
         assertEquals(entries, new ArrayList<BibEntry>());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java
index 99528b89042..a2ebd1bf1b7 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java
@@ -22,14 +22,8 @@
 
 public class InspecImporterTest {
 
-    private InspecImporter importer;
-
     private static final String FILE_ENDING = ".txt";
-
-    @BeforeEach
-    public void setUp() throws Exception {
-        this.importer = new InspecImporter();
-    }
+    private InspecImporter importer;
 
     private static Stream<String> fileNames() throws IOException {
         Predicate<String> fileName = name -> name.startsWith("InspecImportTest")
@@ -43,6 +37,11 @@ private static Stream<String> nonInspecfileNames() throws IOException {
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
+    @BeforeEach
+    public void setUp() throws Exception {
+        this.importer = new InspecImporter();
+    }
+
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testIsRecognizedFormatAccept(String fileName) throws IOException {
@@ -126,5 +125,4 @@ public void testsGetExtensions() {
     public void testGetDescription() {
         assertEquals("INSPEC format importer.", importer.getDescription());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
index f511f7c7803..ddcd6398676 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
@@ -25,9 +25,8 @@
  */
 public class IsiImporterTest {
 
-    private final IsiImporter importer = new IsiImporter();
-
     private static final String FILE_ENDING = ".isi";
+    private final IsiImporter importer = new IsiImporter();
 
     private static Stream<String> fileNames() throws IOException {
         Predicate<String> fileName = name -> name.startsWith("IsiImporterTest")
@@ -228,7 +227,6 @@ public void testIsiAuthorsConvert() {
                 "Joffe, Hadine and Hall, Janet E. and Gruber, Staci and Sarmiento, Ingrid A. and Cohen, Lee S. and Yurgelun-Todd, Deborah and Martin, Kathryn A.",
                 IsiImporter.isiAuthorsConvert(
                         "Joffe, Hadine; Hall, Janet E; Gruber, Staci; Sarmiento, Ingrid A; Cohen, Lee S; Yurgelun-Todd, Deborah; Martin, Kathryn A"));
-
     }
 
     @Test
@@ -266,7 +264,7 @@ public void testImportIEEEExport() throws IOException, URISyntaxException {
         assertEquals("article", entry.getType());
         assertEquals(Optional.of("Geoscience and Remote Sensing Letters, IEEE"), entry.getField("journal"));
         assertEquals(Optional.of("Improving Urban Road Extraction in High-Resolution "
-                + "Images Exploiting Directional Filtering, Perceptual " + "Grouping, and Simple Topological Concepts"),
+                        + "Images Exploiting Directional Filtering, Perceptual " + "Grouping, and Simple Topological Concepts"),
                 entry.getField("title"));
         assertEquals(Optional.of("4"), entry.getField("volume"));
         assertEquals(Optional.of("3"), entry.getField("number"));
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java
index 2444508639c..b20effa34aa 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java
@@ -8,13 +8,10 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
- * Articles in the medline format can be downloaded from http://www.ncbi.nlm.nih.gov/pubmed/.
- * 1. Search for a term and make sure you have selected the PubMed database
- * 2. Select the results you want to export by checking their checkboxes
- * 3. Press on the 'Send to' drop down menu on top of the search results
- * 4. Select 'File' as Destination and 'XML' as Format
- * 5. Press 'Create File' to download your search results in a medline xml file
- *
+ * Articles in the medline format can be downloaded from http://www.ncbi.nlm.nih.gov/pubmed/. 1. Search for a term and
+ * make sure you have selected the PubMed database 2. Select the results you want to export by checking their checkboxes
+ * 3. Press on the 'Send to' drop down menu on top of the search results 4. Select 'File' as Destination and 'XML' as
+ * Format 5. Press 'Create File' to download your search results in a medline xml file
  */
 public class MedlineImporterTest {
 
@@ -44,5 +41,4 @@ public void testsGetExtensions() {
     public void testGetDescription() {
         assertEquals("Importer for the Medline format.", importer.getDescription());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java b/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java
index 91c49fd3d9b..fae9374c580 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTestFiles.java
@@ -53,6 +53,4 @@ private static Stream<String> malformedFileNames() throws IOException {
     public void testImportMalfomedFiles(String fileName) throws IOException {
         ImporterTestEngine.testImportMalformedFiles(new MedlineImporter(), fileName);
     }
-
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
index 2d66b44a0c5..a3c64cf378e 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
@@ -27,13 +27,15 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static junit.framework.TestCase.assertTrue;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class MedlinePlainImporterTest {
 
-    private MedlinePlainImporter importer;
-
     private static final String FILE_ENDING = ".txt";
+    private MedlinePlainImporter importer;
 
     private static Stream<String> fileNames() throws IOException {
         Predicate<String> fileName = name -> name.startsWith("MedlinePlainImporterTest")
@@ -77,7 +79,7 @@ void testImportMultipleEntriesInSingleFile() throws IOException, URISyntaxExcept
                 .get(MedlinePlainImporter.class.getResource("MedlinePlainImporterTestMultipleEntries.txt").toURI());
 
         List<BibEntry> entries = importer.importDatabase(inputFile, StandardCharsets.UTF_8).getDatabase()
-                .getEntries();
+                                         .getEntries();
         BibEntry testEntry = entries.get(0);
 
         assertEquals(7, entries.size());
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
index be10df36e14..56cfec29750 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
@@ -69,5 +69,4 @@ public final void testGetCommandLineId() {
         MsBibImporter testImporter = new MsBibImporter();
         assertEquals("msbib", testImporter.getId());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java
index cae3447b6c8..e9928fa1190 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTestFiles.java
@@ -39,5 +39,4 @@ public void testIsNotRecognizedFormat(String fileName) throws IOException {
     public void testImportEntries(String fileName) throws Exception {
         ImporterTestEngine.testImportEntries(new MsBibImporter(), fileName, FILE_ENDING);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
index e9812c4738a..d734cb20727 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
@@ -26,9 +26,8 @@
 
 public class OvidImporterTest {
 
-    private OvidImporter importer;
-
     private static final String FILE_ENDING = ".txt";
+    private OvidImporter importer;
 
     private static Stream<String> fileNames() throws IOException {
         Predicate<String> fileName = name -> name.startsWith("OvidImporterTest")
@@ -153,7 +152,7 @@ public void testImportSingleEntries() throws IOException, URISyntaxException {
             Path file = Paths.get(OvidImporter.class.getResource("OvidImporterTest" + n + ".txt").toURI());
             try (InputStream nis = OvidImporter.class.getResourceAsStream("OvidImporterTestBib" + n + ".bib")) {
                 List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase()
-                        .getEntries();
+                                                 .getEntries();
                 assertNotNull(entries);
                 assertEquals(1, entries.size());
                 BibEntryAssert.assertEquals(nis, entries.get(0));
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
index 396ba734d2f..db7396d047c 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
@@ -44,5 +44,4 @@ public void doesNotHandleEncryptedPdfs() throws URISyntaxException {
         List<BibEntry> result = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), result);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java
index 74b84bc6a3d..7dc4cef6f26 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTestFiles.java
@@ -32,5 +32,4 @@ public void testIsRecognizedFormat(String fileName) throws IOException {
     public void testImportEntries(String fileName) throws Exception {
         ImporterTestEngine.testImportEntries(new PdfContentImporter(mock(ImportFormatPreferences.class)), fileName, FILE_ENDING);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
index f9aedbb7094..7e46c83d27f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
@@ -48,5 +48,4 @@ public void testIfNotRecognizedFormat() throws IOException, URISyntaxException {
         Path file = Paths.get(RISImporterTest.class.getResource("RisImporterCorrupted.ris").toURI());
         assertFalse(importer.isRecognizedFormat(file, StandardCharsets.UTF_8));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
index 3ecffde377f..5fdee2d9235 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
@@ -14,7 +14,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 class SilverPlatterImporterTest {
 
     private static final String FILE_ENDING = ".txt";
@@ -63,5 +62,4 @@ void testsGetExtensions() {
     void testGetDescription() {
         assertEquals("Imports a SilverPlatter exported file.", testImporter.getDescription());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java b/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
index f618009b947..765f93ddcfe 100644
--- a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
@@ -87,7 +87,6 @@ public void testImportSubGroups() throws Exception {
 
         GroupTreeNode parsedNode = GroupsParser.importGroups(orderedData, ',', fileMonitor);
         assertEquals(rootNode.getChildren(), parsedNode.getChildren());
-
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java b/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java
index dbe3c745b92..b14d6e5c49f 100644
--- a/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java
+++ b/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java
@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-
 public class BracesCorrectorTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index 879abb26d7e..10b75ae8a37 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -135,13 +135,13 @@ public void testJournaltitleChecks() {
     @Test
     public void testBibtexkeyChecks() {
         final BibDatabaseContext correctContext = createContext("bibtexkey", "Knuth2014");
-        correctContext.getDatabase().getEntries().get(0).setField("author","Knuth");
-        correctContext.getDatabase().getEntries().get(0).setField("year","2014");
+        correctContext.getDatabase().getEntries().get(0).setField("author", "Knuth");
+        correctContext.getDatabase().getEntries().get(0).setField("year", "2014");
         assertCorrect(correctContext);
 
         final BibDatabaseContext wrongContext = createContext("bibtexkey", "Knuth2014a");
-        wrongContext.getDatabase().getEntries().get(0).setField("author","Knuth");
-        wrongContext.getDatabase().getEntries().get(0).setField("year","2014");
+        wrongContext.getDatabase().getEntries().get(0).setField("author", "Knuth");
+        wrongContext.getDatabase().getEntries().get(0).setField("year", "2014");
         assertWrong(wrongContext);
     }
 
@@ -410,5 +410,4 @@ private BibDatabaseContext withMode(BibDatabaseContext context, BibDatabaseMode
         context.setMode(mode);
         return context;
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
index 7539dc826a6..1ce9aae56a7 100644
--- a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
@@ -9,7 +9,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 public class NoBibTexFieldCheckerTest {
 
     private final NoBibtexFieldChecker checker = new NoBibtexFieldChecker();
@@ -96,5 +95,4 @@ public void reviewIsNotRecognizedAsBiblatexOnlyField() {
         entry.setField("review", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
index 15c761dd2b5..4381458a39c 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
@@ -10,6 +10,6 @@ public class AbbreviationParserTest {
     public void testReadJournalListFromResource() {
         AbbreviationParser ap = new AbbreviationParser();
         ap.readJournalListFromResource("/journals/journalList.txt");
-         assertFalse(ap.getAbbreviations().isEmpty());
+        assertFalse(ap.getAbbreviations().isEmpty());
     }
 }
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
index cf1a769df72..bfd45940a51 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
@@ -47,5 +47,4 @@ public void testIsoAndMedlineAbbreviationsAreSame() {
         Abbreviation abbreviation = new Abbreviation(" Long Name ", " L N ");
         assertEquals(abbreviation.getIsoAbbreviation(), abbreviation.getMedlineAbbreviation());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java
index ec4ed515926..47b6240c8a5 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java
@@ -24,7 +24,7 @@ public void getNextAbbreviationAbbreviatesIEEEJournalTitle() {
 
         assertEquals("#IEEE_J_PROC#",
                 abbreviations.getRepository(prefs)
-                        .getNextAbbreviation("Proceedings of the IEEE").get());
+                             .getNextAbbreviation("Proceedings of the IEEE").get());
     }
 
     @Test
@@ -33,27 +33,27 @@ public void getNextAbbreviationExpandsIEEEAbbreviation() {
 
         assertEquals("Proceedings of the IEEE",
                 abbreviations.getRepository(prefs)
-                        .getNextAbbreviation("#IEEE_J_PROC#").get());
+                             .getNextAbbreviation("#IEEE_J_PROC#").get());
     }
 
     @Test
     public void getNextAbbreviationAbbreviatesJournalTitle() {
         assertEquals("Proc. IEEE",
                 abbreviations.getRepository(prefs)
-                        .getNextAbbreviation("Proceedings of the IEEE").get());
+                             .getNextAbbreviation("Proceedings of the IEEE").get());
     }
 
     @Test
     public void getNextAbbreviationRemovesPoint() {
         assertEquals("Proc IEEE",
                 abbreviations.getRepository(prefs)
-                        .getNextAbbreviation("Proc. IEEE").get());
+                             .getNextAbbreviation("Proc. IEEE").get());
     }
 
     @Test
     public void getNextAbbreviationExpandsAbbreviation() {
         assertEquals("Proceedings of the IEEE",
                 abbreviations.getRepository(prefs)
-                        .getNextAbbreviation("Proc IEEE").get());
+                             .getNextAbbreviation("Proc IEEE").get());
     }
 }
diff --git a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java b/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
index f8c99cff5d4..5582e0f7aa9 100644
--- a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
@@ -36,7 +36,6 @@ public void oneElement() {
         assertTrue(repository.isKnownName("L. N."));
         assertTrue(repository.isKnownName("L N"));
         assertFalse(repository.isKnownName("?"));
-
     }
 
     @Test
@@ -65,7 +64,5 @@ public void testDuplicateKeys() {
         repository.addEntry(new Abbreviation("Long Name", "LA. N."));
         assertEquals(1, repository.size());
         assertEquals("LA. N.", repository.getIsoAbbreviation("Long Name").orElse("WRONG"));
-
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java b/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java
index dbff021a2df..bda85d58207 100644
--- a/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java
+++ b/src/test/java/org/jabref/logic/journals/ShippedJournalAbbreviationDuplicateTest.java
@@ -29,5 +29,4 @@ public void noDuplicatesInShippedIEEEStandardJournalAbbreviations() {
             assertFalse(repoBuiltIn.getAbbreviation(abbreviation.getMedlineAbbreviation()).isPresent(), "duplicate medline " + abbreviation.toString());
         });
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
index 63848639692..6f8aa2c15de 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
@@ -93,27 +93,27 @@ void languageKeysShouldNotBeQuotedInFiles() throws IOException {
 
         assertEquals(Collections.EMPTY_LIST, quotedEntries,
                 "Language keys must not be used quoted in code! Use \"This is a message\" instead of \"This_is_a_message\".\n" +
-                "Please correct the following entries:\n" +
-                quotedEntries
-                        .stream()
-                        .map(key -> String.format("\n%s (%s)\n", key.getKey(), key.getPath()))
-                        .collect(Collectors.toList()));
+                        "Please correct the following entries:\n" +
+                        quotedEntries
+                                .stream()
+                                .map(key -> String.format("\n%s (%s)\n", key.getKey(), key.getPath()))
+                                .collect(Collectors.toList()));
     }
 
     @Test
     void findMissingLocalizationKeys() throws IOException {
         List<LocalizationEntry> missingKeys = LocalizationParser.find(LocalizationBundleForTest.LANG)
-                .stream()
-                .sorted()
-                .distinct()
-                .collect(Collectors.toList());
+                                                                .stream()
+                                                                .sorted()
+                                                                .distinct()
+                                                                .collect(Collectors.toList());
 
         assertEquals(Collections.emptyList(), missingKeys,
                 "DETECTED LANGUAGE KEYS WHICH ARE NOT IN THE ENGLISH LANGUAGE FILE\n" +
-                "PASTE THESE INTO THE ENGLISH LANGUAGE FILE\n" +
-                missingKeys.parallelStream()
-                        .map(key -> String.format("\n%s=%s\n", key.getKey(), key.getKey().replaceAll("\\\\ ", " ")))
-                        .collect(Collectors.joining("\n")));
+                        "PASTE THESE INTO THE ENGLISH LANGUAGE FILE\n" +
+                        missingKeys.parallelStream()
+                                   .map(key -> String.format("\n%s=%s\n", key.getKey(), key.getKey().replaceAll("\\\\ ", " ")))
+                                   .collect(Collectors.joining("\n")));
     }
 
     @Test
@@ -122,10 +122,10 @@ void findObsoleteLocalizationKeys() throws IOException {
 
         assertEquals(Collections.emptySet(), obsoleteKeys,
                 "Obsolete keys found in language properties file: \n" +
-                obsoleteKeys.stream().collect(Collectors.joining("\n")) +
-                "\n" +
-                "1. CHECK IF THE KEY IS REALLY NOT USED ANYMORE\n" +
-                "2. REMOVE THESE FROM THE ENGLISH LANGUAGE FILE\n");
+                        obsoleteKeys.stream().collect(Collectors.joining("\n")) +
+                        "\n" +
+                        "1. CHECK IF THE KEY IS REALLY NOT USED ANYMORE\n" +
+                        "2. REMOVE THESE FROM THE ENGLISH LANGUAGE FILE\n");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java b/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java
index 9c814d64849..ed4fd477853 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationEntry.java
@@ -3,7 +3,7 @@
 import java.nio.file.Path;
 import java.util.Objects;
 
-class LocalizationEntry implements Comparable<LocalizationEntry>{
+class LocalizationEntry implements Comparable<LocalizationEntry> {
 
     private final Path path;
     private final String key;
@@ -42,7 +42,6 @@ public boolean equals(Object o) {
             return false;
         }
         return bundle == that.bundle;
-
     }
 
     @Override
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
index 0edc4975f8b..657d0e76649 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
@@ -20,5 +20,4 @@ public void testReplacePlaceholders() {
     public void testTooManyParams() {
         assertThrows(IllegalStateException.class, () -> new LocalizationKeyParams("", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
index 42a492d44fa..407800bfb6f 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
@@ -19,5 +19,4 @@ void underscoreIsPreserved() {
         LocalizationKey localizationKey = new LocalizationKey("test_with_underscore");
         assertEquals("test_with_underscore", localizationKey.getPropertiesKey());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
index 8ffdd5a7a96..ee9d254305b 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
@@ -32,10 +32,10 @@ public static SortedSet<LocalizationEntry> find(LocalizationBundleForTest type)
         Set<LocalizationEntry> entries = findLocalizationEntriesInFiles(type);
 
         Set<String> keysInJavaFiles = entries.stream()
-                .map(LocalizationEntry::getKey)
-                .distinct()
-                .sorted()
-                .collect(Collectors.toSet());
+                                             .map(LocalizationEntry::getKey)
+                                             .distinct()
+                                             .sorted()
+                                             .collect(Collectors.toSet());
 
         Set<String> englishKeys;
         if (type == LocalizationBundleForTest.LANG) {
@@ -117,11 +117,11 @@ public static SortedSet<String> getKeysInPropertiesFile(String path) {
         Properties properties = getProperties(path);
 
         return properties.keySet().stream()
-                .sorted()
-                .map(Object::toString)
-                .map(String::trim)
-                .map(e -> new LocalizationKey(e).getPropertiesKey())
-                .collect(Collectors.toCollection(TreeSet::new));
+                         .sorted()
+                         .map(Object::toString)
+                         .map(String::trim)
+                         .map(e -> new LocalizationKey(e).getPropertiesKey())
+                         .collect(Collectors.toCollection(TreeSet::new));
     }
 
     public static Properties getProperties(String path) {
@@ -222,8 +222,8 @@ public boolean containsKey(String key) {
         }
 
         return result.stream()
-                .map(key -> new LocalizationEntry(path, new LocalizationKey(key).getPropertiesKey(), type))
-                .collect(Collectors.toList());
+                     .map(key -> new LocalizationEntry(path, new LocalizationKey(key).getPropertiesKey(), type))
+                     .collect(Collectors.toList());
     }
 
     static class JavaLocalizationEntryParser {
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java
index 2463a15cdc6..b6b0f5a69de 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationParserTest.java
@@ -50,5 +50,4 @@ private void assertLocalizationParameterParsing(String code, List<String> expect
     private void assertLocalizationParameterParsing(String code, String expectedParameter) {
         assertLocalizationParameterParsing(code, Collections.singletonList(expectedParameter));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
index 021c5c53bd1..37d22dacead 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
@@ -65,5 +65,4 @@ void testUnknownTranslation() {
     void testUnsetLanguageTranslation() {
         assertEquals("Groups", Localization.lang("Groups"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
index b3f669d4ca7..340fd35f7ad 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
@@ -12,27 +12,24 @@
 import static org.mockito.Mockito.mock;
 
 /**
- * The test class LayoutEntryTest test the net.sf.jabref.export.layout.LayoutEntry.
- * Indirectly the net.sf.jabref.export.layout.Layout is tested too.
+ * The test class LayoutEntryTest test the net.sf.jabref.export.layout.LayoutEntry. Indirectly the
+ * net.sf.jabref.export.layout.Layout is tested too.
  * <p/>
- * The LayoutEntry creates a human readable String assigned with HTML formatters.
- * To test the Highlighting Feature, an instance of LayoutEntry will be instantiated via Layout and LayoutHelper.
- * With these instance the doLayout() Method is called several times for each test case.
- * To simulate a search, a BibEntry will be created, which will be used by LayoutEntry.
+ * The LayoutEntry creates a human readable String assigned with HTML formatters. To test the Highlighting Feature, an
+ * instance of LayoutEntry will be instantiated via Layout and LayoutHelper. With these instance the doLayout() Method
+ * is called several times for each test case. To simulate a search, a BibEntry will be created, which will be used by
+ * LayoutEntry.
  *
- * There are five test cases:
- * - The shown result text has no words which should be highlighted.
- * - There is one word which will be highlighted ignoring case sensitivity.
- * - There are two words which will be highlighted ignoring case sensitivity.
- * - There is one word which will be highlighted case sensitivity.
- * - There are more words which will be highlighted case sensitivity.
+ * There are five test cases: - The shown result text has no words which should be highlighted. - There is one word
+ * which will be highlighted ignoring case sensitivity. - There are two words which will be highlighted ignoring case
+ * sensitivity. - There is one word which will be highlighted case sensitivity. - There are more words which will be
+ * highlighted case sensitivity.
  */
 
 public class LayoutEntryTest {
 
     private BibEntry mBTE;
 
-
     @BeforeEach
     public void setUp() {
         mBTE = new BibEntry();
@@ -95,5 +92,4 @@ public void testParseMethodCalls() {
         assertEquals("test", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(0)).get(1));
         assertEquals("fark", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(1)).get(1));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/LayoutTest.java b/src/test/java/org/jabref/logic/layout/LayoutTest.java
index 899c62d1446..34c8ae2418f 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutTest.java
@@ -98,7 +98,7 @@ void HTMLCharsWithDotlessIAndTiled() throws IOException {
     }
 
     @Test
-    // Test for http://discourse.jabref.org/t/the-wrapfilelinks-formatter/172 (the example in the help files)
+        // Test for http://discourse.jabref.org/t/the-wrapfilelinks-formatter/172 (the example in the help files)
     void wrapFileLinksExpandFile() throws IOException {
         when(layoutFormatterPreferences.getFileLinkPreferences()).thenReturn(
                 new FileLinkPreferences(Collections.emptyList(), Collections.singletonList("src/test/resources/pdfs/")));
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java
index 9ae1cbc797c..9ed893e166d 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Is the save as the AuthorLastFirstAbbreviator.
  */
@@ -21,7 +22,5 @@ public void testFormat() {
         assertEquals(b.format("Smith, John"), a.format("Smith, John"));
         assertEquals(b.format("von Neumann, John and Smith, John and Black Brown, Peter"), a
                 .format("von Neumann, John and Smith, John and Black Brown, Peter"));
-
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
index 94b37737595..317400fbad3 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
@@ -14,11 +14,11 @@ class AuthorAndToSemicolonReplacerTest {
 
     private static Stream<Arguments> data() {
         return Stream.of(
-                Arguments.of("",""),
+                Arguments.of("", ""),
                 Arguments.of("Someone, Van Something", "Someone, Van Something"),
                 Arguments.of("John Smith and Black Brown, Peter", "John Smith; Black Brown, Peter"),
                 Arguments.of("von Neumann, John and Smith, John and Black Brown, Peter", "von Neumann, John; Smith, John; Black Brown, Peter"),
-                Arguments.of("John von Neumann and John Smith and Peter Black Brown","John von Neumann; John Smith; Peter Black Brown"));
+                Arguments.of("John von Neumann and John Smith and Peter Black Brown", "John von Neumann; John Smith; Peter Black Brown"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java
index 19a643988d0..f19b4681d6e 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java
@@ -2,14 +2,14 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorAndsCommaReplacerTest {
 
     /**
-     * Test method for
-     * {@link org.jabref.logic.layout.format.AuthorAndsCommaReplacer#format(java.lang.String)}.
+     * Test method for {@link org.jabref.logic.layout.format.AuthorAndsCommaReplacer#format(java.lang.String)}.
      */
     @Test
     public void testFormat() {
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java
index 44a85ca7ce6..9c2bcb40c2c 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java
@@ -2,14 +2,14 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorAndsReplacerTest {
 
     /**
-     * Test method for
-     * {@link org.jabref.logic.layout.format.AuthorAndsReplacer#format(java.lang.String)}.
+     * Test method for {@link org.jabref.logic.layout.format.AuthorAndsReplacer#format(java.lang.String)}.
      */
     @Test
     public void testFormat() {
@@ -32,5 +32,4 @@ public void testFormat() {
         assertEquals("John von Neumann; John Smith & Peter Black Brown", a
                 .format("John von Neumann and John Smith and Peter Black Brown"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java
index 9a91ff56c9b..b4f6f544589 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorFirstAbbrLastCommasTest {
 
     @Test
@@ -28,5 +29,4 @@ public void testFormat() {
         assertEquals("J. von Neumann, J. Smith and P. Black Brown", a
                 .format("John von Neumann and John Smith and Black Brown, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java
index 9871a0a9da5..f35de4b55ac 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorFirstAbbrLastOxfordCommasTest {
 
     /**
@@ -31,5 +32,4 @@ public void testFormat() {
         assertEquals("J. von Neumann, J. Smith, and P. Black Brown", a
                 .format("John von Neumann and John Smith and Black Brown, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java
index 97a9c29b82c..1972b6b781e 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorFirstFirstCommasTest {
 
     /**
-     * Test method for
-     * {@link org.jabref.logic.layout.format.AuthorFirstFirstCommas#format(java.lang.String)}.
+     * Test method for {@link org.jabref.logic.layout.format.AuthorFirstFirstCommas#format(java.lang.String)}.
      */
     @Test
     public void testFormat() {
@@ -15,5 +15,4 @@ public void testFormat() {
                 new AuthorFirstFirstCommas()
                         .format("von Neumann,,John and John Smith and Black Brown, Jr, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java
index d61d5840520..d71647dd45e 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorFirstFirstTest {
 
     /**
-     * Test method for
-     * {@link org.jabref.logic.layout.format.AuthorFirstFirst#format(java.lang.String)}.
+     * Test method for {@link org.jabref.logic.layout.format.AuthorFirstFirst#format(java.lang.String)}.
      */
     @Test
     public void testFormat() {
@@ -15,5 +15,4 @@ public void testFormat() {
                 new AuthorFirstFirst()
                         .format("von Neumann,,John and John Smith and Black Brown, Jr, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java
index 8607bfffeb1..6ba9a15966d 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorFirstLastCommasTest {
 
     /**
@@ -31,5 +32,4 @@ public void testFormat() {
         assertEquals("John von Neumann, John Smith and Peter Black Brown", a
                 .format("John von Neumann and John Smith and Black Brown, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java
index 9f8a91fd569..14c31580339 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorFirstLastOxfordCommasTest {
 
     /**
@@ -31,5 +32,4 @@ public void testFormat() {
         assertEquals("John von Neumann, John Smith, and Peter Black Brown", a
                 .format("John von Neumann and John Smith and Black Brown, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java
index 795c7129f0c..937f7e0a71a 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorLF_FFAbbrTest {
 
     /**
-     * Test method for
-     * {@link org.jabref.logic.layout.format.AuthorLF_FFAbbr#format(java.lang.String)}.
+     * Test method for {@link org.jabref.logic.layout.format.AuthorLF_FFAbbr#format(java.lang.String)}.
      */
     @Test
     public void testFormat() {
@@ -15,5 +15,4 @@ public void testFormat() {
                 new AuthorLF_FFAbbr()
                         .format("von Neumann,,John and John Smith and Black Brown, Jr, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java
index 1531cbfd0aa..c3bd13219bc 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorLF_FFTest {
 
     /**
-     * Test method for
-     * {@link org.jabref.logic.layout.format.AuthorLF_FF#format(java.lang.String)}.
+     * Test method for {@link org.jabref.logic.layout.format.AuthorLF_FF#format(java.lang.String)}.
      */
     @Test
     public void testFormat() {
@@ -15,5 +15,4 @@ public void testFormat() {
                 new AuthorLF_FF()
                         .format("von Neumann,,John and John Smith and Black Brown, Jr, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java
index 63faf76cd37..e49653a18c2 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorLastFirstAbbrCommasTest {
 
     /**
@@ -30,7 +31,5 @@ public void testFormat() {
 
         assertEquals("von Neumann, J., Smith, J. and Black Brown, P.", a
                 .format("John von Neumann and John Smith and Black Brown, Peter"));
-
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java
index e3ada4bd62a..21a8e6a195d 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorLastFirstAbbrOxfordCommasTest {
 
     /**
@@ -31,5 +32,4 @@ public void testFormat() {
         assertEquals("von Neumann, J., Smith, J., and Black Brown, P.", a
                 .format("John von Neumann and John Smith and Black Brown, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java
index 91bf403bd74..f28a1055396 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTester.java
@@ -5,8 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
- * Test case  that verifies the functionalities of the
- * formater AuthorLastFirstAbbreviator.
+ * Test case  that verifies the functionalities of the formater AuthorLastFirstAbbreviator.
  */
 class AuthorLastFirstAbbreviatorTester {
 
@@ -60,5 +59,4 @@ void testFormat() {
     private String abbreviate(String name) {
         return new AuthorLastFirstAbbreviator().format(name);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java
index 9e141ca1925..8a544a5a7d0 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java
@@ -2,14 +2,14 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorLastFirstCommasTest {
 
     /**
-     * Test method for
-     * {@link org.jabref.logic.layout.format.AuthorLastFirstCommas#format(java.lang.String)}.
+     * Test method for {@link org.jabref.logic.layout.format.AuthorLastFirstCommas#format(java.lang.String)}.
      */
     @Test
     public void testFormat() {
@@ -33,5 +33,4 @@ public void testFormat() {
         assertEquals("von Neumann, John, Smith, John and Black Brown, Peter", a
                 .format("John von Neumann and John Smith and Black Brown, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java
index 930a0ae6a6d..e3beacbd4b4 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorLastFirstOxfordCommasTest {
 
     /**
@@ -31,5 +32,4 @@ public void testFormat() {
         assertEquals("von Neumann, John, Smith, John, and Black Brown, Peter", a
                 .format("John von Neumann and John Smith and Black Brown, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java
index 8d1822ec1b7..8d26609ee87 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorLastFirstTest {
 
     @Test
@@ -28,5 +29,4 @@ public void testFormat() {
         assertEquals("von Neumann, John and Smith, John and Black Brown, Peter", a
                 .format("John von Neumann and John Smith and Black Brown, Peter"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java
index b6308e0daa9..35b8d4b0cae 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorNatBibTest {
 
     /**
-     * Test method for
-     * {@link org.jabref.logic.layout.format.AuthorNatBib#format(java.lang.String)}.
+     * Test method for {@link org.jabref.logic.layout.format.AuthorNatBib#format(java.lang.String)}.
      */
     @Test
     public void testFormatThreeAuthors() {
@@ -16,12 +16,10 @@ public void testFormatThreeAuthors() {
     }
 
     /**
-     * Test method for
-     * {@link org.jabref.logic.layout.format.AuthorLF_FF#format(java.lang.String)}.
+     * Test method for {@link org.jabref.logic.layout.format.AuthorLF_FF#format(java.lang.String)}.
      */
     @Test
     public void testFormatTwoAuthors() {
         assertEquals("von Neumann and Smith", new AuthorNatBib().format("von Neumann,,John and John Smith"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java
index 568cae4a8d3..522c4caae58 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorOrgSciTest {
 
     @Test
@@ -14,7 +15,6 @@ public void testOrgSci() {
         assertEquals("Flynn, J., S. Gartska", f.format("John Flynn and Sabine Gartska"));
         assertEquals("Garvin, D. A.", f.format("David A. Garvin"));
         assertEquals("Makridakis, S., S. C. Wheelwright, V. E. McGee", f.format("Sa Makridakis and Sa Ca Wheelwright and Va Ea McGee"));
-
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java
index 581d32c236f..fe0cb06ca4d 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.ParamLayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AuthorsTest {
 
     @Test
@@ -153,5 +154,4 @@ public void testEmptyEtAl() {
         assertEquals("Bruce, Bob Croydon",
                 a.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java b/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java
index b7869a703ff..da23a764241 100644
--- a/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class CompositeFormatTest {
 
     @Test
@@ -15,7 +16,7 @@ public void testEmptyComposite() {
 
     @Test
     public void testArrayComposite() {
-        LayoutFormatter f = new CompositeFormat(new LayoutFormatter[] {fieldText -> fieldText + fieldText,
+        LayoutFormatter f = new CompositeFormat(new LayoutFormatter[]{fieldText -> fieldText + fieldText,
                 fieldText -> "A" + fieldText, fieldText -> "B" + fieldText});
 
         assertEquals("BAff", f.format("f"));
@@ -33,5 +34,4 @@ public void testDoubleComposite() {
         assertEquals(second.format(first.format("Sa Makridakis and Sa Ca Wheelwright and Va Ea McGee")),
                 f.format("Sa Makridakis and Sa Ca Wheelwright and Va Ea McGee"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java b/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
index fae8c751630..e14af93ecbd 100644
--- a/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class DOICheckTest {
 
     @Test
@@ -34,5 +35,4 @@ public void testFormat() {
         // Obviously a wrong doi, will not change anything.
         assertEquals("1", lf.format("1"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java b/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java
index c4f40d3b835..8bb16e57265 100644
--- a/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class DOIStripTest {
 
     @Test
@@ -20,7 +21,5 @@ public void testFormat() {
 
         assertEquals("10.1000/ISBN1-900512-44-0",
                 lf.format("http://doi.acm.org/10.1000/ISBN1-900512-44-0"));
-
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java
index 7ada16578a6..b9f878d25ae 100644
--- a/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java
@@ -2,10 +2,11 @@
 
 import org.jabref.logic.layout.ParamLayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class DateFormatterTest {
 
     private ParamLayoutFormatter formatter;
@@ -25,5 +26,4 @@ public void testRequestedFormat() {
         formatter.setArgument("MM/yyyy");
         assertEquals("07/2016", formatter.format("2016-07-15"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/DefaultTest.java b/src/test/java/org/jabref/logic/layout/format/DefaultTest.java
index c4c386d2975..c746de8c858 100644
--- a/src/test/java/org/jabref/logic/layout/format/DefaultTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DefaultTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.ParamLayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class DefaultTest {
 
     @Test
@@ -45,5 +46,4 @@ public void testNoArgumentSetEmptyInput() {
         ParamLayoutFormatter a = new Default();
         assertEquals("", a.format(""));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java
index 89d6850f593..0dd5c4f7c11 100644
--- a/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java
@@ -9,7 +9,6 @@ public class EntryTypeFormatterTest {
 
     private EntryTypeFormatter formatter;
 
-
     @BeforeEach
     public void setUp() {
         formatter = new EntryTypeFormatter();
@@ -29,5 +28,4 @@ public void testCorrectFormatInBook() {
     public void testIncorrectTypeAarticle() {
         assertEquals("Aarticle", formatter.format("aarticle"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java b/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java
index 23c5c205232..f15ae958dc2 100644
--- a/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java
@@ -8,10 +8,10 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
-
 public class FileLinkTest {
 
     private FileLinkPreferences prefs;
+
     @BeforeEach
     public void setUp() throws Exception {
         prefs = mock(FileLinkPreferences.class);
@@ -60,5 +60,4 @@ public void testMultipleFilesPickNonExistant() {
         a.setArgument("doc");
         assertEquals("", a.format("paper:test.pdf:PDF;presentation:pres.ppt:PPT"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java b/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java
index 5c20c5d7898..f0aa9836743 100644
--- a/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class FirstPageTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java b/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
index 42d6a488683..1bd1c441935 100644
--- a/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
@@ -64,7 +64,6 @@ public void testLaTeXHighlighting() {
         assertEquals("<u>hallo</u>", layout.format("\\underline{hallo}"));
         assertEquals("<s>hallo</s>", layout.format("\\sout{hallo}"));
         assertEquals("<tt>hallo</tt>", layout.format("\\texttt{hallo}"));
-
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java b/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java
index 6cd36359c4e..6b2094c3ce4 100644
--- a/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class HTMLParagraphsTest {
 
     @Test
@@ -17,7 +18,5 @@ public void testFormat() {
         assertEquals("<p>\nHello\nWorld\n</p>", f.format("Hello\nWorld"));
         assertEquals("<p>\nHello World\n</p>\n<p>\nWhat a lovely day\n</p>", f.format("Hello World\n   \nWhat a lovely day\n"));
         assertEquals("<p>\nHello World\n</p>\n<p>\nCould not be any better\n</p>\n<p>\nWhat a lovely day\n</p>", f.format("Hello World\n \n\nCould not be any better\n\nWhat a lovely day\n"));
-
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java b/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java
index 5ebd278be81..bb5dbbaceff 100644
--- a/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.ParamLayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class IfPluralTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/LastPageTest.java b/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
index 64dece591f0..6647038a126 100644
--- a/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class LastPageTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java
index cf4dbb86723..0c6203356dc 100644
--- a/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java
@@ -31,7 +31,6 @@ public void testFormatTextit() {
         assertEquals("\uD835\uDC61\uD835\uDC52\uD835\uDC65\uD835\uDC61", formatter.format("\\textit{text}"));
     }
 
-
     @Test
     public void testEscapedDollarSign() {
         assertEquals("$", formatter.format("\\$"));
@@ -75,7 +74,6 @@ public void testIWithDiaresisAndEscapedI() {
         assertEquals("ı̈", formatter.format("\\\"{\\i}"));
     }
 
-
     @Test
     public void testIWithDiaresisAndUnnecessaryBraces() {
         assertEquals("ï", formatter.format("{\\\"{i}}"));
@@ -91,7 +89,6 @@ public void testPolishName() {
         assertEquals("Łęski", formatter.format("\\L\\k{e}ski"));
     }
 
-
     @Test
     public void testDoubleCombiningAccents() {
         assertEquals("ώ", formatter.format("$\\acute{\\omega}$"));
@@ -190,5 +187,4 @@ public void testConversionOfOrdinal4th() {
     public void testConversionOfOrdinal9th() {
         assertEquals("9ᵗʰ", formatter.format("9\\textsuperscript{th}"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java
index 0b5adc77462..41ff6b2ff5d 100644
--- a/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java
@@ -1,8 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class NameFormatterTest {
 
     @Test
@@ -27,7 +28,6 @@ public void testFormatStringStringBibtexEntry() {
         assertEquals("Doe Joe and Jane, M. and Kamp, J.~A.",
                 l.format("Joe Doe and Mary Jane and John Arthur van Kamp",
                         "1@*@{ll}, {ff}@@*@1@{ll} {ff}@2..-1@ and {ll}, {f}."));
-
     }
 
     @Test
@@ -58,5 +58,4 @@ public void testFormat() {
         assertEquals("von Neumann John, Smith, John, Vandekamp, Mary~Ann and Black~Brown, Peter", a.format(
                 "von Neumann, John and Smith, John and Vandekamp, Mary Ann and Black Brown, Peter", formatString));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java b/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java
index e49493fe097..bd787b1ce39 100644
--- a/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class NoSpaceBetweenAbbreviationsTest {
 
     @Test
@@ -16,5 +17,4 @@ public void testFormat() {
         assertEquals("J.R.R. Tolkien", f.format("J. R. R. Tolkien"));
         assertEquals("J.R.R. Tolkien and J.F. Kennedy", f.format("J. R. R. Tolkien and J. F. Kennedy"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java b/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
index 3e1f6e972b1..68c50e17384 100644
--- a/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
@@ -2,12 +2,12 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 class RTFCharsTest {
     private LayoutFormatter formatter;
 
@@ -88,7 +88,7 @@ void testComplicated5() {
     @Test
     void testComplicated6() {
         assertEquals("Pchn\\u261a\\u263c w t\\u281e \\u322l\\u243od\\u378z je\\u380za lub o\\u347sm skrzy\\u324n fig"
-                ,formatter.format("Pchnąć w tę łódź jeża lub ośm skrzyń fig"));
+                , formatter.format("Pchnąć w tę łódź jeża lub ośm skrzyń fig"));
     }
 
     @Test
@@ -131,59 +131,58 @@ void testSpecialCharacters() {
     }
 
     @Test
-    void testRTFCharacters(){
-        assertEquals("\\'e0",formatter.format("\\`{a}"));
-        assertEquals("\\'e8",formatter.format("\\`{e}"));
-        assertEquals("\\'ec",formatter.format("\\`{i}"));
-        assertEquals("\\'f2",formatter.format("\\`{o}"));
-        assertEquals("\\'f9",formatter.format("\\`{u}"));
-
-        assertEquals("\\'e1",formatter.format("\\'a"));
-        assertEquals("\\'e9",formatter.format("\\'e"));
-        assertEquals("\\'ed",formatter.format("\\'i"));
-        assertEquals("\\'f3",formatter.format("\\'o"));
-        assertEquals("\\'fa",formatter.format("\\'u"));
-
-        assertEquals("\\'e2",formatter.format("\\^a"));
-        assertEquals("\\'ea",formatter.format("\\^e"));
-        assertEquals("\\'ee",formatter.format("\\^i"));
-        assertEquals("\\'f4",formatter.format("\\^o"));
-        assertEquals("\\'fa",formatter.format("\\^u"));
-
-        assertEquals("\\'e4",formatter.format("\\\"a"));
-        assertEquals("\\'eb",formatter.format("\\\"e"));
-        assertEquals("\\'ef",formatter.format("\\\"i"));
-        assertEquals("\\'f6",formatter.format("\\\"o"));
-        assertEquals("\\u252u",formatter.format("\\\"u"));
-
-        assertEquals("\\'f1",formatter.format("\\~n"));
+    void testRTFCharacters() {
+        assertEquals("\\'e0", formatter.format("\\`{a}"));
+        assertEquals("\\'e8", formatter.format("\\`{e}"));
+        assertEquals("\\'ec", formatter.format("\\`{i}"));
+        assertEquals("\\'f2", formatter.format("\\`{o}"));
+        assertEquals("\\'f9", formatter.format("\\`{u}"));
+
+        assertEquals("\\'e1", formatter.format("\\'a"));
+        assertEquals("\\'e9", formatter.format("\\'e"));
+        assertEquals("\\'ed", formatter.format("\\'i"));
+        assertEquals("\\'f3", formatter.format("\\'o"));
+        assertEquals("\\'fa", formatter.format("\\'u"));
+
+        assertEquals("\\'e2", formatter.format("\\^a"));
+        assertEquals("\\'ea", formatter.format("\\^e"));
+        assertEquals("\\'ee", formatter.format("\\^i"));
+        assertEquals("\\'f4", formatter.format("\\^o"));
+        assertEquals("\\'fa", formatter.format("\\^u"));
+
+        assertEquals("\\'e4", formatter.format("\\\"a"));
+        assertEquals("\\'eb", formatter.format("\\\"e"));
+        assertEquals("\\'ef", formatter.format("\\\"i"));
+        assertEquals("\\'f6", formatter.format("\\\"o"));
+        assertEquals("\\u252u", formatter.format("\\\"u"));
+
+        assertEquals("\\'f1", formatter.format("\\~n"));
     }
 
     @Test
     void testRTFCharactersCapital() {
-        assertEquals("\\'c0",formatter.format("\\`A"));
-        assertEquals("\\'c8",formatter.format("\\`E"));
-        assertEquals("\\'cc",formatter.format("\\`I"));
-        assertEquals("\\'d2",formatter.format("\\`O"));
-        assertEquals("\\'d9",formatter.format("\\`U"));
-
-        assertEquals("\\'c1",formatter.format("\\'A"));
-        assertEquals("\\'c9",formatter.format("\\'E"));
-        assertEquals("\\'cd",formatter.format("\\'I"));
-        assertEquals("\\'d3",formatter.format("\\'O"));
-        assertEquals("\\'da",formatter.format("\\'U"));
-
-        assertEquals("\\'c2",formatter.format("\\^A"));
-        assertEquals("\\'ca",formatter.format("\\^E"));
-        assertEquals("\\'ce",formatter.format("\\^I"));
-        assertEquals("\\'d4",formatter.format("\\^O"));
-        assertEquals("\\'db",formatter.format("\\^U"));
-
-        assertEquals("\\'c4",formatter.format("\\\"A"));
-        assertEquals("\\'cb",formatter.format("\\\"E"));
-        assertEquals("\\'cf",formatter.format("\\\"I"));
-        assertEquals("\\'d6",formatter.format("\\\"O"));
-        assertEquals("\\'dc",formatter.format("\\\"U"));
+        assertEquals("\\'c0", formatter.format("\\`A"));
+        assertEquals("\\'c8", formatter.format("\\`E"));
+        assertEquals("\\'cc", formatter.format("\\`I"));
+        assertEquals("\\'d2", formatter.format("\\`O"));
+        assertEquals("\\'d9", formatter.format("\\`U"));
+
+        assertEquals("\\'c1", formatter.format("\\'A"));
+        assertEquals("\\'c9", formatter.format("\\'E"));
+        assertEquals("\\'cd", formatter.format("\\'I"));
+        assertEquals("\\'d3", formatter.format("\\'O"));
+        assertEquals("\\'da", formatter.format("\\'U"));
+
+        assertEquals("\\'c2", formatter.format("\\^A"));
+        assertEquals("\\'ca", formatter.format("\\^E"));
+        assertEquals("\\'ce", formatter.format("\\^I"));
+        assertEquals("\\'d4", formatter.format("\\^O"));
+        assertEquals("\\'db", formatter.format("\\^U"));
+
+        assertEquals("\\'c4", formatter.format("\\\"A"));
+        assertEquals("\\'cb", formatter.format("\\\"E"));
+        assertEquals("\\'cf", formatter.format("\\\"I"));
+        assertEquals("\\'d6", formatter.format("\\\"O"));
+        assertEquals("\\'dc", formatter.format("\\\"U"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java b/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java
index 31406596bfe..1961b3dfac5 100644
--- a/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java
@@ -2,10 +2,11 @@
 
 import org.jabref.logic.layout.LayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class RemoveTildeTest {
     private LayoutFormatter formatter;
 
diff --git a/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java b/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
index e5653beb9f7..3d1eb4ebb9b 100644
--- a/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.ParamLayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class ReplaceTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java b/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java
index 3cf2333bab6..863683620fa 100644
--- a/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java
@@ -6,7 +6,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 public class RisKeywordsTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java b/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java
index b3880bec7cb..cd8bfbec58a 100644
--- a/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java
@@ -4,7 +4,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 public class RisMonthTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java b/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java
index 59ce12216b5..be565fcdc6f 100644
--- a/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java
@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-
 public class ToLowerCaseTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java b/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java
index b0ca246bdd9..adb559e5bf9 100644
--- a/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java
@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-
 public class ToUpperCaseTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java b/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java
index 58e9e54c94e..6184b8ccfff 100644
--- a/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java
@@ -2,9 +2,10 @@
 
 import org.jabref.logic.layout.ParamLayoutFormatter;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class WrapContentTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java b/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java
index 05dfc422f2b..09799d584b4 100644
--- a/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java
@@ -10,12 +10,10 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-
 public class WrapFileLinksTest {
 
     private WrapFileLinks formatter;
 
-
     @BeforeEach
     public void setUp() {
         FileLinkPreferences preferences = new FileLinkPreferences(Collections.emptyList(), Collections.emptyList());
@@ -34,7 +32,6 @@ public void testNull() {
 
     public void testNoFormatSetNonEmptyString() {
         assertThrows(NullPointerException.class, () -> formatter.format("test.pdf"));
-
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
index 328f90566ad..cbb37c47408 100644
--- a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
+++ b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
@@ -44,5 +44,4 @@ public void testGetLastName() {
         MsBibAuthor msBibAuthor = new MsBibAuthor(author);
         assertEquals("Bach", msBibAuthor.getLastName());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/net/URLDownloadTest.java b/src/test/java/org/jabref/logic/net/URLDownloadTest.java
index 4c4de67475b..89ea7b33183 100644
--- a/src/test/java/org/jabref/logic/net/URLDownloadTest.java
+++ b/src/test/java/org/jabref/logic/net/URLDownloadTest.java
@@ -91,5 +91,4 @@ public void downloadOfHttpsSucceeds() throws IOException {
         Path path = ftp.toTemporaryFile();
         assertNotNull(path);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java b/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java
index dff07571e76..84d4ff9e12a 100644
--- a/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java
@@ -59,7 +59,7 @@ public void testAuthorYear() throws IOException {
     @Test
     public void testAuthorYearAsFile() throws URISyntaxException, IOException {
         File defFile = Paths.get(OOBibStyleTest.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                .toFile();
+                            .toFile();
         OOBibStyle style = new OOBibStyle(defFile, layoutFormatterPreferences, StandardCharsets.UTF_8);
         assertTrue(style.isValid());
         assertFalse(style.isFromResource());
@@ -115,7 +115,7 @@ public void testGetNumCitationMarkerUndefined() throws IOException {
                 style.getNumCitationMarker(Arrays.asList(1, 2, 3, 0), 1, true));
 
         assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "; " + OOBibStyle.UNDEFINED_CITATION_MARKER + "; "
-                + OOBibStyle.UNDEFINED_CITATION_MARKER + "] ",
+                        + OOBibStyle.UNDEFINED_CITATION_MARKER + "] ",
                 style.getNumCitationMarker(Arrays.asList(0, 0, 0), 1, true));
     }
 
@@ -151,9 +151,9 @@ public void testGetCitationMarker() throws IOException {
         assertEquals("[Boström et al., 2006]",
                 style.getCitationMarker(Arrays.asList(entry), entryDBMap, true, null, null));
         assertEquals("Boström et al. [2006]",
-                style.getCitationMarker(Arrays.asList(entry), entryDBMap, false, null, new int[] {3}));
+                style.getCitationMarker(Arrays.asList(entry), entryDBMap, false, null, new int[]{3}));
         assertEquals("[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006]",
-                style.getCitationMarker(Arrays.asList(entry), entryDBMap, true, null, new int[] {5}));
+                style.getCitationMarker(Arrays.asList(entry), entryDBMap, true, null, new int[]{5}));
     }
 
     /**
@@ -345,7 +345,7 @@ public void testGetCitationMarkerInParenthesisUniquefiers() throws IOException {
         assertEquals("[Beta, 2000; Beta, 2000; Epsilon, 2001]",
                 style.getCitationMarker(entries, entryDBMap, true, null, null));
         assertEquals("[Beta, 2000a,b; Epsilon, 2001]",
-                style.getCitationMarker(entries, entryDBMap, true, new String[] {"a", "b", ""}, new int[] {1, 1, 1}));
+                style.getCitationMarker(entries, entryDBMap, true, new String[]{"a", "b", ""}, new int[]{1, 1, 1}));
     }
 
     @Test
@@ -381,7 +381,7 @@ public void testGetCitationMarkerInTextUniquefiers() throws IOException {
         assertEquals("Beta [2000]; Beta [2000]; Epsilon [2001]",
                 style.getCitationMarker(entries, entryDBMap, false, null, null));
         assertEquals("Beta [2000a,b]; Epsilon [2001]",
-                style.getCitationMarker(entries, entryDBMap, false, new String[] {"a", "b", ""}, new int[] {1, 1, 1}));
+                style.getCitationMarker(entries, entryDBMap, false, new String[]{"a", "b", ""}, new int[]{1, 1, 1}));
     }
 
     @Test
@@ -416,7 +416,7 @@ public void testGetCitationMarkerInParenthesisUniquefiersThreeSameAuthor() throw
         }
 
         assertEquals("[Beta, 2000a,b,c]",
-                style.getCitationMarker(entries, entryDBMap, true, new String[] {"a", "b", "c"}, new int[] {1, 1, 1}));
+                style.getCitationMarker(entries, entryDBMap, true, new String[]{"a", "b", "c"}, new int[]{1, 1, 1}));
     }
 
     @Test
@@ -451,7 +451,7 @@ public void testGetCitationMarkerInTextUniquefiersThreeSameAuthor() throws IOExc
         }
 
         assertEquals("Beta [2000a,b,c]",
-                style.getCitationMarker(entries, entryDBMap, false, new String[] {"a", "b", "c"}, new int[] {1, 1, 1}));
+                style.getCitationMarker(entries, entryDBMap, false, new String[]{"a", "b", "c"}, new int[]{1, 1, 1}));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java b/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java
index 2c51434577e..8b76fbeacd0 100644
--- a/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/OOPreFormatterTest.java
@@ -4,7 +4,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 public class OOPreFormatterTest {
 
     @Test
@@ -39,7 +38,6 @@ public void testUnsupportedSpecialCommands() {
         assertEquals("ftmchaaa", new OOPreFormatter().format("{\\ftmch\\aaa}"));
     }
 
-
     @Test
     public void testEquations() {
         assertEquals("Σ", new OOPreFormatter().format("$\\Sigma$"));
diff --git a/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java b/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java
index 945b70fa356..3765fd37f39 100644
--- a/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java
@@ -30,19 +30,16 @@ public class StyleLoaderTest {
     private LayoutFormatterPreferences layoutPreferences;
     private Charset encoding;
 
-
     @BeforeEach
     public void setUp() {
         preferences = mock(OpenOfficePreferences.class, Answers.RETURNS_DEEP_STUBS);
         layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         encoding = StandardCharsets.UTF_8;
-
     }
 
     @Test
     public void throwNPEWithNullPreferences() {
         assertThrows(NullPointerException.class, () -> loader = new StyleLoader(null, layoutPreferences, mock(Charset.class)));
-
     }
 
     @Test
@@ -69,7 +66,7 @@ public void testAddStyleLeadsToOneMoreStyle() throws URISyntaxException {
         loader = new StyleLoader(preferences, layoutPreferences, encoding);
 
         String filename = Paths.get(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                .toFile().getPath();
+                               .toFile().getPath();
         loader.addStyleIfValid(filename);
         assertEquals(numberOfInternalStyles + 1, loader.getStyles().size());
     }
@@ -86,7 +83,7 @@ public void testAddInvalidStyleLeadsToNoMoreStyle() {
     @Test
     public void testInitalizeWithOneExternalFile() throws URISyntaxException {
         String filename = Paths.get(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                .toFile().getPath();
+                               .toFile().getPath();
         when(preferences.getExternalStyles()).thenReturn(Collections.singletonList(filename));
         loader = new StyleLoader(preferences, layoutPreferences, encoding);
         assertEquals(numberOfInternalStyles + 1, loader.getStyles().size());
@@ -103,7 +100,7 @@ public void testInitalizeWithIncorrectExternalFile() {
     @Test
     public void testInitalizeWithOneExternalFileRemoveStyle() throws URISyntaxException {
         String filename = Paths.get(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                .toFile().getPath();
+                               .toFile().getPath();
         when(preferences.getExternalStyles()).thenReturn(Collections.singletonList(filename));
 
         loader = new StyleLoader(preferences, layoutPreferences, encoding);
@@ -124,7 +121,7 @@ public void testInitalizeWithOneExternalFileRemoveStyle() throws URISyntaxExcept
     @Test
     public void testInitalizeWithOneExternalFileRemoveStyleUpdatesPreferences() throws URISyntaxException {
         String filename = Paths.get(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                .toFile().getPath();
+                               .toFile().getPath();
         when(preferences.getExternalStyles()).thenReturn(Collections.singletonList(filename));
 
         loader = new StyleLoader(preferences, layoutPreferences, encoding);
@@ -148,7 +145,7 @@ public void testAddSameStyleTwiceLeadsToOneMoreStyle() throws URISyntaxException
         loader = new StyleLoader(preferences, layoutPreferences, encoding);
         int beforeAdding = loader.getStyles().size();
         String filename = Paths.get(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                .toFile().getPath();
+                               .toFile().getPath();
         loader.addStyleIfValid(filename);
         loader.addStyleIfValid(filename);
         assertEquals(beforeAdding + 1, loader.getStyles().size());
@@ -158,7 +155,6 @@ public void testAddSameStyleTwiceLeadsToOneMoreStyle() throws URISyntaxException
     public void testAddNullStyleThrowsNPE() {
         loader = new StyleLoader(preferences, layoutPreferences, encoding);
         assertThrows(NullPointerException.class, () -> loader.addStyleIfValid(null));
-
     }
 
     @Test
@@ -206,5 +202,4 @@ public void testRemoveInternalStyleReturnsFalseAndDoNotRemove() {
         assertFalse(loader.removeStyle(toremove.get(0)));
         assertEquals(numberOfInternalStyles, loader.getStyles().size());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java b/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java
index 01bb95f00ea..fc0bb832b35 100644
--- a/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java
+++ b/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java
@@ -12,7 +12,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 public class PdfAnnotationImporterTest {
 
     private final AnnotationImporter importer = new PdfAnnotationImporter();
diff --git a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
index da3b4ddf5f1..c8fbdf7f7e6 100644
--- a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
+++ b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
@@ -6,8 +6,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.TempDirectory;
 
@@ -99,5 +99,4 @@ public void testTermAddedToExternalList() {
         externalList.addProtectedTerm("CCC");
         assertTrue(externalList.getTermList().contains("CCC"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
index f73da3e5b45..0cc24dc3b8a 100644
--- a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
+++ b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
@@ -12,8 +12,8 @@
 
 import org.jabref.logic.l10n.Localization;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.TempDirectory;
 
@@ -30,7 +30,6 @@ class ProtectedTermsLoaderTest {
     void setUp() {
         loader = new ProtectedTermsLoader(new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(),
                 Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
-
     }
 
     @Test
@@ -43,7 +42,7 @@ void testGetProtectedTerms() throws URISyntaxException {
         assertTrue(loader.getProtectedTermsLists().isEmpty());
         String filename = Paths.get(
                 ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms").toURI())
-                .toFile().getPath();
+                               .toFile().getPath();
         loader.addProtectedTermsListFromFile(filename, true);
         assertEquals(Arrays.asList("Einstein"), loader.getProtectedTerms());
     }
@@ -52,7 +51,7 @@ void testGetProtectedTerms() throws URISyntaxException {
     void testAddProtectedTermsListFromFile() throws URISyntaxException {
         String filename = Paths
                 .get(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                        .toURI())
+                                               .toURI())
                 .toFile().getPath();
         assertEquals(ProtectedTermsLoader.getInternalLists().size(), loader.getProtectedTermsLists().size());
         loader.addProtectedTermsListFromFile(filename, false);
@@ -63,7 +62,7 @@ void testAddProtectedTermsListFromFile() throws URISyntaxException {
     void testReadProtectedTermsListFromFileReadsDescription() throws URISyntaxException, FileNotFoundException {
         File file = Paths.get(
                 ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms").toURI())
-                .toFile();
+                         .toFile();
         ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertEquals("Term list", list.getDescription());
     }
@@ -72,7 +71,7 @@ void testReadProtectedTermsListFromFileReadsDescription() throws URISyntaxExcept
     void testReadProtectedTermsListFromFileDisabledWorks() throws URISyntaxException, FileNotFoundException {
         File file = Paths.get(
                 ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms").toURI())
-                .toFile();
+                         .toFile();
         ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, false);
         assertFalse(list.isEnabled());
     }
@@ -81,7 +80,7 @@ void testReadProtectedTermsListFromFileDisabledWorks() throws URISyntaxException
     void testReadProtectedTermsListFromFileEnabledWorks() throws URISyntaxException, FileNotFoundException {
         File file = Paths.get(
                 ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms").toURI())
-                .toFile();
+                         .toFile();
         ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertTrue(list.isEnabled());
     }
@@ -90,7 +89,7 @@ void testReadProtectedTermsListFromFileEnabledWorks() throws URISyntaxException,
     void testReadProtectedTermsListFromFileIsNotInternalList() throws URISyntaxException, FileNotFoundException {
         File file = Paths.get(
                 ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms").toURI())
-                .toFile();
+                         .toFile();
         ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertFalse(list.isInternalList());
     }
@@ -100,8 +99,8 @@ void testReadProtectedTermsListFromFileNoDescriptionGivesDefaultDescription()
             throws URISyntaxException, FileNotFoundException {
         File file = Paths.get(
                 ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/unnamedterms.terms")
-                        .toURI())
-                .toFile();
+                                          .toURI())
+                         .toFile();
         ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertEquals(Localization.lang("The text after the last line starting with # will be used"),
                 list.getDescription());
diff --git a/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java b/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
index a5bfe728722..9f5a34ed95f 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
@@ -16,8 +16,8 @@
 import static org.mockito.Mockito.verify;
 
 /**
- * Tests for the case where the client and server are set-up correctly.
- * Testing the exceptional cases happens in {@link RemoteSetupTest}.
+ * Tests for the case where the client and server are set-up correctly. Testing the exceptional cases happens in {@link
+ * RemoteSetupTest}.
  */
 @DisabledOnCIServer("Tests fails sporadically on CI server")
 class RemoteCommunicationTest {
diff --git a/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java b/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java
index 3b7b5c85470..a1a5aab1a72 100644
--- a/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java
@@ -11,7 +11,6 @@ public class RemotePreferencesTest {
 
     private RemotePreferences preferences;
 
-
     @BeforeEach
     public void setUp() {
         preferences = new RemotePreferences(1000, true);
@@ -48,5 +47,4 @@ public void testIsDifferentPortTrue() {
     public void testIsDifferentPortFalse() {
         assertFalse(preferences.isDifferentPort(1000));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
index b5c18e1234d..e1ac0540649 100644
--- a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
+++ b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
@@ -18,7 +18,6 @@ public class DatabaseSearcherTest {
 
     private BibDatabase database;
 
-
     @BeforeEach
     public void setUp() {
         database = new BibDatabase();
diff --git a/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java b/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java
index 33011ec476a..fbe998e8a85 100644
--- a/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java
+++ b/src/test/java/org/jabref/logic/search/SearchQueryHighlightObservableTest.java
@@ -3,9 +3,8 @@
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeEach;
-
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -15,7 +14,6 @@
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.verify;
 
-
 class SearchQueryHighlightObservableTest {
 
     @Captor ArgumentCaptor<Optional<Pattern>> captor;
diff --git a/src/test/java/org/jabref/logic/search/SearchQueryTest.java b/src/test/java/org/jabref/logic/search/SearchQueryTest.java
index 029b03ce147..2718943d6a6 100644
--- a/src/test/java/org/jabref/logic/search/SearchQueryTest.java
+++ b/src/test/java/org/jabref/logic/search/SearchQueryTest.java
@@ -10,7 +10,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
 public class SearchQueryTest {
 
     @Test
@@ -183,7 +182,6 @@ public void isMatchedForNormalAndFieldBasedSearchMixed() {
         entry.setField("abstract", "text");
 
         assertTrue(new SearchQuery("text AND author=asdf", true, true).isMatch(entry));
-
     }
 
     @Test
@@ -194,5 +192,4 @@ public void testSimpleTerm() {
 
         assertFalse(result.isGrammarBasedSearch());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
index 64a1eeb381e..1594d8a93da 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
@@ -26,6 +26,6 @@ public void testGetConnection(DBMSType dbmsType) throws SQLException, InvalidDBM
     @Test
     public void testGetConnectionFail(DBMSType dbmsType) throws SQLException, InvalidDBMSConnectionPropertiesException {
         assertThrows(SQLException.class,
-                     () -> new DBMSConnection(new DBMSConnectionProperties(dbmsType, "XXXX", 0, "XXXX", "XXXX", "XXXX", false)).getConnection());
+                () -> new DBMSConnection(new DBMSConnectionProperties(dbmsType, "XXXX", 0, "XXXX", "XXXX", "XXXX", false)).getConnection());
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
index 72df4f9301e..1d84949752b 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
@@ -33,10 +33,10 @@ class DBMSProcessorTest {
     private static Stream<Object[]> getTestingDatabaseSystems() throws InvalidDBMSConnectionPropertiesException, SQLException {
         Collection<Object[]> result = new ArrayList<>();
         for (DBMSType dbmsType : TestManager.getDBMSTypeTestParameter()) {
-                result.add(new Object[] {
-                        dbmsType,
-                        TestConnector.getTestDBMSConnection(dbmsType),
-                        DBMSProcessor.getProcessorInstance(TestConnector.getTestDBMSConnection(dbmsType))});
+            result.add(new Object[]{
+                    dbmsType,
+                    TestConnector.getTestDBMSConnection(dbmsType),
+                    DBMSProcessor.getProcessorInstance(TestConnector.getTestDBMSConnection(dbmsType))});
         }
         return result.stream();
     }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java b/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
index 036309362e1..c9f6ff3ecd5 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
@@ -38,14 +38,18 @@
 @DatabaseTest
 public class DBMSSynchronizerTest {
 
+    @Parameter
+    public DBMSType dbmsType;
     private DBMSSynchronizer dbmsSynchronizer;
     private DBMSConnection dbmsConnection;
     private DBMSProcessor dbmsProcessor;
     private BibDatabase bibDatabase;
     private GlobalBibtexKeyPattern pattern;
 
-    @Parameter
-    public DBMSType dbmsType;
+    @Parameters(name = "Test with {0} database system")
+    public static Collection<DBMSType> getTestingDatabaseSystems() {
+        return TestManager.getDBMSTypeTestParameter();
+    }
 
     @BeforeEach
     public void setUp() throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException {
@@ -63,12 +67,6 @@ public void setUp() throws SQLException, DatabaseNotSupportedException, InvalidD
         bibDatabase.registerListener(dbmsSynchronizer);
 
         dbmsSynchronizer.openSharedDatabase(dbmsConnection);
-
-    }
-
-    @Parameters(name = "Test with {0} database system")
-    public static Collection<DBMSType> getTestingDatabaseSystems() {
-        return TestManager.getDBMSTypeTestParameter();
     }
 
     @Test
@@ -99,7 +97,6 @@ public void testFieldChangedEventListener() {
         assertEquals(1, actualEntries.size());
         assertEquals(expectedEntry.getField("author"), actualEntries.get(0).getField("author"));
         assertEquals("The nano processor1", actualEntries.get(0).getField("title").get());
-
     }
 
     @Test
@@ -200,7 +197,6 @@ public void testApplyMetaData() {
         dbmsSynchronizer.applyMetaData();
 
         assertEquals("wirthlin, michael j1", bibEntry.getField("author").get());
-
     }
 
     private BibEntry getBibEntryExample(int index) {
@@ -216,5 +212,4 @@ private BibEntry getBibEntryExample(int index) {
     public void clear() throws SQLException {
         TestManager.clearTables(dbmsConnection);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java b/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
index 3c350aeb6d3..855f522a239 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
@@ -46,5 +46,4 @@ public void testGetDefaultPort() {
         assertEquals(5432, DBMSType.POSTGRESQL.getDefaultPort());
         assertEquals(1521, DBMSType.ORACLE.getDefaultPort());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/shared/SynchronizationTestEventListener.java b/src/test/java/org/jabref/logic/shared/SynchronizationTestEventListener.java
index 99a554422a9..efef81b7cbc 100644
--- a/src/test/java/org/jabref/logic/shared/SynchronizationTestEventListener.java
+++ b/src/test/java/org/jabref/logic/shared/SynchronizationTestEventListener.java
@@ -12,7 +12,6 @@ public class SynchronizationTestEventListener {
     private SharedEntryNotPresentEvent sharedEntryNotPresentEvent;
     private UpdateRefusedEvent updateRefusedEvent;
 
-
     @Subscribe
     public void listen(SharedEntryNotPresentEvent event) {
         this.sharedEntryNotPresentEvent = event;
diff --git a/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java b/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java
index 276167728f1..058216af789 100644
--- a/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java
+++ b/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java
@@ -29,15 +29,17 @@
 @DatabaseTest
 public class SynchronizationTestSimulator {
 
+    @Parameter
+    public DBMSType dbmsType;
     private BibDatabaseContext clientContextA;
     private BibDatabaseContext clientContextB;
-
     private SynchronizationTestEventListener eventListenerB; // used to monitor occurring events
-
     private DBMSConnection dbmsConnection;
 
-    @Parameter
-    public DBMSType dbmsType;
+    @Parameters(name = "Test with {0} database system")
+    public static Collection<DBMSType> getTestingDatabaseSystems() {
+        return TestManager.getDBMSTypeTestParameter();
+    }
 
     @BeforeEach
     public void setUp() throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException {
@@ -57,11 +59,6 @@ public void setUp() throws SQLException, DatabaseNotSupportedException, InvalidD
         clientContextB.getDBMSSynchronizer().registerListener(eventListenerB);
     }
 
-    @Parameters(name = "Test with {0} database system")
-    public static Collection<DBMSType> getTestingDatabaseSystems() {
-        return TestManager.getDBMSTypeTestParameter();
-    }
-
     @Test
     public void simulateEntryInsertionAndManualPull() {
         //client A inserts an entry
diff --git a/src/test/java/org/jabref/logic/shared/TestManager.java b/src/test/java/org/jabref/logic/shared/TestManager.java
index 1413275de95..6c9ec6fd5b6 100644
--- a/src/test/java/org/jabref/logic/shared/TestManager.java
+++ b/src/test/java/org/jabref/logic/shared/TestManager.java
@@ -9,8 +9,8 @@
 import org.jabref.model.database.shared.DBMSType;
 
 /**
- * This class provides helping methods for database tests.
- * Furthermore it determines database systems which are ready to be used for tests.
+ * This class provides helping methods for database tests. Furthermore it determines database systems which are ready to
+ * be used for tests.
  */
 public class TestManager {
 
@@ -41,11 +41,11 @@ public static void clearTables(DBMSConnection dbmsConnection) throws SQLExceptio
             dbmsConnection.getConnection().createStatement().executeUpdate("DROP TABLE IF EXISTS \"METADATA\"");
         } else if (dbmsType == DBMSType.ORACLE) {
             dbmsConnection.getConnection().createStatement()
-                    .executeUpdate("BEGIN\n" + "EXECUTE IMMEDIATE 'DROP TABLE \"FIELD\"';\n"
-                        + "EXECUTE IMMEDIATE 'DROP TABLE \"ENTRY\"';\n"
-                        + "EXECUTE IMMEDIATE 'DROP TABLE \"METADATA\"';\n"
-                        + "EXECUTE IMMEDIATE 'DROP SEQUENCE \"ENTRY_SEQ\"';\n" + "EXCEPTION\n" + "WHEN OTHERS THEN\n"
-                        + "IF SQLCODE != -942 THEN\n" + "RAISE;\n" + "END IF;\n" + "END;");
+                          .executeUpdate("BEGIN\n" + "EXECUTE IMMEDIATE 'DROP TABLE \"FIELD\"';\n"
+                                  + "EXECUTE IMMEDIATE 'DROP TABLE \"ENTRY\"';\n"
+                                  + "EXECUTE IMMEDIATE 'DROP TABLE \"METADATA\"';\n"
+                                  + "EXECUTE IMMEDIATE 'DROP SEQUENCE \"ENTRY_SEQ\"';\n" + "EXCEPTION\n" + "WHEN OTHERS THEN\n"
+                                  + "IF SQLCODE != -942 THEN\n" + "RAISE;\n" + "END IF;\n" + "END;");
         }
     }
 }
diff --git a/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java b/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
index 5e520890608..b2d33d2eed7 100644
--- a/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
+++ b/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
@@ -1,7 +1,5 @@
 package org.jabref.logic.util;
 
-
-
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -34,5 +32,4 @@ public void parseNull() {
     public void parseUnknownString() {
         assertEquals(Version.DevelopmentStage.UNKNOWN, Version.DevelopmentStage.parse("asdf"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/util/JavaVersionTest.java b/src/test/java/org/jabref/logic/util/JavaVersionTest.java
index 5f67d084363..443b404f803 100644
--- a/src/test/java/org/jabref/logic/util/JavaVersionTest.java
+++ b/src/test/java/org/jabref/logic/util/JavaVersionTest.java
@@ -8,18 +8,13 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
 /**
  * Tests for ensuring we can compare most appearing version strings
  */
 public class JavaVersionTest {
 
     private static List<String> java = new ArrayList<>();
-    private static List<String > java9 = new ArrayList<>();
-
-    private final static JavaVersion nullCheck = new JavaVersion(null);
-    private final static JavaVersion noSenseCheck = new JavaVersion("U.N.K.N.O.W.N");
-
+    private static List<String> java9 = new ArrayList<>();
 
     static {
         java.add("1.6.0_10"); // Oracle
@@ -54,8 +49,8 @@ public void isJava9() throws Exception {
         }
 
         // For impossible comparisons we assume it's not java 9
-        assertFalse(nullCheck.isJava9());
-        assertFalse(noSenseCheck.isJava9());
+        assertFalse(new JavaVersion(null).isJava9());
+        assertFalse(new JavaVersion("U.N.K.N.O.W.N").isJava9());
     }
 
     @Test
@@ -68,11 +63,10 @@ public void isAtLeast() throws Exception {
 
             // Check if we optimistically return true if we cannot determine the result
             assertTrue(java8Example.isAtLeast(null));
-            assertTrue(nullCheck.isAtLeast(version8));
-            assertTrue(noSenseCheck.isAtLeast(version8));
+            assertTrue(new JavaVersion(null).isAtLeast(version8));
+            assertTrue(new JavaVersion("U.N.K.N.O.W.N").isAtLeast(version8));
             assertTrue(java8Example.isAtLeast("useless"));
 
-
             // Check against all java 9 entries in both directions
             for (String version9 : java9) {
                 assertFalse(java8Example.isAtLeast(version9));
diff --git a/src/test/java/org/jabref/logic/util/UpdateFieldTest.java b/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
index d79d4014bff..57a15b34621 100644
--- a/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
+++ b/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
@@ -13,12 +13,10 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
 public class UpdateFieldTest {
 
     private BibEntry entry;
 
-
     @BeforeEach
     public void setUp() throws Exception {
         entry = new BibEntry();
@@ -168,5 +166,4 @@ public void testUpdateNonDisplayableFieldHasNotChanged() {
         UpdateField.updateNonDisplayableField(entry, "year", "2016");
         assertFalse(entry.hasChanged());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/util/VersionTest.java b/src/test/java/org/jabref/logic/util/VersionTest.java
index b2f90644b65..7601f29910e 100644
--- a/src/test/java/org/jabref/logic/util/VersionTest.java
+++ b/src/test/java/org/jabref/logic/util/VersionTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.util;
 
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -283,5 +282,4 @@ public void alphaShouldBeUpdatedToStables() {
         List<Version> availableVersions = Arrays.asList(Version.parse("2.8-beta"), stable);
         assertEquals(Optional.of(stable), alpha.shouldBeUpdatedTo(availableVersions));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java b/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java
index 9d3a8374416..0629afe3a97 100644
--- a/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java
+++ b/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java
@@ -1,8 +1,8 @@
 package org.jabref.logic.util.io;
 
 import java.io.IOException;
-import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -10,7 +10,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibtexEntryTypes;
 
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index 7073e65415e..4103e8b7d23 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -2,7 +2,10 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -19,7 +22,11 @@
 import org.junitpioneer.jupiter.TempDirectory;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
 @ExtendWith(TempDirectory.class)
@@ -137,9 +144,9 @@ void testGetLinkedFileNameByYearAuthorFirstpage() {
         // bibkey - title
         String fileNamePattern = "[year]_[auth]_[firstpage]";
         BibEntry entry = new BibEntry();
-        entry.setField( "author", "O. Kitsune" );
-        entry.setField( "year", "1868" );
-        entry.setField( "pages", "567-579" );
+        entry.setField("author", "O. Kitsune");
+        entry.setField("year", "1868");
+        entry.setField("pages", "567-579");
 
         assertEquals("1868_Kitsune_567", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
@@ -215,42 +222,42 @@ void uniquePathSubstrings() {
     }
 
     @Test
-    void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithOverrideExistFile(){
+    void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithOverrideExistFile() {
         assertFalse(FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, true));
     }
 
     @Test
-    void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithoutOverrideExistFile(){
+    void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithoutOverrideExistFile() {
         assertFalse(FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, false));
     }
 
     @Test
-    void testCopyFileFromEmptySourcePathToExistDestinationPathWithOverrideExistFile(){
+    void testCopyFileFromEmptySourcePathToExistDestinationPathWithOverrideExistFile() {
         assertFalse(FileUtil.copyFile(nonExistingTestPath, existingTestFile, true));
     }
 
     @Test
-    void testCopyFileFromEmptySourcePathToExistDestinationPathWithoutOverrideExistFile(){
+    void testCopyFileFromEmptySourcePathToExistDestinationPathWithoutOverrideExistFile() {
         assertFalse(FileUtil.copyFile(nonExistingTestPath, existingTestFile, false));
     }
 
     @Test
-    void testCopyFileFromExistSourcePathToExistDestinationPathWithOverrideExistFile(){
+    void testCopyFileFromExistSourcePathToExistDestinationPathWithOverrideExistFile() {
         assertTrue(FileUtil.copyFile(existingTestFile, existingTestFile, true));
     }
 
     @Test
-    void testCopyFileFromExistSourcePathToExistDestinationPathWithoutOverrideExistFile(){
+    void testCopyFileFromExistSourcePathToExistDestinationPathWithoutOverrideExistFile() {
         assertFalse(FileUtil.copyFile(existingTestFile, existingTestFile, false));
     }
 
     @Test
-    void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithOverrideExistFile(){
+    void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithOverrideExistFile() {
         assertTrue(FileUtil.copyFile(existingTestFile, otherExistingTestFile, true));
     }
 
     @Test
-    void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithoutOverrideExistFile(){
+    void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithoutOverrideExistFile() {
         assertFalse(FileUtil.copyFile(existingTestFile, otherExistingTestFile, false));
     }
 
@@ -290,27 +297,27 @@ void testRenameFileWithFromFileIsNullAndToFileExist() {
     }
 
     @Test
-    void testRenameFileWithFromFileNotExistAndToFileNotExist(){
+    void testRenameFileWithFromFileNotExistAndToFileNotExist() {
         assertFalse(FileUtil.renameFile(nonExistingTestPath, nonExistingTestPath));
     }
 
     @Test
-    void testRenameFileWithFromFileNotExistAndToFileExist(){
+    void testRenameFileWithFromFileNotExistAndToFileExist() {
         assertFalse(FileUtil.renameFile(nonExistingTestPath, existingTestFile));
     }
 
     @Test
-    void testRenameFileWithFromFileExistAndToFileNotExist(){
+    void testRenameFileWithFromFileExistAndToFileNotExist() {
         assertTrue(FileUtil.renameFile(existingTestFile, nonExistingTestPath));
     }
 
     @Test
-    void testRenameFileWithFromFileExistAndToFileExist(){
+    void testRenameFileWithFromFileExistAndToFileExist() {
         assertTrue(FileUtil.renameFile(existingTestFile, existingTestFile));
     }
 
     @Test
-    void testRenameFileWithFromFileExistAndOtherToFileExist(){
+    void testRenameFileWithFromFileExistAndOtherToFileExist() {
         assertFalse(FileUtil.renameFile(existingTestFile, otherExistingTestFile));
     }
 
@@ -362,9 +369,9 @@ void testGetLinkedDirNameDefaultFullTitle() {
         assertEquals("PDF/1998/Åuthör/1234 - mytitle",
                 FileUtil.createDirNameFromPattern(null, entry, fileNamePattern));
     }
+
     @Test
-    public void testIsBibFile() throws IOException
-    {
+    public void testIsBibFile() throws IOException {
         Path bibFile = Files.createFile(rootDir.resolve("test.bib"));
 
         assertTrue(FileUtil.isBibFile(bibFile));
diff --git a/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java b/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java
index b550ca52a2d..d024017ff34 100644
--- a/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java
+++ b/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java
@@ -17,7 +17,7 @@
 
 public class RegExpBasedFileFinderTests {
 
-    private static final String filesDirectory = "src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder";
+    private static final String FILES_DIRECTORY = "src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder";
     private BibDatabase database;
     private BibEntry entry;
 
@@ -52,7 +52,7 @@ public void testFindFiles() throws Exception {
 
         List<String> extensions = Collections.singletonList("pdf");
 
-        List<Path> dirs = Collections.singletonList(Paths.get(filesDirectory));
+        List<Path> dirs = Collections.singletonList(Paths.get(FILES_DIRECTORY));
         RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("**/[bibtexkey].*\\\\.[extension]", ',');
 
         //when
@@ -68,7 +68,7 @@ public void testYearAuthFirspageFindFiles() throws Exception {
         //given
         List<String> extensions = Collections.singletonList("pdf");
 
-        List<Path> dirs = Collections.singletonList(Paths.get(filesDirectory));
+        List<Path> dirs = Collections.singletonList(Paths.get(FILES_DIRECTORY));
         RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("**/[year]_[auth]_[firstpage].*\\\\.[extension]", ',');
 
         //when
@@ -90,7 +90,7 @@ public void testAuthorWithDiacritics() throws Exception {
 
         List<String> extensions = Collections.singletonList("pdf");
 
-        List<Path> dirs = Collections.singletonList(Paths.get(filesDirectory));
+        List<Path> dirs = Collections.singletonList(Paths.get(FILES_DIRECTORY));
         RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("**/[year]_[auth]_[firstpage]\\\\.[extension]", ',');
 
         //when
@@ -110,7 +110,7 @@ public void testFindFileInSubdirectory() throws Exception {
 
         List<String> extensions = Collections.singletonList("pdf");
 
-        List<Path> dirs = Collections.singletonList(Paths.get(filesDirectory));
+        List<Path> dirs = Collections.singletonList(Paths.get(FILES_DIRECTORY));
         RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("**/[bibtexkey].*\\\\.[extension]", ',');
 
         //when
@@ -130,7 +130,7 @@ public void testFindFileNonRecursive() throws Exception {
 
         List<String> extensions = Collections.singletonList("pdf");
 
-        List<Path> dirs = Collections.singletonList(Paths.get(filesDirectory));
+        List<Path> dirs = Collections.singletonList(Paths.get(FILES_DIRECTORY));
         RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("*/[bibtexkey].*\\\\.[extension]", ',');
 
         //when
@@ -169,5 +169,4 @@ public void testExpandBrackets() {
                 RegExpBasedFileFinder.expandBrackets("[author] have published [title] in [journal].", entry, database,
                         ','));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java b/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java
index 29b691b4e13..bf53b938ef4 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java
@@ -9,7 +9,6 @@ public class StringLengthComparatorTest {
 
     private StringLengthComparator slc;
 
-
     @BeforeEach
     public void setUp() {
         slc = new StringLengthComparator();
@@ -21,5 +20,4 @@ public void test() {
         assertEquals(0, slc.compare("AA", "AA"));
         assertEquals(1, slc.compare("AA", "AAA"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java b/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
index ea5dfe702c1..92160685052 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
@@ -14,12 +14,10 @@
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.model.util.FileUpdateMonitor;
 
 import com.google.common.io.Resources;
 import org.apache.xmpbox.XMPMetadata;
 import org.apache.xmpbox.schema.DublinCoreSchema;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
@@ -30,10 +28,7 @@
 
 class XmpUtilReaderTest {
 
-    private static final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
-
     private XmpPreferences xmpPreferences;
-
     private BibtexParser parser;
 
     /**
@@ -49,7 +44,7 @@ void setUp() {
 
         when(xmpPreferences.getKeywordSeparator()).thenReturn(',');
 
-        parser = new BibtexParser(importFormatPreferences, fileMonitor);
+        parser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
     }
 
     /**
@@ -104,5 +99,4 @@ void testReadPDMetadata() throws IOException, URISyntaxException, ParseException
 
         assertEquals(entryFromBibFile.get(), entries.get(0));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
index bad198f9d0f..f3d57c6bfae 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
@@ -13,8 +13,8 @@
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.TempDirectory;
 
@@ -25,11 +25,10 @@
 @ExtendWith(TempDirectory.class)
 class XmpUtilWriterTest {
 
-    private XmpPreferences xmpPreferences;
-
     private static BibEntry olly2018;
     private static BibEntry toral2006;
     private static BibEntry vapnik2000;
+    private XmpPreferences xmpPreferences;
 
     private void initBibEntries() {
 
@@ -113,7 +112,6 @@ void testWriteXmp(@TempDirectory.TempDir Path tempDir) throws IOException, Trans
 
         // compare the two entries
         assertEquals(entry, entryWritten);
-
     }
 
     /**
@@ -130,7 +128,6 @@ void testWriteMultipleBibEntries(@TempDirectory.TempDir Path tempDir) throws IOE
 
         List<BibEntry> entryList = XmpUtilReader.readXmp(Paths.get(pdfFile.toAbsolutePath().toString()), xmpPreferences);
         assertEquals(3, entryList.size());
-
     }
 
     private Path createDefaultFile(String fileName, Path tempDir) throws IOException {
diff --git a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
index 0b7128da0da..c646bab55bb 100644
--- a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
+++ b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
@@ -17,16 +17,15 @@ class PreferencesMigrationsTest {
     private JabRefPreferences prefs;
     private Preferences mainPrefsNode;
 
-    private final String[] oldStylePatterns = new String[] {"\\bibtexkey",
-                                                            "\\bibtexkey\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}"};
-    private final String[] newStylePatterns = new String[] {"[bibtexkey]",
-                                                            "[bibtexkey] - [fulltitle]"};
+    private final String[] oldStylePatterns = new String[]{"\\bibtexkey",
+            "\\bibtexkey\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}"};
+    private final String[] newStylePatterns = new String[]{"[bibtexkey]",
+            "[bibtexkey] - [fulltitle]"};
 
     @BeforeEach
     void setUp() {
         prefs = mock(JabRefPreferences.class);
         mainPrefsNode = mock(Preferences.class);
-
     }
 
     @Test
@@ -39,7 +38,6 @@ void testOldStyleBibtexkeyPattern0() {
 
         verify(prefs).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[0]);
         verify(mainPrefsNode).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[0]);
-
     }
 
     @Test
@@ -53,7 +51,6 @@ void testOldStyleBibtexkeyPattern1() {
 
         verify(prefs).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[1]);
         verify(mainPrefsNode).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[1]);
-
     }
 
     @Test
@@ -67,50 +64,49 @@ void testArbitraryBibtexkeyPattern() {
 
         verify(prefs, never()).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
         verify(mainPrefsNode, never()).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
-
     }
 
     @Test
     void testPreviewStyle() {
         String oldPreviewStyle = "<font face=\"sans-serif\">"
-                                 + "<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>"
-                                 + "\\end{bibtexkey}</b><br>__NEWLINE__"
-                                 + "\\begin{author} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\author}<BR>\\end{author}__NEWLINE__"
-                                 + "\\begin{editor} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\editor} "
-                                 + "<i>(\\format[IfPlural(Eds.,Ed.)]{\\editor})</i><BR>\\end{editor}__NEWLINE__"
-                                 + "\\begin{title} \\format[HTMLChars]{\\title} \\end{title}<BR>__NEWLINE__"
-                                 + "\\begin{chapter} \\format[HTMLChars]{\\chapter}<BR>\\end{chapter}__NEWLINE__"
-                                 + "\\begin{journal} <em>\\format[HTMLChars]{\\journal}, </em>\\end{journal}__NEWLINE__"
-                                 // Include the booktitle field for @inproceedings, @proceedings, etc.
-                                 + "\\begin{booktitle} <em>\\format[HTMLChars]{\\booktitle}, </em>\\end{booktitle}__NEWLINE__"
-                                 + "\\begin{school} <em>\\format[HTMLChars]{\\school}, </em>\\end{school}__NEWLINE__"
-                                 + "\\begin{institution} <em>\\format[HTMLChars]{\\institution}, </em>\\end{institution}__NEWLINE__"
-                                 + "\\begin{publisher} <em>\\format[HTMLChars]{\\publisher}, </em>\\end{publisher}__NEWLINE__"
-                                 + "\\begin{year}<b>\\year</b>\\end{year}\\begin{volume}<i>, \\volume</i>\\end{volume}"
-                                 + "\\begin{pages}, \\format[FormatPagesForHTML]{\\pages} \\end{pages}__NEWLINE__"
-                                 + "\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract} \\end{abstract}__NEWLINE__"
-                                 + "\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}"
-                                 + "</dd>__NEWLINE__<p></p></font>";
+                + "<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>"
+                + "\\end{bibtexkey}</b><br>__NEWLINE__"
+                + "\\begin{author} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\author}<BR>\\end{author}__NEWLINE__"
+                + "\\begin{editor} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\editor} "
+                + "<i>(\\format[IfPlural(Eds.,Ed.)]{\\editor})</i><BR>\\end{editor}__NEWLINE__"
+                + "\\begin{title} \\format[HTMLChars]{\\title} \\end{title}<BR>__NEWLINE__"
+                + "\\begin{chapter} \\format[HTMLChars]{\\chapter}<BR>\\end{chapter}__NEWLINE__"
+                + "\\begin{journal} <em>\\format[HTMLChars]{\\journal}, </em>\\end{journal}__NEWLINE__"
+                // Include the booktitle field for @inproceedings, @proceedings, etc.
+                + "\\begin{booktitle} <em>\\format[HTMLChars]{\\booktitle}, </em>\\end{booktitle}__NEWLINE__"
+                + "\\begin{school} <em>\\format[HTMLChars]{\\school}, </em>\\end{school}__NEWLINE__"
+                + "\\begin{institution} <em>\\format[HTMLChars]{\\institution}, </em>\\end{institution}__NEWLINE__"
+                + "\\begin{publisher} <em>\\format[HTMLChars]{\\publisher}, </em>\\end{publisher}__NEWLINE__"
+                + "\\begin{year}<b>\\year</b>\\end{year}\\begin{volume}<i>, \\volume</i>\\end{volume}"
+                + "\\begin{pages}, \\format[FormatPagesForHTML]{\\pages} \\end{pages}__NEWLINE__"
+                + "\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract} \\end{abstract}__NEWLINE__"
+                + "\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}"
+                + "</dd>__NEWLINE__<p></p></font>";
 
         String newPreviewStyle = "<font face=\"sans-serif\">"
-                                 + "<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>"
-                                 + "\\end{bibtexkey}</b><br>__NEWLINE__"
-                                 + "\\begin{author} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\author}<BR>\\end{author}__NEWLINE__"
-                                 + "\\begin{editor} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\editor} "
-                                 + "<i>(\\format[IfPlural(Eds.,Ed.)]{\\editor})</i><BR>\\end{editor}__NEWLINE__"
-                                 + "\\begin{title} \\format[HTMLChars]{\\title} \\end{title}<BR>__NEWLINE__"
-                                 + "\\begin{chapter} \\format[HTMLChars]{\\chapter}<BR>\\end{chapter}__NEWLINE__"
-                                 + "\\begin{journal} <em>\\format[HTMLChars]{\\journal}, </em>\\end{journal}__NEWLINE__"
-                                 // Include the booktitle field for @inproceedings, @proceedings, etc.
-                                 + "\\begin{booktitle} <em>\\format[HTMLChars]{\\booktitle}, </em>\\end{booktitle}__NEWLINE__"
-                                 + "\\begin{school} <em>\\format[HTMLChars]{\\school}, </em>\\end{school}__NEWLINE__"
-                                 + "\\begin{institution} <em>\\format[HTMLChars]{\\institution}, </em>\\end{institution}__NEWLINE__"
-                                 + "\\begin{publisher} <em>\\format[HTMLChars]{\\publisher}, </em>\\end{publisher}__NEWLINE__"
-                                 + "\\begin{year}<b>\\year</b>\\end{year}\\begin{volume}<i>, \\volume</i>\\end{volume}"
-                                 + "\\begin{pages}, \\format[FormatPagesForHTML]{\\pages} \\end{pages}__NEWLINE__"
-                                 + "\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract} \\end{abstract}__NEWLINE__"
-                                 + "\\begin{comment}<BR><BR><b>Comment: </b> \\format[HTMLChars]{\\comment} \\end{comment}"
-                                 + "</dd>__NEWLINE__<p></p></font>";
+                + "<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>"
+                + "\\end{bibtexkey}</b><br>__NEWLINE__"
+                + "\\begin{author} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\author}<BR>\\end{author}__NEWLINE__"
+                + "\\begin{editor} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\editor} "
+                + "<i>(\\format[IfPlural(Eds.,Ed.)]{\\editor})</i><BR>\\end{editor}__NEWLINE__"
+                + "\\begin{title} \\format[HTMLChars]{\\title} \\end{title}<BR>__NEWLINE__"
+                + "\\begin{chapter} \\format[HTMLChars]{\\chapter}<BR>\\end{chapter}__NEWLINE__"
+                + "\\begin{journal} <em>\\format[HTMLChars]{\\journal}, </em>\\end{journal}__NEWLINE__"
+                // Include the booktitle field for @inproceedings, @proceedings, etc.
+                + "\\begin{booktitle} <em>\\format[HTMLChars]{\\booktitle}, </em>\\end{booktitle}__NEWLINE__"
+                + "\\begin{school} <em>\\format[HTMLChars]{\\school}, </em>\\end{school}__NEWLINE__"
+                + "\\begin{institution} <em>\\format[HTMLChars]{\\institution}, </em>\\end{institution}__NEWLINE__"
+                + "\\begin{publisher} <em>\\format[HTMLChars]{\\publisher}, </em>\\end{publisher}__NEWLINE__"
+                + "\\begin{year}<b>\\year</b>\\end{year}\\begin{volume}<i>, \\volume</i>\\end{volume}"
+                + "\\begin{pages}, \\format[FormatPagesForHTML]{\\pages} \\end{pages}__NEWLINE__"
+                + "\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract} \\end{abstract}__NEWLINE__"
+                + "\\begin{comment}<BR><BR><b>Comment: </b> \\format[HTMLChars]{\\comment} \\end{comment}"
+                + "</dd>__NEWLINE__<p></p></font>";
 
         prefs.setPreviewStyle(oldPreviewStyle);
         when(prefs.getPreviewStyle()).thenReturn(oldPreviewStyle);
@@ -118,6 +114,5 @@ void testPreviewStyle() {
         PreferencesMigrations.upgradePreviewStyleFromReviewToComment(prefs);
 
         verify(prefs).setPreviewStyle(newPreviewStyle);
-
     }
 }
diff --git a/src/test/java/org/jabref/model/EntryTypesTest.java b/src/test/java/org/jabref/model/EntryTypesTest.java
index d58cc7ff904..8a77703ee1a 100644
--- a/src/test/java/org/jabref/model/EntryTypesTest.java
+++ b/src/test/java/org/jabref/model/EntryTypesTest.java
@@ -15,10 +15,9 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.IEEETranEntryTypes;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -147,7 +146,6 @@ void registeredCustomizedStandardEntryTypeIsContainedInListOfCustomizedEntryType
         assertEquals(Arrays.asList(overwrittenStandardType), EntryTypes.getAllModifiedStandardTypes(mode));
     }
 
-
     @ParameterizedTest
     @MethodSource("standardArticleTypeAndMode")
     void standardTypeIsStillAcessibleIfOverwritten(EntryType standardArticleType, BibDatabaseMode mode) {
@@ -176,5 +174,4 @@ void overwriteStandardTypeRequiredFieldsDoesNotAffectOtherMode(BibDatabaseMode m
         EntryTypes.addOrModifyCustomEntryType(overwrittenStandardType, mode);
         assertFalse(EntryTypes.getAllValues(otherMode).contains(overwrittenStandardType));
     }
-
 }
diff --git a/src/test/java/org/jabref/model/TreeNodeTest.java b/src/test/java/org/jabref/model/TreeNodeTest.java
index 577c2420d8d..4ae97c6c2ea 100644
--- a/src/test/java/org/jabref/model/TreeNodeTest.java
+++ b/src/test/java/org/jabref/model/TreeNodeTest.java
@@ -29,7 +29,6 @@ public void setUp() {
     @Test
     public void constructorChecksThatClassImplementsCorrectInterface() {
         assertThrows(UnsupportedOperationException.class, () -> new WrongTreeNodeImplementation());
-
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/TreeNodeTestData.java b/src/test/java/org/jabref/model/TreeNodeTestData.java
index 939e9629292..c4f669ec9a6 100644
--- a/src/test/java/org/jabref/model/TreeNodeTestData.java
+++ b/src/test/java/org/jabref/model/TreeNodeTestData.java
@@ -2,11 +2,7 @@
 
 public class TreeNodeTestData {
     /**
-     * Gets the marked node in the following tree:
-     * Root
-     * A
-     * A (= parent)
-     * B (<-- this)
+     * Gets the marked node in the following tree: Root A A (= parent) B (<-- this)
      */
     public static TreeNodeMock getNodeInSimpleTree(TreeNodeMock root) {
         root.addChild(new TreeNodeMock());
@@ -22,21 +18,8 @@ public static TreeNodeMock getNodeInSimpleTree() {
     }
 
     /**
-     * Gets the marked node in the following tree:
-     * Root
-     * A
-     * A
-     * A (= grand parent)
-     * B
-     * B (= parent)
-     * C (<-- this)
-     * D (= child)
-     * C
-     * C
-     * C
-     * B
-     * B
-     * A
+     * Gets the marked node in the following tree: Root A A A (= grand parent) B B (= parent) C (<-- this) D (= child) C
+     * C C B B A
      */
     public static TreeNodeMock getNodeInComplexTree(TreeNodeMock root) {
         root.addChild(new TreeNodeMock());
@@ -66,12 +49,7 @@ public static TreeNodeMock getNodeInComplexTree() {
     }
 
     /**
-     * Gets the marked in the following tree:
-     * Root
-     * A
-     * A
-     * A (<- this)
-     * A
+     * Gets the marked in the following tree: Root A A A (<- this) A
      */
     public static TreeNodeMock getNodeAsChild(TreeNodeMock root) {
         root.addChild(new TreeNodeMock());
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
index a157a4e3de9..3902da07a58 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
@@ -68,5 +68,4 @@ public void ignoreUnknownTypesForBiblatexDecision() {
 
         assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries)));
     }
-
 }
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseTest.java b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
index 4a11fdc737d..84fcbb426e7 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
@@ -58,7 +58,6 @@ public void insertEntryWithSameIdThrowsException() {
         BibEntry entry1 = new BibEntry();
         entry1.setId(entry0.getId());
         assertThrows(KeyCollisionException.class, () -> database.insertEntry(entry1));
-
     }
 
     @Test
@@ -127,7 +126,6 @@ public void addSameStringLabelTwiceThrowsKeyCollisionException() {
         final BibtexString finalString = new BibtexString("DSP", "Digital Signal Processor");
 
         assertThrows(KeyCollisionException.class, () -> database.addString(finalString));
-
     }
 
     @Test
@@ -139,7 +137,6 @@ public void addSameStringIdTwiceThrowsKeyCollisionException() {
         finalString.setId("duplicateid");
 
         assertThrows(KeyCollisionException.class, () -> database.addString(finalString));
-
     }
 
     @Test
@@ -319,5 +316,4 @@ public void setPreambleWorks() {
         database.setPreamble("Oh yeah!");
         assertEquals(Optional.of("Oh yeah!"), database.getPreamble());
     }
-
 }
diff --git a/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java b/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java
index e280a41d5c7..28782f83642 100644
--- a/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java
+++ b/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java
@@ -11,7 +11,6 @@ public class DuplicationCheckerTest {
 
     private BibDatabase database;
 
-
     @BeforeEach
     public void setUp() {
         database = new BibDatabase();
@@ -46,7 +45,6 @@ public void changeCiteKey() {
         assertEquals(1, database.getDuplicationChecker().getNumberOfKeyOccurrences("BBB"));
     }
 
-
     @Test
     public void setCiteKeySameKeyDifferentEntries() {
         BibEntry entry0 = new BibEntry();
@@ -64,7 +62,7 @@ public void setCiteKeySameKeyDifferentEntries() {
     }
 
     @Test
-    public void removeMultipleCiteKeys(){
+    public void removeMultipleCiteKeys() {
         BibEntry entry0 = new BibEntry();
         entry0.setCiteKey("AAA");
         database.insertEntry(entry0);
@@ -87,7 +85,7 @@ public void removeMultipleCiteKeys(){
     }
 
     @Test
-    public void addEmptyCiteKey(){
+    public void addEmptyCiteKey() {
         BibEntry entry = new BibEntry();
         entry.setCiteKey("");
         database.insertEntry(entry);
@@ -96,7 +94,7 @@ public void addEmptyCiteKey(){
     }
 
     @Test
-    public void removeEmptyCiteKey(){
+    public void removeEmptyCiteKey() {
         BibEntry entry = new BibEntry();
         entry.setCiteKey("AAA");
         database.insertEntry(entry);
@@ -106,5 +104,4 @@ public void removeEmptyCiteKey(){
         database.removeEntry(entry);
         assertEquals(0, database.getDuplicationChecker().getNumberOfKeyOccurrences("AAA"));
     }
-
 }
diff --git a/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java b/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java
index 2540b5ed75e..52ed7cbd403 100644
--- a/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java
+++ b/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java
@@ -18,7 +18,6 @@ public class KeyChangeListenerTest {
     private BibEntry entry3;
     private BibEntry entry4;
 
-
     @BeforeEach
     public void setUp() {
         db = new BibDatabase();
@@ -41,7 +40,6 @@ public void setUp() {
         entry4 = new BibEntry();
         entry4.setCiteKey("Entry4");
         db.insertEntry(entry4);
-
     }
 
     @Test
@@ -89,5 +87,4 @@ public void testRelatedAllEntriesRemoved() {
         db.removeEntry(entry3);
         assertEquals(Optional.empty(), entry2.getField("related"));
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java b/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java
index ee1d3d5defc..5739ed944ca 100644
--- a/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java
@@ -9,7 +9,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 public class AuthorListParameterTest {
 
     private static Stream<Arguments> data() {
diff --git a/src/test/java/org/jabref/model/entry/AuthorListTest.java b/src/test/java/org/jabref/model/entry/AuthorListTest.java
index d5856c04165..0916af571f0 100644
--- a/src/test/java/org/jabref/model/entry/AuthorListTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorListTest.java
@@ -29,7 +29,6 @@ public void testFixAuthorNatbib() {
         assertTrue(AuthorList
                 .fixAuthorNatbib("John von Neumann and John Smith and Black Brown, Peter").equals(AuthorList
                         .fixAuthorNatbib("John von Neumann and John Smith and Black Brown, Peter")));
-
     }
 
     @Test
@@ -55,8 +54,8 @@ public void testFixAuthorFirstNameFirstCommas() {
         // Check caching
         assertTrue(AuthorList.fixAuthorFirstNameFirstCommas(
                 "John von Neumann and John Smith and Black Brown, Peter", true, false).equals(
-                        AuthorList
-                                .fixAuthorFirstNameFirstCommas("John von Neumann and John Smith and Black Brown, Peter", true, false)));
+                AuthorList
+                        .fixAuthorFirstNameFirstCommas("John von Neumann and John Smith and Black Brown, Peter", true, false)));
 
         assertEquals("John Smith and Peter Black Brown", AuthorList
                 .fixAuthorFirstNameFirstCommas("John Smith and Black Brown, Peter", false, false));
@@ -86,8 +85,8 @@ public void testFixAuthorFirstNameFirstCommas() {
         // Check caching
         assertTrue(AuthorList.fixAuthorFirstNameFirstCommas(
                 "John von Neumann and John Smith and Black Brown, Peter", true, true).equals(
-                        AuthorList
-                                .fixAuthorFirstNameFirstCommas("John von Neumann and John Smith and Black Brown, Peter", true, true)));
+                AuthorList
+                        .fixAuthorFirstNameFirstCommas("John von Neumann and John Smith and Black Brown, Peter", true, true)));
 
         assertEquals("John Smith and Peter Black Brown", AuthorList
                 .fixAuthorFirstNameFirstCommas("John Smith and Black Brown, Peter", false, true));
@@ -105,7 +104,6 @@ public void testFixAuthorFirstNameFirstCommas() {
 
         assertEquals("J. P. von Neumann", AuthorList.fixAuthorFirstNameFirstCommas(
                 "John Peter von Neumann", true, true));
-
     }
 
     @Test
@@ -125,7 +123,6 @@ public void testFixAuthorFirstNameFirst() {
         assertTrue(AuthorList
                 .fixAuthorFirstNameFirst("John von Neumann and John Smith and Black Brown, Peter").equals(AuthorList
                         .fixAuthorFirstNameFirst("John von Neumann and John Smith and Black Brown, Peter")));
-
     }
 
     @Test
@@ -230,8 +227,8 @@ public void testFixAuthorLastNameFirst() {
 
         assertTrue(AuthorList.fixAuthorLastNameFirst(
                 "John von Neumann and John Smith and Black Brown, Peter", false).equals(
-                        AuthorList
-                                .fixAuthorLastNameFirst("John von Neumann and John Smith and Black Brown, Peter", false)));
+                AuthorList
+                        .fixAuthorLastNameFirst("John von Neumann and John Smith and Black Brown, Peter", false)));
 
         // Test Abbreviate == true
         assertEquals("Smith, J.", AuthorList.fixAuthorLastNameFirst("John Smith", true));
@@ -248,9 +245,8 @@ public void testFixAuthorLastNameFirst() {
 
         assertTrue(AuthorList.fixAuthorLastNameFirst(
                 "John von Neumann and John Smith and Black Brown, Peter", true).equals(
-                        AuthorList
-                                .fixAuthorLastNameFirst("John von Neumann and John Smith and Black Brown, Peter", true)));
-
+                AuthorList
+                        .fixAuthorLastNameFirst("John von Neumann and John Smith and Black Brown, Peter", true)));
     }
 
     @Test
@@ -263,8 +259,8 @@ public void testFixAuthorLastNameOnlyCommas() {
 
         assertTrue(AuthorList.fixAuthorLastNameOnlyCommas(
                 "John von Neumann and John Smith and Black Brown, Peter", false).equals(
-                        AuthorList
-                                .fixAuthorLastNameOnlyCommas("John von Neumann and John Smith and Black Brown, Peter", false)));
+                AuthorList
+                        .fixAuthorLastNameOnlyCommas("John von Neumann and John Smith and Black Brown, Peter", false)));
 
         assertEquals("von Neumann, Smith and Black Brown", AuthorList
                 .fixAuthorLastNameOnlyCommas(
@@ -276,8 +272,8 @@ public void testFixAuthorLastNameOnlyCommas() {
 
         assertTrue(AuthorList.fixAuthorLastNameOnlyCommas(
                 "John von Neumann and John Smith and Black Brown, Peter", true).equals(
-                        AuthorList
-                                .fixAuthorLastNameOnlyCommas("John von Neumann and John Smith and Black Brown, Peter", true)));
+                AuthorList
+                        .fixAuthorLastNameOnlyCommas("John von Neumann and John Smith and Black Brown, Peter", true)));
 
         assertEquals("von Neumann, Smith, and Black Brown", AuthorList
                 .fixAuthorLastNameOnlyCommas(
@@ -365,7 +361,6 @@ public void testGetAuthor() {
         assertEquals("von Neumann", author.getLastOnly());
         assertEquals("Neumann, Jr, J.", author.getNameForAlphabetization());
         assertEquals(Optional.of("von"), author.getVon());
-
     }
 
     @Test
@@ -506,7 +501,7 @@ public void testGetAuthorsLastFirstAnds() {
                 .parse("John von Neumann and John Smith and Black Brown, Peter")
                 .getAsLastFirstNamesWithAnd(false));
         assertEquals("von Last, Jr, First", AuthorList.parse("von Last, Jr ,First")
-                .getAsLastFirstNamesWithAnd(false));
+                                                      .getAsLastFirstNamesWithAnd(false));
 
         assertEquals("Smith, J.", AuthorList.parse("John Smith").getAsLastFirstNamesWithAnd(
                 true));
@@ -515,8 +510,7 @@ public void testGetAuthorsLastFirstAnds() {
         assertEquals("von Neumann, J. and Smith, J. and Black Brown, P.", AuthorList.parse(
                 "John von Neumann and John Smith and Black Brown, Peter").getAsLastFirstNamesWithAnd(true));
         assertEquals("von Last, Jr, F.", AuthorList.parse("von Last, Jr ,First")
-                .getAsLastFirstNamesWithAnd(true));
-
+                                                   .getAsLastFirstNamesWithAnd(true));
     }
 
     @Test
@@ -571,7 +565,7 @@ public void testGetAuthorsFirstFirst() {
     @Test
     public void testGetAuthorsFirstFirstAnds() {
         assertEquals("John Smith", AuthorList.parse("John Smith")
-                .getAsFirstLastNamesWithAnd());
+                                             .getAsFirstLastNamesWithAnd());
         assertEquals("John Smith and Peter Black Brown", AuthorList.parse(
                 "John Smith and Black Brown, Peter").getAsFirstLastNamesWithAnd());
         assertEquals("John von Neumann and John Smith and Peter Black Brown", AuthorList
@@ -584,11 +578,11 @@ public void testGetAuthorsFirstFirstAnds() {
     @Test
     public void testGetAuthorsForAlphabetization() {
         assertEquals("Smith, J.", AuthorList.parse("John Smith")
-                .getForAlphabetization());
+                                            .getForAlphabetization());
         assertEquals("Neumann, J.", AuthorList.parse("John von Neumann")
-                .getForAlphabetization());
+                                              .getForAlphabetization());
         assertEquals("Neumann, J.", AuthorList.parse("J. von Neumann")
-                .getForAlphabetization());
+                                              .getForAlphabetization());
         assertEquals("Neumann, J. and Smith, J. and Black Brown, Jr., P.", AuthorList
                 .parse("John von Neumann and John Smith and de Black Brown, Jr., Peter")
                 .getForAlphabetization());
@@ -677,5 +671,4 @@ public void correctNamesWithOneComma() throws Exception {
         expected = new Author("José María", "J. M.", null, "Rodriguez Fernandez", null);
         assertEquals(new AuthorList(expected), AuthorList.parse("Rodriguez Fernandez, José María"));
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/AuthorTest.java b/src/test/java/org/jabref/model/entry/AuthorTest.java
index c5c40902927..431d6798e61 100644
--- a/src/test/java/org/jabref/model/entry/AuthorTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorTest.java
@@ -35,5 +35,4 @@ public void addDotIfAbbreviationDoNotAddDot() {
         assertEquals("Moore, O. and O. Moore and Moore, O. O.",
                 Author.addDotIfAbbreviation("Moore, O. and O. Moore and Moore, O. O."));
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTest.java b/src/test/java/org/jabref/model/entry/BibEntryTest.java
index 886439451a0..5f7e95f52ac 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTest.java
@@ -131,6 +131,4 @@ public void testGetResolvedKeywords() {
 
         assertEquals(new KeywordList(new Keyword("kw"), new Keyword("kw2"), new Keyword("kw3")), actual);
     }
-
-
 }
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTests.java b/src/test/java/org/jabref/model/entry/BibEntryTests.java
index eb6b414225f..2f39ddb131c 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTests.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTests.java
@@ -36,7 +36,6 @@ public void setUp() {
         emptyEntry = new BibEntry();
         emptyEntry.setType("article");
         emptyEntry.setChanged(false);
-
     }
 
     @Test
@@ -211,7 +210,6 @@ public void getFieldOrAliasLatexFreeComplexConversionInAlias() {
     @Test
     public void setNullField() {
         assertThrows(NullPointerException.class, () -> emptyEntry.setField(null));
-
     }
 
     @Test
@@ -222,7 +220,6 @@ public void addNullKeywordThrowsNPE() {
     @Test
     public void putNullKeywordListThrowsNPE() {
         assertThrows(NullPointerException.class, () -> keywordEntry.putKeywords((KeywordList) null, ','));
-
     }
 
     @Test
@@ -410,7 +407,6 @@ public void testGroupAndSearchHits() {
         assertTrue(be.isSearchHit());
         be.setSearchHit(false);
         assertFalse(be.isSearchHit());
-
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/BibtexStringTest.java b/src/test/java/org/jabref/model/entry/BibtexStringTest.java
index 440c950394d..1341ac43b33 100644
--- a/src/test/java/org/jabref/model/entry/BibtexStringTest.java
+++ b/src/test/java/org/jabref/model/entry/BibtexStringTest.java
@@ -33,7 +33,6 @@ public void test() {
         bs2.setContent("Oscar Gustafsson");
         assertEquals("aOG", bs2.getName());
         assertEquals("Oscar Gustafsson", bs2.getContent());
-
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
index cb1a79ad172..8a3eb16d7c9 100644
--- a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
@@ -26,5 +26,4 @@ public void canonicalRepresentationWithNewlines() {
         String canonicalRepresentation = CanonicalBibtexEntry.getCanonicalRepresentation(e);
         assertEquals("@article{key,\n  abstract = {line 1\nline 2}\n}", canonicalRepresentation);
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/EntryLinkListTest.java b/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
index 77a5c71d059..e187bccd57e 100644
--- a/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
+++ b/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
@@ -13,7 +13,7 @@
 
 public class EntryLinkListTest {
 
-    private static final String key = "test";
+    private static final String KEY = "test";
 
     private BibDatabase database;
     private List<ParsedEntryLink> links;
@@ -24,7 +24,7 @@ public class EntryLinkListTest {
     @BeforeEach
     public void before() {
         database = new BibDatabase();
-        links = EntryLinkList.parse(key, database);
+        links = EntryLinkList.parse(KEY, database);
         link = links.get(0);
         source = create("source");
         target = create("target");
@@ -39,7 +39,7 @@ private BibEntry create(String citeKey) {
 
     @Test
     public void givenFieldValueAndDatabaseWhenParsingThenExpectKey() {
-        assertEquals(key, link.getKey());
+        assertEquals(KEY, link.getKey());
     }
 
     @Test
@@ -54,7 +54,7 @@ public void givenFieldValueAndDatabaseWhenParsingThenExpectEmptyLinkedEntry() {
 
     @Test
     public void givenFieldValueAndDatabaseWhenParsingThenExpectLink() {
-        ParsedEntryLink expected = new ParsedEntryLink(key, database);
+        ParsedEntryLink expected = new ParsedEntryLink(KEY, database);
         assertEquals(expected, link);
     }
 
diff --git a/src/test/java/org/jabref/model/entry/FieldNameTest.java b/src/test/java/org/jabref/model/entry/FieldNameTest.java
index ae0eb69c2d2..9220fcb86d6 100644
--- a/src/test/java/org/jabref/model/entry/FieldNameTest.java
+++ b/src/test/java/org/jabref/model/entry/FieldNameTest.java
@@ -15,5 +15,4 @@ public void testOrFieldsTwoTerms() {
     public void testOrFieldsThreeTerms() {
         assertEquals("aaa/bbb/ccc", FieldName.orFields("aaa", "bbb", "ccc"));
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java b/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java
index d9b6fb0f1e7..84aba43fcbf 100644
--- a/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java
+++ b/src/test/java/org/jabref/model/entry/FileFieldWriterTest.java
@@ -103,10 +103,10 @@ public void testQuoteNull() {
 
     @Test
     public void testEncodeStringArray() {
-        assertEquals("a:b;c:d", FileFieldWriter.encodeStringArray(new String[][] {{"a", "b"}, {"c", "d"}}));
-        assertEquals("a:;c:d", FileFieldWriter.encodeStringArray(new String[][] {{"a", ""}, {"c", "d"}}));
-        assertEquals("a:" + null + ";c:d", FileFieldWriter.encodeStringArray(new String[][] {{"a", null}, {"c", "d"}}));
-        assertEquals("a:\\:b;c\\;:d", FileFieldWriter.encodeStringArray(new String[][] {{"a", ":b"}, {"c;", "d"}}));
+        assertEquals("a:b;c:d", FileFieldWriter.encodeStringArray(new String[][]{{"a", "b"}, {"c", "d"}}));
+        assertEquals("a:;c:d", FileFieldWriter.encodeStringArray(new String[][]{{"a", ""}, {"c", "d"}}));
+        assertEquals("a:" + null + ";c:d", FileFieldWriter.encodeStringArray(new String[][]{{"a", null}, {"c", "d"}}));
+        assertEquals("a:\\:b;c\\;:d", FileFieldWriter.encodeStringArray(new String[][]{{"a", ":b"}, {"c;", "d"}}));
     }
 
     @Test
@@ -114,6 +114,4 @@ public void testFileFieldWriterGetStringRepresentation() {
         LinkedFile file = new LinkedFile("test", "X:\\Users\\abc.pdf", "PDF");
         assertEquals("test:X\\:/Users/abc.pdf:PDF", FileFieldWriter.getStringRepresentation(file));
     }
-
-
 }
diff --git a/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java b/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java
index 6d87b4bfcfb..dfeb26bf53f 100644
--- a/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java
+++ b/src/test/java/org/jabref/model/entry/IEEETranEntryTypesTest.java
@@ -16,5 +16,4 @@ public void ctlTypeContainsYesNoFields() {
 
         assertTrue(ctlFields.containsAll(ynFields));
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/IdGeneratorTest.java b/src/test/java/org/jabref/model/entry/IdGeneratorTest.java
index f49e00b11c1..2775dd19590 100644
--- a/src/test/java/org/jabref/model/entry/IdGeneratorTest.java
+++ b/src/test/java/org/jabref/model/entry/IdGeneratorTest.java
@@ -17,7 +17,5 @@ public void testCreateNeutralId() {
             assertFalse(set.contains(string));
             set.add(string);
         }
-
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/KeywordListTest.java b/src/test/java/org/jabref/model/entry/KeywordListTest.java
index bb24fb66c68..6dbb9b08db5 100644
--- a/src/test/java/org/jabref/model/entry/KeywordListTest.java
+++ b/src/test/java/org/jabref/model/entry/KeywordListTest.java
@@ -88,5 +88,4 @@ public void parseTwoHierarchicalChains() throws Exception {
         assertEquals(new KeywordList(expectedOne, expectedTwo),
                 KeywordList.parse("Parent1 > Node1 > Child1, Parent2 > Node2 > Child2", ',', '>'));
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/MonthTest.java b/src/test/java/org/jabref/model/entry/MonthTest.java
index d99b7c3c472..20914aabc44 100644
--- a/src/test/java/org/jabref/model/entry/MonthTest.java
+++ b/src/test/java/org/jabref/model/entry/MonthTest.java
@@ -137,7 +137,7 @@ public void parseCorrectlyByFullNameGerman() {
 
     @Test
     public void parseCorrectlyByShortNameGermanLowercase() {
-    	assertEquals(Optional.of(Month.JANUARY), Month.parse("jan"));
+        assertEquals(Optional.of(Month.JANUARY), Month.parse("jan"));
         assertEquals(Optional.of(Month.FEBRUARY), Month.parse("feb"));
         assertEquals(Optional.of(Month.MARCH), Month.parse("mär"));
         assertEquals(Optional.of(Month.MARCH), Month.parse("mae"));
diff --git a/src/test/java/org/jabref/model/entry/identifier/DOITest.java b/src/test/java/org/jabref/model/entry/identifier/DOITest.java
index e1e8636c1f1..4d45bb239cf 100644
--- a/src/test/java/org/jabref/model/entry/identifier/DOITest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/DOITest.java
@@ -148,7 +148,5 @@ public void noDOIFoundInsideArbitraryText() {
     public void parseDOIWithWhiteSpace() {
         String doiWithSpace = "https : / / doi.org / 10 .1109 /V LHCC.20 04.20";
         assertEquals("https://doi.org/10.1109/VLHCC.2004.20", DOI.parse(doiWithSpace).get().getURIAsASCIIString());
-
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java b/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java
index acd4d4149fe..55dcfe847ca 100644
--- a/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java
@@ -70,5 +70,4 @@ public void testIsIsbn13Correct() {
     public void testIsIsbn13Incorrect() {
         assertFalse(new ISBN("0-123456-47-9").isIsbn13());
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java b/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java
index 23cff29c279..9036c7bffe2 100644
--- a/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java
+++ b/src/test/java/org/jabref/model/entry/specialfields/SpecialFieldTest.java
@@ -10,7 +10,6 @@
 
 public class SpecialFieldTest {
 
-
     @Test
     public void getSpecialFieldInstanceFromFieldNameValid() {
         assertEquals(Optional.of(SpecialField.RANKING),
diff --git a/src/test/java/org/jabref/model/event/TestEventListener.java b/src/test/java/org/jabref/model/event/TestEventListener.java
index 7619adb51a8..c8e3b2cd1d5 100644
--- a/src/test/java/org/jabref/model/event/TestEventListener.java
+++ b/src/test/java/org/jabref/model/event/TestEventListener.java
@@ -11,7 +11,6 @@ public class TestEventListener {
 
     private BibEntry bibEntry;
 
-
     @Subscribe
     public void listen(EntryAddedEvent event) {
         this.bibEntry = event.getBibEntry();
@@ -30,5 +29,4 @@ public void listen(EntryChangedEvent event) {
     public BibEntry getBibEntry() {
         return this.bibEntry;
     }
-
 }
diff --git a/src/test/java/org/jabref/model/groups/SearchGroupTest.java b/src/test/java/org/jabref/model/groups/SearchGroupTest.java
index 24849ff6e8a..bdc24d22b56 100644
--- a/src/test/java/org/jabref/model/groups/SearchGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/SearchGroupTest.java
@@ -8,7 +8,6 @@
 
 public class SearchGroupTest {
 
-
     @Test
     public void containsFindsWordWithRegularExpression() {
         SearchGroup group = new SearchGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, "anyfield=rev*", true, true);
diff --git a/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java b/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
index a96aa095835..4d907144d4c 100644
--- a/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
+++ b/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
@@ -8,7 +8,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
 public class FileAnnotationTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java b/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java
index acd7e385b6b..be77c6773e3 100644
--- a/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java
+++ b/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java
@@ -8,7 +8,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
 public class MatcherSetsTest {
 
     @Test
@@ -46,5 +45,4 @@ public void testBuildNotWithFalse() {
         NotMatcher matcher = new NotMatcher(new MockSearchMatcher(false));
         assertTrue(matcher.isMatch(new BibEntry()));
     }
-
 }
diff --git a/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java b/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java
index a31483330f4..b60ec5ebc83 100644
--- a/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java
+++ b/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java
@@ -40,7 +40,6 @@ public void testBasicSearchParsing() {
         assertEquals(false, bsCaseInsensitive.applyRule(query, be));
         assertEquals(false, bsCaseSensitiveRegexp.applyRule(query, be));
         assertEquals(true, bsCaseInsensitiveRegexp.applyRule(query, be));
-
     }
 
     public BibEntry makeBibtexEntry() {
diff --git a/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java b/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java
index c75ee11dc4b..732f4114f5f 100644
--- a/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java
+++ b/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java
@@ -11,10 +11,9 @@ public class SentenceAnalyzerTest {
 
     @Test
     public void testGetWords() {
-        assertEquals(Arrays.asList("a","b"), new SentenceAnalyzer("a b").getWords());
-        assertEquals(Arrays.asList("a","b"), new SentenceAnalyzer(" a b ").getWords());
+        assertEquals(Arrays.asList("a", "b"), new SentenceAnalyzer("a b").getWords());
+        assertEquals(Arrays.asList("a", "b"), new SentenceAnalyzer(" a b ").getWords());
         assertEquals(Collections.singletonList("b "), new SentenceAnalyzer("\"b \" ").getWords());
         assertEquals(Collections.singletonList(" a"), new SentenceAnalyzer(" \\ a").getWords());
     }
-
 }
diff --git a/src/test/java/org/jabref/model/strings/StringUtilTest.java b/src/test/java/org/jabref/model/strings/StringUtilTest.java
index 19872c9d294..383b97c1cc0 100644
--- a/src/test/java/org/jabref/model/strings/StringUtilTest.java
+++ b/src/test/java/org/jabref/model/strings/StringUtilTest.java
@@ -57,7 +57,6 @@ void testQuoteMoreComplicated() {
         assertEquals("a::b:%c:;", StringUtil.quote("a:b%c;", "%;", ':'));
     }
 
-
     @Test
     void testUnifyLineBreaks() {
         // Mac < v9
@@ -129,7 +128,7 @@ void testJoin() {
 
         assertEquals("", StringUtil.join(s, "\\", 3, s.length));
 
-        assertEquals("", StringUtil.join(new String[] {}, "\\", 0, 0));
+        assertEquals("", StringUtil.join(new String[]{}, "\\", 0, 0));
     }
 
     @Test
@@ -192,7 +191,6 @@ void testIsInCurlyBrackets() {
         assertFalse(StringUtil.isInCurlyBrackets("}"));
         assertFalse(StringUtil.isInCurlyBrackets("a{}a"));
         assertFalse(StringUtil.isInCurlyBrackets("{\\AA}sa {\\AA}Stor{\\aa}"));
-
     }
 
     @Test
diff --git a/src/test/java/org/jabref/performance/BibtexEntryGenerator.java b/src/test/java/org/jabref/performance/BibtexEntryGenerator.java
index 676e008ccd6..f69932fe26a 100644
--- a/src/test/java/org/jabref/performance/BibtexEntryGenerator.java
+++ b/src/test/java/org/jabref/performance/BibtexEntryGenerator.java
@@ -23,5 +23,4 @@ private String generateBibtexEntry(int i) {
                 "  publisher={Wiley Online Library}\n" +
                 "}\n";
     }
-
 }
diff --git a/src/test/java/org/jabref/support/CIServerCondition.java b/src/test/java/org/jabref/support/CIServerCondition.java
index cc7ad59251c..3aa8812a3fe 100644
--- a/src/test/java/org/jabref/support/CIServerCondition.java
+++ b/src/test/java/org/jabref/support/CIServerCondition.java
@@ -34,8 +34,8 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
         Optional<DisabledOnCIServer> disabled = AnnotationUtils.findAnnotation(element, DisabledOnCIServer.class);
         if (disabled.isPresent()) {
             String reason = disabled.map(DisabledOnCIServer::value)
-                    .filter(StringUtil::isNotBlank)
-                    .orElseGet(() -> element.get() + " is disabled on CI server");
+                                    .filter(StringUtil::isNotBlank)
+                                    .orElseGet(() -> element.get() + " is disabled on CI server");
             return ConditionEvaluationResult.disabled(reason);
         }
 
diff --git a/src/test/java/org/jabref/testutils/TestUtils.java b/src/test/java/org/jabref/testutils/TestUtils.java
index 83120f4c62c..3c03bfa2714 100644
--- a/src/test/java/org/jabref/testutils/TestUtils.java
+++ b/src/test/java/org/jabref/testutils/TestUtils.java
@@ -8,8 +8,7 @@ public class TestUtils {
     private static final String PATH_TO_TEST_BIBTEX = "src/test/resources/org/jabref/bibtexFiles/test.bib";
 
     /**
-     * Initialize JabRef. Can be cleaned up with
-     * {@link TestUtils#closeJabRef()}
+     * Initialize JabRef. Can be cleaned up with {@link TestUtils#closeJabRef()}
      *
      * @see TestUtils#closeJabRef()
      */
@@ -25,5 +24,4 @@ public static void closeJabRef() {
         if (JabRefGUI.getMainFrame() != null) {
         }
     }
-
 }

From 4893461482d8d04a8d71310d73c3a870dc042f76 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 17 Oct 2018 12:31:34 +0200
Subject: [PATCH 113/229] Convert find unlinked files dialog to JavaFX (#4375)

* Convert find unlinked files dialog to JavaFX

Fixes #4357.

* Fix tests

* Fix checkstyle

* Fix checkstyle

* Remove obsolete language keys
---
 .../jabref/gui/FindUnlinkedFilesDialog.java   | 1226 -----------------
 src/main/java/org/jabref/gui/JabRefFrame.java |    2 +-
 .../FindUnlinkedFilesAction.java              |    6 +-
 .../FindUnlinkedFilesDialog.java              |  440 ++++++
 .../importer/EntryFromFileCreatorManager.java |   78 +-
 .../gui/importer/UnlinkedFilesCrawler.java    |   68 +-
 .../org/jabref/gui/util/BackgroundTask.java   |   56 +-
 .../jabref/gui/util/DefaultTaskExecutor.java  |    6 +
 .../gui/util/ViewModelListCellFactory.java    |    9 +-
 .../gui/util/ViewModelTreeCellFactory.java    |   84 ++
 .../jabref/preferences/JabRefPreferences.java |    1 -
 src/main/resources/l10n/JabRef_en.properties  |    5 -
 .../EntryFromFileCreatorManagerTest.java      |   98 +-
 .../gui/importer/EntryFromPDFCreatorTest.java |    6 +-
 .../importer/DatabaseFileLookupTest.java      |   26 +-
 .../jabref/logic/importer/ImportDataTest.java |   42 +-
 16 files changed, 724 insertions(+), 1429 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
 rename src/main/java/org/jabref/gui/{actions => externalfiles}/FindUnlinkedFilesAction.java (77%)
 create mode 100644 src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
 create mode 100644 src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java

diff --git a/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java b/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
deleted file mode 100644
index e41f30dc616..00000000000
--- a/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
+++ /dev/null
@@ -1,1226 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.JRootPane;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.JTree;
-import javax.swing.KeyStroke;
-import javax.swing.SwingConstants;
-import javax.swing.WindowConstants;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.filechooser.FileSystemView;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
-
-import org.jabref.Globals;
-import org.jabref.JabRefExecutorService;
-import org.jabref.JabRefGUI;
-import org.jabref.gui.desktop.JabRefDesktop;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.importer.EntryFromFileCreator;
-import org.jabref.gui.importer.EntryFromFileCreatorManager;
-import org.jabref.gui.importer.UnlinkedFilesCrawler;
-import org.jabref.gui.importer.UnlinkedPDFFileFilter;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.DirectoryDialogConfiguration;
-import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.EntryTypes;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibtexEntryType;
-import org.jabref.model.entry.EntryType;
-import org.jabref.model.entry.FieldName;
-import org.jabref.preferences.JabRefPreferences;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * GUI Dialog for the feature "Find unlinked files".
- */
-public class FindUnlinkedFilesDialog extends JabRefDialog {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(FindUnlinkedFilesDialog.class);
-    private static final String GLOBAL_PREFS_WORKING_DIRECTORY_KEY = "findUnlinkedFilesWD";
-
-    private static final String GLOBAL_PREFS_DIALOG_SIZE_KEY = "findUnlinkedFilesDialogSize";
-    private final JabRefFrame frame;
-    private final BibDatabaseContext databaseContext;
-    private final EntryFromFileCreatorManager creatorManager;
-
-    private final UnlinkedFilesCrawler crawler;
-    private Path lastSelectedDirectory;
-
-    private TreeModel treeModel;
-    /* PANELS */
-    private JPanel panelDirectory;
-    private JPanel panelSearchArea;
-    private JPanel panelFiles;
-    private JPanel panelOptions;
-    private JPanel panelButtons;
-    private JPanel panelEntryTypesSelection;
-
-    private JPanel panelImportArea;
-    private JButton buttonBrowse;
-    private JButton buttonScan;
-    private JButton buttonExport;
-    private JButton buttonApply;
-
-    private JButton buttonClose;
-    /* Options for the TreeView */
-    private JButton buttonOptionSelectAll;
-    private JButton buttonOptionDeselectAll;
-    private JButton buttonOptionExpandAll;
-    private JButton buttonOptionCollapseAll;
-
-    private JCheckBox checkboxCreateKeywords;
-    private JTextField textfieldDirectoryPath;
-    private JLabel labelDirectoryDescription;
-    private JLabel labelFileTypesDescription;
-    private JLabel labelFilesDescription;
-    private JLabel labelEntryTypeDescription;
-    private JLabel labelSearchingDirectoryInfo;
-
-    private JLabel labelImportingInfo;
-    private JLabel labelExportingInfo;
-    private JTree tree;
-    private JScrollPane scrollpaneTree;
-    private JComboBox<FileFilter> comboBoxFileTypeSelection;
-
-    private JComboBox<BibtexEntryTypeWrapper> comboBoxEntryTypeSelection;
-    private JProgressBar progressBarSearching;
-    private JProgressBar progressBarImporting;
-
-    private MouseListener treeMouseListener;
-    private Action actionSelectAll;
-    private Action actionUnselectAll;
-    private Action actionExpandTree;
-
-    private Action actionCollapseTree;
-
-    private ComponentListener dialogPositionListener;
-    private final AtomicBoolean threadState = new AtomicBoolean();
-
-    private boolean checkBoxWhyIsThereNoGetSelectedStupidSwing;
-
-    public FindUnlinkedFilesDialog(JabRefFrame frame) {
-        super(Localization.lang("Find unlinked files"), true, FindUnlinkedFilesDialog.class);
-        this.frame = frame;
-
-        restoreSizeOfDialog();
-
-        databaseContext = frame.getCurrentBasePanel().getBibDatabaseContext();
-        creatorManager = new EntryFromFileCreatorManager(ExternalFileTypes.getInstance());
-
-        crawler = new UnlinkedFilesCrawler(databaseContext);
-
-        lastSelectedDirectory = loadLastSelectedDirectory();
-
-        initialize();
-        buttonApply.setEnabled(false);
-        buttonExport.setEnabled(false);
-    }
-
-    /**
-     * Close dialog when pressing escape
-     */
-    @Override
-    protected JRootPane createRootPane() {
-        ActionListener actionListener = actionEvent -> setVisible(false);
-        JRootPane rPane = new JRootPane();
-        KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
-        rPane.registerKeyboardAction(actionListener, stroke, JComponent.WHEN_IN_FOCUSED_WINDOW);
-
-        return rPane;
-    }
-
-    /**
-     * Stores the current size of this dialog persistently.
-     */
-    private void storeSizeOfDialog() {
-        Dimension dim = getSize();
-        String store = dim.width + ";" + dim.height;
-        Globals.prefs.put(FindUnlinkedFilesDialog.GLOBAL_PREFS_DIALOG_SIZE_KEY, store);
-    }
-
-    /**
-     * Restores the location and size of this dialog from the persistent storage.
-     */
-    private void restoreSizeOfDialog() {
-
-        String store = Globals.prefs.get(FindUnlinkedFilesDialog.GLOBAL_PREFS_DIALOG_SIZE_KEY);
-
-        Dimension dimension = null;
-
-        if (store != null) {
-            try {
-                String[] dim = store.split(";");
-                dimension = new Dimension(Integer.valueOf(dim[0]), Integer.valueOf(dim[1]));
-            } catch (NumberFormatException ignoredEx) {
-                LOGGER.debug("RestoreSizeDialog Exception ", ignoredEx);
-            }
-        }
-        if (dimension != null) {
-            setPreferredSize(dimension);
-        }
-    }
-
-    /**
-     * Initializes the components, the layout, the data structure and the
-     * actions in this dialog.
-     */
-    private void initialize() {
-
-        initializeActions();
-        initComponents();
-        createTree();
-        createFileTypesCombobox();
-        createEntryTypesCombobox();
-        initLayout();
-        setupActions();
-        pack();
-    }
-
-    /**
-     * Initializes action objects. <br>
-     * Does not assign actions to components yet!
-     */
-    private void initializeActions() {
-
-        actionSelectAll = new AbstractAction(Localization.lang("Select all")) {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                CheckableTreeNode rootNode = (CheckableTreeNode) tree.getModel().getRoot();
-                rootNode.setSelected(true);
-                tree.invalidate();
-                tree.repaint();
-            }
-        };
-
-        actionUnselectAll = new AbstractAction(Localization.lang("Unselect all")) {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                CheckableTreeNode rootNode = (CheckableTreeNode) tree.getModel().getRoot();
-                rootNode.setSelected(false);
-                tree.invalidate();
-                tree.repaint();
-            }
-        };
-
-        actionExpandTree = new AbstractAction(Localization.lang("Expand all")) {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                CheckableTreeNode rootNode = (CheckableTreeNode) tree.getModel().getRoot();
-                expandTree(tree, new TreePath(rootNode), true);
-            }
-        };
-
-        actionCollapseTree = new AbstractAction(Localization.lang("Collapse all")) {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                CheckableTreeNode rootNode = (CheckableTreeNode) tree.getModel().getRoot();
-                expandTree(tree, new TreePath(rootNode), false);
-            }
-        };
-
-        dialogPositionListener = new ComponentAdapter() {
-
-            /* (non-Javadoc)
-             * @see java.awt.event.ComponentAdapter#componentResized(java.awt.event.ComponentEvent)
-             */
-            @Override
-            public void componentResized(ComponentEvent e) {
-                storeSizeOfDialog();
-            }
-
-            /* (non-Javadoc)
-             * @see java.awt.event.ComponentAdapter#componentMoved(java.awt.event.ComponentEvent)
-             */
-            @Override
-            public void componentMoved(ComponentEvent e) {
-                storeSizeOfDialog();
-            }
-        };
-
-    }
-
-    /**
-     * Stores the working directory path for this view in the global
-     * preferences.
-     *
-     * @param lastSelectedDir
-     *            directory that is used as the working directory in this view.
-     */
-    private void storeLastSelectedDirectory(Path lastSelectedDir) {
-        lastSelectedDirectory = lastSelectedDir;
-        if (lastSelectedDirectory != null) {
-            Globals.prefs.put(FindUnlinkedFilesDialog.GLOBAL_PREFS_WORKING_DIRECTORY_KEY,
-                    lastSelectedDirectory.toAbsolutePath().toString());
-        }
-    }
-
-    /**
-     * Loads the working directory path which is persistantly stored for this
-     * view and returns it as a {@link File}-Object. <br>
-     * <br>
-     * If there is no working directory path stored, the general working
-     * directory will be consulted.
-     *
-     * @return The persistently stored working directory path for this view.
-     */
-    private Path loadLastSelectedDirectory() {
-        String workingDirectory = Globals.prefs.get(FindUnlinkedFilesDialog.GLOBAL_PREFS_WORKING_DIRECTORY_KEY);
-        if (workingDirectory == null) {
-            workingDirectory = Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY);
-        }
-        lastSelectedDirectory = Paths.get(workingDirectory);
-
-        return lastSelectedDirectory;
-    }
-
-    /**
-     * Disables or enables all visible Elements in this Dialog. <br>
-     * <br>
-     * This also removes the {@link MouseListener} from the Tree-View to prevent
-     * it from receiving mouse events when in disabled-state.
-     *
-     * @param enable
-     *            <code>true</code> when the elements shall get enabled,
-     *            <code>false</code> when they shall get disabled.
-     */
-    private void disOrEnableDialog(boolean enable) {
-
-        if (enable) {
-            tree.addMouseListener(treeMouseListener);
-        } else {
-            tree.removeMouseListener(treeMouseListener);
-        }
-        disOrEnableAllElements(FindUnlinkedFilesDialog.this, enable);
-    }
-
-    /**
-     * Recursively disables or enables all swing and awt components in this
-     * dialog, starting with but not including the container
-     * <code>startContainer</code>.
-     *
-     * @param startContainer
-     *            The GUI Element to start with.
-     * @param enable
-     *            <code>true</code>, if all elements will get enabled,
-     *            <code>false</code> if all elements will get disabled.
-     */
-    private void disOrEnableAllElements(Container startContainer, boolean enable) {
-        Component[] children = startContainer.getComponents();
-        for (Component child : children) {
-            if (child instanceof Container) {
-                disOrEnableAllElements((Container) child, enable);
-            }
-            child.setEnabled(enable);
-        }
-    }
-
-    /**
-     * Expands or collapses the specified tree according to the
-     * <code>expand</code>-parameter.
-     */
-    private void expandTree(JTree currentTree, TreePath parent, boolean expand) {
-        TreeNode node = (TreeNode) parent.getLastPathComponent();
-        if (node.getChildCount() >= 0) {
-            for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
-                TreePath path = parent.pathByAddingChild(e.nextElement());
-                expandTree(currentTree, path, expand);
-            }
-        }
-        if (expand) {
-            currentTree.expandPath(parent);
-        } else {
-            currentTree.collapsePath(parent);
-        }
-    }
-
-    /**
-     * Starts the search of unlinked files according to the current dialog
-     * state. <br>
-     * <br>
-     * This state is made of: <br>
-     * <li>The value of the "directory"-input-textfield and <li>The file type
-     * selection. <br>
-     * The search will process in a seperate thread and the progress bar behind
-     * the "search" button will be displayed. <br>
-     * <br>
-     * When the search has completed, the
-     * {@link #searchFinishedHandler(CheckableTreeNode)} handler method is
-     * invoked.
-     */
-    private void startSearch() {
-
-        Path directory = Paths.get(textfieldDirectoryPath.getText());
-        if (Files.notExists(directory)) {
-            directory = Paths.get(System.getProperty("user.dir"));
-        }
-        if (!Files.isDirectory(directory)) {
-            directory = directory.getParent();
-        }
-
-        //this addtional statement is needed because for the lamdba the variable must be effetively final
-        Path dir = directory;
-
-        storeLastSelectedDirectory(directory);
-
-        progressBarSearching.setMinimumSize(
-                new Dimension(buttonScan.getSize().width, progressBarSearching.getMinimumSize().height));
-        progressBarSearching.setVisible(true);
-        progressBarSearching.setString("");
-
-        labelSearchingDirectoryInfo.setVisible(true);
-        buttonScan.setVisible(false);
-
-        disOrEnableDialog(false);
-        labelSearchingDirectoryInfo.setEnabled(true);
-
-        final FileFilter selectedFileFilter = (FileFilter) comboBoxFileTypeSelection.getSelectedItem();
-
-        threadState.set(true);
-        JabRefExecutorService.INSTANCE.execute(() -> {
-            UnlinkedPDFFileFilter unlinkedPDFFileFilter = new UnlinkedPDFFileFilter(selectedFileFilter,
-                    databaseContext);
-            CheckableTreeNode rootNode = crawler.searchDirectory(dir.toFile(), unlinkedPDFFileFilter, threadState,
-                    new ChangeListener() {
-
-                        int counter;
-
-                        @Override
-                        public void stateChanged(ChangeEvent e) {
-                            counter++;
-                            String message;
-                            if (counter == 1) {
-                                message = Localization.lang("One file found");
-                            } else {
-                                message = Localization.lang("%0 files found", Integer.toString(counter));
-                            }
-                            progressBarSearching.setString(message);
-                        }
-                    });
-            searchFinishedHandler(rootNode);
-        });
-
-    }
-
-    /**
-     * This will start the import of all file of all selected nodes in this
-     * dialogs tree view. <br>
-     * <br>
-     * The import itself will run in a seperate thread, whilst this dialog will
-     * be showing a progress bar, until the thread has finished its work. <br>
-     * <br>
-     * When the import has finished, the {@link #importFinishedHandler(java.util.List)} is
-     * invoked.
-     */
-    private void startImport() {
-
-        if (treeModel == null) {
-            return;
-        }
-        setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-
-        CheckableTreeNode root = (CheckableTreeNode) treeModel.getRoot();
-
-        final List<File> fileList = getFileListFromNode(root);
-
-        if ((fileList == null) || fileList.isEmpty()) {
-            return;
-        }
-
-        progressBarImporting.setVisible(true);
-        labelImportingInfo.setVisible(true);
-        buttonExport.setVisible(false);
-        buttonApply.setVisible(false);
-        buttonClose.setVisible(false);
-        disOrEnableDialog(false);
-
-        labelImportingInfo.setEnabled(true);
-
-        progressBarImporting.setMinimum(0);
-        progressBarImporting.setMaximum(fileList.size());
-        progressBarImporting.setValue(0);
-        progressBarImporting.setString("");
-
-        final EntryType entryType = ((BibtexEntryTypeWrapper) comboBoxEntryTypeSelection.getSelectedItem())
-                .getEntryType();
-
-        threadState.set(true);
-        JabRefExecutorService.INSTANCE.execute(() -> {
-            List<String> errors = new LinkedList<>();
-            creatorManager.addEntriesFromFiles(fileList, databaseContext.getDatabase(), frame.getCurrentBasePanel(),
-                    entryType, checkBoxWhyIsThereNoGetSelectedStupidSwing, new ChangeListener() {
-
-                        int counter;
-
-                        @Override
-                        public void stateChanged(ChangeEvent e) {
-                            counter++;
-                            progressBarImporting.setValue(counter);
-                            progressBarImporting.setString(Localization.lang("%0 of %1", Integer.toString(counter),
-                                    Integer.toString(progressBarImporting.getMaximum())));
-                        }
-                    }, errors);
-            importFinishedHandler(errors);
-        });
-    }
-
-    /**
-     * This starts the export of all files of all selected nodes in this
-     * dialogs tree view. <br>
-     * <br>
-     * The export itself will run in a seperate thread, whilst this dialog will
-     * be showing a progress bar, until the thread has finished its work. <br>
-     * <br>
-     * When the export has finished, the {@link #exportFinishedHandler()} is
-     * invoked.
-     */
-    private void startExport() {
-        if (treeModel == null) {
-            return;
-        }
-        setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-
-        CheckableTreeNode root = (CheckableTreeNode) treeModel.getRoot();
-
-        final List<File> fileList = getFileListFromNode(root);
-        if ((fileList == null) || fileList.isEmpty()) {
-            return;
-        }
-
-        buttonExport.setVisible(false);
-        buttonApply.setVisible(false);
-        buttonClose.setVisible(false);
-        disOrEnableDialog(false);
-
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
-        DialogService ds = new FXDialogService();
-
-        Optional<Path> exportPath = DefaultTaskExecutor
-                .runInJavaFXThread(() -> ds.showFileSaveDialog(fileDialogConfiguration));
-
-        if (!exportPath.isPresent()) {
-            exportFinishedHandler();
-            return;
-        }
-
-        threadState.set(true);
-        JabRefExecutorService.INSTANCE.execute(() -> {
-            try (BufferedWriter writer =
-                         Files.newBufferedWriter(exportPath.get(), StandardCharsets.UTF_8,
-                                 StandardOpenOption.CREATE)) {
-                for (File file : fileList) {
-                    writer.write(file.toString() + "\n");
-                }
-
-            } catch (IOException e) {
-                LOGGER.warn("IO Error.", e);
-            }
-        });
-
-        exportFinishedHandler();
-    }
-
-    private void exportFinishedHandler() {
-        buttonExport.setVisible(true);
-        buttonApply.setVisible(true);
-        buttonClose.setVisible(true);
-        disOrEnableDialog(true);
-        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.getCurrentBasePanel().markBaseChanged();
-    }
-
-    /**
-     *
-     * @param errors
-     */
-    private void importFinishedHandler(List<String> errors) {
-
-        if ((errors != null) && !errors.isEmpty()) {
-            String message;
-            if (errors.size() == 1) {
-                message = Localization.lang("There was one file that could not be imported.");
-            } else {
-                message = Localization.lang("There were %0 files which could not be imported.",
-                        Integer.toString(errors.size()));
-            }
-            JOptionPane.showMessageDialog(this,
-                    Localization.lang("The import finished with warnings:") + "\n" + message,
-                    Localization.lang("Warning"), JOptionPane.WARNING_MESSAGE);
-        }
-
-        progressBarImporting.setVisible(false);
-        labelImportingInfo.setVisible(false);
-        buttonExport.setVisible(true);
-        buttonApply.setVisible(true);
-        buttonClose.setVisible(true);
-        disOrEnableDialog(true);
-        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.getCurrentBasePanel().markBaseChanged();
-    }
-
-    /**
-     * Will be called from the Thread in which the "unlinked files search" is
-     * processed. As the result of the search, the root node of the determined
-     * file structure is passed.
-     *
-     * @param rootNode
-     *            The root of the file structure as the result of the search.
-     */
-    private void searchFinishedHandler(CheckableTreeNode rootNode) {
-        treeModel = new DefaultTreeModel(rootNode);
-        tree.setModel(treeModel);
-        tree.setRootVisible(rootNode.getChildCount() > 0);
-
-        tree.invalidate();
-        tree.repaint();
-
-        progressBarSearching.setVisible(false);
-        labelSearchingDirectoryInfo.setVisible(false);
-        buttonScan.setVisible(true);
-        actionSelectAll.actionPerformed(null);
-
-        disOrEnableDialog(true);
-        buttonApply.setEnabled(true);
-        buttonExport.setEnabled(true);
-    }
-
-    /**
-     * Sets up the actions for the components.
-     */
-    private void setupActions() {
-
-        DirectoryDialogConfiguration directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
-        DialogService ds = frame.getDialogService();
-        /**
-         * Stores the selected directory.
-         */
-        buttonBrowse.addActionListener(e -> {
-            Optional<Path> selectedDirectory = DefaultTaskExecutor
-                    .runInJavaFXThread(() -> ds.showDirectorySelectionDialog(directoryDialogConfiguration));
-            selectedDirectory.ifPresent(d -> {
-                textfieldDirectoryPath.setText(d.toAbsolutePath().toString());
-                storeLastSelectedDirectory(d);
-            });
-        });
-
-        buttonScan.addActionListener(e -> startSearch());
-
-        /**
-         * Action for the button "Import...". <br>
-         * <br>
-         * Actions on this button will start the import of all file of all
-         * selected nodes in this dialogs tree view. <br>
-         */
-        buttonExport.addActionListener(e -> startExport());
-        buttonApply.addActionListener(e -> startImport());
-        buttonClose.addActionListener(e -> dispose());
-    }
-
-    /**
-     * Creates a list of {@link File}s for all leaf nodes in the tree structure
-     * <code>node</code>, which have been marked as <i>selected</i>. <br>
-     * <br>
-     * <code>Selected</code> nodes correspond to those entries in the tree,
-     * whose checkbox is <code>checked</code>.
-     *
-     * SIDE EFFECT: The checked nodes are removed from the tree.
-     *
-     * @param node
-     *            The root node representing a tree structure.
-     * @return A list of files of all checked leaf nodes.
-     */
-    private List<File> getFileListFromNode(CheckableTreeNode node) {
-        List<File> filesList = new ArrayList<>();
-        Enumeration<CheckableTreeNode> children = node.depthFirstEnumeration();
-        List<CheckableTreeNode> nodesToRemove = new ArrayList<>();
-        for (CheckableTreeNode child : Collections.list(children)) {
-            if (child.isLeaf() && child.isSelected()) {
-                File nodeFile = ((FileNodeWrapper) child.getUserObject()).file;
-                if ((nodeFile != null) && nodeFile.isFile()) {
-                    filesList.add(nodeFile);
-                    nodesToRemove.add(child);
-                }
-            }
-        }
-
-        // remove imported files from tree
-        DefaultTreeModel model = (DefaultTreeModel) tree.getModel();
-        for (CheckableTreeNode nodeToRemove : nodesToRemove) {
-            DefaultMutableTreeNode parent = (DefaultMutableTreeNode) nodeToRemove.getParent();
-            model.removeNodeFromParent(nodeToRemove);
-
-            // remove empty parent node
-            while ((parent != null) && parent.isLeaf()) {
-                DefaultMutableTreeNode pp = (DefaultMutableTreeNode) parent.getParent();
-                if (pp != null) {
-                    model.removeNodeFromParent(parent);
-                }
-                parent = pp;
-            }
-            // TODO: update counter / see: getTreeCellRendererComponent for label generation
-        }
-        tree.invalidate();
-        tree.repaint();
-
-        return filesList;
-    }
-
-    /**
-     * Initializes the visible components in this dialog.
-     */
-    private void initComponents() {
-
-        this.addComponentListener(dialogPositionListener);
-        /* Interrupts the searchThread by setting the State-Array to 0 */
-        this.addWindowListener(new WindowAdapter() {
-
-            @Override
-            public void windowClosing(WindowEvent e) {
-                threadState.set(false);
-            }
-        });
-
-        panelDirectory = new JPanel();
-        panelSearchArea = new JPanel();
-        panelFiles = new JPanel();
-        panelOptions = new JPanel();
-        panelEntryTypesSelection = new JPanel();
-        panelButtons = new JPanel();
-        panelImportArea = new JPanel();
-
-        buttonBrowse = new JButton(Localization.lang("Browse"));
-        buttonBrowse.setMnemonic('B');
-        buttonBrowse.setToolTipText(Localization.lang("Opens the file browser."));
-        buttonScan = new JButton(Localization.lang("Scan directory"));
-        buttonScan.setMnemonic('S');
-        buttonScan.setToolTipText(Localization.lang("Searches the selected directory for unlinked files."));
-        buttonExport = new JButton(Localization.lang("Export"));
-        buttonExport.setMnemonic('E');
-        buttonExport.setToolTipText(Localization.lang("Export to text file."));
-        buttonApply = new JButton(Localization.lang("Apply"));
-        buttonApply.setMnemonic('I');
-        buttonApply.setToolTipText(Localization.lang("Starts the import of BibTeX entries."));
-        buttonClose = new JButton(Localization.lang("Close"));
-        buttonClose.setToolTipText(Localization.lang("Leave this dialog."));
-        buttonClose.setMnemonic('C');
-
-        /* Options for the TreeView */
-        buttonOptionSelectAll = new JButton();
-        buttonOptionSelectAll.setMnemonic('A');
-        buttonOptionSelectAll.setAction(actionSelectAll);
-        buttonOptionDeselectAll = new JButton();
-        buttonOptionDeselectAll.setMnemonic('U');
-        buttonOptionDeselectAll.setAction(actionUnselectAll);
-        buttonOptionExpandAll = new JButton();
-        buttonOptionExpandAll.setMnemonic('E');
-        buttonOptionExpandAll.setAction(actionExpandTree);
-        buttonOptionCollapseAll = new JButton();
-        buttonOptionCollapseAll.setMnemonic('L');
-        buttonOptionCollapseAll.setAction(actionCollapseTree);
-
-        checkboxCreateKeywords = new JCheckBox(Localization.lang("Create directory based keywords"));
-        checkboxCreateKeywords
-                .setToolTipText(Localization.lang("Creates keywords in created entrys with directory pathnames"));
-        checkboxCreateKeywords.setSelected(checkBoxWhyIsThereNoGetSelectedStupidSwing);
-        checkboxCreateKeywords.addItemListener(
-                e -> checkBoxWhyIsThereNoGetSelectedStupidSwing = !checkBoxWhyIsThereNoGetSelectedStupidSwing);
-
-        textfieldDirectoryPath = new JTextField();
-        textfieldDirectoryPath
-                .setText(lastSelectedDirectory == null ? "" : lastSelectedDirectory.toAbsolutePath().toString());
-
-        labelDirectoryDescription = new JLabel(Localization.lang("Select a directory where the search shall start."));
-        labelFileTypesDescription = new JLabel(Localization.lang("Select file type:"));
-        labelFilesDescription = new JLabel(Localization.lang("These files are not linked in the active library."));
-        labelEntryTypeDescription = new JLabel(Localization.lang("Entry type to be created:"));
-        labelSearchingDirectoryInfo = new JLabel(Localization.lang("Searching file system..."));
-        labelSearchingDirectoryInfo.setHorizontalAlignment(SwingConstants.CENTER);
-        labelSearchingDirectoryInfo.setVisible(false);
-        labelImportingInfo = new JLabel(Localization.lang("Importing into Library..."));
-        labelImportingInfo.setHorizontalAlignment(SwingConstants.CENTER);
-        labelImportingInfo.setVisible(false);
-        labelExportingInfo = new JLabel(Localization.lang("Exporting into file..."));
-        labelExportingInfo.setHorizontalAlignment(SwingConstants.CENTER);
-        labelExportingInfo.setVisible(false);
-
-        tree = new JTree();
-
-        scrollpaneTree = new JScrollPane(tree);
-        scrollpaneTree.setWheelScrollingEnabled(true);
-
-        progressBarSearching = new JProgressBar();
-        progressBarSearching.setIndeterminate(true);
-        progressBarSearching.setVisible(false);
-        progressBarSearching.setStringPainted(true);
-
-        progressBarImporting = new JProgressBar();
-        progressBarImporting.setIndeterminate(false);
-        progressBarImporting.setVisible(false);
-        progressBarImporting.setStringPainted(true);
-
-    }
-
-    /**
-     * Initializes the layout for the visible components in this menu. A
-     * {@link GridBagLayout} is used.
-     */
-    private void initLayout() {
-
-        GridBagLayout gbl = new GridBagLayout();
-
-        panelDirectory.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
-                Localization.lang("Select directory")));
-        panelFiles.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
-                Localization.lang("Select files")));
-        panelEntryTypesSelection.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
-                Localization.lang("BibTeX entry creation")));
-
-        Insets basicInsets = new Insets(6, 6, 6, 6);
-        Insets smallInsets = new Insets(3, 2, 3, 1);
-        Insets noInsets = new Insets(0, 0, 0, 0);
-
-        // 		x, y, w, h, wx,wy,ix,iy
-        FindUnlinkedFilesDialog.addComponent(gbl, panelSearchArea, buttonScan, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.EAST, noInsets, 0, 1, 1, 1, 1, 1, 40, 10);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelSearchArea, labelSearchingDirectoryInfo,
-                GridBagConstraints.HORIZONTAL, GridBagConstraints.EAST, noInsets, 0, 2, 1, 1, 0, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelSearchArea, progressBarSearching, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.EAST, noInsets, 0, 3, 1, 1, 0, 0, 0, 0);
-
-        FindUnlinkedFilesDialog.addComponent(gbl, panelDirectory, labelDirectoryDescription, null,
-                GridBagConstraints.WEST, new Insets(6, 6, 0, 6), 0, 0, 3, 1, 0, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelDirectory, textfieldDirectoryPath, GridBagConstraints.HORIZONTAL,
-                null, basicInsets, 0, 1, 2, 1, 1, 1, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelDirectory, buttonBrowse, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.EAST, basicInsets, 2, 1, 1, 1, 0, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelDirectory, labelFileTypesDescription, GridBagConstraints.NONE,
-                GridBagConstraints.WEST, new Insets(18, 6, 18, 3), 0, 3, 1, 1, 0, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelDirectory, comboBoxFileTypeSelection,
-                GridBagConstraints.HORIZONTAL, GridBagConstraints.WEST, new Insets(18, 3, 18, 6), 1, 3, 1, 1, 1, 0, 0,
-                0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelDirectory, panelSearchArea, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.EAST, new Insets(18, 6, 18, 6), 2, 3, 1, 1, 0, 0, 0, 0);
-
-        FindUnlinkedFilesDialog.addComponent(gbl, panelFiles, labelFilesDescription, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.WEST, new Insets(6, 6, 0, 6), 0, 0, 1, 1, 0, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelFiles, scrollpaneTree, GridBagConstraints.BOTH,
-                GridBagConstraints.CENTER, basicInsets, 0, 1, 1, 1, 1, 1, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelFiles, panelOptions, GridBagConstraints.NONE,
-                GridBagConstraints.NORTHEAST, basicInsets, 1, 1, 1, 1, 0, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelOptions, buttonOptionSelectAll, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.NORTH, noInsets, 0, 0, 1, 1, 1, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelOptions, buttonOptionDeselectAll, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.NORTH, noInsets, 0, 1, 1, 1, 0, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelOptions, buttonOptionExpandAll, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.NORTH, new Insets(6, 0, 0, 0), 0, 2, 1, 1, 0, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelOptions, buttonOptionCollapseAll, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.NORTH, noInsets, 0, 3, 1, 1, 0, 0, 0, 0);
-
-        FindUnlinkedFilesDialog.addComponent(gbl, panelEntryTypesSelection, labelEntryTypeDescription,
-                GridBagConstraints.NONE, GridBagConstraints.WEST, basicInsets, 0, 0, 1, 1, 0, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelEntryTypesSelection, comboBoxEntryTypeSelection,
-                GridBagConstraints.NONE, GridBagConstraints.WEST, basicInsets, 1, 0, 1, 1, 1, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelEntryTypesSelection, checkboxCreateKeywords,
-                GridBagConstraints.HORIZONTAL, GridBagConstraints.WEST, basicInsets, 0, 1, 2, 1, 0, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelImportArea, labelImportingInfo, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.CENTER, new Insets(6, 6, 0, 6), 0, 1, 1, 1, 1, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelImportArea, labelExportingInfo, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.CENTER, new Insets(6, 6, 0, 6), 0, 1, 1, 1, 1, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelImportArea, progressBarImporting, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.CENTER, new Insets(0, 6, 6, 6), 0, 2, 1, 1, 1, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, panelButtons, panelImportArea, GridBagConstraints.NONE,
-                GridBagConstraints.EAST, smallInsets, 1, 0, 1, 1, 0, 0, 0, 0);
-
-        FindUnlinkedFilesDialog.addComponent(gbl, getContentPane(), panelDirectory, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.CENTER, basicInsets, 0, 0, 1, 1, 0, 0, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, getContentPane(), panelFiles, GridBagConstraints.BOTH,
-                GridBagConstraints.NORTHWEST, new Insets(12, 6, 2, 2), 0, 1, 1, 1, 1, 1, 0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, getContentPane(), panelEntryTypesSelection,
-                GridBagConstraints.HORIZONTAL, GridBagConstraints.SOUTHWEST, new Insets(12, 6, 2, 2), 0, 2, 1, 1, 0, 0,
-                0, 0);
-        FindUnlinkedFilesDialog.addComponent(gbl, getContentPane(), panelButtons, GridBagConstraints.HORIZONTAL,
-                GridBagConstraints.CENTER, new Insets(10, 6, 10, 6), 0, 3, 1, 1, 0, 0, 0, 0);
-
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-        bb.addButton(buttonExport);
-        bb.addButton(buttonApply);
-        bb.addButton(buttonClose);
-        bb.addGlue();
-
-        bb.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        panelImportArea.add(bb.getPanel(), GridBagConstraints.NONE);
-        pack();
-
-    }
-
-    /**
-     * Adds a component to a container, using the specified gridbag-layout and
-     * the supplied parameters. <br>
-     * <br>
-     * This method is simply used to ged rid of thousands of lines of code,
-     * which inevitably rise when layouts such as the gridbag-layout is being
-     * used.
-     *
-     * @param layout
-     *            The layout to be used.
-     * @param container
-     *            The {@link Container}, to which the component will be added.
-     * @param component
-     *            An AWT {@link Component}, that will be added to the container.
-     * @param fill
-     *            A constant describing the fill behaviour (see
-     *            {@link GridBagConstraints}). Can be <code>null</code>, if no
-     *            filling wants to be specified.
-     * @param anchor
-     *            A constant describing the anchor of the element in its parent
-     *            container (see {@link GridBagConstraints}). Can be
-     *            <code>null</code>, if no specification is needed.
-     * @param gridX
-     *            The relative grid-X coordinate.
-     * @param gridY
-     *            The relative grid-Y coordinate.
-     * @param width
-     *            The relative width of the component.
-     * @param height
-     *            The relative height of the component.
-     * @param weightX
-     *            A value for the horizontal weight.
-     * @param weightY
-     *            A value for the vertical weight.
-     * @param insets
-     *            Insets of the component. Can be <code>null</code>.
-     */
-    private static void addComponent(GridBagLayout layout, Container container, Component component, Integer fill,
-            Integer anchor, Insets insets, int gridX, int gridY, int width, int height, double weightX, double weightY,
-            int ipadX, int ipadY) {
-        container.setLayout(layout);
-        GridBagConstraints constraints = new GridBagConstraints();
-        constraints.gridx = gridX;
-        constraints.gridy = gridY;
-        constraints.gridwidth = width;
-        constraints.gridheight = height;
-        constraints.weightx = weightX;
-        constraints.weighty = weightY;
-        constraints.ipadx = ipadX;
-        constraints.ipady = ipadY;
-        if (fill != null) {
-            constraints.fill = fill;
-        }
-        if (insets != null) {
-            constraints.insets = insets;
-        }
-        if (anchor != null) {
-            constraints.anchor = anchor;
-        }
-        layout.setConstraints(component, constraints);
-        container.add(component);
-    }
-
-    /**
-     * Creates the tree view, that holds the data structure. <br>
-     * <br>
-     * Initially, the root node is <b>not</b> visible, so that the tree appears empty at the beginning.
-     */
-    private void createTree() {
-
-        /**
-         * Mouse listener to listen for mouse events on the tree. <br>
-         * This will mark the selected tree entry as "selected" or "unselected",
-         * which will cause this nodes checkbox to appear as either "checked" or
-         * "unchecked".
-         */
-        treeMouseListener = new MouseAdapter() {
-
-            @Override
-            public void mousePressed(MouseEvent e) {
-                int x = e.getX();
-                int y = e.getY();
-
-                int row = tree.getRowForLocation(x, y);
-
-                TreePath path = tree.getPathForRow(row);
-                if (path != null) {
-                    CheckableTreeNode node = (CheckableTreeNode) path.getLastPathComponent();
-                    if (e.getClickCount() == 2) {
-                        Object userObject = node.getUserObject();
-                        if ((userObject instanceof FileNodeWrapper) && node.isLeaf()) {
-                            FileNodeWrapper fnw = (FileNodeWrapper) userObject;
-                            try {
-                                JabRefDesktop.openExternalViewer(
-                                        JabRefGUI.getMainFrame().getCurrentBasePanel().getBibDatabaseContext(),
-                                        fnw.file.getAbsolutePath(), FieldName.PDF);
-                            } catch (IOException e1) {
-                                LOGGER.info("Error opening file", e1);
-                            }
-                        }
-                    } else {
-                        node.check();
-                        tree.invalidate();
-                        tree.repaint();
-                    }
-                }
-            }
-
-        };
-
-        CheckableTreeNode startNode = new CheckableTreeNode("ROOT");
-        DefaultTreeModel model = new DefaultTreeModel(startNode);
-
-        tree.setModel(model);
-        tree.setRootVisible(false);
-
-        DefaultTreeCellRenderer renderer = new CheckboxTreeCellRenderer();
-        tree.setCellRenderer(renderer);
-
-        tree.addMouseListener(treeMouseListener);
-
-    }
-
-    /**
-     * Initialises the combobox that contains the available file types which
-     * bibtex entries can be created of.
-     */
-    private void createFileTypesCombobox() {
-
-        List<FileFilter> fileFilterList = creatorManager.getFileFilterList();
-
-        comboBoxFileTypeSelection = new JComboBox<>(fileFilterList.toArray(new FileFilter[fileFilterList.size()]));
-
-        comboBoxFileTypeSelection.setRenderer(new DefaultListCellRenderer() {
-
-            /* (non-Javadoc)
-             * @see javax.swing.DefaultListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean)
-             */
-            @Override
-            public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected,
-                    boolean cellHasFocus) {
-                JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected,
-                        cellHasFocus);
-                if (value instanceof EntryFromFileCreator) {
-                    EntryFromFileCreator creator = (EntryFromFileCreator) value;
-                    if (creator.getExternalFileType() != null) {
-                        label.setIcon(creator.getExternalFileType().getIcon().getSmallIcon());
-                    }
-                }
-                return label;
-            }
-        });
-
-    }
-
-    /**
-     * Creates the ComboBox-View for the Listbox that holds the Bibtex entry
-     * types.
-     */
-    private void createEntryTypesCombobox() {
-
-        Iterator<EntryType> iterator = EntryTypes
-                .getAllValues(frame.getCurrentBasePanel().getBibDatabaseContext().getMode()).iterator();
-        List<BibtexEntryTypeWrapper> list = new ArrayList<>();
-        list.add(
-                new BibtexEntryTypeWrapper(null));
-        while (iterator.hasNext()) {
-            list.add(new BibtexEntryTypeWrapper(iterator.next()));
-        }
-        comboBoxEntryTypeSelection = new JComboBox<>(list.toArray(new BibtexEntryTypeWrapper[list.size()]));
-    }
-
-    /**
-     * Wrapper for displaying the Type {@link BibtexEntryType} in a Combobox.
-     */
-    private static class BibtexEntryTypeWrapper {
-
-        private final EntryType entryType;
-
-        BibtexEntryTypeWrapper(EntryType bibtexType) {
-            this.entryType = bibtexType;
-        }
-
-        @Override
-        public String toString() {
-            if (entryType == null) {
-                return Localization.lang("<No selection>");
-            }
-            return entryType.getName();
-        }
-
-        public EntryType getEntryType() {
-            return entryType;
-        }
-    }
-
-    public static class CheckableTreeNode extends DefaultMutableTreeNode {
-
-        private boolean isSelected;
-        private final JCheckBox checkbox;
-
-        public CheckableTreeNode(Object userObject) {
-            super(userObject);
-            checkbox = new JCheckBox();
-        }
-
-        /**
-         * @return the checkbox
-         */
-        public JCheckBox getCheckbox() {
-            return checkbox;
-        }
-
-        public void check() {
-            setSelected(!isSelected);
-        }
-
-        public void setSelected(boolean bSelected) {
-            isSelected = bSelected;
-            Enumeration<CheckableTreeNode> tmpChildren = this.children();
-            for (CheckableTreeNode child : Collections.list(tmpChildren)) {
-                child.setSelected(bSelected);
-            }
-
-        }
-
-        public boolean isSelected() {
-            return isSelected;
-        }
-
-    }
-
-    private static class CheckboxTreeCellRenderer extends DefaultTreeCellRenderer {
-
-        private final FileSystemView fsv = FileSystemView.getFileSystemView();
-
-        @Override
-        public Component getTreeCellRendererComponent(final JTree tree, Object value, boolean sel, boolean expanded,
-                boolean leaf, int row, boolean hasFocus) {
-
-            Component nodeComponent = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row,
-                    hasFocus);
-            CheckableTreeNode node = (CheckableTreeNode) value;
-
-            FileNodeWrapper userObject = (FileNodeWrapper) node.getUserObject();
-
-            JPanel newPanel = new JPanel();
-
-            JCheckBox checkbox = node.getCheckbox();
-            checkbox.setSelected(node.isSelected());
-
-            try {
-                setIcon(fsv.getSystemIcon(userObject.file));
-            } catch (Exception ignored) {
-                // Ignored
-            }
-
-            newPanel.setBackground(nodeComponent.getBackground());
-            checkbox.setBackground(nodeComponent.getBackground());
-
-            GridBagLayout gbl = new GridBagLayout();
-            FindUnlinkedFilesDialog.addComponent(gbl, newPanel, checkbox, null, null, null, 0, 0, 1, 1, 0, 0, 0, 0);
-            FindUnlinkedFilesDialog.addComponent(gbl, newPanel, nodeComponent, GridBagConstraints.HORIZONTAL, null,
-                    new Insets(1, 2, 0, 0), 1, 0, 1, 1, 1, 0, 0, 0);
-
-            if (userObject.fileCount > 0) {
-                JLabel label = new JLabel(
-                        "(" + userObject.fileCount + " file" + (userObject.fileCount > 1 ? "s" : "") + ")");
-                FindUnlinkedFilesDialog.addComponent(gbl, newPanel, label, null, null, new Insets(1, 2, 0, 0), 2, 0, 1,
-                        1, 0, 0, 0, 0);
-            }
-            return newPanel;
-        }
-
-    }
-
-    public static class FileNodeWrapper {
-
-        public final File file;
-        public final int fileCount;
-
-        public FileNodeWrapper(File aFile) {
-            this(aFile, 0);
-        }
-
-        /**
-         * @param aDirectory
-         * @param fileCount
-         */
-        public FileNodeWrapper(File aDirectory, int fileCount) {
-            this.file = aDirectory;
-            this.fileCount = fileCount;
-        }
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see java.lang.Object#toString()
-         */
-        @Override
-        public String toString() {
-            return file.getName();
-        }
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 4803df84fa1..2531456c6f0 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -62,7 +62,6 @@
 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.LookupIdentifierAction;
 import org.jabref.gui.actions.ManageCustomExportsAction;
@@ -89,6 +88,7 @@
 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;
diff --git a/src/main/java/org/jabref/gui/actions/FindUnlinkedFilesAction.java b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
similarity index 77%
rename from src/main/java/org/jabref/gui/actions/FindUnlinkedFilesAction.java
rename to src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
index d1a193857eb..5684869d9ff 100644
--- a/src/main/java/org/jabref/gui/actions/FindUnlinkedFilesAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
@@ -1,7 +1,7 @@
-package org.jabref.gui.actions;
+package org.jabref.gui.externalfiles;
 
-import org.jabref.gui.FindUnlinkedFilesDialog;
 import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.actions.SimpleCommand;
 
 public class FindUnlinkedFilesAction extends SimpleCommand {
 
@@ -14,7 +14,7 @@ public FindUnlinkedFilesAction(JabRefFrame jabRefFrame) {
     @Override
     public void execute() {
         FindUnlinkedFilesDialog dlg = new FindUnlinkedFilesDialog(jabRefFrame);
-        dlg.setVisible(true);
+        dlg.showAndWait();
     }
 
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
new file mode 100644
index 00000000000..5a8b0e8c5a8
--- /dev/null
+++ b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
@@ -0,0 +1,440 @@
+package org.jabref.gui.externalfiles;
+
+import java.io.BufferedWriter;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import javafx.collections.FXCollections;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.CheckBoxTreeItem;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.control.Tooltip;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeView;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+
+import org.jabref.Globals;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.importer.EntryFromFileCreator;
+import org.jabref.gui.importer.EntryFromFileCreatorManager;
+import org.jabref.gui.importer.UnlinkedFilesCrawler;
+import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.DirectoryDialogConfiguration;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.gui.util.ViewModelTreeCellFactory;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.EntryTypes;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.EntryType;
+import org.jabref.preferences.JabRefPreferences;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * GUI Dialog for the feature "Find unlinked files".
+ */
+public class FindUnlinkedFilesDialog extends BaseDialog<Void> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FindUnlinkedFilesDialog.class);
+    private final JabRefFrame frame;
+    private final BibDatabaseContext databaseContext;
+    private final EntryFromFileCreatorManager creatorManager;
+    private final JabRefPreferences preferences = Globals.prefs;
+    private final DialogService dialogService;
+    private Button buttonScan;
+    private Button buttonExport;
+    private Button buttonApply;
+    private CheckBox checkboxCreateKeywords;
+    private TextField textfieldDirectoryPath;
+    private TreeView<FileNodeWrapper> tree;
+    private ComboBox<FileFilter> comboBoxFileTypeSelection;
+    private ComboBox<EntryType> comboBoxEntryTypeSelection;
+    private VBox panelSearchProgress;
+    private BackgroundTask findUnlinkedFilesTask;
+
+    public FindUnlinkedFilesDialog(JabRefFrame frame) {
+        super();
+        this.setTitle(Localization.lang("Find unlinked files"));
+        this.frame = frame;
+        dialogService = frame.getDialogService();
+
+        databaseContext = frame.getCurrentBasePanel().getBibDatabaseContext();
+        creatorManager = new EntryFromFileCreatorManager(ExternalFileTypes.getInstance());
+
+        initialize();
+    }
+
+    /**
+     * Initializes the components, the layout, the data structure and the actions in this dialog.
+     */
+    private void initialize() {
+        Button buttonBrowse = new Button(Localization.lang("Browse"));
+        buttonBrowse.setTooltip(new Tooltip(Localization.lang("Opens the file browser.")));
+        buttonBrowse.getStyleClass().add("text-button");
+        buttonBrowse.setOnAction(e -> {
+            DirectoryDialogConfiguration directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
+                    .withInitialDirectory(preferences.get(JabRefPreferences.WORKING_DIRECTORY)).build();
+            dialogService.showDirectorySelectionDialog(directoryDialogConfiguration)
+                         .ifPresent(selectedDirectory -> {
+                             textfieldDirectoryPath.setText(selectedDirectory.toAbsolutePath().toString());
+                             preferences.put(JabRefPreferences.WORKING_DIRECTORY, selectedDirectory.toAbsolutePath().toString());
+                         });
+        });
+
+        buttonScan = new Button(Localization.lang("Scan directory"));
+        buttonScan.setTooltip(new Tooltip((Localization.lang("Searches the selected directory for unlinked files."))));
+        buttonScan.setOnAction(e -> startSearch());
+        buttonScan.setDefaultButton(true);
+        buttonScan.setPadding(new Insets(5, 0, 0, 0));
+
+        buttonExport = new Button(Localization.lang("Export selected entries"));
+        buttonExport.setTooltip(new Tooltip(Localization.lang("Export to text file.")));
+        buttonExport.getStyleClass().add("text-button");
+        buttonExport.setDisable(true);
+        buttonExport.setOnAction(e -> startExport());
+
+        ButtonType buttonTypeImport = new ButtonType(Localization.lang("Import"), ButtonBar.ButtonData.OK_DONE);
+        getDialogPane().getButtonTypes().setAll(
+                buttonTypeImport,
+                ButtonType.CANCEL
+        );
+        buttonApply = (Button) getDialogPane().lookupButton(buttonTypeImport);
+        buttonApply.setTooltip(new Tooltip((Localization.lang("Starts the import of BibTeX entries."))));
+        buttonApply.setDisable(true);
+
+        /* Actions for the TreeView */
+        Button buttonOptionSelectAll = new Button();
+        buttonOptionSelectAll.setText(Localization.lang("Select all"));
+        buttonOptionSelectAll.getStyleClass().add("text-button");
+        buttonOptionSelectAll.setOnAction(event -> {
+            CheckBoxTreeItem<FileNodeWrapper> root = (CheckBoxTreeItem<FileNodeWrapper>) tree.getRoot();
+            // Need to toggle a twice to make sure everything is selected
+            root.setSelected(true);
+            root.setSelected(false);
+            root.setSelected(true);
+        });
+        Button buttonOptionDeselectAll = new Button();
+        buttonOptionDeselectAll.setText(Localization.lang("Unselect all"));
+        buttonOptionDeselectAll.getStyleClass().add("text-button");
+        buttonOptionDeselectAll.setOnAction(event -> {
+            CheckBoxTreeItem<FileNodeWrapper> root = (CheckBoxTreeItem<FileNodeWrapper>) tree.getRoot();
+            // Need to toggle a twice to make sure nothing is selected
+            root.setSelected(false);
+            root.setSelected(true);
+            root.setSelected(false);
+        });
+        Button buttonOptionExpandAll = new Button();
+        buttonOptionExpandAll.setText(Localization.lang("Expand all"));
+        buttonOptionExpandAll.getStyleClass().add("text-button");
+        buttonOptionExpandAll.setOnAction(event -> {
+            CheckBoxTreeItem<FileNodeWrapper> root = (CheckBoxTreeItem<FileNodeWrapper>) tree.getRoot();
+            expandTree(root, true);
+        });
+        Button buttonOptionCollapseAll = new Button();
+        buttonOptionCollapseAll.setText(Localization.lang("Collapse all"));
+        buttonOptionCollapseAll.getStyleClass().add("text-button");
+        buttonOptionCollapseAll.setOnAction(event -> {
+            CheckBoxTreeItem<FileNodeWrapper> root = (CheckBoxTreeItem<FileNodeWrapper>) tree.getRoot();
+            expandTree(root, false);
+            root.setExpanded(true);
+        });
+
+        checkboxCreateKeywords = new CheckBox(Localization.lang("Create directory based keywords"));
+        checkboxCreateKeywords.setTooltip(new Tooltip((Localization.lang("Creates keywords in created entrys with directory pathnames"))));
+
+        textfieldDirectoryPath = new TextField();
+        Path initialPath = databaseContext.getFirstExistingFileDir(preferences.getFilePreferences())
+                                          .orElse(preferences.getWorkingDir());
+        textfieldDirectoryPath.setText(initialPath.toAbsolutePath().toString());
+
+        Label labelDirectoryDescription = new Label(Localization.lang("Select a directory where the search shall start."));
+        Label labelFileTypesDescription = new Label(Localization.lang("Select file type:"));
+        Label labelFilesDescription = new Label(Localization.lang("These files are not linked in the active library."));
+        Label labelEntryTypeDescription = new Label(Localization.lang("Entry type to be created:"));
+        Label labelSearchingDirectoryInfo = new Label(Localization.lang("Searching file system..."));
+
+        tree = new TreeView<>();
+        tree.setPrefWidth(Double.POSITIVE_INFINITY);
+
+        ScrollPane scrollPaneTree = new ScrollPane(tree);
+        scrollPaneTree.setFitToWidth(true);
+
+        ProgressIndicator progressBarSearching = new ProgressIndicator();
+        progressBarSearching.setMaxSize(50, 50);
+
+        setResultConverter(buttonPressed -> {
+            if (buttonPressed == buttonTypeImport) {
+                startImport();
+            } else {
+                if (findUnlinkedFilesTask != null) {
+                    findUnlinkedFilesTask.cancel();
+                }
+            }
+            return null;
+        });
+
+        new ViewModelTreeCellFactory<FileNodeWrapper>()
+                .withText(node -> {
+                    if (Files.isRegularFile(node.path)) {
+                        // File
+                        return node.path.getFileName().toString();
+                    } else {
+                        // Directory
+                        return node.path.getFileName() + " (" + node.fileCount + " file" + (node.fileCount > 1 ? "s" : "") + ")";
+                    }
+                })
+                .install(tree);
+        List<FileFilter> fileFilterList = creatorManager.getFileFilterList();
+        comboBoxFileTypeSelection = new ComboBox<>(FXCollections.observableArrayList(fileFilterList));
+        comboBoxFileTypeSelection.getSelectionModel().selectFirst();
+        new ViewModelListCellFactory<FileFilter>()
+                .withText(Object::toString)
+                .withIcon(fileFilter -> {
+                    if (fileFilter instanceof EntryFromFileCreator) {
+                        EntryFromFileCreator creator = (EntryFromFileCreator) fileFilter;
+                        if (creator.getExternalFileType() != null) {
+                            return creator.getExternalFileType().getIcon();
+                        }
+                    }
+                    return null;
+                })
+                .install(comboBoxFileTypeSelection);
+
+        Collection<EntryType> entryTypes = EntryTypes.getAllValues(frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
+        comboBoxEntryTypeSelection = new ComboBox<>(FXCollections.observableArrayList(entryTypes));
+        comboBoxEntryTypeSelection.getSelectionModel().selectFirst();
+        new ViewModelListCellFactory<EntryType>()
+                .withText(EntryType::getName)
+                .install(comboBoxEntryTypeSelection);
+
+        panelSearchProgress = new VBox(5, labelSearchingDirectoryInfo, progressBarSearching);
+        panelSearchProgress.toFront();
+        panelSearchProgress.setVisible(false);
+
+//        panelDirectory.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+//                Localization.lang("Select directory")));
+//        panelFiles.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+//                Localization.lang("Select files")));
+//        panelEntryTypesSelection.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+//                Localization.lang("BibTeX entry creation")));
+
+        VBox panelDirectory = new VBox(5);
+        panelDirectory.getChildren().setAll(
+                labelDirectoryDescription,
+                new HBox(10, textfieldDirectoryPath, buttonBrowse),
+                new HBox(15, labelFileTypesDescription, comboBoxFileTypeSelection),
+                buttonScan
+        );
+        HBox.setHgrow(textfieldDirectoryPath, Priority.ALWAYS);
+
+        StackPane stackPaneTree = new StackPane(scrollPaneTree, panelSearchProgress);
+        StackPane.setAlignment(panelSearchProgress, Pos.CENTER);
+        BorderPane panelFiles = new BorderPane();
+        panelFiles.setTop(labelFilesDescription);
+        panelFiles.setCenter(stackPaneTree);
+        panelFiles.setBottom(new HBox(5, buttonOptionSelectAll, buttonOptionDeselectAll, buttonOptionExpandAll, buttonOptionCollapseAll, buttonExport));
+
+        VBox panelEntryTypesSelection = new VBox(5);
+        panelEntryTypesSelection.getChildren().setAll(
+                new HBox(15, labelEntryTypeDescription, comboBoxEntryTypeSelection),
+                checkboxCreateKeywords
+        );
+
+        VBox container = new VBox(20);
+        container.getChildren().addAll(
+                panelDirectory,
+                panelFiles,
+                panelEntryTypesSelection
+        );
+        container.setPrefWidth(600);
+        getDialogPane().setContent(container);
+    }
+
+    /**
+     * Expands or collapses the specified tree according to the <code>expand</code>-parameter.
+     */
+    private void expandTree(TreeItem<?> item, boolean expand) {
+        if (item != null && !item.isLeaf()) {
+            item.setExpanded(expand);
+            for (TreeItem<?> child : item.getChildren()) {
+                expandTree(child, expand);
+            }
+        }
+    }
+
+    /**
+     * Starts the search of unlinked files according chosen directory and the file type selection. The search will
+     * process in a separate thread and a progress indicator will be displayed.
+     */
+    private void startSearch() {
+        Path directory = getSearchDirectory();
+        FileFilter selectedFileFilter = comboBoxFileTypeSelection.getValue();
+
+        findUnlinkedFilesTask = new UnlinkedFilesCrawler(directory, selectedFileFilter, databaseContext)
+                .onRunning(() -> {
+                    panelSearchProgress.setVisible(true);
+                    buttonScan.setDisable(true);
+                    tree.setRoot(null);
+                })
+                .onFinished(() -> {
+                    panelSearchProgress.setVisible(false);
+                    buttonScan.setDisable(false);
+                })
+                .onSuccess(root -> {
+                    tree.setRoot(root);
+                    root.setSelected(true);
+                    root.setExpanded(true);
+
+                    buttonApply.setDisable(false);
+                    buttonExport.setDisable(false);
+                    buttonScan.setDefaultButton(false);
+                });
+        findUnlinkedFilesTask.executeWith(Globals.TASK_EXECUTOR);
+    }
+
+    private Path getSearchDirectory() {
+        Path directory = Paths.get(textfieldDirectoryPath.getText());
+        if (Files.notExists(directory)) {
+            directory = Paths.get(System.getProperty("user.dir"));
+            textfieldDirectoryPath.setText(directory.toAbsolutePath().toString());
+        }
+        if (!Files.isDirectory(directory)) {
+            directory = directory.getParent();
+            textfieldDirectoryPath.setText(directory.toAbsolutePath().toString());
+        }
+        return directory;
+    }
+
+    /**
+     * This will start the import of all file of all selected nodes in the file tree view.
+     */
+    private void startImport() {
+        CheckBoxTreeItem<FileNodeWrapper> root = (CheckBoxTreeItem<FileNodeWrapper>) tree.getRoot();
+        final List<Path> fileList = getFileListFromNode(root);
+
+        if (fileList.isEmpty()) {
+            return;
+        }
+
+        final EntryType entryType = comboBoxEntryTypeSelection.getValue();
+
+        List<String> errors = creatorManager.addEntriesFromFiles(
+                fileList,
+                databaseContext.getDatabase(),
+                frame.getCurrentBasePanel(),
+                entryType,
+                checkboxCreateKeywords.isSelected());
+
+        if (!errors.isEmpty()) {
+            String message;
+            if (errors.size() == 1) {
+                message = Localization.lang("There was one file that could not be imported.");
+            } else {
+                message = Localization.lang("There were %0 files which could not be imported.",
+                        Integer.toString(errors.size()));
+            }
+            dialogService.showWarningDialogAndWait(
+                    Localization.lang("Warning"),
+                    Localization.lang("The import finished with warnings:") + "\n" + message);
+        }
+    }
+
+    /**
+     * This starts the export of all files of all selected nodes in the file tree view.
+     */
+    private void startExport() {
+        CheckBoxTreeItem<FileNodeWrapper> root = (CheckBoxTreeItem<FileNodeWrapper>) tree.getRoot();
+
+        final List<Path> fileList = getFileListFromNode(root);
+        if (fileList.isEmpty()) {
+            return;
+        }
+
+        buttonExport.setVisible(false);
+        buttonApply.setVisible(false);
+
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .withInitialDirectory(preferences.get(JabRefPreferences.WORKING_DIRECTORY)).build();
+        Optional<Path> exportPath = dialogService.showFileSaveDialog(fileDialogConfiguration);
+
+        if (!exportPath.isPresent()) {
+            buttonExport.setVisible(true);
+            buttonApply.setVisible(true);
+            return;
+        }
+
+        try (BufferedWriter writer =
+                     Files.newBufferedWriter(exportPath.get(), StandardCharsets.UTF_8,
+                             StandardOpenOption.CREATE)) {
+            for (Path file : fileList) {
+                writer.write(file.toString() + "\n");
+            }
+        } catch (IOException e) {
+            LOGGER.warn("IO Error.", e);
+        }
+
+        buttonExport.setVisible(true);
+        buttonApply.setVisible(true);
+    }
+
+    /**
+     * Creates a list of all files (leaf nodes in the tree structure), which have been selected.
+     *
+     * @param node The root node representing a tree structure.
+     */
+    private List<Path> getFileListFromNode(CheckBoxTreeItem<FileNodeWrapper> node) {
+        List<Path> filesList = new ArrayList<>();
+        for (TreeItem<FileNodeWrapper> childNode : node.getChildren()) {
+            CheckBoxTreeItem<FileNodeWrapper> child = (CheckBoxTreeItem<FileNodeWrapper>) childNode;
+            if (child.isLeaf() && child.isSelected()) {
+                Path nodeFile = child.getValue().path;
+                if ((nodeFile != null) && Files.isRegularFile(nodeFile)) {
+                    filesList.add(nodeFile);
+                }
+            }
+        }
+        return filesList;
+    }
+
+    public static class FileNodeWrapper {
+
+        public final Path path;
+        public final int fileCount;
+
+        public FileNodeWrapper(Path path) {
+            this(path, 0);
+        }
+
+        public FileNodeWrapper(Path path, int fileCount) {
+            this.path = path;
+            this.fileCount = fileCount;
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/importer/EntryFromFileCreatorManager.java b/src/main/java/org/jabref/gui/importer/EntryFromFileCreatorManager.java
index c1a0d2d0a3d..79b1d93f582 100644
--- a/src/main/java/org/jabref/gui/importer/EntryFromFileCreatorManager.java
+++ b/src/main/java/org/jabref/gui/importer/EntryFromFileCreatorManager.java
@@ -2,14 +2,13 @@
 
 import java.io.File;
 import java.io.FileFilter;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
 
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.undo.CompoundEdit;
 
 import org.jabref.gui.BasePanel;
@@ -67,22 +66,21 @@ private boolean hasSpecialisedCreatorForExternalFileType(
     }
 
     /**
-     * Returns a EntryFromFileCreator object that is capable of creating a
-     * BibEntry for the given File.
+     * Returns a {@link EntryFromFileCreator} object that is capable of creating a entry for the given file.
      *
-     * @param file the pdf file
-     * @return null if there is no EntryFromFileCreator for this File.
+     * @param file the external file
+     * @return an empty optional if there is no EntryFromFileCreator for this file.
      */
-    public EntryFromFileCreator getEntryCreator(File file) {
-        if ((file == null) || !file.exists()) {
-            return null;
+    public Optional<EntryFromFileCreator> getEntryCreator(Path file) {
+        if (!Files.exists(file)) {
+            return Optional.empty();
         }
         for (EntryFromFileCreator creator : entryCreators) {
-            if (creator.accept(file)) {
-                return creator;
+            if (creator.accept(file.toFile())) {
+                return Optional.of(creator);
             }
         }
-        return null;
+        return Optional.empty();
     }
 
     /**
@@ -93,43 +91,32 @@ public EntryFromFileCreator getEntryCreator(File file) {
      * @param entryType
      * @return List of unexpected import event messages including failures.
      */
-    public List<String> addEntrysFromFiles(List<File> files,
-            BibDatabase database, EntryType entryType,
-            boolean generateKeywordsFromPathToFile) {
-        List<String> importGUIMessages = new LinkedList<>();
-        addEntriesFromFiles(files, database, null, entryType,
-                generateKeywordsFromPathToFile, null, importGUIMessages);
-        return importGUIMessages;
+    public List<String> addEntrysFromFiles(List<Path> files,
+                                           BibDatabase database, EntryType entryType,
+                                           boolean generateKeywordsFromPathToFile) {
+        return addEntriesFromFiles(files, database, null, entryType, generateKeywordsFromPathToFile);
     }
 
     /**
      * Tries to add a entry for each file in the List.
      *
-     * @param files
-     * @param database
-     * @param panel
-     * @param entryType
-     * @param generateKeywordsFromPathToFile
-     * @param changeListener
-     * @param importGUIMessages list of unexpected import event - Messages including
-     *         failures
-     * @return Returns The number of entries added
+     * @return Returns a list of unexpected failures while importing
      */
-    public int addEntriesFromFiles(List<File> files,
-            BibDatabase database, BasePanel panel, EntryType entryType,
-            boolean generateKeywordsFromPathToFile,
-            ChangeListener changeListener, List<String> importGUIMessages) {
+    public List<String> addEntriesFromFiles(List<Path> files,
+                                            BibDatabase database, BasePanel panel, EntryType entryType,
+                                            boolean generateKeywordsFromPathToFile) {
 
+        List<String> importGUIMessages = new ArrayList<>();
         int count = 0;
         CompoundEdit ce = new CompoundEdit();
-        for (File f : files) {
-            EntryFromFileCreator creator = getEntryCreator(f);
-            if (creator == null) {
-                importGUIMessages.add("Problem importing " + f.getPath() + ": Unknown filetype.");
+        for (Path f : files) {
+            Optional<EntryFromFileCreator> creator = getEntryCreator(f);
+            if (!creator.isPresent()) {
+                importGUIMessages.add("Problem importing " + f.toAbsolutePath() + ": Unknown filetype.");
             } else {
-                Optional<BibEntry> entry = creator.createEntry(f, generateKeywordsFromPathToFile);
+                Optional<BibEntry> entry = creator.get().createEntry(f.toFile(), generateKeywordsFromPathToFile);
                 if (!entry.isPresent()) {
-                    importGUIMessages.add("Problem importing " + f.getPath() + ": Entry could not be created.");
+                    importGUIMessages.add("Problem importing " + f.toAbsolutePath() + ": Entry could not be created.");
                     continue;
                 }
                 if (entryType != null) {
@@ -147,7 +134,7 @@ public int addEntriesFromFiles(List<File> files,
                     // Work around SIDE EFFECT of creator.createEntry. The EntryFromPDFCreator also creates the entry in the table
                     // Therefore, we only insert the entry if it is not already present
                     if (database.insertEntry(entry.get())) {
-                        importGUIMessages.add("Problem importing " + f.getPath() + ": Insert into BibDatabase failed.");
+                        importGUIMessages.add("Problem importing " + f.toAbsolutePath() + ": Insert into BibDatabase failed.");
                     } else {
                         count++;
                         if (panel != null) {
@@ -156,17 +143,13 @@ public int addEntriesFromFiles(List<File> files,
                     }
                 }
             }
-
-            if (changeListener != null) {
-                changeListener.stateChanged(new ChangeEvent(this));
-            }
         }
 
         if ((count > 0) && (panel != null)) {
             ce.end();
             panel.getUndoManager().addEdit(ce);
         }
-        return count;
+        return importGUIMessages;
 
     }
 
@@ -211,12 +194,9 @@ public String toString() {
      * @return A List of all known possible file filters.
      */
     public List<FileFilter> getFileFilterList() {
-
         List<FileFilter> filters = new ArrayList<>();
         filters.add(getFileFilter());
-        for (FileFilter creator : entryCreators) {
-            filters.add(creator);
-        }
+        filters.addAll(entryCreators);
         return filters;
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/UnlinkedFilesCrawler.java b/src/main/java/org/jabref/gui/importer/UnlinkedFilesCrawler.java
index f3b456fa937..77e57a12ab9 100644
--- a/src/main/java/org/jabref/gui/importer/UnlinkedFilesCrawler.java
+++ b/src/main/java/org/jabref/gui/importer/UnlinkedFilesCrawler.java
@@ -2,38 +2,39 @@
 
 import java.io.File;
 import java.io.FileFilter;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
+import javafx.scene.control.CheckBoxTreeItem;
 
-import org.jabref.gui.FindUnlinkedFilesDialog.CheckableTreeNode;
-import org.jabref.gui.FindUnlinkedFilesDialog.FileNodeWrapper;
+import org.jabref.gui.externalfiles.FindUnlinkedFilesDialog.FileNodeWrapper;
+import org.jabref.gui.util.BackgroundTask;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 
 /**
  * Util class for searching files on the file system which are not linked to a provided {@link BibDatabase}.
  */
-public class UnlinkedFilesCrawler {
-    /**
-     * File filter, that accepts directories only.
-     */
-    private static final FileFilter DIRECTORY_FILTER = pathname -> (pathname != null) && pathname.isDirectory();
+public class UnlinkedFilesCrawler extends BackgroundTask<CheckBoxTreeItem<FileNodeWrapper>> {
 
+    private final Path directory;
+    private final FileFilter fileFilter;
+    private int counter;
     private final BibDatabaseContext databaseContext;
 
-
-    public UnlinkedFilesCrawler(BibDatabaseContext databaseContext) {
+    public UnlinkedFilesCrawler(Path directory, FileFilter fileFilter, BibDatabaseContext databaseContext) {
+        this.directory = directory;
+        this.fileFilter = fileFilter;
         this.databaseContext = databaseContext;
     }
 
-    public CheckableTreeNode searchDirectory(File directory, FileFilter filter) {
-        UnlinkedPDFFileFilter ff = new UnlinkedPDFFileFilter(filter, databaseContext);
-        return searchDirectory(directory, ff, new AtomicBoolean(true), null);
+    @Override
+    protected CheckBoxTreeItem<FileNodeWrapper> call() throws Exception {
+        UnlinkedPDFFileFilter unlinkedPDFFileFilter = new UnlinkedPDFFileFilter(fileFilter, databaseContext);
+        return searchDirectory(directory.toFile(), unlinkedPDFFileFilter);
     }
 
     /**
@@ -43,7 +44,7 @@ public CheckableTreeNode searchDirectory(File directory, FileFilter filter) {
      * {@link EntryFromFileCreatorManager}, are taken into the resulting tree. <br>
      * <br>
      * The result will be a tree structure of nodes of the type
-     * {@link CheckableTreeNode}. <br>
+     * {@link CheckBoxTreeItem}. <br>
      * <br>
      * The user objects that are attached to the nodes is the
      * {@link FileNodeWrapper}, which wraps the {@link File}-Object. <br>
@@ -53,11 +54,7 @@ public CheckableTreeNode searchDirectory(File directory, FileFilter filter) {
      * the recursion running. When the states value changes, the method will
      * resolve its recursion and return what it has saved so far.
      */
-    public CheckableTreeNode searchDirectory(File directory, UnlinkedPDFFileFilter ff, AtomicBoolean state, ChangeListener changeListener) {
-        /* Cancellation of the search from outside! */
-        if ((state == null) || !state.get()) {
-            return null;
-        }
+    private CheckBoxTreeItem<FileNodeWrapper> searchDirectory(File directory, UnlinkedPDFFileFilter ff) {
         // Return null if the directory is not valid.
         if ((directory == null) || !directory.exists() || !directory.isDirectory()) {
             return null;
@@ -70,11 +67,11 @@ public CheckableTreeNode searchDirectory(File directory, UnlinkedPDFFileFilter f
         } else {
             files = Arrays.asList(filesArray);
         }
-        CheckableTreeNode root = new CheckableTreeNode(null);
+        CheckBoxTreeItem<FileNodeWrapper> root = new CheckBoxTreeItem<>(new FileNodeWrapper(directory.toPath(), 0));
 
         int filesCount = 0;
 
-        filesArray = directory.listFiles(DIRECTORY_FILTER);
+        filesArray = directory.listFiles(pathname -> (pathname != null) && pathname.isDirectory());
         List<File> subDirectories;
         if (filesArray == null) {
             subDirectories = Collections.emptyList();
@@ -82,23 +79,30 @@ public CheckableTreeNode searchDirectory(File directory, UnlinkedPDFFileFilter f
             subDirectories = Arrays.asList(filesArray);
         }
         for (File subDirectory : subDirectories) {
-            CheckableTreeNode subRoot = searchDirectory(subDirectory, ff, state, changeListener);
-            if ((subRoot != null) && (subRoot.getChildCount() > 0)) {
-                filesCount += ((FileNodeWrapper) subRoot.getUserObject()).fileCount;
-                root.add(subRoot);
+            if (isCanceled()) {
+                return root;
+            }
+
+            CheckBoxTreeItem<FileNodeWrapper> subRoot = searchDirectory(subDirectory, ff);
+            if ((subRoot != null) && (!subRoot.getChildren().isEmpty())) {
+                filesCount += subRoot.getValue().fileCount;
+                root.getChildren().add(subRoot);
             }
         }
 
-        root.setUserObject(new FileNodeWrapper(directory, files.size() + filesCount));
+        root.setValue(new FileNodeWrapper(directory.toPath(), files.size() + filesCount));
 
         for (File file : files) {
-            root.add(new CheckableTreeNode(new FileNodeWrapper(file)));
-            if (changeListener != null) {
-                changeListener.stateChanged(new ChangeEvent(this));
+            root.getChildren().add(new CheckBoxTreeItem<>(new FileNodeWrapper(file.toPath())));
+
+            counter++;
+            if (counter == 1) {
+                updateMessage(Localization.lang("One file found"));
+            } else {
+                updateMessage(Localization.lang("%0 files found", Integer.toString(counter)));
             }
         }
 
         return root;
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/util/BackgroundTask.java b/src/main/java/org/jabref/gui/util/BackgroundTask.java
index fbc2abb22e9..bab42164053 100644
--- a/src/main/java/org/jabref/gui/util/BackgroundTask.java
+++ b/src/main/java/org/jabref/gui/util/BackgroundTask.java
@@ -5,10 +5,14 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.concurrent.Task;
 
 import org.fxmisc.easybind.EasyBind;
@@ -26,7 +30,9 @@ public abstract class BackgroundTask<V> {
     private Consumer<V> onSuccess;
     private Consumer<Exception> onException;
     private Runnable onFinished;
+    private BooleanProperty isCanceled = new SimpleBooleanProperty(false);
     private ObjectProperty<BackgroundProgress> progress = new SimpleObjectProperty<>(new BackgroundProgress(0, 0));
+    private StringProperty message = new SimpleStringProperty("");
     private DoubleProperty workDonePercentage = new SimpleDoubleProperty(0);
 
     public BackgroundTask() {
@@ -52,6 +58,37 @@ protected Void call() throws Exception {
         };
     }
 
+    private static <T> Consumer<T> chain(Runnable first, Consumer<T> second) {
+        if (first != null) {
+            if (second != null) {
+                return result -> {
+                    first.run();
+                    second.accept(result);
+                };
+            } else {
+                return result -> first.run();
+            }
+        } else {
+            return second;
+        }
+    }
+
+    public boolean isCanceled() {
+        return isCanceled.get();
+    }
+
+    public void cancel() {
+        this.isCanceled.set(true);
+    }
+
+    public BooleanProperty isCanceledProperty() {
+        return isCanceled;
+    }
+
+    public StringProperty messageProperty() {
+        return message;
+    }
+
     public double getWorkDonePercentage() {
         return workDonePercentage.get();
     }
@@ -68,21 +105,6 @@ public ObjectProperty<BackgroundProgress> progressProperty() {
         return progress;
     }
 
-    private static <T> Consumer<T> chain(Runnable first, Consumer<T> second) {
-        if (first != null) {
-            if (second != null) {
-                return result -> {
-                    first.run();
-                    second.accept(result);
-                };
-            } else {
-                return result -> first.run();
-            }
-        } else {
-            return second;
-        }
-    }
-
     /**
      * Sets the {@link Runnable} that is invoked after the task is started.
      */
@@ -197,6 +219,10 @@ protected void updateProgress(double workDone, double max) {
         updateProgress(new BackgroundProgress(workDone, max));
     }
 
+    protected void updateMessage(String newMessage) {
+        message.setValue(newMessage);
+    }
+
     class BackgroundProgress {
 
         private final double workDone;
diff --git a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
index bfed247a73f..fe7f2f64611 100644
--- a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
@@ -103,6 +103,12 @@ private <V> Task<V> getJavaFXTask(BackgroundTask<V> task) {
 
             {
                 EasyBind.subscribe(task.progressProperty(), progress -> updateProgress(progress.getWorkDone(), progress.getMax()));
+                EasyBind.subscribe(task.messageProperty(), this::updateMessage);
+                EasyBind.subscribe(task.isCanceledProperty(), cancelled -> {
+                    if (cancelled) {
+                        cancel();
+                    }
+                });
             }
 
             @Override
diff --git a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
index 87295e0b7dd..983e4c4b29e 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
@@ -49,7 +49,14 @@ public ViewModelListCellFactory<T> withGraphic(Callback<T, Node> toGraphic) {
     }
 
     public ViewModelListCellFactory<T> withIcon(Callback<T, GlyphIcons> toIcon) {
-        this.toGraphic = viewModel -> MaterialDesignIconFactory.get().createIcon(toIcon.call(viewModel));
+        this.toGraphic = viewModel -> {
+            GlyphIcons icon = toIcon.call(viewModel);
+            if (icon != null) {
+                return MaterialDesignIconFactory.get().createIcon(icon);
+            } else {
+                return null;
+            }
+        };
         return this;
     }
 
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
new file mode 100644
index 00000000000..c4d01133406
--- /dev/null
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
@@ -0,0 +1,84 @@
+package org.jabref.gui.util;
+
+import javafx.beans.value.ObservableValue;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBoxTreeItem;
+import javafx.scene.control.TreeCell;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableCell;
+import javafx.scene.control.TreeView;
+import javafx.scene.control.cell.CheckBoxTreeCell;
+import javafx.scene.input.MouseEvent;
+import javafx.util.Callback;
+import javafx.util.StringConverter;
+
+import org.jabref.gui.icon.JabRefIcon;
+
+/**
+ * Constructs a {@link TreeTableCell} based on the view model of the row and a bunch of specified converter methods.
+ *
+ * @param <S> view model
+ * @param <T> cell value
+ */
+public class ViewModelTreeCellFactory<T> implements Callback<TreeView<T>, TreeCell<T>> {
+
+    private Callback<T, String> toText;
+    private Callback<T, Node> toGraphic;
+    private Callback<T, EventHandler<? super MouseEvent>> toOnMouseClickedEvent;
+    private Callback<T, String> toTooltip;
+
+    public ViewModelTreeCellFactory<T> withText(Callback<T, String> toText) {
+        this.toText = toText;
+        return this;
+    }
+
+    public ViewModelTreeCellFactory<T> withGraphic(Callback<T, Node> toGraphic) {
+        this.toGraphic = toGraphic;
+        return this;
+    }
+
+    public ViewModelTreeCellFactory<T> withIcon(Callback<T, JabRefIcon> toIcon) {
+        this.toGraphic = viewModel -> toIcon.call(viewModel).getGraphicNode();
+        return this;
+    }
+
+    public ViewModelTreeCellFactory<T> withTooltip(Callback<T, String> toTooltip) {
+        this.toTooltip = toTooltip;
+        return this;
+    }
+
+    public ViewModelTreeCellFactory<T> withOnMouseClickedEvent(Callback<T, EventHandler<? super MouseEvent>> toOnMouseClickedEvent) {
+        this.toOnMouseClickedEvent = toOnMouseClickedEvent;
+        return this;
+    }
+
+    public void install(TreeView<T> treeView) {
+        treeView.setCellFactory(this);
+    }
+
+    @Override
+    public TreeCell<T> call(TreeView<T> tree) {
+        Callback<TreeItem<T>, ObservableValue<Boolean>> getSelectedProperty =
+                item -> {
+                    if (item instanceof CheckBoxTreeItem<?>) {
+                        return ((CheckBoxTreeItem<?>) item).selectedProperty();
+                    }
+                    return null;
+                };
+
+        StringConverter<TreeItem<T>> converter = new StringConverter<TreeItem<T>>() {
+            @Override
+            public String toString(TreeItem<T> treeItem) {
+                return (treeItem == null || treeItem.getValue() == null || toText == null) ?
+                        "" : toText.call(treeItem.getValue());
+            }
+
+            @Override
+            public TreeItem<T> fromString(String string) {
+                throw new UnsupportedOperationException("Not supported.");
+            }
+        };
+        return new CheckBoxTreeCell<>(getSelectedProperty, converter);
+    }
+}
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index ea96020a5fb..45f724fc252 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -2012,5 +2012,4 @@ public Map<String, SortType> getMainTableColumnSortTypes() {
         }
         return map;
     }
-
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 65d77c60098..529922c4b94 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1393,7 +1393,6 @@ Opens\ the\ file\ browser.=Opens the file browser.
 Scan\ directory=Scan directory
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Searches the selected directory for unlinked files.
 Starts\ the\ import\ of\ BibTeX\ entries.=Starts the import of BibTeX entries.
-Leave\ this\ dialog.=Leave this dialog.
 Create\ directory\ based\ keywords=Create directory based keywords
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Creates keywords in created entrys with directory pathnames
 Select\ a\ directory\ where\ the\ search\ shall\ start.=Select a directory where the search shall start.
@@ -1401,12 +1400,9 @@ Select\ file\ type\:=Select file type:
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=These files are not linked in the active library.
 Entry\ type\ to\ be\ created\:=Entry type to be created:
 Searching\ file\ system...=Searching file system...
-Importing\ into\ Library...=Importing into Library...
-Exporting\ into\ file...=Exporting into file...
 Select\ directory=Select directory
 Select\ files=Select files
 BibTeX\ entry\ creation=BibTeX entry creation
-<No\ selection>=<No selection>
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=Unable to connect to FreeCite online service.
 Parse\ with\ FreeCite=Parse with FreeCite
 How\ would\ you\ like\ to\ link\ to\ '%0'?=How would you like to link to '%0'?
@@ -1981,7 +1977,6 @@ You\ must\ enter\ at\ least\ one\ field\ name=You must enter at least one field
 Non-ASCII\ encoded\ character\ found=Non-ASCII encoded character found
 Toggle\ web\ search\ interface=Toggle web search interface
 %0\ files\ found=%0 files found
-%0\ of\ %1=%0 of %1
 One\ file\ found=One file found
 The\ import\ finished\ with\ warnings\:=The import finished with warnings:
 There\ was\ one\ file\ that\ could\ not\ be\ imported.=There was one file that could not be imported.
diff --git a/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java b/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java
index ec04c0d99e7..49a5a5c8b91 100644
--- a/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java
+++ b/src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java
@@ -1,21 +1,21 @@
 package org.jabref.gui.importer;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.logic.importer.ImportDataTest;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.fileformat.BibtexParser;
+import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.FileFieldParser;
+import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.testutils.category.GUITest;
 
@@ -25,69 +25,61 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @GUITest
-public class EntryFromFileCreatorManagerTest {
+class EntryFromFileCreatorManagerTest {
 
     private final ImportFormatPreferences prefs = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-    private ExternalFileTypes externalFileTypes;
+    private EntryFromFileCreatorManager manager;
 
     @BeforeEach
-    public void setUp() {
-        externalFileTypes = mock(ExternalFileTypes.class, Answers.RETURNS_DEEP_STUBS);
+    void setUp() {
+        ExternalFileTypes externalFileTypes = mock(ExternalFileTypes.class, Answers.RETURNS_DEEP_STUBS);
         when(externalFileTypes.getExternalFileTypeByExt("pdf")).thenReturn(Optional.empty());
+        manager = new EntryFromFileCreatorManager(externalFileTypes);
     }
 
     @Test
-    public void testGetCreator() {
-        EntryFromFileCreatorManager manager = new EntryFromFileCreatorManager(externalFileTypes);
-        EntryFromFileCreator creator = manager.getEntryCreator(ImportDataTest.NOT_EXISTING_PDF);
-        assertNull(creator);
-
-        creator = manager.getEntryCreator(ImportDataTest.FILE_IN_DATABASE);
-        assertNotNull(creator);
-        assertTrue(creator.accept(ImportDataTest.FILE_IN_DATABASE));
+    void getEntryCreatorForNotExistingPDFReturnsEmptyOptional() {
+        assertEquals(Optional.empty(), manager.getEntryCreator(ImportDataTest.NOT_EXISTING_PDF));
     }
 
     @Test
-    public void testAddEntrysFromFiles() throws IOException {
-        try (FileInputStream stream = new FileInputStream(ImportDataTest.UNLINKED_FILES_TEST_BIB);
-             InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(prefs, new DummyFileUpdateMonitor()).parse(reader);
-            BibDatabase database = result.getDatabase();
-
-            List<File> files = new ArrayList<>();
-
-            files.add(ImportDataTest.FILE_NOT_IN_DATABASE);
-            files.add(ImportDataTest.NOT_EXISTING_PDF);
-
-            EntryFromFileCreatorManager manager = new EntryFromFileCreatorManager(externalFileTypes);
-            List<String> errors = manager.addEntrysFromFiles(files, database, null, true);
-
-            /**
-             * One file doesn't exist, so adding it as an entry should lead to an error message.
-             */
-            assertEquals(1, errors.size());
-
-            boolean file1Found = false;
-            boolean file2Found = false;
-            for (BibEntry entry : database.getEntries()) {
-                String filesInfo = entry.getField("file").get();
-                if (filesInfo.contains(files.get(0).getName())) {
-                    file1Found = true;
-                }
-                if (filesInfo.contains(files.get(1).getName())) {
-                    file2Found = true;
-                }
-            }
-
-            assertTrue(file1Found);
-            assertFalse(file2Found);
-        }
+    void getEntryCreatorForExistingPDFReturnsCreatorAcceptingThatFile() {
+        Optional<EntryFromFileCreator> creator = manager.getEntryCreator(ImportDataTest.FILE_IN_DATABASE);
+        assertNotEquals(Optional.empty(), creator);
+        assertTrue(creator.get().accept(ImportDataTest.FILE_IN_DATABASE.toFile()));
+    }
+
+    @Test
+    void testAddEntriesFromFiles() throws IOException {
+        ParserResult result = new BibtexImporter(prefs, new DummyFileUpdateMonitor())
+                .importDatabase(ImportDataTest.UNLINKED_FILES_TEST_BIB, StandardCharsets.UTF_8);
+        BibDatabase database = result.getDatabase();
+
+        List<Path> files = new ArrayList<>();
+        files.add(ImportDataTest.FILE_NOT_IN_DATABASE);
+        files.add(ImportDataTest.NOT_EXISTING_PDF);
+
+        List<String> errors = manager.addEntrysFromFiles(files, database, null, true);
+
+        // One file doesn't exist, so adding it as an entry should lead to an error message.
+        assertEquals(1, errors.size());
+
+        Stream<LinkedFile> linkedFileStream = database.getEntries().stream()
+                                                      .flatMap(entry -> FileFieldParser.parse(entry.getField("file").get()).stream());
+
+        boolean file1Found = linkedFileStream
+                .anyMatch(file -> file.getLink().equalsIgnoreCase(ImportDataTest.FILE_NOT_IN_DATABASE.toString()));
+
+        boolean file2Found = linkedFileStream
+                .anyMatch(file -> file.getLink().equalsIgnoreCase(ImportDataTest.NOT_EXISTING_PDF.toString()));
+
+        assertTrue(file1Found);
+        assertFalse(file2Found);
     }
 }
diff --git a/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java b/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java
index 575d82852b0..0a49334f501 100644
--- a/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java
+++ b/src/test/java/org/jabref/gui/importer/EntryFromPDFCreatorTest.java
@@ -43,17 +43,17 @@ public void testPDFFileFilter() {
 
     @Test
     public void testCreationOfEntryNoPDF() {
-        Optional<BibEntry> entry = entryCreator.createEntry(ImportDataTest.NOT_EXISTING_PDF, false);
+        Optional<BibEntry> entry = entryCreator.createEntry(ImportDataTest.NOT_EXISTING_PDF.toFile(), false);
         assertFalse(entry.isPresent());
     }
 
     @Test
     @Disabled //Can't mock basepanel and maintable
     public void testCreationOfEntryNotInDatabase() {
-        Optional<BibEntry> entry = entryCreator.createEntry(ImportDataTest.FILE_NOT_IN_DATABASE, false);
+        Optional<BibEntry> entry = entryCreator.createEntry(ImportDataTest.FILE_NOT_IN_DATABASE.toFile(), false);
         assertTrue(entry.isPresent());
         assertTrue(entry.get().getField("file").get().endsWith(":PDF"));
-        assertEquals(Optional.of(ImportDataTest.FILE_NOT_IN_DATABASE.getName()),
+        assertEquals(Optional.of(ImportDataTest.FILE_NOT_IN_DATABASE.getFileName().toString()),
                 entry.get().getField("title"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java b/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
index fdb97e6ed88..d5c93399861 100644
--- a/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
+++ b/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
@@ -1,11 +1,9 @@
 package org.jabref.logic.importer;
 
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 
-import org.jabref.logic.importer.fileformat.BibtexParser;
+import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
@@ -18,7 +16,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.mock;
 
-public class DatabaseFileLookupTest {
+class DatabaseFileLookupTest {
 
     private BibDatabase database;
     private Collection<BibEntry> entries;
@@ -27,23 +25,21 @@ public class DatabaseFileLookupTest {
     private BibEntry entry2;
 
     @BeforeEach
-    public void setUp() throws Exception {
-        try (FileInputStream stream = new FileInputStream(ImportDataTest.UNLINKED_FILES_TEST_BIB);
-             InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor()).parse(reader);
-            database = result.getDatabase();
-            entries = database.getEntries();
-
-            entry1 = database.getEntryByKey("entry1").get();
-            entry2 = database.getEntryByKey("entry2").get();
-        }
+    void setUp() throws Exception {
+        ParserResult result = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor())
+                .importDatabase(ImportDataTest.UNLINKED_FILES_TEST_BIB, StandardCharsets.UTF_8);
+        database = result.getDatabase();
+        entries = database.getEntries();
+
+        entry1 = database.getEntryByKey("entry1").get();
+        entry2 = database.getEntryByKey("entry2").get();
     }
 
     /**
      * Tests the prerequisites of this test-class itself.
      */
     @Test
-    public void testTestDatabase() {
+    void testTestDatabase() {
         assertEquals(2, database.getEntryCount());
         assertEquals(2, entries.size());
         assertNotNull(entry1);
diff --git a/src/test/java/org/jabref/logic/importer/ImportDataTest.java b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
index dc457791f75..3a3fbb98c36 100644
--- a/src/test/java/org/jabref/logic/importer/ImportDataTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.importer;
 
-import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.junit.jupiter.api.Test;
@@ -10,38 +11,29 @@
 
 public class ImportDataTest {
 
-    public static final File FILE_IN_DATABASE = Paths
-            .get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf").toFile();
-    public static final File FILE_NOT_IN_DATABASE = Paths
-            .get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf")
-            .toFile();
-    public static final File EXISTING_FOLDER = Paths
-            .get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder").toFile();
-    public static final File NOT_EXISTING_FOLDER = Paths.get("notexistingfolder").toFile();
-    public static final File NOT_EXISTING_PDF = Paths
-            .get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/null.pdf").toFile();
-    public static final File UNLINKED_FILES_TEST_BIB = Paths
-            .get("src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib").toFile();
+    public static final Path FILE_IN_DATABASE = Paths.get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf");
+    public static final Path FILE_NOT_IN_DATABASE = Paths.get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf");
+    public static final Path EXISTING_FOLDER = Paths.get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder");
+    public static final Path NOT_EXISTING_FOLDER = Paths.get("notexistingfolder");
+    public static final Path NOT_EXISTING_PDF = Paths.get("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/null.pdf");
+    public static final Path UNLINKED_FILES_TEST_BIB = Paths.get("src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib");
 
     /**
      * Tests the testing environment.
      */
     @Test
-    public void testTestingEnvironment() {
+    void testTestingEnvironment() {
 
-        assertTrue(ImportDataTest.EXISTING_FOLDER.exists());
-        assertTrue(ImportDataTest.EXISTING_FOLDER.isDirectory());
+        assertTrue(Files.exists(ImportDataTest.EXISTING_FOLDER));
+        assertTrue(Files.isDirectory(ImportDataTest.EXISTING_FOLDER));
 
-        assertTrue(ImportDataTest.FILE_IN_DATABASE.exists());
-        assertTrue(ImportDataTest.FILE_IN_DATABASE.isFile());
+        assertTrue(Files.exists(ImportDataTest.FILE_IN_DATABASE));
+        assertTrue(Files.isRegularFile(ImportDataTest.FILE_IN_DATABASE));
 
-        assertTrue(ImportDataTest.FILE_NOT_IN_DATABASE.exists());
-        assertTrue(ImportDataTest.FILE_NOT_IN_DATABASE.isFile());
-    }
+        assertTrue(Files.exists(ImportDataTest.FILE_NOT_IN_DATABASE));
+        assertTrue(Files.isRegularFile(ImportDataTest.FILE_NOT_IN_DATABASE));
 
-    @Test
-    public void testOpenNotExistingDirectory() {
-        assertFalse(ImportDataTest.NOT_EXISTING_FOLDER.exists());
-        assertFalse(ImportDataTest.NOT_EXISTING_PDF.exists());
+        assertFalse(Files.exists(ImportDataTest.NOT_EXISTING_FOLDER));
+        assertFalse(Files.exists(ImportDataTest.NOT_EXISTING_PDF));
     }
 }

From d37ef3e185b85563d0a68c430b88af3d18833b10 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 17 Oct 2018 13:35:36 +0200
Subject: [PATCH 114/229] Do not execute checkstyle tasks in main test suite on
 travis (#4381)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e270879be38..489044d8ec4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ before_script:
 script:
   # --scan enables the Gradle build scan, which can be used to investigate the time each action consumes
   # For more information see https://gradle.com/scans/get-started
-  - if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS --scan; fi
+  - if [ "$TEST_SUITE" != "guiTest" ] && [ "$TEST_SUITE" != "checkstyle" ] && [ "$TEST_SUITE" != "codecov" ]; then ./gradlew $TEST_SUITE $OPTIONS -x checkstyleJmh -x checkstyleMain -x checkstyleTest --scan; fi
   - if [ "$TEST_SUITE" == "checkstyle" ]; then ./gradlew checkstyleMain checkstyleTest checkstyleJmh; fi
   - if [ "$TEST_SUITE" == "guiTest" ]; then ./buildres/gui-tests.sh; fi
   - if [ "$TEST_SUITE" == "codecov" ]; then ./gradlew jacocoTestReport; bash <(curl -s https://codecov.io/bash); fi

From 7db7bd0ba0be59a88675ed6d9fc39d31fdeb0231 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Fri, 19 Oct 2018 10:53:31 +0200
Subject: [PATCH 115/229] Checkstyle: force braces around code blocks

Enforces that code blocks are surrounded by braces, e.g. the following is invalid
```java
if (test)
    statement;
else
    statement;
```
---
 config/checkstyle/checkstyle.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 20cbcee3f60..d0d037d677b 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -49,6 +49,8 @@
         <module name="ConstantName">
             <property name="format" value="^log(ger)?|[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
         </module>
+            
+        <module name="NeedBraces"/>
     </module>
 
     <module name="SuppressionFilter">

From f43a367c533ce0d4c7a2f26df509f191e3efe2c6 Mon Sep 17 00:00:00 2001
From: Ali <alijakparov.kz@gmail.com>
Date: Fri, 19 Oct 2018 18:29:41 +0600
Subject: [PATCH 116/229] fix NPE in AppearancePreferenceTab (#4386)

* fix NPE in AppearancePreferenceTab

* refactor code

* delete unused import

* set light theme selected by default
---
 .../org/jabref/gui/preferences/AppearancePrefsTab.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
index 92c62d12864..a3a8a349d56 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
@@ -14,6 +14,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.JabRefPreferences;
 
 class AppearancePrefsTab extends Pane implements PrefsTab {
@@ -53,10 +54,12 @@ public AppearancePrefsTab(DialogService dialogService, JabRefPreferences prefs)
         darkTheme = new RadioButton("Dark theme");
         darkTheme.setToggleGroup(themeGroup);
 
-        if (prefs.get(JabRefPreferences.FX_THEME).equals(BASE_CSS))
+        String cssFileName = prefs.get(JabRefPreferences.FX_THEME);
+        if (StringUtil.isBlank(cssFileName) || BASE_CSS.equals(cssFileName)) {
             lightTheme.setSelected(true);
-        else if (prefs.get(JabRefPreferences.FX_THEME).equals(DARK_CSS))
+        } else if (DARK_CSS.equals(cssFileName)) {
             darkTheme.setSelected(true);
+        }
 
         container.getChildren().addAll(overrideFonts, fontSizeContainer, fontTweaksLAF, lightTheme, darkTheme);
 

From e76a28787491788371938791895a0cc866d7705f Mon Sep 17 00:00:00 2001
From: Vlad Topala <topalavlad@gmail.com>
Date: Sun, 21 Oct 2018 01:39:50 +0300
Subject: [PATCH 117/229] Fix showing multiple icons for one menu entry - fixes
 #4384 (#4392)

* Fix showing multiple icons for one menu entry - fixes #4384
It currently only applies to the Rank menu; the sub-entries were only showing the first star instead of 5 stars

* Fix showing multiple icons for one menu entry - fixes #4384
Removed changelog entry
---
 .../java/org/jabref/gui/icon/InternalMaterialDesignIcon.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
index 6eb64b8fc4a..84a02938c6e 100644
--- a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
+++ b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
@@ -57,7 +57,7 @@ public Icon getSmallIcon() {
     public Node getGraphicNode() {
         GlyphIcons icon = icons.get(0);
 
-        Text text = new Text(icon.unicode());
+        Text text = new Text(unicode);
         text.getStyleClass().add("glyph-icon");
         text.setStyle(String.format("-fx-font-family: %s;", icon.fontFamily()));
 

From 44f712132fd3f90d908b9fd4288ffa457581a4e2 Mon Sep 17 00:00:00 2001
From: Ali <alijakparov.kz@gmail.com>
Date: Mon, 22 Oct 2018 19:40:17 +0600
Subject: [PATCH 118/229] Make rank image narrower (#4395)

* make rank image width narrower

* delete border from rank button
---
 src/main/java/org/jabref/gui/maintable/MainTable.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.css b/src/main/java/org/jabref/gui/maintable/MainTable.css
index 5855a86c120..6e5bac6ed4e 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.css
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.css
@@ -22,10 +22,13 @@
 }
 
 .rating > .container > .button {
-    -fx-pref-width: 10;
+    -fx-pref-width: 16;
     -fx-pref-height: 10;
-    -fx-background-size: cover;
-    -fx-padding: 0;
+    -fx-background-repeat: no-repeat no-repeat;
+    -fx-background-size: 16 16;
+    -fx-border-style: none;
+    -fx-border-width: 0;
+    -fx-padding:  0;
 }
 
 .rating > .container > .button.strong {

From b9f9720d04ed946550231607be06e3ce802c5a88 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Mon, 22 Oct 2018 17:15:01 +0200
Subject: [PATCH 119/229] Fix EntryType dialog not closed after generate button
 (#4390)

* Fix EntryType dialog not closed after generate button

When generating an entry from an DOI or similar, the entry was inserted, but the dialog not closed.

* remove obsolete comment

* fix checkstyle
---
 src/main/java/org/jabref/gui/EntryTypeView.java      |  7 +++++++
 src/main/java/org/jabref/gui/EntryTypeViewModel.java | 10 +++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java
index 7eeb35a218c..733eb80ef29 100644
--- a/src/main/java/org/jabref/gui/EntryTypeView.java
+++ b/src/main/java/org/jabref/gui/EntryTypeView.java
@@ -74,6 +74,13 @@ public EntryTypeView(BasePanel basePanel, DialogService dialogService, JabRefPre
 
         btnGenerate.textProperty().bind(EasyBind.map(viewModel.searchingProperty(), searching -> (searching) ? Localization.lang("Searching...") : Localization.lang("Generate")));
         btnGenerate.disableProperty().bind(viewModel.searchingProperty());
+
+        EasyBind.subscribe(viewModel.searchSuccesfulProperty(), value -> {
+            if (value) {
+                setEntryTypeForReturnAndClose(null);
+            }
+        });
+
     }
 
     private void addEntriesToPane(FlowPane pane, Collection<? extends EntryType> entries) {
diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
index bc0464a309d..d023aa48900 100644
--- a/src/main/java/org/jabref/gui/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -36,6 +36,7 @@ public class EntryTypeViewModel {
 
     private final JabRefPreferences prefs;
     private final BooleanProperty searchingProperty = new SimpleBooleanProperty();
+    private final BooleanProperty searchSuccesfulProperty = new SimpleBooleanProperty();
     private final ObjectProperty<IdBasedFetcher> selectedItemProperty = new SimpleObjectProperty<>();
     private final ListProperty<IdBasedFetcher> fetchers = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final StringProperty idText = new SimpleStringProperty();
@@ -53,6 +54,10 @@ public EntryTypeViewModel(JabRefPreferences preferences, BasePanel basePanel, Di
 
     }
 
+    public BooleanProperty searchSuccesfulProperty() {
+        return searchSuccesfulProperty;
+    }
+
     public BooleanProperty searchingProperty() {
         return searchingProperty;
     }
@@ -110,6 +115,7 @@ protected Optional<BibEntry> call() throws InterruptedException, FetcherExceptio
     }
 
     public void runFetcherWorker() {
+        searchSuccesfulProperty.set(false);
         fetcherWorker.run();
         fetcherWorker.setOnFailed(event -> {
             Throwable exception = fetcherWorker.getException();
@@ -124,7 +130,9 @@ public void runFetcherWorker() {
             LOGGER.error(String.format("Exception during fetching when using fetcher '%s' with entry id '%s'.", searchId, fetcher), exception);
 
             searchingProperty.set(false);
+
             fetcherWorker = new FetcherWorker();
+
         });
 
         fetcherWorker.setOnSucceeded(evt -> {
@@ -143,8 +151,8 @@ public void runFetcherWorker() {
                     new BibtexKeyGenerator(basePanel.getBibDatabaseContext(), prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(bibEntry);
                     basePanel.insertEntry(bibEntry);
                 }
+                searchSuccesfulProperty.set(true);
 
-                // close();
             } else if (StringUtil.isBlank(idText.getValue())) {
                 dialogService.showWarningDialogAndWait(Localization.lang("Empty search ID"), Localization.lang("The given search ID was empty."));
             }

From 780c95800e666f123a897dfb3bb01a8f8d0e9527 Mon Sep 17 00:00:00 2001
From: Nivedha <nivedha.sunderraj@gmail.com>
Date: Tue, 23 Oct 2018 18:32:28 +0530
Subject: [PATCH 120/229] Fixes for all mods exporter tests (#4396)

---
 .../org/jabref/logic/exporter/ModsExportFormatTestFiles.java   | 3 ---
 .../jabref/logic/exporter/ModsExportFormatTestAllFields.xml    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
index 7a0d8ac6b6f..009c9f461ac 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
@@ -18,7 +18,6 @@
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -71,7 +70,6 @@ public void setUp(@TempDirectory.TempDir Path testFolder) throws Exception {
         modsImporter = new ModsImporter(mock);
     }
 
-    @Disabled
     @ParameterizedTest
     @MethodSource("fileNames")
     public final void testPerformExport(String filename) throws Exception {
@@ -99,7 +97,6 @@ public final void testExportAsModsAndThenImportAsMods(String filename) throws Ex
         BibEntryAssert.assertEquals(entries, tempFile, modsImporter);
     }
 
-    @Disabled
     @ParameterizedTest
     @MethodSource("fileNames")
     public final void testImportAsModsAndExportAsMods(String filename) throws Exception {
diff --git a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml b/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml
index f446f136049..15158f3323a 100644
--- a/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml
+++ b/src/test/resources/org/jabref/logic/exporter/ModsExportFormatTestAllFields.xml
@@ -57,7 +57,7 @@
             </mods:place>
             <mods:dateCreated keyDate="yes">2000-11-10</mods:dateCreated>
             <mods:issuance>monographic</mods:issuance>
-            <mods:publisher>Verlag verlag</mods:publisher>
+            <mods:publisher ns3:type="mods:stringPlusLanguagePlusSupplied">Verlag verlag</mods:publisher>
         </mods:originInfo>
         <mods:relatedItem type="host">
             <mods:titleInfo>

From eda8e262837f25d836ccec9db6c54f93121c6fde Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus@lynyus.de>
Date: Tue, 23 Oct 2018 16:34:03 +0200
Subject: [PATCH 121/229] Updates (#4402)

* Update Guava from 26 -> 27

* Update mysql-connector-java from 8.0.12 -> 8.0.13

* Update checkstyle from 8.13 -> 8.14

* Add update exception for shadow gradle plugin 4.x

* Update install4j gradle plugin from 7.0.7 -> 7.0.8

* Add exception for the gradle build scan plugin
---
 build.gradle | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8796658b173..a88052930d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
 
 plugins {
     id 'com.gradle.build-scan' version '1.16'
-    id 'com.install4j.gradle' version '7.0.7'
+    id 'com.install4j.gradle' version '7.0.8'
     id 'com.github.johnrengelman.shadow' version '2.0.4'
     id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
     id "com.simonharrer.modernizer" version '1.6.0-1'
@@ -119,13 +119,13 @@ dependencies {
     antlr4 'org.antlr:antlr4:4.7.1'
     compile 'org.antlr:antlr4-runtime:4.7.1'
 
-    compile 'mysql:mysql-connector-java:8.0.12'
+    compile 'mysql:mysql-connector-java:8.0.13'
 
     compile 'org.postgresql:postgresql:42.2.5'
 
     compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
 
-    compile 'com.google.guava:guava:26.0-jre'
+    compile 'com.google.guava:guava:27.0-jre'
 
     // JavaFX stuff
     compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4'
@@ -182,7 +182,7 @@ dependencies {
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:8.13'
+    checkstyle 'com.puppycrawl.tools:checkstyle:8.14'
 }
 
 jacoco {
@@ -204,6 +204,11 @@ dependencyUpdates.resolutionStrategy = {
                 selection.reject("Ignore SNAPSHOT releases")
             }
         }
+        rules.withModule("com.gradle.build-scan:com.gradle.build-scan.gradle.plugin") { ComponentSelection selection ->
+            if (selection.candidate.version ==~ /2.*/) {
+                selection.reject("Cannot be upgraded to version 2 until we upgrade to gradle 5")
+            }
+        }
         rules.withModule("org.controlsfx:controlsfx") { ComponentSelection selection ->
             if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher
                 selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9")
@@ -216,8 +221,8 @@ dependencyUpdates.resolutionStrategy = {
             }
         }
         rules.withModule("com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin") { ComponentSelection selection ->
-            if (selection.candidate.version == /4.0.1/) {
-                selection.reject("Version 4.0.1 breaks the release process.")
+            if (selection.candidate.version ==~ /4.*/) {
+                selection.reject("Version 4.X breaks the release process.")
             }
         }
         rules.withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection ->

From 62fb97151ed09563e882a504a06c6408f8742ae1 Mon Sep 17 00:00:00 2001
From: pavlapp <38015475+pavlapp@users.noreply.github.com>
Date: Wed, 24 Oct 2018 11:17:38 +0200
Subject: [PATCH 122/229] Scrollbar invisible in Preferences -> BibTex Key
 Pattern (#4287) (#4398)

Fixes #4287.

* Scrollbar invisible in Preferences -> BibTex Key Pattern (#4287)
* fix invisible scrollbar in preferences
* divided gridpane to multiple columns

* * change array to arraylist

* Improve code quality

* Improve code quality

* Fix checkstyle

* refactoring css code for invisible scroll
---
 src/main/java/org/jabref/gui/Base.css         |  4 +-
 .../BibtexKeyPatternPanel.java                | 59 +++++++++++--------
 .../gui/preferences/PreferencesDialog.java    |  3 +-
 3 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 6ec8d5c9482..9a7c8b8b223 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -667,6 +667,7 @@
     -fx-background-radius: 0em;
 }
 
+
 .scroll-bar:horizontal .thumb,
 .scroll-bar:vertical .thumb {
     -fx-background-color: -jr-scrollbar-thumb;
@@ -714,7 +715,8 @@
 .tree-view:hover .scroll-bar,
 .table-view:hover .scroll-bar,
 .tree-table-view:hover .scroll-bar,
-.text-input:hover .scroll-bar {
+.text-input:hover .scroll-bar,
+.scroll-pane:hover .scroll-bar {
     -fx-opacity: 1;
 }
 
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
index daf7a4ac105..08a101c740d 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
@@ -36,6 +36,8 @@ public class BibtexKeyPatternPanel extends Pane {
     protected final TextField defaultPat = new TextField();
     private final HelpAction help;
 
+    private final int COLUMNS = 2;
+
     // one field for each type
     private final Map<String, TextField> textFields = new HashMap<>();
     private final BasePanel panel;
@@ -44,25 +46,12 @@ public class BibtexKeyPatternPanel extends Pane {
     public BibtexKeyPatternPanel(BasePanel panel) {
         this.panel = panel;
         help = new HelpAction(Localization.lang("Help on key patterns"), HelpFile.BIBTEX_KEY_PATTERN);
+        gridPane.setHgap(10);
+        gridPane.setVgap(5);
         buildGUI();
     }
 
     private void buildGUI() {
-        // The header - can be removed
-        Label label = new Label(Localization.lang("Entry type"));
-        gridPane.add(label, 1, 1);
-
-        Label keyPattern = new Label(Localization.lang("Key pattern"));
-        gridPane.add(keyPattern, 3, 1);
-
-        Label defaultPattern = new Label(Localization.lang("Default pattern"));
-        gridPane.add(defaultPattern, 1, 2);
-        gridPane.add(defaultPat, 3, 2);
-
-        Button button = new Button("Default");
-        button.setOnAction(e-> defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
-        gridPane.add(button, 4, 2);
-
         BibDatabaseMode mode;
         // check mode of currently used DB
         if (panel != null) {
@@ -72,24 +61,47 @@ private void buildGUI() {
             mode = Globals.prefs.getDefaultBibDatabaseMode();
         }
 
-        int rowIndex = 3;
+        int rowIndex = 1;
+        int columnIndex = 0;
+        // The header - can be removed
+        for (int i = 0; i < COLUMNS; i++) {
+            Label label = new Label(Localization.lang("Entry type"));
+            Label keyPattern = new Label(Localization.lang("Key pattern"));
+            gridPane.add(label, ++columnIndex, rowIndex);
+            gridPane.add(keyPattern, ++columnIndex, rowIndex);
+            ++columnIndex; //3
+        }
+
+        rowIndex++;
+        Label defaultPattern = new Label(Localization.lang("Default pattern"));
+        Button button = new Button("Default");
+        button.setOnAction(e-> defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
+        gridPane.add(defaultPattern, 1, rowIndex);
+        gridPane.add(defaultPat, 2, rowIndex);
+        gridPane.add(button, 3, rowIndex);
+
+        columnIndex = 1;
         for (EntryType type : EntryTypes.getAllValues(mode)) {
             Label label1 = new Label(type.getName());
-
             TextField textField = new TextField();
-
             Button button1 = new Button("Default");
             button1.setOnAction(e1 -> textField.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
 
-            gridPane.add(label1, 1, rowIndex);
-            gridPane.add(textField, 3, rowIndex);
-            gridPane.add(button1, 4, rowIndex);
+            gridPane.add(label1, 1 + (columnIndex * 3) , rowIndex);
+            gridPane.add(textField, 2 + (columnIndex * 3), rowIndex);
+            gridPane.add(button1, 3 + (columnIndex * 3), rowIndex);
 
             textFields.put(type.getName().toLowerCase(Locale.ROOT), textField);
 
-            rowIndex++;
+            if (columnIndex == COLUMNS - 1) {
+                columnIndex = 0;
+                rowIndex++;
+            } else
+                columnIndex++;
         }
 
+        rowIndex++;
+
         Button help1 = new Button("?");
         help1.setOnAction(e->new HelpAction(Localization.lang("Help on key patterns"), HelpFile.BIBTEX_KEY_PATTERN).getHelpButton().doClick());
         gridPane.add(help1, 1, rowIndex);
@@ -102,9 +114,10 @@ private void buildGUI() {
             }
             defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN));
         });
-        gridPane.add(btnDefaultAll1, 3, rowIndex);
+        gridPane.add(btnDefaultAll1, 2, rowIndex);
     }
 
+
     /**
      * fill the given LabelPattern by values generated from the text fields
      */
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index db3e8e22a23..0fe12a13eaf 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -91,8 +91,7 @@ public PreferencesDialog(JabRefFrame parent) {
         preferenceTabs.add(new AppearancePrefsTab(dialogService, prefs));
 
         container = new BorderPane();
-        ScrollPane scroll = new ScrollPane(container);
-        getDialogPane().setContent(scroll);
+        getDialogPane().setContent(container);
         construct();
     }
 

From e8daf2606424155acfd0b87aec0e7c2eb033943f Mon Sep 17 00:00:00 2001
From: Ali <alijakparov.kz@gmail.com>
Date: Thu, 25 Oct 2018 14:33:57 +0600
Subject: [PATCH 123/229] show dialog before creating entry (#4405)

* show dialog before creating entry

* delete unused import

* change new entry to a new article
---
 src/main/java/org/jabref/gui/JabRefFrame.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 2531456c6f0..596fe1972c9 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -618,7 +618,7 @@ private Node createToolbar() {
 
         PushToApplicationButton pushToExternal = new PushToApplicationButton(this, pushApplications.getApplications());
         HBox rightSide = new HBox(
-                factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(this, BiblatexEntryTypes.ARTICLE, dialogService, Globals.prefs)),
+                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)),

From 4d89b0a5511dd9c233c9856632ab48340327b2f2 Mon Sep 17 00:00:00 2001
From: Fancy Zhang <sciencezfx@tju.edu.cn>
Date: Fri, 26 Oct 2018 03:51:50 +0800
Subject: [PATCH 124/229] fix "save" button in preference dialog not response
 (#4406)

Fixes #4391.

* fix "save" button in preference dialog not response or work

this is because default value for fxTheme is not set, thus cause null exception
solution: set default value "Base.css" for key "fxTheme" in preferencewq

* avoid repeat adding the same css

* fix code style
---
 .../java/org/jabref/gui/util/ThemeLoader.java    | 16 +++++++++++-----
 .../jabref/preferences/JabRefPreferences.java    |  3 +++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 7a7004d3445..e9d9a7b40e8 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -36,7 +36,8 @@
  */
 public class ThemeLoader {
 
-    private static final String DEFAULT_PATH_MAIN_CSS = JabRefFrame.class.getResource("Base.css").toExternalForm();
+    public static final String DEFAULT_MAIN_CSS = "Base.css";
+    private static final String DEFAULT_PATH_MAIN_CSS = JabRefFrame.class.getResource(DEFAULT_MAIN_CSS).toExternalForm();
     private static final Logger LOGGER = LoggerFactory.getLogger(ThemeLoader.class);
     private String cssProperty = System.getProperty("jabref.theme.css");
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -57,25 +58,31 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
         }
     }
 
+
     /**
      * Installs the base css file as a stylesheet in the given scene.
      * Changes in the css file lead to a redraw of the scene using the new css file.
      */
     public void installBaseCss(Scene scene, JabRefPreferences preferences) {
-        addAndWatchForChanges(scene, DEFAULT_PATH_MAIN_CSS, 0);
-
         if (StringUtil.isNotBlank(cssProperty)) {
             final Path path = Paths.get(cssProperty);
             if (Files.isReadable(path)) {
                 String cssUrl = path.toUri().toString();
-                addAndWatchForChanges(scene, cssUrl, 1);
+                addAndWatchForChanges(scene, cssUrl, 0);
+            } else {
+                LOGGER.warn(path.toAbsolutePath() + " is not readable");
             }
+        } else {
+            addAndWatchForChanges(scene, DEFAULT_PATH_MAIN_CSS, 0);
         }
 
         preferences.getFontSize().ifPresent(size -> scene.getRoot().setStyle("-fx-font-size: " + size + "pt;"));
     }
 
     private void addAndWatchForChanges(Scene scene, String cssUrl, int index) {
+        // avoid repeat add
+        if (scene.getStylesheets().contains(cssUrl)) return;
+
         scene.getStylesheets().add(index, cssUrl);
 
         try {
@@ -86,7 +93,6 @@ private void addAndWatchForChanges(Scene scene, String cssUrl, int index) {
                 LOGGER.info("Enabling live reloading of " + cssFile);
                 fileUpdateMonitor.addListenerForFile(cssFile, () -> {
                     LOGGER.info("Reload css file " + cssFile);
-
                     DefaultTaskExecutor.runInJavaFXThread(() -> {
                                 scene.getStylesheets().remove(cssUrl);
                                 scene.getStylesheets().add(index, cssUrl);
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 45f724fc252..79d0afc5a5f 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -51,6 +51,7 @@
 import org.jabref.gui.maintable.ColumnPreferences;
 import org.jabref.gui.maintable.MainTablePreferences;
 import org.jabref.gui.preferences.ImportSettingsTab;
+import org.jabref.gui.util.ThemeLoader;
 import org.jabref.logic.bibtex.FieldContentParserPreferences;
 import org.jabref.logic.bibtex.LatexFieldFormatterPreferences;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
@@ -780,6 +781,8 @@ private JabRefPreferences() {
                                     + "\\begin{comment}<BR><BR><b>Comment: </b> \\format[HTMLChars]{\\comment} \\end{comment}"
                                     + "</dd>__NEWLINE__<p></p></font>");
 
+        // set default theme
+        defaults.put(JabRefPreferences.FX_THEME, ThemeLoader.DEFAULT_MAIN_CSS);
         setLanguageDependentDefaultValues();
     }
 

From f1c29c2e1ac89a2d7704ed0e4552dd70424174fb Mon Sep 17 00:00:00 2001
From: conorfos <40298107+conorfos@users.noreply.github.com>
Date: Fri, 26 Oct 2018 08:53:07 +0100
Subject: [PATCH 125/229] Integrate mrdlib redesign (#4361)

* Recommendation retrieval from new Mr. DLib

MrDLibImporter and MrDLibFetcher updated to support JSON and new Mr.
DLib format. Tests updated and passing.

* Create GDPR dialog and update GUI

Created dialog to ask for consent to sed data to Mr. DLib
Created preference setting to keep track of consent
Updated the recommendations GUI to use JavaFX

* Privacy dialog text wrapping

Changed privacy dialog text and allowed the text to wrap.

* Created dev switch based on JabRef version

* Adjusted Hyperlink styling

* Removed .bib file included by mistake

* Simplification of Dev switch

Replaced if/else with in-line conditional

* Removed unnecessary setting of html_representation

Recommendation html_representation field no longer set as it is not used

* Removed .orig file mistakenly added

* Fixed Codacy issues and removed abstracts from tests

Removed html representation test
Removed abstracts from tests

* Moved root styling to css file

* Removed Print Stack Trace call

* Replaced UI strings with Localization.lang strings

* everted to EntryEditorPreferences

* Removed reference to Globals in MrDLibFetcher

* Fixed awkward syntax with JSONObject

* Implemented Dialogs

One to notify the user to restart JabRef after changing preferences
Two to show IOExceptions to the user

* Reverting unintended change

* Set Accept button as default button

* Updated CHANGELOG.md

* Fix for broken MrDLibFetcherTest

* Fix unused imports, refactor event listener to lambda, call static method through classname

* Fix localization strings

Co-authored-by: halirutan <patrick@halirutan.de>
---
 CHANGELOG.md                                  |   1 +
 src/main/java/org/jabref/gui/Base.css         |   1 +
 .../jabref/gui/entryeditor/EntryEditor.css    |  10 +
 .../jabref/gui/entryeditor/EntryEditor.java   |   2 +-
 .../entryeditor/EntryEditorPreferences.java   |   8 +-
 .../gui/entryeditor/RelatedArticlesTab.java   | 164 +++++++++----
 .../gui/preferences/EntryEditorPrefsTab.java  |  10 +-
 .../logic/importer/fetcher/MrDLibFetcher.java |  46 ++--
 .../importer/fileformat/MrDLibImporter.java   | 229 +++++++-----------
 .../jabref/logic/util/StandardFileType.java   |   1 +
 .../jabref/preferences/JabRefPreferences.java |   3 +
 src/main/resources/l10n/JabRef_en.properties  |  20 +-
 .../importer/fetcher/MrDLibFetcherTest.java   |   3 +-
 .../fileformat/MrDLibImporterTest.java        |  38 +--
 14 files changed, 296 insertions(+), 240 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adc97d7c507..9d32677a43e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We added a minimal height for the entry editor so that it can no longer be hidden by accident. [#4279](https://github.com/JabRef/jabref/issues/4279)
 - We added a new keyboard shortcut so that the entry editor could be closed by <kbd>Ctrl<kbd> + <kbd>E<kbd>. [#4222] (https://github.com/JabRef/jabref/issues/4222)
 - We added an option in the preference dialog box, that allows user to pick the dark or light theme option. [#4130] (https://github.com/JabRef/jabref/issues/4130)
+- We updated updated the Related Articles tab to accept JSON from the new version of the Mr. DLib service
 
 
 
diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 9a7c8b8b223..a8644b5c180 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -247,6 +247,7 @@
     -fx-underline: false;
     -fx-border-style: null;
     -fx-border-color: null;
+    -fx-text-fill: -jr-theme;
 }
 
 .hyperlink:visited {
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css
index 47eefbdde49..313583ed222 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css
@@ -79,3 +79,13 @@
 .code-area .text {
     -fx-fill: -fx-text-background-color;
 }
+
+.gdpr-dialog {
+    -fx-font-size: 14pt;
+}
+
+.related-articles-tab {
+    -fx-padding: 20 20 20 20;
+}
+
+
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 75070434db0..46ae9d3d32d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -253,7 +253,7 @@ private List<EntryEditorTab> createTabs() {
         // Special tabs
         tabs.add(new MathSciNetTab());
         tabs.add(new FileAnnotationTab(panel.getAnnotationCache()));
-        tabs.add(new RelatedArticlesTab(preferences));
+        tabs.add(new RelatedArticlesTab(preferences, dialogService));
 
         // Source tab
         sourceTab = new SourceTab(databaseContext, undoManager, preferences.getLatexFieldFormatterPreferences(), preferences.getImportFormatPreferences(), fileMonitor);
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index fd8e1d097b2..ed059ab9f7f 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -16,16 +16,18 @@ public class EntryEditorPreferences {
     private final BibtexKeyPatternPreferences bibtexKeyPatternPreferences;
     private final List<String> customTabFieldNames;
     private final boolean shouldShowRecommendationsTab;
+    private final boolean isMrdlibAccepted;
     private boolean showSourceTabByDefault;
     private final KeyBindingRepository keyBindings;
     private boolean avoidOverwritingCiteKey;
 
-    public EntryEditorPreferences(Map<String, List<String>> entryEditorTabList, LatexFieldFormatterPreferences latexFieldFormatterPreferences, ImportFormatPreferences importFormatPreferences, List<String> customTabFieldNames, boolean shouldShowRecommendationsTab, boolean showSourceTabByDefault, BibtexKeyPatternPreferences bibtexKeyPatternPreferences, KeyBindingRepository keyBindings, boolean avoidOverwritingCiteKey) {
+    public EntryEditorPreferences(Map<String, List<String>> entryEditorTabList, LatexFieldFormatterPreferences latexFieldFormatterPreferences, ImportFormatPreferences importFormatPreferences, List<String> customTabFieldNames, boolean shouldShowRecommendationsTab, boolean isMrdlibAccepted, boolean showSourceTabByDefault, BibtexKeyPatternPreferences bibtexKeyPatternPreferences, KeyBindingRepository keyBindings, boolean avoidOverwritingCiteKey) {
         this.entryEditorTabList = entryEditorTabList;
         this.latexFieldFormatterPreferences = latexFieldFormatterPreferences;
         this.importFormatPreferences = importFormatPreferences;
         this.customTabFieldNames = customTabFieldNames;
         this.shouldShowRecommendationsTab = shouldShowRecommendationsTab;
+        this.isMrdlibAccepted = isMrdlibAccepted;
         this.showSourceTabByDefault = showSourceTabByDefault;
         this.bibtexKeyPatternPreferences = bibtexKeyPatternPreferences;
         this.keyBindings = keyBindings;
@@ -52,6 +54,10 @@ public boolean shouldShowRecommendationsTab() {
         return shouldShowRecommendationsTab;
     }
 
+    public boolean isMrdlibAccepted() {
+        return isMrdlibAccepted;
+    }
+
     public boolean showSourceTabByDefault() {
         return showSourceTabByDefault;
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
index 233d3207ed2..dbbe9ff096a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
@@ -1,82 +1,155 @@
 package org.jabref.gui.entryeditor;
 
-import java.net.URL;
+import java.io.IOException;
 import java.util.List;
-import java.util.Optional;
 
+import javafx.scene.control.Button;
+import javafx.scene.control.Hyperlink;
 import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tooltip;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import javafx.scene.web.WebView;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontPosture;
+import javafx.scene.text.Text;
 
 import org.jabref.Globals;
-import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.util.BackgroundTask;
-import org.jabref.gui.util.OpenHyperlinksInExternalBrowser;
 import org.jabref.logic.importer.fetcher.MrDLibFetcher;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.FieldName;
 import org.jabref.preferences.JabRefPreferences;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * GUI for tab displaying article recommendations based on the currently selected BibEntry
+ */
 public class RelatedArticlesTab extends EntryEditorTab {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(RelatedArticlesTab.class);
     private final EntryEditorPreferences preferences;
+    private final DialogService dialogService;
 
-    public RelatedArticlesTab(EntryEditorPreferences preferences) {
+    public RelatedArticlesTab(EntryEditorPreferences preferences, DialogService dialogService) {
         setText(Localization.lang("Related articles"));
         setTooltip(new Tooltip(Localization.lang("Related articles")));
         this.preferences = preferences;
+        this.dialogService = dialogService;
     }
 
-    private StackPane getPane(BibEntry entry) {
+    /**
+     * Gets a StackPane of related article information to be displayed in the Related Articles tab
+     * @param entry The currently selected BibEntry on the JabRef UI.
+     * @return A StackPane with related article information to be displayed in the Related Articles tab.
+     */
+    private StackPane getRelatedArticlesPane(BibEntry entry) {
         StackPane root = new StackPane();
+        root.getStyleClass().add("related-articles-tab");
         ProgressIndicator progress = new ProgressIndicator();
         progress.setMaxSize(100, 100);
-        WebView browser = new WebView();
-        root.getChildren().addAll(browser, progress);
 
         MrDLibFetcher fetcher = new MrDLibFetcher(Globals.prefs.get(JabRefPreferences.LANGUAGE),
-                Globals.BUILD_INFO.getVersion().getFullVersion());
+                                                  Globals.BUILD_INFO.getVersion());
         BackgroundTask
-                .wrap(() -> fetcher.performSearch(entry))
-                .onRunning(() -> progress.setVisible(true))
-                .onSuccess(relatedArticles -> {
-                    progress.setVisible(false);
-                    browser.getEngine().loadContent(convertToHtml(relatedArticles));
-                })
-                .executeWith(Globals.TASK_EXECUTOR);
+                      .wrap(() -> fetcher.performSearch(entry))
+                      .onRunning(() -> progress.setVisible(true))
+                      .onSuccess(relatedArticles -> {
+                          progress.setVisible(false);
+                          root.getChildren().add(getRelatedArticleInfo(relatedArticles));
+                      })
+                      .executeWith(Globals.TASK_EXECUTOR);
 
-        browser.getEngine().getLoadWorker().stateProperty().addListener(new OpenHyperlinksInExternalBrowser(browser));
+        root.getChildren().add(progress);
 
         return root;
     }
 
     /**
-     * Takes a List of HTML snippets stored in the field "html_representation" of a list of bibentries
-     *
-     * @param list of bib entries having a field html_representation
+     * Creates a VBox of the related article information to be used in the StackPane displayed in the Related Articles tab
+     * @param list List of BibEntries of related articles
+     * @return VBox of related article descriptions to be displayed in the Related Articles tab
      */
-    private String convertToHtml(List<BibEntry> list) {
-        StringBuilder htmlContent = new StringBuilder();
-        URL url = IconTheme.getIconUrl("mdlListIcon");
-        htmlContent
-                .append("<html><head><title></title></head><body bgcolor='#ffffff'>");
-        htmlContent.append("<ul style='list-style-image:(");
-        htmlContent.append(url);
-        htmlContent.append(")'>");
-        list.stream()
-                .map(bibEntry -> bibEntry.getField("html_representation"))
-                .filter(Optional::isPresent)
-                .map(o -> "<li style='margin: 5px'>" + o.get() + "</li>")
-                .forEach(html -> htmlContent.append(html));
-        htmlContent.append("</ul>");
-        htmlContent.append("<br><div style='margin-left: 5px'>");
-        htmlContent.append(
-                "<a href='http://mr-dlib.org/information-for-users/information-about-mr-dlib-for-jabref-users/#' target=\"_blank\">");
-        htmlContent.append(Localization.lang("What is Mr. DLib?"));
-        htmlContent.append("</a></div>");
-        htmlContent.append("</body></html>");
-        return htmlContent.toString();
+    private VBox getRelatedArticleInfo(List<BibEntry> list) {
+        VBox vBox = new VBox();
+        vBox.setSpacing(20.0);
+
+        for (BibEntry entry : list) {
+            HBox hBox = new HBox();
+            hBox.setSpacing(5.0);
+
+            String title = entry.getTitle().orElse("");
+            String journal = entry.getField(FieldName.JOURNAL).orElse("");
+            String authors = entry.getField(FieldName.AUTHOR).orElse("");
+            String year = entry.getField(FieldName.YEAR).orElse("");
+
+            Hyperlink titleLink = new Hyperlink(title);
+            Text journalText = new Text(journal);
+            journalText.setFont(Font.font(Font.getDefault().getFamily(), FontPosture.ITALIC, Font.getDefault().getSize()));
+            Text authorsText = new Text(authors);
+            Text yearText = new Text("(" + year + ")");
+            titleLink.setOnAction(event -> {
+                if (entry.getField(FieldName.URL).isPresent()) {
+                    try {
+                        JabRefDesktop.openBrowser(entry.getField(FieldName.URL).get());
+                    } catch (IOException e) {
+                        LOGGER.error("Error opening the browser to: " + entry.getField(FieldName.URL).get(), e);
+                        dialogService.showErrorDialogAndWait(e);
+                    }
+                }
+            });
+
+            hBox.getChildren().addAll(titleLink, journalText, authorsText, yearText);
+            vBox.getChildren().add(hBox);
+        }
+        return vBox;
+    }
+
+    /**
+     * Returns a consent dialog used to ask permission to send data to Mr. DLib.
+     * @param entry Currently selected BibEntry. (required to allow reloading of pane if accepted)
+     * @return StackPane returned to be placed into Related Articles tab.
+     */
+    private ScrollPane getPrivacyDialog(BibEntry entry) {
+        ScrollPane root = new ScrollPane();
+        root.getStyleClass().add("related-articles-tab");
+        VBox vbox = new VBox();
+        vbox.getStyleClass().add("gdpr-dialog");
+        vbox.setSpacing(20.0);
+
+        Button button = new Button(Localization.lang("I Agree"));
+        button.setDefaultButton(true);
+        Text line1 = new Text(Localization.lang("Mr. DLib is an external service which provides article recommendations based on the currently selected entry. Data about the selected entry must be sent to Mr. DLib in order to provide these recommendations. Do you agree that this data may be sent?"));
+
+        line1.setWrappingWidth(1300.0);
+        Text line2 = new Text(Localization.lang("This setting may be changed in preferences at any time."));
+        Hyperlink mdlLink = new Hyperlink(Localization.lang("Further information about Mr DLib. for JabRef users."));
+        mdlLink.setOnAction(event -> {
+            try {
+                JabRefDesktop.openBrowser("http://mr-dlib.org/information-for-users/information-about-mr-dlib-for-jabref-users/");
+            } catch (IOException e) {
+                LOGGER.error("Error opening the browser to Mr. DLib information page.", e);
+                dialogService.showErrorDialogAndWait(e);
+            }
+        });
+
+        button.setOnAction(event -> {
+            JabRefPreferences prefs = JabRefPreferences.getInstance();
+            prefs.putBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS, true);
+            dialogService.showWarningDialogAndWait(Localization.lang("Restart"), Localization.lang("Please restart JabRef for preferences to take effect."));
+            setContent(getRelatedArticlesPane(entry));
+        });
+
+        vbox.getChildren().addAll(line1, mdlLink, line2, button);
+        root.setContent(vbox);
+
+        return root;
     }
 
     @Override
@@ -86,6 +159,11 @@ public boolean shouldShow(BibEntry entry) {
 
     @Override
     protected void bindToEntry(BibEntry entry) {
-        setContent(getPane(entry));
+        // Ask for consent to send data to Mr. DLib on first time to tab
+        if (preferences.isMrdlibAccepted()) {
+            setContent(getRelatedArticlesPane(entry));
+        } else {
+            setContent(getPrivacyDialog(entry));
+        }
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
index 4530cb88157..ab874bf1287 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
@@ -27,6 +27,7 @@ class EntryEditorPrefsTab extends Pane implements PrefsTab {
     private final CheckBox emacsRebindCtrlF;
     private final CheckBox autoComplete;
     private final CheckBox recommendations;
+    private final CheckBox acceptRecommendations;
     private final CheckBox validation;
     private final RadioButton autoCompBoth;
     private final RadioButton autoCompFF;
@@ -51,6 +52,7 @@ public EntryEditorPrefsTab(JabRefPreferences prefs) {
         emacsRebindCtrlF = new CheckBox(Localization.lang("Rebind C-f, too"));
         autoComplete = new CheckBox(Localization.lang("Enable word/name autocompletion"));
         recommendations = new CheckBox(Localization.lang("Show 'Related Articles' tab"));
+        acceptRecommendations = new CheckBox(Localization.lang("Accept recommendations from Mr. DLib"));
         validation = new CheckBox(Localization.lang("Show validation messages"));
 
         // allowed name formats
@@ -84,8 +86,9 @@ public EntryEditorPrefsTab(JabRefPreferences prefs) {
         builder.add(emacsRebindCtrlA, 1, 5);
         builder.add(emacsRebindCtrlF, 1, 6);
         builder.add(recommendations, 1, 7);
-        builder.add(validation, 1, 8);
-        builder.add(new Label(""), 1, 9);
+        builder.add(acceptRecommendations, 1, 8);
+        builder.add(validation, 1, 9);
+        builder.add(new Label(""), 1, 10);
 
         Label autocompletionOptions = new Label(Localization.lang("Autocompletion options"));
         autocompletionOptions.getStyleClass().add("sectionHeader");
@@ -113,6 +116,7 @@ public EntryEditorPrefsTab(JabRefPreferences prefs) {
         builder.add(firstNameModeBoth,  1, 22);
     }
 
+    @Override
     public Node getBuilder() {
         return builder;
     }
@@ -135,6 +139,7 @@ public void setValues() {
         emacsRebindCtrlA.setSelected(prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA));
         emacsRebindCtrlF.setSelected(prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CF));
         recommendations.setSelected(prefs.getBoolean(JabRefPreferences.SHOW_RECOMMENDATIONS));
+        acceptRecommendations.setSelected(prefs.getBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS));
         autoComplete.setSelected(autoCompletePreferences.shouldAutoComplete());
         autoCompFields.setText(autoCompletePreferences.getCompleteNamesAsString());
 
@@ -171,6 +176,7 @@ public void storeSettings() {
         prefs.putBoolean(JabRefPreferences.AUTO_OPEN_FORM, autoOpenForm.isSelected());
         prefs.putBoolean(JabRefPreferences.DEFAULT_SHOW_SOURCE, defSource.isSelected());
         prefs.putBoolean(JabRefPreferences.SHOW_RECOMMENDATIONS, recommendations.isSelected());
+        prefs.putBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS, acceptRecommendations.isSelected());
         prefs.putBoolean(JabRefPreferences.VALIDATE_IN_ENTRY_EDITOR, validation.isSelected());
         boolean emacsModeChanged = prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS) != emacsMode.isSelected();
         boolean emacsRebindCtrlAChanged = prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA) != emacsRebindCtrlA.isSelected();
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
index 199d68dee32..2ae7db36e35 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package org.jabref.logic.importer.fetcher;
 
 import java.io.IOException;
@@ -14,8 +11,8 @@
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.MrDLibImporter;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.util.Version;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
@@ -25,17 +22,16 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * This class is responible to get the recommendations from MDL
+ * This class is responsible for getting the recommendations from Mr. DLib
  */
 public class MrDLibFetcher implements EntryBasedFetcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(MrDLibFetcher.class);
-
     private static final String NAME = "MDL_FETCHER";
     private final String LANGUAGE;
-    private final String VERSION;
+    private final Version VERSION;
 
 
-    public MrDLibFetcher(String language, String version) {
+    public MrDLibFetcher(String language, Version version) {
         LANGUAGE = language;
         VERSION = version;
     }
@@ -51,22 +47,22 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         if (title.isPresent()) {
             String response = makeServerRequest(title.get());
             MrDLibImporter importer = new MrDLibImporter();
-            ParserResult parserResult = new ParserResult();
+            ParserResult parserResult;
             try {
                 if (importer.isRecognizedFormat(response)) {
                     parserResult = importer.importDatabase(response);
                 } else {
                     // For displaying An ErrorMessage
+                    String error = importer.getResponseErrorMessage(response);
                     BibEntry errorBibEntry = new BibEntry();
-                    errorBibEntry.setField("html_representation",
-                            Localization.lang("Error while fetching from %0", "Mr.DLib"));
+                    errorBibEntry.setField("html_representation", error);
                     BibDatabase errorBibDataBase = new BibDatabase();
                     errorBibDataBase.insertEntry(errorBibEntry);
                     parserResult = new ParserResult(errorBibDataBase);
                 }
             } catch (IOException e) {
                 LOGGER.error(e.getMessage(), e);
-                throw new FetcherException("XML Parser IOException.");
+                throw new FetcherException("JSON Parser IOException.");
             }
             return parserResult.getDatabase().getEntries();
         } else {
@@ -78,13 +74,13 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
     /**
      * Contact the server with the title of the selected item
      *
-     * @param query: The query holds the title of the selected entry. Used to make a query to the MDL Server
+     * @param queryByTitle: The query holds the title of the selected entry. Used to make a query to the MDL Server
      * @return Returns the server response. This is an XML document as a String.
      */
     private String makeServerRequest(String queryByTitle) throws FetcherException {
         try {
             URLDownload urlDownload = new URLDownload(constructQuery(queryByTitle));
-            urlDownload.bypassSSLVerification();
+            URLDownload.bypassSSLVerification();
             String response = urlDownload.asString();
 
             //Conversion of < and >
@@ -97,29 +93,33 @@ private String makeServerRequest(String queryByTitle) throws FetcherException {
     }
 
     /**
-     * Constructs the query based on title of the bibentry. Adds statistical stuff to the url.
+     * Constructs the query based on title of the BibEntry. Adds statistical stuff to the url.
      *
-     * @param query: the title of the bib entry.
+     * @param queryWithTitle: the title of the bib entry.
      * @return the string used to make the query at mdl server
      */
     private String constructQuery(String queryWithTitle) {
         // The encoding does not work for / so we convert them by our own
-        queryWithTitle = queryWithTitle.replaceAll("/", "convbckslsh");
+        queryWithTitle = queryWithTitle.replaceAll("/", " ");
         URIBuilder builder = new URIBuilder();
-        builder.setScheme("https");
-        builder.setHost("api.mr-dlib.org");
-        builder.setPath("/v1/documents/" + queryWithTitle + "/related_documents");
+        builder.setScheme("http");
+        builder.setHost(getMdlUrl());
+        builder.setPath("/v2/items/" + queryWithTitle + "/related_items");
         builder.addParameter("partner_id", "jabref");
         builder.addParameter("app_id", "jabref_desktop");
-        builder.addParameter("app_version", VERSION);
+        builder.addParameter("app_version", VERSION.getFullVersion());
         builder.addParameter("app_lang", LANGUAGE);
-        URI uri = null;
         try {
-            uri = builder.build();
+            URI uri = builder.build();
+            LOGGER.trace("Request: " + uri.toString());
             return uri.toString();
         } catch (URISyntaxException e) {
             LOGGER.error(e.getMessage(), e);
         }
         return "";
     }
+
+    private String getMdlUrl() {
+        return VERSION.isDevelopmentVersion() ? "api-dev.darwingoliath.com" : "api.darwingoliath.com";
+    }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
index 491eff2c8d1..6320b8d7483 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
@@ -4,58 +4,45 @@
 package org.jabref.logic.importer.fileformat;
 
 import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.stream.Collectors;
 
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
 
 /**
- *
- *
+ * Handles importing of recommended articles to be displayed in the Related Articles tab.
  */
 public class MrDLibImporter extends Importer {
 
+    private static final String DEFAULT_MRDLIB_ERROR_MESSAGE = Localization.lang("Error while fetching from Mr.DLib.");
     private static final Logger LOGGER = LoggerFactory.getLogger(MrDLibImporter.class);
     public ParserResult parserResult;
 
+    @SuppressWarnings("unused")
     @Override
     public boolean isRecognizedFormat(BufferedReader input) throws IOException {
         String recommendationsAsString = convertToString(input);
-        // check for valid format
         try {
-            SAXParserFactory factory = SAXParserFactory.newInstance();
-            SAXParser saxParser = factory.newSAXParser();
-            DefaultHandler handler = new DefaultHandler() {
-                // No Processing here. Just check for valid xml.
-                // Later here will be the check against the XML schema.
-            };
-
-            try (InputStream stream = new ByteArrayInputStream(recommendationsAsString.getBytes())) {
-                saxParser.parse(stream, handler);
-            } catch (Exception e) {
+            JSONObject jsonObject = new JSONObject(recommendationsAsString);
+            if (!jsonObject.has("recommendations")) {
                 return false;
             }
-        } catch (ParserConfigurationException | SAXException e) {
+        } catch (JSONException ex) {
             return false;
         }
         return true;
@@ -74,18 +61,18 @@ public String getName() {
 
     @Override
     public StandardFileType getFileType() {
-        return StandardFileType.XML;
+        return StandardFileType.JSON;
     }
 
     @Override
     public String getDescription() {
-        return "Takes valid xml documents. Parses from MrDLib API a BibEntry";
+        return "Takes valid JSON documents from the Mr. DLib API and parses them into a BibEntry";
     }
 
     /**
-     * The SaxParser needs this String. So I convert it here.
-     * @param Takes a BufferedReader with a reference to the XML document delivered by mdl server.
-     * @return Returns an String containing the XML file.
+     * Convert Buffered Reader response to string for JSON parsing.
+     * @param input Takes a BufferedReader with a reference to the JSON document delivered by mdl server.
+     * @return Returns an String containing the JSON document.
      * @throws IOException
      */
     private String convertToString(BufferedReader input) throws IOException {
@@ -117,7 +104,7 @@ public RankedBibEntry(BibEntry entry, Integer rank) {
 
     /**
      * Parses the input from the server to a ParserResult
-     * @param input A BufferedReader with a reference to a string with the servers response
+     * @param input A BufferedReader with a reference to a string with the server's response
      * @throws IOException
      */
     private void parse(BufferedReader input) throws IOException {
@@ -126,133 +113,95 @@ private void parse(BufferedReader input) throws IOException {
         // The document to parse
         String recommendations = convertToString(input);
         // The sorted BibEntries gets stored here later
-        List<BibEntry> bibEntries = new ArrayList<>();
-        //Parsing the response with a SAX parser
-        try {
-            SAXParserFactory factory = SAXParserFactory.newInstance();
-            SAXParser saxParser = factory.newSAXParser();
-            MrDlibImporterHandler handler = new MrDlibImporterHandler();
-            try (InputStream stream = new ByteArrayInputStream(recommendations.getBytes())) {
-                saxParser.parse(stream, handler);
-            } catch (SAXException e) {
-                LOGGER.error(e.getMessage(), e);
-            }
-            List<RankedBibEntry> rankedBibEntries = handler.getRankedBibEntries();
-            rankedBibEntries.sort((RankedBibEntry rankedBibEntry1,
-                    RankedBibEntry rankedBibEntry2) -> rankedBibEntry1.rank.compareTo(rankedBibEntry2.rank));
-            bibEntries = rankedBibEntries.stream().map(e -> e.entry).collect(Collectors.toList());
-        } catch (ParserConfigurationException | SAXException e) {
-            LOGGER.error(e.getMessage(), e);
+        List<RankedBibEntry> rankedBibEntries = new ArrayList<>();
+
+        // Get recommendations from response and populate bib entries
+        JSONObject recommendationsJson = new JSONObject(recommendations).getJSONObject("recommendations");
+        Iterator<String> keys = recommendationsJson.keys();
+        while (keys.hasNext()) {
+            String key = keys.next();
+            JSONObject value = recommendationsJson.getJSONObject(key);
+            rankedBibEntries.add(populateBibEntry(value));
         }
 
+        // Sort bib entries according to rank
+        rankedBibEntries.sort((RankedBibEntry rankedBibEntry1,
+                               RankedBibEntry rankedBibEntry2) -> rankedBibEntry1.rank.compareTo(rankedBibEntry2.rank));
+        List<BibEntry> bibEntries = rankedBibEntries.stream().map(e -> e.entry).collect(Collectors.toList());
+
         for (BibEntry bibentry : bibEntries) {
             bibDatabase.insertEntry(bibentry);
         }
-
         parserResult = new ParserResult(bibDatabase);
     }
 
-    public ParserResult getParserResult() {
-        return parserResult;
-    }
-
     /**
-     * Handler that parses the response from Mr. DLib to BibEntries
+     * Parses the JSON recommendations into bib entries
+     * @param recommendation JSON object of a single recommendation returned by Mr. DLib
+     * @return A ranked bib entry created from the recommendation input
      */
-    private class MrDlibImporterHandler extends DefaultHandler {
-
-        // The list ob BibEntries with its associated rank
-        private final List<RankedBibEntry> rankedBibEntries = new ArrayList<>();
-
-        private boolean authors;
-        private boolean published_in;
-        private boolean title;
-        private boolean year;
-        private boolean snippet;
-        private boolean rank;
-        private boolean type;
-        private String htmlSnippetSingle;
-        private int htmlSnippetSingleRank = -1;
-        private BibEntry currentEntry;
-
-        public List<RankedBibEntry> getRankedBibEntries() {
-            return rankedBibEntries;
-        }
+    private RankedBibEntry populateBibEntry(JSONObject recommendation) {
+        BibEntry current = new BibEntry();
+
+        // parse each of the relevant fields into variables
+        String authors = isRecommendationFieldPresent(recommendation, "authors") ? getAuthorsString(recommendation) : "";
+        String title = isRecommendationFieldPresent(recommendation, "title") ? recommendation.getString("title") : "";
+        String year = isRecommendationFieldPresent(recommendation, "year_published") ? Integer.toString(recommendation.getInt("year_published")) : "";
+        String journal = isRecommendationFieldPresent(recommendation, "published_in") ? recommendation.getString("published_in") : "";
+        String url = isRecommendationFieldPresent(recommendation, "url") ? recommendation.getString("url") : "";
+        Integer rank = isRecommendationFieldPresent(recommendation, "url") ? recommendation.getInt("recommendation_id") : 100;
+
+        // Populate bib entry with relevant data
+        current.setField(FieldName.AUTHOR, authors);
+        current.setField(FieldName.TITLE, title);
+        current.setField(FieldName.YEAR, year);
+        current.setField(FieldName.JOURNAL, journal);
+        current.setField(FieldName.URL, url);
+
+        return new RankedBibEntry(current, rank);
+    }
 
-        @Override
-        public void startElement(String uri, String localName, String qName, Attributes attributes)
-                throws SAXException {
+    private Boolean isRecommendationFieldPresent(JSONObject recommendation, String field) {
+        return recommendation.has(field) && !recommendation.isNull(field);
+    }
 
-            switch (qName.toLowerCase(Locale.ROOT)) {
-            case "related_article":
-                currentEntry = new BibEntry();
-                htmlSnippetSingle = null;
-                htmlSnippetSingleRank = -1;
-                break;
-            case "authors":
-                authors = true;
-                break;
-            case "published_in":
-                published_in = true;
-                break;
-            case "title":
-                title = true;
-                break;
-            case "year":
-                year = true;
-                break;
-            case "type":
-                type = true;
-                break;
-            case "suggested_rank":
-                rank = true;
-                break;
-            default:
-                break;
-            }
-            if (qName.equalsIgnoreCase("snippet")
-                    && attributes.getValue(0).equalsIgnoreCase("html_fully_formatted")) {
-                snippet = true;
-            }
+    /**
+     * Creates an authors string from a JSON recommendation
+     * @param recommendation JSON Object recommendation from Mr. DLib
+     * @return A string of all authors, separated by commas and finished with a full stop.
+     */
+    private String getAuthorsString(JSONObject recommendation) {
+        String authorsString = "";
+        JSONArray array = recommendation.getJSONArray("authors");
+        for (int i = 0; i < array.length(); ++i) {
+            authorsString += array.getString(i) + "; ";
         }
-
-        @Override
-        public void endElement(String uri, String localName, String qName) throws SAXException {
-            if (qName.equalsIgnoreCase("related_article")) {
-                rankedBibEntries.add(new RankedBibEntry(currentEntry, htmlSnippetSingleRank));
-                currentEntry = new BibEntry();
-            }
+        int stringLength = authorsString.length();
+        if (stringLength > 2) {
+            authorsString = authorsString.substring(0, stringLength - 2) + ".";
         }
+        return authorsString;
+    }
 
-        @Override
-        public void characters(char ch[], int start, int length) throws SAXException {
+    public ParserResult getParserResult() {
+        return parserResult;
+    }
 
-            if (authors) {
-                currentEntry.setField(FieldName.AUTHOR, new String(ch, start, length));
-                authors = false;
-            }
-            if (published_in) {
-                currentEntry.setField(FieldName.JOURNAL, new String(ch, start, length));
-                published_in = false;
-            }
-            if (title) {
-                currentEntry.setField(FieldName.TITLE, new String(ch, start, length));
-                title = false;
-            }
-            if (year) {
-                currentEntry.setField(FieldName.YEAR, new String(ch, start, length));
-                year = false;
-            }
-            if (rank) {
-                htmlSnippetSingleRank = Integer.parseInt(new String(ch, start, length));
-                rank = false;
-            }
-            if (snippet) {
-                currentEntry.setField("html_representation", new String(ch, start, length));
-                snippet = false;
+    /**
+     * Gets the error message to be returned if there has been an error in returning recommendations.
+     * Returns default error message if there is no message from Mr. DLib.
+     * @param response The response from the MDL server as a string.
+     * @return String error message to be shown to the user.
+     */
+    public String getResponseErrorMessage(String response) {
+        try {
+            JSONObject jsonObject = new JSONObject(response);
+            if (!jsonObject.has("message")) {
+                return jsonObject.getString("message");
             }
-
+        } catch (JSONException ex) {
+            return DEFAULT_MRDLIB_ERROR_MESSAGE;
         }
-
+        return DEFAULT_MRDLIB_ERROR_MESSAGE;
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index 5eb21456754..db7766e9811 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -36,6 +36,7 @@ public enum StandardFileType implements FileType {
     RTF("rtf"),
     SXC("sxc"),
     XML("xml"),
+    JSON("json"),
     XMP("xmp"),
     ZIP("zip");
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 79d0afc5a5f..a61c1762f99 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -303,6 +303,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String NAME_FORMATER_KEY = "nameFormatterNames";
     public static final String PUSH_TO_APPLICATION = "pushToApplication";
     public static final String SHOW_RECOMMENDATIONS = "showRecommendations";
+    public static final String ACCEPT_RECOMMENDATIONS = "acceptRecommendations";
     public static final String VALIDATE_IN_ENTRY_EDITOR = "validateInEntryEditor";
     // Dropped file handler
     public static final String DROPPEDFILEHANDLER_RENAME = "DroppedFileHandler_RenameFile";
@@ -571,6 +572,7 @@ private JabRefPreferences() {
         defaults.put(MERGE_ENTRIES_DIFF_MODE, 2);
 
         defaults.put(SHOW_RECOMMENDATIONS, Boolean.TRUE);
+        defaults.put(ACCEPT_RECOMMENDATIONS, Boolean.FALSE);
         defaults.put(VALIDATE_IN_ENTRY_EDITOR, Boolean.TRUE);
         defaults.put(EDITOR_EMACS_KEYBINDINGS, Boolean.FALSE);
         defaults.put(EDITOR_EMACS_KEYBINDINGS_REBIND_CA, Boolean.TRUE);
@@ -903,6 +905,7 @@ public EntryEditorPreferences getEntryEditorPreferences() {
                                           getImportFormatPreferences(),
                                           getCustomTabFieldNames(),
                                           getBoolean(SHOW_RECOMMENDATIONS),
+                                          getBoolean(ACCEPT_RECOMMENDATIONS),
                                           getBoolean(DEFAULT_SHOW_SOURCE),
                                           getBibtexKeyPatternPreferences(),
                                           Globals.getKeyPrefs(),
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 529922c4b94..aa3101e4371 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -31,9 +31,9 @@ Accept=Accept
 
 Accept\ change=Accept change
 
-Action=Action
+Accept\ recommendations\ from\ Mr.\ DLib=Accept recommendations from Mr. DLib
 
-What\ is\ Mr.\ DLib?=What is Mr. DLib?
+Action=Action
 
 Add=Add
 
@@ -379,6 +379,8 @@ Error\ occurred\ when\ parsing\ entry=Error occurred when parsing entry
 
 Error\ opening\ file=Error opening file
 
+Error\ while\ fetching\ from\ Mr.DLib.=Error while fetching from Mr.DLib.
+
 Error\ while\ writing=Error while writing
 
 '%0'\ exists.\ Overwrite\ file?='%0' exists. Overwrite file?
@@ -466,6 +468,8 @@ found\ in\ AUX\ file=found in AUX file
 
 Full\ name=Full name
 
+Further\ information\ about\ Mr\ DLib.\ for\ JabRef\ users.=Further information about Mr DLib. for JabRef users.
+
 General=General
 
 General\ Fields=General Fields
@@ -560,6 +564,8 @@ Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Indepe
 
 Work\ options=Work options
 
+I\ Agree=I Agree
+
 Insert=Insert
 
 Insert\ rows=Insert rows
@@ -656,6 +662,9 @@ Move\ up=Move up
 
 Moved\ group\ "%0".=Moved group "%0".
 
+Mr.\ DLib\ is\ an\ external\ service\ which\ provides\ article\ recommendations\ based\ on\ the\ currently\ selected\ entry.\ Data\ about\ the\ selected\ entry\ must\ be\ sent\ to\ Mr.\ DLib\ in\ order\ to\ provide\ these\ recommendations.\ Do\ you\ agree\ that\ this\ data\ may\ be\ sent?=Mr. DLib is an external service which provides article recommendations based on the currently selected entry. Data about the selected entry must be sent to Mr. DLib in order to provide these recommendations. Do you agree that this data may be sent?
+
+
 Name=Name
 Name\ formatter=Name formatter
 
@@ -786,6 +795,8 @@ Please\ enter\ the\ string's\ label=Please enter the string's label
 
 Please\ select\ an\ importer.=Please select an importer.
 
+Please\ restart\ JabRef\ for\ preferences\ to\ take\ effect.=Please restart JabRef for preferences to take effect.
+
 Possible\ duplicate\ entries=Possible duplicate entries
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Possible duplicate of existing entry. Click to resolve.
@@ -897,6 +908,9 @@ Resolve\ strings\ for\ all\ fields\ except=Resolve strings for all fields except
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Resolve strings for standard BibTeX fields only
 
 resolved=resolved
+
+Restart=Restart
+
 Review=Review
 Review\ changes=Review changes
 Review\ Field\ Migration=Review Field Migration
@@ -1063,6 +1077,8 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=This operation requires one or more entries to be selected.
 
+This\ setting\ may\ be\ changed\ in\ preferences\ at\ any\ time.=This setting may be changed in preferences at any time.
+
 Toggle\ entry\ preview=Toggle entry preview
 Toggle\ groups\ interface=Toggle groups interface
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
index c35684edf48..357e50393fd 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.util.Version;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 import org.jabref.testutils.category.FetcherTest;
@@ -20,7 +21,7 @@ public class MrDLibFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        fetcher = new MrDLibFetcher("", "");
+        fetcher = new MrDLibFetcher("", Version.parse(""));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
index 7c2c1e5d837..5af07b4dfa3 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
@@ -19,23 +19,18 @@
 public class MrDLibImporterTest {
 
     private MrDLibImporter importer;
-    private BufferedReader inputMin;
-    private BufferedReader inputMax;
+    private BufferedReader input;
 
     @BeforeEach
     public void setUp() {
         importer = new MrDLibImporter();
-
-        String testMin = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><mr-dlib></mr-dlib>";
-        String testMax = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><mr-dlib><related_articles set_id=\"28184\" suggested_label=\"Related Articles\"><related_article document_id=\"2250539\" original_document_id=\"gesis-solis-00538797\" recommendation_id=\"204944\"><authors/><click_url>https://api-dev.mr-dlib.org/v1/recommendations/204944/original_url?access_key=99ab2fc64f3228ab839e9e3525ac37f8&format=direct_url_forward</click_url><debug_details><bibDocId>0</bibDocId><bibScore>2.0</bibScore><finalScore>2.0</finalScore><rankAfterAlgorithm>3</rankAfterAlgorithm><rankAfterReRanking>3</rankAfterReRanking><rankAfterShuffling>2</rankAfterShuffling><rankDelivered>2</rankDelivered><relevanceScoreFromAlgorithm>1.0</relevanceScoreFromAlgorithm></debug_details><fallback_url>http://sowiport.gesis.org/search/id/gesis-solis-00538797</fallback_url><published_in>Fachhochschulverl.</published_in><snippet format=\"html_plain\"><![CDATA[<a href='https://api-dev.mr-dlib.org/v1/recommendations/204944/original_url?access_key=99ab2fc64f3228ab839e9e3525ac37f8&format=direct_url_forward'>Gesundheit von Arbeitslosen fördern!: ein Handbuch für Wissenschaft und Praxis</a>. . Fachhochschulverl.. 2009.]]></snippet><snippet format=\"html_fully_formatted\"><![CDATA[<a href='https://api-dev.mr-dlib.org/v1/recommendations/204944/original_url?access_key=99ab2fc64f3228ab839e9e3525ac37f8&format=direct_url_forward'><font color='#000000' size='5' face='Arial, Helvetica, sans-serif'>Gesundheit von Arbeitslosen fördern!: ein Handbuch für Wissenschaft und Praxis.</font></a><font color='#000000' size='5' face='Arial, Helvetica, sans-serif'>. <i>Fachhochschulverl.</i>. 2009.</font>]]></snippet><snippet format=\"html_and_css\"><![CDATA[<span class='mdl-title'>Gesundheit von Arbeitslosen fördern!: ein Handbuch für Wissenschaft und Praxis</span>. <span class='mdl-authors'></span>. <span class='mdl-journal'>Fachhochschulverl.</span>. <span class='mdl-year'>2009</span>]]></snippet><suggested_rank>2</suggested_rank><title>Gesundheit von Arbeitslosen fördern!: ein Handbuch für Wissenschaft und Praxis</title><year>2009</year></related_article></related_articles></mr-dlib>";
-        testMax = testMax.replaceAll("&", "");
-        inputMin = new BufferedReader(new StringReader(testMin));
-        inputMax = new BufferedReader(new StringReader(testMax));
+        String testInput = "{    \"label\": {        \"label-language\": \"en\",        \"label-text\": \"Related Items\"    },    \"recommendation-set-id\": \"1\",    \"recommendations\": {        \"74021358\": {            \"abstract\": \"abstract\",            \"authors\": [                \"Sajovic, Marija\"         ],            \"year_published\": \"2006\",            \"item_id_original\": \"12088644\",            \"keywords\": [                \"visoko\\u0161olski program Geodezija - smer Prostorska informatika\"            ],            \"language_provided\": \"sl\",            \"recommendation_id\": \"1\",            \"title\": \"The protection of rural lands with the spatial development strategy on the case of Hrastnik commune\",            \"url\": \"http://drugg.fgg.uni-lj.si/701/1/GEV_0199_Sajovic.pdf\"        },        \"82005804\": {            \"abstract\": \"abstract\",            \"year_published\": null,            \"item_id_original\": \"30145702\",            \"language_provided\": null,            \"recommendation_id\": \"2\",            \"title\": \"Engagement of the volunteers in the solution to the accidents in the South-Moravia region\"        },        \"82149599\": {            \"abstract\": \"abstract\",            \"year_published\": null,            \"item_id_original\": \"97690763\",            \"language_provided\": null,            \"recommendation_id\": \"3\",            \"title\": \"\\\"The only Father's word\\\". The relationship of the Father and the Son in the documents of saint John of the Cross\",            \"url\": \"http://www.nusl.cz/ntk/nusl-285711\"        },        \"84863921\": {            \"abstract\": \"abstract\",            \"authors\": [                \"Kaffa, Elena\"            ],            \"year_published\": null,            \"item_id_original\": \"19397104\",            \"keywords\": [                \"BX\",                \"D111\"            ],            \"language_provided\": \"en\",            \"recommendation_id\": \"4\",            \"title\": \"Greek Church of Cyprus, the Morea and Constantinople during the Frankish Era (1196-1303)\"        },        \"88950992\": {            \"abstract\": \"abstract\",            \"authors\": [                \"Yasui, Kono\"            ],            \"year_published\": null,            \"item_id_original\": \"38763657\",            \"language_provided\": null,            \"recommendation_id\": \"5\",            \"title\": \"A Phylogenetic Consideration on the Vascular Plants, Cotyledonary Node Including Hypocotyl Being Taken as the Ancestral Form : A Preliminary Note\"        }    }}";
+        input = new BufferedReader(new StringReader(testInput));
     }
 
     @Test
     public void testGetDescription() {
-        assertEquals("Takes valid xml documents. Parses from MrDLib API a BibEntry", importer.getDescription());
+        assertEquals("Takes valid JSON documents from the Mr. DLib API and parses them into a BibEntry", importer.getDescription());
     }
 
     @Test
@@ -45,46 +40,35 @@ public void testGetName() {
 
     @Test
     public void testGetFileExtention() {
-        assertEquals(StandardFileType.XML, importer.getFileType());
-    }
-
-    @Test
-    public void testImportDatabaseIsHtmlSetCorrectly() throws IOException {
-        ParserResult parserResult = importer.importDatabase(inputMax);
-
-        List<BibEntry> resultList = parserResult.getDatabase().getEntries();
-
-        assertEquals(
-                "<a href='https://api-dev.mr-dlib.org/v1/recommendations/204944/original_url?access_key=99ab2fc64f3228ab839e9e3525ac37f8format=direct_url_forward'><font color='#000000' size='5' face='Arial, Helvetica, sans-serif'>Gesundheit von Arbeitslosen fördern!: ein Handbuch für Wissenschaft und Praxis.</font></a><font color='#000000' size='5' face='Arial, Helvetica, sans-serif'>. <i>Fachhochschulverl.</i>. 2009.</font>",
-                resultList.get(0).getField("html_representation").get());
+        assertEquals(StandardFileType.JSON, importer.getFileType());
     }
 
     @Test
     public void testImportDatabaseIsYearSetCorrectly() throws IOException {
-        ParserResult parserResult = importer.importDatabase(inputMax);
+        ParserResult parserResult = importer.importDatabase(input);
 
         List<BibEntry> resultList = parserResult.getDatabase().getEntries();
 
-        assertEquals("2009",
+        assertEquals("2006",
                 resultList.get(0).getLatexFreeField(FieldName.YEAR).get());
     }
 
     @Test
     public void testImportDatabaseIsTitleSetCorrectly() throws IOException {
-        ParserResult parserResult = importer.importDatabase(inputMax);
+        ParserResult parserResult = importer.importDatabase(input);
 
         List<BibEntry> resultList = parserResult.getDatabase().getEntries();
 
-        assertEquals("Gesundheit von Arbeitslosen fördern!: ein Handbuch für Wissenschaft und Praxis",
+        assertEquals("The protection of rural lands with the spatial development strategy on the case of Hrastnik commune",
                 resultList.get(0).getLatexFreeField(FieldName.TITLE).get());
     }
 
     @Test
     public void testImportDatabaseMin() throws IOException {
-        ParserResult parserResult = importer.importDatabase(inputMin);
+        ParserResult parserResult = importer.importDatabase(input);
 
         List<BibEntry> resultList = parserResult.getDatabase().getEntries();
 
-        assertSame(0, resultList.size());
+        assertSame(5, resultList.size());
     }
 }

From cf7b31c47f96e2177112bfde9fd3f90b0f01402b Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Fri, 26 Oct 2018 10:21:22 +0200
Subject: [PATCH 126/229] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000000..32a3c7f37fb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+<!-- 
+Note: Please use the GitHub issue tracker only for bug reports. 
+Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
+Thanks! 
+--> 
+
+JabRef version <!-- version as shown in the about box --> on <!-- Windows 10|Ubuntu 14.04|Mac OS X 10.8|... -->
+<!-- Hint: If you use a development version (available at http://builds.jabref.org/master/), ensure that you use the latest one. -->
+- [ ] I have tested the latest development version from http://builds.jabref.org/master/ and the problem persists
+
+<!-- Add a clear and concise description of what the bug is. -->
+
+Steps to reproduce the behavior:
+1. ...
+2. ...
+3. ...
+
+<!-- If applicable, add excerpt of the bibliography file, screenshot, and excerpt of log (available in the error console) -->
+
+<details>
+  <summary>Log File</summary>
+  
+  ```
+  Paste an excerpt of your log file here
+  ```
+</details>

From 2783caf5249b3da65e79e317e4c4389e79f74aa7 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Fri, 26 Oct 2018 10:22:11 +0200
Subject: [PATCH 127/229] Delete ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 1426417c5bf..00000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- Note: Please use the GitHub Issue tracker only for BugReports. 
-Feature requests,  questions and general feedback is now handled at http://discourse.jabref.org 
-Thanks! --> 
-
-- [ ] I have tested the latest master version from http://builds.jabref.org/master/ and the problem persists
-
-
-JabRef version <!-- version as shown in the about box --> on <!-- Windows 10|Ubuntu 14.04|Mac OS X 10.8|... -->
-<!-- Hint: If you use a development version (available at http://builds.jabref.org/master/), ensure that you use the latest one. -->
-
-
-Steps to reproduce:
-
-1. ...
-2. ...
-3. ...
-
-<!-- If applicable, excerpt of the bibliography file, screenshot, and excerpt of log (available in the error console) -->
-
-<details>
-  <summary>Log File</summary>
-  
-  ```
-  Paste an excerpt of your log file here
-  ```
-</details>

From 3d8570bb7ac854f6feaeb58eab26cd1cb285bb1c Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Fri, 26 Oct 2018 10:27:00 +0200
Subject: [PATCH 128/229] Update issue templates

---
 .github/ISSUE_TEMPLATE/feature_request.md     |  9 +++++++++
 .github/ISSUE_TEMPLATE/question.md            |  9 +++++++++
 .../suggestion-for-improvement.md             | 20 +++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/question.md
 create mode 100644 .github/ISSUE_TEMPLATE/suggestion-for-improvement.md

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000000..d2ae96c562d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,9 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+Please use the GitHub issue tracker only for bug reports and suggestions for improvements.
+Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
+Thanks!
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000000..7e9c25fe4b4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,9 @@
+---
+name: Question
+about: Ask a question about JabRef
+
+---
+
+Please use the GitHub issue tracker only for bug reports and suggestions for improvements.
+Feature requests, questions and general feedback is now handled at http://discourse.jabref.org.
+Thanks!
diff --git a/.github/ISSUE_TEMPLATE/suggestion-for-improvement.md b/.github/ISSUE_TEMPLATE/suggestion-for-improvement.md
new file mode 100644
index 00000000000..ec6d48cc1dc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/suggestion-for-improvement.md
@@ -0,0 +1,20 @@
+---
+name: Suggestion for improvement
+about: Suggest an enhancement
+
+---
+
+<!--
+Please use the GitHub issue tracker only for bug reports and smaller suggestions for improvements.
+Requests for completely new features, questions and general feedback is now handled at http://discourse.jabref.org.
+Thanks!
+-->
+
+**Is your suggestion for improvement related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

From d65ca33af4c6adf85d7aac9d77bc93d59a1fefd6 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Fri, 26 Oct 2018 16:23:31 +0200
Subject: [PATCH 129/229] Fix display of radio buttons (#4411)

Previously, unchecked radio buttons were not displayed.
---
 src/main/java/org/jabref/gui/Base.css         |  22 +++-
 .../org/jabref/styletester/StyleTester.fxml   | 119 +++++++++++-------
 2 files changed, 96 insertions(+), 45 deletions(-)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index a8644b5c180..ed4bbd29f96 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -391,12 +391,32 @@
 }
 
 .check-box > .box > .mark {
-    -fx-background-color: white;
+    -fx-background-color: -fx-control-inner-background;
     -fx-padding: 0.2em 0.2em 0.2em 0.2em;
     -fx-shape: "M6.61 11.89L3.5 8.78 2.44 9.84 6.61 14l8.95-8.95L14.5 4z";
     -fx-stroke-width: 5;
 }
 
+.radio-button > .radio {
+    -fx-background-radius: 1.0em; /* large value to make sure this remains circular */
+    -fx-padding: 0.35em; /* padding from outside edge to the inner dot */
+    -fx-background-color: rgba(0, 0, 0, 0.54), -fx-control-inner-background;
+    -fx-background-insets: 0, 2px;
+}
+
+.radio-button:selected > .radio {
+    -fx-background-color: -jr-checked, -fx-background;
+}
+
+.radio-button > .radio > .dot {
+    -fx-padding: 0.25em; /* radius of the inner dot when selected */
+    -fx-background-insets: 0;
+}
+
+.radio-button:selected > .radio > .dot {
+    -fx-background-color: -jr-checked;
+}
+
 .menu-bar {
     -fx-background-color: -jr-menu-background;
     -fx-background-insets: 0;
diff --git a/src/main/java/org/jabref/styletester/StyleTester.fxml b/src/main/java/org/jabref/styletester/StyleTester.fxml
index 8ace521ed71..6eaf7bae249 100644
--- a/src/main/java/org/jabref/styletester/StyleTester.fxml
+++ b/src/main/java/org/jabref/styletester/StyleTester.fxml
@@ -28,147 +28,178 @@
 <?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.input.KeyCodeCombination?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-<AnchorPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="600.0" prefWidth="900.0"
-            xmlns="http://javafx.com/javafx/8.0.121" fx:controller="org.jabref.styletester.StyleTesterView">
+
+<AnchorPane prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.121"
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.styletester.StyleTesterView">
     <TabPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
              AnchorPane.topAnchor="0.0">
         <Tab text="Buttons">
-            <GridPane vgap="16" hgap="32" style="-fx-padding: 20 30 20 30;">
-                <Label GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="6">Normal buttons:</Label>
-                <Button text="Normal" GridPane.rowIndex="1" GridPane.columnIndex="0">
+            <GridPane hgap="32" style="-fx-padding: 20 30 20 30;" vgap="16">
+                <Label GridPane.columnIndex="0" GridPane.columnSpan="6" GridPane.rowIndex="0">Normal buttons:</Label>
+                <Button text="Normal" GridPane.columnIndex="0" GridPane.rowIndex="1">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button text="Hover" fx:id="normalButtonHover" GridPane.rowIndex="1" GridPane.columnIndex="1">
+                <Button fx:id="normalButtonHover" text="Hover" GridPane.columnIndex="1" GridPane.rowIndex="1">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button text="Pressed" fx:id="normalButtonPressed" GridPane.rowIndex="1" GridPane.columnIndex="2">
+                <Button fx:id="normalButtonPressed" text="Pressed" GridPane.columnIndex="2" GridPane.rowIndex="1">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button text="Focused" fx:id="normalButtonFocused" GridPane.rowIndex="1" GridPane.columnIndex="3">
+                <Button fx:id="normalButtonFocused" text="Focused" GridPane.columnIndex="3" GridPane.rowIndex="1">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button disable="true" text="Disabled" GridPane.rowIndex="1" GridPane.columnIndex="4">
+                <Button disable="true" text="Disabled" GridPane.columnIndex="4" GridPane.rowIndex="1">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button defaultButton="true" text="Default" GridPane.rowIndex="1" GridPane.columnIndex="5">
+                <Button defaultButton="true" text="Default" GridPane.columnIndex="5" GridPane.rowIndex="1">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button cancelButton="true" text="Cancel" GridPane.rowIndex="1" GridPane.columnIndex="6">
+                <Button cancelButton="true" text="Cancel" GridPane.columnIndex="6" GridPane.rowIndex="1">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Label GridPane.rowIndex="2" GridPane.columnIndex="0" GridPane.columnSpan="6">Text buttons:</Label>
-                <Button text="Normal" styleClass="text-button" GridPane.rowIndex="3" GridPane.columnIndex="0">
+                <Label GridPane.columnIndex="0" GridPane.columnSpan="6" GridPane.rowIndex="2">Text buttons:</Label>
+                <Button styleClass="text-button" text="Normal" GridPane.columnIndex="0" GridPane.rowIndex="3">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button text="Hover" fx:id="textButtonHover" styleClass="text-button" GridPane.rowIndex="3"
-                        GridPane.columnIndex="1">
+                <Button fx:id="textButtonHover" styleClass="text-button" text="Hover" GridPane.columnIndex="1"
+                        GridPane.rowIndex="3">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button text="Pressed" fx:id="textButtonPressed" styleClass="text-button" GridPane.rowIndex="3"
-                        GridPane.columnIndex="2">
+                <Button fx:id="textButtonPressed" styleClass="text-button" text="Pressed" GridPane.columnIndex="2"
+                        GridPane.rowIndex="3">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button text="Focused" fx:id="textButtonFocused" styleClass="text-button" GridPane.rowIndex="3"
-                        GridPane.columnIndex="3">
+                <Button fx:id="textButtonFocused" styleClass="text-button" text="Focused" GridPane.columnIndex="3"
+                        GridPane.rowIndex="3">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button disable="true" text="Disabled" styleClass="text-button" GridPane.rowIndex="3"
-                        GridPane.columnIndex="4">
+                <Button disable="true" styleClass="text-button" text="Disabled" GridPane.columnIndex="4"
+                        GridPane.rowIndex="3">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button defaultButton="true" text="Default" styleClass="text-button" GridPane.rowIndex="3"
-                        GridPane.columnIndex="5">
+                <Button defaultButton="true" styleClass="text-button" text="Default" GridPane.columnIndex="5"
+                        GridPane.rowIndex="3">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button cancelButton="true" text="Cancel" styleClass="text-button" GridPane.rowIndex="3"
-                        GridPane.columnIndex="6">
+                <Button cancelButton="true" styleClass="text-button" text="Cancel" GridPane.columnIndex="6"
+                        GridPane.rowIndex="3">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Label GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="6">Contained buttons:</Label>
-                <Button text="Normal" styleClass="contained-button" GridPane.rowIndex="5" GridPane.columnIndex="0">
+                <Label GridPane.columnIndex="0" GridPane.columnSpan="6" GridPane.rowIndex="4">Contained buttons:</Label>
+                <Button styleClass="contained-button" text="Normal" GridPane.columnIndex="0" GridPane.rowIndex="5">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button text="Hover" fx:id="containedButtonHover" styleClass="contained-button" GridPane.rowIndex="5"
-                        GridPane.columnIndex="1">
+                <Button fx:id="containedButtonHover" styleClass="contained-button" text="Hover" GridPane.columnIndex="1"
+                        GridPane.rowIndex="5">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button text="Pressed" fx:id="containedButtonPressed" styleClass="contained-button"
-                        GridPane.rowIndex="5" GridPane.columnIndex="2">
+                <Button fx:id="containedButtonPressed" styleClass="contained-button" text="Pressed"
+                        GridPane.columnIndex="2" GridPane.rowIndex="5">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button text="Focused" fx:id="containedButtonFocused" styleClass="contained-button"
-                        GridPane.rowIndex="5" GridPane.columnIndex="3">
+                <Button fx:id="containedButtonFocused" styleClass="contained-button" text="Focused"
+                        GridPane.columnIndex="3" GridPane.rowIndex="5">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button disable="true" text="Disabled" styleClass="contained-button" GridPane.rowIndex="5"
-                        GridPane.columnIndex="4">
+                <Button disable="true" styleClass="contained-button" text="Disabled" GridPane.columnIndex="4"
+                        GridPane.rowIndex="5">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button defaultButton="true" text="Default" styleClass="contained-button" GridPane.rowIndex="5"
-                        GridPane.columnIndex="5">
+                <Button defaultButton="true" styleClass="contained-button" text="Default" GridPane.columnIndex="5"
+                        GridPane.rowIndex="5">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
-                <Button cancelButton="true" text="Cancel" styleClass="contained-button" GridPane.rowIndex="5"
-                        GridPane.columnIndex="6">
+                <Button cancelButton="true" styleClass="contained-button" text="Cancel" GridPane.columnIndex="6"
+                        GridPane.rowIndex="5">
                     <graphic>
                         <JabRefIconView glyph="ADD_NOBOX"/>
                     </graphic>
                 </Button>
+                <columnConstraints>
+                    <ColumnConstraints/>
+                    <ColumnConstraints/>
+                    <ColumnConstraints/>
+                    <ColumnConstraints/>
+                    <ColumnConstraints/>
+                    <ColumnConstraints/>
+                    <ColumnConstraints/>
+                </columnConstraints>
+                <rowConstraints>
+                    <RowConstraints/>
+                    <RowConstraints/>
+                    <RowConstraints/>
+                    <RowConstraints/>
+                    <RowConstraints/>
+                    <RowConstraints/>
+                </rowConstraints>
             </GridPane>
         </Tab>
         <Tab text="Switches">
-            <VBox style="-fx-padding: 1em" spacing="10">
+            <VBox spacing="10" style="-fx-padding: 1em">
                 <Label text="Checkboxes"/>
-                <VBox style="-fx-padding: 0em 0em 0em 1em" spacing="15">
+                <VBox spacing="15" style="-fx-padding: 0em 0em 0em 1em">
                     <CheckBox text="Unchecked"/>
-                    <CheckBox text="Checked" selected="true"/>
-                    <CheckBox text="Unchecked disabled" disable="true"/>
-                    <CheckBox text="Checked disabled" disable="true" selected="true"/>
+                    <CheckBox selected="true" text="Checked"/>
+                    <CheckBox disable="true" text="Unchecked disabled"/>
+                    <CheckBox disable="true" selected="true" text="Checked disabled"/>
+                </VBox>
+                <Label text="Radio-Buttons">
+                    <VBox.margin>
+                        <Insets top="20.0"/>
+                    </VBox.margin>
+                </Label>
+                <VBox spacing="15" style="-fx-padding: 0em 0em 0em 1em">
+                    <RadioButton text="Unchecked"/>
+                    <RadioButton selected="true" text="Checked"/>
+                    <RadioButton disable="true" text="Unchecked disabled"/>
+                    <RadioButton disable="true" selected="true" text="Checked disabled"/>
                 </VBox>
             </VBox>
         </Tab>

From e7a65c771de515e184616199082e5bb1f6d69abe Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Fri, 26 Oct 2018 16:29:19 +0200
Subject: [PATCH 130/229] Add a few journal abbreviations (#4412)

---
 src/main/resources/journals/journalList.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/resources/journals/journalList.txt b/src/main/resources/journals/journalList.txt
index 3d019b4bfa6..cdb5e36ab78 100644
--- a/src/main/resources/journals/journalList.txt
+++ b/src/main/resources/journals/journalList.txt
@@ -3544,6 +3544,7 @@ Communication and Medicine = Commun. Med.
 Communications in Agricultural and Applied Biological Sciences = Commun. Agric. Appl. Biol. Sci.
 Communications in Behavioral Biology. Part A, Original Articles = Commun. Behav. Biol.
 Communications in Computational Physics = Comm. Comput. Phys.
+Communications in Contemporary Mathematics = Commun. Contemp. Math.
 Communications in Mathematical PHysics = Commun. Math. Phys.
 Communications in Nonlinear Science and Numerical Simulation = Commun. Nonlinear Sci. Numer. Simul.
 Communications in Numerical Methods in Engineering = Commun. Numer. Methods Eng.
@@ -7986,6 +7987,7 @@ Journal of Geographical Sciences = J. Geog. Sci.
 Journal of Geological Education = J. Geol. Educ.
 Journal of Geology = J. Geol.
 Journal of Geomagnetism and Geoelectricity = J. Geomagn. Geoelec.
+Journal of Geometric Mechanics = J. Geom. Mech.
 Journal of Geometry and Physics = J. Geom. Phys.
 Journal of Geophysical Research = J. Geophys. Res.
 Journal of Geophysical Research, [Atmospheres] = J. Geophys. Res. Atmos.

From 940fa2ce3f5579d65b503d4d294f832be5c9d2a9 Mon Sep 17 00:00:00 2001
From: Fancy Zhang <sciencezfx@tju.edu.cn>
Date: Fri, 26 Oct 2018 22:34:36 +0800
Subject: [PATCH 131/229] fixed an issue where corresponding groups are
 sometimes not highlighted when clicking on entries (#4404)

* fixed an issue where corresponding groups are sometimes not highlighted when clicking on entries
:
the cause of this bug is that the local variable "pseudoClassState" is garbaged by java gc.
there is no reference to this variable except an weak one from "bind" function.

* Remove unused imports

* Update BindingsHelper.java
---
 CHANGELOG.md                                  |  1 +
 .../org/jabref/gui/util/BindingsHelper.java   | 20 +------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d32677a43e..91a47bb024c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 
 
 ### Fixed
+- We fixed an issue where corresponding groups are sometimes not highlighted when clicking on entries [#3112](https://github.com/JabRef/jabref/issues/3112)
 - We fixed an issue where custom exports could not be selected in the 'Export (selected) entries' dialog [#4013](https://github.com/JabRef/jabref/issues/4013)
 - Italic text is now rendered correctly. https://github.com/JabRef/jabref/issues/3356
 - The entry editor no longer gets corrupted after using the source tab. https://github.com/JabRef/jabref/issues/3532 https://github.com/JabRef/jabref/issues/3608 https://github.com/JabRef/jabref/issues/3616
diff --git a/src/main/java/org/jabref/gui/util/BindingsHelper.java b/src/main/java/org/jabref/gui/util/BindingsHelper.java
index 8ae0b7be563..162fb210065 100644
--- a/src/main/java/org/jabref/gui/util/BindingsHelper.java
+++ b/src/main/java/org/jabref/gui/util/BindingsHelper.java
@@ -9,8 +9,6 @@
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.StringBinding;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.BooleanPropertyBase;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.Property;
 import javafx.beans.value.ChangeListener;
@@ -44,23 +42,7 @@ public static <T> BooleanBinding all(ObservableList<T> source, Predicate<T> pred
     }
 
     public static void includePseudoClassWhen(Node node, PseudoClass pseudoClass, ObservableValue<? extends Boolean> condition) {
-        BooleanProperty pseudoClassState = new BooleanPropertyBase(false) {
-            @Override
-            protected void invalidated() {
-                node.pseudoClassStateChanged(pseudoClass, get());
-            }
-
-            @Override
-            public Object getBean() {
-                return node;
-            }
-
-            @Override
-            public String getName() {
-                return pseudoClass.getPseudoClassName();
-            }
-        };
-        pseudoClassState.bind(condition);
+        condition.addListener((obs, oldValue, newValue) -> node.pseudoClassStateChanged(pseudoClass, newValue));
     }
 
     /**

From c3fe6818ffd1ba305a00eb10f755376c1cdc1ec2 Mon Sep 17 00:00:00 2001
From: Fancy Zhang <sciencezfx@tju.edu.cn>
Date: Sat, 27 Oct 2018 19:57:38 +0800
Subject: [PATCH 132/229] fix java.nio.file.FileSystemNotFoundException and
 reorganize code (#4416)

---
 .../java/org/jabref/gui/util/ThemeLoader.java | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index e9d9a7b40e8..9c4e84ce3f6 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Objects;
@@ -11,7 +10,6 @@
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 
-import org.jabref.JabRefException;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -39,21 +37,25 @@ public class ThemeLoader {
     public static final String DEFAULT_MAIN_CSS = "Base.css";
     private static final String DEFAULT_PATH_MAIN_CSS = JabRefFrame.class.getResource(DEFAULT_MAIN_CSS).toExternalForm();
     private static final Logger LOGGER = LoggerFactory.getLogger(ThemeLoader.class);
-    private String cssProperty = System.getProperty("jabref.theme.css");
+    private String cssToLoad = System.getProperty("jabref.theme.css");
     private final FileUpdateMonitor fileUpdateMonitor;
 
-    public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRefPreferences) throws JabRefException {
+    public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRefPreferences) {
         this.fileUpdateMonitor = Objects.requireNonNull(fileUpdateMonitor);
 
-        if (StringUtil.isNullOrEmpty(cssProperty)) {
-            String cssFileName = jabRefPreferences.get(JabRefPreferences.FX_THEME);
-            if (cssFileName != null) {
-                try {
-                    cssProperty = Paths.get(JabRefFrame.class.getResource(cssFileName).toURI()).toString();
-                } catch (URISyntaxException e) {
-                    LOGGER.warn("can't get css file URI");
-                    throw new JabRefException("can't set custom theme");
-                }
+        if (!StringUtil.isNullOrEmpty(cssToLoad)) {
+            LOGGER.info("using css from system " + cssToLoad);
+            return;
+        }
+
+        // otherwise load css from preference
+        String cssFileName = jabRefPreferences.get(JabRefPreferences.FX_THEME);
+        if (cssFileName != null) {
+            try {
+                cssToLoad = JabRefFrame.class.getResource(cssFileName).toExternalForm();
+                LOGGER.info("using css " + cssToLoad);
+            } catch (Exception e) {
+                LOGGER.warn("can't get css file path of " + cssFileName);
             }
         }
     }
@@ -64,15 +66,10 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
      * Changes in the css file lead to a redraw of the scene using the new css file.
      */
     public void installBaseCss(Scene scene, JabRefPreferences preferences) {
-        if (StringUtil.isNotBlank(cssProperty)) {
-            final Path path = Paths.get(cssProperty);
-            if (Files.isReadable(path)) {
-                String cssUrl = path.toUri().toString();
-                addAndWatchForChanges(scene, cssUrl, 0);
-            } else {
-                LOGGER.warn(path.toAbsolutePath() + " is not readable");
-            }
+        if (!StringUtil.isNullOrEmpty(cssToLoad)) {
+            addAndWatchForChanges(scene, cssToLoad, 0);
         } else {
+            LOGGER.warn("using the last default css " + DEFAULT_PATH_MAIN_CSS);
             addAndWatchForChanges(scene, DEFAULT_PATH_MAIN_CSS, 0);
         }
 
@@ -88,7 +85,7 @@ private void addAndWatchForChanges(Scene scene, String cssUrl, int index) {
         try {
             // If -Djabref.theme.css is defined and the resources are not part of a .jar bundle,
             // we watch the file for changes and turn on live reloading
-            if (!cssUrl.startsWith("jar:") && cssProperty != null) {
+            if (!cssUrl.startsWith("jar:")) {
                 Path cssFile = Paths.get(new URL(cssUrl).toURI());
                 LOGGER.info("Enabling live reloading of " + cssFile);
                 fileUpdateMonitor.addListenerForFile(cssFile, () -> {

From 72a73a6e1bc8a8206261a6c0e28ea4646ec7844b Mon Sep 17 00:00:00 2001
From: Christoph <siedlerkiller@gmail.com>
Date: Sat, 27 Oct 2018 15:28:51 +0200
Subject: [PATCH 133/229] Update README.md

Remove obsolete integration test description. Add a note on travis
---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5cd2607dbc4..e4a60dc95da 100644
--- a/README.md
+++ b/README.md
@@ -101,9 +101,7 @@ When you want to develop, it is necessary to generate additional sources using `
 and then generate the Eclipse `gradlew eclipse`.
 For IntelliJ IDEA, just import the project via a Gradle Import by pointing at the `build.gradle`.
 
-`gradlew test` executes the normal unit tests.
-If you want to test the UI, execute `gradlew integrationTest`.
-Sources for the integration test are kept in `src/integrationTest`.
+`gradlew test` executes all tests. We use Travis CI[https://travis-ci.org/] for executing the tests after each commit. For developing it is sufficient to locally only run the associated test for the classes you changed. Travis will report any other failure.
 
 
 ## Acknowledgements

From f5a8f00a892f46ee6f3c8e5cbccdec9d1f36dba7 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sat, 27 Oct 2018 15:36:07 +0200
Subject: [PATCH 134/229] Fix group hit counter when adding entries (#4413)

Fixes #3537 by replacing the EventBus subscription by a JavaFX listener.
---
 CHANGELOG.md                                         |  1 +
 .../org/jabref/gui/groups/GroupNodeViewModel.java    | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91a47bb024c..9848a45705f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where the order of fields in customized entry types was not saved correctly. [#4033](http://github.com/JabRef/jabref/issues/4033)
 - We fixed an issue where the groups tree of the last database was still shown even after the database was already closed.
 - We fixed an issue where the "Open file dialog" may disappear behind other windows. https://github.com/JabRef/jabref/issues/3410
+- We fixed an issue where the number of entries matched was not updated correctly upon adding or removing an entry. [#3537](https://github.com/JabRef/jabref/issues/3537)
 - We fixed an issue where the default icon of a group was not colored correctly.
 - We fixed an issue where the first field in entry editor was not focused when adding a new entry. [#4024](https://github.com/JabRef/jabref/issues/4024)
 - We reworked the "Edit file" dialog to make it resizeable and improved the workflow for adding and editing files https://github.com/JabRef/jabref/issues/2970
diff --git a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
index 2699df22cb6..12abad57d6c 100644
--- a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
@@ -11,6 +11,7 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.scene.input.Dragboard;
 import javafx.scene.paint.Color;
@@ -29,7 +30,6 @@
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.event.EntryEvent;
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.AutomaticGroup;
 import org.jabref.model.groups.GroupEntryChanger;
@@ -37,7 +37,6 @@
 import org.jabref.model.strings.StringUtil;
 
 import com.google.common.base.Enums;
-import com.google.common.eventbus.Subscribe;
 import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
 import org.fxmisc.easybind.EasyBind;
 
@@ -85,7 +84,7 @@ public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager state
         expandedProperty.addListener((observable, oldValue, newValue) -> groupNode.getGroup().setExpanded(newValue));
 
         // Register listener
-        databaseContext.getDatabase().registerListener(this);
+        databaseContext.getDatabase().getEntries().addListener(this::onDatabaseChanged);
 
         ObservableList<Boolean> selectedEntriesMatchStatus = EasyBind.map(stateManager.getSelectedEntries(), groupNode::matches);
         anySelectedEntriesMatched = BindingsHelper.any(selectedEntriesMatchStatus, matched -> matched);
@@ -212,10 +211,9 @@ public GroupTreeNode getGroupNode() {
     }
 
     /**
-    * Gets invoked if an entry in the current database changes.
-    */
-    @Subscribe
-    public void listen(@SuppressWarnings("unused") EntryEvent entryEvent) {
+     * Gets invoked if an entry in the current database changes.
+     */
+    private void onDatabaseChanged(ListChangeListener.Change<? extends BibEntry> change) {
         calculateNumberOfMatches();
     }
 

From b09973f86c4033304135ac422583371db18367fe Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sat, 27 Oct 2018 16:00:13 +0200
Subject: [PATCH 135/229] Fix generate bibtex key overwrite warning dialog
 (#4418)

* Fix generate bibtex key overwrite warning dialog


Fixes #4417

* split up confirm of overwrite and generate keys
put only generate action in background task

* fix checkstyle
---
 .../gui/actions/GenerateBibtexKeyAction.java  | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/jabref/gui/actions/GenerateBibtexKeyAction.java b/src/main/java/org/jabref/gui/actions/GenerateBibtexKeyAction.java
index 5fa5eb5e76c..90b61800215 100644
--- a/src/main/java/org/jabref/gui/actions/GenerateBibtexKeyAction.java
+++ b/src/main/java/org/jabref/gui/actions/GenerateBibtexKeyAction.java
@@ -14,8 +14,9 @@
 import org.jabref.preferences.JabRefPreferences;
 
 public class GenerateBibtexKeyAction implements BaseAction {
+
     private final DialogService dialogService;
-    private BasePanel basePanel;
+    private final BasePanel basePanel;
     private List<BibEntry> entries;
     private boolean isCanceled;
 
@@ -29,7 +30,7 @@ public void init() {
 
         if (entries.isEmpty()) {
             dialogService.showWarningDialogAndWait(Localization.lang("Autogenerate BibTeX keys"),
-                    Localization.lang("First select the entries you want keys to be generated for."));
+                                                   Localization.lang("First select the entries you want keys to be generated for."));
             return;
         }
         basePanel.output(formatOutputMessage(Localization.lang("Generating BibTeX key for"), entries.size()));
@@ -38,19 +39,20 @@ public void init() {
     public static boolean confirmOverwriteKeys(DialogService dialogService) {
         if (Globals.prefs.getBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY)) {
             return dialogService.showConfirmationDialogWithOptOutAndWait(
-                    Localization.lang("Overwrite keys"),
-                    Localization.lang("One or more keys will be overwritten. Continue?"),
-                    Localization.lang("Overwrite keys"),
-                    Localization.lang("Cancel"),
-                    Localization.lang("Disable this confirmation dialog"),
-                    optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY, !optOut));
+                                                                         Localization.lang("Overwrite keys"),
+                                                                         Localization.lang("One or more keys will be overwritten. Continue?"),
+                                                                         Localization.lang("Overwrite keys"),
+                                                                         Localization.lang("Cancel"),
+                                                                         Localization.lang("Disable this confirmation dialog"),
+                                                                         optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY, !optOut));
+
         } else {
             // Always overwrite keys by default
             return true;
         }
     }
 
-    private void generateKeys() {
+    private void checkOverwriteKeysChosen() {
         // We don't want to generate keys for entries which already have one thus remove the entries
         if (Globals.prefs.getBoolean(JabRefPreferences.AVOID_OVERWRITING_KEY)) {
             entries.removeIf(BibEntry::hasCiteKey);
@@ -64,7 +66,12 @@ private void generateKeys() {
                 return;
             }
         }
+    }
 
+    private void generateKeys() {
+        if (isCanceled) {
+            return;
+        }
         // generate the new cite keys for each entry
         final NamedCompound compound = new NamedCompound(Localization.lang("Autogenerate BibTeX keys"));
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(basePanel.getBibDatabaseContext(), Globals.prefs.getBibtexKeyPatternPreferences());
@@ -79,21 +86,19 @@ private void generateKeys() {
             basePanel.getUndoManager().addEdit(compound);
         }
 
-        if (isCanceled) {
-            return;
-        }
         basePanel.markBaseChanged();
         basePanel.output(formatOutputMessage(Localization.lang("Generated BibTeX key for"), entries.size()));
     }
 
     private String formatOutputMessage(String start, int count) {
         return String.format("%s %d %s.", start, count,
-                (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
+                             (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
     }
 
     @Override
     public void action() {
         init();
+        checkOverwriteKeysChosen();
         BackgroundTask.wrap(this::generateKeys)
                       .executeWith(Globals.TASK_EXECUTOR);
     }

From aeea80969859b219d93c056d6f7284ae032bc997 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sat, 27 Oct 2018 16:17:21 +0200
Subject: [PATCH 136/229] Update README.md (#4419)

* Update README.md

Remove obsolete integration test description. Add a note on travis

* Fix travis link

* Update README.md

Missing comma
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e4a60dc95da..cec54b33f74 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ When you want to develop, it is necessary to generate additional sources using `
 and then generate the Eclipse `gradlew eclipse`.
 For IntelliJ IDEA, just import the project via a Gradle Import by pointing at the `build.gradle`.
 
-`gradlew test` executes all tests. We use Travis CI[https://travis-ci.org/] for executing the tests after each commit. For developing it is sufficient to locally only run the associated test for the classes you changed. Travis will report any other failure.
+`gradlew test` executes all tests. We use [Travis CI](https://travis-ci.org/) for executing the tests after each commit. For developing, it is sufficient to locally only run the associated test for the classes you changed. Travis will report any other failure.
 
 
 ## Acknowledgements

From 1d8b3aad2f9ca4441c41fa6fa3dfac61e45cb5ef Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sun, 28 Oct 2018 12:36:38 +0100
Subject: [PATCH 137/229] Add JabRef icon to installer and change watermark to
 JabRef (#4421)

* Add JabRef Icon to installer


Change watermark from Install4j to JabRef
Update to 7.0.8

* add jabref icon as png in 64x64

* add cache clearing when checkstum saves

* try around with caching in circle ci

* test again

* show progress in wget

* move checkout before install4j cache

* add custom jar

* move icon resources

* add jar

* revert custom icon jar
does not work
---
 .circleci/config.yml                          |  14 ++---
 jabref.install4j                              |  21 +++++---
 scripts/download-install4j-and-jres.sh        |   2 +-
 scripts/extract-install4j.sh                  |   4 +-
 .../preferences/PreferencesService.java.orig  |  48 ++++++++++++++++++
 src/main/resources/icons/JabRef-icon-64.png   | Bin 0 -> 3454 bytes
 6 files changed, 73 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/org/jabref/preferences/PreferencesService.java.orig
 create mode 100644 src/main/resources/icons/JabRef-icon-64.png

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d21c1c05c59..e9e4452ea17 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,13 +5,13 @@ jobs:
     docker:
       - image: circleci/openjdk:8-jdk
     steps:
+      - checkout
       - restore_cache:
           keys:
-            - install4j
-      - checkout
+            - install4j-{{ checksum "scripts/extract-install4j.sh" }}
       - run: scripts/download-install4j-and-jres.sh
       - save_cache:
-          key: install4j
+          key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
           paths:
             - "~/downloads"
             - "~/.install4j7"
@@ -25,9 +25,9 @@ jobs:
     steps:
       - restore_cache:
           key: dependency-cache
-      - restore_cache:
-          key: install4j
       - checkout
+      - restore_cache:
+          key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
       - run: scripts/extract-install4j.sh
       - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
       - run: ./gradlew -Pdev=true -Pinstall4jDir="install4j7" release --stacktrace
@@ -46,9 +46,9 @@ jobs:
     steps:
       - restore_cache:
           key: dependency-cache
-      - restore_cache:
-          key: install4j
       - checkout
+      - restore_cache:
+          key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
       - run: scripts/extract-install4j.sh
       - run: install4j7/bin/install4jc --verbose --license=$INSTALL4J_KEY
       - run: ./gradlew -Pinstall4jDir="install4j7" release --stacktrace
diff --git a/jabref.install4j b/jabref.install4j
index a79be056141..08da26fd0a2 100644
--- a/jabref.install4j
+++ b/jabref.install4j
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="7.0.4" transformSequenceNumber="7">
+<install4j version="7.0.8" transformSequenceNumber="7">
   <directoryPresets config="./buildres/jabref.json" />
   <application name="JabRef" distributionSourceDir="" applicationId="0034-7691-1464-4754" mediaDir="build/install4j" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="JabRef" publisher="JabRef Community" publisherWeb="https://www.jabref.org/" version="DEV" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="780dfea2d33a0244" javaMinVersion="1.8" javaMaxVersion="1.8" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
     <languages skipLanguageSelection="true" languageSelectionInPrincipalLanguage="false">
@@ -42,7 +42,10 @@
       <variable name="version" value="3.1dev" description="" category="" />
     </variables>
     <mergedProjects />
-    <codeSigning macEnabled="false" macPkcs12File="" windowsEnabled="false" windowsKeySource="pkcs12" windowsPvkFile="" windowsSpcFile="" windowsPkcs12File="" />
+    <codeSigning macEnabled="false" macPkcs12File="" windowsEnabled="false" windowsKeySource="pkcs12" windowsPvkFile="" windowsSpcFile="" windowsPkcs12File="" windowsPkcs11Library="" windowsPkcs11Slot="">
+      <windowsKeystoreIdentifier issuer="" serial="" subject="" />
+      <windowsPkcs11Identifier issuer="" serial="" subject="" />
+    </codeSigning>
   </application>
   <files keepModificationTimes="false" missingFilesStrategy="warn" globalExcludeSuffixes="" defaultOverwriteMode="4" defaultUninstallMode="0" launcherOverwriteMode="3" defaultFileMode="644" defaultDirMode="755">
     <filesets />
@@ -105,7 +108,7 @@
       <customAttributes />
     </autoUpdate>
     <applications>
-      <application name="" id="installer" customizedId="" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" enabled="true" commentSet="false" comment="" actionElevationType="none" styleId="" fileset="" customIcnsFile="./src/main/resources/icons/jabref.icns" customIcoFile="./src/main/resources/icons/jabref.ico" macEntitlementsFile="" automaticLauncherIntegration="false" launchMode="startupFirstWindow" launchInNewProcess="false" launchSchedule="updateSchedule" allLaunchers="true">
+      <application name="" id="installer" customizedId="" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" enabled="true" commentSet="false" comment="" actionElevationType="none" styleId="326" fileset="" customIcnsFile="./src/main/resources/icons/jabref.icns" customIcoFile="./src/main/resources/icons/jabref.ico" macEntitlementsFile="" automaticLauncherIntegration="false" launchMode="startupFirstWindow" launchInNewProcess="false" launchSchedule="updateSchedule" allLaunchers="true">
         <serializedBean>
           <java class="java.beans.XMLDecoder">
             <object class="com.install4j.runtime.beans.applications.InstallerApplication">
@@ -116,6 +119,9 @@
           </java>
         </serializedBean>
         <styleOverrides />
+        <customScript mode="1" file="">
+          <content />
+        </customScript>
         <launcherIds />
         <variables />
         <startup>
@@ -144,7 +150,7 @@
           </screen>
         </startup>
         <screens>
-          <screen name="" id="2" customizedId="" beanClass="com.install4j.runtime.beans.screens.WelcomeScreen" enabled="true" commentSet="false" comment="" actionElevationType="inherit" styleId="332" rollbackBarrier="false" rollbackBarrierExitCode="1" backButton="2" finishScreen="false" wizardIndexChangeType="unchanged" wizardIndexKey="">
+          <screen name="" id="2" customizedId="" beanClass="com.install4j.runtime.beans.screens.WelcomeScreen" enabled="true" commentSet="false" comment="" actionElevationType="inherit" styleId="" rollbackBarrier="false" rollbackBarrierExitCode="1" backButton="2" finishScreen="false" wizardIndexChangeType="unchanged" wizardIndexKey="">
             <serializedBean>
               <java class="java.beans.XMLDecoder">
                 <object class="com.install4j.runtime.beans.screens.WelcomeScreen" />
@@ -766,6 +772,9 @@ return console.askOkCancel(message, true);
           </java>
         </serializedBean>
         <styleOverrides />
+        <customScript mode="1" file="">
+          <content />
+        </customScript>
         <launcherIds />
         <variables />
         <startup>
@@ -1054,7 +1063,7 @@ return console.askYesNo(message, true);
                         <boolean>false</boolean>
                       </void>
                       <void property="labelText">
-                        <string>install4j</string>
+                        <string>JabRef</string>
                       </void>
                     </object>
                   </java>
@@ -1262,7 +1271,7 @@ return console.askYesNo(message, true);
                       </void>
                       <void property="imageFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>icon:${installer:sys.installerApplicationMode}_header.png</string>
+                          <string>./src/main/resources/icons/JabRef-icon-64.png</string>
                         </object>
                       </void>
                       <void property="imageInsets">
diff --git a/scripts/download-install4j-and-jres.sh b/scripts/download-install4j-and-jres.sh
index 0e99d438c6e..cdd5aee3b20 100755
--- a/scripts/download-install4j-and-jres.sh
+++ b/scripts/download-install4j-and-jres.sh
@@ -5,7 +5,7 @@ if [ ! -d ~/downloads ]; then
   mkdir ~/downloads
 fi
 cd ~/downloads
-wget --quiet -nc http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_4.tar.gz
+wget --quiet -nc --show-progress http://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_8.tar.gz
 
 # fetch JREs
 if [ ! -d ~/.install4j7/jres ]; then
diff --git a/scripts/extract-install4j.sh b/scripts/extract-install4j.sh
index 4e8cfcc7dd3..9e960280b81 100755
--- a/scripts/extract-install4j.sh
+++ b/scripts/extract-install4j.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-tar -xf ~/downloads/install4j_unix_7_0_4.tar.gz
+tar -xf ~/downloads/install4j_unix_7_0_8.tar.gz
 # fix directory name (until install4j 6.1.5 it was install4j6
-mv install4j7.0.4 install4j7
+mv install4j7.0.8 install4j7
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java.orig b/src/main/java/org/jabref/preferences/PreferencesService.java.orig
new file mode 100644
index 00000000000..28974c413fe
--- /dev/null
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java.orig
@@ -0,0 +1,48 @@
+package org.jabref.preferences;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
+import org.jabref.gui.keyboard.KeyBindingRepository;
+import org.jabref.logic.journals.JournalAbbreviationPreferences;
+import org.jabref.logic.openoffice.OpenOfficePreferences;
+import org.jabref.model.metadata.FilePreferences;
+
+public interface PreferencesService {
+
+    JournalAbbreviationPreferences getJournalAbbreviationPreferences();
+
+    void storeKeyBindingRepository(KeyBindingRepository keyBindingRepository);
+
+    KeyBindingRepository getKeyBindingRepository();
+
+    void storeJournalAbbreviationPreferences(JournalAbbreviationPreferences abbreviationsPreferences);
+
+    FilePreferences getFilePreferences();
+
+    Path getWorkingDir();
+
+    void setWorkingDir(Path dir);
+
+<<<<<<< HEAD
+    OpenOfficePreferences getOpenOfficePreferences();
+
+    void setOpenOfficePreferences(OpenOfficePreferences openOfficePreferences);
+
+    PreviewPreferences getPreviewPreferences();
+=======
+    Map<String, List<String>> getEntryEditorTabList();
+
+    Boolean getEnforceLegalKeys();
+
+    Map<String, String> getCustomTabsNamesAndFields();
+
+    void setCustomTabsNameAndFields(String name, String fields, int defNumber);
+
+    public void purgeSeries(String prefix, int number);
+
+    public void updateEntryEditorTabList();
+>>>>>>> upstream/master
+
+}
diff --git a/src/main/resources/icons/JabRef-icon-64.png b/src/main/resources/icons/JabRef-icon-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..e807e0448d315ea926ba1b8d296b70e6e705fa6c
GIT binary patch
literal 3454
zcmV-^4T18BP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm000D1000D10nq3SK>z>%8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H14Esq$K~#90?VEjc)a8}OKlk^WyrP79P&~DZ78k3P?h)CZ+TEpY
zwic>DW+t|SLQN(RKse+L!rI~<adulhg@l<TJt&bRGXa#Bk~dxy+Feei)$Uo8-96~K
zWd-aOT5V4&vAiUi`Q80vX2@iiAu|(#<+$I!esiDa-sgVr?>;ZT=Xpj{l~gdZq;5>U
zX<LDsFLwGX-c3pAD#Ph+x*ZA4I~NMB-``$)HWeL7H2|&!O*i&ip%21Z{HtNfcRK=A
zdop+T%AvTlVYX%HKcIXGAloo++R<9^+f;OIsW#Flk|og}%9kwB-43_!kfA)$5vYDW
zeYZ!B;!@w2E#dnJ(}{VHeIi+@+DJJ7dcLn;vdz=Lr(?v^E#WnXyP?yP;Od^XmG7i#
zZzL!xtH0Aw+cOBx1jVQId|!X6wv0qVm&=nKFY9@6<?s5(nv(>Up}aS=RGo&JM;)c!
z=AwD^<5O)sT@=l$AMYsjHXCXl1szIWc~4+j|5$TU&x<R67q6R$6C@b}obHB)6@H*t
zKNgH1X%_ptU#NONT3%S_v5mW};9DrG6(+~2{|dvH+tph6T1G6Bz_Fn5uduA`z-NXK
zfMW>He0cKAmV*b^1fz2MqJ{}Fz)Z#ZnqWL2u)Nb>wJY9k!T{LIypM>=OEID#$Zo-U
zzAI4kBh_$^D=hTb#@<@6N|2{Ob7SfcfIiXXukntQIDo_LtpWKy5YxBi0&4x!nP2v<
zjS?3@9Hri`DaPZVbBO8UD*9-5Tg|q3+le!v%=efo?TMUGIBp2OzU$5AeT@};0CUP3
zC!1<D1AiM=ee2ZEo+(+gW{s6DX#kJMV;nhA&<@OxD|*#XYf(pF#V-IJs%*;1`6#s5
zQmO?eC9)+#NoQO2=6HF+LC}K15kKA#Oj4yWyEjzpbT|BC*11pnckie?1{6Bo4GR@r
z2Yf10eg2UX1?Pc9De%1nM@|%MWGMMF0)O8XsD42eb-8w$1No=j+2~UW6O;KI<&;RC
za1azLrD<fMqMQ2jPrdCZ^?d`N(_hu1S#lTfYD~RyhugO<1$#pf(J8+uP<>5J+vhv|
z)y=A?qty3}{`^yKE4m4oIGnv?oDv2=lSC^C?m*b-aQk)^&8r{Z{X*6I{bS7;3bA8I
zt<&vYnX17^-P#z@56>9AU+r#Le!6I0{dkAlw-aF}a7U^(lW|Ho2F#xS+^0<2g(4B=
zfXo1{PqCf%4VChaK-C@*#P0Szi}FOItWPlS9&Q=!bT{3ugx&&j!j4OQPoQd*Dq39H
zFxwK{1WZWLpN~KfsIog0%<b8;b?G1CD-637cDX#+ePhPmFKW#Oc?7s=xK>4J4dv!n
z^lV&w&R*tyTvUDln84mHfA#Fk={nrLJ-{p=glc71pk_nSlIDE#!nr0D77W)m@B!#H
z6=P4%*$;oRW5=4yE{ZM&U{=|>n{zC4Y-jt5W6^0Y9))F|+yZM{sfeyjF#pG!K4|6S
z&F<N__+0qSu@f{`VRpB_dT$~PyW2NQU=PRzL-}S$plVOilIDD)@BALn!ppV>$5f^M
zjPYUMVB4At3F`>rELlIf&j|JIZCmx5ApwY)`aS~w9rTDQZ<=bp(a~OcG}e&E<1vmL
zA8SWs74YR`PO0#d3!&hw{q419oo?S!g$=+jy8P9jOH|+C_Wd_-hrqH<fAw=SOX|kt
znzp^7+<zJFucNwd>ZIQ8`02K|q;X0}LeoUJ7i21M4{&|#lsFiG@D#QwArUw(@RDJ%
zwWGcIzlJnY+W0q?SgU}dBo4lM-U>bx3BnGAZ)!*<cW<uwpV&(F$Gm?orW_O4+3Bx#
z%`B-KlV{lW0bfaCx5rRpT}Pnur$b5m?y?N#D?FNXO@Nel`m0)C$T~n1u9d?IOah*?
z44!nj8;%Ip)}XR&ccA7}#DSkW-QF3Bv;w!psedKUu)XYZc^>G?zM(wJ7Mf<5#{IyM
z02romzl9#}51QpJmnS<fzu;wHdIEP&3A&)uUvnTTm{aP##U?zW81pfh8u9ru8030!
z8niTd0OFLVDpF^PoV2@r8|;f3CIEE$YYqela=s8Z{Y5doKY!e}_id@@#nQQo-gk*r
z^gb+|yKhTHZ-4%{Z<Bz$!b`z{oG(Pl+ZQ!Vu)BR5Op%j{)PYV-g+VOW!3;2rY*O4D
ziRub0Wk4UZm-^~1Xs~Yo*4jS+^BkoO-H2`gZisPz^_;TCmv*<;94;#L#%BqZ>YkqV
zn!|I-8Yi3R>bT<Hqq3|!P_-SxyHmMhs}-RZxGo*1fiTzT<Dh@xc{c-GC&JTthV5N@
znfLL+LXWL0P_^9*F$Lt6n0h&;S{nd*0yW+7MxwGvofu!_6*I(?u0YlH!a|SDUgmu~
z&#=8K!qa3z9)@s@2|%h{ASot@%5w!13ywO=eE00yT>a}Vf7OF3x)g}c#Sb{jyz`P7
zh?G4L`Pr|cOS}A45ANDr{cC5L@1BB*1xH2YIZ|H;C59##1H@pY0f-plbE+J&yM40&
zy4z}=w^UugK)7*PpJ;Q!<?>{svOe;2z*2Q}x79ok;q`$khY%7@pJ}@o!!;%Y<jMpf
zjOzrt?WGONA(GyzbAcc*A(%IAM!Z5qHUS8tIyc%S?4=FM1-i*J-4h{(Ys|;ch`T^M
zOc8CeyM11Ou0TyE%A<f<qL0K^j>r_{(XK#ECxG4U^NMH_;brs{M1n4G1;&7c5U6&R
z`6>Xq0@XhR>VcUFs?G%JBXw|=`6>jeN5iLtV}NC7tHNqgT7g5rC0|aNw<l|hOB$yD
zWS=|pq$;OkH&2V^)sI)@RQ9<uPeOPJt14@+RQrUv91^8fVYOvwYqTKg*Wi*R%~`+c
zJ2wNEFJK4qN9e@SGjisO2iw+MC~|x67K^;@_L{>0_7d-3s=@glf6ZHkWuDvuE%-NJ
z$_U##r{S?<>&-d&2R3e8JdmhT(sO}`!d_r+QEB5uL#!4Cr>IOYrNAm!3sm;_Yu@sB
zJQuU?-rIZMjDE-zSOsg55tIM1rN+XZK;<uotC;f97=YdF`;NdfBXG<zZJ|lKHm!Uw
zQQ^bo^|ywC=5dnjRHXui)!qK;XH%`8RzuzX>Sq<2(|2pIz2JbkFj--wY$W8H(;-hL
zjoqA+zZ~>Lx_VKFu)yWodC9cqa_uxFwH==%&=X<b(nHz-*tl`=07_lDdNH^qn0NZY
zcwt0#$wyMkQ0kHmbeBU$>DC{zZ2>Ym>;SMtOH+}hV>04X+Q=vX`?gf{f{x@Q`0f;C
zDMH@~`;<OLGT<D~R2R4{MOjK1i7y!kz(6wHKLE&!?j%8YX9vjpIDE-C0M-Z`29UnN
zHy-<ZwSCDr00Ozg*Sd_pF?h}&`+T*1N%@KlKygXkO(8SOE=n=sJ@$-YiIo-mEPDBU
z++lE!!`<+*3LR!>pu3~J_JdRvhYi5P<@L8(A=9Z!F^280MK$BB8AaGYzb?wxEyMP_
z!|nT-2pxtQ>P)umj#0c6#U;MGEKw&S#b8bw9iK-H1~6Tf>7k(Mb+~<RpxR-mbjBa*
zKuiFf?#5{<T8vVR!JWe$EnGvGhR8Ha_@2Yv@D4(UsC0DtE8l>~AULz6Zj53bMs+pl
zogc5iqY1qe)zyl1cxFl67>ER*Aln?toPJFr%Gm%o8w!rfe&C-nqMQwYT+{f(Wk8g(
z0iXjTTGn2Zh;k0k>1zALb%7}7a0VC|AB<kJh;lXnM6FL;21Ggke+B?(=o2^yhGGXn
z^Qw1&!=|AZ*X5Dt!&lXV2<Py(fF(IsVd?*Sl&y+v>JC)>XKX=7%ZmR1zGyFP_zOYH
z5#}@Gdd(=n3TJ=~K!u!9;;+Czt7yx>^|sFF_4;Ip1g7$#%BEFW9|fJFvJm(xqwr;>
z!e9Ud&A!5I{I4p0!=SaZt@>oT%8@{A1GYKKe79K^3q)`Oe|DuDl*k={!3;?2f>=Tf
z0NpCua_?=u2QvMWL_8t^e9GhTJpJa$u`?oBVJE#C?U!I^2B?uu;_Jbwn0i}PT5?Qt
zbE^N<%LI{tz5=}BTF`W3UnumLh%N;Ad?xn7oHNgWKPtLiMK|@dt@wE+4vYkmK(7bZ
z7nQBQPgKeUnM)e?h=yc98g~R=S7B4m+3X!Vb}aj2ntqQ8A}`?QF4u<YzA^nSQOdc@
z1@4Q`Apy|rWMiPhZ$a8kOIs4{sr{)S@<LjH*5VT1T_Hmjf|dx}m{37u20`SK46qdT
z8%WE9oV=b)PF+7vL|#<wk|oXG`JnH7k%cal@FlFl9qrgIU<f(kiz0eLF<Naw!@p}w
z#jidF->)blFK!pG>)~%TeI{tL+=8_L<g-R>04(HZ2C};=Q28&({w;E?Bl1GOE5i32
grHy}Qp*H~hA77DHO_lL3L;wH)07*qoM6N<$f=W=UA^-pY

literal 0
HcmV?d00001


From 9a3f2d6270e1872576da281d396ed0a5228648b2 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sun, 28 Oct 2018 12:41:53 +0100
Subject: [PATCH 138/229] Delete PreferencesService.java.orig

---
 .../preferences/PreferencesService.java.orig  | 48 -------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 src/main/java/org/jabref/preferences/PreferencesService.java.orig

diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java.orig b/src/main/java/org/jabref/preferences/PreferencesService.java.orig
deleted file mode 100644
index 28974c413fe..00000000000
--- a/src/main/java/org/jabref/preferences/PreferencesService.java.orig
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.jabref.preferences;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-
-import org.jabref.gui.keyboard.KeyBindingRepository;
-import org.jabref.logic.journals.JournalAbbreviationPreferences;
-import org.jabref.logic.openoffice.OpenOfficePreferences;
-import org.jabref.model.metadata.FilePreferences;
-
-public interface PreferencesService {
-
-    JournalAbbreviationPreferences getJournalAbbreviationPreferences();
-
-    void storeKeyBindingRepository(KeyBindingRepository keyBindingRepository);
-
-    KeyBindingRepository getKeyBindingRepository();
-
-    void storeJournalAbbreviationPreferences(JournalAbbreviationPreferences abbreviationsPreferences);
-
-    FilePreferences getFilePreferences();
-
-    Path getWorkingDir();
-
-    void setWorkingDir(Path dir);
-
-<<<<<<< HEAD
-    OpenOfficePreferences getOpenOfficePreferences();
-
-    void setOpenOfficePreferences(OpenOfficePreferences openOfficePreferences);
-
-    PreviewPreferences getPreviewPreferences();
-=======
-    Map<String, List<String>> getEntryEditorTabList();
-
-    Boolean getEnforceLegalKeys();
-
-    Map<String, String> getCustomTabsNamesAndFields();
-
-    void setCustomTabsNameAndFields(String name, String fields, int defNumber);
-
-    public void purgeSeries(String prefix, int number);
-
-    public void updateEntryEditorTabList();
->>>>>>> upstream/master
-
-}

From 7b12d41e80f6a52b79eb64b3f58769c820c7840a Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus@lynyus.de>
Date: Sun, 28 Oct 2018 18:39:07 +0100
Subject: [PATCH 139/229] Fix Violations of Always Use Braces (#4400)

---
 .../gui/edit/ReplaceStringViewModel.java      | 20 +++++++++----------
 .../gui/preferences/AppearancePrefsTab.java   |  7 +++----
 .../logic/integrity/IntegrityMessage.java     |  9 ++++++---
 .../org/jabref/model/entry/BibtexString.java  | 11 ++++++----
 .../model/entry/identifier/MathSciNetId.java  |  8 ++++++--
 .../model/groups/AutomaticKeywordGroup.java   |  8 ++++++--
 .../model/groups/AutomaticPersonsGroup.java   |  8 ++++++--
 .../org/jabref/model/groups/TexGroup.java     | 12 ++++++++---
 .../model/metadata/ContentSelectors.java      | 14 ++++++++-----
 .../gui/search/TextFlowEqualityHelper.java    |  6 ++++--
 10 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java b/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
index 89fff7fa8b7..db5ce8b4b29 100644
--- a/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
@@ -14,8 +14,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 
-public class ReplaceStringViewModel extends AbstractViewModel
-{
+public class ReplaceStringViewModel extends AbstractViewModel {
     private boolean allFieldReplace;
     private String findString;
     private String replaceString;
@@ -29,8 +28,7 @@ public class ReplaceStringViewModel extends AbstractViewModel
     private BooleanProperty selectOnlyProperty = new SimpleBooleanProperty();
 
 
-    public ReplaceStringViewModel(BasePanel basePanel)
-    {
+    public ReplaceStringViewModel(BasePanel basePanel) {
         Objects.requireNonNull(basePanel);
         this.panel = basePanel;
     }
@@ -45,20 +43,20 @@ public int replace() {
         final NamedCompound compound = new NamedCompound(Localization.lang("Replace string"));
         int counter = 0;
         if (selOnly) {
-            for (BibEntry bibEntry: this.panel.getSelectedEntries())
+            for (BibEntry bibEntry : this.panel.getSelectedEntries()) {
                 counter += replaceItem(bibEntry, compound);
-        }
-        else {
-            for (BibEntry bibEntry: this.panel.getDatabase().getEntries())
+            }
+        } else {
+            for (BibEntry bibEntry : this.panel.getDatabase().getEntries()) {
                 counter += replaceItem(bibEntry, compound);
+            }
         }
         return counter;
     }
 
     /**
-     * Does the actual operation on a Bibtex entry based on the
-     * settings specified in this same dialog. Returns the number of
-     * occurrences replaced.
+     * Does the actual operation on a Bibtex entry based on the settings specified in this same dialog. Returns the
+     * number of occurrences replaced.
      */
     private int replaceItem(BibEntry entry, NamedCompound compound) {
         int counter = 0;
diff --git a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
index 92c62d12864..3aae702b2b0 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
@@ -53,13 +53,12 @@ public AppearancePrefsTab(DialogService dialogService, JabRefPreferences prefs)
         darkTheme = new RadioButton("Dark theme");
         darkTheme.setToggleGroup(themeGroup);
 
-        if (prefs.get(JabRefPreferences.FX_THEME).equals(BASE_CSS))
+        if (prefs.get(JabRefPreferences.FX_THEME).equals(BASE_CSS)) {
             lightTheme.setSelected(true);
-        else if (prefs.get(JabRefPreferences.FX_THEME).equals(DARK_CSS))
+        } else if (prefs.get(JabRefPreferences.FX_THEME).equals(DARK_CSS)) {
             darkTheme.setSelected(true);
-
+        }
         container.getChildren().addAll(overrideFonts, fontSizeContainer, fontTweaksLAF, lightTheme, darkTheme);
-
     }
 
     public Node getBuilder() {
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java b/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java
index c04a63f87fa..f11fa936187 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java
@@ -41,8 +41,12 @@ public Object clone() {
 
     @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;
+        }
         IntegrityMessage that = (IntegrityMessage) o;
         return Objects.equals(entry, that.entry) &&
                 Objects.equals(fieldName, that.fieldName) &&
@@ -53,5 +57,4 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(entry, fieldName, message);
     }
-
 }
diff --git a/src/main/java/org/jabref/model/entry/BibtexString.java b/src/main/java/org/jabref/model/entry/BibtexString.java
index b03d9ba08e7..52268364cd3 100644
--- a/src/main/java/org/jabref/model/entry/BibtexString.java
+++ b/src/main/java/org/jabref/model/entry/BibtexString.java
@@ -135,7 +135,7 @@ public boolean hasChanged() {
     }
 
     /*
-    * Returns user comments (arbitrary text before the string) if there are any. If not returns the empty string
+     * Returns user comments (arbitrary text before the string) if there are any. If not returns the empty string
      */
     public String getUserComments() {
         if (parsedSerialization != null) {
@@ -173,8 +173,12 @@ 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 &&
                 Objects.equals(name, that.name) &&
@@ -188,5 +192,4 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(name, content, id, type, parsedSerialization, hasChanged);
     }
-
 }
diff --git a/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java b/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java
index c848e56025b..f07ec8be273 100644
--- a/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java
+++ b/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java
@@ -27,8 +27,12 @@ public static Optional<MathSciNetId> parse(String mrNumberRaw) {
 
     @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;
+        }
         MathSciNetId that = (MathSciNetId) o;
         return Objects.equals(identifier, that.identifier);
     }
diff --git a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java b/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
index 062648d7f72..f4952a4f751 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
@@ -42,8 +42,12 @@ public AbstractGroup deepCopy() {
 
     @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;
+        }
         AutomaticKeywordGroup that = (AutomaticKeywordGroup) o;
         return Objects.equals(keywordDelimiter, that.keywordDelimiter) &&
                 Objects.equals(field, that.field);
diff --git a/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java b/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
index 61992508ab9..58f11af3b4c 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
@@ -21,8 +21,12 @@ public AutomaticPersonsGroup(String name, GroupHierarchyType context, String fie
 
     @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;
+        }
         AutomaticPersonsGroup that = (AutomaticPersonsGroup) o;
         return Objects.equals(field, that.field);
     }
diff --git a/src/main/java/org/jabref/model/groups/TexGroup.java b/src/main/java/org/jabref/model/groups/TexGroup.java
index 3c0ef915db9..a9e7f82e006 100644
--- a/src/main/java/org/jabref/model/groups/TexGroup.java
+++ b/src/main/java/org/jabref/model/groups/TexGroup.java
@@ -59,9 +59,15 @@ public AbstractGroup deepCopy() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
         TexGroup group = (TexGroup) o;
         return Objects.equals(filePath, group.filePath);
     }
diff --git a/src/main/java/org/jabref/model/metadata/ContentSelectors.java b/src/main/java/org/jabref/model/metadata/ContentSelectors.java
index 96269ff9349..7f841494bf2 100644
--- a/src/main/java/org/jabref/model/metadata/ContentSelectors.java
+++ b/src/main/java/org/jabref/model/metadata/ContentSelectors.java
@@ -21,7 +21,7 @@ public void addContentSelector(ContentSelector contentSelector) {
     }
 
     public List<String> getSelectorValuesForField(String fieldName) {
-        for (ContentSelector selector: contentSelectors) {
+        for (ContentSelector selector : contentSelectors) {
             if (selector.getFieldName().equals(fieldName)) {
                 return selector.getValues();
             }
@@ -33,7 +33,7 @@ public List<String> getSelectorValuesForField(String fieldName) {
     public void removeSelector(String fieldName) {
         ContentSelector toRemove = null;
 
-        for (ContentSelector selector: contentSelectors) {
+        for (ContentSelector selector : contentSelectors) {
             if (selector.getFieldName().equals(fieldName)) {
                 toRemove = selector;
                 break;
@@ -61,7 +61,7 @@ public static ContentSelector parse(String key, String values) {
     public List<String> getFieldNamesWithSelectors() {
         List<String> result = new ArrayList<>(contentSelectors.size());
 
-        for (ContentSelector selector: contentSelectors) {
+        for (ContentSelector selector : contentSelectors) {
             result.add(selector.getFieldName());
         }
 
@@ -70,8 +70,12 @@ public List<String> getFieldNamesWithSelectors() {
 
     @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;
+        }
         ContentSelectors that = (ContentSelectors) o;
         return Objects.equals(contentSelectors, that.contentSelectors);
     }
diff --git a/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java b/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
index 0ac74f99233..15246db4681 100644
--- a/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
+++ b/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
@@ -28,16 +28,18 @@ public static void assertEquals(List<Text> expectedTexts, TextFlow description)
     }
 
     public static boolean checkIfTextsEqualsExpectedTexts(List<Text> texts, List<Text> expectedTexts) {
-        if (expectedTexts.size() != texts.size())
+        if (expectedTexts.size() != texts.size()) {
             return false;
+        }
         Text expectedText;
         for (int i = 0; i < expectedTexts.size(); i++) {
             expectedText = expectedTexts.get(i);
             // the strings contain not only the text but also the font and other properties
             // so comparing them compares the Text object as a whole
             // the equals method is not implemented...
-            if (!expectedText.toString().equals(texts.get(i).toString()))
+            if (!expectedText.toString().equals(texts.get(i).toString())) {
                 return false;
+            }
         }
         return true;
     }

From e3da41f7792e69ce726c78586388f2ca5f72484e Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus.dietz@tum.de>
Date: Sun, 28 Oct 2018 19:15:52 +0100
Subject: [PATCH 140/229] Fix two new issues

---
 .../gui/bibtexkeypattern/BibtexKeyPatternPanel.java   | 11 ++++++-----
 src/main/java/org/jabref/gui/util/ThemeLoader.java    |  8 +++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
index 08a101c740d..994452e5efa 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
@@ -75,7 +75,7 @@ private void buildGUI() {
         rowIndex++;
         Label defaultPattern = new Label(Localization.lang("Default pattern"));
         Button button = new Button("Default");
-        button.setOnAction(e-> defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
+        button.setOnAction(e -> defaultPat.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
         gridPane.add(defaultPattern, 1, rowIndex);
         gridPane.add(defaultPat, 2, rowIndex);
         gridPane.add(button, 3, rowIndex);
@@ -87,7 +87,7 @@ private void buildGUI() {
             Button button1 = new Button("Default");
             button1.setOnAction(e1 -> textField.setText((String) Globals.prefs.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)));
 
-            gridPane.add(label1, 1 + (columnIndex * 3) , rowIndex);
+            gridPane.add(label1, 1 + (columnIndex * 3), rowIndex);
             gridPane.add(textField, 2 + (columnIndex * 3), rowIndex);
             gridPane.add(button1, 3 + (columnIndex * 3), rowIndex);
 
@@ -96,18 +96,19 @@ private void buildGUI() {
             if (columnIndex == COLUMNS - 1) {
                 columnIndex = 0;
                 rowIndex++;
-            } else
+            } else {
                 columnIndex++;
+            }
         }
 
         rowIndex++;
 
         Button help1 = new Button("?");
-        help1.setOnAction(e->new HelpAction(Localization.lang("Help on key patterns"), HelpFile.BIBTEX_KEY_PATTERN).getHelpButton().doClick());
+        help1.setOnAction(e -> new HelpAction(Localization.lang("Help on key patterns"), HelpFile.BIBTEX_KEY_PATTERN).getHelpButton().doClick());
         gridPane.add(help1, 1, rowIndex);
 
         Button btnDefaultAll1 = new Button(Localization.lang("Reset all"));
-        btnDefaultAll1.setOnAction(e-> {
+        btnDefaultAll1.setOnAction(e -> {
             // reset all fields
             for (TextField field : textFields.values()) {
                 field.setText("");
diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 9c4e84ce3f6..5f152bfe36d 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -62,8 +62,8 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
 
 
     /**
-     * Installs the base css file as a stylesheet in the given scene.
-     * Changes in the css file lead to a redraw of the scene using the new css file.
+     * Installs the base css file as a stylesheet in the given scene. Changes in the css file lead to a redraw of the
+     * scene using the new css file.
      */
     public void installBaseCss(Scene scene, JabRefPreferences preferences) {
         if (!StringUtil.isNullOrEmpty(cssToLoad)) {
@@ -78,7 +78,9 @@ public void installBaseCss(Scene scene, JabRefPreferences preferences) {
 
     private void addAndWatchForChanges(Scene scene, String cssUrl, int index) {
         // avoid repeat add
-        if (scene.getStylesheets().contains(cssUrl)) return;
+        if (scene.getStylesheets().contains(cssUrl)) {
+            return;
+        }
 
         scene.getStylesheets().add(index, cssUrl);
 

From f8b1e2d0a3cbe8a4a37bbabc756e757b58a5eabe Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 29 Oct 2018 18:02:53 +0100
Subject: [PATCH 141/229] Fix highlight color of selected text and progress bar
 (#4420)

In the progress, also a few NPEs in the ThemeLoader were fixed.
---
 src/main/java/org/jabref/JabRefGUI.java       |  2 +-
 src/main/java/org/jabref/gui/Base.css         | 15 +++
 .../jabref/gui/customjfx/CustomJFXPanel.java  |  2 +-
 .../gui/preferences/AppearancePrefsTab.java   | 15 ++-
 .../java/org/jabref/gui/util/BaseDialog.java  |  2 +-
 .../java/org/jabref/gui/util/ThemeLoader.java | 91 +++++++++----------
 .../jabref/preferences/JabRefPreferences.java |  2 +-
 .../jabref/styletester/StyleTesterMain.java   |  2 +-
 8 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
index ac996a79899..57214d9ef9f 100644
--- a/src/main/java/org/jabref/JabRefGUI.java
+++ b/src/main/java/org/jabref/JabRefGUI.java
@@ -150,7 +150,7 @@ private void openWindow(Stage mainStage) {
         root.getChildren().add(JabRefGUI.mainFrame);
 
         Scene scene = new Scene(root, 800, 800);
-        Globals.getThemeLoader().installBaseCss(scene, Globals.prefs);
+        Globals.getThemeLoader().installCss(scene, Globals.prefs);
         mainStage.setTitle(JabRefFrame.FRAME_TITLE);
         mainStage.getIcons().addAll(IconTheme.getLogoSetFX());
         mainStage.setScene(scene);
diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index ed4bbd29f96..349b7acc6d7 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -242,6 +242,7 @@
 /*
  * The base css file defining the style that is valid for every pane and dialog.
  */
+
 .hyperlink {
     -fx-padding: 0;
     -fx-underline: false;
@@ -630,8 +631,10 @@
 }
 
 .text-input:focused {
+    -fx-highlight-fill: derive(-jr-accent, 20%);
     -fx-background-color: -jr-accent, -fx-control-inner-background;
     -fx-background-insets: 0, 2;
+    -fx-highlight-text-fill: -fx-text-inner-color;
 }
 
 .text-area {
@@ -941,3 +944,15 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-text-fill: -fx-light-text-color;
     -fx-padding: -1ex -0.5ex -1ex -0.5ex;
 }
+
+.progress-bar > .bar {
+    -fx-background-color: -jr-theme;
+}
+
+.progress-bar:indeterminate > .bar {
+    -fx-background-color: -jr-theme;
+}
+
+.progress-bar > .track {
+    -fx-background-color: -jr-accent;
+}
diff --git a/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java b/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java
index 5cdafa593ce..e21f8ce805e 100644
--- a/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java
+++ b/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java
@@ -13,7 +13,7 @@ public class CustomJFXPanel {
 
     public static JFXPanel wrap(Scene scene) {
         JFXPanel container = new JFXPanel();
-        Globals.getThemeLoader().installBaseCss(scene, Globals.prefs);
+        Globals.getThemeLoader().installCss(scene, Globals.prefs);
         DefaultTaskExecutor.runInJavaFXThread(() -> container.setScene(scene));
         return container;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
index 185b7ca38c4..917b88b3ea4 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
@@ -13,14 +13,13 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.ControlHelper;
+import org.jabref.gui.util.ThemeLoader;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.JabRefPreferences;
 
 class AppearancePrefsTab extends Pane implements PrefsTab {
 
-    public static final String BASE_CSS = "Base.css";
-    public static final String DARK_CSS = "Dark.css";
     private final JabRefPreferences prefs;
     private final CheckBox fontTweaksLAF;
     private final TextField fontSize;
@@ -55,9 +54,9 @@ public AppearancePrefsTab(DialogService dialogService, JabRefPreferences prefs)
         darkTheme.setToggleGroup(themeGroup);
 
         String cssFileName = prefs.get(JabRefPreferences.FX_THEME);
-        if (StringUtil.isBlank(cssFileName) || BASE_CSS.equals(cssFileName)) {
+        if (StringUtil.isBlank(cssFileName) || ThemeLoader.MAIN_CSS.equalsIgnoreCase(cssFileName)) {
             lightTheme.setSelected(true);
-        } else if (DARK_CSS.equals(cssFileName)) {
+        } else if (ThemeLoader.DARK_CSS.equals(cssFileName)) {
             darkTheme.setSelected(true);
         }
 
@@ -89,11 +88,11 @@ public void storeSettings() {
 
         boolean isThemeChanged = false;
 
-        if (lightTheme.isSelected() && !prefs.get(JabRefPreferences.FX_THEME).equals(BASE_CSS)) {
-            prefs.put(JabRefPreferences.FX_THEME, BASE_CSS);
+        if (lightTheme.isSelected() && !prefs.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.MAIN_CSS)) {
+            prefs.put(JabRefPreferences.FX_THEME, ThemeLoader.MAIN_CSS);
             isThemeChanged = true;
-        } else if (darkTheme.isSelected() && !prefs.get(JabRefPreferences.FX_THEME).equals(DARK_CSS)) {
-            prefs.put(JabRefPreferences.FX_THEME, DARK_CSS);
+        } else if (darkTheme.isSelected() && !prefs.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.DARK_CSS)) {
+            prefs.put(JabRefPreferences.FX_THEME, ThemeLoader.DARK_CSS);
             isThemeChanged = true;
         }
 
diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index 41dda14d551..59f6e034e3b 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -21,7 +21,7 @@ protected BaseDialog() {
 
         setDialogIcon(IconTheme.getJabRefImageFX());
         setResizable(true);
-        Globals.getThemeLoader().installBaseCss(getDialogPane().getScene(), Globals.prefs);
+        Globals.getThemeLoader().installCss(getDialogPane().getScene(), Globals.prefs);
     }
 
     private void setDialogIcon(Image image) {
diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 5f152bfe36d..b2230505578 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -1,13 +1,15 @@
 package org.jabref.gui.util;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Objects;
+import java.util.Optional;
 
-import javafx.scene.Parent;
 import javafx.scene.Scene;
 
 import org.jabref.gui.JabRefFrame;
@@ -34,29 +36,40 @@
  */
 public class ThemeLoader {
 
-    public static final String DEFAULT_MAIN_CSS = "Base.css";
-    private static final String DEFAULT_PATH_MAIN_CSS = JabRefFrame.class.getResource(DEFAULT_MAIN_CSS).toExternalForm();
+    public static final String MAIN_CSS = "Base.css";
+    public static final String DARK_CSS = "Dark.css";
+
     private static final Logger LOGGER = LoggerFactory.getLogger(ThemeLoader.class);
-    private String cssToLoad = System.getProperty("jabref.theme.css");
+    private final Optional<URL> additionalCssToLoad;
     private final FileUpdateMonitor fileUpdateMonitor;
 
     public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRefPreferences) {
         this.fileUpdateMonitor = Objects.requireNonNull(fileUpdateMonitor);
 
-        if (!StringUtil.isNullOrEmpty(cssToLoad)) {
-            LOGGER.info("using css from system " + cssToLoad);
-            return;
-        }
-
-        // otherwise load css from preference
-        String cssFileName = jabRefPreferences.get(JabRefPreferences.FX_THEME);
-        if (cssFileName != null) {
+        String cssVmArgument = System.getProperty("jabref.theme.css");
+        String cssPreferences = jabRefPreferences.get(JabRefPreferences.FX_THEME);
+        if (StringUtil.isNotBlank(cssVmArgument)) {
+            // First priority: VM argument
+            LOGGER.info("Using css from VM option: " + cssVmArgument);
+            URL cssVmUrl = null;
             try {
-                cssToLoad = JabRefFrame.class.getResource(cssFileName).toExternalForm();
-                LOGGER.info("using css " + cssToLoad);
-            } catch (Exception e) {
-                LOGGER.warn("can't get css file path of " + cssFileName);
+                cssVmUrl = Paths.get(cssVmArgument).toUri().toURL();
+            } catch (MalformedURLException e) {
+                LOGGER.warn("Cannot load css " + cssVmArgument, e);
+            }
+            additionalCssToLoad = Optional.ofNullable(cssVmUrl);
+        } else if (StringUtil.isNotBlank(cssPreferences) && !MAIN_CSS.equalsIgnoreCase(cssPreferences)) {
+            // Otherwise load css from preference
+            URL cssResource = JabRefFrame.class.getResource(cssPreferences);
+            if (cssResource != null) {
+                LOGGER.debug("Using css " + cssResource);
+                additionalCssToLoad = Optional.of(cssResource);
+            } else {
+                additionalCssToLoad = Optional.empty();
+                LOGGER.warn("Cannot load css " + cssPreferences);
             }
+        } else {
+            additionalCssToLoad = Optional.empty();
         }
     }
 
@@ -65,50 +78,32 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
      * Installs the base css file as a stylesheet in the given scene. Changes in the css file lead to a redraw of the
      * scene using the new css file.
      */
-    public void installBaseCss(Scene scene, JabRefPreferences preferences) {
-        if (!StringUtil.isNullOrEmpty(cssToLoad)) {
-            addAndWatchForChanges(scene, cssToLoad, 0);
-        } else {
-            LOGGER.warn("using the last default css " + DEFAULT_PATH_MAIN_CSS);
-            addAndWatchForChanges(scene, DEFAULT_PATH_MAIN_CSS, 0);
-        }
+    public void installCss(Scene scene, JabRefPreferences preferences) {
+        addAndWatchForChanges(scene, JabRefFrame.class.getResource(MAIN_CSS), 0);
+        additionalCssToLoad.ifPresent(file -> addAndWatchForChanges(scene, file, 1));
 
         preferences.getFontSize().ifPresent(size -> scene.getRoot().setStyle("-fx-font-size: " + size + "pt;"));
     }
 
-    private void addAndWatchForChanges(Scene scene, String cssUrl, int index) {
-        // avoid repeat add
-        if (scene.getStylesheets().contains(cssUrl)) {
-            return;
-        }
-
-        scene.getStylesheets().add(index, cssUrl);
+    private void addAndWatchForChanges(Scene scene, URL cssFile, int index) {
+        scene.getStylesheets().add(index, cssFile.toExternalForm());
 
         try {
-            // If -Djabref.theme.css is defined and the resources are not part of a .jar bundle,
-            // we watch the file for changes and turn on live reloading
-            if (!cssUrl.startsWith("jar:")) {
-                Path cssFile = Paths.get(new URL(cssUrl).toURI());
-                LOGGER.info("Enabling live reloading of " + cssFile);
-                fileUpdateMonitor.addListenerForFile(cssFile, () -> {
+            // If the file is an ordinary file (i.e. not a resource part of a .jar bundle), we watch it for changes and turn on live reloading
+            Path cssPath = Paths.get(cssFile.toURI());
+            if (Files.isRegularFile(cssPath)) {
+                LOGGER.info("Enabling live reloading of " + cssPath);
+                fileUpdateMonitor.addListenerForFile(cssPath, () -> {
                     LOGGER.info("Reload css file " + cssFile);
                     DefaultTaskExecutor.runInJavaFXThread(() -> {
-                                scene.getStylesheets().remove(cssUrl);
-                                scene.getStylesheets().add(index, cssUrl);
+                        scene.getStylesheets().remove(cssFile.toExternalForm());
+                        scene.getStylesheets().add(index, cssFile.toExternalForm());
                             }
                     );
                 });
             }
-        } catch (URISyntaxException | IOException e) {
-            LOGGER.error("Could not watch css file for changes " + cssUrl, e);
+        } catch (IOException | URISyntaxException e) {
+            LOGGER.error("Could not watch css file for changes " + cssFile, e);
         }
     }
-
-    /**
-     * @deprecated you should never need to add css to a control, add it to the scene containing the control
-     */
-    @Deprecated
-    public void installBaseCss(Parent control) {
-        control.getStylesheets().add(0, DEFAULT_PATH_MAIN_CSS);
-    }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index a61c1762f99..aaf9b4f24aa 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -784,7 +784,7 @@ private JabRefPreferences() {
                                     + "</dd>__NEWLINE__<p></p></font>");
 
         // set default theme
-        defaults.put(JabRefPreferences.FX_THEME, ThemeLoader.DEFAULT_MAIN_CSS);
+        defaults.put(JabRefPreferences.FX_THEME, ThemeLoader.MAIN_CSS);
         setLanguageDependentDefaultValues();
     }
 
diff --git a/src/main/java/org/jabref/styletester/StyleTesterMain.java b/src/main/java/org/jabref/styletester/StyleTesterMain.java
index 68a7331b989..13fa1ffcf7c 100644
--- a/src/main/java/org/jabref/styletester/StyleTesterMain.java
+++ b/src/main/java/org/jabref/styletester/StyleTesterMain.java
@@ -30,7 +30,7 @@ public void start(Stage stage) throws JabRefException {
         JabRefExecutorService.INSTANCE.executeInterruptableTask(fileUpdateMonitor, "FileUpdateMonitor");
 
         Scene scene = new Scene(view.getContent());
-        new ThemeLoader(fileUpdateMonitor, JabRefPreferences.getInstance()).installBaseCss(scene, JabRefPreferences.getInstance());
+        new ThemeLoader(fileUpdateMonitor, JabRefPreferences.getInstance()).installCss(scene, JabRefPreferences.getInstance());
         stage.setScene(scene);
         stage.show();
     }

From 11a62dd5ee7f4e0ad5188409a56d4d9ecb42c7c9 Mon Sep 17 00:00:00 2001
From: Florian Beetz <8899552+florian-beetz@users.noreply.github.com>
Date: Mon, 29 Oct 2018 18:24:22 +0100
Subject: [PATCH 142/229] Add citation styles as git submodule (#4431)

* add citation styles as git submodule

* add CSL locales as git submodule
---
 .gitmodules                                   |  6 ++
 build.gradle                                  |  3 -
 .../logic/citationstyle/CSLAdapter.java       |  3 +-
 .../logic/citationstyle/CitationStyle.java    | 67 +++++++++----------
 .../citationstyle/JabRefLocaleProvider.java   | 38 +++++++++++
 src/main/resources/csl-locales                |  1 +
 src/main/resources/csl-styles                 |  1 +
 7 files changed, 80 insertions(+), 39 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java
 create mode 160000 src/main/resources/csl-locales
 create mode 160000 src/main/resources/csl-styles

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000000..b37b24cf6d9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "src/main/resources/csl-styles"]
+	path = src/main/resources/csl-styles
+	url = https://github.com/citation-style-language/styles.git
+[submodule "src/main/resources/csl-locales"]
+	path = src/main/resources/csl-locales
+	url = https://github.com/citation-style-language/locales.git
diff --git a/build.gradle b/build.gradle
index a88052930d2..1c14214c094 100644
--- a/build.gradle
+++ b/build.gradle
@@ -151,9 +151,6 @@ dependencies {
     compile 'org.apache.logging.log4j:log4j-api:2.11.1'
     compile 'org.apache.logging.log4j:log4j-core:2.11.1'
 
-    // need to use snapshots as the stable version is from 2013 and doesn't support v1.0.1 CitationStyles
-    compile 'org.citationstyles:styles:1.0.1-SNAPSHOT'
-    compile 'org.citationstyles:locales:1.0.1-SNAPSHOT'
     compile 'de.undercouch:citeproc-java:1.0.1'
 
     compile 'com.github.tomtung:latex2unicode_2.12:0.2.2'
diff --git a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
index 7ce1e57e6f6..cda929568d2 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
@@ -64,7 +64,8 @@ public synchronized List<String> makeBibliography(List<BibEntry> bibEntries, Str
      */
     private void initialize(String newStyle, CitationStyleOutputFormat newFormat) throws IOException {
         if (cslInstance == null || !Objects.equals(newStyle, style)) {
-            cslInstance = new CSL(dataProvider, newStyle);
+            // lang and forceLang are set to the default values of other CSL constructors
+            cslInstance = new CSL(dataProvider, new JabRefLocaleProvider(), newStyle, "en-US", false);
             style = newStyle;
         }
 
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
index 02010cbbea6..f1ebe894836 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.io.UncheckedIOException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -13,12 +13,10 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -39,15 +37,13 @@
 import org.xml.sax.SAXException;
 
 /**
- * Representation of a CitationStyle.
- * Stores its name, the file path and the style itself
+ * Representation of a CitationStyle. Stores its name, the file path and the style itself
  */
 public class CitationStyle {
 
     public static final String DEFAULT = "/ieee.csl";
     private static final Logger LOGGER = LoggerFactory.getLogger(CitationStyle.class);
-
-    private static final Pattern SNAPSHOT_NAME = Pattern.compile(".*styles-1\\.0\\.1-SNAPSHOT\\.jar");
+    private static final String STYLES_ROOT = "/csl-styles";
 
     private static final List<CitationStyle> STYLES = new ArrayList<>();
 
@@ -88,7 +84,7 @@ private static Optional<CitationStyle> createCitationStyleFromSource(final Strin
     private static String stripInvalidProlog(String source) {
         int startIndex = source.indexOf("<");
         if (startIndex > 0) {
-            return source.substring(startIndex, source.length());
+            return source.substring(startIndex);
         } else {
             return source;
         }
@@ -99,13 +95,13 @@ private static String stripInvalidProlog(String source) {
      */
     public static Optional<CitationStyle> createCitationStyleFromFile(final String styleFile) {
         if (!isCitationStyleFile(styleFile)) {
-            LOGGER.error("Can only load style files: " + styleFile);
+            LOGGER.error("Can only load style files: {}", styleFile);
             return Optional.empty();
         }
 
         try {
             String text;
-            String internalFile = (styleFile.startsWith("/") ? "" : "/") + styleFile;
+            String internalFile = STYLES_ROOT + (styleFile.startsWith("/") ? "" : "/") + styleFile;
             URL url = CitationStyle.class.getResource(internalFile);
             if (url != null) {
                 text = CSLUtils.readURLToString(url, StandardCharsets.UTF_8.toString());
@@ -140,36 +136,37 @@ public static List<CitationStyle> discoverCitationStyles() {
         if (!STYLES.isEmpty()) {
             return STYLES;
         }
-        try {
-
-            Path filePath = Paths.get(CitationStyle.class.getProtectionDomain().getCodeSource().getLocation().toURI());
-            String path = filePath.toString();
-
-            // This is a quick fix to have the styles when running JabRef in a development environment.
-            // The styles.jar is not extracted into the JabRef.jar and therefore, we search the classpath for it.
-            if (Files.isDirectory(filePath)) {
-                final String cp = System.getProperty("java.class.path");
-                final String[] entries = cp.split(System.getProperty("path.separator"));
-
-                Optional<String> foundStyle = Arrays.stream(entries).filter(entry -> SNAPSHOT_NAME.matcher(entry).matches()).findFirst();
-                path = foundStyle.orElse(path);
-            }
-
-            try (FileSystem jarFs = FileSystems.newFileSystem(Paths.get(path), null)) {
 
-                try (Stream<Path> stylefileStream = Files.find(jarFs.getRootDirectories().iterator().next(), 1, (file, attr) -> file.toString().endsWith("csl"))) {
-                    for (Path style : stylefileStream.collect(Collectors.toList())) {
-                        CitationStyle.createCitationStyleFromFile(style.getFileName().toString()).ifPresent(STYLES::add);
-                    }
-                } catch (UncheckedIOException e) {
-                    throw new IOException(e);
+        URL url = CitationStyle.class.getResource(STYLES_ROOT);
+        if (url == null) {
+            return Collections.emptyList();
+        }
+        try {
+            URI uri = url.toURI();
+            if ("jar".equals(uri.getScheme())) {
+                try (FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) {
+                    Path path = fs.getPath(STYLES_ROOT);
+                    STYLES.addAll(discoverCitationStylesInPath(path));
                 }
+            } else {
+                STYLES.addAll(discoverCitationStylesInPath(Paths.get(uri)));
             }
             return STYLES;
-        } catch (UncheckedIOException | IOException | URISyntaxException ex) {
-            LOGGER.error("something went wrong while searching available CitationStyles. Are you running directly from source code?", ex);
+        } catch (URISyntaxException | IOException e) {
+            LOGGER.error("something went wrong while searching available CitationStyles. Are you running directly from source code?", e);
+            return Collections.emptyList();
+        }
+    }
+
+    private static List<CitationStyle> discoverCitationStylesInPath(Path path) throws IOException {
+        try (Stream<Path> stream = Files.find(path, 1, (file, attr) -> file.toString().endsWith("csl"))) {
+            return stream.map(Path::getFileName)
+                         .map(Path::toString)
+                         .map(CitationStyle::createCitationStyleFromFile)
+                         .filter(Optional::isPresent)
+                         .map(Optional::get)
+                         .collect(Collectors.toList());
         }
-        return Collections.emptyList();
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java b/src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java
new file mode 100644
index 00000000000..ecfc18d55de
--- /dev/null
+++ b/src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java
@@ -0,0 +1,38 @@
+package org.jabref.logic.citationstyle;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import de.undercouch.citeproc.LocaleProvider;
+import de.undercouch.citeproc.helper.CSLUtils;
+
+/**
+ * A {@link LocaleProvider} that loads locales from a directory in the current module.
+ *
+ * This implementation is only a slight adaption of {@link de.undercouch.citeproc.DefaultLocaleProvider}.
+ */
+public class JabRefLocaleProvider implements LocaleProvider {
+
+    private static final String LOCALES_ROOT = "/csl-locales";
+
+    private final Map<String, String> locales = new HashMap<>();
+
+    @Override
+    public String retrieveLocale(String lang) {
+        return locales.computeIfAbsent(lang, locale -> {
+            try {
+                URL url = getClass().getResource(LOCALES_ROOT + "/locales-" + locale + ".xml");
+                if (url == null) {
+                    throw new IllegalArgumentException("Unable to load locale " + locale);
+                }
+
+                return CSLUtils.readURLToString(url, "UTF-8");
+            } catch (IOException e) {
+                throw new UncheckedIOException("failed to read locale " + locale, e);
+            }
+        });
+    }
+}
diff --git a/src/main/resources/csl-locales b/src/main/resources/csl-locales
new file mode 160000
index 00000000000..29ed2ff4328
--- /dev/null
+++ b/src/main/resources/csl-locales
@@ -0,0 +1 @@
+Subproject commit 29ed2ff43284f726f9f583981650a86ffb9b236f
diff --git a/src/main/resources/csl-styles b/src/main/resources/csl-styles
new file mode 160000
index 00000000000..6ed87f55fd7
--- /dev/null
+++ b/src/main/resources/csl-styles
@@ -0,0 +1 @@
+Subproject commit 6ed87f55fd75fcecbf8f6b8a96d5edd0c935702e

From 68469b2a68e04b0d4391103a93746e9804befb7d Mon Sep 17 00:00:00 2001
From: Paul Krappatsch <paul.krappatsch@mni.thm.de>
Date: Mon, 29 Oct 2018 09:27:06 +0100
Subject: [PATCH 143/229] Fix radiobuttons in preference menu (#4409)

Previously multiple radiobuttons in preference menu belonging to the same group were selectable simultaneously
---
 .../gui/preferences/EntryEditorPrefsTab.java  |  9 +++++++
 .../jabref/gui/preferences/ExternalTab.java   |  7 +++++
 .../org/jabref/gui/preferences/FileTab.java   |  9 ++++++-
 .../gui/preferences/GroupsPrefsTab.java       |  4 +++
 .../gui/preferences/ImportSettingsTab.java    |  6 +++++
 .../gui/preferences/TableColumnsTab.java      |  7 +++++
 .../jabref/gui/preferences/TablePrefsTab.java | 26 +++++++++++--------
 7 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
index ab874bf1287..dd04ed460cd 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
@@ -6,6 +6,7 @@
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Separator;
 import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 
@@ -102,18 +103,26 @@ public EntryEditorPrefsTab(JabRefPreferences prefs) {
 
         Label nameFormat = new Label(Localization.lang("Name format used for autocompletion"));
         nameFormat.getStyleClass().add("sectionHeader");
+        final ToggleGroup autocompletionToggleGroup = new ToggleGroup();
         builder.add(nameFormat, 1, 14);
         builder.add(autoCompFF, 1, 15);
         builder.add(autoCompLF,  1, 16);
         builder.add(autoCompBoth,  1, 17);
+        autoCompFF.setToggleGroup(autocompletionToggleGroup);
+        autoCompLF.setToggleGroup(autocompletionToggleGroup);
+        autoCompBoth.setToggleGroup(autocompletionToggleGroup);
         builder.add(new Label(""), 1, 18);
 
         Label treatment = new Label(Localization.lang("Treatment of first names"));
         treatment.getStyleClass().add("sectionHeader");
+        final ToggleGroup treatmentOfFirstNamesToggleGroup = new ToggleGroup();
         builder.add(treatment, 1, 19);
         builder.add(firstNameModeAbbr,  1, 20);
         builder.add(firstNameModeFull, 1, 21);
         builder.add(firstNameModeBoth,  1, 22);
+        firstNameModeAbbr.setToggleGroup(treatmentOfFirstNamesToggleGroup);
+        firstNameModeFull.setToggleGroup(treatmentOfFirstNamesToggleGroup);
+        firstNameModeBoth.setToggleGroup(treatmentOfFirstNamesToggleGroup);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTab.java b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
index a9ec0064a42..782a14fa11d 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
@@ -13,6 +13,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 
 import org.jabref.Globals;
@@ -69,6 +70,9 @@ public ExternalTab(JabRefFrame frame, PreferencesDialog prefsDiag, JabRefPrefere
         browseAdobeAcrobatReader.setOnAction(e -> showAdobeChooser());
 
         GridPane consoleOptionPanel = new GridPane();
+        final ToggleGroup consoleGroup = new ToggleGroup();
+        defaultConsole.setToggleGroup(consoleGroup);
+        executeConsole.setToggleGroup(consoleGroup);
         consoleOptionPanel.add(defaultConsole,  1, 1);
         consoleOptionPanel.add(executeConsole,  1, 2);
         consoleOptionPanel.add(consoleCommand,  2, 2);
@@ -76,13 +80,16 @@ public ExternalTab(JabRefFrame frame, PreferencesDialog prefsDiag, JabRefPrefere
         consoleOptionPanel.add(commandDescription,  2, 3);
 
         GridPane pdfOptionPanel = new GridPane();
+        final ToggleGroup pdfReaderGroup = new ToggleGroup();
         pdfOptionPanel.add(adobeAcrobatReader,  1, 1);
         pdfOptionPanel.add(adobeAcrobatReaderPath,  2, 1);
+        adobeAcrobatReader.setToggleGroup(pdfReaderGroup);
         pdfOptionPanel.add(browseAdobeAcrobatReader,  3, 1);
 
         if (OS.WINDOWS) {
             browseSumatraReader.setOnAction(e -> showSumatraChooser());
             pdfOptionPanel.add(sumatraReader,  1, 2);
+            sumatraReader.setToggleGroup(pdfReaderGroup);
             pdfOptionPanel.add(sumatraReaderPath,  2, 2);
             pdfOptionPanel.add(browseSumatraReader,  3, 2);
         }
diff --git a/src/main/java/org/jabref/gui/preferences/FileTab.java b/src/main/java/org/jabref/gui/preferences/FileTab.java
index 110caa3f640..55e599e67ae 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTab.java
+++ b/src/main/java/org/jabref/gui/preferences/FileTab.java
@@ -12,6 +12,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 
@@ -95,11 +96,13 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         builder.add(backup, 1, 3);
         Label label = new Label(Localization.lang("Do not wrap the following fields when saving") + ":");
         builder.add(label, 1, 4);
+        final ToggleGroup resolveGroup = new ToggleGroup();
         builder.add(nonWrappableFields, 2, 4);
         builder.add(resolveStringsStandard,  1, 5);
         builder.add(resolveStringsAll, 1, 6);
         builder.add(doNotResolveStringsFor, 2, 6);
-
+        resolveStringsStandard.setToggleGroup(resolveGroup);
+        resolveStringsAll.setToggleGroup(resolveGroup);
         Label newlineSeparatorLabel = new Label(Localization.lang("Newline separator") + ":");
         builder.add(newlineSeparatorLabel, 1, 7);
         builder.add(newlineSeparator, 2, 7);
@@ -125,10 +128,14 @@ public FileTab(DialogService dialogService, JabRefPreferences prefs) {
         });
         builder.add(browse, 3, 12);
         builder.add(bibLocAsPrimaryDir, 1, 13);
+        final ToggleGroup autolinkGroup = new ToggleGroup();
         builder.add(matchStartsWithKey,  1, 14);
         builder.add(matchExactKeyOnly,  1, 15);
         builder.add(useRegExpComboBox, 1, 16);
         builder.add(regExpTextField, 2, 16);
+        matchStartsWithKey.setToggleGroup(autolinkGroup);
+        matchExactKeyOnly.setToggleGroup(autolinkGroup);
+        useRegExpComboBox.setToggleGroup(autolinkGroup);
 
         Button help = new Button("?");
         help.setOnAction(event -> new HelpAction(Localization.lang("Help on regular expression search"),
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java b/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
index 989f4b534cc..e7086e15e0b 100644
--- a/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
@@ -7,6 +7,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 
@@ -45,8 +46,11 @@ public void handle(ActionEvent event) {
         builder.add(view, 1, 1);
         builder.add(hideNonHits, 2, 2);
         builder.add(grayOut, 2, 3);
+        final ToggleGroup selectionModeGroup = new ToggleGroup();
         builder.add(multiSelectionModeIntersection, 2, 4);
         builder.add(multiSelectionModeUnion, 2, 5);
+        multiSelectionModeIntersection.setToggleGroup(selectionModeGroup);
+        multiSelectionModeUnion.setToggleGroup(selectionModeGroup);
         builder.add(autoAssignGroup, 2, 6);
         builder.add(new Label(""), 1, 7);
 
diff --git a/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java b/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
index ad63acc2ffa..d2dd0896a7e 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
@@ -10,6 +10,7 @@
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Separator;
 import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 
@@ -60,11 +61,16 @@ public ImportSettingsTab(JabRefPreferences prefs) {
         Label defaultImportStyle = new Label(Localization.lang("Default import style for drag and drop of PDFs"));
         defaultImportStyle.getStyleClass().add("sectionHeader");
         builder.add(defaultImportStyle, 1, 1);
+        final ToggleGroup defaultImportStyleDragDropPdfs = new ToggleGroup();
         builder.add(new Separator(), 2, 1);
         builder.add(radioButtonNoMeta, 2, 2);
         builder.add(radioButtonXmp, 2, 3);
         builder.add(radioButtonPDFcontent, 2, 4);
         builder.add(radioButtononlyAttachPDF, 2, 5);
+        radioButtonNoMeta.setToggleGroup(defaultImportStyleDragDropPdfs);
+        radioButtonXmp.setToggleGroup(defaultImportStyleDragDropPdfs);
+        radioButtonPDFcontent.setToggleGroup(defaultImportStyleDragDropPdfs);
+        radioButtononlyAttachPDF.setToggleGroup(defaultImportStyleDragDropPdfs);
         builder.add(useDefaultPDFImportStyle, 2, 6);
         builder.add(new Label(""), 1, 7);
 
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
index 9a9ea48bd0b..40ae74463ed 100644
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
@@ -24,6 +24,7 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.layout.BorderPane;
@@ -284,14 +285,20 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
         specialTableColumnsBuilder.add(priorityColumn, 1, 5);
         specialTableColumnsBuilder.add(printedColumn, 1, 6);
         specialTableColumnsBuilder.add(readStatusColumn, 1, 7);
+        final ToggleGroup syncGroup = new ToggleGroup();
         specialTableColumnsBuilder.add(syncKeywords, 1, 8);
         specialTableColumnsBuilder.add(writeSpecialFields, 1, 9);
+        syncKeywords.setToggleGroup(syncGroup);
+        writeSpecialFields.setToggleGroup(syncGroup);
         specialTableColumnsBuilder.add(helpButton, 1, 10);
 
         specialTableColumnsBuilder.add(fileColumn, 2, 1);
         specialTableColumnsBuilder.add(urlColumn, 2, 2);
+        final ToggleGroup preferUrlOrDoi = new ToggleGroup();
         specialTableColumnsBuilder.add(preferUrl, 2 ,3);
         specialTableColumnsBuilder.add(preferDoi, 2, 4);
+        preferUrl.setToggleGroup(preferUrlOrDoi);
+        preferDoi.setToggleGroup(preferUrlOrDoi);
         specialTableColumnsBuilder.add(arxivColumn, 2, 5);
 
         specialTableColumnsBuilder.add(extraFileColumns,2, 6);
diff --git a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
index 4ec10405351..c0dfe9b90be 100644
--- a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
@@ -4,6 +4,7 @@
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.RadioButton;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 
@@ -54,26 +55,33 @@ public TablePrefsTab(JabRefPreferences prefs) {
         Label formatOfAuthor = new Label(Localization.lang("Format of author and editor names"));
         formatOfAuthor.getStyleClass().add("sectionHeader");
         builder.add(formatOfAuthor, 1, 1);
+        final ToggleGroup formatNamesToggleGroup = new ToggleGroup();
+        final ToggleGroup nameAbbrevToggleGroup = new ToggleGroup();
         builder.add(namesAsIs, 1, 2);
+        namesAsIs.setToggleGroup(formatNamesToggleGroup);
         builder.add(noAbbrNames, 2, 2);
+        noAbbrNames.setToggleGroup(nameAbbrevToggleGroup);
         builder.add(namesFf, 1, 3);
+        namesFf.setToggleGroup(formatNamesToggleGroup);
         builder.add(abbrNames, 2, 3);
+        abbrNames.setToggleGroup(nameAbbrevToggleGroup);
         builder.add(namesFl, 1, 4);
+        namesFl.setToggleGroup(formatNamesToggleGroup);
         builder.add(lastNamesOnly, 2, 4);
+        lastNamesOnly.setToggleGroup(nameAbbrevToggleGroup);
         builder.add(namesNatbib, 1, 5);
-
+        namesNatbib.setToggleGroup(formatNamesToggleGroup);
         Label label1 = new Label("");
         builder.add(label1, 1, 6);
-
         Label general = new Label(Localization.lang("General"));
         general.getStyleClass().add("sectionHeader");
         builder.add(general, 1, 7);
         builder.add(autoResizeMode, 1, 8);
-        namesNatbib.setOnAction(e -> {
-            abbrNames.setDisable(namesNatbib.isSelected());
-            lastNamesOnly.setDisable(namesNatbib.isSelected());
-            noAbbrNames.setDisable(namesNatbib.isSelected());
-        });
+
+        abbrNames.disableProperty().bind(namesNatbib.selectedProperty());
+        lastNamesOnly.disableProperty().bind(namesNatbib.selectedProperty());
+        noAbbrNames.disableProperty().bind(namesNatbib.selectedProperty());
+
     }
 
     @Override
@@ -102,10 +110,6 @@ public void setValues() {
             noAbbrNames.setSelected(true);
         }
 
-        abbrNames.setDisable(namesNatbib.isSelected());
-        lastNamesOnly.setDisable(namesNatbib.isSelected());
-        noAbbrNames.setDisable(namesNatbib.isSelected());
-
     }
 
     /**

From 583c61fba671cb15c46d8d3284982793e4b0812d Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Tue, 30 Oct 2018 09:34:54 +0100
Subject: [PATCH 144/229] Fix ArrayIndexOutOfBoundsException on second pdf
 import (#4426)

* Fix ArrayIndexOutOfBoundsException on second pdf import

The variable formally known as i is a global variable which had -1 after the first run and therefore threw an exception

* add changelog and fix

* add test
---
 CHANGELOG.md                                  |  6 +-
 .../fileformat/PdfContentImporter.java        | 65 ++++++++++---------
 .../fileformat/PdfContentImporterTest.java    | 25 +++++--
 3 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9848a45705f..bab3e63099a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,7 +31,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - Files without a defined external file type are now directly opened with the default application of the operating system
 - We streamlined the process to rename and move files by removing the confirmation dialogs.
 - We removed the redundant new lines of markings and wrapped the summary in the File annotation tab. [#3823](https://github.com/JabRef/jabref/issues/3823)
-- We add auto url formatting when user paste link to URL field in entry editor. [#254](https://github.com/koppor/jabref/issues/254)
+- We add auto url formatting when user paste link to URL field in entry editor. [koppor#254](https://github.com/koppor/jabref/issues/254)
 - We added a minimal height for the entry editor so that it can no longer be hidden by accident. [#4279](https://github.com/JabRef/jabref/issues/4279)
 - We added a new keyboard shortcut so that the entry editor could be closed by <kbd>Ctrl<kbd> + <kbd>E<kbd>. [#4222] (https://github.com/JabRef/jabref/issues/4222)
 - We added an option in the preference dialog box, that allows user to pick the dark or light theme option. [#4130] (https://github.com/JabRef/jabref/issues/4130)
@@ -74,8 +74,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where files added via the "Attach file" contextmenu of an entry were not made relative. [#4201](https://github.com/JabRef/jabref/issues/4201) and [#4241](https://github.com/JabRef/jabref/issues/4241)
 - We fixed an issue where author list parser can't generate bibtex for Chinese author. [#4169](https://github.com/JabRef/jabref/issues/4169)
 - We fixed an issue where the list of XMP Exclusion fields in the preferences was not be saved [#4072](https://github.com/JabRef/jabref/issues/4072)
-- We fixed an issue where the ArXiv Fetcher did not support HTTP URLs [#4367](https://github.com/JabRef/jabref/pull/4367)
-
+- We fixed an issue where the ArXiv Fetcher did not support HTTP URLs [koppor#328](https://github.com/koppor/jabref/issues/328)
+- We fixed an issue where only one PDF file could be imported [#4422](https://github.com/JabRef/jabref/issues/4422)
 
 
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
index 67020c721fc..73d5f0544fc 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
@@ -45,13 +45,14 @@ public class PdfContentImporter extends Importer {
     // input lines into several lines
     private String[] lines;
     // current index in lines
-    private int i;
+    private int lineIndex;
     private String curString;
     private String year;
 
 
     public PdfContentImporter(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
+
     }
     /**
      * Removes all non-letter characters at the end
@@ -225,17 +226,19 @@ public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
             //   the different lines are joined into one and thereby separated by " "
             lines = firstPageContents.split(System.lineSeparator());
 
+            lineIndex = 0; //to prevent array index out of bounds exception on second run we need to reset i to zero
+
             proceedToNextNonEmptyLine();
-            if (i >= lines.length) {
+            if (lineIndex >= lines.length) {
                 // PDF could not be parsed or is empty
                 // return empty list
                 return new ParserResult();
             }
 
             // we start at the current line
-            curString = lines[i];
+            curString = lines[lineIndex];
             // i might get incremented later and curString modified, too
-            i = i + 1;
+            lineIndex = lineIndex + 1;
 
             String author;
             String editor = null;
@@ -279,10 +282,10 @@ public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
 
             // after title: authors
             author = null;
-            while ((i < lines.length) && !"".equals(lines[i])) {
+            while ((lineIndex < lines.length) && !"".equals(lines[lineIndex])) {
                 // author names are unlikely to be lines among different lines
                 // treat them line by line
-                curString = streamlineNames(lines[i]);
+                curString = streamlineNames(lines[lineIndex]);
                 if (author == null) {
                     author = curString;
                 } else {
@@ -292,14 +295,14 @@ public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
                         author = author.concat(" and ").concat(curString);
                     }
                 }
-                i++;
+                lineIndex++;
             }
             curString = "";
-            i++;
+            lineIndex++;
 
             // then, abstract and keywords follow
-            while (i < lines.length) {
-                curString = lines[i];
+            while (lineIndex < lines.length) {
+                curString = lines[lineIndex];
                 if ((curString.length() >= "Abstract".length()) && "Abstract".equalsIgnoreCase(curString.substring(0, "Abstract".length()))) {
                     if (curString.length() == "Abstract".length()) {
                         // only word "abstract" found -- skip line
@@ -307,15 +310,15 @@ public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
                     } else {
                         curString = curString.substring("Abstract".length() + 1).trim().concat(System.lineSeparator());
                     }
-                    i++;
+                    lineIndex++;
                     // fillCurStringWithNonEmptyLines() cannot be used as that uses " " as line separator
                     // whereas we need linebreak as separator
-                    while ((i < lines.length) && !"".equals(lines[i])) {
-                        curString = curString.concat(lines[i]).concat(System.lineSeparator());
-                        i++;
+                    while ((lineIndex < lines.length) && !"".equals(lines[lineIndex])) {
+                        curString = curString.concat(lines[lineIndex]).concat(System.lineSeparator());
+                        lineIndex++;
                     }
                     abstractT = curString.trim();
-                    i++;
+                    lineIndex++;
                 } else if ((curString.length() >= "Keywords".length()) && "Keywords".equalsIgnoreCase(curString.substring(0, "Keywords".length()))) {
                     if (curString.length() == "Keywords".length()) {
                         // only word "Keywords" found -- skip line
@@ -323,7 +326,7 @@ public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
                     } else {
                         curString = curString.substring("Keywords".length() + 1).trim();
                     }
-                    i++;
+                    lineIndex++;
                     fillCurStringWithNonEmptyLines();
                     keywords = removeNonLettersAtEnd(curString);
                 } else {
@@ -340,18 +343,18 @@ public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
                         }
                     }
 
-                    i++;
+                    lineIndex++;
                     proceedToNextNonEmptyLine();
                 }
             }
 
-            i = lines.length - 1;
+            lineIndex = lines.length - 1;
 
             // last block: DOI, detailed information
             // sometimes, this information is in the third last block etc...
             // therefore, read until the beginning of the file
 
-            while (i >= 0) {
+            while (lineIndex >= 0) {
                 readLastBlock();
                 // i now points to the block before or is -1
                 // curString contains the last block, separated by " "
@@ -522,8 +525,8 @@ private void extractYear() {
      * proceed to next non-empty line
      */
     private void proceedToNextNonEmptyLine() {
-        while ((i < lines.length) && "".equals(lines[i].trim())) {
-            i++;
+        while ((lineIndex < lines.length) && "".equals(lines[lineIndex].trim())) {
+            lineIndex++;
         }
     }
 
@@ -540,16 +543,16 @@ private void proceedToNextNonEmptyLine() {
     private void fillCurStringWithNonEmptyLines() {
         // ensure that curString does not end with " "
         curString = curString.trim();
-        while ((i < lines.length) && !"".equals(lines[i])) {
-            String curLine = lines[i].trim();
+        while ((lineIndex < lines.length) && !"".equals(lines[lineIndex])) {
+            String curLine = lines[lineIndex].trim();
             if (!"".equals(curLine)) {
                 if (!curString.isEmpty()) {
                     // insert separating space if necessary
                     curString = curString.concat(" ");
                 }
-                curString = curString.concat(lines[i]);
+                curString = curString.concat(lines[lineIndex]);
             }
-            i++;
+            lineIndex++;
         }
 
         proceedToNextNonEmptyLine();
@@ -563,22 +566,22 @@ private void fillCurStringWithNonEmptyLines() {
      * invariant before/after: i points to line before the last handled block
      */
     private void readLastBlock() {
-        while ((i >= 0) && "".equals(lines[i].trim())) {
-            i--;
+        while ((lineIndex >= 0) && "".equals(lines[lineIndex].trim())) {
+            lineIndex--;
         }
         // i is now at the end of a block
 
-        int end = i;
+        int end = lineIndex;
 
         // find beginning
-        while ((i >= 0) && !"".equals(lines[i])) {
-            i--;
+        while ((lineIndex >= 0) && !"".equals(lines[lineIndex])) {
+            lineIndex--;
         }
         // i is now the line before the beginning of the block
         // this fulfills the invariant
 
         curString = "";
-        for (int j = i + 1; j <= end; j++) {
+        for (int j = lineIndex + 1; j <= end; j++) {
             curString = curString.concat(lines[j].trim());
             if (j != end) {
                 curString = curString.concat(" ");
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
index db7396d047c..b82795865d6 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -10,6 +9,8 @@
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
+import org.jabref.model.entry.FieldName;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,14 +35,30 @@ public void testsGetExtensions() {
     @Test
     public void testGetDescription() {
         assertEquals(
-                "PdfContentImporter parses data of the first page of the PDF and creates a BibTeX entry. Currently, Springer and IEEE formats are supported.",
-                importer.getDescription());
+                     "PdfContentImporter parses data of the first page of the PDF and creates a BibTeX entry. Currently, Springer and IEEE formats are supported.",
+                     importer.getDescription());
     }
 
     @Test
-    public void doesNotHandleEncryptedPdfs() throws URISyntaxException {
+    public void doesNotHandleEncryptedPdfs() throws Exception {
         Path file = Paths.get(PdfContentImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
         List<BibEntry> result = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), result);
     }
+
+    @Test
+    public void importTwiceWorksAsExpected() throws Exception {
+        Path file = Paths.get(PdfContentImporter.class.getResource("/pdfs/minimal.pdf").toURI());
+        List<BibEntry> result = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+
+        BibEntry expected = new BibEntry(BibtexEntryTypes.INPROCEEDINGS);
+        expected.setField(FieldName.AUTHOR, "1 ");
+        expected.setField(FieldName.TITLE, "Hello World");
+
+        List<BibEntry> resultSecondImport = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        assertEquals(Collections.singletonList(expected), result);
+        assertEquals(Collections.singletonList(expected), resultSecondImport);
+
+    }
+
 }

From 274fed4862a5ac81e4eb9adf9e9c4bbe3d9507ff Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 30 Oct 2018 15:07:47 +0100
Subject: [PATCH 145/229] Convert merge entries dialog to JavaFX (#4410)

* Convert to JavaFX

* Fix diff display

* Colorize diff

* Fix build and implement review feedback

* Move test file to tests

* Fix exception

* Maybe now...

* Fix NPE

* Remove obsolete language
---
 src/main/java/org/jabref/gui/BasePanel.java   |   4 +-
 .../jabref/gui/DuplicateResolverDialog.java   |   5 +-
 src/main/java/org/jabref/gui/JabRefFrame.java |   2 +-
 .../gui/actions/MergeEntriesAction.java       |  20 -
 .../gui/mergeentries/DiffHighlighting.java    | 108 +++++
 .../gui/mergeentries/FetchAndMergeEntry.java  |  71 ++-
 .../jabref/gui/mergeentries/MergeEntries.css  |  15 +
 .../jabref/gui/mergeentries/MergeEntries.java | 454 +++++++-----------
 .../gui/mergeentries/MergeEntriesAction.java  |  68 +++
 .../gui/mergeentries/MergeEntriesDialog.java  | 127 +----
 .../mergeentries/MergeFetchedEntryDialog.java | 167 -------
 .../gui/shared/MergeSharedEntryDialog.java    |   5 +-
 .../component/DiffHighlightingTextPane.java   |  20 +-
 .../logic/importer/fetcher/DoiFetcher.java    |  13 +-
 .../logic/util/strings/DiffHighlighting.java  | 103 ----
 .../jabref/preferences/JabRefPreferences.java |   3 +-
 src/main/resources/l10n/JabRef_en.properties  |   4 -
 .../mergeentries/DiffHighlightingTest.java    | 174 +++++++
 .../util/strings/DiffHighlightingTest.java    |  81 ----
 19 files changed, 668 insertions(+), 776 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/actions/MergeEntriesAction.java
 create mode 100644 src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
 create mode 100644 src/main/java/org/jabref/gui/mergeentries/MergeEntries.css
 create mode 100644 src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
 delete mode 100644 src/main/java/org/jabref/gui/mergeentries/MergeFetchedEntryDialog.java
 delete mode 100644 src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java
 create mode 100644 src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
 delete mode 100644 src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 324b6805ccd..f57f69d6134 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -60,7 +60,7 @@
 import org.jabref.gui.journals.UnabbreviateAction;
 import org.jabref.gui.maintable.MainTable;
 import org.jabref.gui.maintable.MainTableDataModel;
-import org.jabref.gui.mergeentries.MergeEntriesDialog;
+import org.jabref.gui.mergeentries.MergeEntriesAction;
 import org.jabref.gui.mergeentries.MergeWithFetchedEntryAction;
 import org.jabref.gui.specialfields.SpecialFieldDatabaseChangeListener;
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
@@ -324,7 +324,7 @@ private void setupActions() {
         // The action for cleaning up entry.
         actions.put(Actions.CLEANUP, cleanUpAction);
 
-        actions.put(Actions.MERGE_ENTRIES, () -> new MergeEntriesDialog(BasePanel.this, dialogService));
+        actions.put(Actions.MERGE_ENTRIES, () -> new MergeEntriesAction(frame).execute());
 
         // The action for copying the selected entry's key.
         actions.put(Actions.COPY_KEY, this::copyKey);
diff --git a/src/main/java/org/jabref/gui/DuplicateResolverDialog.java b/src/main/java/org/jabref/gui/DuplicateResolverDialog.java
index c7d939cbd87..362333ebfa0 100644
--- a/src/main/java/org/jabref/gui/DuplicateResolverDialog.java
+++ b/src/main/java/org/jabref/gui/DuplicateResolverDialog.java
@@ -8,6 +8,9 @@
 import javax.swing.JButton;
 import javax.swing.JPanel;
 
+import javafx.scene.Scene;
+
+import org.jabref.gui.customjfx.CustomJFXPanel;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.importer.ImportInspectionDialog;
 import org.jabref.gui.mergeentries.MergeEntries;
@@ -119,7 +122,7 @@ public void windowClosing(WindowEvent e) {
             }
         });
 
-        getContentPane().add(me.getMergeEntryPanel());
+        getContentPane().add(CustomJFXPanel.wrap(new Scene(me)));
         getContentPane().add(options, BorderLayout.SOUTH);
         pack();
 
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 596fe1972c9..a7f2586d7e0 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -69,7 +69,6 @@
 import org.jabref.gui.actions.ManageJournalsAction;
 import org.jabref.gui.actions.ManageKeywordsAction;
 import org.jabref.gui.actions.ManageProtectedTermsAction;
-import org.jabref.gui.actions.MergeEntriesAction;
 import org.jabref.gui.actions.NewDatabaseAction;
 import org.jabref.gui.actions.NewEntryAction;
 import org.jabref.gui.actions.NewEntryFromPlainTextAction;
@@ -97,6 +96,7 @@
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 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;
diff --git a/src/main/java/org/jabref/gui/actions/MergeEntriesAction.java b/src/main/java/org/jabref/gui/actions/MergeEntriesAction.java
deleted file mode 100644
index 257c8b04a18..00000000000
--- a/src/main/java/org/jabref/gui/actions/MergeEntriesAction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.jabref.gui.actions;
-
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.mergeentries.MergeEntriesDialog;
-
-public class MergeEntriesAction extends SimpleCommand {
-
-    private final JabRefFrame jabRefFrame;
-
-    public MergeEntriesAction(JabRefFrame jabRefFrame) {
-        this.jabRefFrame = jabRefFrame;
-    }
-
-    @Override
-    public void execute() {
-        MergeEntriesDialog dlg = new MergeEntriesDialog(jabRefFrame.getCurrentBasePanel(), jabRefFrame.getDialogService());
-        dlg.setVisible(true);
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java b/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
new file mode 100644
index 00000000000..f4812fbc4ad
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
@@ -0,0 +1,108 @@
+package org.jabref.gui.mergeentries;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javafx.scene.text.Text;
+
+import difflib.Delta;
+import difflib.DiffUtils;
+
+public class DiffHighlighting {
+
+    private DiffHighlighting() {
+    }
+
+    public static List<Text> generateDiffHighlighting(String baseString, String modifiedString, String separator) {
+        List<String> stringList = Arrays.asList(baseString.split(separator));
+        List<Text> result = stringList.stream().map(DiffHighlighting::forUnchanged).collect(Collectors.toList());
+        List<Delta<String>> deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
+            Collections.reverse(deltaList);
+            for (Delta<String> delta : deltaList) {
+                int startPos = delta.getOriginal().getPosition();
+                List<String> lines = delta.getOriginal().getLines();
+                int offset = 0;
+                switch (delta.getType()) {
+                case CHANGE:
+                    for (String line : lines) {
+                        result.set(startPos + offset, forRemoved(line + separator));
+                        offset++;
+                    }
+                    result.set(startPos + offset - 1, forRemoved(stringList.get((startPos + offset) - 1) + separator));
+                    result.add(startPos + offset, forAdded(String.join(separator, delta.getRevised().getLines())));
+                    break;
+                case DELETE:
+                    for (String line : lines) {
+                        result.set(startPos + offset, forRemoved(line + separator));
+                        offset++;
+                    }
+                    break;
+                case INSERT:
+                    result.add(delta.getOriginal().getPosition(), forAdded(String.join(separator, delta.getRevised().getLines())));
+                    break;
+                default:
+                    break;
+                }
+            }
+        return result;
+    }
+
+    public static Text forChanged(String text) {
+        Text node = new Text(text);
+        node.getStyleClass().add("text-changed");
+        return node;
+    }
+
+    public static Text forUnchanged(String text) {
+        Text node = new Text(text);
+        node.getStyleClass().add("text-unchanged");
+        return node;
+    }
+
+    public static Text forAdded(String text) {
+        Text node = new Text(text);
+        node.getStyleClass().add("text-added");
+        return node;
+    }
+
+    public static Text forRemoved(String text) {
+        Text node = new Text(text);
+        node.getStyleClass().add("text-removed");
+        return node;
+    }
+
+    public static List<Text> generateSymmetricHighlighting(String baseString, String modifiedString, String separator) {
+        List<String> stringList = Arrays.asList(baseString.split(separator));
+        List<Text> result = stringList.stream().map(text -> DiffHighlighting.forUnchanged(text + separator)).collect(Collectors.toList());
+        List<Delta<String>> deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
+            Collections.reverse(deltaList);
+            for (Delta<String> delta : deltaList) {
+                int startPos = delta.getOriginal().getPosition();
+                List<String> lines = delta.getOriginal().getLines();
+                int offset = 0;
+                switch (delta.getType()) {
+                case CHANGE:
+                    for (String line : lines) {
+                        result.set(startPos + offset, forChanged(line + separator));
+                        offset++;
+                    }
+                    break;
+                case DELETE:
+                    for (String line : lines) {
+                        result.set(startPos + offset, forAdded(line + separator));
+                        offset++;
+                    }
+                    break;
+                case INSERT:
+                    break;
+                default:
+                    break;
+                }
+            }
+
+        return result;
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
index 38a332e6dd3..cd7be54acc3 100644
--- a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
+++ b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
@@ -4,18 +4,25 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableChangeType;
+import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.IdBasedFetcher;
+import org.jabref.logic.importer.WebFetcher;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
+import org.jabref.model.entry.InternalBibtexFields;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,8 +63,7 @@ public void fetchAndMerge(BibEntry entry, List<String> fields) {
                                   .onSuccess(fetchedEntry -> {
                                       String type = FieldName.getDisplayName(field);
                                       if (fetchedEntry.isPresent()) {
-                                          MergeFetchedEntryDialog dialog = new MergeFetchedEntryDialog(panel, entry, fetchedEntry.get(), type);
-                                          dialog.setVisible(true);
+                                          showMergeDialog(entry, fetchedEntry.get(), fetcher.get());
                                       } else {
                                           panel.frame().setStatus(Localization.lang("Cannot get info based on given %0: %1", type, fieldContent.get()));
                                       }
@@ -74,12 +80,69 @@ public void fetchAndMerge(BibEntry entry, List<String> fields) {
         }
     }
 
+    private void showMergeDialog(BibEntry originalEntry, BibEntry fetchedEntry, WebFetcher fetcher) {
+        MergeEntriesDialog dialog = new MergeEntriesDialog(originalEntry, fetchedEntry, panel.getBibDatabaseContext().getMode());
+        dialog.setTitle(Localization.lang("Merge entry with %0 information", fetcher.getName()));
+        dialog.setLeftHeaderText(Localization.lang("Original entry"));
+        dialog.setRightHeaderText(Localization.lang("Entry from %0", fetcher.getName()));
+        Optional<BibEntry> mergedEntry = dialog.showAndWait();
+        if (mergedEntry.isPresent()) {
+            NamedCompound ce = new NamedCompound(Localization.lang("Merge entry with %0 information", fetcher.getName()));
+
+            // Updated the original entry with the new fields
+            Set<String> jointFields = new TreeSet<>(mergedEntry.get().getFieldNames());
+            Set<String> originalFields = new TreeSet<>(originalEntry.getFieldNames());
+            boolean edited = false;
+
+            // entry type
+            String oldType = originalEntry.getType();
+            String newType = mergedEntry.get().getType();
+
+            if (!oldType.equalsIgnoreCase(newType)) {
+                originalEntry.setType(newType);
+                ce.addEdit(new UndoableChangeType(originalEntry, oldType, newType));
+                edited = true;
+            }
+
+            // fields
+            for (String field : jointFields) {
+                Optional<String> originalString = originalEntry.getField(field);
+                Optional<String> mergedString = mergedEntry.get().getField(field);
+                if (!originalString.isPresent() || !originalString.equals(mergedString)) {
+                    originalEntry.setField(field, mergedString.get()); // mergedString always present
+                    ce.addEdit(new UndoableFieldChange(originalEntry, field, originalString.orElse(null),
+                            mergedString.get()));
+                    edited = true;
+                }
+            }
+
+            // Remove fields which are not in the merged entry, unless they are internal fields
+            for (String field : originalFields) {
+                if (!jointFields.contains(field) && !InternalBibtexFields.isInternalField(field)) {
+                    Optional<String> originalString = originalEntry.getField(field);
+                    originalEntry.clearField(field);
+                    ce.addEdit(new UndoableFieldChange(originalEntry, field, originalString.get(), null)); // originalString always present
+                    edited = true;
+                }
+            }
+
+            if (edited) {
+                ce.end();
+                panel.getUndoManager().addEdit(ce);
+                dialogService.notify(Localization.lang("Updated entry with info from %0", fetcher.getName()));
+            } else {
+                dialogService.notify(Localization.lang("No information added"));
+            }
+        } else {
+            dialogService.notify(Localization.lang("Canceled merging entries"));
+        }
+    }
+
     public void fetchAndMerge(BibEntry entry, EntryBasedFetcher fetcher) {
         BackgroundTask.wrap(() -> fetcher.performSearch(entry).stream().findFirst())
                       .onSuccess(fetchedEntry -> {
                           if (fetchedEntry.isPresent()) {
-                              MergeFetchedEntryDialog dialog = new MergeFetchedEntryDialog(panel, entry, fetchedEntry.get(), fetcher.getName());
-                              dialog.setVisible(true);
+                              showMergeDialog(entry, fetchedEntry.get(), fetcher);
                           } else {
                               dialogService.notify(Localization.lang("Could not find any bibliographic information."));
                           }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css
new file mode 100644
index 00000000000..9c110d24857
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css
@@ -0,0 +1,15 @@
+.text-changed {
+    -fx-fill: darkgreen;
+}
+
+.text-unchanged {
+
+}
+
+.text-added {
+    -fx-fill: blue;
+}
+
+.text-removed {
+    -fx-fill: red;
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
index 1e4db5bcc0f..9deceb0218b 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
@@ -1,11 +1,9 @@
 package org.jabref.gui.mergeentries;
 
-import java.awt.Font;
-import java.io.IOException;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -13,62 +11,38 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
-
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextPane;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingUtilities;
-
-import javafx.embed.swing.JFXPanel;
-import javafx.scene.Scene;
+import java.util.stream.Collectors;
+
+import javafx.collections.FXCollections;
+import javafx.geometry.Insets;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextFlow;
 
 import org.jabref.Globals;
-import org.jabref.gui.FXDialogService;
-import org.jabref.gui.PreviewPanel;
-import org.jabref.gui.customjfx.CustomJFXPanel;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.gui.util.component.DiffHighlightingTextPane;
-import org.jabref.logic.bibtex.BibEntryWriter;
-import org.jabref.logic.bibtex.LatexFieldFormatter;
 import org.jabref.logic.formatter.casechanger.SentenceCaseFormatter;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.strings.DiffHighlighting;
-import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.ColumnSpec;
-import com.jgoodies.forms.layout.FormLayout;
-import com.jgoodies.forms.layout.RowSpec;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MergeEntries {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(MergeEntries.class);
-
-
-    private static final String MARGIN = "10px";
+import org.fxmisc.easybind.EasyBind;
 
-    private static final List<JLabel> HEADING_LABELS = new ArrayList<>(6);
+public class MergeEntries extends BorderPane {
 
-    private static final CellConstraints CELL_CONSTRAINTS = new CellConstraints();
-    private static final String[] DIFF_MODES = {Localization.lang("Plain text"),
-            Localization.lang("Show diff") + " - " + Localization.lang("word"),
-            Localization.lang("Show diff") + " - " + Localization.lang("character"),
-            Localization.lang("Show symmetric diff") + " - " + Localization.lang("word"),
-            Localization.lang("Show symmetric diff") + " - " + Localization.lang("character")};
+    private final ComboBox<DiffMode> diffMode = new ComboBox<>();
 
     // Headings
     private final List<String> columnHeadings = Arrays.asList(Localization.lang("Field"),
@@ -82,22 +56,30 @@ public class MergeEntries {
     private final BibEntry mergedEntry = new BibEntry();
     private final BibEntry leftEntry;
     private final BibEntry rightEntry;
-    private final BibDatabaseMode databaseType;
-    private JScrollPane scrollPane;
-    private JTextArea sourceView;
-    private PreviewPanel entryPreview;
-    private Boolean doneBuilding;
-    private Boolean identicalTypes;
-    private List<JRadioButton> typeRadioButtons;
+    private final Map<String, TextFlow> leftTextPanes = new HashMap<>();
     private final Set<String> allFields = new TreeSet<>();
-    private final JComboBox<String> diffMode = new JComboBox<>();
-    private final Map<String, JTextPane> leftTextPanes = new HashMap<>();
-    private final Map<String, JTextPane> rightTextPanes = new HashMap<>();
-
-    private final Map<String, List<JRadioButton>> radioButtons = new HashMap<>();
+    private final Map<String, TextFlow> rightTextPanes = new HashMap<>();
+    private final Map<String, List<RadioButton>> radioButtons = new HashMap<>();
+    private Boolean identicalTypes;
+    private List<RadioButton> typeRadioButtons;
 
-    private final JPanel mainPanel = new JPanel();
+    /**
+     * Constructor with optional column captions for the two entries
+     *
+     * @param entryLeft    Left entry
+     * @param entryRight   Right entry
+     * @param headingLeft  Heading for left entry
+     * @param headingRight Heading for right entry
+     * @param type         Bib database mode
+     */
+    public MergeEntries(BibEntry entryLeft, BibEntry entryRight, String headingLeft, String headingRight, BibDatabaseMode type) {
+        this.leftEntry = entryLeft;
+        this.rightEntry = entryRight;
 
+        initialize();
+        setLeftHeaderText(headingLeft);
+        setRightHeaderText(headingRight);
+    }
 
 
     /**
@@ -110,112 +92,69 @@ public class MergeEntries {
     public MergeEntries(BibEntry entryLeft, BibEntry entryRight, BibDatabaseMode type) {
         leftEntry = entryLeft;
         rightEntry = entryRight;
-        this.databaseType = type;
         initialize();
     }
 
-    /**
-     * Constructor with optional column captions for the two entries
-     *
-     * @param entryLeft Left entry
-     * @param entryRight Right entry
-     * @param headingLeft Heading for left entry
-     * @param headingRight Heading for right entry
-     * @param type Bib database mode
-     */
-    public MergeEntries(BibEntry entryLeft, BibEntry entryRight, String headingLeft, String headingRight, BibDatabaseMode type) {
-        columnHeadings.set(1, headingLeft);
-        columnHeadings.set(5, headingRight);
-        this.leftEntry = entryLeft;
-        this.rightEntry = entryRight;
-
-        this.databaseType = type;
-
-        initialize();
+    private static String getDisplayText(DiffMode mode) {
+        switch (mode) {
+            case PLAIN:
+                return Localization.lang("Plain text");
+            case WORD:
+                return Localization.lang("Show diff") + " - " + Localization.lang("word");
+            case CHARACTER:
+                return Localization.lang("Show diff") + " - " + Localization.lang("character");
+            case WORD_SYMMETRIC:
+                return Localization.lang("Show symmetric diff") + " - " + Localization.lang("word");
+            case CHARACTER_SYMMETRIC:
+                return Localization.lang("Show symmetric diff") + " - " + Localization.lang("character");
+            default:
+                throw new UnsupportedOperationException("Not implemented: " + mode);
+        }
     }
 
     /**
      * Main function for building the merge entry JPanel
      */
     private void initialize() {
-        doneBuilding = false;
+        setPrefWidth(800);
+
         setupFields();
 
         fillDiffModes();
 
-        // Create main layout
-        String colSpecMain = "left:pref, 5px, center:3cm:grow, 5px, center:pref, 3px, center:pref, 3px, center:pref, 5px, center:3cm:grow";
-        String colSpecMerge = "left:pref, 5px, fill:3cm:grow, 5px, center:pref, 3px, center:pref, 3px, center:pref, 5px, fill:3cm:grow";
-        String rowSpec = "pref, pref, 10px, fill:5cm:grow, 10px, pref, 10px, fill:3cm:grow";
-        StringBuilder rowBuilder = new StringBuilder("");
-        for (int i = 0; i < allFields.size(); i++) {
-            rowBuilder.append("pref, 2dlu, ");
-        }
-        rowBuilder.append("pref");
-
-        JPanel mergePanel = new JPanel();
-        FormLayout mainLayout = new FormLayout(colSpecMain, rowSpec);
-        FormLayout mergeLayout = new FormLayout(colSpecMerge, rowBuilder.toString());
-        mainPanel.setLayout(mainLayout);
-        mergePanel.setLayout(mergeLayout);
-
-        setupHeadingRows();
-
-        mainPanel.add(new JSeparator(), CELL_CONSTRAINTS.xyw(1, 3, 11));
-
+        GridPane mergePanel = new GridPane();
+        mergePanel.setVgap(10);
+        mergePanel.setHgap(15);
+        ColumnConstraints columnLabel = new ColumnConstraints();
+        columnLabel.setHgrow(Priority.NEVER);
+        ColumnConstraints columnValues = new ColumnConstraints();
+        columnValues.setHgrow(Priority.ALWAYS);
+        columnValues.setPercentWidth(40);
+        ColumnConstraints columnSelect = new ColumnConstraints();
+        columnSelect.setHgrow(Priority.NEVER);
+        mergePanel.getColumnConstraints().setAll(columnLabel, columnValues, columnSelect, columnSelect, columnSelect, columnValues);
+
+        setupHeadingRows(mergePanel);
         setupEntryTypeRow(mergePanel);
+        setupFieldRows(mergePanel);
 
-        int maxLabelWidth = setupFieldRows(mergePanel);
-
-        // Create and add scrollpane
-        scrollPane = new JScrollPane(mergePanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        scrollPane.setBorder(BorderFactory.createEmptyBorder());
-        updateTextPanes(allFields);
-        mainPanel.add(scrollPane, CELL_CONSTRAINTS.xyw(1, 4, 11));
-        mainPanel.add(new JSeparator(), CELL_CONSTRAINTS.xyw(1, 5, 11));
-
-        synchronizeColumnWidths(mainLayout, mergeLayout, maxLabelWidth);
-
-        // Setup a PreviewPanel and a Bibtex source box for the merged entry
-        mainPanel.add(boldFontLabel(Localization.lang("Merged entry")), CELL_CONSTRAINTS.xyw(1, 6, 6));
-
-        entryPreview = new PreviewPanel(null, new BibDatabaseContext(), Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService(), ExternalFileTypes.getInstance());
-        entryPreview.setEntry(mergedEntry);
-        JFXPanel container = CustomJFXPanel.wrap(new Scene(entryPreview));
-        mainPanel.add(container, CELL_CONSTRAINTS.xyw(1, 8, 6));
-
-        mainPanel.add(boldFontLabel(Localization.lang("Merged BibTeX source code")), CELL_CONSTRAINTS.xyw(8, 6, 4));
-
-        sourceView = new JTextArea();
-        sourceView.setLineWrap(true);
-        sourceView.setFont(new Font("Monospaced", Font.PLAIN, Globals.prefs.getInt(JabRefPreferences.FONT_SIZE)));
-        mainPanel.add(new JScrollPane(sourceView), CELL_CONSTRAINTS.xyw(8, 8, 4));
-        sourceView.setEditable(false);
-
-        // Add some margin around the layout
-        mainLayout.appendRow(RowSpec.decode(MARGIN));
-        mainLayout.appendColumn(ColumnSpec.decode(MARGIN));
-        mainLayout.insertRow(1, RowSpec.decode(MARGIN));
-        mainLayout.insertColumn(1, ColumnSpec.decode(MARGIN));
+        ScrollPane scrollPane = new ScrollPane(mergePanel);
+        scrollPane.setFitToWidth(true);
+        setCenter(scrollPane);
 
-        // Everything done, allow any action to actually update the merged entry
-        doneBuilding = true;
+        updateFieldValues(allFields);
 
-        updateAll();
+        updateMergedEntry();
 
-        // Show what we've got
-        mainPanel.setVisible(true);
-        SwingUtilities.invokeLater(() -> scrollPane.getVerticalScrollBar().setValue(0));
+        getStylesheets().add(0, MergeEntries.class.getResource("MergeEntries.css").toExternalForm());
     }
 
-    private int setupFieldRows(JPanel mergePanel) {
+    private void setupFieldRows(GridPane mergePanel) {
         // For all fields in joint add a row and possibly radio buttons
         int row = 2;
-        int maxLabelWidth = -1;
         for (String field : allFields) {
-            JLabel label = boldFontLabel(new SentenceCaseFormatter().format(field));
-            mergePanel.add(label, CELL_CONSTRAINTS.xy(1, (2 * row) - 1, "left, top"));
+            Label label = new Label(new SentenceCaseFormatter().format(field));
+            mergePanel.add(label, 0, row);
             Optional<String> leftString = leftEntry.getField(field);
             Optional<String> rightString = rightEntry.getField(field);
             if (leftString.equals(rightString)) {
@@ -224,12 +163,10 @@ private int setupFieldRows(JPanel mergePanel) {
                 differentFields.add(field);
             }
 
-            maxLabelWidth = Math.max(maxLabelWidth, label.getPreferredSize().width);
-
             // Left text pane
             if (leftString.isPresent()) {
-                JTextPane tf = new DiffHighlightingTextPane();
-                mergePanel.add(tf, CELL_CONSTRAINTS.xy(3, (2 * row) - 1, "f, f"));
+                TextFlow tf = new DiffHighlightingTextPane();
+                mergePanel.add(tf, 1, row);
                 leftTextPanes.put(field, tf);
             }
 
@@ -237,167 +174,133 @@ private int setupFieldRows(JPanel mergePanel) {
             if (identicalFields.contains(field)) {
                 mergedEntry.setField(field, leftString.get()); // Will only happen if both entries have the field and the content is identical
             } else {
-                ButtonGroup group = new ButtonGroup();
-                List<JRadioButton> list = new ArrayList<>(3);
+                ToggleGroup group = new ToggleGroup();
+                List<RadioButton> list = new ArrayList<>(3);
                 for (int k = 0; k < 3; k++) {
-                    JRadioButton button = new JRadioButton();
-                    group.add(button);
-                    mergePanel.add(button, CELL_CONSTRAINTS.xy(5 + (k * 2), (2 * row) - 1));
-                    button.addChangeListener(e -> updateAll());
+                    RadioButton button = new RadioButton();
+                    EasyBind.subscribe(button.selectedProperty(), selected -> updateMergedEntry());
+                    group.getToggles().add(button);
+                    mergePanel.add(button, 2 + k, row);
                     list.add(button);
                 }
                 radioButtons.put(field, list);
                 if (leftString.isPresent()) {
                     list.get(0).setSelected(true);
                     if (!rightString.isPresent()) {
-                        list.get(2).setEnabled(false);
+                        list.get(2).setDisable(true);
                     }
                 } else {
-                    list.get(0).setEnabled(false);
+                    list.get(0).setDisable(true);
                     list.get(2).setSelected(true);
                 }
             }
 
             // Right text pane
             if (rightString.isPresent()) {
-                JTextPane tf = new DiffHighlightingTextPane();
-                mergePanel.add(tf, CELL_CONSTRAINTS.xy(11, (2 * row) - 1, "f, f"));
+                TextFlow tf = new DiffHighlightingTextPane();
+                mergePanel.add(tf, 5, row);
                 rightTextPanes.put(field, tf);
             }
             row++;
         }
-        return maxLabelWidth;
     }
 
-    private void setupEntryTypeRow(JPanel mergePanel) {
+    private void setupEntryTypeRow(GridPane mergePanel) {
         // Start with entry type
-        mergePanel.add(boldFontLabel(Localization.lang("Entry type")), CELL_CONSTRAINTS.xy(1, 1));
+        mergePanel.add(new Label(Localization.lang("Entry type")), 0, 1);
 
-        JTextPane leftTypeDisplay = new DiffHighlightingTextPane();
-        leftTypeDisplay.setText(DiffHighlighting.HTML_START + leftEntry.getType() + DiffHighlighting.HTML_END);
-        mergePanel.add(leftTypeDisplay, CELL_CONSTRAINTS.xy(3, 1));
         if (leftEntry.getType().equals(rightEntry.getType())) {
+            mergePanel.add(DiffHighlighting.forUnchanged(leftEntry.getType()), 1, 1);
+            mergePanel.add(DiffHighlighting.forUnchanged(rightEntry.getType()), 5, 1);
             identicalTypes = true;
         } else {
+            mergePanel.add(DiffHighlighting.forChanged(leftEntry.getType()), 1, 1);
+            mergePanel.add(DiffHighlighting.forChanged(rightEntry.getType()), 5, 1);
             identicalTypes = false;
-            ButtonGroup group = new ButtonGroup();
+            ToggleGroup group = new ToggleGroup();
             typeRadioButtons = new ArrayList<>(2);
             for (int k = 0; k < 3; k += 2) {
-                JRadioButton button = new JRadioButton();
+                RadioButton button = new RadioButton();
+                EasyBind.subscribe(button.selectedProperty(), selected -> updateMergedEntry());
                 typeRadioButtons.add(button);
-                group.add(button);
-                mergePanel.add(button, CELL_CONSTRAINTS.xy(5 + (k * 2), 1));
-                button.addChangeListener(e -> updateAll());
+                group.getToggles().add(button);
+                mergePanel.add(button, 2 + k, 1);
             }
             typeRadioButtons.get(0).setSelected(true);
         }
-        JTextPane rightTypeDisplay = new DiffHighlightingTextPane();
-        rightTypeDisplay.setText(DiffHighlighting.HTML_START + rightEntry.getType() + DiffHighlighting.HTML_END);
-        mergePanel.add(rightTypeDisplay, CELL_CONSTRAINTS.xy(11, 1));
     }
 
-    private void setupHeadingRows() {
-        mainPanel.add(boldFontLabel(Localization.lang("Use")), CELL_CONSTRAINTS.xyw(4, 1, 7, "center, bottom"));
-        mainPanel.add(diffMode, CELL_CONSTRAINTS.xy(11, 1, "right, bottom"));
-
+    private void setupHeadingRows(GridPane mergePanel) {
         // Set headings
         for (int i = 0; i < 6; i++) {
-            HEADING_LABELS.add(boldFontLabel(columnHeadings.get(i)));
-            mainPanel.add(HEADING_LABELS.get(i), CELL_CONSTRAINTS.xy(1 + (i * 2), 2));
+            mergePanel.add(new Label(columnHeadings.get(i)), i, 0);
         }
     }
 
     private void fillDiffModes() {
-        // Fill diff mode combo box
-        for (String diffText : DIFF_MODES) {
-            diffMode.addItem(diffText);
-        }
-        diffMode.setSelectedIndex(
-                Math.min(Globals.prefs.getInt(JabRefPreferences.MERGE_ENTRIES_DIFF_MODE), diffMode.getItemCount() - 1));
-        diffMode.addActionListener(e -> {
-            updateTextPanes(differentFields);
-            storePreference();
+        diffMode.setItems(FXCollections.observableList(Arrays.asList(DiffMode.values())));
+        new ViewModelListCellFactory<DiffMode>()
+                .withText(MergeEntries::getDisplayText)
+                .install(diffMode);
+        DiffMode diffModePref = Globals.prefs.getAsOptional(JabRefPreferences.MERGE_ENTRIES_DIFF_MODE)
+                                             .flatMap(DiffMode::parse)
+                                             .orElse(DiffMode.WORD);
+        diffMode.setValue(diffModePref);
+        EasyBind.subscribe(this.diffMode.valueProperty(), mode -> {
+            updateFieldValues(differentFields);
+            Globals.prefs.put(JabRefPreferences.MERGE_ENTRIES_DIFF_MODE, mode.name());
         });
-    }
-
-    private void synchronizeColumnWidths(FormLayout mainLayout, FormLayout mergeLayout,
-            int maxLabelWidth) {
-        // Synchronize column widths
-        String[] rbAlign = {"right", "center", "left"};
-        mainLayout.setColumnSpec(1, ColumnSpec.decode(Integer.toString(maxLabelWidth) + "px"));
-        Integer maxRBWidth = -1;
-        for (int k = 2; k < 5; k++) {
-            maxRBWidth = Math.max(maxRBWidth, HEADING_LABELS.get(k).getPreferredSize().width);
-        }
-        for (int k = 0; k < 3; k++) {
-            mergeLayout.setColumnSpec(5 + (k * 2), ColumnSpec.decode(rbAlign[k] + ":" + maxRBWidth + "px"));
-        }
-    }
-
-    private JLabel boldFontLabel(String text) {
-        JLabel label = new JLabel(text);
-        Font font = label.getFont();
-        label.setFont(font.deriveFont(font.getStyle() | Font.BOLD));
-        return label;
-    }
 
-    private void storePreference() {
-        Globals.prefs.putInt(JabRefPreferences.MERGE_ENTRIES_DIFF_MODE, diffMode.getSelectedIndex());
+        HBox heading = new HBox(10);
+        heading.getChildren().setAll(this.diffMode);
+        setTop(heading);
+        BorderPane.setMargin(heading, new Insets(0, 0, 10, 0));
     }
 
     private void setupFields() {
         allFields.addAll(leftEntry.getFieldNames());
         allFields.addAll(rightEntry.getFieldNames());
 
-        // Remove internal fields
-        Set<String> toberemoved = new TreeSet<>();
-        for (String field : allFields) {
-            if (InternalBibtexFields.isInternalField(field)) {
-                toberemoved.add(field);
-            }
-        }
-        allFields.removeAll(toberemoved);
+        // Do not show internal fields
+        Set<String> internalFields = allFields.stream().filter(InternalBibtexFields::isInternalField).collect(Collectors.toSet());
+        allFields.removeAll(internalFields);
     }
 
-    private void updateTextPanes(Collection<String> fields) {
-        int oldScrollPaneValue = scrollPane.getVerticalScrollBar().getValue();
+    private void updateFieldValues(Collection<String> fields) {
         for (String field : fields) {
             String leftString = leftEntry.getField(field).orElse("");
             String rightString = rightEntry.getField(field).orElse("");
-            switch (diffMode.getSelectedIndex()) {
-            case 0: // Plain text
-                break;
-            case 1: // Latexdiff style - word
-                rightString = DiffHighlighting.generateDiffHighlighting(leftString, rightString, " ");
-                break;
-            case 2: // Latexdiff style - character
-                rightString = DiffHighlighting.generateDiffHighlighting(leftString, rightString, "");
-                break;
-            case 3: // Symmetric style - word
-                String tmpLeftString = DiffHighlighting.generateSymmetricHighlighting(leftString, rightString, " ");
-                rightString = DiffHighlighting.generateSymmetricHighlighting(rightString, leftString, " ");
-                leftString = tmpLeftString;
-                break;
-            case 4: // Symmetric style - character
-                tmpLeftString = DiffHighlighting.generateSymmetricHighlighting(leftString, rightString, "");
-                rightString = DiffHighlighting.generateSymmetricHighlighting(rightString, leftString, "");
-                leftString = tmpLeftString;
-                break;
-            default: // Shouldn't happen
-                break;
+            List<Text> leftText = leftString.isEmpty() ? Collections.emptyList() : Collections.singletonList(DiffHighlighting.forUnchanged(leftString));
+            List<Text> rightText = rightString.isEmpty() ? Collections.emptyList() : Collections.singletonList(DiffHighlighting.forUnchanged(rightString));
+            switch (diffMode.getValue()) {
+                case PLAIN:
+                    break;
+                case WORD:
+                    rightText = DiffHighlighting.generateDiffHighlighting(leftString, rightString, " ");
+                    break;
+                case CHARACTER:
+                    rightText = DiffHighlighting.generateDiffHighlighting(leftString, rightString, "");
+                    break;
+                case WORD_SYMMETRIC:
+                    leftText = DiffHighlighting.generateSymmetricHighlighting(leftString, rightString, " ");
+                    rightText = DiffHighlighting.generateSymmetricHighlighting(rightString, leftString, " ");
+                    break;
+                case CHARACTER_SYMMETRIC:
+                    leftText = DiffHighlighting.generateSymmetricHighlighting(leftString, rightString, "");
+                    rightText = DiffHighlighting.generateSymmetricHighlighting(rightString, leftString, "");
+                    break;
+                default:
+                    throw new UnsupportedOperationException("Not implemented " + diffMode.getValue());
             }
-            if ((leftString != null) && leftTextPanes.containsKey(field)) {
-                leftTextPanes.get(field).setText(DiffHighlighting.HTML_START + leftString + DiffHighlighting.HTML_END);
+            if (!leftText.isEmpty() && leftTextPanes.containsKey(field)) {
+                leftTextPanes.get(field).getChildren().setAll(leftText);
             }
-            if ((rightString != null) && rightTextPanes.containsKey(field)) {
-                rightTextPanes.get(field).setText(DiffHighlighting.HTML_START + rightString + DiffHighlighting.HTML_END);
+            if (!rightText.isEmpty() && rightTextPanes.containsKey(field)) {
+                rightTextPanes.get(field).getChildren().setAll(rightText);
             }
         }
-        SwingUtilities.invokeLater(() -> scrollPane.getVerticalScrollBar()
-                .setValue(Math.min(scrollPane.getVerticalScrollBar().getMaximum(), oldScrollPaneValue)));
     }
 
-
     /**
      * @return Merged BibEntry
      */
@@ -406,22 +309,11 @@ public BibEntry getMergeEntry() {
     }
 
     /**
-     * @return The merge entry JPanel
-     */
-    public JPanel getMergeEntryPanel() {
-        return mainPanel;
-    }
-
-    /**
-     * Update the merged BibEntry with source and preview panel every time something is changed
+     * Update the merged entry
      */
-    private void updateAll() {
-        if (!doneBuilding) {
-            // If we are not done adding everything, do not do anything...
-            return;
-        }
+    private void updateMergedEntry() {
         // Check if the type has changed
-        if (!identicalTypes && typeRadioButtons.get(0).isSelected()) {
+        if (!identicalTypes && !typeRadioButtons.isEmpty() && typeRadioButtons.get(0).isSelected()) {
             mergedEntry.setType(leftEntry.getType());
         } else {
             mergedEntry.setType(rightEntry.getType());
@@ -429,6 +321,10 @@ private void updateAll() {
 
         // Check the potentially different fields
         for (String field : differentFields) {
+            if (!radioButtons.containsKey(field)) {
+                // May happen during initialization -> just ignore
+                continue;
+            }
             if (radioButtons.get(field).get(0).isSelected()) {
                 mergedEntry.setField(field, leftEntry.getField(field).get()); // Will only happen if field exists
             } else if (radioButtons.get(field).get(2).isSelected()) {
@@ -437,19 +333,31 @@ private void updateAll() {
                 mergedEntry.clearField(field);
             }
         }
+    }
 
-        // Update the PreviewPanel
-        entryPreview.setEntry(mergedEntry);
+    public void setLeftHeaderText(String leftHeaderText) {
+        columnHeadings.set(1, leftHeaderText);
+        initialize();
+    }
 
-        // Update the BibTeX source view
-        StringWriter writer = new StringWriter();
-        try {
-            new BibEntryWriter(new LatexFieldFormatter(Globals.prefs.getLatexFieldFormatterPreferences()),
-                    false).write(mergedEntry, writer, databaseType);
-        } catch (IOException ex) {
-            LOGGER.error("Error in entry", ex);
+    public void setRightHeaderText(String rightHeaderText) {
+        columnHeadings.set(5, rightHeaderText);
+        initialize();
+    }
+
+    public enum DiffMode {
+        PLAIN,
+        WORD,
+        CHARACTER,
+        WORD_SYMMETRIC,
+        CHARACTER_SYMMETRIC;
+
+        public static Optional<DiffMode> parse(String name) {
+            try {
+                return Optional.of(DiffMode.valueOf(name));
+            } catch (IllegalArgumentException e) {
+                return Optional.empty();
+            }
         }
-        sourceView.setText(writer.getBuffer().toString());
-        sourceView.setCaretPosition(0);
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
new file mode 100644
index 00000000000..22ba15d7d8a
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
@@ -0,0 +1,68 @@
+package org.jabref.gui.mergeentries;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableInsertEntry;
+import org.jabref.gui.undo.UndoableRemoveEntry;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+
+public class MergeEntriesAction extends SimpleCommand {
+
+    private final JabRefFrame jabRefFrame;
+    private final DialogService dialogService;
+
+    public MergeEntriesAction(JabRefFrame jabRefFrame) {
+        this.jabRefFrame = jabRefFrame;
+        dialogService = jabRefFrame.getDialogService();
+    }
+
+    @Override
+    public void execute() {
+        BasePanel basePanel = jabRefFrame.getCurrentBasePanel();
+
+        // Check if there are two entries selected
+        List<BibEntry> selectedEntries = basePanel.getSelectedEntries();
+        if (selectedEntries.size() != 2) {
+            // Inform the user to select entries first.
+            dialogService.showInformationDialogAndWait(
+                    Localization.lang("Merge entries"),
+                    Localization.lang("You have to choose exactly two entries to merge."));
+
+            return;
+        }
+
+        // Store the two entries
+        BibEntry one = selectedEntries.get(0);
+        BibEntry two = selectedEntries.get(1);
+
+        MergeEntriesDialog dlg = new MergeEntriesDialog(one, two, basePanel.getBibDatabaseContext().getMode());
+        dlg.setTitle(Localization.lang("Merge entries"));
+        Optional<BibEntry> mergedEntry = dlg.showAndWait();
+        if (mergedEntry.isPresent()) {
+            basePanel.insertEntry(mergedEntry.get());
+
+            // Create a new entry and add it to the undo stack
+            // Remove the other two entries and add them to the undo stack (which is not working...)
+            NamedCompound ce = new NamedCompound(Localization.lang("Merge entries"));
+            ce.addEdit(new UndoableInsertEntry(basePanel.getDatabase(), mergedEntry.get()));
+            ce.addEdit(new UndoableRemoveEntry(basePanel.getDatabase(), one, basePanel));
+            basePanel.getDatabase().removeEntry(one);
+            ce.addEdit(new UndoableRemoveEntry(basePanel.getDatabase(), two, basePanel));
+            basePanel.getDatabase().removeEntry(two);
+            ce.end();
+            basePanel.getUndoManager().addEdit(ce);
+
+            dialogService.notify(Localization.lang("Merged entries"));
+        } else {
+            dialogService.notify(Localization.lang("Canceled merging entries"));
+        }
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
index f081759bb67..251f62cfdc6 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
@@ -1,124 +1,47 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.List;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
 
-import javax.swing.JButton;
-import javax.swing.JSeparator;
-
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableInsertEntry;
-import org.jabref.gui.undo.UndoableRemoveEntry;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.WindowLocation;
+import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.JabRefPreferences;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.ColumnSpec;
-import com.jgoodies.forms.layout.FormLayout;
-import com.jgoodies.forms.layout.RowSpec;
-
-public class MergeEntriesDialog extends JabRefDialog {
 
-    private static final String MERGE_ENTRIES = Localization.lang("Merge entries");
-    private static final String MARGIN = "5px";
-    private final BasePanel panel;
+public class MergeEntriesDialog extends BaseDialog<BibEntry> {
 
-    private final CellConstraints cc = new CellConstraints();
-    private final DialogService dialogService;
+    private final MergeEntries mergeEntries;
 
-    public MergeEntriesDialog(BasePanel panel, DialogService dialogService) {
-        super(MERGE_ENTRIES, true, MergeEntriesDialog.class);
-        this.dialogService = dialogService;
-        this.panel = panel;
+    public MergeEntriesDialog(BibEntry one, BibEntry two, BibDatabaseMode databaseMode) {
+        mergeEntries = new MergeEntries(one, two, databaseMode);
 
-        // Start setting up the dialog
-        init(panel.getSelectedEntries());
+        init();
     }
 
     /**
      * Sets up the dialog
      *
-     * @param selected Selected BibtexEntries
      */
-    private void init(List<BibEntry> selected) {
-
-        // Check if there are two entries selected
-        if (selected.size() != 2) { // None selected. Inform the user to select entries first.
-
-            dialogService.showInformationDialogAndWait(Localization.lang("Merge entries"),
-                                                       Localization.lang("You have to choose exactly two entries to merge."));
-
-            this.dispose();
-            return;
-        }
-
-        // Store the two entries
-        BibEntry one = selected.get(0);
-        BibEntry two = selected.get(1);
-
-        MergeEntries mergeEntries = new MergeEntries(one, two, panel.getBibDatabaseContext().getMode());
-
-        // Create undo-compound
-        NamedCompound ce = new NamedCompound(MERGE_ENTRIES);
-
-        FormLayout layout = new FormLayout("fill:700px:grow", "fill:400px:grow, 4px, p, 5px, p");
-        this.setLayout(layout);
-
-        this.add(mergeEntries.getMergeEntryPanel(), cc.xy(1, 1));
-        this.add(new JSeparator(), cc.xy(1, 3));
+    private void init() {
+        this.getDialogPane().setContent(mergeEntries);
 
         // Create buttons
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-        JButton cancel = new JButton(Localization.lang("Cancel"));
-        cancel.setActionCommand("cancel");
-        cancel.addActionListener(e -> {
-            panel.output(Localization.lang("Canceled merging entries"));
-            dispose();
-        });
-
-        JButton replaceentries = new JButton(MERGE_ENTRIES);
-        replaceentries.setActionCommand("replace");
-        replaceentries.addActionListener(e -> {
-            // Create a new entry and add it to the undo stack
-            // Remove the other two entries and add them to the undo stack (which is not working...)
-            BibEntry mergedEntry = mergeEntries.getMergeEntry();
-            DefaultTaskExecutor.runInJavaFXThread(() -> {
-                panel.insertEntry(mergedEntry);
-                ce.addEdit(new UndoableInsertEntry(panel.getDatabase(), mergedEntry));
-                ce.addEdit(new UndoableRemoveEntry(panel.getDatabase(), one, panel));
-                panel.getDatabase().removeEntry(one);
-                ce.addEdit(new UndoableRemoveEntry(panel.getDatabase(), two, panel));
-                panel.getDatabase().removeEntry(two);
-                ce.end();
-                panel.getUndoManager().addEdit(ce);
-                panel.output(Localization.lang("Merged entries"));
-            });
-
-            dispose();
+        ButtonType replaceEntries = new ButtonType(Localization.lang("Merge entries"), ButtonBar.ButtonData.OK_DONE);
+        this.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, replaceEntries);
+        this.setResultConverter(buttonType -> {
+            if (buttonType.equals(replaceEntries)) {
+                return mergeEntries.getMergeEntry();
+            } else {
+                return null;
+            }
         });
+    }
 
-        bb.addButton(new JButton[] {replaceentries, cancel});
-        this.add(bb.getPanel(), cc.xy(1, 5));
-
-        // Add some margin around the layout
-        layout.appendRow(RowSpec.decode(MARGIN));
-        layout.appendColumn(ColumnSpec.decode(MARGIN));
-        layout.insertRow(1, RowSpec.decode(MARGIN));
-        layout.insertColumn(1, ColumnSpec.decode(MARGIN));
-
-        WindowLocation pw = new WindowLocation(this, JabRefPreferences.MERGEENTRIES_POS_X,
-                                               JabRefPreferences.MERGEENTRIES_POS_Y, JabRefPreferences.MERGEENTRIES_SIZE_X,
-                                               JabRefPreferences.MERGEENTRIES_SIZE_Y);
-        pw.displayWindowAtStoredLocation();
+    public void setLeftHeaderText(String leftHeaderText) {
+        mergeEntries.setLeftHeaderText(leftHeaderText);
+    }
 
-        // Show what we've got
-        setVisible(true);
+    public void setRightHeaderText(String rightHeaderText) {
+        mergeEntries.setRightHeaderText(rightHeaderText);
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeFetchedEntryDialog.java b/src/main/java/org/jabref/gui/mergeentries/MergeFetchedEntryDialog.java
deleted file mode 100644
index 516f59f98b9..00000000000
--- a/src/main/java/org/jabref/gui/mergeentries/MergeFetchedEntryDialog.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.jabref.gui.mergeentries;
-
-import java.awt.event.ActionEvent;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.JButton;
-import javax.swing.JSeparator;
-
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableChangeType;
-import org.jabref.gui.undo.UndoableFieldChange;
-import org.jabref.gui.util.WindowLocation;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.InternalBibtexFields;
-import org.jabref.preferences.JabRefPreferences;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.ColumnSpec;
-import com.jgoodies.forms.layout.FormLayout;
-import com.jgoodies.forms.layout.RowSpec;
-
-/**
- * Dialog for merging Bibtex entry with fetched data
- */
-public class MergeFetchedEntryDialog extends JabRefDialog {
-
-    private static final String MARGIN = "5px";
-    private final BasePanel panel;
-    private final CellConstraints cc = new CellConstraints();
-    private final BibEntry originalEntry;
-    private final BibEntry fetchedEntry;
-    private NamedCompound ce;
-    private MergeEntries mergeEntries;
-    private final String type;
-
-
-    public MergeFetchedEntryDialog(BasePanel panel, BibEntry originalEntry, BibEntry fetchedEntry, String type) {
-        super(Localization.lang("Merge entry with %0 information", type), true, MergeFetchedEntryDialog.class);
-
-        this.panel = panel;
-        this.originalEntry = originalEntry;
-        this.fetchedEntry = fetchedEntry;
-        this.type = type;
-
-        // Start setting up the dialog
-        init();
-    }
-
-    /**
-     * Sets up the dialog
-     */
-    private void init() {
-        mergeEntries = new MergeEntries(this.originalEntry, this.fetchedEntry, Localization.lang("Original entry"),
-                Localization.lang("Entry from %0", type), panel.getBibDatabaseContext().getMode());
-
-        // Create undo-compound
-        ce = new NamedCompound(Localization.lang("Merge entry with %0 information", type));
-
-        FormLayout layout = new FormLayout("fill:700px:grow", "fill:400px:grow, 4px, p, 5px, p");
-        this.setLayout(layout);
-
-        this.add(mergeEntries.getMergeEntryPanel(), cc.xy(1, 1));
-        this.add(new JSeparator(), cc.xy(1, 3));
-
-        // Create buttons
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-
-        JButton cancel = new JButton(new CancelAction());
-        JButton replaceEntry = new JButton(new ReplaceAction());
-
-        bb.addButton(replaceEntry, cancel);
-        this.add(bb.getPanel(), cc.xy(1, 5));
-
-        // Add some margin around the layout
-        layout.appendRow(RowSpec.decode(MARGIN));
-        layout.appendColumn(ColumnSpec.decode(MARGIN));
-        layout.insertRow(1, RowSpec.decode(MARGIN));
-        layout.insertColumn(1, ColumnSpec.decode(MARGIN));
-
-        WindowLocation pw = new WindowLocation(this, JabRefPreferences.MERGEENTRIES_POS_X,
-                JabRefPreferences.MERGEENTRIES_POS_Y, JabRefPreferences.MERGEENTRIES_SIZE_X,
-                JabRefPreferences.MERGEENTRIES_SIZE_Y);
-        pw.displayWindowAtStoredLocation();
-
-    }
-
-    private class CancelAction extends AbstractAction {
-        CancelAction() {
-            putValue(Action.NAME, Localization.lang("Cancel"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            panel.output(Localization.lang("Canceled merging entries"));
-            dispose();
-        }
-    }
-
-    private class ReplaceAction extends AbstractAction {
-        ReplaceAction() {
-            putValue(Action.NAME, Localization.lang("Replace original entry"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            BibEntry mergedEntry = mergeEntries.getMergeEntry();
-
-            // Updated the original entry with the new fields
-            Set<String> jointFields = new TreeSet<>(mergedEntry.getFieldNames());
-            Set<String> originalFields = new TreeSet<>(originalEntry.getFieldNames());
-            boolean edited = false;
-
-            // entry type
-            String oldType = originalEntry.getType();
-            String newType = mergedEntry.getType();
-
-            if (!oldType.equalsIgnoreCase(newType)) {
-                originalEntry.setType(newType);
-                ce.addEdit(new UndoableChangeType(originalEntry, oldType, newType));
-                edited = true;
-            }
-
-            // fields
-            for (String field : jointFields) {
-                Optional<String> originalString = originalEntry.getField(field);
-                Optional<String> mergedString = mergedEntry.getField(field);
-                if (!originalString.isPresent() || !originalString.equals(mergedString)) {
-                    originalEntry.setField(field, mergedString.get()); // mergedString always present
-                    ce.addEdit(new UndoableFieldChange(originalEntry, field, originalString.orElse(null),
-                            mergedString.get()));
-                    edited = true;
-                }
-            }
-
-            // Remove fields which are not in the merged entry, unless they are internal fields
-            for (String field : originalFields) {
-                if (!jointFields.contains(field) && !InternalBibtexFields.isInternalField(field)) {
-                    Optional<String> originalString = originalEntry.getField(field);
-                    originalEntry.clearField(field);
-                    ce.addEdit(new UndoableFieldChange(originalEntry, field, originalString.get(), null)); // originalString always present
-                    edited = true;
-                }
-            }
-
-            if (edited) {
-                ce.end();
-                panel.getUndoManager().addEdit(ce);
-                panel.output(Localization.lang("Updated entry with info from %0", type));
-                panel.updateEntryEditorIfShowing();
-                panel.markBaseChanged();
-            } else {
-                panel.output(Localization.lang("No information added"));
-            }
-
-            dispose();
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java b/src/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java
index e2ac256b025..44a26afd33b 100644
--- a/src/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java
+++ b/src/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java
@@ -14,7 +14,10 @@
 import javax.swing.WindowConstants;
 import javax.swing.border.EmptyBorder;
 
+import javafx.scene.Scene;
+
 import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.customjfx.CustomJFXPanel;
 import org.jabref.gui.mergeentries.MergeEntries;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseMode;
@@ -65,7 +68,7 @@ public void showMergeDialog() {
         mergeInnformation.setBorder(new EmptyBorder(9, 9, 9, 9));
 
         mergeDialog.add(mergeInnformation, BorderLayout.NORTH);
-        mergeDialog.add(mergeEntries.getMergeEntryPanel(), BorderLayout.CENTER);
+        mergeDialog.add(CustomJFXPanel.wrap(new Scene(mergeEntries)), BorderLayout.CENTER);
 
         JButton mergeButton = new JButton(Localization.lang("Merge entries"));
         mergeButton.addActionListener(e -> mergeEntries());
diff --git a/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java b/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java
index e02eb7d080a..496feb1e5ee 100644
--- a/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java
+++ b/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java
@@ -1,10 +1,8 @@
 package org.jabref.gui.util.component;
 
-import javax.swing.JTextPane;
-import javax.swing.text.html.HTMLEditorKit;
-import javax.swing.text.html.StyleSheet;
+import javafx.scene.text.TextFlow;
 
-public class DiffHighlightingTextPane extends JTextPane {
+public class DiffHighlightingTextPane extends TextFlow {
 
     private static final String BODY_STYLE = "body{font:sans-serif}";
     private static final String ADDITION_STYLE = ".add{color:blue;text-decoration:underline}";
@@ -16,13 +14,13 @@ public class DiffHighlightingTextPane extends JTextPane {
 
     public DiffHighlightingTextPane() {
         super();
-        setContentType(CONTENT_TYPE);
-        StyleSheet sheet = ((HTMLEditorKit) getEditorKit()).getStyleSheet();
-        sheet.addRule(BODY_STYLE);
-        sheet.addRule(ADDITION_STYLE);
-        sheet.addRule(REMOVAL_STYLE);
-        sheet.addRule(CHANGE_STYLE);
-        setEditable(false);
+//        setContentType(CONTENT_TYPE);
+//        StyleSheet sheet = ((HTMLEditorKit) getEditorKit()).getStyleSheet();
+//        sheet.addRule(BODY_STYLE);
+//        sheet.addRule(ADDITION_STYLE);
+//        sheet.addRule(REMOVAL_STYLE);
+//        sheet.addRule(CHANGE_STYLE);
+//        setEditable(false);
     }
 
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
index 0deb118292e..0fd2880a30d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -22,6 +22,7 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.util.DummyFileUpdateMonitor;
+import org.jabref.model.util.OptionalUtil;
 
 public class DoiFetcher implements IdBasedFetcher, EntryBasedFetcher {
     public static final String NAME = "DOI";
@@ -75,9 +76,11 @@ private void doPostCleanup(BibEntry entry) {
 
     @Override
     public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
-        Optional<BibEntry> bibEntry = performSearchById(entry.getField(FieldName.DOI).orElse(""));
-        List<BibEntry> list = new ArrayList<>();
-        bibEntry.ifPresent(list::add);
-        return list;
+        Optional<String> doi = entry.getField(FieldName.DOI);
+        if (doi.isPresent()) {
+            return OptionalUtil.toList(performSearchById(doi.get()));
+        } else {
+            return Collections.emptyList();
+        }
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java b/src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java
deleted file mode 100644
index acd358d99e4..00000000000
--- a/src/main/java/org/jabref/logic/util/strings/DiffHighlighting.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.jabref.logic.util.strings;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-import difflib.Delta;
-import difflib.DiffUtils;
-
-public class DiffHighlighting {
-
-    public static final String HTML_START = "<html><body>";
-    public static final String HTML_END = "</body></html>";
-    private static final String ADDITION_START = "<span class=add>";
-    private static final String REMOVAL_START = "<span class=del>";
-    private static final String CHANGE_START = "<span class=change>";
-
-    private static final String TAG_END = "</span>";
-
-    private DiffHighlighting() {
-    }
-
-    public static String generateDiffHighlighting(String baseString, String modifiedString, String separator) {
-        Objects.requireNonNull(separator);
-        if ((baseString != null) && (modifiedString != null)) {
-            List<String> stringList = new ArrayList<>(Arrays.asList(baseString.split(separator)));
-            List<Delta<String>> deltaList = new ArrayList<>(
-                    DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas());
-            Collections.reverse(deltaList);
-            for (Delta<String> delta : deltaList) {
-                int startPos = delta.getOriginal().getPosition();
-                List<String> lines = delta.getOriginal().getLines();
-                int offset = 0;
-                switch (delta.getType()) {
-                case CHANGE:
-                    for (String line : lines) {
-                        stringList.set(startPos + offset, (offset == 0 ? DiffHighlighting.REMOVAL_START : "") + line);
-                        offset++;
-                    }
-                    stringList.set((startPos + offset) - 1,
-                            stringList.get((startPos + offset) - 1) + DiffHighlighting.TAG_END + separator + DiffHighlighting.ADDITION_START
-                                    + String.join(separator, delta.getRevised().getLines()) + DiffHighlighting.TAG_END);
-                    break;
-                case DELETE:
-                    for (String line : lines) {
-                        stringList.set(startPos + offset, (offset == 0 ? DiffHighlighting.REMOVAL_START : "") + line);
-                        offset++;
-                    }
-                    stringList.set((startPos + offset) - 1,
-                            stringList.get((startPos + offset) - 1) + DiffHighlighting.TAG_END);
-                    break;
-                case INSERT:
-                    stringList.add(delta.getOriginal().getPosition(),
-                            DiffHighlighting.ADDITION_START + String.join(separator, delta.getRevised().getLines()) + DiffHighlighting.TAG_END);
-                    break;
-                default:
-                    break;
-                }
-            }
-            return String.join(separator, stringList);
-        }
-        return modifiedString;
-    }
-
-    public static String generateSymmetricHighlighting(String baseString, String modifiedString, String separator) {
-        if ((baseString != null) && (modifiedString != null)) {
-            List<String> stringList = new ArrayList<>(Arrays.asList(baseString.split(separator)));
-            List<Delta<String>> deltaList = new ArrayList<>(DiffUtils
-                    .diff(stringList, new ArrayList<>(Arrays.asList(modifiedString.split(separator)))).getDeltas());
-            Collections.reverse(deltaList);
-            for (Delta<String> delta : deltaList) {
-                int startPos = delta.getOriginal().getPosition();
-                List<String> lines = delta.getOriginal().getLines();
-                int offset = 0;
-                switch (delta.getType()) {
-                case CHANGE:
-                    for (String line : lines) {
-                        stringList.set(startPos + offset, (offset == 0 ? DiffHighlighting.CHANGE_START : "") + line);
-                        offset++;
-                    }
-                    stringList.set((startPos + offset) - 1, stringList.get((startPos + offset) - 1) + DiffHighlighting.TAG_END);
-                    break;
-                case DELETE:
-                    for (String line : lines) {
-                        stringList.set(startPos + offset, (offset == 0 ? DiffHighlighting.ADDITION_START : "") + line);
-                        offset++;
-                    }
-                    stringList.set((startPos + offset) - 1, stringList.get((startPos + offset) - 1) + DiffHighlighting.TAG_END);
-                    break;
-                case INSERT:
-                    break;
-                default:
-                    break;
-                }
-            }
-            return String.join(separator, stringList);
-        }
-        return modifiedString;
-    }
-
-}
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index aaf9b4f24aa..cbc7c80163c 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -50,6 +50,7 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.maintable.ColumnPreferences;
 import org.jabref.gui.maintable.MainTablePreferences;
+import org.jabref.gui.mergeentries.MergeEntries;
 import org.jabref.gui.preferences.ImportSettingsTab;
 import org.jabref.gui.util.ThemeLoader;
 import org.jabref.logic.bibtex.FieldContentParserPreferences;
@@ -569,7 +570,7 @@ private JabRefPreferences() {
 
         defaults.put(DEFAULT_AUTO_SORT, Boolean.FALSE);
 
-        defaults.put(MERGE_ENTRIES_DIFF_MODE, 2);
+        defaults.put(MERGE_ENTRIES_DIFF_MODE, MergeEntries.DiffMode.WORD.name());
 
         defaults.put(SHOW_RECOMMENDATIONS, Boolean.TRUE);
         defaults.put(ACCEPT_RECOMMENDATIONS, Boolean.FALSE);
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index aa3101e4371..d58e0cbc12d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1490,7 +1490,6 @@ Canceled\ merging\ entries=Canceled merging entries
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Format units by adding non-breaking separators and keeping the correct case on search
 Merge\ entries=Merge entries
 Merged\ entries=Merged entries
-Merged\ entry=Merged entry
 None=None
 Parse=Parse
 Result=Result
@@ -1574,9 +1573,7 @@ Add\ new\ file\ type=Add new file type
 
 Left\ entry=Left entry
 Right\ entry=Right entry
-Use=Use
 Original\ entry=Original entry
-Replace\ original\ entry=Replace original entry
 No\ information\ added=No information added
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Select at least one entry to manage keywords.
 OpenDocument\ text=OpenDocument text
@@ -1614,7 +1611,6 @@ Print\ entry\ preview=Print entry preview
 Copy\ title=Copy title
 Copy\ \\cite{BibTeX\ key}=Copy \\cite{BibTeX key}
 Copy\ BibTeX\ key\ and\ title=Copy BibTeX key and title
-Merged\ BibTeX\ source\ code=Merged BibTeX source code
 Invalid\ DOI\:\ '%0'.=Invalid DOI: '%0'.
 should\ start\ with\ a\ name=should start with a name
 should\ end\ with\ a\ name=should end with a name
diff --git a/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java b/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
new file mode 100644
index 00000000000..70d0b601cd6
--- /dev/null
+++ b/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
@@ -0,0 +1,174 @@
+package org.jabref.gui.mergeentries;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javafx.scene.text.Text;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.testfx.framework.junit5.ApplicationExtension;
+
+@ExtendWith(ApplicationExtension.class)
+class DiffHighlightingTest {
+
+    public static void assertEquals(List<Text> expected, List<Text> actual) {
+        // Need to compare string values since Texts with the same string are not considered equal
+        Assertions.assertEquals(expected.toString(), actual.toString());
+
+        // Moreover, make sure that style classes are correct
+        List<String> expectedStyles = expected.stream().map(text -> text.getStyleClass().toString()).collect(Collectors.toList());
+        List<String> actualStyles = actual.stream().map(text -> text.getStyleClass().toString()).collect(Collectors.toList());
+        Assertions.assertEquals(expectedStyles, actualStyles);
+    }
+
+    @Test
+    void testGenerateDiffHighlightingBothNullThrowsNPE() {
+        Assertions.assertThrows(NullPointerException.class, () -> DiffHighlighting.generateDiffHighlighting(null, null, ""));
+    }
+
+    @Test
+    void testNullSeparatorThrowsNPE() {
+        Assertions.assertThrows(NullPointerException.class, () -> DiffHighlighting.generateDiffHighlighting("", "", null));
+    }
+
+    @Test
+    void testGenerateDiffHighlightingNoDiff() {
+        assertEquals(
+                Arrays.asList(
+                        DiffHighlighting.forUnchanged("f"),
+                        DiffHighlighting.forUnchanged("o"),
+                        DiffHighlighting.forUnchanged("o")
+                ),
+                DiffHighlighting.generateDiffHighlighting("foo", "foo", ""));
+    }
+
+    @Test
+    void testGenerateDiffHighlightingSingleWordAddTextWordDiff() {
+        assertEquals(
+                Arrays.asList(
+                        DiffHighlighting.forRemoved("foo "),
+                        DiffHighlighting.forAdded("foobar")
+                ),
+                DiffHighlighting.generateDiffHighlighting("foo", "foobar", " "));
+    }
+
+    @Test
+    void testGenerateDiffHighlightingSingleWordAddTextCharacterDiff() {
+        assertEquals(
+                Arrays.asList(
+                        DiffHighlighting.forUnchanged("f"),
+                        DiffHighlighting.forUnchanged("o"),
+                        DiffHighlighting.forUnchanged("o"),
+                        DiffHighlighting.forAdded("bar")
+                ),
+                DiffHighlighting.generateDiffHighlighting("foo", "foobar", ""));
+    }
+
+    @Test
+    void testGenerateDiffHighlightingSingleWordDeleteTextWordDiff() {
+        assertEquals(
+                Arrays.asList(
+                        DiffHighlighting.forRemoved("foobar "),
+                        DiffHighlighting.forAdded("foo")
+                ),
+                DiffHighlighting.generateDiffHighlighting("foobar", "foo", " "));
+    }
+
+    @Test
+    void testGenerateDiffHighlightingSingleWordDeleteTextCharacterDiff() {
+        assertEquals(
+                Arrays.asList(
+                        DiffHighlighting.forUnchanged("f"),
+                        DiffHighlighting.forUnchanged("o"),
+                        DiffHighlighting.forUnchanged("o"),
+                        DiffHighlighting.forRemoved("b"),
+                        DiffHighlighting.forRemoved("a"),
+                        DiffHighlighting.forRemoved("r")
+                ),
+                DiffHighlighting.generateDiffHighlighting("foobar", "foo", ""));
+    }
+
+    @Test
+    void generateSymmetricHighlightingSingleWordAddTextWordDiff() {
+        assertEquals(
+                Collections.singletonList(DiffHighlighting.forChanged("foo ")),
+                DiffHighlighting.generateSymmetricHighlighting("foo", "foobar", " "));
+    }
+
+    @Test
+    void generateSymmetricHighlightingSingleWordAddTextCharacterDiff() {
+        assertEquals(
+                Arrays.asList(
+                        DiffHighlighting.forUnchanged("f"),
+                        DiffHighlighting.forUnchanged("o"),
+                        DiffHighlighting.forUnchanged("o")
+                ),
+                DiffHighlighting.generateSymmetricHighlighting("foo", "foobar", ""));
+    }
+
+    @Test
+    void generateSymmetricHighlightingSingleWordDeleteTextWordDiff() {
+        assertEquals(
+                Collections.singletonList(DiffHighlighting.forChanged("foobar ")),
+                DiffHighlighting.generateSymmetricHighlighting("foobar", "foo", " "));
+    }
+
+    @Test
+    void generateSymmetricHighlightingSingleWordDeleteTextCharacterDiff() {
+        assertEquals(
+                Arrays.asList(
+                        DiffHighlighting.forUnchanged("f"),
+                        DiffHighlighting.forUnchanged("o"),
+                        DiffHighlighting.forUnchanged("o"),
+                        DiffHighlighting.forAdded("b"),
+                        DiffHighlighting.forAdded("a"),
+                        DiffHighlighting.forAdded("r")
+                ),
+                DiffHighlighting.generateSymmetricHighlighting("foobar", "foo", ""));
+    }
+
+    @Test
+    void generateSymmetricHighlightingMultipleWordsDeleteTextCharacterDiff() {
+        assertEquals(
+                Arrays.asList(
+                        DiffHighlighting.forUnchanged("f"),
+                        DiffHighlighting.forUnchanged("o"),
+                        DiffHighlighting.forUnchanged("o"),
+                        DiffHighlighting.forAdded("b"),
+                        DiffHighlighting.forAdded("a"),
+                        DiffHighlighting.forAdded("r"),
+                        DiffHighlighting.forUnchanged(" "),
+                        DiffHighlighting.forUnchanged("a"),
+                        DiffHighlighting.forUnchanged("n"),
+                        DiffHighlighting.forUnchanged("d"),
+                        DiffHighlighting.forUnchanged(" "),
+                        DiffHighlighting.forAdded("s"),
+                        DiffHighlighting.forAdded("o"),
+                        DiffHighlighting.forAdded("m"),
+                        DiffHighlighting.forAdded("e"),
+                        DiffHighlighting.forUnchanged("t"),
+                        DiffHighlighting.forUnchanged("h"),
+                        DiffHighlighting.forUnchanged("i"),
+                        DiffHighlighting.forUnchanged("n"),
+                        DiffHighlighting.forUnchanged("g")
+                ),
+                DiffHighlighting.generateSymmetricHighlighting("foobar and something", "foo and thing", ""));
+    }
+
+    @Test
+    void generateSymmetricHighlightingMultipleWordsDeleteTextWordDiff() {
+        assertEquals(
+                Arrays.asList(
+                        DiffHighlighting.forUnchanged("foo "),
+                        DiffHighlighting.forAdded("bar "),
+                        DiffHighlighting.forUnchanged("and "),
+                        DiffHighlighting.forAdded("some "),
+                        DiffHighlighting.forUnchanged("thing ")
+                ),
+                DiffHighlighting.generateSymmetricHighlighting("foo bar and some thing", "foo and thing", " "));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java b/src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java
deleted file mode 100644
index bda3faa126c..00000000000
--- a/src/test/java/org/jabref/logic/util/strings/DiffHighlightingTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.jabref.logic.util.strings;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class DiffHighlightingTest {
-
-    @Test
-    public void testGenerateDiffHighlightingBothNullReturnsNull() {
-        assertNull(DiffHighlighting.generateDiffHighlighting(null, null, ""));
-    }
-
-    @Test
-    public void testNullSeparatorThrowsNPE() {
-        assertThrows(NullPointerException.class, () -> DiffHighlighting.generateDiffHighlighting("", "", null));
-    }
-
-    @Test
-    public void testGenerateDiffHighlightingNoDiff() {
-        assertEquals("foo", DiffHighlighting.generateDiffHighlighting("foo", "foo", ""));
-    }
-
-    @Test
-    public void testGenerateDiffHighlightingSingleWordAddTextWordDiff() {
-        assertEquals("<span class=del>foo</span> <span class=add>foobar</span>",
-                DiffHighlighting.generateDiffHighlighting("foo", "foobar", " "));
-    }
-
-    @Test
-    public void testGenerateDiffHighlightingSingleWordAddTextCharacterDiff() {
-        assertEquals("foo<span class=add>bar</span>", DiffHighlighting.generateDiffHighlighting("foo", "foobar", ""));
-    }
-
-    @Test
-    public void testGenerateDiffHighlightingSingleWordDeleteTextWordDiff() {
-        assertEquals("<span class=del>foobar</span> <span class=add>foo</span>",
-                DiffHighlighting.generateDiffHighlighting("foobar", "foo", " "));
-    }
-
-    @Test
-    public void testGenerateDiffHighlightingSingleWordDeleteTextCharacterDiff() {
-        assertEquals("foo<span class=del>bar</span>", DiffHighlighting.generateDiffHighlighting("foobar", "foo", ""));
-    }
-
-    @Test
-    public void generateSymmetricHighlightingSingleWordAddTextWordDiff() {
-        assertEquals("<span class=change>foo</span>",
-                DiffHighlighting.generateSymmetricHighlighting("foo", "foobar", " "));
-    }
-
-    @Test
-    public void generateSymmetricHighlightingSingleWordAddTextCharacterDiff() {
-        assertEquals("foo", DiffHighlighting.generateSymmetricHighlighting("foo", "foobar", ""));
-    }
-
-    @Test
-    public void generateSymmetricHighlightingSingleWordDeleteTextWordDiff() {
-        assertEquals("<span class=change>foobar</span>",
-                DiffHighlighting.generateSymmetricHighlighting("foobar", "foo", " "));
-    }
-
-    @Test
-    public void generateSymmetricHighlightingSingleWordDeleteTextCharacterDiff() {
-        assertEquals("foo<span class=add>bar</span>", DiffHighlighting.generateSymmetricHighlighting("foobar", "foo", ""));
-    }
-
-    @Test
-    public void generateSymmetricHighlightingMultipleWordsDeleteTextCharacterDiff() {
-        assertEquals("foo<span class=add>bar</span> and <span class=add>some</span>thing",
-                DiffHighlighting.generateSymmetricHighlighting("foobar and something", "foo and thing", ""));
-    }
-
-    @Test
-    public void generateSymmetricHighlightingMultipleWordsDeleteTextWordDiff() {
-        assertEquals("foo <span class=add>bar</span> and <span class=add>some</span> thing",
-                DiffHighlighting.generateSymmetricHighlighting("foo bar and some thing", "foo and thing", " "));
-    }
-}

From 32b580d8d232c85d8d23241f9ebfe1eb162c6c31 Mon Sep 17 00:00:00 2001
From: Ali <alijakparov.kz@gmail.com>
Date: Wed, 31 Oct 2018 17:18:52 +0600
Subject: [PATCH 146/229] fix groups drag and drop (#4439)

* fix groups drag and drop

* fix comment
---
 .../org/jabref/gui/groups/GroupTreeView.java  | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
index 4e4aee8051e..6cdcae3c8ee 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -195,20 +195,21 @@ public void initialize() {
 
             // Drag and drop support
             row.setOnDragDetected(event -> {
-                TreeItem<GroupNodeViewModel> selectedItem = treeTable.getSelectionModel().getSelectedItem();
-                if ((selectedItem != null) && (selectedItem.getValue() != null)) {
-                    Dragboard dragboard = treeTable.startDragAndDrop(TransferMode.MOVE);
-
-                    // Display the group when dragging
-                    dragboard.setDragView(row.snapshot(null, null));
-
-                    // Put the group node as content
-                    ClipboardContent content = new ClipboardContent();
-                    content.put(DragAndDropDataFormats.GROUP, selectedItem.getValue().getPath());
-                    dragboard.setContent(content);
-
-                    event.consume();
+                List<String> groupsToMove = new ArrayList<>();
+                for (TreeItem<GroupNodeViewModel> selectedItem : treeTable.getSelectionModel().getSelectedItems()) {
+                    if ((selectedItem != null) && (selectedItem.getValue() != null)) {
+                        groupsToMove.add(selectedItem.getValue().getPath());
+                    }
                 }
+
+                // Put the group nodes as content
+                Dragboard dragboard = treeTable.startDragAndDrop(TransferMode.MOVE);
+                // Display the group when dragging
+                dragboard.setDragView(row.snapshot(null, null));
+                ClipboardContent content = new ClipboardContent();
+                content.put(DragAndDropDataFormats.GROUP, groupsToMove);
+                dragboard.setContent(content);
+                event.consume();
             });
             row.setOnDragOver(event -> {
                 Dragboard dragboard = event.getDragboard();
@@ -240,13 +241,16 @@ public void initialize() {
             row.setOnDragDropped(event -> {
                 Dragboard dragboard = event.getDragboard();
                 boolean success = false;
+
                 if (dragboard.hasContent(DragAndDropDataFormats.GROUP)) {
-                    String pathToSource = (String) dragboard.getContent(DragAndDropDataFormats.GROUP);
-                    Optional<GroupNodeViewModel> source = viewModel.rootGroupProperty().get()
-                            .getChildByPath(pathToSource);
-                    if (source.isPresent()) {
-                        source.get().draggedOn(row.getItem(), getDroppingMouseLocation(row, event));
-                        success = true;
+                    List<String> pathToSources = (List<String>) dragboard.getContent(DragAndDropDataFormats.GROUP);
+                    for (String pathToSource : pathToSources) {
+                        Optional<GroupNodeViewModel> source = viewModel.rootGroupProperty().get()
+                                .getChildByPath(pathToSource);
+                        if (source.isPresent()) {
+                            source.get().draggedOn(row.getItem(), getDroppingMouseLocation(row, event));
+                            success = true;
+                        }
                     }
                 }
 

From 11ddb8c965d182775ee3397761b97b4463347460 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Thu, 1 Nov 2018 11:46:37 +0100
Subject: [PATCH 147/229] Add submodule pull to circle ci and fix theme loading
 css (#4443)

* Add submodule pull to circle ci

* align again

* fix submodule checkout according to doc

* add null check for theme loading paths get

* fix theme loading css errors
---
 .circleci/config.yml                          |  6 ++++
 .../java/org/jabref/gui/util/ThemeLoader.java | 32 +++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e9e4452ea17..f140a5511af 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,8 @@ jobs:
       - image: circleci/openjdk:8-jdk
     steps:
       - checkout
+      - run: git submodule sync
+      - run: git submodule update --init
       - restore_cache:
           keys:
             - install4j-{{ checksum "scripts/extract-install4j.sh" }}
@@ -26,6 +28,8 @@ jobs:
       - restore_cache:
           key: dependency-cache
       - checkout
+      - run: git submodule sync
+      - run: git submodule update --init
       - restore_cache:
           key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
       - run: scripts/extract-install4j.sh
@@ -47,6 +51,8 @@ jobs:
       - restore_cache:
           key: dependency-cache
       - checkout
+      - run: git submodule sync
+      - run: git submodule update --init
       - restore_cache:
           key: install4j-{{ checksum "scripts/extract-install4j.sh" }}
       - run: scripts/extract-install4j.sh
diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index b2230505578..d7d452e2b3e 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -2,9 +2,9 @@
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Objects;
@@ -73,7 +73,6 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
         }
     }
 
-
     /**
      * Installs the base css file as a stylesheet in the given scene. Changes in the css file lead to a redraw of the
      * scene using the new css file.
@@ -89,18 +88,23 @@ private void addAndWatchForChanges(Scene scene, URL cssFile, int index) {
         scene.getStylesheets().add(index, cssFile.toExternalForm());
 
         try {
-            // If the file is an ordinary file (i.e. not a resource part of a .jar bundle), we watch it for changes and turn on live reloading
-            Path cssPath = Paths.get(cssFile.toURI());
-            if (Files.isRegularFile(cssPath)) {
-                LOGGER.info("Enabling live reloading of " + cssPath);
-                fileUpdateMonitor.addListenerForFile(cssPath, () -> {
-                    LOGGER.info("Reload css file " + cssFile);
-                    DefaultTaskExecutor.runInJavaFXThread(() -> {
-                        scene.getStylesheets().remove(cssFile.toExternalForm());
-                        scene.getStylesheets().add(index, cssFile.toExternalForm());
-                            }
-                    );
-                });
+
+            URI cssUri = cssFile.toURI();
+            if (!cssUri.toString().contains("jar")) {
+                LOGGER.debug("CSS URI {}", cssUri);
+
+                Path cssPath = Paths.get(cssUri).toAbsolutePath();
+                // If the file is an ordinary file (i.e. not a resource part of a .jar bundle), we watch it for changes and turn on live reloading
+                if (!cssUri.toString().contains("jar")) {
+                    LOGGER.info("Enabling live reloading of {}", cssPath);
+                    fileUpdateMonitor.addListenerForFile(cssPath, () -> {
+                        LOGGER.info("Reload css file " + cssFile);
+                        DefaultTaskExecutor.runInJavaFXThread(() -> {
+                            scene.getStylesheets().remove(cssFile.toExternalForm());
+                            scene.getStylesheets().add(index, cssFile.toExternalForm());
+                        });
+                    });
+                }
             }
         } catch (IOException | URISyntaxException e) {
             LOGGER.error("Could not watch css file for changes " + cssFile, e);

From 4d2ae94ca5cc99928b4f62d807bf91e4f31b2082 Mon Sep 17 00:00:00 2001
From: Amish Shah <shahamish150294@gmail.com>
Date: Thu, 1 Nov 2018 12:07:48 -0500
Subject: [PATCH 148/229] Add a preference to add files in entry editor (#4408)

* Add a preference to add files in entry editor (#4356)

* Fix import order

* Edit changelog

* Use enum to represent FileDragDropPreference for Entry Editor

* Changes for localization message and replaced boolean for drag and drop preference with enums

* Change drag-drop option name in preferences

* Added behaviors to accommodate different drag-drop ways along with preference default

* Added whitespaces after if condition

* Remove unused imports
---
 AUTHORS                                       |  1 +
 CHANGELOG.md                                  |  2 +-
 .../jabref/gui/entryeditor/EntryEditor.java   | 64 ++++++++++++++++---
 .../FileDragDropPreferenceType.java           |  7 ++
 .../gui/fieldeditors/LinkedFilesEditor.java   | 36 +----------
 .../gui/preferences/EntryEditorPrefsTab.java  | 37 +++++++++++
 .../jabref/preferences/JabRefPreferences.java | 16 +++++
 src/main/resources/l10n/JabRef_en.properties  |  5 ++
 8 files changed, 122 insertions(+), 46 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/entryeditor/FileDragDropPreferenceType.java

diff --git a/AUTHORS b/AUTHORS
index 04adf86cb9d..05f6f4111da 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Alexsandro Lauber
 Ali Ayan
 Alick Zhao
 Ambrogio Oliva
+Amish Shah
 Andreas Amann
 Andreas Buhr
 Andreas Rudert
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bab3e63099a..f2119c71557 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We added a new keyboard shortcut so that the entry editor could be closed by <kbd>Ctrl<kbd> + <kbd>E<kbd>. [#4222] (https://github.com/JabRef/jabref/issues/4222)
 - We added an option in the preference dialog box, that allows user to pick the dark or light theme option. [#4130] (https://github.com/JabRef/jabref/issues/4130)
 - We updated updated the Related Articles tab to accept JSON from the new version of the Mr. DLib service
-
+- We added an option in the preference dialog box that allows user to choose behavior after dragging and dropping files in Entry Editor. [#4356](https://github.com/JabRef/jabref/issues/4356)
 
 
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 46ae9d3d32d..c7961bff628 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -144,19 +144,63 @@ public EntryEditor(BasePanel panel, EntryEditorPreferences preferences, FileUpda
             if (event.getDragboard().hasContent(DataFormat.FILES)) {
                 List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
 
-                if (event.getTransferMode() == TransferMode.MOVE) {
-
-                    LOGGER.debug("Mode MOVE"); //shift on win or no modifier
-                    fileHandler.addToEntryRenameAndMoveToFileDir(entry, files);
+                FileDragDropPreferenceType dragDropPreferencesType = Globals.prefs.getEntryEditorFileLinkPreference();
+
+                if (dragDropPreferencesType == FileDragDropPreferenceType.MOVE)
+                {
+                    if (event.getTransferMode() == TransferMode.LINK) //alt on win
+                    {
+                        LOGGER.debug("Mode LINK");
+                        fileHandler.addToEntry(entry, files);
+                    }
+                    else if (event.getTransferMode() == TransferMode.COPY) //ctrl on win, no modifier on Xubuntu
+                    {
+                        LOGGER.debug("Mode COPY");
+                        fileHandler.copyFilesToFileDirAndAddToEntry(entry, files);
+                    }
+                    else
+                    {
+                        LOGGER.debug("Mode MOVE"); //shift on win or no modifier
+                        fileHandler.addToEntryRenameAndMoveToFileDir(entry, files);
+                    }
                 }
-                if (event.getTransferMode() == TransferMode.LINK) {
-                    LOGGER.debug("Node LINK"); //alt on win
-                    fileHandler.addToEntry(entry, files);
 
+                if (dragDropPreferencesType == FileDragDropPreferenceType.COPY)
+                {
+                    if (event.getTransferMode() == TransferMode.COPY) //ctrl on win, no modifier on Xubuntu
+                    {
+                        LOGGER.debug("Mode MOVE");
+                        fileHandler.addToEntryRenameAndMoveToFileDir(entry, files);
+                    }
+                    else if (event.getTransferMode() == TransferMode.LINK) //alt on win
+                    {
+                        LOGGER.debug("Mode LINK");
+                        fileHandler.addToEntry(entry, files);
+                    }
+                    else
+                    {
+                        LOGGER.debug("Mode COPY"); //shift on win or no modifier
+                        fileHandler.copyFilesToFileDirAndAddToEntry(entry, files);
+                    }
                 }
-                if (event.getTransferMode() == TransferMode.COPY) {
-                    LOGGER.debug("Mode Copy"); //ctrl on win, no modifier on Xubuntu
-                    fileHandler.copyFilesToFileDirAndAddToEntry(entry, files);
+
+                if (dragDropPreferencesType == FileDragDropPreferenceType.LINK)
+                {
+                    if (event.getTransferMode() == TransferMode.COPY) //ctrl on win, no modifier on Xubuntu
+                    {
+                        LOGGER.debug("Mode COPY");
+                        fileHandler.copyFilesToFileDirAndAddToEntry(entry, files);
+                    }
+                    else if (event.getTransferMode() == TransferMode.LINK) //alt on win
+                    {
+                        LOGGER.debug("Mode MOVE");
+                        fileHandler.addToEntryRenameAndMoveToFileDir(entry, files);
+                    }
+                    else
+                    {
+                        LOGGER.debug("Mode LINK"); //shift on win or no modifier
+                        fileHandler.addToEntry(entry, files);
+                    }
                 }
             }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/FileDragDropPreferenceType.java b/src/main/java/org/jabref/gui/entryeditor/FileDragDropPreferenceType.java
new file mode 100644
index 00000000000..f8bea3ce606
--- /dev/null
+++ b/src/main/java/org/jabref/gui/entryeditor/FileDragDropPreferenceType.java
@@ -0,0 +1,7 @@
+package org.jabref.gui.entryeditor;
+
+public enum FileDragDropPreferenceType {
+    COPY,
+    LINK,
+    MOVE;
+}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
index 8c4a94d3517..b782ae80c61 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import java.io.File;
-import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import javafx.beans.binding.Bindings;
 import javafx.collections.ObservableList;
@@ -71,41 +68,14 @@ public LinkedFilesEditor(String fieldName, DialogService dialogService, BibDatab
 
         listView.setCellFactory(cellFactory);
 
-        setUpFilesDragAndDrop();
         Bindings.bindContentBidirectional(listView.itemsProperty().get(), viewModel.filesProperty());
         setUpKeyBindings();
     }
 
-    private void setUpFilesDragAndDrop() {
-        listView.setOnDragOver(event -> {
-            if (event.getDragboard().hasFiles()) {
-                event.acceptTransferModes(TransferMode.COPY, TransferMode.LINK);
-            }
-        });
-
-        listView.setOnDragDropped(event -> {
-            Dragboard dragboard = event.getDragboard();
-            boolean success = false;
-            ObservableList<LinkedFileViewModel> items = listView.itemsProperty().get();
-
-            if (dragboard.hasFiles()) {
-                List<LinkedFileViewModel> linkedFiles = dragboard.getFiles().stream().map(File::toPath).map(viewModel::fromFile).collect(Collectors.toList());
-                items.addAll(linkedFiles);
-                success = true;
-            }
-            event.setDropCompleted(success);
-            event.consume();
-        });
-
-    }
-
     private void handleOnDragOver(LinkedFileViewModel originalItem, DragEvent event) {
         if ((event.getGestureSource() != originalItem) && event.getDragboard().hasContent(DragAndDropDataFormats.LINKED_FILE)) {
             event.acceptTransferModes(TransferMode.MOVE);
         }
-        if (event.getDragboard().hasFiles()) {
-            event.acceptTransferModes(TransferMode.COPY, TransferMode.LINK);
-        }
     }
 
     private void handleOnDragDetected(@SuppressWarnings("unused") LinkedFileViewModel linkedFile, MouseEvent event) {
@@ -143,11 +113,7 @@ private void handleOnDragDropped(LinkedFileViewModel originalItem, DragEvent eve
             items.set(thisIdx, transferedItem);
             success = true;
         }
-        if (dragboard.hasFiles()) {
-            List<LinkedFileViewModel> linkedFiles = dragboard.getFiles().stream().map(File::toPath).map(viewModel::fromFile).collect(Collectors.toList());
-            items.addAll(linkedFiles);
-            success = true;
-        }
+
         event.setDropCompleted(success);
         event.consume();
 
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
index dd04ed460cd..2fd8a9a6653 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
@@ -12,6 +12,7 @@
 
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
+import org.jabref.gui.entryeditor.FileDragDropPreferenceType;
 import org.jabref.gui.keyboard.EmacsKeyBindings;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
@@ -42,10 +43,14 @@ class EntryEditorPrefsTab extends Pane implements PrefsTab {
     private final JabRefPreferences prefs;
     private final AutoCompletePreferences autoCompletePreferences;
 
+    private final RadioButton copyFile;
+    private final RadioButton linkFile;
+    private final RadioButton renameCopyFile;
 
     public EntryEditorPrefsTab(JabRefPreferences prefs) {
         this.prefs = prefs;
         autoCompletePreferences = prefs.getAutoCompletePreferences();
+
         autoOpenForm = new CheckBox(Localization.lang("Open editor when a new entry is created"));
         defSource = new CheckBox(Localization.lang("Show BibTeX source by default"));
         emacsMode = new CheckBox(Localization.lang("Use Emacs key bindings"));
@@ -123,6 +128,20 @@ public EntryEditorPrefsTab(JabRefPreferences prefs) {
         firstNameModeAbbr.setToggleGroup(treatmentOfFirstNamesToggleGroup);
         firstNameModeFull.setToggleGroup(treatmentOfFirstNamesToggleGroup);
         firstNameModeBoth.setToggleGroup(treatmentOfFirstNamesToggleGroup);
+
+        final ToggleGroup group = new ToggleGroup();
+        Label linkFileOptions = new Label(Localization.lang("Default drag & drop action"));
+        linkFileOptions.getStyleClass().add("sectionHeader");
+        copyFile = new RadioButton(Localization.lang("Copy file to default file folder"));
+        linkFile = new RadioButton(Localization.lang("Link file (without copying)"));
+        renameCopyFile = new RadioButton(Localization.lang("Copy, rename and link file"));
+        builder.add(linkFileOptions, 1, 23);
+        builder.add(copyFile, 1, 24);
+        builder.add(linkFile, 1, 25);
+        builder.add(renameCopyFile, 1, 26);
+        copyFile.setToggleGroup(group);
+        linkFile.setToggleGroup(group);
+        renameCopyFile.setToggleGroup(group);
     }
 
     @Override
@@ -172,6 +191,15 @@ public void setValues() {
             break;
         }
 
+        FileDragDropPreferenceType dragDropPreferenceType = prefs.getEntryEditorFileLinkPreference();
+        if (dragDropPreferenceType == FileDragDropPreferenceType.COPY) {
+            copyFile.setSelected(true);
+        } else if (dragDropPreferenceType == FileDragDropPreferenceType.LINK) {
+            linkFile.setSelected(true);
+        } else {
+            renameCopyFile.setSelected(true);
+        }
+
         // similar for emacs CTRL-a and emacs mode
         emacsRebindCtrlA.setDisable(!emacsMode.isSelected());
         // Autocomplete fields is only enabled when autocompletion is selected
@@ -230,6 +258,15 @@ else if (autoCompFF.isSelected()) {
         } else {
             autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.BOTH);
         }
+
+        if (copyFile.isSelected()) {
+            prefs.storeEntryEditorFileLinkPreference(FileDragDropPreferenceType.COPY);
+        } else if (linkFile.isSelected()) {
+            prefs.storeEntryEditorFileLinkPreference(FileDragDropPreferenceType.LINK);
+        } else {
+            prefs.storeEntryEditorFileLinkPreference(FileDragDropPreferenceType.MOVE);
+        }
+
         prefs.storeAutoCompletePreferences(autoCompletePreferences);
     }
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index cbc7c80163c..eea8a2ee771 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -46,6 +46,7 @@
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
 import org.jabref.gui.entryeditor.EntryEditorTabList;
+import org.jabref.gui.entryeditor.FileDragDropPreferenceType;
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.maintable.ColumnPreferences;
@@ -369,6 +370,10 @@ public class JabRefPreferences implements PreferencesService {
     // Id Entry Generator Preferences
     public static final String ID_ENTRY_GENERATOR = "idEntryGenerator";
 
+
+    //File linking Options for entry editor
+    public static final String ENTRY_EDITOR_DRAG_DROP_PREFERENCE_TYPE = "DragDropPreferenceType";
+
     // Preview
     private static final String PREVIEW_STYLE = "previewStyle";
     private static final String CYCLE_PREVIEW_POS = "cyclePreviewPos";
@@ -411,6 +416,7 @@ public class JabRefPreferences implements PreferencesService {
 
     // Helper string
     private static final String USER_HOME = System.getProperty("user.home");
+
     // The only instance of this class:
     private static JabRefPreferences singleton;
     /**
@@ -786,6 +792,8 @@ private JabRefPreferences() {
 
         // set default theme
         defaults.put(JabRefPreferences.FX_THEME, ThemeLoader.MAIN_CSS);
+
+        defaults.put(ENTRY_EDITOR_DRAG_DROP_PREFERENCE_TYPE, FileDragDropPreferenceType.MOVE.name());
         setLanguageDependentDefaultValues();
     }
 
@@ -2019,4 +2027,12 @@ public Map<String, SortType> getMainTableColumnSortTypes() {
         }
         return map;
     }
+
+    public FileDragDropPreferenceType getEntryEditorFileLinkPreference() {
+        return FileDragDropPreferenceType.valueOf(get(ENTRY_EDITOR_DRAG_DROP_PREFERENCE_TYPE));
+    }
+
+    public void storeEntryEditorFileLinkPreference(FileDragDropPreferenceType type) {
+        put(ENTRY_EDITOR_DRAG_DROP_PREFERENCE_TYPE, type.name());
+    }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index d58e0cbc12d..e4bd843bed0 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2229,3 +2229,8 @@ Keystore\:=Keystore\:
 Password\:=Password\:
 Remember\ Password=Remember Password
 Use\ SSL=Use SSL
+
+Default\ drag\ &\ drop\ action=Default drag & drop action
+Copy\ file\ to\ default\ file\ folder=Copy file to default file folder
+Link\ file\ (without\ copying)=Link file (without copying)
+Copy,\ rename\ and\ link\ file=Copy, rename and link file

From a2aff9330f19510d76b07dde95afac3f83240510 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Thu, 1 Nov 2018 20:59:15 +0100
Subject: [PATCH 149/229] Emphasize that users should try out the newest
 version before reporting a bug

---
 .github/ISSUE_TEMPLATE/bug_report.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 32a3c7f37fb..03dff7e01a6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,7 +11,15 @@ Thanks!
 --> 
 
 JabRef version <!-- version as shown in the about box --> on <!-- Windows 10|Ubuntu 14.04|Mac OS X 10.8|... -->
-<!-- Hint: If you use a development version (available at http://builds.jabref.org/master/), ensure that you use the latest one. -->
+
+<!-- IMPORTANT NOTE ->
+<!-- 
+      Please always test if the bug is still reproducible in the latest development version.
+      We are constantly improving JabRef and some bugs may already be fixed.
+      You can download the development version at: http://builds.jabref.org/master/
+      Please make a backup of your library before you try out this version.
+      If you already use a development version, ensure that you use the latest one.
+ -->
 - [ ] I have tested the latest development version from http://builds.jabref.org/master/ and the problem persists
 
 <!-- Add a clear and concise description of what the bug is. -->

From d466e4643bc4c49638645a5dbee2b187f0bf883d Mon Sep 17 00:00:00 2001
From: Christoph <siedlerkiller@gmail.com>
Date: Fri, 2 Nov 2018 08:30:45 +0100
Subject: [PATCH 150/229] Add Depandabot badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index cec54b33f74..98b6397a8cc 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/JabRef/jabref.svg?branch=master)](https://travis-ci.org/JabRef/jabref)
 [![codecov.io](https://codecov.io/github/JabRef/jabref/coverage.svg?branch=master)](https://codecov.io/github/JabRef/jabref?branch=master)
+[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=JabRef/jabref)](https://dependabot.com)
 [![Donation](https://img.shields.io/badge/donate%20to-jabref-orange.svg)](https://donations.jabref.org)
 
 JabRef is an open-source, cross-platform citation and reference management tool licensed under the  [MIT license](https://tldrlegal.com/license/mit-license).

From 611e35a6b8f3032bd9e87b6b09c341f414683eac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Nov 2018 08:33:12 +0100
Subject: [PATCH 151/229] Bump junit-pioneer from 0.2.2 to 0.3.0 (#4451)

Bumps [junit-pioneer](https://github.com/junit-pioneer/junit-pioneer) from 0.2.2 to 0.3.0.
- [Release notes](https://github.com/junit-pioneer/junit-pioneer/releases)
- [Changelog](https://github.com/junit-pioneer/junit-pioneer/blob/master/docs/release-notes.md)
- [Commits](https://github.com/junit-pioneer/junit-pioneer/compare/v0.2.2...v0.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1c14214c094..24665d8c2be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -165,7 +165,7 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1'
     testCompile 'org.junit.platform:junit-platform-launcher:1.3.1'
-    testCompile 'org.junit-pioneer:junit-pioneer:0.2.2'
+    testCompile 'org.junit-pioneer:junit-pioneer:0.3.0'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'
     testCompile 'org.mockito:mockito-core:2.23.0'

From c3684a15bd98c1fe5bcfee59f86bdb74c4e4b13f Mon Sep 17 00:00:00 2001
From: Christoph <siedlerkiller@gmail.com>
Date: Fri, 2 Nov 2018 22:00:02 +0100
Subject: [PATCH 152/229] Remove depandabot

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 98b6397a8cc..cec54b33f74 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 
 [![Build Status](https://travis-ci.org/JabRef/jabref.svg?branch=master)](https://travis-ci.org/JabRef/jabref)
 [![codecov.io](https://codecov.io/github/JabRef/jabref/coverage.svg?branch=master)](https://codecov.io/github/JabRef/jabref?branch=master)
-[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=JabRef/jabref)](https://dependabot.com)
 [![Donation](https://img.shields.io/badge/donate%20to-jabref-orange.svg)](https://donations.jabref.org)
 
 JabRef is an open-source, cross-platform citation and reference management tool licensed under the  [MIT license](https://tldrlegal.com/license/mit-license).

From 2ae8d9d1dfc1c7d519e76a454ff7ad11a50ee92f Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sat, 3 Nov 2018 16:12:51 +0100
Subject: [PATCH 153/229] Fix error in l10n file: Toogle -> Toggle (#4453)

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

diff --git a/src/main/java/org/jabref/gui/groups/GroupModeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupModeViewModel.java
index d88565f82ba..022941a97d5 100644
--- a/src/main/java/org/jabref/gui/groups/GroupModeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupModeViewModel.java
@@ -8,7 +8,7 @@
 
 public class GroupModeViewModel {
 
-    private GroupViewMode mode;
+    private final GroupViewMode mode;
 
     public GroupModeViewModel(GroupViewMode mode) {
         this.mode = mode;
@@ -27,9 +27,9 @@ public Node getUnionIntersectionGraphic() {
 
     public Tooltip getUnionIntersectionTooltip() {
         if (mode == GroupViewMode.UNION) {
-            return new Tooltip(Localization.lang("Toogle intersection"));
+            return new Tooltip(Localization.lang("Toggle intersection"));
         } else if (mode == GroupViewMode.INTERSECTION) {
-            return new Tooltip(Localization.lang("Toogle union"));
+            return new Tooltip(Localization.lang("Toggle union"));
         }
         return new Tooltip();
     }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index e4bd843bed0..f7b09efbf18 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2182,8 +2182,8 @@ Group\ view\ mode\ set\ to\ union=Group view mode set to union
 Open\ %0\ URL\ (%1)=Open %0 URL (%1)
 Open\ URL\ (%0)=Open URL (%0)
 Open\ file\ %0=Open file %0
-Toogle\ intersection=Toogle intersection
-Toogle\ union=Toogle union
+Toggle\ intersection=Toggle intersection
+Toggle\ union=Toggle union
 Jump\ to\ entry=Jump to entry
 The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\ does\ not\ work\ as\ expected.=The group name contains the keyword separator "%0" and thus probably does not work as expected.
 Abbreviate\ journal\ names\ (ISO)=Abbreviate journal names (ISO)

From d4f6826d9149fb16d4195305b740709e0b74ea64 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sat, 3 Nov 2018 16:40:19 +0100
Subject: [PATCH 154/229] New Crowdin translations (#4454)

* New translations JabRef_en.properties (Chinese Simplified)

* New translations JabRef_en.properties (Persian)

* New translations JabRef_en.properties (Turkish)

* New translations JabRef_en.properties (Tagalog)

* New translations JabRef_en.properties (Swedish)

* New translations JabRef_en.properties (Spanish)

* New translations JabRef_en.properties (Russian)

* New translations JabRef_en.properties (Portuguese, Brazilian)

* New translations JabRef_en.properties (Norwegian)

* New translations JabRef_en.properties (Danish)

* New translations JabRef_en.properties (Japanese)

* New translations JabRef_en.properties (Italian)

* New translations JabRef_en.properties (Indonesian)

* New translations JabRef_en.properties (Greek)

* New translations JabRef_en.properties (German)

* New translations JabRef_en.properties (French)

* New translations JabRef_en.properties (Dutch)

* New translations JabRef_en.properties (Vietnamese)
---
 src/main/resources/l10n/JabRef_da.properties  |  110 +-
 src/main/resources/l10n/JabRef_de.properties  |  203 +-
 src/main/resources/l10n/JabRef_el.properties  | 1710 +++++++++++++++--
 src/main/resources/l10n/JabRef_es.properties  |  135 +-
 src/main/resources/l10n/JabRef_fa.properties  |   22 +-
 src/main/resources/l10n/JabRef_fr.properties  |  199 +-
 src/main/resources/l10n/JabRef_in.properties  |  136 +-
 src/main/resources/l10n/JabRef_it.properties  |  247 +--
 src/main/resources/l10n/JabRef_ja.properties  |  149 +-
 src/main/resources/l10n/JabRef_nl.properties  | 1290 +++++++++++--
 src/main/resources/l10n/JabRef_no.properties  |  110 +-
 .../resources/l10n/JabRef_pt_BR.properties    |  124 +-
 src/main/resources/l10n/JabRef_ru.properties  |  130 +-
 src/main/resources/l10n/JabRef_sv.properties  |  125 +-
 src/main/resources/l10n/JabRef_tl.properties  |  127 +-
 src/main/resources/l10n/JabRef_tr.properties  |  236 +--
 src/main/resources/l10n/JabRef_vi.properties  |  116 +-
 src/main/resources/l10n/JabRef_zh.properties  |  525 +++--
 18 files changed, 3736 insertions(+), 1958 deletions(-)

diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
index d8975e95327..32ad4beec00 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<feltnavn>
 
-<select>=<vælg>
-
 <select\ word>=<vælg ord>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Forkort tidsskriftsnavn for de valgte poster (ISO-forkortelse)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Forkort tidsskriftsnavn for de valgte poster (MEDLINE-forkortelse)
@@ -34,11 +32,13 @@ Accept=Accepter
 
 Accept\ change=Accepter ændring
 
-Action=Handling
 
+Action=Handling
 
 Add=Tilføj
 
+Add\ new=Tilføj ny
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Tilføj en (kompileret) egendefineret Importer-klasse fra en classpath.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Stien behøver ikke at være på JabRefs classpath.
 
@@ -51,16 +51,12 @@ Add\ from\ folder=Tilføj fra mappe
 
 Add\ from\ JAR=Tilføj fra JAR-fil
 
-Add\ new=Tilføj ny
-
 Add\ subgroup=Tilføj undergruppe
 
 Add\ to\ group=Tilføj i gruppe
 
 Added\ group\ "%0".=Tilføjede gruppe "%0".
 
-Added\ new=Tilføjede ny
-
 Added\ string=Tilføjede streng
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Desuden, poster hvis <b>%0</b>-felt ikke indeholder <b>%1</b> kan føjes manuelt til denne gruppe ved at vælge dem, og enten trække dem over eller bruge kontekstmenuen. Denne proces tilføjer udtrykket <b>%1</b> til hver af posternes <b>%0</b>-felt. Poster kan fjernes manuelt fra denne gruppe ved at vælge dem og derefter bruge kontekstmenuen. Denne proces fjerner udtrykket <b>%1</b> fra hver af posternes <b>%0</b>-felt.
@@ -69,10 +65,6 @@ Advanced=Avanceret
 All\ entries=Alle poster
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Alle posterne af denne type vil blive klassificeret som typeløse. Fortsæt?
 
-All\ fields=Alle felter
-
-
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=En SAXException forekom ved læsning af '%0'\:
 
 and=og
 
@@ -163,6 +155,7 @@ Clear\ fields=Ryd felter
 
 Close=Luk
 
+
 Close\ dialog=Luk dialog
 
 Close\ the\ current\ library=Luk denne library
@@ -215,6 +208,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Kunne ikke køre 'vim'-programmet
 Could\ not\ save\ file.=Kunne ikke gemme fil.
 Character\ encoding\ '%0'\ is\ not\ supported.=Tegnkodingen '%0' er ikke understøttet.
 
+
 crossreferenced\ entries\ included=refererede poster inkluderet
 
 Current\ content=Nuværende indhold
@@ -250,8 +244,6 @@ Default\ grouping\ field=Standardfelt for gruppering
 
 Default\ pattern=Standardmønster
 
-Default\ sort\ criteria=Standard sorteringskriterier
-
 Delete=Slet
 
 Delete\ custom\ format=Slet brugerdefineret type
@@ -271,8 +263,6 @@ Delete\ strings=Slet strenge
 Deleted=Slettet
 
 
-Delimit\ fields\ with\ semicolon,\ ex.=Afgræns felter med semikolon, f.eks.
-
 Descending=Faldende
 
 Description=Beskrivelse
@@ -327,7 +317,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Grupper poster
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Grupper poster dynamisk ved at søge efter nøgleord i et felt
 
-Each\ line\ must\ be\ on\ the\ following\ form=Hver linje skal være på følgende form
 
 Edit=Rediger
 
@@ -374,12 +363,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Posttyper
 
 Error=Fejl
-Error\ exporting\ to\ clipboard=Fejl ved eksport til udklipsholder
 
 Error\ occurred\ when\ parsing\ entry=En fejl opstod ved læsning af post
 
 Error\ opening\ file=Fejl ved åbning af fil
 
+
 Error\ while\ writing=En fejl opstod ved skrivning
 
 '%0'\ exists.\ Overwrite\ file?='%0' eksisterer. Erstat filen?
@@ -409,8 +398,6 @@ External\ programs=Eksterne programmer
 
 External\ viewer\ called=Eksternt program kaldt
 
-Fetch=Hent
-
 Field=Felt
 
 field=felt
@@ -418,8 +405,6 @@ field=felt
 Field\ name=Feltnavn
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Feltnavn kan ikke indeholde mellemrum eller følgende tegn
 
-Field\ to\ filter=Felt som skal filtreres
-
 Field\ to\ group\ by=Grupperingsfelt
 
 File=Fil
@@ -434,13 +419,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Filbiblioteket er ikke sat
 
 File\ exists=Filen eksisterer
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=Filen er blevet ændret eksternt. Hvad vil du gøre?
-
 File\ not\ found=Fil ikke fundet
 File\ type=Filtype
-
-File\ updated\ externally=Filen er blevet ændret eksternt
-
 filename=filnavn
 
 Files\ opened=Filer åbnet
@@ -459,6 +439,7 @@ Fit\ table\ horizontally\ on\ screen=Tilpas tabelbredden horisontalt
 Float=Flyt
 
 
+
 Format\ of\ author\ and\ editor\ names=Formattering af forfatter- og redaktørnavn
 Format\ string=Formatstreng
 
@@ -469,9 +450,9 @@ found\ in\ AUX\ file=fundet i AUX-fil
 
 Full\ name=Fuldt navn
 
+
 General=Generelt
 
-General\ fields=Generelle felter
 
 Generate=Generer
 
@@ -549,14 +530,12 @@ Importing=Importerer
 
 Importing\ in\ unknown\ format=Importerer ukendt format
 
-Include\ abstracts=Inkluder abstracts
-Include\ entries=Inkluder poster
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Inkluder undergrupper\: Vis poster indeholdt i denne gruppe eller en undergruppe
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Uafhængig gruppe\: Vis kun denne gruppes poster
 
 
+
 Insert=Tilføj
 
 Insert\ rows=Tilføj rækker
@@ -603,10 +582,6 @@ Leave\ file\ in\ its\ current\ directory=Lad filen ligge i biblioteket, den ligg
 
 Left=Venstre
 
-Limit\ to\ fields=Begræns til følgende felter
-
-Limit\ to\ selected\ entries=Begræns til valgte poster
-
 Link\ local\ file=Link til lokal fil
 Link\ to\ file\ %0=Link til filen %0
 
@@ -628,8 +603,6 @@ Mark\ new\ entries\ with\ owner\ name=Mærk nye poster med navn på ejer
 
 Memory\ stick\ mode=Memory Stick-tilstand
 
-Menu\ and\ label\ font\ size=Størrelse på menuskrifttyper
-
 Merged\ external\ changes=Inkorporerede eksterne ændringer
 
 Messages=Meddelelser
@@ -654,6 +627,8 @@ Move\ up=Flyt op
 
 Moved\ group\ "%0".=Flyttede gruppen "%0".
 
+
+
 Name=Navn
 Name\ formatter=Navneformatering
 
@@ -671,8 +646,6 @@ New\ content=Nyt indhold
 
 New\ library\ created.=Opprettede ny library.
 
-New\ field\ value=Ny værdi
-
 New\ group=Ny gruppe
 
 New\ string=Ny streng
@@ -687,9 +660,6 @@ no\ library\ generated=ingen library genereret
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Ingen poster fundet. Kontroller at du bruger korrekt importfilter.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Fandt ingen poster for søgeteksten '%0'
-
 No\ entries\ imported.=Ingen poster importeret.
 
 No\ files\ found.=Ingen filer fundet.
@@ -710,8 +680,6 @@ Nothing\ to\ redo=Ingenting at gentage
 
 Nothing\ to\ undo=Ingenting at fortryde
 
-occurrences=forekomster
-
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=En eller flere nøgler vil blive overskrevet. Fortsæt?
 
@@ -749,13 +717,10 @@ Override=Tilsidesæt
 
 Override\ default\ file\ directories=Tilsidesæt standard fil-biblioteker
 
-Override\ default\ font\ settings=Tilsidesæt standardskrifttyper
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=Tilsidesæt BibTeX-nøglen til fordel for den valgte nøgle
 
 
 Overwrite=Overskriv
-Overwrite\ existing\ field\ values=Overskriv eksisterende værdier
 
 Overwrite\ keys=Overskriv nøgler
 
@@ -790,6 +755,7 @@ Please\ enter\ the\ string's\ label=Skriv et navn for strengen
 
 Please\ select\ an\ importer.=Vælg venligst et importfilter.
 
+
 Possible\ duplicate\ entries=Mulige dubletter
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Mulig dublet af eksisterende post. Klik for at løse problemet.
@@ -816,8 +782,6 @@ Redo=Gentag
 
 Reference\ library=Referencelibrary
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Referencer fundet\: %0. Antal referencer som skal hentes?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Undergruppe\: Vis poster indeholdt både i denne gruppe og gruppe over
 
 regular\ expression=Regulærudtryk
@@ -873,10 +837,6 @@ Replace\ (regular\ expression)=Erstat (regulærudtryk)
 
 Replace\ string=Erstat streng
 
-Replace\ with=Erstat med
-
-
-Replaced=Erstattet
 
 Required\ fields=Obligatoriske felter
 
@@ -886,6 +846,8 @@ Resolve\ strings\ for\ all\ fields\ except=Slå strenge op for alle felter undta
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Slå kun strenge op for standard BibTeX-felter
 
 resolved=løst
+
+
 Review=Kommentarer
 Review\ changes=Gennemse ændringer
 
@@ -903,10 +865,6 @@ Save\ library\ as...=Gem library som ...
 
 Save\ entries\ in\ their\ original\ order=Gem poster i oprindelig rækkefølge
 
-Save\ failed=Gemning mislykkedes
-
-Save\ failed\ during\ backup\ creation=Gemning mislykkedes ved oprettelse af sikkerhedskopi
-
 Saved\ library=Library gemt
 
 Saved\ selected\ to\ '%0'.=Gemte valgte i '%0'.
@@ -920,8 +878,6 @@ Search=Søg
 
 Search\ expression=Søgeudtryk
 
-Search\ for=Søg efter
-
 Searching\ for\ duplicates...=Søger efter dubletter...
 
 Searching\ for\ files=Søger efter filer
@@ -930,19 +886,16 @@ Secondary\ sort\ criterion=Sekundært sorteringskriterium
 
 Select\ all=Vælg alle
 
-Select\ encoding=Vælg tegnkodning
-
 Select\ entry\ type=Vælg posttype
-Select\ external\ application=Vælg ekstern applikation
 
 Select\ file\ from\ ZIP-archive=Vælg fil fra ZIP-fil
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Vælg forgreningerne for at inspicere og acceptere eller forkaste ændringer
-Selected\ entries=Valgte poster
+
 Set\ field=Sæt felt
 Set\ fields=Sæt felter
 
-Set\ general\ fields=Tilpas generelle felter
+
 Set\ main\ external\ file\ directory=Sæt hovedbibliotek for eksterne links
 
 Settings=Indstillinger
@@ -993,8 +946,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Grupper poster statisk ved ma
 
 
 
-Strings=Strenge
-
 Strings\ for\ library=Strenge for library
 
 Sublibrary\ from\ AUX=Dellibrary fra AUX-fil
@@ -1054,8 +1005,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Denne operation kræver, at en eller flere poster er valgt.
 
+
 Toggle\ entry\ preview=Vis/skjul forhåndsvisning
 Toggle\ groups\ interface=Vis/skjul grupperingspanel
+
+
+
 Try\ different\ encoding=Prøv en anden tegnkodning
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Ekspander tidsskriftsnavn for de valgte poster
@@ -1100,8 +1055,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=kontroller at
 View=Vis
 Vim\ server\ name=Navn på Vim-server
 
-Waiting\ for\ ArXiv...=Venter på ArXiv
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Advar om dubletter som ikke er blevet håndteret, når inspektionsvinduet lukkes
 
 Warn\ before\ overwriting\ existing\ keys=Advar før eksisterende nøgler overskrives
@@ -1132,7 +1085,6 @@ XMP\ export\ privacy\ settings=Indstillinger for XMP-eksport
 XMP-metadata\ found\ in\ PDF\:\ %0=XMP-metadata fundet i PDF\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Du skal genstarte JabRef for, at dette skal træde i kraft.
 You\ have\ changed\ the\ language\ setting.=Du har valgt et nyt sprog.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Ugyldigt søgeudtryk '%0'.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Du skal genstarte JabRef for, at de nye genvejstaster skal fungere.
 
@@ -1141,25 +1093,19 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Dine nye genvejstaster er blevet g
 The\ following\ fetchers\ are\ available\:=Følgende henteværktøjer er tilgængelige\:
 Could\ not\ find\ fetcher\ '%0'=Kunne ikke finde henteværktøjet '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Kører forespørgsel '%0' med henteværktøjet '%1'.
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=Forespørgsel '%0' med henteværktøjet '%1' returnerede ingen resultater.
 
 Move\ file=Flyt fil
 Rename\ file=omdøb fil
 
+
 Move\ file\ failed=Flytning af fil mislykkedes
 Could\ not\ move\ file\ '%0'.=Kunne ikke flytte fil '%0'.
 Could\ not\ find\ file\ '%0'.=Kunne ikke finde filen '%0'.
 Number\ of\ entries\ successfully\ imported=Antal poster korrekt importeret
 Import\ canceled\ by\ user=Import afbrudt af bruger
-Progress\:\ %0\ of\ %1=Fremskridt\: %0 af %1
 Error\ while\ fetching\ from\ %0=Fejl under hentning fra %0
 
-Please\ enter\ a\ valid\ number=Indtast venligst et gyldigt tal
 Show\ search\ results\ in\ a\ window=Vis søgeresultater i et vindue
-Move\ file\ to\ file\ directory?=Flyt fil til filbibliotek?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=Libraryn er beskyttet. Kan ikke gemme før eksterne ændringer er gennemset.
-Protected\ library=Beskyttet library
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Nægt at gemme library før eksterne ændringer er gennemset.
 Library\ protection=Library-beskyttelse
 Unable\ to\ save\ library=Kan ikke gemme library
@@ -1171,7 +1117,6 @@ MIME\ type=MIME-type
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Denne funktion tillader, at flere filer kan åbnes eller importeres i en allerede kørende JabRef<BR>i stedet for at åbne programmet påny. For eksempel er dette praktisk, når du åbner filer i<BR>JabRef fra din web browser.<BR>Bemærk at dette vil forhindre dig i at køre mere end en instans af JabRef ad gangen.
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Kør henteværktøj, f.eks. "--fetch\=Medline\:cancer"
 
-The\ ACM\ Digital\ Library=ACM Digital Library
 Reset=Nulstil
 
 Use\ IEEE\ LaTeX\ abbreviations=Brug IEEE-LaTeX-forkortelser
@@ -1179,7 +1124,6 @@ Use\ IEEE\ LaTeX\ abbreviations=Brug IEEE-LaTeX-forkortelser
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Søg efter en matchende fil, når der åbnes et fil-link, der ikke er defineret
 Settings\ for\ %0=Indstillinger for %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Sorter følgende felter som numeriske felter
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Linje %0\: Fandt ødelagt BibTeX-nøgle.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Linje %0\: Fandt ødelagt BibTeX-nøgle (indeholder blanktegn).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Linje %0\: Fandt ødelagt BibTeX-nøgle (manglende komma).
@@ -1188,7 +1132,6 @@ Rename\ field=Omdøb felt
 Set/clear/append/rename\ fields=Udfyld/ryd/omdøb felter
 Rename\ field\ to=Omdøb felt til
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Flyt indhold af et felt til et felt med et andet navn
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Du kan kun omdøbe et felt ad gangen
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Kan ikke bruge port %0 til fjernstyring; et andet program bruger den måske. Prøv en anden port.
 
@@ -1204,9 +1147,6 @@ Formatter\ not\ found\:\ %0=Formatering ikke fundet\: %0
 Clear\ inputarea=Ryd inputområde
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Kunne ikke gemme, filen er låst af en anden kørende JabRef.
-File\ is\ locked\ by\ another\ JabRef\ instance.=Filen er låst af en anden kørende JabRef.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Vil du ignorere, at filen er låst?
-File\ locked=Fil låst
 Current\ tmp\ value=Aktuel tmp-værdi
 Metadata\ change=Metadata-ændring
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Der er ændringer i følgende metadata-elementer
@@ -1215,7 +1155,6 @@ Generate\ groups\ for\ author\ last\ names=Generer grupper for forfatteres efter
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Generer grupper ud fra nøgleord i et BibTeX-felt
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Håndhæv tilladte tegn i BibTeX-nøgler
 
-Save\ without\ backup?=Gem uden sikkerhedskopi?
 Unable\ to\ create\ backup=Kan ikke oprette sikkerhedskopi
 Move\ file\ to\ file\ directory=Flyt fil til filbibliotek
 Rename\ file\ to=Omdøb fil til
@@ -1254,14 +1193,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Vælg kilde for import af metada
 Create\ entry\ based\ on\ XMP-metadata=Opret post baseret på XMP-data
 Create\ blank\ entry\ linking\ the\ PDF=Opret tom post med link til PDF-filen
 Only\ attach\ PDF=Tilføj kun PDF
-Title=Titel
 Create\ new\ entry=Opret ny post
 Update\ existing\ entry=Opdater eksisterende post
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autofuldfør kun navne i formatet 'Fornavn Efternavn'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autofuldfør kun navne i formatet 'Efternavn, Fornavn'
 Autocomplete\ names\ in\ both\ formats=Autofuldfør navne i begge formater
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=Navnet 'comment' kan ikke bruges som navn på en posttype.
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Der skal indtastes et heltal i tekstfeltet til
 Send\ as\ email=Send som email
 References=Referencer
 Sending\ of\ emails=Afsendelse af emails
@@ -1397,7 +1334,6 @@ Unabbreviate\ journal\ names=Ekspander tidsskriftsnavn
 
 
 
-%0\ import\ canceled=%0-import afbrudt
 
 
 
@@ -1469,3 +1405,7 @@ Fork\ me\ on\ GitHub=Fork mig på GitHub
 Push\ entries\ to\ external\ application\ (%0)=Send poster til ekstern applikation (%0)
 Write\ XMP-metadata\ to\ PDFs=Skriv XMP-metadata til PDF-filer
 
+Override\ default\ font\ settings=Tilsidesæt standardskrifttyper
+
+
+
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index 22fddeaa5cb..f266b945a78 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -1,7 +1,7 @@
 #X-Generator: crowdin.com
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 enthält den regulären Ausdruck <b>%1</b>
 
-%0\ contains\ the\ term\ <b>%1</b>=%0 enthält den Ausdruck <b>%1</b>
+%0\ contains\ the\ term\ <b>%1</b>=%0 enthalten den Ausdruck <b>%1</b>
 
 %0\ doesn't\ contain\ the\ regular\ expression\ <b>%1</b>=%0 nicht den regulären Ausdruck <b>%1</b> enthält
 
@@ -15,8 +15,6 @@
 
 <field\ name>=<Feldname>
 
-<select>=<auswählen>
-
 <select\ word>=<Wort auswählen>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Zeitschriftentitel der ausgewählten Einträge abkürzen (ISO-Abkürzung)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Zeitschriftentitel der ausgewählten Einträge abkürzen (MEDLINE-Abkürzung)
@@ -34,12 +32,13 @@ Accept=Übernehmen
 
 Accept\ change=Änderung akzeptieren
 
-Action=Aktion
 
-What\ is\ Mr.\ DLib?=Was ist Mr. DLib?
+Action=Aktion
 
 Add=Hinzufügen
 
+Add\ new=Neu
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Füge eine (kompilierte) externe Importer Klasse aus einem Verzeichnis hinzu.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Das Verzeichnis muss nicht im Klassenpfad von JabRef enthalten sein.
 
@@ -50,20 +49,16 @@ Add\ a\ regular\ expression\ for\ the\ key\ pattern.=Füge einen Regulären Ausd
 
 Add\ selected\ entries\ to\ this\ group=Ausgewählte Einträge zu dieser Gruppe hinzufügen
 
-Add\ from\ folder=Aus Klassenpfad hinzufügen
+Add\ from\ folder=Aus Ordner hinzufügen
 
 Add\ from\ JAR=Aus Archiv-Datei hinzufügen
 
-Add\ new=Neu
-
 Add\ subgroup=Untergruppe hinzufügen
 
 Add\ to\ group=Zu Gruppe hinzufügen
 
 Added\ group\ "%0".=Gruppe "%0" hinzugefügt.
 
-Added\ new=Neu hinzugefügt
-
 Added\ string=String hinzugefügt
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Zusätzlich können Einträge, deren Feld <b>%0</b> nicht <b>%1</b> enthält, dieser Gruppe manuell hinzugefügt werden, indem Sie sie selektieren und dann entweder Drag&Drop oder das Kontextmenü benutzen. Dieser Vorgang fügt <b>%1</b> dem Feld <b>%0</b> jedes Eintrags hinzu. Einträge können manuell aus dieser Gruppe entfernt werden, indem Sie sie selektieren und dann das Kontextmenü benutzen. Dieser Vorgang entfernt <b>%1</b> aus dem Feld <b>%0</b> jedes Eintrags.
@@ -72,12 +67,8 @@ Advanced=Erweitert
 All\ entries=Alle Einträge
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Alle Einträge dieses Typs werden als 'ohne Typ' angesehen. Fortfahren?
 
-All\ fields=Alle Felder
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Formatiere BIB Datei immer neu beim Exportieren
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=Beim Parsen von '%0' ist eine SAX-Exception aufgetreten\:
-
 and=und
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=ein beliebiges Feld, auf das der reguläre Ausdruck <b>%0</b> passt,
@@ -89,7 +80,7 @@ Append\ contents\ from\ a\ BibTeX\ library\ into\ the\ currently\ viewed\ librar
 
 Append\ library=Bibliothek anhängen
 
-Append\ the\ selected\ text\ to\ BibTeX\ field=Ausgewählten Text an BibTeX-Key anhängen
+Append\ the\ selected\ text\ to\ BibTeX\ field=Ausgewählten Text an BibTeX-Feld anhängen
 Application=Anwendung
 
 Apply=Übernehmen
@@ -168,6 +159,7 @@ Clear\ fields=Felder löschen
 
 Close=Schließen
 
+
 Close\ dialog=Dialog schließen
 
 Close\ the\ current\ library=Aktuelle Bibliothek schließen
@@ -223,6 +215,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Das Programm 'vim' konnte nicht gestartet
 Could\ not\ save\ file.=Datei konnte nicht gespeichert werden.
 Character\ encoding\ '%0'\ is\ not\ supported.=Die Zeichenkodierung '%0' wird nicht unterstützt.
 
+
 crossreferenced\ entries\ included=Inklusive querverwiesenen Einträgen
 
 Current\ content=Aktueller Inhalt
@@ -258,8 +251,6 @@ Default\ grouping\ field=Standard Gruppierungs-Feld
 
 Default\ pattern=Standardmuster
 
-Default\ sort\ criteria=Standard-Sortierkriterium
-
 Delete=Löschen
 
 Delete\ custom\ format=Format des Eintragstyps löschen
@@ -280,8 +271,6 @@ Deleted=Gelöscht
 
 Permanently\ delete\ local\ file=Lösche lokale Datei
 
-Delimit\ fields\ with\ semicolon,\ ex.=Felder mit Semikolon abgrenzen, z.B.
-
 Descending=Absteigend
 
 Description=Beschreibung
@@ -336,7 +325,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Dynamisches Gr
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Dynamisches Gruppieren der Einträge anhand eines Stichworts in einem Feld
 
-Each\ line\ must\ be\ on\ the\ following\ form=Jede Zeile muss das folgende Format aufweisen
 
 Edit=Bearbeiten
 
@@ -383,12 +371,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Eintragstypen
 
 Error=Fehler
-Error\ exporting\ to\ clipboard=Fehler beim Exportieren in die Zwischenablage
 
 Error\ occurred\ when\ parsing\ entry=Fehler beim Analysieren des Eintrags
 
 Error\ opening\ file=Fehler beim Öffnen der Datei
 
+
 Error\ while\ writing=Fehler beim Schreiben
 
 '%0'\ exists.\ Overwrite\ file?='%0' existiert bereits. Überschreiben?
@@ -406,6 +394,7 @@ Export\ properties=Eigenschaften für Exportfilter
 
 Export\ to\ clipboard=In die Zwischenablage kopieren
 
+Export\ to\ text\ file.=In Text-Datei exportieren.
 
 Exporting=Exportiere
 Extension=Erweiterung
@@ -418,8 +407,6 @@ External\ programs=Externe Programme
 
 External\ viewer\ called=Externer Betrachter aufgerufen
 
-Fetch=Abrufen
-
 Field=Feld
 
 field=Feld
@@ -427,8 +414,6 @@ field=Feld
 Field\ name=Feldname
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Feldbezeichnungen dürfen keine Leerzeichen enthalten und keine der folgenden Zeichen
 
-Field\ to\ filter=Feld für Filter
-
 Field\ to\ group\ by=Sortierfeld
 
 File=Datei
@@ -443,13 +428,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Dateiverzeichnis ist nicht
 
 File\ exists=Datei ist vorhanden
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=Die Datei wurde extern aktualisiert. Was wollen Sie tun?
-
 File\ not\ found=Datei nicht gefunden
 File\ type=Dateityp
-
-File\ updated\ externally=Datei extern geändert
-
 filename=Dateiname
 
 Files\ opened=Dateien geöffnet
@@ -472,6 +452,7 @@ Float=Oben einsortieren
 
 for=für
 
+
 Format\ of\ author\ and\ editor\ names=Format der Autoren- und Hrsg.-Namen
 Format\ string=Formatier-Ausdruck
 
@@ -482,9 +463,9 @@ found\ in\ AUX\ file=gefundene Schlüssel in AUX Datei
 
 Full\ name=Kompletter Name
 
+
 General=Allgemein
 
-General\ fields=Allgemeine Felder
 
 Generate=Erzeugen
 
@@ -570,15 +551,13 @@ Importing=Importieren
 
 Importing\ in\ unknown\ format=Ein unbekanntes Format importieren
 
-Include\ abstracts=Abstracts berücksichtigen
-Include\ entries=Einträge einschließen
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Untergruppen berücksichtigen\: Einträge dieser Gruppe und ihrer Untergruppen anzeigen
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Unabhängige Gruppen\: Nur die Einträge dieser Gruppe anzeigen
 
 Work\ options=Bearbeitungsoptionen
 
+
 Insert=einfügen
 
 Insert\ rows=Zeilen einfügen
@@ -628,10 +607,6 @@ Leave\ file\ in\ its\ current\ directory=Datei im aktuellen Verzeichnis lassen
 
 Left=Links
 
-Limit\ to\ fields=Auf folgende Felder begrenzen
-
-Limit\ to\ selected\ entries=Auf ausgewählte Einträge begrenzen
-
 Link=Link
 Link\ local\ file=Link zu lokaler Datei
 Link\ to\ file\ %0=Link zur Datei %0
@@ -654,8 +629,6 @@ Mark\ new\ entries\ with\ owner\ name=Neue Einträge mit Namen des Besitzers ver
 
 Memory\ stick\ mode=Memory Stick-Modus
 
-Menu\ and\ label\ font\ size=Schriftgröße in Menüs
-
 Merged\ external\ changes=Externe Änderungen eingefügt
 Merge\ fields=Felder zusammenführen
 
@@ -681,6 +654,8 @@ Move\ up=Nach oben
 
 Moved\ group\ "%0".=Gruppe "%0" verschoben.
 
+
+
 Name=Name
 Name\ formatter=Namens-Formatierer
 
@@ -698,8 +673,6 @@ New\ content=Neuer Inhalt
 
 New\ library\ created.=Neue Bibliothek angelegt.
 
-New\ field\ value=Neuer Feldwert
-
 New\ group=Neue Gruppe
 
 New\ string=Neuer String
@@ -714,9 +687,6 @@ no\ library\ generated=keine Bibliothek erstellt und geschrieben
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Keine Einträge gefunden. Bitte vergewissern Sie sich, dass Sie den richtigen Importfilter benutzen.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Für den Suchausdruck '%0' wurden keine Einträge gefunden
-
 No\ entries\ imported.=Keine Einträge importiert.
 
 No\ files\ found.=Keine Dateien gefunden.
@@ -738,8 +708,6 @@ Nothing\ to\ redo=Wiederholen nicht möglich
 
 Nothing\ to\ undo=Rückgängig nicht möglich
 
-occurrences=Vorkommen
-
 OK=OK
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Einer oder mehrere Keys werden überschrieben. Fortsetzen?
@@ -779,13 +747,10 @@ Override=überschreiben
 
 Override\ default\ file\ directories=Standard-Verzeichnisse überschreiben
 
-Override\ default\ font\ settings=Standardschrifteinstellungen überschreiben
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=BibTeX-Key mit ausgewähltem Text überschreiben
 
 
 Overwrite=Überschreiben
-Overwrite\ existing\ field\ values=Bestehende Feldwerte überschreiben
 
 Overwrite\ keys=Keys überschreiben
 
@@ -821,6 +786,7 @@ Please\ enter\ the\ string's\ label=Geben Sie bitte den Namen des Strings ein.
 
 Please\ select\ an\ importer.=Bitte Importer auswählen.
 
+
 Possible\ duplicate\ entries=Mögliche doppelte Einträge
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Möglicherweise doppelter Eintrag. Klicken um Konflikt zu lösen.
@@ -856,8 +822,6 @@ Redo=Wiederholen
 
 Reference\ library=Referenz-Bibliothek
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=%0 Literaturangaben gefunden. Anzahl der abzurufenden Literaturangaben?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Obergruppe einbeziehen\: Einträge aus dieser Gruppe und ihrer übergeordneten Gruppe anzeigen
 
 regular\ expression=Regulärer Ausdruck
@@ -916,13 +880,9 @@ Replace\ (regular\ expression)=Ersetzen (regulärer Ausdruck)
 
 Replace\ string=String ersetzen
 
-Replace\ with=Ersetzen durch
-
 Replace\ Unicode\ ligatures=Unicode-Ligaturen ersetzen
 Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Unicode-Ligaturen durch ihre erweiterte Form ersetzen
 
-Replaced=Ersetzt\:
-
 Required\ fields=Benötigte Felder
 
 Reset\ all=Alle zurücksetzen
@@ -931,6 +891,8 @@ Resolve\ strings\ for\ all\ fields\ except=Strings auflösen für alle Felder au
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Strings nur für Standard-BibTeX-Felder auflösen
 
 resolved=davon aufgelöst
+
+
 Review=Überprüfung
 Review\ changes=Änderungen überprüfen
 Review\ Field\ Migration=Review-Feld Migration
@@ -949,10 +911,6 @@ Save\ library\ as...=Bibliothek speichern unter ...
 
 Save\ entries\ in\ their\ original\ order=Einträge in ursprünglicher Reihenfolge abspeichern
 
-Save\ failed=Fehler beim Speichern
-
-Save\ failed\ during\ backup\ creation=Während der Erstellung des Backups ist das Speichern fehlgeschlagen
-
 Saved\ library=Bibliothek gespeichert
 
 Saved\ selected\ to\ '%0'.=Auswahl gespeichert unter '%0'.
@@ -966,8 +924,6 @@ Search=Suchen
 
 Search\ expression=Suchausdruck
 
-Search\ for=Suchen nach
-
 Searching\ for\ duplicates...=Suche nach doppelten Einträgen...
 
 Searching\ for\ files=Suche nach Dateien
@@ -976,19 +932,16 @@ Secondary\ sort\ criterion=Zweites Sortierkriterium
 
 Select\ all=Alle auswählen
 
-Select\ encoding=Kodierung wählen
-
 Select\ entry\ type=Eintragstyp auswählen
-Select\ external\ application=Externe Anwendung auswählen
 
 Select\ file\ from\ ZIP-archive=Eintrag aus der ZIP-Archiv auswählen
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Wählen Sie die Verzweigungen aus, um die Änderungen zu sehen und anzunehmen oder zu verwerfen
-Selected\ entries=Ausgewählte Einträge
+
 Set\ field=Setze Feld
 Set\ fields=Felder setzen
 
-Set\ general\ fields=Allgemeine Felder festlegen
+
 Set\ main\ external\ file\ directory=Standard-Verzeichnis für externe Dateien bestimmen
 
 Settings=Einstellungen
@@ -1044,8 +997,6 @@ Status=Status
 
 Stop=Stopp
 
-Strings=Ersetzen
-
 Strings\ for\ library=Strings für die Bibliothek
 
 Sublibrary\ from\ AUX=Teilbibliothek aus AUX-Datei
@@ -1106,8 +1057,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Für diesen Vorgang muss mindestens ein Eintrag ausgewählt sein.
 
+
 Toggle\ entry\ preview=Eintragsvorschau ein-/ausblenden
 Toggle\ groups\ interface=Gruppenansicht ein-/ausblenden
+
+
+
 Try\ different\ encoding=Versuchen Sie es mit einer anderen Kodierung
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Abkürzung der Zeitschriftentitel der ausgewählten Einträge aufheben
@@ -1154,8 +1109,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=überprüfen
 View=Ansicht
 Vim\ server\ name=Vim Server-Name
 
-Waiting\ for\ ArXiv...=Warte auf ArXiv...
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Warnung zu ungeklärten Duplikaten ausgeben, wenn das Kontrollfenster geschlossen wird
 
 Warn\ before\ overwriting\ existing\ keys=Vor dem Überschreiben von existierenden Keys warnen
@@ -1187,7 +1140,6 @@ XMP-metadata=XMP-Metadaten
 XMP-metadata\ found\ in\ PDF\:\ %0=XMP-Metadaten gefunden im PDF\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Sie müssen JabRef neu starten, damit diese Änderungen in Kraft treten.
 You\ have\ changed\ the\ language\ setting.=Sie haben die Spracheinstellung geändert.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Sie haben eine ungültige Suche '%0' eingegeben.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Sie müssen JabRef neu starten, damit die Tastenkürzel funktionieren.
 
@@ -1196,27 +1148,21 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Ihre neuen Tastenkürzel wurden ge
 The\ following\ fetchers\ are\ available\:=Folgende Recherchetools stehen zur Verfügung\:
 Could\ not\ find\ fetcher\ '%0'=Recherchetool '%0' konnte nicht gefunden werden
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Abfrage '%0' wird mit dem Recherchetool '%1' durchgeführt.
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=Die Abfrage '%0' mit dem Recherchetool '%1' lieferte keine Ergebnisse.
 
 Move\ file=Datei verschoben
 Rename\ file=Datei umbenennen
 
+
 Move\ file\ failed=Fehler beim Verschieben der Datei
 Could\ not\ move\ file\ '%0'.=Datei '%0' konnte nicht verschoben werden.
 Could\ not\ find\ file\ '%0'.=Datei '%0' nicht gefunden.
 Number\ of\ entries\ successfully\ imported=Zahl der erfolgreich importierten Einträge
 Import\ canceled\ by\ user=Import durch Benutzer abgebrochen
-Progress\:\ %0\ of\ %1=Fortschritt\: %0 von %1
 Error\ while\ fetching\ from\ %0=Fehler beim Abrufen von %0
 
-Please\ enter\ a\ valid\ number=Bitte geben Sie eine gültige Zahl ein
 Show\ search\ results\ in\ a\ window=Suchergebnisse in einem Fenster anzeigen
 Show\ global\ search\ results\ in\ a\ window=Globale Suchergebnisse in einem Fenster anzeigen
 Search\ in\ all\ open\ libraries=Suche in allen offenen Bibliotheken
-Move\ file\ to\ file\ directory?=Datei in Dateiverzeichnis verschieben?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=Die Bibliothek ist geschützt. Speichern nicht möglich, bis externe Änderungen geprüft wurden.
-Protected\ library=Geschützte Bibliothek
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Die Bibliothek kann nicht gespeichert werden, bis externe Änderungen geprüft wurden.
 Library\ protection=Bibliotheksschutz
 Unable\ to\ save\ library=Speichern der Bibliothek nicht möglich
@@ -1228,19 +1174,17 @@ MIME\ type=MIME-Typ
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Diese Funktion öffnet neue oder importierte Dateien in einer bereits laufenden Instanz von JabRef<BR>und nicht in einem neuen Fenster. Das ist beispielsweise nützlich,<BR>wenn Sie JabRef von einem Webbrowser aus starten.<BR>Beachten Sie, dass damit nicht mehr als eine Instanz von JabRef gestartet werden kann.
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Recherche starten, z.B. "--fetch\=Medline\:cancer"
 
-The\ ACM\ Digital\ Library=ACM Digital Library
 Reset=Zurücksetzen
 
 Use\ IEEE\ LaTeX\ abbreviations=Benutze IEEE-LaTeX-Abkürzungen
-The\ Guide\ to\ Computing\ Literature=The Guide to Computing Literature
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Beim Öffnen des Dateilinks die passende Datei suchen, falls keine verlinkt ist
 Settings\ for\ %0=Einstellungen für %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Sortiere folgende Felder als numerische Felder
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Zeile %0\: Beschädigter BibTeX-Key gefunden.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Zeile %0\: Beschädigter BibTeX-Key gefunden (enthält Leerzeichen).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Zeile %0\: Beschädigter BibTeX-Key gefunden (Komma fehlt).
+No\ full\ text\ document\ found=Kein Volltext-Dokument gefunden
 Update\ to\ current\ column\ order=Aktuelle Spaltenanordnung verwenden
 Download\ from\ URL=Download von URL
 Rename\ field=Feld umbenennen
@@ -1249,7 +1193,6 @@ Append\ field=An Feld anfügen
 Append\ to\ fields=An Felder anfügen
 Rename\ field\ to=Feld umbenennen
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Inhalt eines Felds in ein Feld mit anderem Namen verschieben
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Sie können nur eine Datei auf einmal umbenennen
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Port %0 konnte nicht für externen Zugriff genutzt werden; er wird möglicherweise von einer anderen Anwendung benutzt. Versuchen Sie einen anderen Port.
 
@@ -1269,9 +1212,6 @@ Formatter\ not\ found\:\ %0=Formatierer nicht gefunden\: %0
 Clear\ inputarea=Eingabefeld löschen
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Speichern nicht möglich, die Datei wird von einer anderen JabRef-Instanz verwendet.
-File\ is\ locked\ by\ another\ JabRef\ instance.=Die Datei ist durch eine andere JabRef-Instanz gesperrt.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Wollen Sie die Datei trotz Sperre überschreiben?
-File\ locked=Datei gesperrt
 Current\ tmp\ value=Derzeitiger tmp-Wert
 Metadata\ change=Metadaten-Änderung
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=An den folgenden Metadaten wurden Änderungen vorgenommen
@@ -1280,7 +1220,6 @@ Generate\ groups\ for\ author\ last\ names=Erstelle Gruppen für Nachnamen der A
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Erstelle Gruppen aus den Stichwörtern eines BibTeX-Feldes
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Erzwinge erlaubte Zeichen in BibTeX-Keys
 
-Save\ without\ backup?=Ohne Backup Speichern?
 Unable\ to\ create\ backup=Erstellen des Backups fehlgeschlagen
 Move\ file\ to\ file\ directory=Datei ins Dateiverzeichnis verschieben
 Rename\ file\ to=Datei umbenennen in
@@ -1319,14 +1258,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Quelle zum Import von Metadaten
 Create\ entry\ based\ on\ XMP-metadata=Eintrag aus XMP-Daten erstellen
 Create\ blank\ entry\ linking\ the\ PDF=Leeren Eintrag erstellen mit Link zum PDF
 Only\ attach\ PDF=Nur PDF anhängen
-Title=Titel
 Create\ new\ entry=Neuen Eintrag erstellen
 Update\ existing\ entry=Bestehenden Eintrag aktualisieren
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Automatische Vervollständigung von Namen nur im Format 'Vorname Nachname'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Automatische Vervollständigung von Namen nur im Format 'Nachname, Vorname'
 Autocomplete\ names\ in\ both\ formats=Automatische Vervollständigung von Namen in beiden Formaten
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=Der Name 'comment' kann nicht als Name für einen Eintragstyp verwendet werden.
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Sie müssen einen Zahlwert eintragen im Textfeld für
 Send\ as\ email=Als E-Mail senden
 References=Literaturverweise
 Sending\ of\ emails=Senden der E-Mails
@@ -1448,7 +1385,6 @@ Opens\ the\ file\ browser.=Öffnet den Dateimanager.
 Scan\ directory=Ordner durchsuchen
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Sucht im ausgewählten Ordner nach nicht-verlinkten Dateien.
 Starts\ the\ import\ of\ BibTeX\ entries.=Startet den Import von BibTeX-Einträgen.
-Leave\ this\ dialog.=Verlasse diesen Dialog.
 Create\ directory\ based\ keywords=Erstelle Stichworte, die auf Ordnern basieren
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Erstellt Stichworte in erstellten Einträgen mit Ordner-Pfadnamen
 Select\ a\ directory\ where\ the\ search\ shall\ start.=Verzeichnis wählen, in dem die Suche starten soll.
@@ -1456,11 +1392,9 @@ Select\ file\ type\:=Dateityp wählen\:
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=Diese Dateien sind in der aktiven Bibliothek nicht verlinkt.
 Entry\ type\ to\ be\ created\:=Eintragstyp, der erstellt werden soll\:
 Searching\ file\ system...=Dateisystem wird durchsucht...
-Importing\ into\ Library...=In die Bibliothek importieren...
 Select\ directory=Verzeichnis wählen
 Select\ files=Dateien wählen
 BibTeX\ entry\ creation=Erstellung eines BibTeX-Eintrags
-<No\ selection>=<Keine Auswahl>
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=Verbindung zu FreeCite konnte nicht hergestellt werden.
 Parse\ with\ FreeCite=Mit FreeCite parsen
 How\ would\ you\ like\ to\ link\ to\ '%0'?=Wie möchten Sie zu '%0' verlinken?
@@ -1502,7 +1436,6 @@ Toggle\ print\ status=Druckstatus umschalten
 Update\ keywords=Stichworte aktualisieren
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Werte spezieller Felder separat in die BibTeX-Datei schreiben
 You\ have\ changed\ settings\ for\ special\ fields.=Sie haben die Einstellungen für spezielle Felder geändert.
-%0\ entries\ found.\ To\ reduce\ server\ load,\ only\ %1\ will\ be\ downloaded.=%0 Einträge gefunden. Um die Serverlast zu reduzieren, werden nur %1 heruntergeladen.
 A\ string\ with\ that\ label\ already\ exists=Ein String mit diesem Label ist bereits vorhanden
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Verbindung zu OpenOffice/LibreOffice verloren. Bitte stellen Sie sicher, dass OpenOffice/LibreOffice läuft, und versuchen Sie, erneut zu verbinden.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef sendet pro Eintrag mindestens eine Anfrage an einen Herausgeber.
@@ -1523,8 +1456,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Ihre Stildatei legt das Abschnittsformat '%0' fest, das in Ihrem aktuellen OpenOffice/LibreOffice-Dokument nicht definiert ist.
 
 Searching...=Suche läuft...
-You\ have\ selected\ more\ than\ %0\ entries\ for\ download.\ Some\ web\ sites\ might\ block\ you\ if\ you\ make\ too\ many\ rapid\ downloads.\ Do\ you\ want\ to\ continue?=Sie haben mehr als %0 Einträge zum Download ausgewählt. Einige Webseiten könnten zu viele Downloads blockieren. Möchten Sie fortfahren?
-Confirm\ selection=Auswahl bestätigen
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Nach der Suche {} zu festgesetzten Titelworten hinzufügen, um Groß-/Kleinschreibung beizubehalten
 Import\ conversions=Konvertierungen importieren
 Please\ enter\ a\ search\ string=Bitte geben Sie eine Suchphrase ein
@@ -1535,7 +1466,6 @@ Canceled\ merging\ entries=Zusammenführen der Einträge abgebrochen
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Einheiten formatieren\: nicht-umbrechende Trennzeichen hinzufügen und bei der Suche Groß-/Kleinschreibung beibehalten
 Merge\ entries=Einträge zusammenführen
 Merged\ entries=Die Einträge wurden zusammengeführt
-Merged\ entry=Eintrag zusammengeführt
 None=Kein(e/r)
 Parse=Parsen
 Result=Ergebnis
@@ -1619,9 +1549,7 @@ Add\ new\ file\ type=Füge neuen Dateityp hinzu
 
 Left\ entry=Linker Eintrag
 Right\ entry=Rechter Eintrag
-Use=Benutze
 Original\ entry=Originaleintrag
-Replace\ original\ entry=Ersetze Originaleintrag
 No\ information\ added=Keine Informationen hinzugefügt
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Es muss mindestens ein Eintrag ausgewählt sein um Stichworte verwalten zu können.
 OpenDocument\ text=OpenDocument-Text
@@ -1640,7 +1568,6 @@ Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Bitte die Datei manuell
 Could\ not\ connect\ to\ %0=Verbindung zu %0 fehlgeschlagen
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Warnung\: %0 von %1 Einträgen haben keinen Titel.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Warnung\: %0 von %1 Einträgen haben keinen BibTeX-Key.
-occurrence=Vorkommen
 Added\ new\ '%0'\ entry.=Neuer '%0' Eintrag hinzugefügt.
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Mehrere Einträge ausgewählt. Wollen Sie den Typ aller Einträge zu '%0' ändern?
 Changed\ type\ to\ '%0'\ for=Typ geändert zu '%0' für
@@ -1660,8 +1587,6 @@ Print\ entry\ preview=Eintragsvorschau drucken
 Copy\ title=Kopiere Titel
 Copy\ \\cite{BibTeX\ key}=\\cite{BibTeX key} kopieren
 Copy\ BibTeX\ key\ and\ title=BibTeX-Key und Titel kopieren
-File\ rename\ failed\ for\ %0\ entries.=Dateiumbennung schlug ür %0 Einträge fehl.
-Merged\ BibTeX\ source\ code=BibTeX-Quelltext zusammengeführt
 Invalid\ DOI\:\ '%0'.=Ungültiger DOI\: '%0'.
 should\ start\ with\ a\ name=sollte mit einem Name beginnen
 should\ end\ with\ a\ name=sollte mit einem Name enden
@@ -1715,7 +1640,7 @@ Preamble\ editor,\ store\ changes=Präambeleditor, speichere Änderungen
 Push\ to\ application=In Applikation einfügen
 Refresh\ OpenOffice/LibreOffice=Aktualisiere OpenOffice/LibreOffice
 Resolve\ duplicate\ BibTeX\ keys=Doppelte BibTeX-Keys beseitigen
-Save\ all=A&lle speichern
+Save\ all=Alle speichern
 String\ dialog,\ add\ string=Stringdialog, String hinzufügen
 String\ dialog,\ remove\ string=Stringdialog, String entfernen
 Synchronize\ files=Sychronisiere Dateien
@@ -1754,10 +1679,8 @@ Error\ Occurred=Fehler aufgetreten
 Journal\ file\ %s\ already\ added=Zeitschriftentiteldatei %s ist bereits vorhanden
 Name\ cannot\ be\ empty=Name darf nicht leer sein
 
-Adding\ fetched\ entries=Füge abgerufene Einträge hinzu
 Display\ keywords\ appearing\ in\ ALL\ entries=Zeige Schlüsselwörter die in ALLEN Einträgen vorkommen
 Display\ keywords\ appearing\ in\ ANY\ entry=Zeige Schlüsselwörter die in mind. EINEM Eintrag vorkommen
-Fetching\ entries\ from\ Inspire=Rufe Einträge von Inspire ab
 None\ of\ the\ selected\ entries\ have\ titles.=Keiner der selektierten Einträge besitzt einen Titel.
 None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=Keiner der selektieren Einträge besitzt BibTeX-Keys.
 Unabbreviate\ journal\ names=&Abkürzung der Zeitschriftentitel aufheben
@@ -1772,14 +1695,11 @@ Ill-formed\ entrytype\ comment\ in\ BIB\ file=Fehlerhafter Eintragstypkommentar
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=Verknüpfte Dateien in das Standardverzeichnis %0 verschieben
 
-Clipboard=Zwischenablage
-Could\ not\ paste\ entry\ as\ text\:=Konnte Einträge nicht als Text parsen\:
 Do\ you\ still\ want\ to\ continue?=Wollen Sie wirklich fortfahren?
 This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=Diese Aktion wird jeweils das/die folgenden Feld(er) in mindestens einem Eintrag ändern\:
 This\ could\ cause\ undesired\ changes\ to\ your\ entries.=Dies könnte ungewollte Änderungen an Ihren Einträgen hervorrufen.
 Run\ field\ formatter\:=Führe Feldformatierer aus\:
 Table\ font\ size\ is\ %0=Tabellenschriftgröße ist %0%
-%0\ import\ canceled=%0-Import abgebrochen
 Internal\ style=Interner Stil
 Add\ style\ file=Füge Stildatei hinzu
 Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=Wollen Sie wirklich den Stil entfernen?
@@ -1797,6 +1717,7 @@ Changes\ all\ letters\ to\ upper\ case.=Ändere alle Buchstaben in Großschreibu
 Changes\ the\ first\ letter\ of\ all\ words\ to\ capital\ case\ and\ the\ remaining\ letters\ to\ lower\ case.=Schreibt den ersten Buchstaben eines jeden Wortes groß und schreibt alle anderen Wörter klein.
 Cleans\ up\ LaTeX\ code.=Räumt LaTeX-Code auf.
 Converts\ HTML\ code\ to\ LaTeX\ code.=Konvertiere HTML-Code in LaTeX-Code.
+HTML\ to\ Unicode=HTML zu Unicode
 Converts\ HTML\ code\ to\ Unicode.=Konvertiere HTML-Code in Unicode.
 Converts\ LaTeX\ encoding\ to\ Unicode\ characters.=Konvertiere LaTeX Kodierung in Unicode Zeichen.
 Converts\ Unicode\ characters\ to\ LaTeX\ encoding.=Konvertiere Unicode Zeichen in LaTeX Kodierung.
@@ -1808,6 +1729,7 @@ LaTeX\ to\ Unicode=LaTeX zu Unicode
 Lower\ case=Kleinschreibung
 Minify\ list\ of\ person\ names=Reduziere Liste der Personen
 Normalize\ date=Normalisiere Datum
+Normalize\ en\ dashes=Gedankenstriche normalisieren
 Normalize\ month=Normalisiere Monat
 Normalize\ month\ to\ BibTeX\ standard\ abbreviation.=Normalisiere Datum in BibTeX Standardabkürzung.
 Normalize\ names\ of\ persons=Normalisiere Personennamen
@@ -1815,8 +1737,11 @@ Normalize\ page\ numbers=Normalisiere Seitennummern
 Normalize\ pages\ to\ BibTeX\ standard.=Normalisiere Seiten in Bibtex-Standard
 Normalizes\ lists\ of\ persons\ to\ the\ BibTeX\ standard.=Normalisiere Liste der Personen in BibTeX-Standard
 Normalizes\ the\ date\ to\ ISO\ date\ format.=Normalisiere Datum ins ISO-Datumsformat
+Normalizes\ the\ en\ dashes.=Die Gedankenstriche normalisieren.
 Ordinals\ to\ LaTeX\ superscript=Ordinalzahlen in LaTeX Hochstellungen
 Protect\ terms=Schütze Terme
+Add\ enclosing\ braces=Füge einschließende Klammern hinzu
+Add\ braces\ encapsulating\ the\ complete\ field\ content.=Füge Klammern, die den kompletten Feldinhalt einschließen, hinzu.
 Remove\ enclosing\ braces=Entferne einschließende Klammern
 Removes\ braces\ encapsulating\ the\ complete\ field\ content.=Entferne Klammern, die den kompletten Feldinhalt einschließen.
 Sentence\ case=Groß-/Kleinschreibung von Sätzen
@@ -1997,7 +1922,6 @@ Your\ issue\ was\ reported\ in\ your\ browser.=Ihr Problem wurde im Browser geme
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=Die Log und Ausnahmefehler-Informationen wurden in die Zwischenablage kopiert.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Bitte fügen Sie die Informationen (mit STRG+V) in die Problembeschreibung ein.
 
-Connection=Verbindung
 Connecting...=Verbinde...
 Host=Host
 Port=Port
@@ -2024,9 +1948,7 @@ Shared\ version\:\ %0=Geteilte genutzte Version\: %0
 Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Bitte führen Sie den gemeinsam genutzten Eintrag mit Ihrem zusammen und klicken Sie auf "Einträge zuammenführen", um das Problem zu beheben.
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Durch einen Abbruch dieser Operation werden die Änderungen nicht synchronisiert. Trotzdem abbrechen?
 Shared\ entry\ is\ no\ longer\ present=Geteilter Eintrag ist nicht mehr vorhanden
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=Der Eintrag, welchen Sie zur Zeit bearbeiten, ist auf der geteilten Datenbank nicht mehr vorhanden.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Unter Benutzung der "Rückgängig"-Funktion kann der Eintrag wiederhergestellt werden.
-Remember\ password?=Passwort merken?
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Eine Datenbankverbindung mit den eingegebenen Verbindungsinformationen besteht bereits.
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Kann keine Einträge ohne BibTeX-Key zitieren. Keys jetzt generieren?
@@ -2042,7 +1964,6 @@ You\ must\ enter\ at\ least\ one\ field\ name=Sie müssen mindestens einen Feldn
 Non-ASCII\ encoded\ character\ found=Nicht ASCII-kodiertes Zeichen gefunden
 Toggle\ web\ search\ interface=Websuche ein-/ausschalten
 %0\ files\ found=%0 Dateien gefunden
-%0\ of\ %1=%0 von %1
 One\ file\ found=Eine Datei gefunden
 The\ import\ finished\ with\ warnings\:=Der Import wurde mit Warnungen abgeschlossen\:
 There\ was\ one\ file\ that\ could\ not\ be\ imported.=Eine Datei konnte nicht importiert werden.
@@ -2051,7 +1972,6 @@ There\ were\ %0\ files\ which\ could\ not\ be\ imported.=%0 Dateien konnten nich
 Migration\ help\ information=Hilfe zur Migration
 Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Die gewählte Datenbank nutzt eine veraltete, nicht mehr unterstützte Struktur.
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Dennoch wurde eine neue Datenbank neben der alten Datenbank erzeugt.
-Click\ here\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=Klicken um Informationen zur Migration von vor-3.6-Datenbanken zu erhalten.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Öffnet eine Seite auf der die aktuellste Entwicklungsversion heruntergeladen werden kann
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=Beschreibt was in den verschiedenen JabRef-Versionen geändert wurde
 Referenced\ BibTeX\ key\ does\ not\ exist=Referenzierter BibTeX-Key existiert nicht
@@ -2079,7 +1999,6 @@ Existing\ file=Existierende Datei
 
 ID=Id
 ID\ type=ID-Typ
-ID-based\ entry\ generator=ID-basierter Eintragsgenerator
 Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=Der %0-Fetcher hat keinen Eintrag für die ID '%1' gefunden.
 
 Select\ first\ entry=Ersten Eintrag auswählen
@@ -2130,8 +2049,6 @@ journal\ not\ found\ in\ abbreviation\ list=Journal nicht in Abkürzungsliste ge
 Unhandled\ exception\ occurred.=Unbehandelte Ausnahme aufgetreten.
 
 strings\ included=Strings eingeschlossen
-Size\ of\ large\ icons=Größe für große Icons
-Size\ of\ small\ icons=Größe für kleine Icon
 Default\ table\ font\ size=Standard Tabellenschriftgröße
 Escape\ underscores=Unterstriche maskieren
 Color=Farbe
@@ -2199,13 +2116,47 @@ Any\ file=Beliebige Datei
 
 No\ linked\ files\ found\ for\ export.=Keine verknüpften Dateien für den Export gefunden.
 
+Full\ text\ document\ download\ failed\ for\ entry\ %0=Download des Volltextdokuments für Eintrag %0 fehlgeschlagen
+No\ full\ text\ document\ found\ for\ entry\ %0.=Kein Volltext-Dokument für Eintrag %0 gefunden.
 
+Delete\ Entry=Eintrag löschen
+Import\ &\ Export=Import & Export
+Look\ up\ document\ identifier=Dokument-ID nachschlagen
+Next\ library=Nächste Bibliothek
+Previous\ library=Vorherige Bibliothek
 add\ group=Gruppe hinzufügen
-
-
-
-
-
+Entry\ is\ contained\ in\ the\ following\ groups\:=Eintrag ist in folgenden Gruppen enthalten\:
+Delete\ entries=Einträge löschen
+Keep\ entries=Einträge behalten
+Keep\ entry=Eintrag behalten
+Ignore\ backup=Sicherung ignorieren
+Restore\ from\ backup=Aus Sicherung wiederherstellen
+
+Continue=Fortsetzen
+Generate\ key=Schlüssel erzeugen
+Overwrite\ file=Datei überschreiben
+Shared\ database\ connection=Gemeinsame Datenbankverbindung
+
+Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\ correct\ server\ name.=Verbindung zum Vim-Server fehlgeschlagen. Vergewissern Sie sich, dass Vim mit korrektem Servernamen läuft.
+Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Keine Verbindung zu einem laufenden gnuserv-Prozess möglich. Vergewissern Sie sich, dass Emacs oder XEmacs läuft und dass der Server gestartet wurde (mit dem Befehl 'server-start'/'gnuserv-start').
+Error\ pushing\ entries=Fehler beim Einfügen der Einträge
+
+Undefined\ character\ format=Nicht definiertes Zeichenformat
+Undefined\ paragraph\ format=Nicht definiertes Paragraphenformat
+
+Edit\ Preamble=Präambel bearbeiten
+Markings=Markierungen
+Use\ selected\ instance=Ausgewählte Instanz verwenden
+
+Hide\ panel=Panel ausblenden
+Move\ panel\ up=Panel nach oben bewegen
+Move\ panel\ down=Panel nach unten verschieben
+Linked\ files=Verknüpfte Dateien
+Group\ view\ mode\ set\ to\ intersection=Gruppen-Anzeigemodus auf Durchschnitt eingestellt
+Group\ view\ mode\ set\ to\ union=Gruppen-Anzeigemodus auf Vereinigung eingestellt
+Open\ %0\ URL\ (%1)=URL %0 öffnen (%1)
+Open\ URL\ (%0)=URL öffnen (%0)
+Open\ file\ %0=Datei %0 öffnen
 Jump\ to\ entry=Springe zu Eintrag
 The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\ does\ not\ work\ as\ expected.=Der Gruppename enthält das Trennzeichen "%0" und wird deswegen möglicherweise nicht wie erwartet funktionieren.
 Abbreviate\ journal\ names\ (ISO)=Zeitschriftentitel abkürzen (&ISO)
@@ -2216,13 +2167,25 @@ Copy\ DOI\ url=DOI-URL kopieren
 Copy\ citation=Kopiere Zitation
 Development\ version=Entwicklungsversion
 Export\ selected\ entries=Ausgewählte Einträge exportieren
+Export\ selected\ entries\ to\ clipboard=Ausgewählte Einträge in die Zwischenablage kopieren
+Find\ duplicates=Duplikate finden
 Fork\ me\ on\ GitHub=Forke mich auf GitHub
 JabRef\ resources=Mehr zu JabRef
+Manage\ journal\ abbreviations=Abkürzung der Zeitschriftentitel verwalten
 Manage\ protected\ terms=Geschützte Terme verwalten
 New\ %0\ library=Neue %0 Bibliothek
+New\ entry\ from\ plain\ text=Neuer Eintrag aus Klartext
+New\ sublibrary\ based\ on\ AUX\ file=Neue Unterbibliothek basierend auf AUX Datei
 Push\ entries\ to\ external\ application\ (%0)=&Einträge in externe Anwendung einfügen (%0)
+Quit=Beenden
+Recent\ libraries=Zuletzt geöffnete Bibliotheken
+Set\ up\ general\ fields=Allgemeine Felder festlegen
 View\ change\ log=Changelog öffnen
 View\ event\ log=Ereignisprotokoll anzeigen
 Website=Webseite
 Write\ XMP-metadata\ to\ PDFs=&XMP-Metadaten in PDFs schreiben
 
+Override\ default\ font\ settings=Standardschrifteinstellungen überschreiben
+
+
+
diff --git a/src/main/resources/l10n/JabRef_el.properties b/src/main/resources/l10n/JabRef_el.properties
index 7ee7f396782..6e51a88ed2f 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -15,11 +15,9 @@
 
 <field\ name>=<όνομα πεδίου>
 
-<select>=<επιλογή>
-
 <select\ word>=<επιλογή λέξης>
-Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Συμπτύξτε τα ονόματα περιοδικών για τις επιλεγμένες καταχωρήσεις (ISO σύντμηση)
-Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Συμπτύξτε τα ονόματα περιοδικών για τις επιλεγμένες καταχωρήσεις (MEDLINE σύντμηση)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Συμπτύξτε τα ονόματα περιοδικών για τις επιλεγμένες καταχωρήσεις (συντομογραφία ISO)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Συμπτύξτε τα ονόματα περιοδικών για τις επιλεγμένες καταχωρήσεις (συντομογραφία MEDLINE)
 
 Abbreviate\ names=Ονόματα συντομογραφιών
 Abbreviated\ %0\ journal\ names.=Ονόματα συντομογραφιών %0 περιοδικών.
@@ -34,48 +32,42 @@ Accept=Αποδοχή
 
 Accept\ change=Αποδοχή αλλαγής
 
-Action=Ενέργεια
 
-What\ is\ Mr.\ DLib?=Τι είναι ο κ. DLib;
+Action=Ενέργεια
 
 Add=Προσθήκη
 
+Add\ new=Προσθήκη νέου
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Προσθέστε μια compiled, custom κλάση importer από ένα class path.
-The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Το μονοπάτι δεν χρειάζεται να είναι στο classpath του JabRef.
+The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Η διαδρομή δεν χρειάζεται να βρίσκεται στη διαδρομή κλάσης του JabRef.
 
-Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ ZIP-archive.=Προσθέστε μια compiled, custom κλάση importer από ένα ZIP αρχείο.
-The\ ZIP-archive\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Το αρχείο ZIP-δεν χρειάζεται να είναι στο classpath του JabRef.
+Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ ZIP-archive.=Προσθήκη μιας (compiled) προσαρμοσμένης κλάσης εισαγωγέα από ένα αρχείο ZIP.
+The\ ZIP-archive\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Το αρχείο ZIP δεν χρειάζεται να βρίσκεται στη διαδρομή κλάσης του JabRef.
 
 Add\ a\ regular\ expression\ for\ the\ key\ pattern.=Προσθέσετε μια κανονική έκφραση (regular expression) για το βασικό μοτίβο (key pattern).
 
-Add\ selected\ entries\ to\ this\ group=Προσθήκη επιλεγμένων καταχωρήσεων σε αυτήν την ομάδα
+Add\ selected\ entries\ to\ this\ group=Προσθήκη των επιλεγμένων καταχωρήσεων σε αυτήν την ομάδα
 
 Add\ from\ folder=Προσθήκη από φάκελο
 
 Add\ from\ JAR=Προσθήκη από JAR
 
-Add\ new=Προσθήκη νέου
-
 Add\ subgroup=Προσθήκη υποομάδας
 
 Add\ to\ group=Προσθήκη στην ομάδα
 
 Added\ group\ "%0".=Προστέθηκε στην ομάδα "%0".
 
-Added\ new=Προστέθηκε νέο
-
 Added\ string=Προστέθηκε string
 
+Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Επιπρόσθετα, καταχωρήσεις των οποίων το πεδίο <b>%0</b> δεν περιέχει <b>%1</b> μπορούν να ανατεθούν χειροκίνητα σε αυτήν την ομάδα, είτε μέσω μεταφοράς και απόθεσης, είτε από το μενού. Η διαδικασία αυτή προσθέτει τον όρο <b>%1</b> σε κάθε πεδίο <b>%0</b> της καταχώρησης. Οι καταχωρήσεις μπορούν να αφαιρεθούν χειροκίνητα από αυτήν την ομάδα επιλέγοντάς τες και χρησιμοποιώντας το μενού. Η διαδικασία αυτή αφαιρεί τον όρο <b>%1</b> από το πεδίο <b>%0</b> της κάθε εγγραφής.
 
 Advanced=Για προχωρημένους
 All\ entries=Όλες entries
-All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Όλες οι καταχωρήσεις αυτού του τύπου θα δηλωθούν χωρίς τύπο. Συνέχεια;
-
-All\ fields=Όλα τα πεδία
+All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Όλες οι καταχωρήσεις αυτού του τύπου θα δηλωθούν ως 'χωρίς τύπο'. Συνέχεια;
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Πάντα να διαμορφώνεται το BIB αρχείο κατά την αποθήκευση και εξαγωγή
-
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=Μια εξαίρεση SAX παρουσιάστηκε κατά την ανάλυση των «%0»\:
+Always\ reformat\ BIB\ file\ on\ save\ and\ export=Πάντα να διαμορφώνεται εκ νέου το BIB αρχείο κατά την αποθήκευση και εξαγωγή
 
 and=και
 
@@ -83,81 +75,81 @@ any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=οποιοδήπ
 
 Appearance=Εμφάνιση
 
-Append=Προσθήκη
-Append\ contents\ from\ a\ BibTeX\ library\ into\ the\ currently\ viewed\ library=Προσθέστε το περιεχόμενο από μια βιβλιοθήκη BibTeX στη βιβλιοθήκη που προβάλλεται
+Append=Προσάρτηση
+Append\ contents\ from\ a\ BibTeX\ library\ into\ the\ currently\ viewed\ library=Προσάρτηση των περιεχομένων από μια βιβλιοθήκη BibTeX στην τρέχουσα βιβλιοθήκη
 
-Append\ library=Προσθήκη βιβλιοθήκης
+Append\ library=Προσάρτηση βιβλιοθήκης
 
-Append\ the\ selected\ text\ to\ BibTeX\ field=Προσθήκη του επιλεγμένου κειμένου σε πεδίο BibTeX
+Append\ the\ selected\ text\ to\ BibTeX\ field=Προσάρτηση του επιλεγμένου κειμένου στο πεδίο BibTeX
 Application=Εφαρμογή
 
-Apply=Εφαρμογή
+Apply=Εφαρμόστε
 
-Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Οι παράμετροι περάστηκαν στην τρέχουσα εκτέλεση JabRef. Γίνεται τερματισμός.
+Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Οι παράμετροι περάστηκαν στο τρέχον παράθυρο JabRef. Πραγματοποιείται τερματισμός.
 
-Assign\ the\ original\ group's\ entries\ to\ this\ group?=Αντιστοίχιση των αρχικών καταχωρήσεων σε αυτή την ομάδα;
+Assign\ the\ original\ group's\ entries\ to\ this\ group?=Ανάθεση των καταχωρήσεων της πρωταρχικής ομάδας σε αυτή την ομάδα;
 
-Assigned\ %0\ entries\ to\ group\ "%1".=Αντιχτοιχήθηκαν %0 καταχωρήσεις στην ομάδα "%1".
+Assigned\ %0\ entries\ to\ group\ "%1".=Ανατέθηκαν %0 καταχωρήσεις στην ομάδα "%1".
 
-Assigned\ 1\ entry\ to\ group\ "%0".=Αντιχτοιχήθηκε 1 καταχώρηση στην ομάδα "%0".
+Assigned\ 1\ entry\ to\ group\ "%0".=Ανατέθηκε 1 καταχώρηση στην ομάδα "%0".
 
-Attach\ URL=Επισυνάψετε URL
+Attach\ URL=Επισύναψη διεύθυνσης URL
 
-Autogenerate\ BibTeX\ keys=Αυτόματη παραγωγή BibTeX
+Autogenerate\ BibTeX\ keys=Αυτόματη δημιουργία κλειδιών BibTeX
 
-Autolink\ files\ with\ names\ starting\ with\ the\ BibTeX\ key=Αυτόματος σύνδεσμος αρχείων με ονόματα που ξεκινούν με το κλειδί BibTeX
+Autolink\ files\ with\ names\ starting\ with\ the\ BibTeX\ key=Αυτόματη σύνδεση αρχείων με ονόματα που ξεκινούν με το κλειδί BibTeX
 
-Autolink\ only\ files\ that\ match\ the\ BibTeX\ key=Αυτόματος σύνδεσμος μόνο των αρχείων που ταιριάζουν με το κλειδί BibTeX
+Autolink\ only\ files\ that\ match\ the\ BibTeX\ key=Αυτόματη σύνδεση μόνο των αρχείων που ταιριάζουν με το κλειδί BibTeX
 
 Automatically\ create\ groups=Αυτόματη δημιουργία ομάδων
 
-Automatically\ remove\ exact\ duplicates=Αφαιρέστε αυτόματα ακριβή αντίγραφα
+Automatically\ remove\ exact\ duplicates=Αυτόματη αφαίρεση ακριβών αντιγράφων
 
-AUX\ file\ import=AUX εισαγωγή αρχείου
+AUX\ file\ import=Εισαγωγή αρχείου AUX
 
-Available\ export\ formats=Διαθέσιμες μορφές (format) εξαγωγής
+Available\ export\ formats=Διαθέσιμες μορφές εξαγωγής
 
 Available\ BibTeX\ fields=Διαθέσιμα πεδία BibTeX
 
-Available\ import\ formats=Διαθέσιμες μορφές (format) εισαγωγής
+Available\ import\ formats=Διαθέσιμες μορφές εισαγωγής
 
-Backup\ old\ file\ when\ saving=Δημιουργία αντιγράφων ασφαλείας παλιού αρχείου κατά την αποθήκευση
+Backup\ old\ file\ when\ saving=Δημιουργία αντιγράφων ασφαλείας του προγενέστερου αρχείου κατά την αποθήκευση
 
-%0\ source=%0 προέλευση
+%0\ source=Πηγή %0
 
 Browse=Περιήγηση
 
 by=από
-The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=Τα διφορούμενα πεδία από αυτές τις καταχωρήσεις θα συγχωνευθούν στο πεδίο 'Σχόλιο'.
+The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=Τα αντικρουόμενα πεδία αυτών των καταχωρήσεων θα συγχωνευθούν στο πεδίο 'Σχόλιο'.
 
 Cancel=Ακύρωση
 
-Cannot\ add\ entries\ to\ group\ without\ generating\ keys.\ Generate\ keys\ now?=Δεν είναι δυνατό να προσθέσετε καταχωρήσεις σε ομάδα χωρίς τη δημιουργία κλειδιών. Δημιουργία κλειδιών τώρα;
+Cannot\ add\ entries\ to\ group\ without\ generating\ keys.\ Generate\ keys\ now?=Η προσθήκη καταχωρήσεων σε ομάδα χωρίς τη δημιουργία κλειδιών δεν είναι δυνατή. Θέλετε να δημιουργήσετε κλειδιά τώρα;
 
-Cannot\ merge\ this\ change=Δεν είναι δυνατό να συγχωνευτεί αυτή η αλλαγή
+Cannot\ merge\ this\ change=Η συγχώνευση αυτής της αλλαγής δεν είναι δυνατή
 
-case\ insensitive=Χωρίς διάκριση πεζών - κεφαλαίων γραμμάτων 
+case\ insensitive=χωρίς διάκριση πεζών - κεφαλαίων
 
-case\ sensitive=διαφοροποίηση πεζών-κεφαλαίων
+case\ sensitive=διάκριση πεζών - κεφαλαίων
 
-Case\ sensitive=Διαφοροποίηση πεζών-κεφαλαίων
+Case\ sensitive=Διάκριση πεζών - κεφαλαίων
 
-change\ assignment\ of\ entries=αλλαγή εκχώρησης των καταχωρήσεων
+change\ assignment\ of\ entries=αλλαγή ανάθεσης των καταχωρήσεων
 
-Change\ case=Αλλαγή πεζών-κεφαλαίων
+Change\ case=Αλλαγή πεζών - κεφαλαίων
 
-Change\ entry\ type=Αλλάξτε τύπου εγγραφής
+Change\ entry\ type=Αλλαγή τύπου εγγραφής
 
 
-Change\ of\ Grouping\ Method=Αλλαγή μεθόδου ομαδοποίησης
+Change\ of\ Grouping\ Method=Αλλαγή Μεθόδου Ομαδοποίησης
 
 change\ preamble=αλλαγή εισαγωγής
 
-Change\ table\ column\ and\ General\ fields\ settings\ to\ use\ the\ new\ feature=Αλλαγή στήλης πίνακα και Γενικά πεδία ρυθμίσεων για χρήση της νέας λειτουργίας
+Change\ table\ column\ and\ General\ fields\ settings\ to\ use\ the\ new\ feature=Αλλαγή στήλης πίνακα και ρυθμίσεων Γενικών πεδίων για χρήση της νέας λειτουργίας
 
 Changed\ language\ settings=Αλλαγή ρυθμίσεων γλώσσας
 
-Changed\ preamble=Η αλλαγή εισαγωγής ολοκληρώθηκε
+Changed\ preamble=Η εισαγωγή άλλαξε
 
 Cite\ command=Εντολή αναφοράς
 
@@ -167,6 +159,7 @@ Clear\ fields=Καθαρισμός πεδίων
 
 Close=Κλείσιμο
 
+
 Close\ dialog=Κλείσμο διαλόγου
 
 Close\ the\ current\ library=Κλείσιμο της τρέχουσας βιβλιοθήκης
@@ -178,6 +171,7 @@ Closed\ library=Κλειστή βιβλιοθήκη
 Column\ width=Μήκος στήλης
 
 Command\ line\ id=id γραμμής εντολών
+Comments=Σχόλια
 
 Contained\ in=Περιέχεται σε
 
@@ -185,28 +179,56 @@ Content=Περιεχόμενο
 
 Copied=Αντιγράφηκε
 
+Copied\ title=Ο τίτλος αντιγράφτηκε
 
+Copied\ key=Το κλειδί αντιγράφτηκε
 
+Copied\ titles=Οι τίτλοι αντιγράφτηκαν
 
+Copied\ keys=Τα κλειδιά αντιγράφτηκαν
 
 Copy=Αντιγραφή
 
+Copy\ BibTeX\ key=Αντιγραφή κλειδιού BibTeX
+Copy\ file\ to\ file\ directory=Αντιγραφή αρχείου στον φάκελο αρχείου
 
+Copy\ to\ clipboard=Αντιγραφή στο πρόχειρο
 
+Could\ not\ call\ executable=Αδυναμία κλήσης του εκτελέσιμου αρχείου
 
+Could\ not\ export\ file=Αδυναμία εξαγωγής του αρχείου
 
+Could\ not\ export\ preferences=Αδυναμία εξαγωγής των προτιμήσεων
 
+Could\ not\ find\ a\ suitable\ import\ format.=Αδυναμία εύρεσης κατάλληλης μορφής εισαγωγής.
+Could\ not\ import\ preferences=Αδυναμία εισαγωγής των προτιμήσεων
 
+Could\ not\ instantiate\ %0=Αδυναμία δημιουργίας υπόστασης %0
+Could\ not\ instantiate\ %0\ %1=Αδυναμία δημιουργίας υπόστασης %0 %1
+Could\ not\ instantiate\ %0.\ Have\ you\ chosen\ the\ correct\ package\ path?=Αδυναμία δημιουργίας υπόστασης %0. Έχετε επιλέξει τη σωστή διαδρομή πακέτου;
+Could\ not\ open\ link=Αδυναμία ανοίγματος συνδέσμου
 
+Could\ not\ print\ preview=Αδυναμία προεπισκόπηση εκτύπωσης
 
+Could\ not\ run\ the\ 'vim'\ program.=Το πρόγραμμα 'vim' δεν μπόρεσε να τρέξει.
 
+Could\ not\ save\ file.=Αδυναμία αποθήκευσης του αρχείου.
+Character\ encoding\ '%0'\ is\ not\ supported.=Η κωδικοποίηση χαρακτήρων '%0' δεν υποστηρίζεται.
 
 
+crossreferenced\ entries\ included=περιλαμβάνονται καταχωρήσεις παραπομπών που συμπίπτουν
 
+Current\ content=Τρέχον περιεχόμενο
 
+Current\ value=Τρέχουσα τιμή
 
+Custom\ entry\ types=Προσαρμοσμένοι τύποι καταχωρήσεων
 
+Custom\ entry\ types\ found\ in\ file=Βρέθηκαν προσαρμοσμένοι τύποι καταχωρήσεων σε αυτό το αρχείο
 
+Customize\ entry\ types=Προσαρμογή του τύπου των καταχωρήσεων
+
+Customize\ key\ bindings=Προσαρμογή συντομεύσεων πλήκτρων
 
 Cut=Αποκοπή
 
@@ -215,45 +237,71 @@ cut\ entries=αποκοπή entries
 cut\ entry=αποκοπή entry
 
 
+Library\ encoding=Κωδικοποίηση βιβλιοθήκης
 
+Library\ properties=Ιδιότητες βιβλιοθήκης
 
+Date\ format=Μορφή ημερομηνίας
 
 Default=Προεπιλογή
 
 Default\ encoding=Προεπιλεγμένη κωδικοποίηση
 
+Default\ grouping\ field=Προεπιλεγμένο πεδίο ομαδοποίησης
 
-
+Default\ pattern=Προεπιλεγμένο μοτίβο
 
 Delete=Διαγραφή
 
+Delete\ custom\ format=Διαγραφή τρέχουσας μορφής
 
+delete\ entries=διαγραφή καταχωρήσεων
 
 Delete\ entry=Διαγραφή καταχώρησης
 
+delete\ entry=διαγραφή καταχώρησης
 
+Delete\ multiple\ entries=Διαγραφή πολλαπλών καταχωρήσεων
 
 Delete\ rows=Διαγραφή γραμμών
 
+Delete\ strings=Διαγραφή συμβολοσειρών
 
 Deleted=Διαγράφηκε
 
+Permanently\ delete\ local\ file=Οριστική διαγραφή τοπικού αρχείου
 
-
+Descending=Φθίνουσα
 
 Description=Περιγραφή
 
+Deselect\ all=Αποεπιλογή όλων
+Deselect\ all\ duplicates=Αποεπιλογή όλων των διπλότυπων
 
+Disable\ this\ confirmation\ dialog=Απενεργοποίηση αυτού του παραθύρου διαλόγου επιβεβαίωσης
 
+Display\ all\ entries\ belonging\ to\ one\ or\ more\ of\ the\ selected\ groups.=Εμφάνιση όλων των καταχωρήσεων που ανήκουν σε μία ή περισσότερες από τις επιλεγμένες ομάδες.
 
+Display\ all\ error\ messages=Εμφάνιση όλων των μηνυμάτων σφάλματος
 
+Display\ help\ on\ command\ line\ options=Εμφάνιση βοήθειας στις επιλογές της γραμμής εντολών
 
+Display\ only\ entries\ belonging\ to\ all\ selected\ groups.=Εμφάνιση μόνο των καταχωρήσεων που ανήκουν σε όλες τις επιλεγμένες ομάδες.
+Display\ version=Εμφάνιση έκδοσης
 
+Do\ not\ abbreviate\ names=Να μη γίνει σύντμηση των ονομάτων
 
+Do\ not\ import\ entry=Να μην εισαχθεί καταχώρηση
 
+Do\ not\ open\ any\ files\ at\ startup=Να μην ανοίγεται κανένα αρχείο κατά την εκκίνηση
 
+Do\ not\ overwrite\ existing\ keys=Να μην αντικαθιστώνται τα υπάρχοντα κλειδιά
+Do\ not\ show\ these\ options\ in\ the\ future=Να μην εμφανίζονται αυτές οι επιλογές στο μέλλον
 
+Do\ not\ wrap\ the\ following\ fields\ when\ saving=Να μην αναδιπλώνονται τα ακόλουθα πεδία κατά την αποθήκευση
+Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata\:=Να μην γράφονται τα ακόλουθα πεδία στο Μεταδεδομένα XMP\:
 
+Do\ you\ want\ JabRef\ to\ do\ the\ following\ operations?=Θέλετε το JabRef να εκτελέσει τις παρακάτω ενέργειες;
 
 Donate\ to\ JabRef=Δωρεά στο JabRef
 
@@ -263,569 +311,1881 @@ Download\ file=Κατέβασμα αρχείου
 
 Downloading...=Κατεβαίνει...
 
+Drop\ %0=Ελευθέρωση %0
 
 duplicate\ removal=διαγραφή διπλότυπων
 
+Duplicate\ string\ name=Διπλότυπο όνομα συμβολοσειράς
 
 Duplicates\ found=Βρέθηκαν διπλότυπα
 
+Dynamic\ groups=Δυναμικές ομάδες
 
+Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Δυναμική ομαδοποίηση καταχωρήσεων κατά την αναζήτηση ελεύθερου κειμένου
 
+Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Δυναμική ομαδοποίηση καταχωρήσεων κατά την αναζήτηση ενός πεδίου ή λέξης-κλειδιού
 
 
 Edit=Επεξεργασία
 
+Edit\ custom\ export=Επεξεργασία προσαρμοσμένης εξαγωγής
 Edit\ entry=Επεξεργασία entry
 Save\ file=Αποθήκευση αρχείου
+Edit\ file\ type=Επεξεργασία του τύπου αρχείου
 
 Edit\ group=Επεξεργασία ομάδας
 
 
+Edit\ preamble=Επεξεργασία εισαγωγής
+Edit\ strings=Επεξεργασία συμβολοσειρών
+Editor\ options=Επιλογές επεξεργαστή κειμένου
 
+empty\ library=κενή βιβλιοθήκη
+Enable\ word/name\ autocompletion=Ενεργοποίηση αυτόματης συμπλήρωσης λέξης/ονόματος
 
 Enter\ URL=Εισάγετε URL
 
 Enter\ URL\ to\ download=Εισάγετε URL για κατέβασμα
 
+entries=καταχωρήσεις
 
+Entries\ cannot\ be\ manually\ assigned\ to\ or\ removed\ from\ this\ group.=Οι καταχωρήσεις δεν μπορούν να ανατεθούν ή να αφαιρεθούν χειροκίνητα από αυτήν την ομάδα.
 
+Entries\ exported\ to\ clipboard=Οι καταχωρήσεις έχουν εξαχθεί στο πρόχειρο
 
 
+entry=καταχώρηση
 
+Entry\ editor=Επεξεργαστής κειμένου καταχώρησης
 
+Entry\ preview=Προεπισκόπηση καταχώρησης
 
+Entry\ table=Πίνακας καταχωρήσεων
 
+Entry\ table\ columns=Στήλες πίνακα καταχωρήσεων
 
+Entry\ type=Τύπος καταχώρησης
 
+Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Το όνομα τύπου καταχώρησης δεν επιτρέπεται να περιέχει κενά ή τους παρακάτω χαρακτήρες
 
+Entry\ types=Τύποι καταχωρήσεων
 
+Error=Σφάλμα
 
+Error\ occurred\ when\ parsing\ entry=Παρουσιάστηκε σφάλμα κατά την ανάλυση της καταχώρησης
 
+Error\ opening\ file=Σφάλμα κατά το άνοιγμα αρχείου
 
 
+Error\ while\ writing=Σφάλμα κατά την διαδικασία εγγραφής
 
-Export=Εξαγωγή
-
-
-
+'%0'\ exists.\ Overwrite\ file?=Το '%0' υπάρχει ήδη. Αντικατάσταση αρχείου;
+Overwrite\ file?=Αντικατάσταση αρχείου;
 
+Export=Εξαγωγή
 
+Export\ name=Όνομα εξαγωγής
 
+Export\ preferences=Εξαγωγή προτιμήσεων
 
+Export\ preferences\ to\ file=Εξαγωγή προτιμήσεων σε αρχείο
 
+Export\ properties=Ιδιότητες εξαγωγής
 
+Export\ to\ clipboard=Εξαγωγή στο πρόχειρο
 
+Export\ to\ text\ file.=Εξαγωγή σε αρχείο κειμένου.
 
+Exporting=Πραγματοποιείται εξαγωγή
+Extension=Επέκταση αρχείου
 
+External\ changes=Εξωτερικές αλλαγές
 
+External\ file\ links=Εξωτερικοί σύνδεσμοι αρχείων
 
+External\ programs=Εξωτερικά προγράμματα
 
+External\ viewer\ called=Κλήθηκε εξωτερικός αναγνώστης
 
+Field=Πεδίο
 
+field=πεδίο
 
+Field\ name=Όνομα πεδίου
+Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Το όνομα πεδίου δεν επιτρέπεται να περιέχει κενά ή τους παρακάτω χαρακτήρες
 
+Field\ to\ group\ by=Ομαδοποίηση με το πεδίο
 
+File=Αρχείο
 
+file=αρχείο
+File\ '%0'\ is\ already\ open.=Το αρχείο '%0%' είναι ήδη ανοιχτό.
 
+File\ changed=Το αρχείο άλλαξε
+File\ directory\ is\ '%0'\:=Ο φάκελος αρχείου είναι '%0'\:
 
+File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Ο φάκελος αρχείου δεν έχει οριστεί ή δεν υπάρχει\!
 
+File\ exists=Το αρχείο υπάρχει
 
+File\ not\ found=Το αρχείο δε βρέθηκε
+File\ type=Τύπος αρχείου
+filename=όνομα αρχείου
 
+Files\ opened=Τα αρχεία έχουν ανοίξει
 
+Filter=Φίλτρο
 
+Filter\ All=Φιλτράρισμα Όλων
 
+Filter\ None=Φιλτράρισμα Κανενός
 
+Finished\ automatically\ setting\ external\ links.=Ο αυτόματος ορισμός εξωτερικών συνδέσμων έχει ολοκληρωθεί.
 
+Finished\ writing\ XMP\ for\ %0\ file\ (%1\ skipped,\ %2\ errors).=Η εγγραφή XMP για το αρχείο %0 έχει ολοκληρωθεί (παραβλέφθηκαν %1, σφάλματα %2).
 
+First\ select\ the\ entries\ you\ want\ keys\ to\ be\ generated\ for.=Πρώτα επιλέξτε τις καταχωρήσεις για τις οποίες θέλετε να δημιουργηθούν κλειδιά.
 
+Fit\ table\ horizontally\ on\ screen=Προσαρμόστε τον πίνακα οριζόντια στην οθόνη
 
+Float=Αριθμός κινητής υποδιαστολής
 
+for=για
 
 
+Format\ of\ author\ and\ editor\ names=Μορφή ονόματος συγγραφέα και εκδότη
+Format\ string=Μορφοποίηση συμβολοσειράς
 
+Format\ used=Μορφή που έχει χρησιμοποιηθεί
+Formatter\ name=Όνομα μορφοποιητή
 
+found\ in\ AUX\ file=βρέθηκε στο αρχείο AUX
 
 Full\ name=Πλήρες όνομα
 
+
 General=Γενικά
 
 
+Generate=Δημιουργία
 
+Generate\ BibTeX\ key=Δημιουργία κλειδιού BibTeX
 
+Generate\ keys=Δημιουργία κλειδιών
 
+Generate\ keys\ before\ saving\ (for\ entries\ without\ a\ key)=Δημιουργία κλειδιών πριν την αποθήκευση (για καταχωρήσεις χωρίς κλειδί)
+Generate\ keys\ for\ imported\ entries=Δημιουργία κλειδιών για καταχωρήσεις που έχουν εισαχθεί
 
+Generate\ now=Δημιουργία τώρα
 
+Generated\ BibTeX\ key\ for=Δημιουργήθηκε κλειδί BibTeX για
 
+Generating\ BibTeX\ key\ for=Δημιουργείται κλειδί BibTeX για
+Get\ fulltext=Αποκτήστε το πλήρες κείμενο
 
+Gray\ out\ non-hits=Γκριζάρισμα των καταχωρήσεων που δεν αντιστοιχούν
 
 Groups=Ομάδες
+has/have\ both\ a\ 'Comment'\ and\ a\ 'Review'\ field.=έχει/έχουν πεδία και 'Σχόλιο' και 'Κριτική'.
 
+Have\ you\ chosen\ the\ correct\ package\ path?=Έχετε διαλέξει τη σωστή διαδρομή πακέτου;
 
 Help=Βοήθεια
 
+Help\ on\ key\ patterns=Βοήθεια για μοτίβα κλειδιών
+Help\ on\ regular\ expression\ search=Βοήθεια για την αναζήτηση κανονικών εκφράσεων
 
+Hide\ non-hits=Απόκρυψη των καταχωρήσεων που δεν αντιστοιχούν
 
+Hierarchical\ context=Πλαίσιο ιεράρχησης
 
+Highlight=Επισήμανση
+Marking=Μαρκάρισμα
+Underline=Υπογράμμιση
+Empty\ Highlight=Χωρίς Επισήμανση
+Empty\ Marking=Χωρίς Μαρκάρισμα
+Empty\ Underline=Χωρίς Υπογράμμιση
+The\ marked\ area\ does\ not\ contain\ any\ legible\ text\!=Η μαρκαρισμένη περιοχή δεν περιέχει κανένα ευανάγνωστο κείμενο\!
 
+Hint\:\ To\ search\ specific\ fields\ only,\ enter\ for\ example\:<p><tt>author\=smith\ and\ title\=electrical</tt>=Συμβουλή\: Για την αναζήτηση μόνο συγκεκριμένων πεδίων, πληκτρολογήστε παραδείγματος χάριν\:<p><tt>author\=τσιμπούκης and title\=ηλεκτρομαγνητικό</tt>
 
+HTML\ table=Πίνακας HTML
+HTML\ table\ (with\ Abstract\ &\ BibTeX)=Πίνακας HTML (με Περίληψη & BibTeX)
+Icon=Εικονίδιο
 
 Ignore=Παράβλεψη
 
+Import=Εισαγωγή
 
+Import\ and\ keep\ old\ entry=Εισαγωγή και διατήρηση παλαιότερης καταχώρησης
 
+Import\ and\ remove\ old\ entry=Εισαγωγή και αφαίρεση παλαιότερης καταχώρησης
 
+Import\ entries=Εισαγωγή καταχωρήσεων
 
+Import\ failed=Η εισαγωγή απέτυχε
 
+Import\ file=Εισαγωγή αρχείου
 
+Import\ group\ definitions=Εισαγωγή ορισμών ομάδας
 
+Import\ name=Εισαγωγή ονόματος
 
+Import\ preferences=Εισαγωγή προτιμήσεων
 
+Import\ preferences\ from\ file=Εισαγωγή προτιμήσεων από αρχείο
 
+Import\ strings=Εισαγωγή συμβολοσειρών
 
+Import\ to\ open\ tab=Εισαγωγή σε ανοιχτή καρτέλα
 
+Import\ word\ selector\ definitions=Εισαγωγή ορισμών του επιλογέα λέξεων
 
+Imported\ entries=Καταχωρήσεις που έχουν εισαχθεί
 
+Imported\ from\ library=Έχει εισαχθεί από τη βιβλιοθήκη
 
+Importer\ class=Κλάση εισαγωγέα
 
+Importing=Διαδικασία εισαγωγής
 
+Importing\ in\ unknown\ format=Εισαγωγή σε άγνωστη μορφή
 
+Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Να περιλαμβάνονται υπο-ομάδες\: Όταν επιλεχθεί αυτό, προβάλλονται οι καταχωρήσεις που περιλαμβάνονται σε αυτή την ομάδα ή τις υπο-ομάδες της
 
+Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Ανεξάρτητη ομάδα\: Όταν επιλεχθεί αυτό, προβάλλονται οι καταχωρήσεις μόνο αυτής της ομάδας
 
+Work\ options=Επιλογές εργασίας
 
 
+Insert=Προσθήκη
 
+Insert\ rows=Προσθήκη σειρών
 
+Intersection=Σημείο τομής
 
+Invalid\ BibTeX\ key=Μη έγκυρο κλειδί BibTeX
 
+Invalid\ date\ format=Μη έγκυρη μορφή ημερομηνίας
 
+Invalid\ URL=Μη έγκυρη διεύθυνση URL
 
 Online\ help=Online βοήθεια
 
+JabRef\ preferences=Προτιμήσεις JabRef
 
+Join=Ενώστε
 
+Joins\ selected\ keywords\ and\ deletes\ selected\ keywords.=Ενώνει επιλεγμένες λέξεις-κλειδιά και διαγράφει επιλεγμένες λέξεις-κλειδιά.
 
+Journal\ abbreviations=Συντομογραφίες περιοδικών
 
+Keep=Κρατήστε
 
+Keep\ both=Κρατήστε και τα δύο
 
+Key\ bindings=Συντομεύσεις πληκτρολογίου
 
+Key\ bindings\ changed=Οι συντομεύσεις πληκτρολογίου έχουν αλλάξει
 
+Key\ generator\ settings=Ρυθμίσεις δημιουργού κλειδιών
 
+Key\ pattern=Βασικό μοτίβο
 
+keys\ in\ library=κλειδιά στη βιβλιοθήκη
 
+Keyword=λέξη-κλειδί
 
+Label=Ετικέτα
 
+Language=Γλώσσα
 
+Last\ modified=Τελευταία τροποποίηση
 
+LaTeX\ AUX\ file=Αρχείο LaTeX AUX
+Leave\ file\ in\ its\ current\ directory=Αφήστε το αρχείο στον τρέχοντα φάκελο
 
+Left=Αριστερά
 
+Link=Σύνδεση
+Link\ local\ file=Σύνδεση τοπικού αρχείου
+Link\ to\ file\ %0=Σύνδεση στο αρχείο %0
 
+Listen\ for\ remote\ operation\ on\ port=Αναμονή για απομακρυσμένη λειτουργία στη θύρα
+Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Φόρτωση και Αποθήκευση από/σε jabref.xml κατά την εκκίνηση (λειτουργία memory stick)
 
+Main\ file\ directory=Φάκελος κύριου αρχείου
 
+Main\ layout\ file=Φάκελος κύριας διάταξης
 
+Manage\ custom\ exports=Διαχείριση προσαρμοσμένων εξαγωγών
 
-
-
+Manage\ custom\ imports=Διαχείριση προσαρμοσμένων εισαγωγών
 Manage\ external\ file\ types=Διαχείριση εξωτερικού τυπου αρχείων
 
+Mark\ new\ entries\ with\ addition\ date=Μαρκάρετε τις νέες καταχωρήσεις με την ημερομηνία προσθήκης
 
+Mark\ new\ entries\ with\ owner\ name=Μαρκάρετε τις νέες καταχωρήσεις με το όνομα ιδιοκτήτη
 
+Memory\ stick\ mode=Λειτουργία memory stick
 
+Merged\ external\ changes=Συγχωνευμένες εξωτερικές αλλαγές
+Merge\ fields=Συγχώνευση πεδίων
 
+Messages=Μηνύματα
 
+Modification\ of\ field=Τροποποίηση του πεδίου
 
+Modified\ group\ "%0".=Η ομάδα "%0" έχει τροποποιηθεί.
 
+Modified\ groups=Τροποποιημένες ομάδες
 
+Modified\ string=Τροποποιημένη συμβολοσειρά
 
+Modify=Τροποποίηση
 
+Move\ down=Μετακίνηση κάτω
 
+Move\ external\ links\ to\ 'file'\ field=Μετακίνηση των εξωτερικών συνδέσμων στο πεδίο 'αρχείο'
 
+move\ group=μετακίνηση ομάδας
 
+Move\ up=Μετακίνηση επάνω
 
+Moved\ group\ "%0".=Η ομάδα "%0" έχει μετακινηθεί.
 
 
 
+Name=Όνομα
+Name\ formatter=Μορφοποιητής ονόματος
 
+Natbib\ style=Στυλ Natbib
 
+nested\ AUX\ files=εμφωλευμένα αρχεία AUX
 
+New=Νέο
 
+new=νέο
 
+New\ BibTeX\ sublibrary=Νέα υπο-βιβλιοθήκη BibTeX
 
+New\ content=Νέο περιεχόμενο
 
+New\ library\ created.=Δημιουργήθηκε νέα βιβλιοθήκη.
 
+New\ group=Νέα ομάδα
 
+New\ string=Νέα συμβολοσειρά
 
+Next\ entry=Νέα καταχώρηση
 
+No\ actual\ changes\ found.=Δε βρέθηκαν πραγματικές αλλαγές.
 
+no\ base-BibTeX-file\ specified=δεν έχει καθοριστεί αρχείο βάσης BibTeX
 
+no\ library\ generated=δεν δημιουργήθηκε βιβλιοθήκη
 
+No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Δεν βρέθηκαν καταχωρήσεις. Παρακαλώ βεβαιωθείτε πως χρησιμοποιείτε το σωστό φίλτρο εισαγωγής.
 
+No\ entries\ imported.=Δεν έγινε εισαγωγή καταχωρήσεων.
 
+No\ files\ found.=Δεν βρέθηκαν αρχεία.
 
+No\ GUI.\ Only\ process\ command\ line\ options.=Δεν υπάρχει διεπαφή χρήστη. Πραγματοποιείται επεξεργασία μόνο των επιλογών γραμμής εντολών.
 
+No\ journal\ names\ could\ be\ abbreviated.=Δεν ήταν δυνατή η σύντμηση ονομάτων περιοδικών.
 
+No\ journal\ names\ could\ be\ unabbreviated.=Δεν ήταν δυνατή η αναίρεση της σύντμησης ονομάτων περιοδικών.
 
+Open\ PDF=Άνοιγμα PDF
 
+No\ URL\ defined=Δεν έχει καθοριστεί διεύθυνση URL
+not=δεν
 
+not\ found=δεν βρέθηκε
 
+Nothing\ to\ redo=Καμία ενέργεια προς επανάληψη
 
+Nothing\ to\ undo=Καμία ενέργεια προς αναίρεση
 
+OK=ΟΚ
 
+One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Ένα ή περισσότερα κλειδιά θα αντικατασταθούν. Θα συνεχίσετε;
 
 
+Open=Άνοιγμα
 
+Open\ library=Άνοιγμα βιβλιοθήκης
 
-
-
-
+Open\ editor\ when\ a\ new\ entry\ is\ created=Άνοιγμα επεξεργαστή κειμένου κατά τη δημιουργία νέας καταχώρησης
 
 Open\ file=Άνοιγμα αρχείου
 
+Open\ last\ edited\ libraries\ at\ startup=Άνοιγμα των βιβλιοθηκών που τροποποιήθηκαν πρόσφατα κατά την εκκίνηση
 
-Connect\ to\ shared\ database=Σύνδεση σε κοινόχρηστη Βάση Δεδομένων
+Connect\ to\ shared\ database=Σύνδεση σε κοινόχρηστη βάση δεδομένων
 
 Open\ terminal\ here=Άνοιγμα τερματικού εδώ
 
+Open\ URL\ or\ DOI=Άνοιγμα διεύθυνσης URL ή DOI
 
+Opened\ library=Ανοιχτή βιβλιοθήκη
 
+Opening=Άνοιγμα
 
+Operation\ canceled.=Η ενέργεια έχει ακυρωθεί.
 
+Optional\ fields=Προαιρετικά πεδία
 
+Options=Επιλογές
 
+or=ή
 
+Output\ or\ export\ file=Έξοδος ή αρχείο εξαγωγής
 
+Override=Παράκαμψη
 
+Override\ default\ file\ directories=Παράκαμψη των προεπιλεγμένων φακέλων αρχείου
 
+Override\ the\ BibTeX\ field\ by\ the\ selected\ text=Παράκαμψη του πεδίου BibTeX από το επιλεγμένο κείμενο
 
 
+Overwrite=Αντικατάσταση
 
+Overwrite\ keys=Αντικατάσταση κλειδιών
 
+pairs\ processed=τα ζεύγη έχουν επεξεργαστεί
+Password=Κωδικός πρόσβασης
 
+Paste=Επικόλληση
 
+paste\ entries=επικόλληση καταχωρήσεων
 
+paste\ entry=επικόλληση καταχώρησης
+Paste\ from\ clipboard=Επικόλληση από το πρόχειρο
 
+Pasted=Επικολλήθηκε
 
+Path\ to\ %0\ not\ defined=Δεν έχει οριστεί διαδρομή για το %0
 
+Path\ to\ LyX\ pipe=Διαδρομή προς τον αγωγό LyX
 
+PDF\ does\ not\ exist=Το PDF δεν υπάρχει
 
+File\ has\ no\ attached\ annotations=Το αρχείο δεν περιέχει συνημμένους σχολιασμούς
 
+Plain\ text\ import=Εισαγωγή απλού κειμένου
 
+Please\ enter\ a\ name\ for\ the\ group.=Παρακαλώ πληκτρολογήστε ένα όνομα για την ομάδα.
 
+Please\ enter\ a\ search\ term.\ For\ example,\ to\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:<p><tt>smith</tt><p>To\ search\ the\ field\ <b>Author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>Title</b>\ for\ <b>electrical</b>,\ enter\:<p><tt>author\=smith\ and\ title\=electrical</tt>=Παρακαλούμε εισάγετε έναν όρο αναζήτησης. Για παράδειγμα, για να κάνετε αναζήτηση για το <b>Τσιμπούκης</b> σε όλα τα πεδία, πληκτρολογήστε\:<p><tt>τσιμπούκης</tt><p>Για να κάνετε αναζήτηση στο πεδίο <b>Author</b> για <b>Τσιμπούκης</b> και στο πεδίο <b>Title</b> για <b>ηλεκτρομαγνητικό</b>, πληκτρολογήστε\:<p><tt>author\=τσιμπούκης and title\=ηλεκτρομαγνητικό</tt>
 
+Please\ enter\ the\ field\ to\ search\ (e.g.\ <b>keywords</b>)\ and\ the\ keyword\ to\ search\ it\ for\ (e.g.\ <b>electrical</b>).=Παρακαλούμε εισάγετε το πεδίο προς αναζήτηση (π.χ. <b>λέξεις-κλειδιά</b>) και τη λέξη-κλειδί για την οποία θα γίνει η αναζήτησή του (π.χ. <b>ηλεκτρικό</b>).
 
+Please\ enter\ the\ string's\ label=Παρακαλούμε εισάγετε την ετικέτα της συμβολοσειράς
 
+Please\ select\ an\ importer.=Παρακαλούμε επιλέξτε έναν εισαγωγέα.
 
 
+Possible\ duplicate\ entries=Πιθανώς διπλότυπες καταχωρήσεις
 
+Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Πιθανώς διπλότυπο μιας υπάρχουσας καταχώρησης. Κάντε κλικ για να το επιλύσετε.
 
+Preferences=Προτιμήσεις
 
+Preferences\ recorded.=Οι προτιμήσεις καταγράφονται.
 
+Preview=Προεπισκόπηση
+Citation\ Style=Στυλ Αναφορών
+Current\ Preview=Τρέχουσα Προεπισκόπηση
+Cannot\ generate\ preview\ based\ on\ selected\ citation\ style.=Δεν είναι δυνατή η δημιουργία προεπισκόπησης βάσει του επιλεγμένου στυλ αναφορών.
+Bad\ character\ inside\ entry=Κακοί χαρακτήρες μέσα στην καταχώρηση
+Error\ while\ generating\ citation\ style=Σφάλμα κατά τη δημιουργία στυλ αναφορών
+Preview\ style\ changed\ to\:\ %0=Το στυλ προεπισκόπησης άλλαξε σε\: %0
+Next\ preview\ layout=Επόμενη διάταξη προεπισκόπησης
+Previous\ preview\ layout=Προηγούμενη διάταξη προεπισκόπησης
 
+Previous\ entry=Προηγούμενη καταχώρηση
 
-Pull\ changes\ from\ shared\ database=Τραβήξτε αλλαγές από την κοινόχρηστη βάση δεδομένων
-
+Primary\ sort\ criterion=Κριτήριο πρωτογενούς ταξινόμησης
+Problem\ with\ parsing\ entry=Πρόβλημα με την ανάλυση της καταχώρησης
+Processing\ %0=%0 υπό επεξεργασία
+Pull\ changes\ from\ shared\ database=Τραβήξτε αλλαγές από κοινόχρηστη βάση δεδομένων
 
+Pushed\ citations\ to\ %0=Οι αναφορές μεταφέρθηκαν στο %0
 
+Quit\ JabRef=Έξοδος από το JabRef
 
+Raw\ source=Μη επεξεργασμένη πηγή
 
+Redo=Ακύρωση αναίρεσης
 
+Reference\ library=Βιβλιοθήκη παραπομπών
 
+Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Βελτίωση της υπερ-ομάδας\: Όταν επιλεχθεί αυτό, προβάλλονται οι καταχωρήσεις που περιέχονται σε αυτήν την ομάδα και την υπερ-ομάδα της
 
+regular\ expression=κανονική έκφραση
 
+Related\ articles=Σχετικά άρθρα
 
+Remote\ operation=Απομακρυσμένη λειτουργία
 
+Remote\ server\ port=Θύρα απομακρυσμένου διακομιστή
 
+Remove=Αφαίρεση
 
+Remove\ subgroups=Αφαίρεση υπο-ομάδων
 
+Remove\ all\ subgroups\ of\ "%0"?=Αφαίρεση όλων των υπο-ομάδων από "%0";
 
+Remove\ entry\ from\ import=Αφαίρεση καταχώρησης από την εισαγωγή
 
+Remove\ selected\ entries\ from\ this\ group=Αφαίρεση επιλεγμένων καταχωρήσεων από αυτή την ομάδα
 
+Remove\ entry\ type=Αφαίρεση τύπου καταχώρησης
 
+Remove\ from\ group=Αφαίρεση από την ομάδα
 
+Remove\ group=Αφαίρεση ομάδας
 
+Remove\ group,\ keep\ subgroups=Αφαίρεση ομάδας, διατήρηση υπο-ομάδων
 
+Remove\ group\ "%0"?=Αφαίρεση της ομάδας "%0";
 
+Remove\ group\ "%0"\ and\ its\ subgroups?=Αφαίρεση της ομάδας "%0" και των υπο-ομάδων της;
 
+remove\ group\ (keep\ subgroups)=αφαίρεση ομάδας (διατήρηση υπο-ομάδων)
 
+remove\ group\ and\ subgroups=αφαίρεση ομάδας και των υπο-ομάδων της
 
+Remove\ group\ and\ subgroups=Αφαίρεση ομάδας και υπο-ομάδων
 
+Remove\ link=Αφαίρεση συνδέσμου
 
+Remove\ old\ entry=Αφαίρεση παλαιάς καταχώρησης
 
+Remove\ selected\ strings=Αφαίρεση επιλεγμένων συμβολοσειρών
 
+Removed\ group\ "%0".=Η ομάδα "%0" έχει αφαιρεθεί.
 
+Removed\ group\ "%0"\ and\ its\ subgroups.=Η ομάδα "%0" και οι υπο-ομάδες της έχουν αφαιρεθεί.
 
+Removed\ string=Η συμβολοσειρά έχει αφαιρεθεί
 
+Renamed\ string=Η συμβολοσειρά έχει μετονομαστεί
 
+Replace=Αντικατάσταση
 
+Replace\ (regular\ expression)=Αντικατάσταση (κανονική έκφραση)
 
+Replace\ string=Αντικατάσταση συμβολοσειράς
 
+Replace\ Unicode\ ligatures=Αντικατάσταση Συνδέσμων Unicode
+Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Αντικαθιστά τους συνδέσμους Unicode με την εκτεταμένη τους μορφή
 
+Required\ fields=Απαιτούμενα πεδία
 
+Reset\ all=Επαναφορά όλων
 
+Resolve\ strings\ for\ all\ fields\ except=Επίλυση των συμβολοσειρών για όλα τα πεδία εκτός
+Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Επίλυση των συμβολοσειρών μόνο για τα βασικά πεδία BibTeX
 
+resolved=έχει επιλυθεί
 
 
+Review=Κριτική
+Review\ changes=Αλλαγές κριτικών
+Review\ Field\ Migration=Μετακίνηση Πεδίων Κριτικής
 
+Right=Δεξιά
 
+Save=Αποθήκευση
+Save\ all\ finished.=Η αποθήκευση όλων ολοκληρώθηκε.
 
+Save\ all\ open\ libraries=Αποθήκευση όλων των ανοιχτών βιβλιοθηκών
 
+Save\ before\ closing=Αποθήκευση πριν το κλείσιμο
 
+Save\ library=Αποθήκευση βιβλιοθήκης
+Save\ library\ as...=Αποθήκευση βιβλιοθήκης ως...
 
+Save\ entries\ in\ their\ original\ order=Αποθήκευση καταχωρήσεων με την αρχική τους σειρά
 
+Saved\ library=Η βιβλιοθήκη αποθηκεύτηκε
 
+Saved\ selected\ to\ '%0'.=Το επιλεγμένο έχει αποθηκευτεί στο '%0'.
 
+Saving=Πραγματοποιείται αποθήκευση
+Saving\ all\ libraries...=Πραγματοποιείται αποθήκευση όλων των βιβλιοθηκών...
 
+Saving\ library=Πραγματοποιείται αποθήκευση βιβλιοθήκης
 
+Search=Αναζήτηση
 
+Search\ expression=Αναζήτηση έκφρασης
 
+Searching\ for\ duplicates...=Αναζήτηση για διπλότυπα...
 
+Searching\ for\ files=Αναζήτηση για αρχεία
 
+Secondary\ sort\ criterion=Κριτήριο δευτερογενούς ταξινόμησης
 
+Select\ all=Επιλογή όλων
 
+Select\ entry\ type=Επιλογή τύπου καταχώρησης
 
+Select\ file\ from\ ZIP-archive=Επιλογή αρχείου από συμπιεσμένο αρχείο ZIP
 
+Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Επιλέξτε τους δενδροειδείς κόμβους για να προβάλλετε και να αποδεχτείτε ή να απορρίψετε αλλαγές
 
+Set\ field=Ορισμός πεδίου
+Set\ fields=Ορισμός πεδίων
 
 
+Set\ main\ external\ file\ directory=Ορισμός κύριου φακέλου εξωτερικών αρχείων
 
+Settings=Ρυθμίσεις
 
+Shortcut=Συντόμευση
 
+Show/edit\ %0\ source=Εμφάνιση/επεξεργασία πηγής %0
 
+Show\ 'Firstname\ Lastname'=Εμφάνιση 'Όνομα Επώνυμο'
 
+Show\ 'Lastname,\ Firstname'=Εμφάνιση 'Επώνυμο, Όνομα'
 
+Show\ BibTeX\ source\ by\ default=Εμφάνιση πηγής BibTeX από προεπιλογή
 
+Show\ confirmation\ dialog\ when\ deleting\ entries=Εμφάνιση παραθύρου διαλόγου επιβεβαίωσης κατά τη διαγραφή καταχωρήσεων
 
+Show\ description=Εμφάνιση περιγραφής
 
+Show\ file\ column=Εμφάνιση στήλης αρχείων
 
+Show\ last\ names\ only=Εμφάνιση μόνο επωνύμων
 
+Show\ names\ unchanged=Εμφάνιση ονομάτων χωρίς αλλαγές
 
+Show\ optional\ fields=Εμφάνιση προαιρετικών πεδίων
 
+Show\ required\ fields=Εμφάνιση απαραίτητων πεδίων
 
+Show\ URL/DOI\ column=Εμφάνιση στήλης διεύθυνσης URL/DOI
 
+Show\ validation\ messages=Εμφάνιση μηνυμάτων επικύρωσης
 
+Simple\ HTML=Απλό HTML
+Since\ the\ 'Review'\ field\ was\ deprecated\ in\ JabRef\ 4.2,\ these\ two\ fields\ are\ about\ to\ be\ merged\ into\ the\ 'Comment'\ field.=Επειδή το πεδίο 'Κριτική' αφαιρέθηκε στην έκδοση JabRef 4.2, αυτά τα δύο πεδία πρόκειται να συγχωνευθούν στο πεδίο 'Σχόλιο'.
 
+Size=Μέγεθος
 
+Skipped\ -\ No\ PDF\ linked=Παραβλέφθηκε - Δεν έχει συνδεθεί PDF
+Skipped\ -\ PDF\ does\ not\ exist=Παραβλέφθηκε - Δεν υπάρχει PDF
 
+Skipped\ entry.=Η καταχώρηση παραβλέφθηκε.
 
+Some\ appearance\ settings\ you\ changed\ require\ to\ restart\ JabRef\ to\ come\ into\ effect.=Μερικές ρυθμίσεις εμφάνισης που έχετε αλλάξει απαιτούν την επανεκκίνηση του JabRef προκειμένου να τεθούν σε λειτουργία.
 
+source\ edit=επεξεργασία πηγής
+Special\ name\ formatters=Ειδικοί μορφοποιητές ονόματος
 
+Special\ table\ columns=Ειδικές στήλες πίνακα
 
+Statically\ group\ entries\ by\ manual\ assignment=Ομαδοποίηση στατικών καταχωρήσεων με χειροκίνητη ανάθεση
 
+Status=Κατάσταση
 
+Stop=Διακοπή
 
+Strings\ for\ library=Συμβολοσειρές για βιβλιοθήκη
 
+Sublibrary\ from\ AUX=Υπο-βιβλιοθήκη από AUX
 
+Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Εναλλαγή από πλήρες ή συντετμημένο όνομα περιοδικού, εάν το όνομα του περιοδικού είναι άγνωστο.
 
+Tabname=Όνομα καρτέλας
+Target\ file\ cannot\ be\ a\ directory.=Το αρχείο προορισμού δεν μπορεί να είναι φάκελος.
 
+Tertiary\ sort\ criterion=Κριτήριο τριτογενούς ταξινόμησης
 
+Test=Έλεγχος
 
+paste\ text\ here=επικόλληση κειμένου εδώ
 
+The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Η επιλεγμένη μορφή ημερομηνίας για νέες καταχωρήσεις δεν είναι έγκυρη
 
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Η επιλεγμένη κωδικοποίηση '%0' δεν κατάφερε να κωδικοποιήσει τους παρακάτω χαρακτήρες\:
 
 
+the\ field\ <b>%0</b>=το πεδίο <b>%0</b>
 
+The\ file<BR>'%0'<BR>has\ been\ modified<BR>externally\!=Το αρχείο <BR>'%0'<BR>έχει τροποποιηθεί<BR>εξωτερικά\!
 
+The\ group\ "%0"\ already\ contains\ the\ selection.=Η ομάδα "%0" περιέχει ήδη την επιλογή.
 
+The\ label\ of\ the\ string\ cannot\ be\ a\ number.=Η ετικέτα της συμβολοσειράς δεν μπορεί να είναι αριθμός.
 
+The\ label\ of\ the\ string\ cannot\ contain\ spaces.=Η ετικέτα της συμβολοσειράς δεν μπορεί να περιέχει κενά.
 
+The\ label\ of\ the\ string\ cannot\ contain\ the\ '\#'\ character.=Η ετικέτα της συμβολοσειράς δεν μπορεί να περιέχει τον χαρακτήρα '\#'.
 
+The\ output\ option\ depends\ on\ a\ valid\ import\ option.=Η επιλογή εξόδου εξαρτάται από μια έγκυρη επιλογή εισαγωγής.
+The\ PDF\ contains\ one\ or\ several\ BibTeX-records.=Το αρχείο PDF περιέχει μία ή περισσότερες εγγραφές BibTeX.
+Do\ you\ want\ to\ import\ these\ as\ new\ entries\ into\ the\ current\ library?=Θέλετε να εισαγάγετε αυτές ως νέες καταχωρήσεις στην τρέχουσα βιβλιοθήκη;
 
+The\ regular\ expression\ <b>%0</b>\ is\ invalid\:=Η κανονική έκφραση <b>%0</b> δεν είναι έγκυρη\:
 
+The\ search\ is\ case\ insensitive.=Η αναζήτηση δεν επηρεάζεται από την αντιστοιχία πεζών-κεφαλαίων.
 
+The\ search\ is\ case\ sensitive.=Η αναζήτηση επηρεάζεται από την αντιστοιχία πεζών-κεφαλαίων.
 
+The\ string\ has\ been\ removed\ locally=Η συμβολοσειρά έχει αφαιρεθεί τοπικά
 
+There\ are\ possible\ duplicates\ (marked\ with\ an\ icon)\ that\ haven't\ been\ resolved.\ Continue?=Υπάρχουν πιθανά διπλότυπα (σημειώνονται με εικονίδιο), που δεν έχουν επιλυθεί. Συνέχεια;
 
+This\ entry\ has\ no\ BibTeX\ key.\ Generate\ key\ now?=Αυτή η καταχώρηση δεν έχει κλειδί BibTeX. Δημιουργία κλειδιού τώρα;
 
+This\ entry\ type\ cannot\ be\ removed.=Αυτή η καταχώρηση δεν μπορεί να αφαιρεθεί.
 
+This\ group\ contains\ entries\ based\ on\ manual\ assignment.\ Entries\ can\ be\ assigned\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ Entries\ can\ be\ removed\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.=Αυτή η ομάδα περιέχει καταχωρήσεις που βασίζονται σε χειροκίνητη ανάθεση. Οι καταχωρήσεις μπορούν να ανατεθούν σε αυτήν την ομάδα με επιλογή κι έπειτα μεταφορά και απόθεση, είτε χρησιμοποιώντας το αντίστοιχο μενού. Οι καταχωρήσεις μπορούν να αφαιρεθούν από αυτή την ομάδα επιλέγοντάς τες και χρησιμοποιώντας το αντίστοιχο μενού.
 
+This\ group\ contains\ entries\ whose\ <b>%0</b>\ field\ contains\ the\ keyword\ <b>%1</b>=Αυτή η ομάδα περιέχει καταχωρήσεις των οποίων το πεδίο <b>%0</b> περιέχει τη λέξη-κλειδί <b>%1</b>
 
+This\ group\ contains\ entries\ whose\ <b>%0</b>\ field\ contains\ the\ regular\ expression\ <b>%1</b>=Αυτή η ομάδα περιέχει καταχωρήσεις των οποίων το πεδίο <b>%0</b> περιέχει την κανονική έκφραση <b>%1</b>
 
+This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defined.=Αυτή η ενέργεια απαιτεί όλες οι επιλεγμένες καταχωρήσεις να έχουν καθορισμένα κλειδιά BibTeX.
 
+This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Αυτή η ενέργεια απαιτεί να έχουν επιλεχθεί μία ή περισσότερες καταχωρήσεις.
 
 
+Toggle\ entry\ preview=Εναλλαγή προβολής καταχώρησης
+Toggle\ groups\ interface=Εναλλαγή διεπαφής ομάδων
 
 
 
+Try\ different\ encoding=Δοκιμάστε διαφορετική κωδικοποίηση
 
+Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Αποσυμπτύξτε τα ονόματα περιοδικών των επιλεγμένων καταχωρήσεων
+Unabbreviated\ %0\ journal\ names.=Αποσυμπτυγμένα %0 ονόματα περιοδικών.
 
+Unable\ to\ open\ %0=Αδυναμία ανοίγματος του %0
+Unable\ to\ open\ link.\ The\ application\ '%0'\ associated\ with\ the\ file\ type\ '%1'\ could\ not\ be\ called.=Αδυναμία ανοίγματος συνδέσμου. Δεν μπόρεσε να κληθεί η εφαρμογή '%0' που σχετίζεται με τον τύπο αρχείου '%1'.
+unable\ to\ write\ to=αδυναμία εγγραφής σε
 
+Undo=Αναίρεση
 
+Union=Ένωση
 
+Unknown\ BibTeX\ entries=Άγνωστες καταχωρήσεις BibTeX
 
+unknown\ edit=άγνωστη τροποποίηση
 
+Unknown\ export\ format=Άγνωστη μορφή εξαγωγής
 
+untitled=χωρίς τίτλο
 
+Up=Επάνω
 
+Update\ to\ current\ column\ widths=Ενημέρωση του τρέχοντος πλάτους στηλών
 
+Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Αναβαθμίστε τους εξωτερικούς συνδέσμους PDF/PS για να χρησιμοποιήσετε το πεδίο '%0'.
+Upgrade\ file=Αναβάθμιση αρχείου
+Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Αναβαθμίστε τους παλιούς συνδέσμους εξωτερικού αρχείου για να χρησιμοποιήσετε τη νέα λειτουργία
 
+usage=χρήση
+Use\ autocompletion\ for\ the\ following\ fields=Χρήση αυτόματης συμπλήρωσης για τα ακόλουθα πεδία
 
+Tweak\ font\ rendering\ for\ entry\ editor\ on\ Linux=Προσαρμόστε την απόδοση γραμματοσειράς για τον επεξεργαστή καταχωρήσεων σε Linux
+Use\ regular\ expression\ search=Χρήση αναζήτησης κανονικής έκφρασης
 
+Username=Όνομα χρήστη
 
+Value\ cleared\ externally=Η τιμή έχει εκκαθαριστεί εξωτερικά
 
+Value\ set\ externally=Η τιμή έχει οριστεί εξωτερικά
 
+verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=βεβαιωθείτε πως εκτελείται το LyX και πως το lyxpipe είναι έγκυρο
 
+View=Προβολή
+Vim\ server\ name=Όνομα διακομιστή Vim
 
+Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Προειδοποίηση για διπλότυπα που δεν έχουν επιλυθεί κατά το κλείσιμο του παραθύρου επιθεώρησης
 
+Warn\ before\ overwriting\ existing\ keys=Προειδοποίηση πριν την αντικατάσταση υπαρχόντων κλειδιών
 
+Warning=Προειδοποίηση
 
+Warnings=Προειδοποιήσεις
 
+web\ link=ηλεκτρονικός σύνδεσμος
 
+What\ do\ you\ want\ to\ do?=Τι θέλετε να κάνετε;
 
+When\ adding/removing\ keywords,\ separate\ them\ by=Κατά την πρόσθεση/αφαίρεση λέξεων-κλειδιών, να χωρίζονται με
+Will\ write\ XMP-metadata\ to\ the\ PDFs\ linked\ from\ selected\ entries.=Θα γράψει τα μεταδεδομένα XMP στα αρχεία PDF που έχουν συνδεθεί από τις επιλεγμένες καταχωρήσεις.
 
+with=με
 
+Write\ BibTeXEntry\ as\ XMP-metadata\ to\ PDF.=Εγγραφή των μεταδεδομένων XMP σε αρχείο PDF.
 
+Write\ XMP=Εγγραφή XMP
+Write\ XMP-metadata=Εγγραφή μεταδεδομένων XMP
+Write\ XMP-metadata\ for\ all\ PDFs\ in\ current\ library?=Εγγραφή μεταδεδομένων XMP για όλα τα αρχεία PDF στην τρέχουσα βιβλιοθήκη;
+Writing\ XMP-metadata...=Πραγματοποιείται εγγραφή μεταδεδομένων XMP...
+Writing\ XMP-metadata\ for\ selected\ entries...=Πραγματοποιείται εγγραφή μεταδεδομένων XMP για τις επιλεγμένες καταχωρήσεις...
 
+XMP-annotated\ PDF=Αρχείο PDF με σχόλια XMP
+XMP\ export\ privacy\ settings=Ρυθμίσεις ιδιωτικότητας εξαγωγής XMP
+XMP-metadata=Μεταδεδομένα XMP
+XMP-metadata\ found\ in\ PDF\:\ %0=Βρέθηκαν μεταδεδομένα XMP στο αρχείο PDF\: %0
+You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Πρέπει να επανεκκινήσετε το JabRef για να τεθεί σε λειτουργία αυτό.
+You\ have\ changed\ the\ language\ setting.=Έχετε αλλάξει τις ρυθμίσεις γλώσσας.
 
+You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Πρέπει να επανεκκινήσετε το JabRef για να λειτουργήσουν σωστά οι νέες συντομεύσεις πληκτρολογίου.
 
+Your\ new\ key\ bindings\ have\ been\ stored.=Οι νέες συντομεύσεις πληκτρολογίου έχουν αποθηκευτεί.
 
+The\ following\ fetchers\ are\ available\:=Οι παρακάτω ανακτητές είναι διαθέσιμοι\:
+Could\ not\ find\ fetcher\ '%0'=Αδυναμία εύρεσης ανακτητή '%0'
+Running\ query\ '%0'\ with\ fetcher\ '%1'.=Το αίτημα '%0' με ανακτητή '%1' τρέχει.
 
+Move\ file=Μετακίνηση αρχείου
+Rename\ file=Μετονομασία αρχείου
 
 
+Move\ file\ failed=Αποτυχία μετακίνησης αρχείου
+Could\ not\ move\ file\ '%0'.=Αδυναμία μετακίνησης αρχείου '%0'.
+Could\ not\ find\ file\ '%0'.=Αδυναμία εύρεσης αρχείου '%0'.
+Number\ of\ entries\ successfully\ imported=Έγινε εισαγωγή του αριθμού των καταχωρήσεων με επιτυχία
+Import\ canceled\ by\ user=Η εισαγωγή ακυρώθηκε από το χρήστη
+Error\ while\ fetching\ from\ %0=Σφάλμα κατά την ανάκτηση από %0
 
+Show\ search\ results\ in\ a\ window=Εμφάνιση αποτελεσμάτων αναζήτησης σε ένα παράθυρο
+Show\ global\ search\ results\ in\ a\ window=Εμφάνιση αποτελεσμάτων καθολικής αναζήτησης σε ένα παράθυρο
+Search\ in\ all\ open\ libraries=Αναζήτηση σε όλες τις ανοιχτές βιβλιοθήκες
+Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Άρνηση αποθήκευσης της βιβλιοθήκης μέχρι να αναθεωρηθούν εξωτερικές αλλαγές.
+Library\ protection=Προστασία βιβλιοθήκης
+Unable\ to\ save\ library=Αδυναμία αποθήκευσης βιβλιοθήκης
 
+BibTeX\ key\ generator=Γεννήτρια κλειδιών BibTeX
+Unable\ to\ open\ link.=Αδυναμία ανοίγματος συνδέσμου.
+MIME\ type=Τύπος MIME
 
+This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Το χαρακτηριστικό αυτό επιτρέπει το άνοιγμα ή την εισαγωγή νέων αρχείων σε ένα ήδη τρέχον παράθυρο JabRef<BR>αντί να ανοίγει νέο παράθυρο. Για παράδειγμα, αυτό είναι χρήσιμο όταν ανοίγετε ένα αρχείο JabRef<br>από τον περιηγητή ιστού.<BR>Σημειώστε πως αυτό θα σας εμποδίσει από το να τρέξετε περισσότερα από ένα παράθυρα JabRef ταυτόχρονα.
+Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Τρέξτε ανακτητή, π.χ. "--fetch\=Medline\:cancer"
 
+Reset=Επαναφορά
 
+Use\ IEEE\ LaTeX\ abbreviations=Χρήση των συντομογραφιών IEEE LaTeX
 
+When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Κατά το άνοιγμα συνδέσμου αρχείου, να πραγματοποιείται αναζήτηση για αντίστοιχο αρχείο, όταν δεν καθορίζεται σύνδεσμος
+Settings\ for\ %0=Ρυθμίσεις για %0
 
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Γραμμή %0\: Βρέθηκε κατεστραμμένο κλειδί BibTeX.
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Γραμμή %0\: Βρέθηκε κατεστραμμένο κλειδί BibTeX (περιέχονται κενά).
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Γραμμή %0\: Βρέθηκε κατεστραμμένο κλειδί BibTeX (λείπει κόμμα).
+No\ full\ text\ document\ found=Δεν βρέθηκε αρχείο πλήρους κειμένου
+Update\ to\ current\ column\ order=Ενημέρωση ως την τρέχουσα σειρά στηλών
+Download\ from\ URL=Κατέβασμα από σύνδεσμο URL
+Rename\ field=Μετονομασία πεδίου
 Set/clear/append/rename\ fields=Ρύθμιση/καθαρισμός/μετονομασία πεδίων
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+Append\ field=Προσάρτηση πεδίου
+Append\ to\ fields=Προσάρτηση στα πεδία
+Rename\ field\ to=Μετονομασία πεδίου ως
+Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Μετακίνηση περιεχομένων ενός πεδίου σε ένα πεδίο με διαφορετικό όνομα
+
+Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Αδύνατη η χρήση της θύρας %0 για απομακρυσμένη λειτουργία, ίσως χρησιμοποιείται από μια άλλη εφαρμογή. Δοκιμάστε να ορίσετε άλλη θύρα.
+
+Looking\ for\ full\ text\ document...=Αναζήτηση αρχείου πλήρους κειμένου...
+Autosave=Αυτόματη αποθήκευση
+A\ local\ copy\ will\ be\ opened.=Θα ανοίξει ένα τοπικό αντίγραφο.
+Autosave\ local\ libraries=Αυτόματη αποθήκευση τοπικών βιβλιοθηκών
+Automatically\ save\ the\ library\ to=Αποθηκεύστε αυτόματα τη βιβλιοθήκη στο
+Please\ enter\ a\ valid\ file\ path.=Παρακαλώ εισάγετε μια έγκυρη διαδρομή αρχείου.
+
+
+Export\ in\ current\ table\ sort\ order=Εξαγωγή στην τρέχουσα σειρά ταξινόμησης του πίνακα
+Export\ entries\ in\ their\ original\ order=Εξαγωγή καταχωρήσεων κατά την αρχική τους σειρά
+Error\ opening\ file\ '%0'.=Σφάλμα κατά το άνοιγμα αρχείου '%0'.
+
+Formatter\ not\ found\:\ %0=Δεν βρέθηκε μορφοποιητής\: %0
+Clear\ inputarea=Καθαρισμός περιοχής εισαγωγής
+
+Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Αδυναμία αποθήκευσης, το αρχείο είναι κλειδωμένο από ένα άλλο παράθυρο JabRef.
+Current\ tmp\ value=Τρέχουσα τιμή tmp
+Metadata\ change=Αλλαγή μεταδεδομένων
+Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Έχουν πραγματοποιηθεί αλλαγές στα ακόλουθα στοιχεία μεταδεδομένων
+
+Generate\ groups\ for\ author\ last\ names=Δημιουργία ομάδων για τα επώνυμα συγγραφέων
+Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Δημιουργία ομάδων από λέξεις-κλειδιά σε ένα πεδίο BibTeX
+Enforce\ legal\ characters\ in\ BibTeX\ keys=Επιβολή έγκυρων χαρακτήρων στα κλειδιά BibTeX
+
+Unable\ to\ create\ backup=Αδυναμία δημιουργίας αντιγράφου ασφαλείας
+Move\ file\ to\ file\ directory=Μετακίνηση αρχείου στο φάκελο αρχείου
+Rename\ file\ to=Μετονομασία αρχείου ως
+<b>All\ Entries</b>\ (this\ group\ cannot\ be\ edited\ or\ removed)=<b>Όλες οι Καταχωρήσεις</b> (αυτή η ομάδα δεν μπορεί να τροποποιηθεί ή να αφαιρεθεί)
+static\ group=στατική ομάδα
+dynamic\ group=δυναμική ομάδα
+refines\ supergroup=βελτιστοποιεί την υπερ-ομάδα
+includes\ subgroups=περιλαμβάνει την υπο-ομάδα
+contains=περιέχει
+search\ expression=έκφραση αναζήτησης
+
+Optional\ fields\ 2=Προαιρετικά πεδία 2
+Waiting\ for\ save\ operation\ to\ finish=Αναμονή για ολοκλήρωση της λειτουργίας αποθήκευσης
+Resolving\ duplicate\ BibTeX\ keys...=Πραγματοποιείται επίλυση των διπλότυπων κλειδιών BibTeX...
+Finished\ resolving\ duplicate\ BibTeX\ keys.\ %0\ entries\ modified.=Η επίλυση των διπλότυπων κλειδιών BibTeX έχει ολοκληρωθεί. Τροποποιήθηκαν %0 καταχωρήσεις.
+This\ library\ contains\ one\ or\ more\ duplicated\ BibTeX\ keys.=Η βιβλιοθήκη περιέχει ένα ή περισσότερα διπλότυπα κλειδιά BibTeX.
+Do\ you\ want\ to\ resolve\ duplicate\ keys\ now?=Θέλετε να επιλύσετε τα διπλότυπα κλειδιά τώρα;
+
+Find\ and\ remove\ duplicate\ BibTeX\ keys=Εύρεση και αφαίρεση των διπλότυπων κλειδιών BibTeX
+Expected\ syntax\ for\ --fetch\='<name\ of\ fetcher>\:<query>'=Αναμενόμενη σύνταξη για --fetch\='<όνομα ανακτητή>\:<αίτημα>'
+Duplicate\ BibTeX\ key=Διπλότυπο κλειδί BibTeX
+Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Πάντα να προστίθεται γράμμα (a, b, ...) στα κλειδιά που δημιουργούνται
+
+Ensure\ unique\ keys\ using\ letters\ (a,\ b,\ ...)=Σιγουρέψτε τη μοναδικότητα των κλειδιών χρησιμοποιώντας γράμματα (a, b, ...)
+Ensure\ unique\ keys\ using\ letters\ (b,\ c,\ ...)=Σιγουρέψτε τη μοναδικότητα των κλειδιών χρησιμοποιώντας γράμματα (b, c, ...)
+
+General\ file\ directory=Γενικός φάκελος αρχείου
+User-specific\ file\ directory=Φάκελος αρχείου καθορισμένος από τον χρήστη
+Search\ failed\:\ illegal\ search\ expression=Αποτυχία αναζήτησης\: εσφαλμένη έκφραση αναζήτησης
+Show\ ArXiv\ column=Εμφάνιση στήλης ArXiv
+
+You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535\ in\ the\ text\ field\ for=Πρέπει να πληκτρολογήσετε μια ακέραιη τιμή στο διάστημα 1025-65535 στο πεδίο κειμένου για
+Automatically\ open\ browse\ dialog\ when\ creating\ new\ file\ link=Αυτόματο άνοιγμα του παραθύρου διαλόγου εξερεύνησης κατά τη δημιουργία νέου συνδέσμου αρχείου
+Import\ metadata\ from\:=Εισαγωγή μεταδεδομένων από\:
+Choose\ the\ source\ for\ the\ metadata\ import=Διαλέξτε την πηγή για την εισαγωγή μεταδεδομένων
+Create\ entry\ based\ on\ XMP-metadata=Δημιουργία καταχώρησης βασισμένης σε μεταδεδομένα XMP
+Create\ blank\ entry\ linking\ the\ PDF=Δημιουργία κενής καταχώρησης που να συνδέεται με το αρχείο PDF
+Only\ attach\ PDF=Επισύναψη μόνο αρχείου PDF
+Create\ new\ entry=Δημιουργία νέας καταχώρησης
+Update\ existing\ entry=Ενημέρωση υπάρχουσας καταχώρησης
+Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Αυτόματη συμπλήρωση ονομάτων μόνο με τη μορφή 'Όνομα Επώνυμο'
+Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Αυτόματη συμπλήρωση ονομάτων μόνο με τη μορφή 'Επώνυμο, Όνομα'
+Autocomplete\ names\ in\ both\ formats=Αυτόματη συμπλήρωση ονομάτων και με τις δύο μορφές
+The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=Το όνομα 'σχόλιο' δεν μπορεί να χρησιμοποιηθεί ως τύπος ονόματος καταχώρησης.
+Send\ as\ email=Αποστολή ως email
+References=Παραπομπές
+Sending\ of\ emails=Πραγματοποιείται αποστολή των email
+Subject\ for\ sending\ an\ email\ with\ references=Θέμα αποστολής ενός email με παραπομπές
+Automatically\ open\ folders\ of\ attached\ files=Αυτόματο άνοιγμα φακέλων των συνημμένων αρχείων
+Create\ entry\ based\ on\ content=Δημιουργία μια καταχώρησης βασισμένης σε περιεχόμενο
+Do\ not\ show\ this\ box\ again\ for\ this\ import=Να μην εμφανιστεί ξανά αυτό το μήνυμα για αυτήν την εισαγωγή
+Always\ use\ this\ PDF\ import\ style\ (and\ do\ not\ ask\ for\ each\ import)=Να γίνεται πάντα χρήση του στυλ εισαγωγής αρχείου PDF (και να μην γίνεται ερώτηση για κάθε εισαγωγή)
+Error\ creating\ email=Σφάλμα κατά τη δημιουργία email
+Entries\ added\ to\ an\ email=Οι καταχωρήσεις προστέθηκαν σε ένα email
+exportFormat=μορφήεξαγωγής
+Output\ file\ missing=Λείπει το αρχείο εξόδου
+No\ search\ matches.=Δε βρέθηκαν αποτελέσματα αναζήτησης.
+The\ output\ option\ depends\ on\ a\ valid\ input\ option.=Η επιλογή εξόδου εξαρτάται από μια έγκυρη επιλογή εισόδου.
+Default\ import\ style\ for\ drag\ and\ drop\ of\ PDFs=Προεπιλεγμένο στυλ εισαγωγής για μεταφορά και απόθεση αρχείων PDF
+Default\ PDF\ file\ link\ action=Προεπιλεγμένη ενέργεια του συνδέσμου αρχείου PDF
+Filename\ format\ pattern=Μορφή μοτίβου ονόματος αρχείου
+Additional\ parameters=Επιπρόσθετες παράμετροι
+Cite\ selected\ entries\ between\ parenthesis=Αναφορά επιλεγμένων καταχωρήσεων μέσα σε παρενθέσεις
+Cite\ selected\ entries\ with\ in-text\ citation=Αναφορά επιλεγμένων καταχωρήσεων με αναφορά μέσα στο κείμενο
+Cite\ special=Αναφορά ιδιαίτερων
+Extra\ information\ (e.g.\ page\ number)=Περισσότερες πληροφορίες (π.χ. αριθμός σελίδας)
+Manage\ citations=Διαχείριση αναφορών
+Problem\ modifying\ citation=Πρόβλημα κατά την τροποποίηση της αναφοράς
+Citation=Αναφορά
+Extra\ information=Περισσότερες πληροφορίες
+Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Αδυναμία επίλυσης της καταχώρησης BibTeX για τον δείκτη αναφοράς '%0'.
+Select\ style=Επιλογή στυλ
+Journals=Περιοδικά
+Cite=Αναφορά
+Cite\ in-text=Αναφορά μέσα στο κείμενο
+Insert\ empty\ citation=Εισαγωγή κενής αναφοράς
+Merge\ citations=Συγχώνευση αναφορών
+Manual\ connect=Χειροκίνητη σύνδεση
+Select\ Writer\ document=Επιλογή εγγράφου Writer
+Sync\ OpenOffice/LibreOffice\ bibliography=Συγχρονισμός βιβλιογραφίας OpenOffice/LibreOffice
+Select\ which\ open\ Writer\ document\ to\ work\ on=Επιλογή εγγράφου Writer για εργασία
+Connected\ to\ document=Συνδέθηκε στο έγγραφο
+Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Εισάγετε μια αναφορά χωρίς κείμενο (η καταχώρηση θα εμφανιστεί στη λίστα παραπομπών)
+Cite\ selected\ entries\ with\ extra\ information=Αναφορά επιλεγμένων καταχωρήσεων με περισσότερες πληροφορίες
+Ensure\ that\ the\ bibliography\ is\ up-to-date=Βεβαιωθείτε πως η βιβλιογραφία έχει ενημερωθεί
+Your\ OpenOffice/LibreOffice\ document\ references\ the\ BibTeX\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=Το έγγραφο OpenOffice/LibreOffice παραπέμπει στο κλειδί BibTeX key '%0', το οποίο δεν μπόρεσε να βρεθεί στην τρέχουσα βιβλιοθήκη σας.
+Unable\ to\ synchronize\ bibliography=Αδυναμία συγχρονισμού βιβλιογραφίας
+Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Συνδυασμός ζευγών αναφορών που χωρίζονται μόνο με κενό
+Autodetection\ failed=Αποτυχία αυτόματης εύρεσης
+Connecting=Πραγματοποιείται σύνδεση
+Please\ wait...=Παρακαλώ περιμένετε...
+Set\ connection\ parameters=Ορισμός παραμέτρων σύνδεσης
+Path\ to\ OpenOffice/LibreOffice\ directory=Διαδρομή προς φάκελο OpenOffice/LibreOffice
+Path\ to\ OpenOffice/LibreOffice\ executable=Διαδρομή προς εκτελέσιμο αρχείο OpenOffice/LibreOffice
+Path\ to\ OpenOffice/LibreOffice\ library\ dir=Διαδρομή προς κατάλογο βιβλιοθήκης OpenOffice/LibreOffice
+Connection\ lost=Απώλεια σύνδεσης
+The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=Η μορφή παραγράφου ελέγχεται από την ιδιότητα 'ΠαραπομπήΠαράγραφοςΜορφή' ή 'ΠαραπομπήΕπικεφαλίδαΠαράγραφοςΜορφή' στο αρχείο στυλ.
+The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=Η μορφή χαρακτήρων ελέγχεται από την ιδιότητα αναφορών 'ΑναφοράΧαρακτήραςΜορφή' στο αρχείο στυλ.
+Automatically\ sync\ bibliography\ when\ inserting\ citations=Αυτόματος συγχρονισμός βιβλιογραφίας κατά την προσθήκη αναφορών
+Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Αναζήτηση καταχωρήσεων BibTeX μόνο στην ενεργή καρτέλα
+Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Αναζήτηση καταχωρήσεων BibTeX σε όλες τις ενεργές βιβλιοθήκες
+Autodetecting\ paths...=Πραγματοποιείται αυτόματος εντοπισμών διαδρομών...
+Could\ not\ find\ OpenOffice/LibreOffice\ installation=Αδυναμία εύρεσης αρχείου εγκατάστασης του OpenOffice/LibreOffice
+Found\ more\ than\ one\ OpenOffice/LibreOffice\ executable.=Βρέθηκαν περισσότερα από ένα εκτελέσιμα αρχεία OpenOffice/LibreOffice.
+Please\ choose\ which\ one\ to\ connect\ to\:=Παρακαλώ επιλέξτε σε ποιο θέλετε να συνδεθείτε\:
+Choose\ OpenOffice/LibreOffice\ executable=Επιλογή εκτελέσιμου αρχείου OpenOffice/LibreOffice
+Select\ document=Επιλογή εγγράφου
+HTML\ list=Λίστα HTML
+If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Εάν είναι δυνατόν, εναρμονίστε αυτή τη λίστα ονομάτων ώστε να ακολουθεί τη βασική μορφοποίηση ονομάτων του BibTeX
+Could\ not\ open\ %0=Αδυναμία ανοίγματος %0
+Unknown\ import\ format=Άγνωστη μορφή εισαγωγής
+Web\ search=Διαδικτυακή αναζήτηση
+Style\ selection=Επιλογή στυλ
+No\ valid\ style\ file\ defined=Δεν έχει οριστεί έγκυρο αρχείο στυλ
+Choose\ pattern=Επιλογή μοτίβου
+Use\ the\ BIB\ file\ location\ as\ primary\ file\ directory=Χρησιμοποιήστε την τοποθεσία αρχείου BIB ως τον πρωταρχικό φάκελο αρχείου
+Could\ not\ run\ the\ gnuclient/emacsclient\ program.\ Make\ sure\ you\ have\ the\ emacsclient/gnuclient\ program\ installed\ and\ available\ in\ the\ PATH.=Αδυναμία εκτέλεσης του προγράμματος gnuclient/emacsclient. Βεβαιωθείτε πως το πρόγραμμα gnuclient/emacsclient είναι εγκατεστημένο και διαθέσιμο στο PATH.
+OpenOffice/LibreOffice\ connection=Σύνδεση OpenOffice/LibreOffice
+You\ must\ select\ either\ a\ valid\ style\ file,\ or\ use\ one\ of\ the\ default\ styles.=Πρέπει να επιλέξετε ένα έγκυρο αρχείο στυλ, ή να χρησιμοποιήσετε ένα από τα προεπιλεγμένα αρχεία στυλ.
+
+This\ is\ a\ simple\ copy\ and\ paste\ dialog.\ First\ load\ or\ paste\ some\ text\ into\ the\ text\ input\ area.<br>After\ that,\ you\ can\ mark\ text\ and\ assign\ it\ to\ a\ BibTeX\ field.=Αυτός είναι ένας εύκολος διάλογος αντιγραφής κι επικόλλησης. Πρώτα, φορτώστε ένα κείμενο στο πλαίσιο εισαγωγής κειμένου.<br>Έπειτα, μπορείτε να μαρκάρετε το κείμενο και να το αναθέσετε σε ένα πεδίο BibTeX.
+This\ feature\ generates\ a\ new\ library\ based\ on\ which\ entries\ are\ needed\ in\ an\ existing\ LaTeX\ document.=Το χαρακτηριστικό αυτό δημιουργεί μια νέα βιβλιοθήκη βασισμένη στις καταχωρήσεις που απαιτούνται σε ένα υπάρχον έγγραφο LaTeX.
+You\ need\ to\ select\ one\ of\ your\ open\ libraries\ from\ which\ to\ choose\ entries,\ as\ well\ as\ the\ AUX\ file\ produced\ by\ LaTeX\ when\ compiling\ your\ document.=Πρέπει να επιλέξετε μία από τις ανοιχτές σας βιβλιοθήκες για να διαλέξετε καταχωρήσεις, καθώς επίσης και το αρχείο AUX που θα δημιουργηθεί από το LaTeX κατά τη σύνταξη του εγγράφου σας.
+
+First\ select\ entries\ to\ clean\ up.=Πρώτα επιλέξτε καταχωρήσεις προς εκκαθάριση.
+Cleanup\ entry=Εκκαθάριση καταχώρησης
+Autogenerate\ PDF\ Names=Αυτόματη Δημιουργία Ονομάτων PDF
+Auto-generating\ PDF-Names\ does\ not\ support\ undo.\ Continue?=Η Αυτόματη δημιουργία ονομάτων PDF δεν υποστηρίζει λειτουργία αναίρεσης. Συνέχεια;
+
+Use\ full\ firstname\ whenever\ possible=Χρήση πλήρους ονόματος όποτε είναι δυνατόν
+Use\ abbreviated\ firstname\ whenever\ possible=Χρήση συμπτυγμένου ονόματος όποτε είναι δυνατόν
+Use\ abbreviated\ and\ full\ firstname=Χρήση συμπτυγμένου και πλήρους ονόματος
+Autocompletion\ options=Επιλογές αυτόματης συμπλήρωσης
+Name\ format\ used\ for\ autocompletion=Χρησιμοποιούμενη μορφή ονόματος κατά την αυτόματη συμπλήρωση
+Treatment\ of\ first\ names=Μεταχείριση ονομάτων
 Cleanup\ entries=Καθαρισμός καταχωρήσεων
-
-
-
+Automatically\ assign\ new\ entry\ to\ selected\ groups=Αυτόματη ανάθεση νέας καταχώρησης στις επιλεγμένες ομάδες
+%0\ mode=λειτουργία %0
+Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=Μετακίνηση του DOI (Ψηφιακό Αναγνωριστικό Αντικειμένου) από το πεδίο σημείωσης και διεύθυνσης URL, στο πεδίο DOI και αφαίρεση του προθέματος http
+Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=Μετατροπή των διαδρομών των συνδεδεμένων αρχείων σε σχετικές (όπου είναι δυνατόν)
+Rename\ PDFs\ to\ given\ filename\ format\ pattern=Μετονομασία αρχείων PDF σύμφωνα με το ορισμένο μοτίβο ονόματος αρχείου
+Rename\ only\ PDFs\ having\ a\ relative\ path=Μετονομασία μόνο των αρχείων PDF που διαθέτουν σχετική διαδρομή
+Doing\ a\ cleanup\ for\ %0\ entries...=Πραγματοποιείται εκκαθάριση για %0 καταχωρήσεις...
+No\ entry\ needed\ a\ clean\ up=Καμία καταχώρηση δεν χρειάστηκε εκκαθάριση
+One\ entry\ needed\ a\ clean\ up=Μία καταχώρηση χρειάστηκε εκκαθάριση
+%0\ entries\ needed\ a\ clean\ up=%0 καταχωρήσεις χρειάστηκαν εκκαθάριση
+
+Remove\ selected=Αφαίρεση επιλεγμένων
+
+Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=Αδυναμία ανάλυσης του δενδροδιαγράμματος ομάδων. Εάν αποθηκεύσετε τη βιβλιοθήκη BibTeX, όλες οι ομάδες θα χαθούν.
+Attach\ file=Επισύναψη αρχείου
+Setting\ all\ preferences\ to\ default\ values.=Ορισμός όλων των προτιμήσεων στις προεπιλεγμένες τιμές.
+Resetting\ preference\ key\ '%0'=Επαναφορά κλειδιού προτίμησης '%0'
+Unknown\ preference\ key\ '%0'=Άγνωστο κλειδί προτίμησης '%0'
+Unable\ to\ clear\ preferences.=Αδυναμία εκκαθάρισης προτιμήσεων.
+
+Reset\ preferences\ (key1,key2,...\ or\ 'all')=Επαναφορά προτιμήσεων (κλειδί1,κλειδί2,... ή 'όλα')
+Find\ unlinked\ files=Εύρεση μη συνδεδεμένων αρχείων
+Unselect\ all=Αποεπιλογή όλων
+Expand\ all=Ανάπτυξη όλων
+Collapse\ all=Σύμπτυξη όλων
+Opens\ the\ file\ browser.=Ανοίγει τον περιηγητή αρχείων.
+Scan\ directory=Σάρωση φακέλου
+Searches\ the\ selected\ directory\ for\ unlinked\ files.=Σαρώνει τον επιλεγμένο φάκελο για μη συνδεδεμένα αρχεία.
+Starts\ the\ import\ of\ BibTeX\ entries.=Εκκινεί την εισαγωγή καταχωρήσεων BibTeX.
+Create\ directory\ based\ keywords=Δημιουργία λέξεων-κλειδιών βασισμένων στο φάκελο
+Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Δημιουργεί λέξεις-κλειδιά σε καταχωρήσεις που έχουν ήδη δημιουργηθεί με όνομα διαδρομής φακέλου
+Select\ a\ directory\ where\ the\ search\ shall\ start.=Επιλέξτε ένα φάκελο από όπου θα ξεκινήσει η αναζήτηση.
+Select\ file\ type\:=Επιλογή τύπου αρχείου\:
+These\ files\ are\ not\ linked\ in\ the\ active\ library.=Αυτά τα αρχεία δεν συνδέονται με την ενεργή βιβλιοθήκη.
+Entry\ type\ to\ be\ created\:=Τύπος καταχώρησης προς δημιουργία\:
+Searching\ file\ system...=Πραγματοποιείται αναζήτηση στο σύστημα αρχείου...
+Select\ directory=Επιλογή φακέλου
+Select\ files=Επιλογή αρχείων
+BibTeX\ entry\ creation=Δημιουργία καταχώρησης BibTeX
+Unable\ to\ connect\ to\ FreeCite\ online\ service.=Αδυναμία σύνδεσης με την online υπηρεσία FreeCite.
+Parse\ with\ FreeCite=Ανάλυση με FreeCite
+How\ would\ you\ like\ to\ link\ to\ '%0'?=Πώς θα θέλατε να συνδεθείτε με το '%0';
+BibTeX\ key\ patterns=Μοτίβα κλειδιών BibTeX
+Changed\ special\ field\ settings=Οι ρυθμίσεις ειδικού πεδίου έχουν αλλάξει
+Clear\ priority=Εκκαθάριση προτεραιότητας
+Clear\ rank=Εκκαθάριση ιεράρχησης
+Enable\ special\ fields=Ενεργοποίηση ειδικών πεδίων
+One\ star=Ένα αστέρι
+Two\ stars=Δύο αστέρια
+Three\ stars=Τρία αστέρια
+Four\ stars=Τέσσερα αστέρια
+Five\ stars=Πέντε αστέρια
+Help\ on\ special\ fields=Βοήθεια σε ειδικά πεδία
+Keywords\ of\ selected\ entries=Λέξεις-κλειδιά των επιλεγμένων καταχωρήσεων
+Manage\ content\ selectors=Διαχείριση των επιλογέων περιεχομένου
 Manage\ keywords=Διαχείριση λέξεων κλειδιών
-
-
-
+No\ priority\ information=Δεν υπάρχουν πληροφορίες προτεραιότητας
+No\ rank\ information=Δεν υπάρχουν πληροφορίες ιεράρχησης
+Priority=Προτεραιότητα
+Priority\ high=Προτεραιότητα υψηλή
+Priority\ low=Προτεραιότητα χαμηλή
+Priority\ medium=Προτεραιότητα μέση
+Quality=Ποιότητα
+Rank=Ιεράρχηση
+Relevance=Συνάφεια
+Set\ priority\ to\ high=Ορισμός προτεραιότητας σε υψηλή
+Set\ priority\ to\ low=Ορισμός προτεραιότητας σε χαμηλή
+Set\ priority\ to\ medium=Ορισμός προτεραιότητας σε μέση
+Show\ priority=Εμφάνιση προτεραιότητας
+Show\ quality=Εμφάνιση ποιότητας
+Show\ rank=Εμφάνιση ιεράρχησης
+Show\ relevance=Εμφάνιση συνάφειας
+Synchronize\ with\ keywords=Συγχρονισμός με λέξεις-κλειδιά
+Synchronized\ special\ fields\ based\ on\ keywords=Τα ειδικά πεδία έχουν συγχρονιστεί βάσει λέξεων-κλειδιών
+Toggle\ relevance=Αλλάξτε την επιλογή συνάφειας
+Toggle\ quality\ assured=Αλλάξτε την επιλογή εξασφαλισμένης ποιότητας
+Toggle\ print\ status=Αλλάξτε την επιλογή κατάστασης εκτύπωσης
+Update\ keywords=Ενημέρωση λέξεων-κλειδιών
+Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Εγγραφή τιμών ειδικών πεδίων στο BibTeX ως ξεχωριστά πεδία
+You\ have\ changed\ settings\ for\ special\ fields.=Έχετε αλλάξει τις ρυθμίσεις για ειδικά πεδία.
+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.=Απώλεια σύνδεσης με το OpenOffice/LibreOffice. Παρακαλώ βεβαιωθείτε πως το OpenOffice/LibreOffice λειτουργεί, και επιχειρήστε επανασύνδεση.
+JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=Το JabRef θα στείλει σε έναν εκδότη τουλάχιστον ένα αίτημα ανά καταχώρηση.
+Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Διορθώστε την καταχώρηση, και ανοίξτε ξανά τον επεξεργαστή κειμένου για να προβάλλετε/επεξεργαστείτε την πηγή.
+Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Αδυναμία σύνδεσης σε εν λειτουργία OpenOffice/LibreOffice.
+Make\ sure\ you\ have\ installed\ OpenOffice/LibreOffice\ with\ Java\ support.=Βεβαιωθείτε πως έχετε εγκαταστήσει OpenOffice/LibreOffice με υποστήριξη Java.
+If\ connecting\ manually,\ please\ verify\ program\ and\ library\ paths.=Εάν συνδέεστε αυτόματα, παρακαλώ επιβεβαιώστε τις διαδρομές προγράμματος και βιβλιοθήκης.
+Error\ message\:=Μήνυμα σφάλματος\:
+If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Εάν μια επικολλημένη ή εισηγμένη καταχώρηση έχει ήδη ορισμένο το πεδίο, αντικαταστήστε την.
+Import\ metadata\ from\ PDF=Εισαγωγή μεταδεδομένων από αρχείο PDF
+Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Δεν υπάρχει σύνδεση με κανένα έγγραφο Writer. Παρακαλώ βεβαιωθείτε πως το έγγραφο είναι ανοιχτό, και χρησιμοποιήστε το κουμπί 'Επιλογή εγγράφου Writer' για να συνδεθείτε με αυτό.
+Removed\ all\ subgroups\ of\ group\ "%0".=Αφαίρεση όλων των υπο-ομάδων της ομάδας "%0".
+To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Για την απενεργοποίηση της λειτουργίας memory stick, μετονομάστε ή μετακινήστε το αρχείο jabref.xml στον ίδιο φάκελο με το JabRef.
+Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Αδυναμία σύνδεσης. Μια πιθανή αιτία είναι ότι το JabRef και το OpenOffice/LibreOffice δεν τρέχουν σε ίδια λειτουργία 32 bit ή 64 bit.
+Use\ the\ following\ delimiter\ character(s)\:=Χρησιμοποιήστε τους παρακάτω χαρακτήρες οριοθέτησης\:
+When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ prefer\ the\ BIB\ file\ location\ rather\ than\ the\ file\ directory\ set\ above=Κατά τη λήψη αρχείων, ή τη μετακίνηση συνδεδεμένων αρχείων στο φάκελο αρχείου, να προτιμάτε την τοποθεσία αρχείου BIB παρά το φάκελο αρχείου που έχει οριστεί παραπάνω
+Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Το αρχείο στυλ καθορίζει τη μορφή χαρακτήρων '%0', η οποία δεν ορίζεται στο τρέχον αρχείο OpenOffice/LibreOffice.
+Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Το αρχείο στυλ καθορίζει τη μορφή παραγράφου '%0', η οποία δεν ορίζεται στο τρέχον αρχείο OpenOffice/LibreOffice.
+
+Searching...=Πραγματοποιείται αναζήτηση...
+Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Προσθέστε {} κατά την αναζήτηση σε συγκεκριμένες λέξεις του τίτλου, προκειμένου να διατηρηθεί η σωστή αντιστοιχία πεζών-κεφαλαίων
+Import\ conversions=Εισαγωγή μετατροπών
+Please\ enter\ a\ search\ string=Παρακαλώ εισάγετε μια συμβολοσειρά αναζήτησης
+Please\ open\ or\ start\ a\ new\ library\ before\ searching=Παρακαλώ ανοίξτε ή ξεκινήστε μια νέα βιβλιοθήκη πριν την αναζήτηση
+
+Canceled\ merging\ entries=Ακύρωση συγχώνευσης καταχωρήσεων
+
+Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Μορφοποιήστε τις μονάδες με την προσθήκη μη-διακοπτόμενων διαχωριστικών και τη διατήρηση της σωστής αντιστοιχίας πεζών-κεφαλαίων κατά την αναζήτηση
 Merge\ entries=Συγχώνευση καταχωρήσεων
-
-
-
-
+Merged\ entries=Συγχωνευμένες καταχωρήσεις
+None=Καμία
+Parse=Ανάλυση
+Result=Αποτέλεσμα
+Show\ DOI\ first=Εμφάνιση DOI πρώτα
+Show\ URL\ first=Εμφάνιση διεύθυνσης URL πρώτα
+Use\ Emacs\ key\ bindings=Χρήση συντομεύσεων πληκτρολογίου Emacs
+You\ have\ to\ choose\ exactly\ two\ entries\ to\ merge.=Πρέπει να επιλέξετε ακριβώς δύο καταχωρήσεις για συγχώνευση.
+
+Update\ timestamp\ on\ modification=Ενημέρωση χρονοσήμανσης κατά την τροποποίηση
+All\ key\ bindings\ will\ be\ reset\ to\ their\ defaults.=Θα γίνει επαναφορά όλων των συντομεύσεων πληκτρολογίου στις προεπιλογές τους.
+
+Automatically\ set\ file\ links=Αυτόματος ορισμός συνδέσμων αρχείου
+Resetting\ all\ key\ bindings=Πραγματοποιείται επαναφορά όλων των συντομεύσεων πληκτρολογίου
+Hostname=Όνομα κεντρικού διαμεσολαβητή
+Invalid\ setting=Μη έγκυρη ρύθμιση
+Network=Δίκτυο
+Please\ specify\ both\ hostname\ and\ port=Παρακαλώ ορίστε όνομα κεντρικού διαμεσολαβητή και θύρα
+Please\ specify\ both\ username\ and\ password=Παρακαλώ ορίστε όνομα χρήστη και κωδικό πρόσβασης
+
+Use\ custom\ proxy\ configuration=Χρήση προσαρμοσμένων ρυθμίσεων του διακομιστή μεσολάβησης
+Proxy\ requires\ authentication=Ο διακομιστής μεσολάβησης απαιτεί ταυτοποίηση
+Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Προσοχή\: Ο κωδικός πρόσβασης είναι αποθηκευμένος σε απλό κείμενο\!
+Clear\ connection\ settings=Εκκαθάριση ρυθμίσεων σύνδεσης
+
+Rebind\ C-a,\ too=Επανασύνδεση και του C-a
+Rebind\ C-f,\ too=Επανασύνδεση και του C-f
 
 Open\ folder=Άνοιγμα φακέλου
-
-
-
+Searches\ for\ unlinked\ PDF\ files\ on\ the\ file\ system=Πραγματοποιεί αναζήτηση στα αρχεία PDF που δεν έχουν συνδεθεί σε αυτό το σύστημα αρχείου
+Export\ entries\ ordered\ as\ specified=Εξαγωγή καταχωρήσεων με την σειρά που έχουν καθοριστεί
+Export\ sort\ order=Εξαγωγή σειράς ταξινόμησης
+Export\ sorting=Εξαγωγή ταξινόμησης
+Newline\ separator=Διαχωριστικό νέας σειράς
+
+Save\ entries\ ordered\ as\ specified=Αποθήκευση καταχωρήσεων με την σειρά που έχουν καθοριστεί
+Save\ sort\ order=Αποθήκευση σειράς ταξινόμησης
+Show\ extra\ columns=Εμφάνιση επιπλέον στηλών
+Parsing\ error=Σφάλμα ανάλυσης
+illegal\ backslash\ expression=εσφαλμένη έκφραση backslash
+
+Move\ to\ group=Μετακίνηση στην ομάδα
+
+Clear\ read\ status=Εκκαθάριση κατάστασης ανάγνωσης
+Convert\ to\ biblatex\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journal'\ field\ to\ 'journaltitle')=Μετατροπή σε μορφή biblatex (για παράδειγμα, μετακίνηση της τιμής του πεδίου 'περιοδικό' στο πεδίο 'τίτλοςπεριοδικού')
+Could\ not\ apply\ changes.=Αδυναμία εφαρμογής αλλαγών.
+Deprecated\ fields=Παρωχημένα πεδία
+No\ read\ status\ information=Δεν υπάρχουν πληροφορίες για την κατάσταση ανάγνωσης
+Printed=Εκτυπώθηκε
+Read\ status=Κατάσταση ανάγνωσης
+Read\ status\ read=Κατάσταση ανάγνωσης\: 'διαβάστηκε'
+Read\ status\ skimmed=Κατάσταση ανάγνωσης\: 'διαβάστηκε επί τροχάδην'
 Save\ selected\ as\ plain\ BibTeX...=Αποθήκευση επιλεγμένου ως plain BibTeX...
-
-
-
-
-
-
-
+Set\ read\ status\ to\ read=Ορισμός κατάστασης ανάγνωσης σε\: 'διαβάστηκε'
+Set\ read\ status\ to\ skimmed=Ορισμός κατάστασης ανάγνωσης σε\: 'διαβάστηκε επί τροχάδην'
+Show\ deprecated\ BibTeX\ fields=Εμφάνιση παρωχημένων πεδίων BibTeX
+
+Show\ printed\ status=Εμφάνιση κατάστασης εκτύπωσης
+Show\ read\ status=Εμφάνιση κατάστασης ανάγνωσης
+
+Opens\ JabRef's\ GitHub\ page=Ανοίγει τη σελίδα του JabRef στο GitHub
+Opens\ JabRef's\ Twitter\ page=Ανοίγει τη σελίδα του JabRef στο Twitter
+Opens\ JabRef's\ Facebook\ page=Ανοίγει τη σελίδα του JabRef στο Facebook
+Opens\ JabRef's\ blog=Ανοίγει τo ιστολόγιο του JabRef
+Opens\ JabRef's\ website=Ανοίγει τον ιστότοπο του JabRef
+
+Could\ not\ open\ browser.=Αδυναμία ανοίγματος του περιηγητή.
+Please\ open\ %0\ manually.=Παρακαλώ ανοίξτε το %0 χειροκίνητα.
+The\ link\ has\ been\ copied\ to\ the\ clipboard.=Ο σύνδεσμος έχει αντιγραφεί στο πρόχειρο.
+
+Open\ %0\ file=Άνοιγμα του αρχείου %0
+
+Cannot\ delete\ file=Αδυναμία διαγραφής αρχείου
+File\ permission\ error=Σφάλμα δικαιωμάτων αρχείου
+Push\ to\ %0=Προώθηση σε %0
+Path\ to\ %0=Διαδρομή για %0
+Convert=Μετατροπή
+Normalize\ to\ BibTeX\ name\ format=Εναρμόνιση με μορφή ονόματος BibTeX
+Help\ on\ Name\ Formatting=Βοήθεια στην Μορφοποίηση Ονόματος
+
+Add\ new\ file\ type=Προσθήκη νέου τύπου αρχείου
+
+Left\ entry=Αριστερή καταχώρηση
+Right\ entry=Δεξιά καταχώρηση
+Original\ entry=Αρχική καταχώρηση
+No\ information\ added=Δεν προστέθηκαν πληροφορίες
+Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Επιλέξτε τουλάχιστον μια καταχώρηση για να διαχειριστείτε λέξεις-κλειδιά.
+OpenDocument\ text=Αρχείο κειμένου OpenDocument
+OpenDocument\ spreadsheet=Υπολογιστικό φύλλο OpenDocument
+OpenDocument\ presentation=Παρουσίαση OpenDocument
+%0\ image=Εικόνα %0
+Added\ entry=Η καταχώρηση προστέθηκε
+Modified\ entry=Η καταχώρηση τροποποιήθηκε
+Deleted\ entry=Η καταχώρηση διαγράφηκε
+Modified\ groups\ tree=Το δενδροδιάγραμμα ομάδων τροποποιήθηκε
+Removed\ all\ groups=Όλες οι ομάδες αφαιρέθηκαν
+Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=Η αποδοχή των αλλαγών αντικαθιστά το πλήρες δενδροδιάγραμμα ομάδων με ένα δενδροδιάγραμμα ομάδων τροποποιημένο εξωτερικά.
+Select\ export\ format=Επιλογή μορφής εξαγωγής
+Return\ to\ JabRef=Επιστροφή στο JabRef
+Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Παρακαλώ μετακινήστε το αρχείο χειροκίνητα και συνδέστε το στη σωστή θέση.
+Could\ not\ connect\ to\ %0=Αδυναμία σύνδεσης στη %0
+Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Προειδοποίηση\: %0 από %1 καταχωρήσεις δεν έχουν ορισμένο τίτλο.
+Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Προειδοποίηση\: %0 από %1 καταχωρήσεις δεν έχουν ορισμένο κλειδί BibTeX.
+Added\ new\ '%0'\ entry.=Προστέθηκε νέα καταχώρηση '%0'.
+Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Επιλέχθηκαν πολλαπλές καταχωρήσεις. Θέλετε να αλλάξετε των τύπο όλων αυτών σε '%0';
+Changed\ type\ to\ '%0'\ for=Ο τύπος άλλαξε σε '%0' για
+Really\ delete\ the\ selected\ entry?=Θέλετε όντως να διαγράψετε την επιλεγμένη καταχώρηση;
+Really\ delete\ the\ %0\ selected\ entries?=Θέλετε όντως να διαγράψετε τις %0 επιλεγμένες καταχωρήσεις;
+Keep\ merged\ entry\ only=Διατήρηση μόνο της συγχωνευμένης καταχώρησης
+Keep\ left=Παραμονή αριστερά
+Keep\ right=Παραμονή δεξιά
+Old\ entry=Παλιά καταχώρηση
+From\ import=Από εισαγωγή
+No\ problems\ found.=Δεν εντοπίστηκαν προβλήματα.
+%0\ problem(s)\ found=Εντοπίστηκαν %0 προβλήματα
+Save\ changes=Αποθήκευση αλλαγών
+Discard\ changes=Απόρριψη αλλαγών
+Library\ '%0'\ has\ changed.=Η βιβλιοθήκη '%0' έχει αλλάξει.
+Print\ entry\ preview=Προεπισκόπηση εκτύπωσης καταχώρησης
+Copy\ title=Αντιγραφή τίτλου
+Copy\ \\cite{BibTeX\ key}=Αντιγραφή \\cite{BibTeX key}
 Copy\ BibTeX\ key\ and\ title=Αντιγραφή BibTeX και τίτλου
-
-
-
+Invalid\ DOI\:\ '%0'.=Μη έγκυρο DOI\: '%0'.
+should\ start\ with\ a\ name=πρέπει να ξεκινάει με όνομα
+should\ end\ with\ a\ name=πρέπει να τελειώνει με όνομα
+unexpected\ closing\ curly\ bracket=μη αναμενόμενο κλείσιμο αγκιστροειδούς αγκύλης
+unexpected\ opening\ curly\ bracket=μη αναμενόμενο άνοιγμα αγκιστροειδούς αγκύλης
+capital\ letters\ are\ not\ masked\ using\ curly\ brackets\ {}=οι κεφαλαίοι χαρακτήρες δεν σημειώνονται μέσα σε αγκιστροειδείς αγκύλες {}
+should\ contain\ a\ four\ digit\ number=πρέπει να περιέχει τετραψήφιο αριθμό
+should\ contain\ a\ valid\ page\ number\ range=πρέπει να περιέχει ένα έγκυρο εύρος αριθμών σελίδων
+Filled=Γεμάτο
+Field\ is\ missing=Το πεδίο λείπει
+Search\ %0=Αναζήτηση %0
+
+Search\ results\ in\ all\ libraries\ for\ %0=Αποτελέσματα αναζήτησης σε όλες τις βιβλιοθήκες για %0
+Search\ results\ in\ library\ %0\ for\ %1=Αποτελέσματα αναζήτησης στη βιβλιοθήκη %0 για %1
+Search\ globally=Καθολική αναζήτηση
+No\ results\ found.=Δε βρέθηκαν αποτελέσματα.
+Found\ %0\ results.=Βρέθηκαν %0 αποτελέσματα.
+plain\ text=απλό κείμενο
+This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ regular\ expression\ <b>%0</b>=Αυτή η αναζήτηση περιέχει καταχωρήσεις στις οποίες οποιοδήποτε πεδίο θα περιέχει την κανονική έκφραση <b>%0</b>
+This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ term\ <b>%0</b>=Αυτή η αναζήτηση περιέχει καταχωρήσεις στις οποίες οποιοδήποτε πεδίο θα περιέχει τον όρο <b>%0</b>
+This\ search\ contains\ entries\ in\ which=Αυτή η αναζήτηση περιέχει καταχωρήσεις στις οποίες
+
+Unable\ to\ autodetect\ OpenOffice/LibreOffice\ installation.\ Please\ choose\ the\ installation\ directory\ manually.=Αδυναμία αυτόματου εντοπισμού εγκατάστασης OpenOffice/LibreOffice. Παρακαλώ επιλέξτε τον φάκελο εγκατάστασης χειροκίνητα.
+JabRef\ no\ longer\ supports\ 'ps'\ or\ 'pdf'\ fields.<br>File\ links\ are\ now\ stored\ in\ the\ 'file'\ field\ and\ files\ are\ stored\ in\ an\ external\ file\ directory.<br>To\ make\ use\ of\ this\ feature,\ JabRef\ needs\ to\ upgrade\ file\ links.<br><br>=Το JabRef δεν υποστηρίζει πλέον τα πεδία 'ps' ή 'pdf'.<br>Οι σύνδεσμοι των αρχείων τώρα αποθηκεύονται πεδίο 'Αρχείο' και τα αρχεία σε έναν εξωτερικό φάκελο.<br>Για να χρησιμοποιήσετε αυτό το χαρακτηριστικό, το JabRef χρειάζεται να αναβαθμίσει τους συνδέσμους του αρχείου.<br><br>
+This\ library\ uses\ outdated\ file\ links.=Αυτή η βιβλιοθήκη χρησιμοποιεί ξεπερασμένους συνδέσμους αρχείων.
+
+Close\ library=Κλείσιμο βιβλιοθήκης
+Decrease\ table\ font\ size=Μείωση μεγέθους γραμματοσειράς πίνακα
+Entry\ editor,\ next\ entry=Επεξεργαστής κειμένου καταχώρησης, επόμενη καταχώρηση
+Entry\ editor,\ next\ panel=Επεξεργαστής κειμένου καταχώρησης, επόμενο πλαίσιο
+Entry\ editor,\ next\ panel\ 2=Επεξεργαστής κειμένου καταχώρησης, επόμενο πλαίσιο 2
+Entry\ editor,\ previous\ entry=Επεξεργαστής κειμένου καταχώρησης, προηγούμενη καταχώρηση
+Entry\ editor,\ previous\ panel=Επεξεργαστής κειμένου καταχώρησης, προηγούμενο πλαίσιο
+Entry\ editor,\ previous\ panel\ 2=Επεξεργαστής κειμένου καταχώρησης, προηγούμενο πλαίσιο 2
+File\ list\ editor,\ move\ entry\ down=Επεξεργαστής κειμένου λίστας αρχείων, μετακίνηση καταχώρησης προς τα κάτω
+File\ list\ editor,\ move\ entry\ up=Επεξεργαστής κειμένου λίστας αρχείων, μετακίνηση καταχώρησης προς τα πάνω
 Focus\ entry\ table=Επικεντρωμένη εισαγωγή πίνακα
-Import\ into\ current\ library=Εισαγωγή στη τρέχουσα βιβλιοθήκη
+Import\ into\ current\ library=Εισαγωγή στην τρέχουσα βιβλιοθήκη
 Import\ into\ new\ library=Εισαγωγή σε νέα βιβλιοθήκη
+Increase\ table\ font\ size=Αύξηση μεγέθους γραμματοσειράς πίνακα
+New\ article=Νέο άρθρο
+New\ book=Νέο βιβλίο
+New\ entry=Νέα καταχώρηση
+New\ from\ plain\ text=Νέο από απλό κείμενο
+New\ inbook=Νέο ένθετο
+New\ mastersthesis=Νέα μεταπτυχιακή διατριβή
+New\ phdthesis=Νέα διδακτορική διατριβή
+New\ proceedings=Νέα πρακτικά
+New\ unpublished=Νέο αδημοσίευτο
+Preamble\ editor,\ store\ changes=Επεξεργαστής κειμένου εισαγωγής, αποθήκευση αλλαγών
+Push\ to\ application=Προώθηση προς εφαρμογή
+Refresh\ OpenOffice/LibreOffice=Ανανέωση OpenOffice/LibreOffice
 Resolve\ duplicate\ BibTeX\ keys=Resolve διπλότυπων BibTeX keys
 Save\ all=Αποθήκευση όλων
-
-
-
+String\ dialog,\ add\ string=Παράθυρο διαλόγου συμβολοσειράς, προσθήκη συμβολοσειράς
+String\ dialog,\ remove\ string=Παράθυρο διαλόγου συμβολοσειράς, αφαίρεση συμβολοσειράς
+Synchronize\ files=Συγχρονισμός αρχείων
+Unabbreviate=Αποσύμπτυξη
+should\ contain\ a\ protocol=πρέπει να περιέχει ένα πρωτόκολλο
+Copy\ preview=Αντιγραφή προεπισκόπησης
+Automatically\ setting\ file\ links=Αυτόματος ορισμός συνδέσμων αρχείου
+Regenerating\ BibTeX\ keys\ according\ to\ metadata=Πραγματοποιείται αναδημιουργία κλειδιών BibTeX σύμφωνα με τα μεταδεδομένα
+Regenerate\ all\ keys\ for\ the\ entries\ in\ a\ BibTeX\ file=Αναδημιουργία όλων των κλειδιών για τις καταχωρήσεις σε ένα αρχείο BibTeX
+Show\ debug\ level\ messages=Εμφάνιση μηνυμάτων επιπέδου αποσφαλμάτωσης
+Default\ bibliography\ mode=Προεπιλεγμένη λειτουργία βιβλιογραφίας
+New\ %0\ library\ created.=Δημιουργήθηκε νέα βιβλιοθήκη %0.
+Show\ only\ preferences\ deviating\ from\ their\ default\ value=Εμφάνιση μόνο των προτιμήσεων που είναι διαφορετικές από την προεπιλεγμένη τους τιμή
+default=προεπιλογή
+key=κλειδί
+type=τύπος
+value=τιμή
+Show\ preferences=Εμφάνιση προτιμήσεων
+Save\ actions=Αποθήκευση ενεργειών
+Enable\ save\ actions=Ενεργοποίηση αποθήκευσης ενεργειών
+Convert\ to\ BibTeX\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journaltitle'\ field\ to\ 'journal')=Μετατροπή σε τύπο BibTeX (για παράδειγμα, μετακίνηση της τιμής του πεδίου 'τίτλοςπεριοδικού' στο πεδίο 'περιοδικό')
+
+Other\ fields=Άλλα πεδία
+Show\ remaining\ fields=Εμφάνιση εναπομείναντων πεδίων
+
+link\ should\ refer\ to\ a\ correct\ file\ path=ο σύνδεσμος πρέπει να αναφέρεται σε σωστή διαδρομή αρχείου
+abbreviation\ detected=εντοπίστηκε συντομογραφία
+wrong\ entry\ type\ as\ proceedings\ has\ page\ numbers=εσφαλμένος τύπος καταχώρησης καθώς η διαδικασία εμπεριέχει αριθμούς σελίδων
+Abbreviate\ journal\ names=Σύμπτυξη ονομάτων περιοδικών
+Abbreviating...=Πραγματοποιείται σύμπτυξη...
+Abbreviation\ %s\ for\ journal\ %s\ already\ defined.=Η συντομογραφία %s για το περιοδικό %s έχει οριστεί ήδη.
+Abbreviation\ cannot\ be\ empty=Η συντομογραφία δεν μπορεί να είναι κενή
+Duplicated\ Journal\ Abbreviation=Διπλότυπη Συντομογραφία Περιοδικού
+Duplicated\ Journal\ File=Διπλότυπο Αρχείο Περιοδικού
+Error\ Occurred=Προέκυψε Σφάλμα
+Journal\ file\ %s\ already\ added=Το αρχείο περιοδικού %s προστέθηκε ήδη
+Name\ cannot\ be\ empty=Το όνομα δεν μπορεί να είναι κενό
+
+Display\ keywords\ appearing\ in\ ALL\ entries=Προβολή λέξεων-κλειδιών που εμφανίζονται σε ΟΛΕΣ τις καταχωρήσεις
+Display\ keywords\ appearing\ in\ ANY\ entry=Προβολή λέξεων-κλειδιών που εμφανίζονται σε ΟΠΟΙΑΔΗΠΟΤΕ καταχώρηση
+None\ of\ the\ selected\ entries\ have\ titles.=Καμία από τις επιλεγμένες καταχωρήσεις δεν έχουν τίτλους.
+None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=Καμία από τις επιλεγμένες καταχωρήσεις δεν έχουν κλειδιά BibTeX.
 Unabbreviate\ journal\ names=Ονόματα περιοδικών χωρίς συντομογραφία
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+Unabbreviating...=Πραγματοποιείται αναίρεση σύμπτυξης...
+Usage=Χρήση
+
+
+Adds\ {}\ brackets\ around\ acronyms,\ month\ names\ and\ countries\ to\ preserve\ their\ case.=Προσθέτει αγκύλες {} γύρω από ακρωνύμια, ονόματα μηνών και χωρών για να διατηρήσει τους κεφαλαίους χαρακτήρες.
+Are\ you\ sure\ you\ want\ to\ reset\ all\ settings\ to\ default\ values?=Είστε βέβαιοι πως θέλετε να επαναφέρετε όλες τις ρυθμίσεις στις προεπιλεγμένες τους τιμές;
+Reset\ preferences=Επαναφορά προτιμήσεων
+Ill-formed\ entrytype\ comment\ in\ BIB\ file=Σχόλιο με κακοδιατυπωμένο τύπο καταχώρησης στο αρχείο BIB
+
+Move\ linked\ files\ to\ default\ file\ directory\ %0=Μετακίνηση συνδεδεμένων αρχείων στον προεπιλεγμένο φάκελο αρχείου %0
+
+Do\ you\ still\ want\ to\ continue?=Θέλετε ακόμα να συνεχίσετε;
+This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=Αυτή η ενέργεια θα τροποποιήσει τα παρακάτω πεδία σε τουλάχιστον μια καταχώρηση για το καθένα\:
+This\ could\ cause\ undesired\ changes\ to\ your\ entries.=Αυτό θα προκαλούσε ανεπιθύμητες αλλαγές στις καταχωρήσεις σας.
+Run\ field\ formatter\:=Εκτέλεση μορφοποιητή πεδίου\:
+Table\ font\ size\ is\ %0=Το μέγεθος γραμματοσειράς πίνακα είναι %0
+Internal\ style=Εσωτερικό στυλ
+Add\ style\ file=Προσθήκη αρχείου στυλ
+Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=Είστε σίγουρος πως θέλετε να αφαιρέσετε αυτό το στυλ;
+Current\ style\ is\ '%0'=Το τρέχον στυλ είναι '%0'
+Remove\ style=Αφαίρεση στυλ
+Select\ one\ of\ the\ available\ styles\ or\ add\ a\ style\ file\ from\ disk.=Επιλέξτε μόνο ένα από τα διαθέσιμα στυλ ή προσθέστε ένα αρχείο στυλ από το δίσκο.
+You\ must\ select\ a\ valid\ style\ file.=Πρέπει να επιλέξετε έναν έγκυρο αρχείο στυλ.
+Reload=Επαναφόρτωση
+
+Capitalize=Κεφαλαιοποίηση
+Capitalize\ all\ words,\ but\ converts\ articles,\ prepositions,\ and\ conjunctions\ to\ lower\ case.=Μετατρέπει όλες τις λέξεις σε κεφαλαία γράμματα, αλλά μετατρέπει τα άρθρα, τις προθέσεις, και τους συνδέσμους σε πεζούς χαρακτήρες.
+Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Μετατρέπει την πρώτη λέξη σε κεφαλαία γράμματα και όλες τις υπόλοιπες σε πεζούς χαρακτήρες.
+Changes\ all\ letters\ to\ lower\ case.=Αλλάζει όλα τα γράμματα με πεζούς χαρακτήρες.
+Changes\ all\ letters\ to\ upper\ case.=Αλλάζει όλα τα γράμματα με κεφαλαίους χαρακτήρες.
+Changes\ the\ first\ letter\ of\ all\ words\ to\ capital\ case\ and\ the\ remaining\ letters\ to\ lower\ case.=Αλλάζει το πρώτο γράμμα όλων των λέξεων σε κεφαλαίο και τα υπόλοιπα γράμματα σε πεζούς χαρακτήρες.
+Cleans\ up\ LaTeX\ code.=Εκκαθαρίζει των κώδικα LaTeX.
+Converts\ HTML\ code\ to\ LaTeX\ code.=Μετατρέπει τον κώδικα HTML σε κώδικα LaTeX.
+HTML\ to\ Unicode=HTML σε Unicode
+Converts\ HTML\ code\ to\ Unicode.=Μετατρέπει τον κώδικα HTML σε Unicode.
+Converts\ LaTeX\ encoding\ to\ Unicode\ characters.=Μετατρέπει την κωδικοποίηση LaTeX σε χαρακτήρες Unicode.
+Converts\ Unicode\ characters\ to\ LaTeX\ encoding.=Μετατρέπει τους χαρακτήρες Unicode σε κωδικοποίηση LaTeX.
+Converts\ ordinals\ to\ LaTeX\ superscripts.=Μετατρέπει αριθμούς σε υπερκείμενα LaTeX.
+Converts\ units\ to\ LaTeX\ formatting.=Μετατρέπει μονάδες σε μορφοποίηση LaTeX.
+HTML\ to\ LaTeX=HTML σε LaTeX
+LaTeX\ cleanup=Εκκαθάριση LaTeX
+LaTeX\ to\ Unicode=LaTeX σε Unicode
+Lower\ case=Πεζοί χαρακτήρες
+Minify\ list\ of\ person\ names=Μείωση λίστας ονομάτων ατόμων
+Normalize\ date=Εναρμόνιση ημερομηνίας
+Normalize\ en\ dashes=Εναρμόνιση με μεγάλες παύλες
+Normalize\ month=Εναρμόνιση μήνα
+Normalize\ month\ to\ BibTeX\ standard\ abbreviation.=Εναρμόνιση μήνα με τη βασική συντομογραφία BibTeX.
+Normalize\ names\ of\ persons=Εναρμόνιση ονομάτων ατόμων
+Normalize\ page\ numbers=Εναρμόνιση αριθμών σελίδας
+Normalize\ pages\ to\ BibTeX\ standard.=Εναρμόνιση σελίδων με το πρότυπο BibTeX.
+Normalizes\ lists\ of\ persons\ to\ the\ BibTeX\ standard.=Εναρμονίζει τη λίστα ατόμων με το πρότυπο BibTeX.
+Normalizes\ the\ date\ to\ ISO\ date\ format.=Εναρμονίζει την ημερομηνία με τη μορφή ημερομηνίας ISO.
+Normalizes\ the\ en\ dashes.=Εναρμονίζει το περιεχόμενο ανάμεσα σε παύλες.
+Ordinals\ to\ LaTeX\ superscript=Αριθμοί σε υπερκείμενο LaTeX
+Protect\ terms=Προστασία όρων
+Add\ enclosing\ braces=Προσθήκη εσωκλειόντων παρενθέσεων
+Add\ braces\ encapsulating\ the\ complete\ field\ content.=Προσθήκη παρενθέσεων που περιέχουν το πλήρες περιεχόμενο πεδίου.
+Remove\ enclosing\ braces=Αφαίρεση εσωκλειόντων παρενθέσεων
+Removes\ braces\ encapsulating\ the\ complete\ field\ content.=Αφαιρεί τις παρενθέσεις που περιέχουν το πλήρες περιεχόμενο πεδίου.
+Sentence\ case=Πεζοί-κεφαλαίοι χαρακτήρες πρότασης
+Shortens\ lists\ of\ persons\ if\ there\ are\ more\ than\ 2\ persons\ to\ "et\ al.".=Συντομεύει τη λίστα ατόμων σε "και συνεργάτες", εάν υπάρχουν περισσότερα από 2 άτομα.
+Title\ case=Πεζοί-κεφαλαίοι χαρακτήρες τίτλου
+Unicode\ to\ LaTeX=Unicode σε LaTeX
+Units\ to\ LaTeX=Μονάδες σε LaTeX
+Upper\ case=Κεφαλαίοι χαρακτήρες
+Does\ nothing.=Δεν εκτελεί καμία ενέργεια.
+Identity=Ταυτότητα
+Clears\ the\ field\ completely.=Εκκαθαρίζει πλήρως το πεδίο.
+Directory\ not\ found=Ο φάκελος δε βρέθηκε
+Main\ file\ directory\ not\ set\!=Ο κύριος φάκελος αρχείου δεν έχει οριστεί\!
+This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Αυτή η ενέργεια απαιτεί την επιλογή ακριβώς ενός αντικειμένου.
+Importing\ in\ %0\ format=Πραγματοποιείται εισαγωγή σε μορφή %0
+Female\ name=Γυναικείο όνομα
+Female\ names=Γυναικεία ονόματα
+Male\ name=Ανδρικό όνομα
+Male\ names=Ανδρικά ονόματα
+Mixed\ names=Μεικτά ονόματα
+Neuter\ name=Ουδέτερο όνομα
+Neuter\ names=Ουδέτερα ονόματα
+
+Determined\ %0\ for\ %1\ entries=Έχει καθοριστεί %0 για %1 καταχωρήσεις
+Look\ up\ %0=Αναζήτηση %0
+Looking\ up\ %0...\ -\ entry\ %1\ out\ of\ %2\ -\ found\ %3=Πραγματοποιείται αναζήτηση %0... - καταχώρηση %1 από %2 - βρέθηκαν %3
+
+Audio\ CD=Ψηφιακός Δίσκος Ήχου
+British\ patent=Βρετανικό δίπλωμα ευρεσιτεχνίας
+British\ patent\ request=Αίτημα Βρετανικού διπλώματος ευρεσιτεχνίας
+Candidate\ thesis=Διατριβή υποψηφίου
+Collaborator=Συνεργάτης
+Column=Στήλη
+Compiler=Μεταγλωττιστής
+Continuator=Συνεχιστής
+Data\ CD=CD Δεδομένων
+Editor=Εκδότης
+European\ patent=Ευρωπαϊκό δίπλωμα ευρεσιτεχνίας
+European\ patent\ request=Αίτημα Ευρωπαϊκού διπλώματος ευρεσιτεχνίας
+Founder=Ιδρυτής
+French\ patent=Γαλλικό δίπλωμα ευρεσιτεχνίας
+French\ patent\ request=Αίτημα Γαλλικού διπλώματος ευρεσιτεχνίας
+German\ patent=Γερμανικό δίπλωμα ευρεσιτεχνίας
+German\ patent\ request=Αίτημα Γερμανικού διπλώματος ευρεσιτεχνίας
+Line=Γραμμή
+Master's\ thesis=Μεταπτυχιακή διατριβή
+Page=Σελίδα
+Paragraph=Παράγραφος
+Patent=Δίπλωμα ευρεσιτεχνίας
+Patent\ request=Αίτημα διπλώματος ευρεσιτεχνίας
+PhD\ thesis=Διδακτορική διατριβή
+Redactor=Συγγραφέας
+Research\ report=Αναφορά έρευνας
+Reviser=Αναθεωρητής
+Section=Ενότητα
+Software=Λογισμικό
+Technical\ report=Τεχνική αναφορά
+U.S.\ patent=Δίπλωμα ευρεσιτεχνίας Η.Π.Α.
+U.S.\ patent\ request=Αίτημα διπλώματος ευρεσιτεχνίας Η.Π.Α.
+Verse=Στίχος
+
+change\ entries\ of\ group=αλλαγή καταχωρήσεων της ομάδας
+odd\ number\ of\ unescaped\ '\#'=περιττός αριθμός '\#' που δεν έχει διαφύγει
+
+Plain\ text=Απλό κείμενο
+Show\ diff=Εμφάνιση διαφορών
+character=χαρακτήρας
+word=λέξη
+Show\ symmetric\ diff=Εμφάνιση συμμετρικών διαφορών
+Copy\ Version=Αντιγραφή Έκδοσης
+Developers=Προγραμματιστές
+Authors=Συγγραφείς
+License=Άδεια χρήσης
+
+HTML\ encoded\ character\ found=Βρέθηκε χαρακτήρας με κωδικοποίηση HTML
+booktitle\ ends\ with\ 'conference\ on'=ο τίτλος βιβλίου τελειώνει με 'συνέδριο για'
+
+All\ external\ files=Όλα τα εξωτερικά αρχεία
+
+OpenOffice/LibreOffice\ integration=Ενσωμάτωση OpenOffice/LibreOffice
+
+incorrect\ control\ digit=εσφαλμένο ψηφίο ελέγχου
+incorrect\ format=εσφαλμένη μορφή
+Copied\ version\ to\ clipboard=Η έκδοση αντιγράφτηκε στο πρόχειρο
+
+BibTeX\ key=Κλειδί BibTeX
+Message=Μήνυμα
+
+
+MathSciNet\ Review=Κριτική MathSciNet
+Reset\ Bindings=Επαναφορά Συντομεύσεων Πληκτρολογίου
+
+Decryption\ not\ supported.=Η αποκρυπτογράφηση δεν υποστηρίζεται.
+
+Cleared\ '%0'\ for\ %1\ entries=Πραγματοποιήθηκε εκκαθάριση '%0' για %1 καταχωρήσεις
+Set\ '%0'\ to\ '%1'\ for\ %2\ entries=Ορίστηκε '%0' σε '%1' για %2 καταχωρήσεις
+Toggled\ '%0'\ for\ %1\ entries=Πραγματοποιήθηκε αλλαγή '%0' για %1 καταχωρήσεις
+
+Check\ for\ updates=Έλεγχος για ενημερώσεις
+Download\ update=Λήψη ενημέρωσης
+New\ version\ available=Υπάρχει νέα έκδοση διαθέσιμη
+Installed\ version=Εγκατεστημένη έκδοση
+Remind\ me\ later=Υπενθύμιση αργότερα
+Ignore\ this\ update=Αγνόηση αυτής της ενημέρωσης
+Could\ not\ connect\ to\ the\ update\ server.=Αδυναμία σύνδεσης με το διακομιστή ενημέρωσης.
+Please\ try\ again\ later\ and/or\ check\ your\ network\ connection.=Παρακαλώ προσπαθήστε ξανά αργότερα και/ή ελέγξτε τη σύνδεσή σας στο διαδίκτυο.
+To\ see\ what\ is\ new\ view\ the\ changelog.=Για να δείτε τι νέο υπάρχει, δείτε το αρχείο αλλαγών.
+A\ new\ version\ of\ JabRef\ has\ been\ released.=Μια νέα έκδοση του JabRef κυκλοφόρησε.
+JabRef\ is\ up-to-date.=Το JabRef είναι ενημερωμένο.
+Latest\ version=Τελευταία έκδοση
 Online\ help\ forum=Online forum βοήθειας
-
-
-
-
-
-
-
-
-
+Custom=Προσαρμοσμένο
+
+Export\ cited=Εξαγωγή των αναφερόμενων
+Unable\ to\ generate\ new\ library=Αδυναμία δημιουργίας νέας βιβλιοθήκης
+
+Open\ console=Άνοιγμα κονσόλας
+Use\ default\ terminal\ emulator=Χρήση προεπιλεγμένου προσωμοιωτή τερματικού
+Execute\ command=Εκτέλεση εντολής
+Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Σημείωση\: Χρήση του %0 ως σύμβολο κράτησης θέσης για το αρχείο ανοιχτής βιβλιοθήκης.
+Executing\ command\ "%0"...=Πραγματοποιείται εκτέλεση εντολής "%0"...
+Error\ occured\ while\ executing\ the\ command\ "%0".=Προέκυψε σφάλμα κατά την εκτέλεση της εντολής "%0".
+Reformat\ ISSN=Αναδιαμόρφωση ISSN
+
+Countries\ and\ territories\ in\ English=Χώρες και περιοχές στα Αγγλικά
+Electrical\ engineering\ terms=Ορολογία ηλεκτρολόγων μηχανικών
+Enabled=Ενεργοποιημένο
+Internal\ list=Εσωτερική λίστα
+Manage\ protected\ terms\ files=Διαχείριση αρχείων προστατευμένων όρων
+Months\ and\ weekdays\ in\ English=Μήνες και ημέρες της εβδομάδας στα Αγγλικά
+The\ text\ after\ the\ last\ line\ starting\ with\ \#\ will\ be\ used=Θα χρησιμοποιείται το κείμενο μετά την τελευταία σειρά που ξεκινά με \#
+Add\ protected\ terms\ file=Προσθήκη αρχείου προστατευμένων όρων
+Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=Είστε σίγουροι πως θέλετε να αφαιρέσετε το αρχείο προστατευμένων όρων;
+Remove\ protected\ terms\ file=Αφαίρεση αρχείου προστατευμένων όρων
+Add\ selected\ text\ to\ list=Προσθήκη επιλεγμένου κειμένου σε λίστα
+Add\ {}\ around\ selected\ text=Προσθήκη {} γύρω από το επιλεγμένο κείμενο
+Format\ field=Μορφοποίηση πεδίου
+New\ protected\ terms\ file=Νέο αρχείο προστατευμένων όρων
+change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=αλλαγή πεδίου %0 της καταχώρησης %1 από %2 ως %3
+change\ key\ from\ %0\ to\ %1=αλλαγή κλειδιού από %0 ως %1
+change\ string\ content\ %0\ to\ %1=αλλαγή περιεχομένου συμβολοσειράς %0 σε %1
+change\ string\ name\ %0\ to\ %1=αλλαγή ονόματος συμβολοσειράς %0 σε %1
+change\ type\ of\ entry\ %0\ from\ %1\ to\ %2=αλλαγή τύπου καταχώρησης %0 από %1 ως %2
+insert\ entry\ %0=εισαγωγή καταχώρησης %0
+insert\ string\ %0=εισαγωγή συμβολοσειράς %0
+remove\ entry\ %0=αφαίρεση καταχώρησης %0
+remove\ string\ %0=αφαίρεση συμβολοσειράς %0
+undefined=δεν ορίστηκε
+Cannot\ get\ info\ based\ on\ given\ %0\:\ %1=Αδυναμία απόκτησης πληροφοριών βάσει των δεδομένων %0\: %1
+Get\ BibTeX\ data\ from\ %0=Λήψη δεδομένων BibTeX από %0
+No\ %0\ found=Δε βρέθηκαν καθόλου %0
+Entry\ from\ %0=Καταχώρηση από %0
+Merge\ entry\ with\ %0\ information=Συγχώνευση καταχώρησης με πληροφορίες %0
+Updated\ entry\ with\ info\ from\ %0=Η καταχώρηση ενημερώθηκε με πληροφορίες από %0
+
+Add\ existing\ file=Προσθήκη υπάρχοντος αρχείου
+Create\ new\ list=Δημιουργία νέας λίστας
+Remove\ list=Αφαίρεση λίστας
+Full\ journal\ name=Πλήρες όνομα περιοδικού
+Abbreviation\ name=Όνομα συντομογραφίας
+
+No\ abbreviation\ files\ loaded=Δεν έγινε φόρτωση αρχείων συντομογραφίας
+
+Loading\ built\ in\ lists=Πραγματοποιείται φόρτωση στις ενσωματωμένες λίστες
+
+JabRef\ built\ in\ list=Ενσωματωμένη λίστα JabRef
+IEEE\ built\ in\ list=Ενσωματωμένη λίστα IEEE
+
+Event\ log=Αρχείο καταγραφής συμβάντων
+We\ now\ give\ you\ insight\ into\ the\ inner\ workings\ of\ JabRef's\ internals.\ This\ information\ might\ be\ helpful\ to\ diagnose\ the\ root\ cause\ of\ a\ problem.\ Please\ feel\ free\ to\ inform\ the\ developers\ about\ an\ issue.=Τώρα σας παρέχουμε πληροφορίες του τρόπου λειτουργίας των ενδότερων του JabRef. Οι πληροφορίες αυτές ίσως σας φανούν χρήσιμες για τη διάγνωση της βασικής αιτίας ενός προβλήματος. Παρακαλώ, μη διστάσετε να ενημερώσετε τους προγραμματιστές μας για οποιοδήποτε πρόβλημα.
+Log\ copied\ to\ clipboard.=Το αρχείο καταγραφής αντιγράφτηκε στο πρόχειρο.
+Copy\ Log=Αντιγραφή Αρχείου Καταγραφής
+Clear\ Log=Εκκαθάριση Αρχείου Καταγραφής
+Report\ Issue=Αναφορά Προβλήματος
+Issue\ on\ GitHub\ successfully\ reported.=Η αναφορά προβλήματος στο GitHub πραγματοποιήθηκε επιτυχώς.
+Issue\ report\ successful=Η αναφορά προβλήματος πραγματοποιήθηκε επιτυχώς
+Your\ issue\ was\ reported\ in\ your\ browser.=Το πρόβλημά σας αναφέρθηκε στον περιηγητή σας.
+The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=Το αρχείο καταγραφής και οι πληροφορίες εξαίρεσης αντιγράφτηκαν στο πρόχειρο.
+Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Παρακαλώ επικολλήστε αυτές τις πληροφορίες (με Ctrl+V από το πληκτρολόγιο) στο πεδίο περιγραφής του προβλήματος.
+
+Connecting...=Πραγματοποιείται σύνδεση...
+Host=Κεντρικός Διακομιστής
+Port=Θύρα
+Library=Βιβλιοθήκη
+User=Χρήστης
 Connect=Σύνδεση
-
-
-
-
-Look\ up\ full\ text\ documents=Αναζητήστε πλήρη έγγραφα κειμένου
-
-
-
-
-
+Connection\ error=Σφάλμα σύνδεσης
+Connection\ to\ %0\ server\ established.=Πραγματοποιήθηκε σύνδεση στο διακομιστή %0.
+Required\ field\ "%0"\ is\ empty.=Το απαιτούμενο πεδίο "%0" είναι κενό.
+%0\ driver\ not\ available.=Ο οδηγός %0 δεν είναι διαθέσιμος.
+The\ connection\ to\ the\ server\ has\ been\ terminated.=Η σύνδεση με το διακομιστή έχει τερματιστεί.
+Connection\ lost.=Η σύνδεση χάθηκε.
+Reconnect=Επανασύνδεση
+Work\ offline=Εργασία χωρίς σύνδεση
+Working\ offline.=Πραγματοποιείται εργασία χωρίς σύνδεση.
+Update\ refused.=Η ενημέρωση απορρίφθηκε.
+Update\ refused=Η ενημέρωση απορρίφθηκε
+Local\ entry=Τοπική καταχώρηση
+Shared\ entry=Κοινόχρηστη καταχώρηση
+Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Αδυναμία ενημέρωσης λόγω συγκρούσεων στις υφιστάμενες αλλαγές.
+You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=Δεν χρησιμοποιείτε την πιο πρόσφατη έκδοση του BibEntry.
+Local\ version\:\ %0=Τοπική έκδοση\: %0
+Shared\ version\:\ %0=Κοινόχρηστη έκδοση\: %0
+Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Παρακαλώ συγχωνεύστε την κοινόχρηστη καταχώρηση με τη δική σας και πατήστε "Συγχώνευση καταχωρήσεων" για να επιλύσετε το πρόβλημα.
+Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Η ακύρωση αυτής της ενέργειας θα αφήσει τις αλλαγές σας ασυγχρόνιστες. Θέλετε σίγουρα να την ακυρώσετε;
+Shared\ entry\ is\ no\ longer\ present=Η κοινόχρηστη καταχώρηση δεν υπάρχει πλέον
+You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Μπορείτε να επαναφέρετε την καταχώρηση με τη χρήση της λειτουργίας "Αναίρεση".
+You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Είστε ήδη συνδεδεμένοι σε μια βάση δεδομένων χρησιμοποιώντας τις καταχωρημένες λεπτομέρειες σύνδεσης.
+
+Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Αδυναμία αναφοράς καταχωρήσεων χωρίς τα κλειδιά BibTeX. Δημιουργία κλειδιών τώρα;
+New\ technical\ report=Νέα τεχνική αναφορά
+
+%0\ file=Αρχείο %0
+Custom\ layout\ file=Αρχείο προσαρμοσμένης διάταξης
+Protected\ terms\ file=Αρχείο προστατευμένων όρων
+Style\ file=Αρχείο στυλ
+
+Open\ OpenOffice/LibreOffice\ connection=Άνοιγμα σύνδεσης OpenOffice/LibreOffice
+You\ must\ enter\ at\ least\ one\ field\ name=Πρέπει να καταχωρήσετε τουλάχιστον ένα όνομα πεδίου
+Non-ASCII\ encoded\ character\ found=Βρέθηκε χαρακτήρας χωρίς κωδικοποίηση ASCII
+Toggle\ web\ search\ interface=Εναλλαγή διεπαφής αναζήτησης στο διαδίκτυο
+%0\ files\ found=Βρέθηκαν %0 αρχεία
+One\ file\ found=Βρέθηκε ένα αρχείο
+The\ import\ finished\ with\ warnings\:=Η εισαγωγή ολοκληρώθηκε με προειδοποιήσεις\:
+There\ was\ one\ file\ that\ could\ not\ be\ imported.=Αδυναμία εισαγωγής ενός αρχείου.
+There\ were\ %0\ files\ which\ could\ not\ be\ imported.=Αδυναμία εισαγωγής %0 αρχείων.
+
+Migration\ help\ information=Πληροφορίες βοήθειας μετακίνησης
+Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Η βάση δεδομένων που εισαγάγατε έχει παρωχημένη δομή και δεν υποστηρίζεται πλέον.
+However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Παρόλα αυτά, μια νέα βάση δεδομένων δημιουργήθηκε παράλληλα με τη βάση δεδομένων για την παλαιότερη της 3.6 έκδοσης.
+Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Ανοίγει έναν σύνδεσμο μέσω του οποίου μπορεί να γίνει λήψη της τρέχουσας έκδοσης υπό ανάπτυξη
+See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=Δείτε τις αλλαγές που έγιναν στις εκδόσεις JabRef
+Referenced\ BibTeX\ key\ does\ not\ exist=Το αναφερόμενο κλειδί BibTeX δεν υπάρχει
+Finished\ downloading\ full\ text\ document\ for\ entry\ %0.=Η λήψη του αρχείου πλήρους κειμένου για την καταχώρηση %0 ολοκληρώθηκε.
+Look\ up\ full\ text\ documents=Αναζητήστε έγγραφα πλήρους κειμένου
+You\ are\ about\ to\ look\ up\ full\ text\ documents\ for\ %0\ entries.=Πρόκειται να αναζητήσετε έγγραφα πλήρους κειμένου για %0 καταχωρήσεις.
+last\ four\ nonpunctuation\ characters\ should\ be\ numerals=οι τελευταίοι τέσσερις χαρακτήρες που δεν είναι σημεία στίξης, πρέπει να είναι αριθμοί
+
+Author=Συγγραφέας
+Date=Ημερομηνία
+File\ annotations=Σχολιασμοί αρχείου
+Show\ file\ annotations=Εμφάνιση σχολιασμών αρχείου
+Adobe\ Acrobat\ Reader=Adobe Acrobat Reader
+Sumatra\ Reader=Sumatra Reader
+shared=κοινόχρηστο
+should\ contain\ an\ integer\ or\ a\ literal=πρέπει να περιέχει ακέραιο αριθμό ή γράμμα
+should\ have\ the\ first\ letter\ capitalized=πρέπει να έχει κεφαλαίο το πρώτο γράμμα
+Tools=Εργαλεία
+What's\ new\ in\ this\ version?=Τι νέο υπάρχει σε αυτήν την έκδοση;
+Want\ to\ help?=Θέλετε να βοηθήσετε;
+Make\ a\ donation=Κάντε μια δωρεά
+get\ involved=εμπλακείτε
+Used\ libraries=Χρησιμοποιημένες βιβλιοθήκες
+Existing\ file=Υπάρχον αρχείο
+
+ID=ID
+ID\ type=Τύπος ID
+Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=Ο ανακτητής '%0' δεν βρήκε καμία καταχώρηση για το ID '%1'.
+
+Select\ first\ entry=Επιλογή της πρώτης καταχώρησης
+Select\ last\ entry=Επιλογή της τελευταίας καταχώρησης
+
+Invalid\ ISBN\:\ '%0'.=Μη έγκυρο ISBN\: '%0'.
+should\ be\ an\ integer\ or\ normalized=πρέπει να είναι ακέραιος ή στρογγυλοποιημένος αριθμός
+should\ be\ normalized=πρέπει να είναι στρογγυλοποιημένος αριθμός
+
+Empty\ search\ ID=Κενό ID αναζήτησης
+The\ given\ search\ ID\ was\ empty.=Το δεδομένο ID αναζήτησης ήταν κενό.
 Copy\ BibTeX\ key\ and\ link=Αντιγραφή BibTeX και συνδέσμου (link)
-
-
-
-
-
-
-
-
-
-
-Default\ table\ font\ size=Προεπιλεγμένη γραμματοσειρά πίνακα
-Show\ document\ viewer=Εμφάνιση προβολέα εγγράφου
-
-
-
-
-
-
-
-
-
-
+biblatex\ field\ only=μόνο biblatex πεδίο
+
+Error\ while\ generating\ fetch\ URL=Σφάλμα κατά τη δημιουργία διεύθυνσης URL ανάκτησης
+Error\ while\ parsing\ ID\ list=Σφάλμα κατά την ανάλυση της λίστας ID
+Unable\ to\ get\ PubMed\ IDs=Αδυναμία πρόσβασης σε ID PubMed
+Backup\ found=Βρέθηκε αντίγραφο ασφαλείας
+A\ backup\ file\ for\ '%0'\ was\ found.=Βρέθηκε ένα αντίγραφο ασφαλείας για το '%0'.
+This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Αυτό ίσως υποδεικνύει πως το JabRef δεν τερματίστηκε σωστά την τελευταία φορά που χρησιμοποιήθηκε το αρχείο.
+Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Θέλετε να επαναφέρετε τη βιβλιοθήκη από το αντίγραφο ασφαλείας;
+Firstname\ Lastname=Όνομα Επώνυμο
+
+Recommended\ for\ %0=Προτείνεται για %0
+Show\ 'Related\ Articles'\ tab=Εμφάνιση καρτέλας 'Σχετικά Άρθρα'
+This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=Αυτό ίσως προκαλείται επειδή φτάνετε στο όριο κίνησης του Google Scholar (δείτε στη 'Βοήθεια' για λεπτομέρειες).
+
+Could\ not\ open\ website.=Αδυναμία ανοίγματος ιστοτόπου.
+Problem\ downloading\ from\ %1=Πρόβλημα κατά τη λήψη από %1
+
+File\ directory\ pattern=Μοτίβο φακέλου αρχείου
+Update\ with\ bibliographic\ information\ from\ the\ web=Ενημέρωση με πληροφορίες βιβλιογραφίας από το διαδίκτυο
+
+Could\ not\ find\ any\ bibliographic\ information.=Αδυναμία εύρεσης οποιασδήποτε πληροφορίας βιβλιογραφίας.
+BibTeX\ key\ deviates\ from\ generated\ key=Το κλειδί BibTeX αποκλίνει από το κλειδί που δημιουργήθηκε
+DOI\ %0\ is\ invalid=Μη έγκυρο DOI %0
+
+Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences=Επιλογή όλων των προσαρμοσμένων από το χρήστη τύπων, ώστε να αποθηκεύονται στις τοπικές ρυθμίσεις
+Currently\ unknown=Προς το παρόν άγνωστο
+Different\ customization,\ current\ settings\ will\ be\ overwritten=Διαφορετική προσαρμογή από το χρήστη, οι τρέχουσες ρυθμίσεις θα αντικατασταθούν
+
+Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=Ο τύπος καταχώρησης %0 καθορίζεται μόνο για Biblatex, αλλά όχι για BibTeX
+
+Copied\ %0\ citations.=Αντιγράφτηκαν %0 αναφορές.
+Copying...=Πραγματοποιείται αντιγραφή...
+
+journal\ not\ found\ in\ abbreviation\ list=το περιοδικό δεν βρέθηκε στη λίστα συντομογραφιών
+Unhandled\ exception\ occurred.=Προέκυψε εξαίρεση χωρίς επίλυση.
+
+strings\ included=συμπεριλαμβανόμενες συμβολοσειρές
+Default\ table\ font\ size=Μέγεθος γραμματοσειράς  προεπιλεγμένου πίνακα
+Escape\ underscores=Διαφυγή κάτω παύλας
+Color=Χρώμα
+Please\ also\ add\ all\ steps\ to\ reproduce\ this\ issue,\ if\ possible.=Παρακαλώ προσθέστε επίσης όλα τα βήματα για να αναπαραχθεί αυτό το πρόβλημα, εάν είναι δυνατόν.
+Fit\ width=Ταίριασμα πλάτους
+Fit\ a\ single\ page=Ταίριασμα μιας μονής σελίδας
+Zoom\ in=Μεγέθυνση
+Zoom\ out=Σμίκρυνση
+Previous\ page=Προηγούμενη σελίδα
+Next\ page=Επόμενη σελίδα
+Document\ viewer=Πρόγραμμα προβολής εγγράφων
+Live=Ενεργό
+Locked=Κλειδωμένο
+Show\ document\ viewer=Εμφάνιση προγράμματος προβολής εγγράφων
+Show\ the\ document\ of\ the\ currently\ selected\ entry.=Εμφάνιση του εγγράφου της τρέχουσας επιλεγμένης καταχώρησης.
+Show\ this\ document\ until\ unlocked.=Εμφάνιση αυτού του εγγράφου μέχρι να ξεκλειδωθεί.
+Set\ current\ user\ name\ as\ owner.=Ορισμός του τρέχοντος ονόματος χρήστη ως ιδιοκτήτη.
+
+Sort\ all\ subgroups\ (recursively)=Ταξινόμηση όλων των υπο-ομάδων (αναδρομικά)
+Collect\ and\ share\ telemetry\ data\ to\ help\ improve\ JabRef.=Συλλέξτε και διαμοιραστείτε δεδομένα τηλεμετρίας για να βοηθήσετε το JabRef να βελτιωθεί.
+Don't\ share=Να μη γίνει διαμοιρασμός
+Share\ anonymous\ statistics=Διαμοιραστείτε ανώνυμα στατιστικά
+Telemetry\:\ Help\ make\ JabRef\ better=Τηλεμετρία\: Βοηθήστε να βελτιώσουμε το JabRef
+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.=Για να βελτιώσουμε την εμπειρία του χρήστη, θα θέλαμε να συλλέξουμε ανώνυμα στατιστικά για τα χαρακτηριστικά που χρησιμοποιείτε. Θα καταγράφουμε μονάχα τι είδους χαρακτηριστικά χρησιμοποιείτε και πόσο συχνά το κάνετε. Δεν θα συλλέγουμε καθόλου προσωπικά δεδομένα ούτε αντικείμενα βιβλιογραφίας. Εάν επιλέξετε να επιτραπεί η συλλογή δεδομένων, μπορείτε αργότερα να την απενεργοποιήσετε μέσω\: Επιλογές -> Προτιμήσεις -> Γενικές.
+This\ file\ was\ found\ automatically.\ Do\ you\ want\ to\ link\ it\ to\ this\ entry?=Το αρχείο βρέθηκε αυτόματα. Θέλετε να το συνδέσετε με αυτήν την καταχώρηση;
+Names\ are\ not\ in\ the\ standard\ %0\ format.=Τα ονόματα δεν είναι γραμμένα με τη βασική μορφή %0.
+
+Delete\ the\ selected\ file\ permanently\ from\ disk,\ or\ just\ remove\ the\ file\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ file\ permanently\ from\ disk.=Οριστική διαγραφή του επιλεγμένου αρχείου από το δίσκο, ή αφαίρεση του αρχείου από την καταχώρηση; Εάν πατήσετε 'Διαγραφή' το αρχείο θα διαγραφεί οριστικά από το δίσκο.
+Delete\ '%0'=Διαγραφή '%0'
+Delete\ from\ disk=Διαγραφή από το δίσκο
+Remove\ from\ entry=Αφαίρεση από την καταχώρηση
+There\ exists\ already\ a\ group\ with\ the\ same\ name.=Υπάρχει ήδη μια ομάδα με το ίδιο όνομα.
+
+Copy\ linked\ files\ to\ folder...=Αντιγραφή συνδεδεμένων αρχείων στο φάκελο...
+Copied\ file\ successfully=Το αρχείο αντιγράφτηκε με επιτυχία
+Copying\ files...=Πραγματοποιείται αντιγραφή αρχείων...
+Copying\ file\ %0\ of\ entry\ %1=Πραγματοποιείται αντιγραφή του αρχείου %0 της καταχώρησης %1
+Finished\ copying=Η αντιγραφή ολοκληρώθηκε
+Could\ not\ copy\ file=Αδυναμία αντιγραφής αρχείου
+Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=Αντιγράφτηκαν με επιτυχία %0 αρχεία από %1 στο %2
+Rename\ failed=Η μετονομασία απέτυχε
+JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=Το JabRef δεν έχει πρόσβαση στο αρχείο γιατί χρησιμοποιείται από κάποια άλλη διεργασία.
+Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Εμφάνιση της κονσόλας εξαγωγής (απαραίτητο μόνο κατά τη χρήση του εκκινητή)
+
+Remove\ line\ breaks=Αφαίρεση αλλαγών γραμμής
+Removes\ all\ line\ breaks\ in\ the\ field\ content.=Αφαιρεί όλες τις αλλαγές γραμμής από τα περιεχόμενα του πεδίου.
+Checking\ integrity...=Πραγματοποιείται έλεγχος ακεραιότητας...
+
+Remove\ hyphenated\ line\ breaks=Αφαίρεση αλλαγών γραμμής με ενωτικό
+Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Αφαιρεί όλες τις αλλαγές γραμμής με ενωτικό από τα περιεχόμενα του πεδίου.
+Note\ that\ currently,\ JabRef\ does\ not\ run\ with\ Java\ 9.=Σημειώστε ότι προς το παρόν, το JabRef δεν υποστηρίζει την έκδοση Java 9.
+Your\ current\ Java\ version\ (%0)\ is\ not\ supported.\ Please\ install\ version\ %1\ or\ higher.=Η εγκατεστημένη έκδοση Java (%0) δεν υποστηρίζεται. Παρακαλώ εγκαταστήστε την έκδοση %1 ή νεότερη.
+
+Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Αδυναμία ανάκτησης δεδομένων καταχώρησης από '%0'.
+Entry\ from\ %0\ could\ not\ be\ parsed.=Αδυναμία ανάλυσης καταχώρησης από %0.
+Invalid\ identifier\:\ '%0'.=Μη έγκυρο αναγνωριστικό\: '%0'.
+This\ paper\ has\ been\ withdrawn.=Αυτή η εργασία έχει αποσυρθεί.
+Finished\ writing\ XMP-metadata.=Ολοκλήρωση εγγραφής μεταδεδομένων XMP.
+empty\ BibTeX\ key=κενό κλειδί BibTeX
+Your\ Java\ Runtime\ Environment\ is\ located\ at\ %0.=Το Περιβάλλον Λειτουργίας Java βρίσκεται στο %0.
+Aux\ file=Αρχείο AUX
+Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Ομάδα που περιέχει καταχωρήσεις που αναφέρονται σε ένα συγκεκριμένο αρχείο TeX
+
+Any\ file=Οποιοδήποτε αρχείο
+
+No\ linked\ files\ found\ for\ export.=Δε βρέθηκαν συνδεδεμένα αρχεία για εξαγωγή.
+
+Full\ text\ document\ download\ failed\ for\ entry\ %0=Αποτυχία λήψης του εγγράφου πλήρους κειμένου για την καταχώρηση %0
+No\ full\ text\ document\ found\ for\ entry\ %0.=Δε βρέθηκε έγγραφο πλήρους κειμένου για την καταχώρηση %0.
+
+Delete\ Entry=Διαγραφή Καταχώρησης
+Import\ &\ Export=Εισαγωγή & Εξαγωγή
+Look\ up\ document\ identifier=Αναζήτηση αναγνωριστικού εγγράφου
+Next\ library=Επόμενη βιβλιοθήκη
+Previous\ library=Προηγούμενη βιβλιοθήκη
 add\ group=προσθήκη ομάδας
-
-
-
-
-
+Entry\ is\ contained\ in\ the\ following\ groups\:=Η καταχώρηση περιέχεται στις παρακάτω ομάδες\:
+Delete\ entries=Διαγραφή καταχωρήσεων
+Keep\ entries=Διατήρηση καταχωρήσεων
+Keep\ entry=Διατήρηση καταχώρησης
+Ignore\ backup=Αγνόηση του αντιγράφου ασφαλείας
+Restore\ from\ backup=Επαναφορά από αντίγραφο ασφαλείας
+
+Continue=Συνέχεια
+Generate\ key=Δημιουργία κλειδιού
+Overwrite\ file=Αντικατάσταση αρχείου
+Shared\ database\ connection=Σύνδεση κοινόχρηστης βάσης δεδομένων
+
+Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\ correct\ server\ name.=Αδυναμία σύνδεσης στο διακομιστή Vim. Βεβαιωθείτε πως το Vim εκτελείται με το σωστό όνομα διακομιστή.
+Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Αδυναμία σύνδεσης σε μια ενεργή διεργασία gnuserv. Βεβαιωθείτε πως το Emacs ή XEmacs εκτελείται, και πως ο διακομιστής έχει εκκινηθεί (τρέχοντας την εντολή 'server-start'/'gnuserv-start').
+Error\ pushing\ entries=Σφάλμα κατά την προώθηση καταχωρήσεων
+
+Undefined\ character\ format=Μη καθορισμένη μορφή χαρακτήρων
+Undefined\ paragraph\ format=Μη καθορισμένη μορφή παραγράφου
+
+Edit\ Preamble=Επεξεργασία Εισαγωγής
+Markings=Μαρκάρισμα
+Use\ selected\ instance=Χρήση επιλεγμένου παραθύρου
+
+Hide\ panel=Απόκρυψη πλαισίου
+Move\ panel\ up=Μετακίνηση πλαισίου επάνω
+Move\ panel\ down=Μετακίνηση πλαισίου κάτω
+Linked\ files=Συνδεδεμένα αρχεία
+Group\ view\ mode\ set\ to\ intersection=Η λειτουργία προβολής ομάδων ορίστηκε σε σημείο τομής
+Group\ view\ mode\ set\ to\ union=Η λειτουργία προβολής ομάδων ορίστηκε σε ένωση
+Open\ %0\ URL\ (%1)=Άνοιγμα διεύθυνσης URL %0 (%1)
+Open\ URL\ (%0)=Άνοιγμα διεύθυνσης URL (%0)
+Open\ file\ %0=Άνοιγμα αρχείου %0
+Jump\ to\ entry=Μετάβαση στην καταχώρηση
+The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\ does\ not\ work\ as\ expected.=Το όνομα ομάδας περιέχει τον διαχωριστή λέξεων-κλειδιών "%0", και πιθανότατα γι' αυτόν το λόγο δεν λειτούργησε όπως αναμενόταν.
 Abbreviate\ journal\ names\ (ISO)=Συντομογραφίες ονομάτων περιοδικών (ISO)
 Abbreviate\ journal\ names\ (MEDLINE)=Συντομογραφίες ονομάτων περιοδικών (MEDLINE)
 Blog=Ιστολόγιο
 Check\ integrity=Έλεγχος συνοχής
-Copy\ DOI\ url=Αντιγραφή DOI URL
+Copy\ DOI\ url=Αντιγραφή διεύθυνσης URL DOI
 Copy\ citation=Αντιγραφή αναφοράς
 Development\ version=Έκδοση ανάπτυξης λογισμικού
 Export\ selected\ entries=Εξαγωγή επιλεγμένων καταχωρήσεων
+Export\ selected\ entries\ to\ clipboard=Εξαγωγή των επιλεγμένων καταχωρήσεων στο πρόχειρο
+Find\ duplicates=Εύρεση διπλότυπων
 Fork\ me\ on\ GitHub=Ξεκινήστε μία διακλάδωση (fork) στο GitHub\!
 JabRef\ resources=Πηγές πληροφοριών JabRef
+Manage\ journal\ abbreviations=Διαχείριση συντομογραφιών περιοδικών
 Manage\ protected\ terms=Διαχείριση προστατευόμενων όρων
+New\ %0\ library=Νέα βιβλιοθήκη %0
+New\ entry\ from\ plain\ text=Νέα καταχώρηση από απλό κείμενο
+New\ sublibrary\ based\ on\ AUX\ file=Νέα υπο-βιβλιοθήκη βασισμένη σε αρχείο AUX
 Push\ entries\ to\ external\ application\ (%0)=Προωθήστε τις καταχωρήσεις σε εξωτερική εφαρμογή (%0)
+Quit=Έξοδος
+Recent\ libraries=Πρόσφατες βιβλιοθήκες
+Set\ up\ general\ fields=Ορισμός γενικών πεδίων
 View\ change\ log=Προβολή αρχείου καταγραφής αλλαγών
 View\ event\ log=Προβολή καταγραφής συμβάντων (event log)
-Website=Ιστοσελίδα
+Website=Ιστότοπος
 Write\ XMP-metadata\ to\ PDFs=Εγγραφή XMP-μεταδεδομένων σε PDF
 
+Override\ default\ font\ settings=Παράκαμψη των προεπιλεγμένων ρυθμίσεων γραμματοσειράς
+
+
+
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index 2e0df9821c6..88c2818cffa 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<nombre del campo>
 
-<select>=<seleccionar>
-
 <select\ word>=<seleccionar palabra>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Abreviar nombres de revistas de las entradas seleccionadas (Abreviatura ISO)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Abreviar nombres de revistas de las entradas seleccionadas (Abreviatura MEDLINE)
@@ -34,12 +32,13 @@ Accept=Aceptar
 
 Accept\ change=Aceptar cambio
 
-Action=Acción
 
-What\ is\ Mr.\ DLib?=¿Qué es Mr. DLib?
+Action=Acción
 
 Add=Añadir
 
+Add\ new=Añadir nuevo
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Añadir una clase personalizada (compilada) Importer desde una classpath.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=La ruta no debe estar en la classpath de JabRef.
 
@@ -53,16 +52,12 @@ Add\ from\ folder=Añadir desde carpeta
 
 Add\ from\ JAR=Añadir desde JAR
 
-Add\ new=Añadir nuevo
-
 Add\ subgroup=Añadir subgrupo
 
 Add\ to\ group=Añadir a grupo
 
 Added\ group\ "%0".=Grupo "%0" añadido
 
-Added\ new=Nuevo añadido
-
 Added\ string=Cadena añadida
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Adicionalmente, entradas cuyo campo <b>%0</b> no contenga <b>%1</b> pueden ser asignadas manualmente al grupo seleccionándolas y arrastrándolas sobre el menu contextual. Este proceso añade el término <b>%1</b> al campo de cada entrada. Las entradas pueden ser eliminadas manualmente del grupo seleccionándolas y usando a continuación el menú contextual. Este proceso elimina el término <b>%1</b> del campo de cada entrada.
@@ -71,12 +66,8 @@ Advanced=Avanzado
 All\ entries=Todas las entradas
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Todas las entradas de este tipo serán declaradas Sin Tipo. ¿Continuar?
 
-All\ fields=Todos los campos
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Siempre reformatear el fichero BIB al guardar y exportar
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=Ocurrió una Excepción SAX mientras se analizaba la sintaxis de '%0'\:
-
 and=y
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=cualquier campo que satisfaga la Expresión Regular <b>%0</b>
@@ -166,6 +157,7 @@ Clear\ fields=Limpiar campos
 
 Close=Cerrar
 
+
 Close\ dialog=Cerrar diálogo
 
 Close\ the\ current\ library=Cerrar la biblioteca actual
@@ -221,6 +213,7 @@ Could\ not\ run\ the\ 'vim'\ program.=No se puede ejecutar Vim
 Could\ not\ save\ file.=No se puede guardar el archivo.
 Character\ encoding\ '%0'\ is\ not\ supported.=La codificaciónd de caracteres '%0' no está soportada.
 
+
 crossreferenced\ entries\ included=entradas de referencia cruzada incluídas
 
 Current\ content=Contenido actual
@@ -256,8 +249,6 @@ Default\ grouping\ field=Campo de agrupación por defecto
 
 Default\ pattern=Patrón por defecto
 
-Default\ sort\ criteria=Criterio de ordenación por defecto
-
 Delete=Borrar
 
 Delete\ custom\ format=Borrar formato por defecto
@@ -278,8 +269,6 @@ Deleted=Borrado
 
 Permanently\ delete\ local\ file=Eliminar archivo local
 
-Delimit\ fields\ with\ semicolon,\ ex.=Delimitar campos con punto y coma
-
 Descending=Descendiente
 
 Description=Descripción
@@ -334,7 +323,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Agrupar entrad
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Agrupar entradas dinámicamente buscando palabra clave en campo
 
-Each\ line\ must\ be\ on\ the\ following\ form=Cada línea debe tener la siguiente forma
 
 Edit=Editar
 
@@ -381,12 +369,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Tipos de entrada
 
 Error=Error
-Error\ exporting\ to\ clipboard=Error exportando al portapapeles
 
 Error\ occurred\ when\ parsing\ entry=Ocurrió un error al analizar la entrada
 
 Error\ opening\ file=Error al abrir el archivo
 
+
 Error\ while\ writing=Error al escribir
 
 '%0'\ exists.\ Overwrite\ file?='%0' existe. ¿Sobreescribir?
@@ -416,8 +404,6 @@ External\ programs=Programas externos
 
 External\ viewer\ called=Se ha lanzado el visor externo
 
-Fetch=Recuperar
-
 Field=Campo
 
 field=campo
@@ -425,8 +411,6 @@ field=campo
 Field\ name=Nombre del campo
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=No se permiten los espacios o los siguientes caracteres en los nombres de campo
 
-Field\ to\ filter=Filtro a partir de campo
-
 Field\ to\ group\ by=Agrupar a partir de campo
 
 File=Archivo
@@ -441,13 +425,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=¡La carpeta de archivos n
 
 File\ exists=El archivo ya existe
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=El archivo ha sido editado
-
 File\ not\ found=No se ha encontrado el archivo
 File\ type=Tipo de archivo
-
-File\ updated\ externally=Archivo actualizado externamente
-
 filename=nombre de archivo
 
 Files\ opened=Archivos abiertos
@@ -469,6 +448,7 @@ Float=Flotar
 
 for=para
 
+
 Format\ of\ author\ and\ editor\ names=Formato de los nombres de autor y editor
 Format\ string=Formatear cadena
 
@@ -479,9 +459,9 @@ found\ in\ AUX\ file=encontrado en archivo AUX
 
 Full\ name=Nombre completo
 
+
 General=General
 
-General\ fields=Generar campos
 
 Generate=Generar
 
@@ -566,15 +546,13 @@ Importing=Importando
 
 Importing\ in\ unknown\ format=Importando en formato desconocido
 
-Include\ abstracts=Incluir abstracts
-Include\ entries=Incluir entradas
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Incluir subgrupos\: Ver entradas contenidas es este grupo o sus subgrupos cuando estén seleccionadas.
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Grupo independiente\: ver sólo las entradas de este grupo cuando esté seleccionado.
 
 Work\ options=Opciones de trabajo
 
+
 Insert=Insertar
 
 Insert\ rows=Insertar filas
@@ -622,10 +600,6 @@ Leave\ file\ in\ its\ current\ directory=Dejar el archivo en su directorio actua
 
 Left=Dejar
 
-Limit\ to\ fields=Limitar a los campos
-
-Limit\ to\ selected\ entries=Limitar a las entradas seleccionadas
-
 Link=Enlace
 Link\ local\ file=Enlazar archivo local
 Link\ to\ file\ %0=Enlazar al archivo %0
@@ -648,8 +622,6 @@ Mark\ new\ entries\ with\ owner\ name=Marcar nuevas entradas con nombre de propi
 
 Memory\ stick\ mode=Modo lápiz de memoria
 
-Menu\ and\ label\ font\ size=Tamaño de tipo de letra para menú y etiquetas
-
 Merged\ external\ changes=Cambios externos incorporados
 Merge\ fields=Combinar campos
 
@@ -675,6 +647,8 @@ Move\ up=Mover hacia arriba
 
 Moved\ group\ "%0".=Se ha movido el grupo "%0".
 
+
+
 Name=Nombre
 Name\ formatter=Formateador de nombre
 
@@ -692,8 +666,6 @@ New\ content=Nuevo contenido
 
 New\ library\ created.=Nueva biblioteca creada.
 
-New\ field\ value=Nuevo valor de campo
-
 New\ group=Nuevo grupo
 
 New\ string=Nueva cadena
@@ -708,9 +680,6 @@ no\ library\ generated=No se generó biblioteca
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=No se han encontrado entradas. Asegúrese de que está usando el filtro de importación correcto.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=No se han encontrado entdas para la cadena de búsqueda '%0'
-
 No\ entries\ imported.=No se han importado entradas.
 
 No\ files\ found.=No se han encontrado archivos.
@@ -732,8 +701,6 @@ Nothing\ to\ redo=Nada que rehacer
 
 Nothing\ to\ undo=Nada que deshacer
 
-occurrences=apariciones
-
 OK=Ok
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Una o claves se sobreescribirán. ¿Continuar?
@@ -773,13 +740,10 @@ Override=Ignorar
 
 Override\ default\ file\ directories=Ignorar carpetas de archivo por defecto
 
-Override\ default\ font\ settings=Ignorar ajustes de tipo de letra por defecto
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=Ignorar la clave BibTeX por el texto seleccionado
 
 
 Overwrite=Sobreescribir
-Overwrite\ existing\ field\ values=Sobreescribir valores de campo existentes
 
 Overwrite\ keys=Sobreescribir claves
 
@@ -815,6 +779,7 @@ Please\ enter\ the\ string's\ label=Introduzca la etiqueta de la cadena
 
 Please\ select\ an\ importer.=Seleccionar un importador.
 
+
 Possible\ duplicate\ entries=Posibles entradas duplicadas
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Posible duplicado de entrada existente. Clique para resolver.
@@ -850,8 +815,6 @@ Redo=Rehacer
 
 Reference\ library=Biblioteca de referencia
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Referencias encontradas\: %0. ¿Número de apariciones a recuperar?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Refinar supergrupo\: Ver entradas contenidas en este grupo y sus subgrupos cuando estén seleccionadas
 
 regular\ expression=Expresión Regular
@@ -910,10 +873,6 @@ Replace\ (regular\ expression)=Reemplazar (Expresión regular)
 
 Replace\ string=Reemplazar cadena
 
-Replace\ with=Reemplazar con
-
-
-Replaced=Reemplazado
 
 Required\ fields=Campos requeridos
 
@@ -923,6 +882,8 @@ Resolve\ strings\ for\ all\ fields\ except=Resolver cadenas para todos los campo
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Resolver cadenas únicamente para los campos BibTeX estándar
 
 resolved=resuelto
+
+
 Review=Revisar
 Review\ changes=Revisar cambios
 
@@ -940,10 +901,6 @@ Save\ library\ as...=Guardar biblioteca como...
 
 Save\ entries\ in\ their\ original\ order=Guardar entradas en el orden original
 
-Save\ failed=Fallón el guardado
-
-Save\ failed\ during\ backup\ creation=Error durante el guardado mientras se creaba la copia de seguridad
-
 Saved\ library=Biblioteca guardada
 
 Saved\ selected\ to\ '%0'.=Guardar seleccionados a '%0'.
@@ -957,8 +914,6 @@ Search=Buscar
 
 Search\ expression=Buscar expresión
 
-Search\ for=Buscar
-
 Searching\ for\ duplicates...=Buscando duplicados...
 
 Searching\ for\ files=Buscando archivos
@@ -967,19 +922,16 @@ Secondary\ sort\ criterion=Criterio secundario de ordenación
 
 Select\ all=Seleccionar todo
 
-Select\ encoding=Seleccionar codificación
-
 Select\ entry\ type=Seleccionar tipo de entrada
-Select\ external\ application=Seleccionar aplicación externa
 
 Select\ file\ from\ ZIP-archive=Seleccionar archivo desde archivo ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Seleccionar nodos de árbol para ver y aceptar o rechazar los cambios.
-Selected\ entries=Entradas seleccionadas
+
 Set\ field=Establecer campo
 Set\ fields=Establecer campos
 
-Set\ general\ fields=Establecer campos generales
+
 Set\ main\ external\ file\ directory=Establecer carpeta de archivo externo principal
 
 Settings=Ajustes
@@ -1033,8 +985,6 @@ Status=Estado
 
 Stop=Parar
 
-Strings=Cadenas
-
 Strings\ for\ library=Cadenas para biblioteca
 
 Sublibrary\ from\ AUX=Biblioteca secundaria desde AUX
@@ -1095,8 +1045,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Esta operación requiere seleccionar una o más entradas.
 
+
 Toggle\ entry\ preview=Usar vista previa de la entrada si/no
 Toggle\ groups\ interface=Usar interfaz de grupos si/no
+
+
+
 Try\ different\ encoding=Probar una codificación diferente
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Desabreviar nombre de revista de las entradas seleccionadas
@@ -1141,8 +1095,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=virificar que
 View=Ver
 Vim\ server\ name=Nombre de servidor Vim
 
-Waiting\ for\ ArXiv...=Esperando a ArXiv
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Advertir sobre duplicados sin resolver cuando al cerrar la ventana de inspección
 
 Warn\ before\ overwriting\ existing\ keys=Advertir antes de sobreescribir claves existentes
@@ -1174,7 +1126,6 @@ XMP-metadata=Metadatos XMP
 XMP-metadata\ found\ in\ PDF\:\ %0=Metadatos XMP encontrados en PDF\: '%0'
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Debe reiniciar JabRef para que los cambios surtan efecto.
 You\ have\ changed\ the\ language\ setting.=Ha cambiado el ajuste de lenguaje.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Ha introducido una búsqueda inválida '%0'
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Debe reiniciar JabRef para que las nuevas combinaciones de teclas funcionen correctamente.
 
@@ -1183,27 +1134,21 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Sus nuevas combinaciones de teclas
 The\ following\ fetchers\ are\ available\:=Están disponibles los siguientes recuperadores de datos\:
 Could\ not\ find\ fetcher\ '%0'=No se puede encontrar el recuperador de datos '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Ejecutando consulta '%0' con recuperador '%1'
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=La consulta '%0' con el recuperador ¡%1' no devolvió ningún resultado.
 
 Move\ file=Mover archivo
 Rename\ file=renombrar archivo
 
+
 Move\ file\ failed=Error al mover de archivos
 Could\ not\ move\ file\ '%0'.=No se puede mover el archivo '%0'.
 Could\ not\ find\ file\ '%0'.=No se encuentra el archivo '%0'.
 Number\ of\ entries\ successfully\ imported=Número de entradas importadas con éxito
 Import\ canceled\ by\ user=Importación cancelada por el usuario
-Progress\:\ %0\ of\ %1=Progreso\: %0 de %1
 Error\ while\ fetching\ from\ %0=Error al recuperar desde %0
 
-Please\ enter\ a\ valid\ number=Por favor, introduzca un número válido
 Show\ search\ results\ in\ a\ window=Mostrar los resultados de la búsqueda en una ventana
 Show\ global\ search\ results\ in\ a\ window=Mostrar resultados de búsqueda global en una ventana
 Search\ in\ all\ open\ libraries=Buscar en todos los archivos abiertos
-Move\ file\ to\ file\ directory?=¿Mover archivo a la carpeta de archivos?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=La biblioteca está protegida. No se puede guardar hasta que los cambios externos hayan sido revisados.
-Protected\ library=Biblioteca protegida
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Rechazar guadar la biblioteca antes qde que los cambios externos hayan sido revisado.
 Library\ protection=Proteccion de la biblioteca
 Unable\ to\ save\ library=No es posible guardar la biblioteca
@@ -1215,7 +1160,6 @@ MIME\ type=Tipo MIME
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Esta función permite que nuevos archivos seasn abiertos o importados en una instancia de JabRef que ya se esté ejecutando,<BR>en lugar de abrir una nueva instancia. Esto es útil, por ejemplo, cuando se abre un archivo en JabRef desde <br> el navegador de internet.<BR> Tenga en cuenta que esto le impedirá ejecutar más de una instancia de JabRef a la vez.
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Ejecutar recuperador, por ejemplo "--fetch\=Medline\:cancer"
 
-The\ ACM\ Digital\ Library=La Biblioteca Digital ACM
 Reset=Restablecer
 
 Use\ IEEE\ LaTeX\ abbreviations=Usar abreviaturas LaTeX IEEE
@@ -1223,7 +1167,6 @@ Use\ IEEE\ LaTeX\ abbreviations=Usar abreviaturas LaTeX IEEE
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Al abrir el enlace al archivo, buscar por archivo coincidente si no hay enlace definido
 Settings\ for\ %0=Ajustes para %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Ordenar los siguientes campos como campos numéricos
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Línea %0\: Se ha encontrado una clave BibTeX corrupta.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Línea %0\: Se ha encontrado una clave BibTeX corrupta (contiene espacios en blanco)
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Línea %0\: Se ha encontrado clave BibTeX corrupta (falta coma).
@@ -1235,7 +1178,6 @@ Append\ field=Añadir campo
 Append\ to\ fields=Añadir a campos
 Rename\ field\ to=Renombrar campo a
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Mover contenidos de un campo en un campo con nombre diferente
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Sólo puede renombrar un campo a la vez
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=No se puede usar el puerto %0 para operación remota\: Puede estar en uso por otra aplicación. Pruebe a especificar otro puerto.
 
@@ -1255,9 +1197,6 @@ Formatter\ not\ found\:\ %0=Formateador no encontrado\: %0
 Clear\ inputarea=Limpiar área de entrada
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=No se puede guardar. Fichero bloqueado por otra instancia JabRef.
-File\ is\ locked\ by\ another\ JabRef\ instance.=El archivo está bloqueado por otra instancia de JabRef.
-Do\ you\ want\ to\ override\ the\ file\ lock?=¿Quiere saltarse el bloqueo de archivo?
-File\ locked=Archivo bloqueado
 Current\ tmp\ value=Valor temporal actual
 Metadata\ change=Cambio de metadatos
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Se han efectuado los cambios a los siguientes elementos de los metadatos
@@ -1266,7 +1205,6 @@ Generate\ groups\ for\ author\ last\ names=Generar grupos para apellidos de auto
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Generar grupos desde palabras claves de un campo BibTeX
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Uso obligado de caracteres legales en claves BibTeX
 
-Save\ without\ backup?=¿Guardar sin copia de seguridad?
 Unable\ to\ create\ backup=No es posible crear la copia de seguridad
 Move\ file\ to\ file\ directory=Mover archivo al directorio de archivos
 Rename\ file\ to=Renombrar archivo a
@@ -1305,14 +1243,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Escoger fuente para importar met
 Create\ entry\ based\ on\ XMP-metadata=Crear entradas a partir de datos XMP
 Create\ blank\ entry\ linking\ the\ PDF=Crear entrada en blanco enlazando el PDF
 Only\ attach\ PDF=Sólo adjnntar PDF
-Title=Título
 Create\ new\ entry=Crear nueva entrada
 Update\ existing\ entry=Actualizar entrada existente
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autocompletar nombres sólo en el formato 'Nombre Apellidos'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autocompletar nombres sólo en el formato 'Apellidos, Nombre'
 Autocomplete\ names\ in\ both\ formats=Autocompletar nombres en ambos formatos
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=El nombre 'comment' no puede ser usado como nombre de tipo de entrada.
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Es preciso introducir un valor entero en el campo de texto para
 Send\ as\ email=Enviar como email
 References=Referencias
 Sending\ of\ emails=Envío de emails
@@ -1434,7 +1370,6 @@ Opens\ the\ file\ browser.=Abre el explorador de archivos.
 Scan\ directory=Escanear directorio
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Busca archivos sin enlazar en la carpeta seleccionada.
 Starts\ the\ import\ of\ BibTeX\ entries.=Comienza la importación de entradas BibTeX.
-Leave\ this\ dialog.=Dejar este diálogo.
 Create\ directory\ based\ keywords=Crear palabras clave basadas en carpeta
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Crea palabras clave en entradas creadas con nombres de ruta de carpeta.
 Select\ a\ directory\ where\ the\ search\ shall\ start.=Seleccione el directorio donde debería comenzar la búsqueda.
@@ -1442,11 +1377,9 @@ Select\ file\ type\:=Seleccione el tipo de archivo\:
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=Estos archivos no están enlazados en la biblioteca activa.
 Entry\ type\ to\ be\ created\:=Tipo de entrada a crear\:
 Searching\ file\ system...=Buscando en el sistema de archivos...
-Importing\ into\ Library...=Importando en biblioteca...
 Select\ directory=Seleccionar carpeta
 Select\ files=Seleccionar archivos
 BibTeX\ entry\ creation=Creación de entrada BibTeX
-<No\ selection>=<No hay selección>
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=No es posible conectar con el servicio online FreeCite.
 Parse\ with\ FreeCite=Analizar con FreeCite
 How\ would\ you\ like\ to\ link\ to\ '%0'?=¿Cómo desea enlazar '%0'?
@@ -1488,7 +1421,6 @@ Toggle\ print\ status=Cambiar estatus de impresion
 Update\ keywords=Actualizar palabras clave
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Escribir valores de campos especiales como campos separados en BibTeX
 You\ have\ changed\ settings\ for\ special\ fields.=Ha cambiado los ajustes para campos especiales.
-%0\ entries\ found.\ To\ reduce\ server\ load,\ only\ %1\ will\ be\ downloaded.=%0 entradas encontradas. Para reducir la carga del servidor, sólo %1 será(n) descargada(s).
 A\ string\ with\ that\ label\ already\ exists=Una cadena con esa etiqueta ya existe
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=La conexión con OpenOffice/LibreOffice se ha perdido. Asegúrese de que OpenOffice/LibreOffice está ejecutándose e intente reconectar.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRed enviará al menos una solicitud por entrada al editor
@@ -1509,8 +1441,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Su archivo de estilo especifica el formato de párrafo '%0', que no está definido en su documento OpenOffice/LibreOffice.
 
 Searching...=Buscando...
-You\ have\ selected\ more\ than\ %0\ entries\ for\ download.\ Some\ web\ sites\ might\ block\ you\ if\ you\ make\ too\ many\ rapid\ downloads.\ Do\ you\ want\ to\ continue?=Ha seleccionado más de %0 entradas para descargar. Algunos sitios web podrían bloquearle si hace demasiadas descargas. ¿Desea continuar?
-Confirm\ selection=Confirmar selección
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Añadir {} para especificar las palabras del título para mantener mayúsculas/minúsculas correctamente
 Import\ conversions=Importar conversiones
 Please\ enter\ a\ search\ string=Introduzca una cadena de búsqueda, por favor
@@ -1521,7 +1451,6 @@ Canceled\ merging\ entries=Cancelar fusionado de entradas
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Formatear unidades añadiendo separadores no divisores y manteniendo mayúsculas/minúsculas correctamente en la búsqueda
 Merge\ entries=Fusionar entradas
 Merged\ entries=Fusionar entradas en una nueva y mantener la antigua
-Merged\ entry=Entrada fusionada
 None=Ningún
 Parse=Analizar
 Result=Resultado
@@ -1605,9 +1534,7 @@ Add\ new\ file\ type=Añadir un nuevo tipo de archivo
 
 Left\ entry=Entrada izquierda
 Right\ entry=Entrada derecha
-Use=Usar
 Original\ entry=Entrada original
-Replace\ original\ entry=Reemplazar entrada original
 No\ information\ added=No se ha añadido información
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Seleccionar al menos una entrada para gestionar palabras clave.
 OpenDocument\ text=Texto OpenDocument
@@ -1626,7 +1553,6 @@ Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Por favor, mueva el fic
 Could\ not\ connect\ to\ %0=No se puede conectar a %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Atención\: %0 de %1 entradas tienen el título sin definir
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Atención\: %0 de un total de %1 entradas tienen clave BibTex indefinida.
-occurrence=incidencia
 Added\ new\ '%0'\ entry.=Añadida la nueva entrada '%0'
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Múltiples entradas seleccionadas. ¿Desea cambiar el tipo de todas ellas a '%0'?
 Changed\ type\ to\ '%0'\ for=Tipo cambiado a '%0' para
@@ -1646,8 +1572,6 @@ Print\ entry\ preview=Imprimir vista previa de la entrada
 Copy\ title=Copiar título
 Copy\ \\cite{BibTeX\ key}=Copiar \\cite{clave BibTeX}
 Copy\ BibTeX\ key\ and\ title=Copiar clave y título BibTeX
-File\ rename\ failed\ for\ %0\ entries.=Ha fallado el renombrado para %0 entradas.
-Merged\ BibTeX\ source\ code=Código fuente BibTex fusionado
 Invalid\ DOI\:\ '%0'.=DOI no válida\: '%0'.
 should\ start\ with\ a\ name=debería comenzar por un nombre
 should\ end\ with\ a\ name=debería acabar por un nombre
@@ -1740,10 +1664,8 @@ Error\ Occurred=Ha ocurrido un error
 Journal\ file\ %s\ already\ added=El fichero de revista %s ya está añadido
 Name\ cannot\ be\ empty=El nombre no puede estar vacío
 
-Adding\ fetched\ entries=Añadiendo las entradas recuperadas
 Display\ keywords\ appearing\ in\ ALL\ entries=Mostrar palabras clave que aparezcan en TODAS las entradas
 Display\ keywords\ appearing\ in\ ANY\ entry=Mostrar palabras clave que aparezcan en ALGUNA entrada
-Fetching\ entries\ from\ Inspire=Recuperando entradas desde Inspire
 None\ of\ the\ selected\ entries\ have\ titles.=Ninguna de las entradas seleccionadas tiene título
 None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=Ninguna de las entradas seleccionadas tiene clave BibTeX
 Unabbreviate\ journal\ names=Quitar abreviatción de nombres de journal
@@ -1758,14 +1680,11 @@ Ill-formed\ entrytype\ comment\ in\ BIB\ file=Comentario de tipo de entrada mal
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=Mover archivos enlazados a la carpeta de archivos por defecto
 
-Clipboard=Portapapeles
-Could\ not\ paste\ entry\ as\ text\:=No se puede pegar la entrada como texto\:
 Do\ you\ still\ want\ to\ continue?=¿Aún desea continuar?
 This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=Esta acción modificará los siguientes campos en al menos una entrad por cada uno\:
 This\ could\ cause\ undesired\ changes\ to\ your\ entries.=Esto podría causar cambios indeseados a sus entradas.
 Run\ field\ formatter\:=Ejecutar formateador de campo\:
 Table\ font\ size\ is\ %0=El tamaño de tipo de letra es %0
-%0\ import\ canceled=Importación desde %0 cancelada
 Internal\ style=Estilo interno
 Add\ style\ file=Añadir archivo de estilo
 Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=¿Está seguro de querer eliminar el archivo?
@@ -1980,7 +1899,6 @@ Your\ issue\ was\ reported\ in\ your\ browser.=Su problema fue comunicado a trav
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=La información de excepción y registro fue copiada a su portapapeles
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Por favor, pegue esta información (con Ctrl+V) en la descripción del problema.
 
-Connection=Conexión
 Connecting...=Conectando...
 Port=Puerto
 Library=Biblioteca
@@ -2006,9 +1924,7 @@ Shared\ version\:\ %0=Versión compartida\: %0
 Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Por favor, fusione la entrada compartida con la suya y presione "Fusionar entradas" para resolver el problema.
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Cancelar la operación dejará sus cambios sin sincronizar. ¿Cancelar de todos modos?
 Shared\ entry\ is\ no\ longer\ present=La entrada compartida ya no está presente.
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=La BibEntry en la que trabaja actualmente ha sido eliminada en la parte compartida.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Puede restaurar la entrada mediante la operación "Deshacer"
-Remember\ password?=¿Recordar contraseña?
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Ya esa conectado a una vase de datos usando los detalles de la conexión introducidos.
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=No se puede citar entradas sin las claves BibTeX. ¿Generar ahora?
@@ -2024,7 +1940,6 @@ You\ must\ enter\ at\ least\ one\ field\ name=Debe introducir, al menos, un nomb
 Non-ASCII\ encoded\ character\ found=Se han encontrado caracteres con codificación no-ASCII
 Toggle\ web\ search\ interface=Cambiar interfaz de búsqueda web
 %0\ files\ found=Se encontraron %0 archivos
-%0\ of\ %1=%0 de %1
 One\ file\ found=Se encontró un archivo
 The\ import\ finished\ with\ warnings\:=La importación finalizó con las siguientes alertas\:
 There\ was\ one\ file\ that\ could\ not\ be\ imported.=No se pudo importar un archivo.
@@ -2033,7 +1948,6 @@ There\ were\ %0\ files\ which\ could\ not\ be\ imported.=No se pudieron importar
 Migration\ help\ information=Información de ayuda para la migración
 Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=La biblioteca introducida tiene una estructura obsoleta y no se soporta.
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=En todo caso, una nueva biblioteca ha sido creada junto a la previa a la versión 3.6.
-Click\ here\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=Haga click aquí para aprender sobre la migración de bibliotecas de versiones previas a la 3.6
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Abre un enlace donde descarga la versión de desarrollo
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=Vea lo que se ha cambiado en las versiones de JabRef
 Referenced\ BibTeX\ key\ does\ not\ exist=La clave BibTex referenciada no existe
@@ -2059,7 +1973,6 @@ Used\ libraries=Librerías usadas
 Existing\ file=Fichero existente
 
 ID\ type=Tipo de ID
-ID-based\ entry\ generator=Generador de entradas basado en ID
 Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=El recolector '%0' no encontró entradas para la id '%1'.
 
 Select\ first\ entry=Seleccionar primera entrada
@@ -2110,8 +2023,6 @@ journal\ not\ found\ in\ abbreviation\ list=No se encuentra la revista en la lis
 Unhandled\ exception\ occurred.=Ocurrió una excepción no manejada
 
 strings\ included=cadenas incluidas
-Size\ of\ large\ icons=Tamaño de iconos grandes
-Size\ of\ small\ icons=Tamaño de iconos pequeños
 Default\ table\ font\ size=Tamaño de fuente por defecto para tabla
 Escape\ underscores=Escapar guiones bajos
 Color=Color
@@ -2171,3 +2082,7 @@ View\ event\ log=Ver visor de eventos
 Website=Sitio web
 Write\ XMP-metadata\ to\ PDFs=Escribir metadatos XMP a PDF
 
+Override\ default\ font\ settings=Ignorar ajustes de tipo de letra por defecto
+
+
+
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
index fd28a1ef31f..fa813cdeff6 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -17,6 +17,7 @@
 
 
 
+Add\ new=اضافه کردن جدید
 
 
 
@@ -29,12 +30,16 @@
 
 
 
+Advanced=پیشرفته
 
 
+and=و
 
 
+Appearance=ظاهر
 
 
+Append\ library=افزودن پایگاه داده
 
 
 
@@ -53,11 +58,10 @@
 
 
 
+%0\ source=%0 منبع
 
 
-
-
-
+by=توسط
 
 
 
@@ -145,7 +149,6 @@ Delete\ entry=حذف مدخل
 
 
 
-
 
 
 Donate\ to\ JabRef=هدیه دادن به JabRef
@@ -291,10 +294,6 @@ Donate\ to\ JabRef=هدیه دادن به JabRef
 
 
 
-
-
-
-
 
 
 
@@ -346,9 +345,6 @@ Manage\ external\ file\ types=مدیریت نوع پرونده‌های خارج
 
 
 
-
-
-
 
 
 
@@ -557,7 +553,6 @@ Open\ terminal\ here=در اینجا پایانه را باز کن
 
 
 
-
 
 
 Set/clear/append/rename\ fields=تنظیم/حذف/تغییرنام حوزه‌ها
@@ -686,3 +681,6 @@ Fork\ me\ on\ GitHub=مرا در GitHub منشعب کن
 Push\ entries\ to\ external\ application\ (%0)=(نشاندن ورودی‌ها به برنامه‌ی خارجی (%0
 Write\ XMP-metadata\ to\ PDFs=نوشتن XMP-metadata در PDFها
 
+
+
+
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index 2bddd1e7cd6..7647e660e9f 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<nom de champ>
 
-<select>=<sélectionner>
-
 <select\ word>=<entrer le mot-clef>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Abréger les noms de journaux des entrées sélectionnées (abréviations ISO)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Abréger les noms de journaux des entrées sélectionnées (abréviations MEDLINE)
@@ -34,12 +32,13 @@ Accept=Valider
 
 Accept\ change=Accepter la modification
 
-Action=Action
 
-What\ is\ Mr.\ DLib?=Qu'est ce que Mr. Dlib ?
+Action=Action
 
 Add=Ajouter
 
+Add\ new=Ajouter nouvelle
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Ajouter une classe Importer personnalisée (compilée) à partir d'un chemin de classe.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Le chemin n'a pas besoin d'être dans le chemin de classe de JabRef.
 
@@ -54,16 +53,12 @@ Add\ from\ folder=Ajouter à partir du répertoire
 
 Add\ from\ JAR=Ajouter à partir de JAR
 
-Add\ new=Ajouter nouvelle
-
 Add\ subgroup=Ajouter un sous-groupe
 
 Add\ to\ group=Ajouter au groupe
 
 Added\ group\ "%0".=Groupe « %0 » ajouté.
 
-Added\ new=Nouvel ajout
-
 Added\ string=Chaîne ajoutée
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=De plus, des entrées dont le champ <b>%0</b> ne contient pas <b>%1</b> peuvent être assignée manuellement à ce groupe en les sélectionnant puis en utilisant soit un glisser-déplacer ou le menu contextuel. Ce processus ajoute le terme <b>%1</b> à chaque champ d'entrées <b>%0</b>. Des entrées peuvent être supprimées manuellement de ce groupe les sélectionnant puis en utilisant le menu contextuel. Ce processus supprime le terme <b>%1</b> de chaque champ d'entrée <b>%0</b>.
@@ -72,12 +67,8 @@ Advanced=Avancé
 All\ entries=Toutes les entrées
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Toutes les entrées de ce type seront déclarées 'sans type'. Continuer ?
 
-All\ fields=Tous les champs
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Toujours remettre en forme les fichiers BIB lors de l'enregistrement et de l'exportation
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=Une exception SAX est survenue pendant le traitement de « %0 » \:
-
 and=et
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=tout champ qui correspond à l'expression régulière <b>%0</b>
@@ -168,6 +159,7 @@ Clear\ fields=Vider les champs
 
 Close=Fermer
 
+
 Close\ dialog=Fermer la fenêtre
 
 Close\ the\ current\ library=Fermer le fichier courant
@@ -223,6 +215,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Le programme 'vim' n'a pas pu être lancé
 Could\ not\ save\ file.=Le fichier n'a pas pu être enregistré.
 Character\ encoding\ '%0'\ is\ not\ supported.=L'encodage de caractères « %0 » n'est pas supporté.
 
+
 crossreferenced\ entries\ included=Entrées avec références croisées incluses
 
 Current\ content=Contenu actuel
@@ -258,8 +251,6 @@ Default\ grouping\ field=Champ par défaut pour les groupes
 
 Default\ pattern=Modèle par défaut
 
-Default\ sort\ criteria=Critère de tri par défaut
-
 Delete=Supprimer
 
 Delete\ custom\ format=Supprimer le format personnalisé
@@ -280,8 +271,6 @@ Deleted=Supprimé
 
 Permanently\ delete\ local\ file=Supprimer le fichier local
 
-Delimit\ fields\ with\ semicolon,\ ex.=Délimiter les champs par des points-virgules, ex.
-
 Descending=Descendant
 
 Description=Description
@@ -328,7 +317,7 @@ duplicate\ removal=Suppression des doublons
 
 Duplicate\ string\ name=Dupliquer le nom de chaîne
 
-Duplicates\ found=Doublons trouvés
+Duplicates\ found=Trouver les doublons
 
 Dynamic\ groups=Groupes dynamiques
 
@@ -336,7 +325,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Grouper dynami
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Grouper dynamiquement les entrées en cherchant un mot-clef dans un champ
 
-Each\ line\ must\ be\ on\ the\ following\ form=Chaque ligne doit être de la forme suivante
 
 Edit=Éditer
 
@@ -383,12 +371,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Types d'entrées
 
 Error=Erreur
-Error\ exporting\ to\ clipboard=Erreur lors de l'exportation vers le presse-papiers
 
 Error\ occurred\ when\ parsing\ entry=Une erreur est survenue pendant le traitement de l'entrée
 
 Error\ opening\ file=Erreur lors de l'ouverture du fichier
 
+
 Error\ while\ writing=Erreur lors de l'écriture
 
 '%0'\ exists.\ Overwrite\ file?=« %0 » existe. Écraser le fichier ?
@@ -419,8 +407,6 @@ External\ programs=Programmes externes
 
 External\ viewer\ called=Afficheur externe lancé
 
-Fetch=Rechercher
-
 Field=Champ
 
 field=Champ
@@ -428,8 +414,6 @@ field=Champ
 Field\ name=Nom du champ
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Les noms de champs ne peuvent pas contenir d'espace ou l'un des caractères suivants
 
-Field\ to\ filter=Champ vers filtre
-
 Field\ to\ group\ by=Champ à grouper par
 
 File=Fichier
@@ -444,13 +428,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Le répertoire de fichiers
 
 File\ exists=Le fichier existe
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=Le fichier a été mis à jour externalement. Que voulez-vous faire ?
-
 File\ not\ found=Fichier non trouvé
 File\ type=Type de fichier
-
-File\ updated\ externally=Fichier mis à jour externalement
-
 filename=nom de fichier
 
 Files\ opened=Fichiers ouverts
@@ -473,6 +452,7 @@ Float=Flottante
 
 for=pour
 
+
 Format\ of\ author\ and\ editor\ names=Format des noms d'auteurs et d'éditeurs
 Format\ string=Chaîne de format
 
@@ -483,9 +463,9 @@ found\ in\ AUX\ file=trouvées dans le fichier AUX
 
 Full\ name=Nom complet
 
+
 General=Général
 
-General\ fields=Champs généraux
 
 Generate=Créer
 
@@ -520,7 +500,7 @@ Hide\ non-hits=Masquer les entrées non correspondantes
 Hierarchical\ context=Type de hiérarchie
 
 Highlight=Surligner
-Marking=Etiqueter
+Marking=Étiqueter
 Underline=Souligner
 Empty\ Highlight=Annuler le surlignement
 Empty\ Marking=Annuler l'étiquetage
@@ -571,15 +551,13 @@ Importing=Importation en cours
 
 Importing\ in\ unknown\ format=Importation dans un format inconnu
 
-Include\ abstracts=Inclure les résumés
-Include\ entries=Entrées affectées
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Inclut les sous-groupes \: Quand sélectionné, afficher les entrées contenues dans ce groupe ou ses sous-groupes
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Groupe indépendant \: Quand sélectionné, afficher uniquement les entrées de ce groupe
 
 Work\ options=Attribution des champs
 
+
 Insert=Insérer
 
 Insert\ rows=Insérer des lignes
@@ -629,10 +607,6 @@ Leave\ file\ in\ its\ current\ directory=Laisser le fichier dans son répertoire
 
 Left=Gauche
 
-Limit\ to\ fields=Restreindre aux champs
-
-Limit\ to\ selected\ entries=Restreindre aux seules entrées sélectionnées
-
 Link=Lien
 Link\ local\ file=Lier le fichier local
 Link\ to\ file\ %0=Lien vers le fichier %0
@@ -655,8 +629,6 @@ Mark\ new\ entries\ with\ owner\ name=Nouvelles entrées attribuées au proprié
 
 Memory\ stick\ mode=Mode clef mémoire
 
-Menu\ and\ label\ font\ size=Taille de police pour les menus et les champs
-
 Merged\ external\ changes=Fusionner les modifications externes
 Merge\ fields=Fusionner les champs
 
@@ -682,6 +654,8 @@ Move\ up=Déplacer vers le haut
 
 Moved\ group\ "%0".=Groupe « %0 » déplacé.
 
+
+
 Name=Nom
 Name\ formatter=Formateur de nom
 
@@ -699,8 +673,6 @@ New\ content=Nouveau contenu
 
 New\ library\ created.=Nouveau fichier créé.
 
-New\ field\ value=Nouvelle valeur du champ
-
 New\ group=Nouveau groupe
 
 New\ string=Nouvelle chaîne
@@ -715,9 +687,6 @@ no\ library\ generated=pas de fichier créé
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Pas d'entrées trouvées. Assurez-vous, SVP, que vous utilisez le filtre d'importation approprié.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Pas d'entrée pour la chaîne de recherche « %0 »
-
 No\ entries\ imported.=Pas d'entrées importées.
 
 No\ files\ found.=Fichiers non trouvés.
@@ -739,8 +708,6 @@ Nothing\ to\ redo=Rien à répéter
 
 Nothing\ to\ undo=Rien à annuler
 
-occurrences=occurrences
-
 OK=Ok
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Une ou plusieurs clefs seront écrasées. Continuer ?
@@ -780,13 +747,10 @@ Override=Remplacer
 
 Override\ default\ file\ directories=Remplacer les répertoires de fichier par défaut
 
-Override\ default\ font\ settings=Se substituer aux paramètres de police par défaut
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=Remplacer la clef BibTeX par le texte sélectionné
 
 
 Overwrite=Ecraser
-Overwrite\ existing\ field\ values=Écraser les valeurs existantes du champ
 
 Overwrite\ keys=Écraser les clefs
 
@@ -822,6 +786,7 @@ Please\ enter\ the\ string's\ label=SVP, entrez le nom de la chaîne
 
 Please\ select\ an\ importer.=Sélectionner un filtre d'importation, SVP.
 
+
 Possible\ duplicate\ entries=Entrées potentiellement dupliquées
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Duplication possible d'une entrée existante. Cliquer pour vérifier.
@@ -857,8 +822,6 @@ Redo=Répéter
 
 Reference\ library=Fichier de référence
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Références trouvées \: %0. Nombre de références à récupérer ?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Raffine le super-groupe \: Quand sélectionné, afficher les entrées contenues à la fois dans ce groupe et son super-groupe
 
 regular\ expression=Expression régulière
@@ -917,13 +880,9 @@ Replace\ (regular\ expression)=Remplacer (expression régulière)
 
 Replace\ string=Remplacer la chaîne
 
-Replace\ with=Remplacer par
-
 Replace\ Unicode\ ligatures=Remplacer les ligatures Unicode
 Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Remplace les ligatures Unicode par leur forme développée
 
-Replaced=Remplacé
-
 Required\ fields=Champs requis
 
 Reset\ all=Rétablir les options précédentes
@@ -932,6 +891,8 @@ Resolve\ strings\ for\ all\ fields\ except=Traiter les chaînes pour tous les ch
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Traiter les chaînes pour les champs BibTeX standard uniquement
 
 resolved=résolu
+
+
 Review=Remarques
 Review\ changes=Revoir les changements
 Review\ Field\ Migration=Migration des champs « Review »
@@ -950,10 +911,6 @@ Save\ library\ as...=Enregistrement le fichier sous...
 
 Save\ entries\ in\ their\ original\ order=Enregistrer les entrées dans leur ordre original
 
-Save\ failed=Échec de l'enregistrement
-
-Save\ failed\ during\ backup\ creation=L'enregistrement a échoué durant la création de la copie de secours
-
 Saved\ library=Fichier enregistré
 
 Saved\ selected\ to\ '%0'.=Sélection enregistrée dans « %0 ».
@@ -967,8 +924,6 @@ Search=Recherche
 
 Search\ expression=Expression à rechercher
 
-Search\ for=Rechercher
-
 Searching\ for\ duplicates...=Recherche des doublons en cours...
 
 Searching\ for\ files=Recherche de fichiers...
@@ -977,19 +932,16 @@ Secondary\ sort\ criterion=Critère secondaire de tri
 
 Select\ all=Tout sélectionner
 
-Select\ encoding=Sélectionner l'encodage
-
 Select\ entry\ type=Sélectionner un type d'entrée
-Select\ external\ application=Sélectionner une application externe
 
 Select\ file\ from\ ZIP-archive=Sélectionner un fichier depuis une archive ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Sélectionner les nœuds de l'arborescence pour voir, et accepter ou rejeter, les modifications
-Selected\ entries=Les entrées sélectionnées
+
 Set\ field=Configurer le champ
 Set\ fields=Configurer les champs
 
-Set\ general\ fields=Définir les champs généraux
+
 Set\ main\ external\ file\ directory=Définir le répertoire principal des fichiers externes
 
 Settings=Paramètres
@@ -1045,8 +997,6 @@ Status=État
 
 Stop=Arrêt
 
-Strings=Chaîne
-
 Strings\ for\ library=Chaînes pour le fichier
 
 Sublibrary\ from\ AUX=Sous-fichier à partir du LaTeX AUX
@@ -1107,8 +1057,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Cette opération nécessite qu'une ou plusieurs entrées soient sélectionnées.
 
+
 Toggle\ entry\ preview=Afficher/Masquer l'aperçu
 Toggle\ groups\ interface=Afficher/Masquer l'interface des groupes
+
+
+
 Try\ different\ encoding=Essayer un encodage différent
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Développer les noms de journaux des entrées sélectionnées
@@ -1155,8 +1109,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=vérifier que
 View=Aperçu
 Vim\ server\ name=Nom du serveur Vim
 
-Waiting\ for\ ArXiv...=Attente de ArXiv...
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Avertir des doublons non résolus lors de la fermeture de la fenêtre d'inspection
 
 Warn\ before\ overwriting\ existing\ keys=Avertir avant d'écraser des clefs existantes
@@ -1188,7 +1140,6 @@ XMP-metadata=Métadonnées XMP
 XMP-metadata\ found\ in\ PDF\:\ %0=Métadonnées XMP trouvées dans le PDF \: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Vous devez redémarrer JabRef pour que ce changement prenne effet.
 You\ have\ changed\ the\ language\ setting.=Vous avez modifié la langue.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Vous avez entré une recherche invalide « %0 ».
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Vous devez relancer JabRef pour que les nouvelles affectations des touches soient activées.
 
@@ -1197,27 +1148,21 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Vos nouvelles affectations des tou
 The\ following\ fetchers\ are\ available\:=Les outils de recherche suivants sont disponible \:
 Could\ not\ find\ fetcher\ '%0'=L'outil de recherche « %0 » n'a pas pu être trouvé
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Exécution de la requête « %0 » avec l'outil de recherche « %1 ».
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=Le requête « %0 » pour l'outil de recherche « %1 » n'a retourné aucun résultat.
 
 Move\ file=Déplacer fichier
 Rename\ file=Renommer le fichier
 
+
 Move\ file\ failed=Échec du déplacement du fichier
 Could\ not\ move\ file\ '%0'.=Le fichier « %0 » n'a pas pu être déplacé.
 Could\ not\ find\ file\ '%0'.=Le fichier « %0 » n'a pas pu être trouvé.
 Number\ of\ entries\ successfully\ imported=Nombre d'entrées importées avec succès
 Import\ canceled\ by\ user=Importation interrompue par l'utilisateur
-Progress\:\ %0\ of\ %1=Progression \: %0 de %1
 Error\ while\ fetching\ from\ %0=Erreur au cours de la recherche %0
 
-Please\ enter\ a\ valid\ number=SVP, entrez un nombre valide
 Show\ search\ results\ in\ a\ window=Afficher les résultats de recherche dans une fenêtre
 Show\ global\ search\ results\ in\ a\ window=Afficher les résultats de recherche globale dans une fenêtre
 Search\ in\ all\ open\ libraries=Rechercher sur tous les fichiers ouverts
-Move\ file\ to\ file\ directory?=Déplacer le fichier vers le répertoire de fichiers ?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=Le fichier est protégé. L'enregistrement ne peut pas être effectué tant que les changements externes n'auront pas été vérifiés.
-Protected\ library=Fichier protégée
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Refus d'enregistrement du fichier tant que les changements externes ne sont pas vérifiés.
 Library\ protection=Protection du fichier
 Unable\ to\ save\ library=Impossible d'enregistrer le fichier
@@ -1229,16 +1174,13 @@ MIME\ type=Type MIME
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Cette fonction permet aux nouveaux fichiers d'être ouverts ou importés dans une fenêtre JabRef déjà active<BR>au lieu d'ouvrir une nouvelle fenêtre. Par exemple, c'est utile quand vous ouvrez un fichier dans JabRef<BR>à partir de notre navigateur internet. <BR>Notez que cela vous empêchera de lancer plus d'une fenêtre JabRef à la fois.
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Lance une recherche, par. ex. "--fetch\=Medline\:cancer"
 
-The\ ACM\ Digital\ Library=La Bibliothèque Numérique ACM
 Reset=Réinitialiser
 
 Use\ IEEE\ LaTeX\ abbreviations=Utiliser les abréviations LaTeX IEEE
-The\ Guide\ to\ Computing\ Literature=Le Guide de la Littérature Informatique
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=A l'ouverture d'un lien de fichier, rechercher un fichier correspondant si aucun lien n'est défini
 Settings\ for\ %0=Paramètres pour %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Trier les champs suivants comme des champs numériques
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Ligne %0 \: Clef BibTeX corrompue trouvée.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Ligne %0 \: Clef BibTeX corrompue trouvée (contient des espaces).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Ligne %0 \: Clef BibTeX corrompue trouvée (virgule manquante).
@@ -1251,7 +1193,6 @@ Append\ field=Ajouter au champ
 Append\ to\ fields=Ajouter aux champs
 Rename\ field\ to=Renommer le champ en
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Déplacer le contenu d'un champ vers un champ d'un nom différent
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Vou pouvez supprimer uniquement un champ à la fois
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Le port %0 ne peut pas être utilisé pour une opération à distance ; une autre application pourrait être en train de l'utiliser. Essayer de spécifier un autre port.
 
@@ -1271,9 +1212,6 @@ Formatter\ not\ found\:\ %0=Formateur non trouvé \: %0
 Clear\ inputarea=Vider la zone de saisie
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Échec de l'enregistrement, le fichier est verrouillé par une autre instance de JabRef.
-File\ is\ locked\ by\ another\ JabRef\ instance.=Le fichier est verrouillé par une autre instance de JabRef.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Voulez-vous outrepasser le verrouillage du fichier ?
-File\ locked=Fichier verrouillé
 Current\ tmp\ value=Valeur tmp actuelle
 Metadata\ change=Changement dans les métadonnées
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Des modifications ont été faites aux éléments de métadonnées suivants
@@ -1282,7 +1220,6 @@ Generate\ groups\ for\ author\ last\ names=Création de groupes pour les noms d'
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Création de groupes à partir de mots-clefs d'un champ BibTeX
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Imposer des caractères légaux dans les clefs BibTeX
 
-Save\ without\ backup?=Enregistrer sans sauvegarde de secours ?
 Unable\ to\ create\ backup=Impossible de créer une sauvegarde de secours
 Move\ file\ to\ file\ directory=Déplacer le fichier vers le répertoire de fichiers
 Rename\ file\ to=Renommer le fichier en
@@ -1321,14 +1258,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Choisir la source pour l'importa
 Create\ entry\ based\ on\ XMP-metadata=Créer une entrée basée sur les données XMP
 Create\ blank\ entry\ linking\ the\ PDF=Créer une entrée vide liée au PDF
 Only\ attach\ PDF=Lier uniquement le PDF
-Title=Titre
 Create\ new\ entry=Créer une nouvelle entrée
 Update\ existing\ entry=Mettre à jour une entrée existante
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Complétion automatique des noms uniquement dans le format 'Prénom Nom'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Complétion automatique des noms uniquement dans le format 'Nom, Prénom'
 Autocomplete\ names\ in\ both\ formats=Complétion automatique des noms dans les 2 formats
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=Le nom 'comment' ne peut pas être utilisé comme nom de type d'entrée.
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Vous devez entrer une valeur entière dans le champ texte pour
 Send\ as\ email=Expédier par courriel
 References=Références
 Sending\ of\ emails=Envoi des courriels
@@ -1442,7 +1377,7 @@ Unknown\ preference\ key\ '%0'=Clef de configuration « %0 » inconnue
 Unable\ to\ clear\ preferences.=Impossible d'initialiser la configuration.
 
 Reset\ preferences\ (key1,key2,...\ or\ 'all')=Réinitialiser la configuration (clef1, clef2,... ou 'toutes')
-Find\ unlinked\ files=Trouver les fichiers non liés
+Find\ unlinked\ files=Rechercher les fichiers non liés
 Unselect\ all=Tout désélectionner
 Expand\ all=Tout étendre
 Collapse\ all=Tout masquer
@@ -1450,7 +1385,6 @@ Opens\ the\ file\ browser.=Ouvre l'explorateur de fichier.
 Scan\ directory=Examiner le répertoire
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Recherche les fichiers non liés dans le répertoire sélectionné.
 Starts\ the\ import\ of\ BibTeX\ entries.=Débuter l'importation des entrées BibTeX
-Leave\ this\ dialog.=Quitter cette fenêtre de dialogue.
 Create\ directory\ based\ keywords=Créer les mots-clefs selon le répertoire
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Ajoute des mot-clefs dans les répertoires selon les chemins de répertoire
 Select\ a\ directory\ where\ the\ search\ shall\ start.=Sélectionner un répertoire où débutera la recherche
@@ -1458,12 +1392,9 @@ Select\ file\ type\:=Sélectionner le type de fichier \:
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=Ces fichiers ne sont pas liés dans le fichier actif.
 Entry\ type\ to\ be\ created\:=Type d'entrée à créer \:
 Searching\ file\ system...=Recherche dans le système de fichiers...
-Importing\ into\ Library...=Importation dans un fichier...
-Exporting\ into\ file...=Exportation vers un fichier...
 Select\ directory=Sélectionner un répertoire
 Select\ files=Sélectionner des fichiers
 BibTeX\ entry\ creation=Création d'un entrée BibTeX
-<No\ selection>=<Pas de sélection>
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=Impossible de se connecter au service en ligne FreeCite.
 Parse\ with\ FreeCite=Analyse avec FreeCite
 How\ would\ you\ like\ to\ link\ to\ '%0'?=Quel type de lien souhaitez-vous vers « %0 » ?
@@ -1505,8 +1436,7 @@ Toggle\ print\ status=Changer le statut d'impression
 Update\ keywords=Mettre à jour les mots-clefs
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Écrire les valeurs des champs spéciaux dans des champs BibTeX séparés
 You\ have\ changed\ settings\ for\ special\ fields.=Vous avez modifié les paramètres pour les champs spéciaux.
-%0\ entries\ found.\ To\ reduce\ server\ load,\ only\ %1\ will\ be\ downloaded.=%0 entrées trouvées. Pour réduire la charge du serveur, seulement %1 seront téléchargées.
-A\ string\ with\ that\ label\ already\ exists=Une chaîne avec cette étiquette existe déjà
+A\ string\ with\ that\ label\ already\ exists=Une chaîne avec ce nom existe déjà
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=La connexion à OpenOffice/LibreOffice a été perdue. S'il vous plaît, assurez-vous qu'OpenOffice/LibreOffice soit lancé, et essayez de vous reconnecter.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef fera au moins une requête par entrée à chaque éditeur.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Corrigez l'entrée et ré-ouvrez l'éditeur pour afficher/éditer la source.
@@ -1526,8 +1456,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Votre fichier de style spécifie le format de paragraphe « %0 », qui n'est pas défini dans votre document OpenOffice/LibreOffice actuel.
 
 Searching...=Recherche...
-You\ have\ selected\ more\ than\ %0\ entries\ for\ download.\ Some\ web\ sites\ might\ block\ you\ if\ you\ make\ too\ many\ rapid\ downloads.\ Do\ you\ want\ to\ continue?=Vous avez sélectionné plus de %0 entrées à télécharger. Certains sites web pourraient vous bloquer si vous effectuez de trop nombreux et rapides téléchargements. Voulez-vous continuer ?
-Confirm\ selection=Confirmez la sélection
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Ajouter {} aux mots du titre spécifiés lors d'une recherche pour préserver la casse correcte
 Import\ conversions=Importer les conversions
 Please\ enter\ a\ search\ string=Entrez s'il vous plaît une chaîne de recherche
@@ -1538,7 +1466,6 @@ Canceled\ merging\ entries=Fusion des entrées interrompues
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Formatter les unités en ajouter des séparateurs non interruptibles et conserver la casse correcte pour la recherche
 Merge\ entries=Fusionner les entrées
 Merged\ entries=Entrées fusionnées dans une nouvelle et anciennes conservées
-Merged\ entry=Entrée fusionnée
 None=Effacer
 Parse=Analyser
 Result=Résultat
@@ -1622,9 +1549,7 @@ Add\ new\ file\ type=Ajouter un nouveau type de fichier
 
 Left\ entry=Entrée de gauche
 Right\ entry=Entrée de droite
-Use=Utilisation
 Original\ entry=Entrée d'origine
-Replace\ original\ entry=Remplacer l'entrée d'origine
 No\ information\ added=Aucune information ajoutée
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Sélectionner au moins une entrée pour gérer les mots-clefs.
 OpenDocument\ text=Texte OpenDocument
@@ -1643,7 +1568,6 @@ Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Déplacez le fichier ma
 Could\ not\ connect\ to\ %0=La connexion à %0 n'a pas pu être établie
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Attention \: %0 des %1 entrées n'ont pas de titre.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Attention \: %0 des %1 entrées n'ont pas de clef BibTeX.
-occurrence=occurrence
 Added\ new\ '%0'\ entry.=Nouvelle entrée « %0 » ajoutée.
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Plusieurs entrées sont sélectionnées. Voulez-vous en changer le type en « %0 » pour toutes ?
 Changed\ type\ to\ '%0'\ for=Type modifié en « %0 » pour
@@ -1663,8 +1587,6 @@ Print\ entry\ preview=Imprimer la prévisualisation de l'entrée
 Copy\ title=Copier le titre
 Copy\ \\cite{BibTeX\ key}=Copier \\cite{clé BibTeX}
 Copy\ BibTeX\ key\ and\ title=Copier la clef BibTeX et le titre
-File\ rename\ failed\ for\ %0\ entries.=Le renommage des fichiers a échoué pour %0 entrées.
-Merged\ BibTeX\ source\ code=Code source BibTeX fusionné
 Invalid\ DOI\:\ '%0'.=DOI invalide \: « %0 ».
 should\ start\ with\ a\ name=devrait débuter par un nom
 should\ end\ with\ a\ name=devrait se terminer par un nom
@@ -1757,10 +1679,8 @@ Error\ Occurred=Une erreur s'est produite
 Journal\ file\ %s\ already\ added=Le fichier de journaux %s a déjà été ajouté
 Name\ cannot\ be\ empty=Le nom ne peut pas être vide
 
-Adding\ fetched\ entries=Ajout des entrées récupérées
 Display\ keywords\ appearing\ in\ ALL\ entries=Afficher les mots-clefs apparaissant dans TOUTES les entrées
 Display\ keywords\ appearing\ in\ ANY\ entry=Afficher les mots-clefs apparaissant dans AU MOINS UNE entrée
-Fetching\ entries\ from\ Inspire=Recherche d'entrées depuis Inspire
 None\ of\ the\ selected\ entries\ have\ titles.=Aucune des entrées sélectionnées n'a un titre.
 None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=Aucune des entrées sélectionnées n'a une clef BibTeX.
 Unabbreviate\ journal\ names=Développer les noms de journaux
@@ -1775,14 +1695,11 @@ Ill-formed\ entrytype\ comment\ in\ BIB\ file=Commentaire de type d'entrées mal
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=Déplacer les fichiers liés vers le répertoire par défaut %0
 
-Clipboard=Presse-papiers
-Could\ not\ paste\ entry\ as\ text\:=L'entrée n'a pas pu être collée comme du texte \:
 Do\ you\ still\ want\ to\ continue?=Voulez-vous continuer ?
 This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=Cette action modifiera le(s) champ(s) suivant(s) dans au moins une entrée chacune \:
 This\ could\ cause\ undesired\ changes\ to\ your\ entries.=Cela pourrai causer des changements non souhaités dans vos entrées.
 Run\ field\ formatter\:=Lancer le formatage des champs \:
 Table\ font\ size\ is\ %0=La taille de police de la table est %0
-%0\ import\ canceled=Importation %0 annulée
 Internal\ style=Style interne
 Add\ style\ file=Ajouter un fichier de style
 Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=Êtes-vous sûr de vouloir supprimer le style ?
@@ -2005,7 +1922,6 @@ Your\ issue\ was\ reported\ in\ your\ browser.=Votre anomalie a été affichée
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=Le journal et les informations d'anomalie ont été copiées dans votre presse-papier.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=SVP, collez ces informations (avec Ctrl+V) dans la description de l'anomalie.
 
-Connection=Connexion
 Connecting...=Connexion en cours...
 Host=Hôte
 Port=Port
@@ -2032,9 +1948,7 @@ Shared\ version\:\ %0=Version partagée \: %0
 Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=SVP, fusionnez l'entrée partagée avec la vôtre et cliquez sur "Fusionner les entrées" pour résoudre ce problème.
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Annuler cette opération laissera vos changements désynchronisés. Annuler quand même ?
 Shared\ entry\ is\ no\ longer\ present=L'entrée partagée n'est plus présente
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=L'entrée sur laquelle vous travaillez actuellement a été supprimée de la base partagée.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Vous pouvez restaurer l'entrée en utilisant l'opération "Annuler".
-Remember\ password?=Mémoriser le mot de passe ?
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Vous êtes déjà connecté à une base de données en utilisant les informations de connexion entrées.
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Citation impossible sans clef BibTeX. Générer les clefs maintenant ?
@@ -2050,7 +1964,6 @@ You\ must\ enter\ at\ least\ one\ field\ name=Vous devez entrer au moins un nom
 Non-ASCII\ encoded\ character\ found=Caractère ayant un encodage non-ASCII trouvé
 Toggle\ web\ search\ interface=Afficher/Masquer l'interface de recherche internet
 %0\ files\ found=%0 fichiers trouvés
-%0\ of\ %1=%0 de %1
 One\ file\ found=Un fichier trouvé
 The\ import\ finished\ with\ warnings\:=L'importation s'est terminée avec des messages d'avertissement \:
 There\ was\ one\ file\ that\ could\ not\ be\ imported.=Un fichier n'a pas pu être importé.
@@ -2059,7 +1972,6 @@ There\ were\ %0\ files\ which\ could\ not\ be\ imported.=%0 fichiers n'ont pas p
 Migration\ help\ information=Aide sur la migration
 Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Ce fichier a une structure obsolète qui n'est plus gérée.
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Ainsi, un nouveau fichier a été créée en parallèle de celle antérieure à la version 3.6.
-Click\ here\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=Cliquer ici pour plus de détails sur la migration des fichiers antérieurs à la version 3.6.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Ouvre un lien à partir duquel la version de développement actuelle peut être téléchargée
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=Afficher les changements dans les versions de JabRef
 Referenced\ BibTeX\ key\ does\ not\ exist=La clef BibTeX référencée n'existe pas
@@ -2087,7 +1999,6 @@ Existing\ file=Fichier existant
 
 ID=Identifiant
 ID\ type=Type d'identifiant
-ID-based\ entry\ generator=Générateur d'entrée basé sur l'identifiant
 Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=L'outil de recherche « %0 » n'a pas trouvé d'entrée pour l'identifiant « %1 ».
 
 Select\ first\ entry=Sélectionner la première entrée
@@ -2138,8 +2049,6 @@ journal\ not\ found\ in\ abbreviation\ list=journal non trouvé dans la liste d'
 Unhandled\ exception\ occurred.=Une exception non gérée est survenue.
 
 strings\ included=chaînes incluses
-Size\ of\ large\ icons=Taille des grands icônes
-Size\ of\ small\ icons=Taille des petits icônes
 Default\ table\ font\ size=Taille de police par défaut
 Escape\ underscores=Echapper les soulignements
 Color=Couleur
@@ -2173,7 +2082,7 @@ Delete\ from\ disk=Supprimer du disque
 Remove\ from\ entry=Effacer de l'entrée
 There\ exists\ already\ a\ group\ with\ the\ same\ name.=Un groupe portant ce nom existe déjà.
 
-Copy\ linked\ files\ to\ folder...=Copie les fichiers liés dans un répertoire...
+Copy\ linked\ files\ to\ folder...=Copier les fichiers liés dans un répertoire...
 Copied\ file\ successfully=Fichier copié avec succès
 Copying\ files...=Copie des fichiers...
 Copying\ file\ %0\ of\ entry\ %1=Copie du fichier %0 de l'entrée %1
@@ -2206,18 +2115,48 @@ Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Groupe contenant les
 Any\ file=N’importe quel fichier
 
 No\ linked\ files\ found\ for\ export.=Aucun fichier lié trouvé pour l'exportation.
-Database=Base de données
-Database\ type=Type de base de données
 
 Full\ text\ document\ download\ failed\ for\ entry\ %0=Le téléchargement du texte intégral a échoué pour l’entrée %0
 No\ full\ text\ document\ found\ for\ entry\ %0.=Aucun texte intégral trouvé pour l'entrée %0.
 
+Delete\ Entry=Supprimer l'entrée
+Import\ &\ Export=Importation & Exportation
+Look\ up\ document\ identifier=Rechercher l'identifiant du document
+Next\ library=Fichier suivant
+Previous\ library=Fichier précédent
 add\ group=ajouter un groupe
-
-
-
-
-
+Entry\ is\ contained\ in\ the\ following\ groups\:=L'entrée est contenue dans les groupes suivants \:
+Delete\ entries=Supprimer les entrées
+Keep\ entries=Garder les entrées
+Keep\ entry=Garder l'entrée
+Ignore\ backup=Ignorer la sauvegarde de secours
+Restore\ from\ backup=Restaurer à partir de la sauvegarde de secours
+
+Continue=Continuer
+Generate\ key=Créer la clef
+Overwrite\ file=Écraser le fichier
+Shared\ database\ connection=Connexion à une base de données partagée
+
+Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\ correct\ server\ name.=La connexion au serveur Vim a échoué. Assurez-vous que Vim tourne avec le bon nom de serveur.
+Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=La connexion au processus actif gnuserv a échoué. Assurez-vous que Emacs ou XEmacs tourne, et que le serveur a été démarré (en lançant la commande 'server-start'/'gnuserv-start').\n\n tourne avec le bon nom de serveur.
+Error\ pushing\ entries=Erreur lors de l'envoi des entrées
+
+Undefined\ character\ format=Format de caractère indéfini
+Undefined\ paragraph\ format=Format de paragraphe indéfini
+
+Edit\ Preamble=Éditer le préambule
+Markings=Étiquettes
+Use\ selected\ instance=Utiliser la fenêtre sélectionnée
+
+Hide\ panel=Masquer l'onglet
+Move\ panel\ up=Déplacer l'onglet vers le haut
+Move\ panel\ down=Déplacer l'onglet vers le bas
+Linked\ files=Fichiers liés
+Group\ view\ mode\ set\ to\ intersection=Mode d'affichage des groupes défini en intersection
+Group\ view\ mode\ set\ to\ union=Mode d'affichage des groupes défini en union
+Open\ %0\ URL\ (%1)=Ouvrir %0 URL (%1)
+Open\ URL\ (%0)=Ouvrir URL (%0)
+Open\ file\ %0=Ouvrir le fichier %0
 Jump\ to\ entry=Aller à cette entrée
 The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\ does\ not\ work\ as\ expected.=Le nom du groupe contient le séparateur de mot-clef « %0 » et ne fonctionnera probablement donc pas comme attendu.
 Abbreviate\ journal\ names\ (ISO)=Abréger les noms de journaux (IS&O)
@@ -2228,13 +2167,25 @@ Copy\ DOI\ url=Copier l'URL du DOI
 Copy\ citation=Copier la citation
 Development\ version=Version en développement
 Export\ selected\ entries=Exporter les entrées sélectionnées
+Export\ selected\ entries\ to\ clipboard=Exporter les entrées sélectionnées vers le presse-papiers
+Find\ duplicates=Rechercher les doublons
 Fork\ me\ on\ GitHub=Forkez-moi sur GitHub
 JabRef\ resources=Plus sur JabRef
+Manage\ journal\ abbreviations=Gérer les abréviations de journaux
 Manage\ protected\ terms=Gérer les termes protégés
 New\ %0\ library=Nouveau fichier %0
+New\ entry\ from\ plain\ text=Nouvelle entrée à partir de texte brut
+New\ sublibrary\ based\ on\ AUX\ file=Nouveau sous-fichier à partir du fichier AUX
 Push\ entries\ to\ external\ application\ (%0)=Envoyer l'entrée vers l'application externe (%0)
+Quit=Quitter
+Recent\ libraries=Fichiers récents
+Set\ up\ general\ fields=Définir les champs généraux
 View\ change\ log=Afficher le fichier des changements
 View\ event\ log=Afficher le journal des évènements
 Website=Site Internet
 Write\ XMP-metadata\ to\ PDFs=Ecrire les métadonnées XMP dans les PDFs
 
+Override\ default\ font\ settings=Se substituer aux paramètres de police par défaut
+
+
+
diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties
index 1ec9e76a810..f7002d3abec 100644
--- a/src/main/resources/l10n/JabRef_in.properties
+++ b/src/main/resources/l10n/JabRef_in.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<nama bidang>
 
-<select>=<pilih>
-
 <select\ word>=<pilih kata>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Singkat nama jurnal dari entri pilihan (Singkatan ISO)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Singkat nama jurnal dari entri pilihan (Singkatan MEDLINE)
@@ -34,12 +32,13 @@ Accept=Terima
 
 Accept\ change=Terima perubahan
 
-Action=Aksi
 
-What\ is\ Mr.\ DLib?=Apakah bapak Dlib?
+Action=Aksi
 
 Add=Tambah
 
+Add\ new=Tambah baru
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Tambah kelas Importer dari lokasi class.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Lokasi tidak harus pada lokasi kelas JabRef.
 
@@ -54,16 +53,12 @@ Add\ from\ folder=Tambah dari folder
 
 Add\ from\ JAR=Tambah dari JAR
 
-Add\ new=Tambah baru
-
 Add\ subgroup=Tambah Anak Grup
 
 Add\ to\ group=Tambah ke grup
 
 Added\ group\ "%0".=Grup ditambahkan "%0".
 
-Added\ new=Ditambahkan baru
-
 Added\ string=Ditambahkan string
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Tambahan, entri bidang <b>%0</b> yang tidak mengandung<b>%1</b> dapat ditugaskan secara manual ke grup ini dengan memilihnya kemudian menggunakan dengan cara seret dan tempatkan atau melalui menu konteks. Proses ini menghapus istilah <b>%1</b> pada tiap bidang <b>%0</b>.
@@ -72,12 +67,8 @@ Advanced=Tingkat lanjut
 All\ entries=Semua entri
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Semua entri tipe ini akan dinyatakan sebagai tanpa tipe. Teruskan?
 
-All\ fields=Semua bidang
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Selalu memformat BIB file pada menyimpan dan ekspor
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=SAXException terjadi ketika mengurai '%0'\:
-
 and=dan
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=bidang yang sesuai dengan ekspresi reguler <b>%0</b>
@@ -167,6 +158,7 @@ Clear\ fields=Bersihkan beberapa bidang
 
 Close=Tutup
 
+
 Close\ dialog=Tutup dialog
 
 Close\ the\ current\ library=Tutup basisdata yang sekarang
@@ -221,6 +213,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Tidak bisa menjalankan program 'vim'.
 Could\ not\ save\ file.=Tidak bisa membuka berkas.
 Character\ encoding\ '%0'\ is\ not\ supported.=Enkoding karakter '%0' tidak didukung.
 
+
 crossreferenced\ entries\ included=entri referensi silang diikutkan
 
 Current\ content=Isi sekarang
@@ -256,8 +249,6 @@ Default\ grouping\ field=Bidang grup bawaan
 
 Default\ pattern=Pola bawaan
 
-Default\ sort\ criteria=Kriteria pengurutan bawaan
-
 Delete=Hapus
 
 Delete\ custom\ format=Menghapus format suaian
@@ -278,8 +269,6 @@ Deleted=Dihapus
 
 Permanently\ delete\ local\ file=Hapus berkas lokal
 
-Delimit\ fields\ with\ semicolon,\ ex.=Batas bidang dengan titik koma, misal,
-
 Descending=Urutan menurun
 
 Description=Deskripsi
@@ -334,7 +323,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Entri grup din
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Entri grup dinamk dengan pencarian bidang dari katakunci
 
-Each\ line\ must\ be\ on\ the\ following\ form=Setiap baris harus menurut bentuk berikut
 
 Edit=Sunting
 
@@ -381,12 +369,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Tipe entri
 
 Error=Kesalahan
-Error\ exporting\ to\ clipboard=Kesalahan mengekspor ke papan klip
 
 Error\ occurred\ when\ parsing\ entry=Kesalahan terjadi ketika mengurai entri
 
 Error\ opening\ file=Kesalahan ketika membuka berkas
 
+
 Error\ while\ writing=Kesalahan ketika menulis
 
 '%0'\ exists.\ Overwrite\ file?='%0' esudah ada. Berkas ditindih?
@@ -416,8 +404,6 @@ External\ programs=Program eksternal
 
 External\ viewer\ called=Penampil eksternal dijalankan
 
-Fetch=Mengambil
-
 Field=Bidang
 
 field=bidang
@@ -425,8 +411,6 @@ field=bidang
 Field\ name=Nama bidang
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Nama bidang tidak diijinkan mengandung spasi kosong atau karakter berikut
 
-Field\ to\ filter=Bidang ditapis
-
 Field\ to\ group\ by=Bidang ke grup berdasar
 
 File=Berkas
@@ -441,13 +425,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Lokasi berkas belum ditent
 
 File\ exists=Berkas ada
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=Berkas diperbarui dengan program eksternal. Apakah yang and inginkan?
-
 File\ not\ found=Berkas tidak ditemukan
 File\ type=Tipe berkas
-
-File\ updated\ externally=Berkas diperbarui secara eksternal
-
 filename=nama berkas
 
 Files\ opened=Berkas dibuka
@@ -470,6 +449,7 @@ Float=Ambangan
 
 for=untuk
 
+
 Format\ of\ author\ and\ editor\ names=Format nama penulis dan penyunting
 Format\ string=Format string
 
@@ -480,9 +460,9 @@ found\ in\ AUX\ file=ditemukan dalam berkas AUX
 
 Full\ name=Nama lengkap
 
+
 General=Umum
 
-General\ fields=Bidang umum
 
 Generate=Membuat
 
@@ -567,15 +547,13 @@ Importing=Sedang mengimpor
 
 Importing\ in\ unknown\ format=Mengimpor pada format tidak dikenal
 
-Include\ abstracts=Termasuk abstrak
-Include\ entries=Termasuk entri
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Termasuk sub-grup\: Ketika dipilih, lihat entri yang ada di grup atau sub-grup ini.
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Grup bebas\: Ketika dipilih, lihat hanya entri grup ini
 
 Work\ options=Pilihan kerja
 
+
 Insert=Sisipkan
 
 Insert\ rows=Sisipkan baris
@@ -625,10 +603,6 @@ Leave\ file\ in\ its\ current\ directory=Tinggalkan berkas di direktori yg sekar
 
 Left=Kiri
 
-Limit\ to\ fields=Batasi ke bidang
-
-Limit\ to\ selected\ entries=Batasi ke entri pilihan
-
 Link=Tautan
 Link\ local\ file=Tautan berkas lokal
 Link\ to\ file\ %0=Tautan ke berkas %0
@@ -651,8 +625,6 @@ Mark\ new\ entries\ with\ owner\ name=Tandai entri baru dengan nama pemilik
 
 Memory\ stick\ mode=Mode Pena Simpan
 
-Menu\ and\ label\ font\ size=Ukuran huruf menu dan label
-
 Merged\ external\ changes=Menggabung perubahan eksternal
 
 Messages=Pesan
@@ -677,6 +649,8 @@ Move\ up=Pindah keatas
 
 Moved\ group\ "%0".=Grup dipindah "%0".
 
+
+
 Name=Nama
 Name\ formatter=Pemformat nama
 
@@ -694,8 +668,6 @@ New\ content=Isi baru
 
 New\ library\ created.=Basisdata baru selesai dibuat.
 
-New\ field\ value=Isi bidang baru
-
 New\ group=Grup baru
 
 New\ string=String baru
@@ -710,9 +682,6 @@ no\ library\ generated=tidak ada basisdata dibuat
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Entri tidak ditemukan. Pastikan anda menggunakan penapis impor yang tepat.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Tidak adan entri ditemukan untuk pencarian string '%0'
-
 No\ entries\ imported.=Tidak ada entri yang diimpor.
 
 No\ files\ found.=Berkas tidak ditemukan.
@@ -734,8 +703,6 @@ Nothing\ to\ redo=Tidak ada yang dibatalkan
 
 Nothing\ to\ undo=Tidak ada yang dikembalikan
 
-occurrences=kali
-
 OK=Ok
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Satu atau lebih kunci akan ditindih. Teruskan?
@@ -775,13 +742,10 @@ Override=Ganti
 
 Override\ default\ file\ directories=Ganti direktori berkas bawaan
 
-Override\ default\ font\ settings=Ganti ukuran huruf bawaan
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=Ganti kunci BibTeX dengan pilihan teks
 
 
 Overwrite=Tindih
-Overwrite\ existing\ field\ values=Tindih isi bidang yang ada
 
 Overwrite\ keys=Tindih kunci
 
@@ -817,6 +781,7 @@ Please\ enter\ the\ string's\ label=Tuliskan label string
 
 Please\ select\ an\ importer.=Silahkan pilih pengimpor.
 
+
 Possible\ duplicate\ entries=Mungkin entri sama
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Mungkin entri sama dengan lainnya. Klik untuk menyelesaikan.
@@ -852,8 +817,6 @@ Redo=Mengembalikan
 
 Reference\ library=Basisdata acuan
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Acuan ditemukan\: %0. Nomor referensi yang diambil?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Perbaiki supergrup\: Ketika dipilih, lihat entri yang ada di grup ini dan supergrup
 
 regular\ expression=Ekspresi reguler
@@ -912,10 +875,6 @@ Replace\ (regular\ expression)=Ganti (ekspresi reguler)
 
 Replace\ string=Ganti string
 
-Replace\ with=Ganti dengan
-
-
-Replaced=Diganti
 
 Required\ fields=Bidang diperlukan
 
@@ -925,6 +884,8 @@ Resolve\ strings\ for\ all\ fields\ except=Selesaikan masalah string untuk semua
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Selesaikan masalah string hanya pada bidang BibTeX standar
 
 resolved=sudah diselesaikan
+
+
 Review=Periksa ulang
 Review\ changes=Periksa ulang perubahan
 
@@ -942,10 +903,6 @@ Save\ library\ as...=Simpan basisdata sebagai...
 
 Save\ entries\ in\ their\ original\ order=Simpan entri pada urutan aslinya
 
-Save\ failed=Gagal menyimpan
-
-Save\ failed\ during\ backup\ creation=Gagal menyimpan waktu membuat cadangan
-
 Saved\ library=Basisdata disimpan
 
 Saved\ selected\ to\ '%0'.=Simpan pilihan ke '%0'.
@@ -959,8 +916,6 @@ Search=Cari
 
 Search\ expression=Ekspresi pencarian
 
-Search\ for=Mencari
-
 Searching\ for\ duplicates...=pencarian hal yang sama...
 
 Searching\ for\ files=Mencari berkas
@@ -969,19 +924,16 @@ Secondary\ sort\ criterion=Kriteria kedua
 
 Select\ all=Pilih semua
 
-Select\ encoding=Pilih enkoding
-
 Select\ entry\ type=Pilih tipe entri
-Select\ external\ application=Pilih aplikasi eksternal
 
 Select\ file\ from\ ZIP-archive=Pilih berkas dari arsip ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Pilih tiga nodal untuk melihat, menerima atau menolak perubahan
-Selected\ entries=Entri pilihan
+
 Set\ field=Pilih bidang
 Set\ fields=Pilih beberapa bidang
 
-Set\ general\ fields=Pilih bidang umum
+
 Set\ main\ external\ file\ directory=Tetapkan direktori utama berkas eksternal
 
 Settings=Pengaturan
@@ -1035,8 +987,6 @@ Status=Keadaan
 
 Stop=Berhenti
 
-Strings=String
-
 Strings\ for\ library=String untuk basisdata
 
 Sublibrary\ from\ AUX=Sub-basisdata dari AUX
@@ -1097,8 +1047,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Operasi ini memerlukan satu atau lebih entri yang dipilih.
 
+
 Toggle\ entry\ preview=Gunakan pratampilan entri
 Toggle\ groups\ interface=Gunakan antarmuka grup
+
+
+
 Try\ different\ encoding=Coba enkoding lain
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Nama jurnal tidak disingkat dari entri pilihan
@@ -1144,8 +1098,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=pastikan LyX
 View=Tampilkan
 Vim\ server\ name=Nama Server Vim
 
-Waiting\ for\ ArXiv...=Menunggu ArXiv...
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Peringatkan jika masih ada duplikasi ketika menutup dialog
 
 Warn\ before\ overwriting\ existing\ keys=Peringatan sebelum menindih kunci
@@ -1177,7 +1129,6 @@ XMP-metadata=Metadata XMP
 XMP-metadata\ found\ in\ PDF\:\ %0=XMP metadata ditemukan di PDF\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Anda harus menjalankan ulang JabRef agar berfungsi.
 You\ have\ changed\ the\ language\ setting.=Anda telah mengganti pengaturan bahasa.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Anda telah menulis pencarian yang salah '%0'.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Anda harus menjalankan ulang JabRef agar gabungan kunci dapat berfungsi.
 
@@ -1186,27 +1137,21 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Gabungan kunci anda sudah disimpan
 The\ following\ fetchers\ are\ available\:=Pengambil berikut tersedia\:
 Could\ not\ find\ fetcher\ '%0'=Tidak bisa menemukan pengambil '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Jalankan Kueri '%0' dengan pengambil '%1'.
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=Kueri '%0' dengan pengambil '%1' tidak ada hasilnya.
 
 Move\ file=Memindah berkas
 Rename\ file=Menamai berkas
 
+
 Move\ file\ failed=Gagal memindah berkas
 Could\ not\ move\ file\ '%0'.=Tidak bisa meindah berkas '%0'.
 Could\ not\ find\ file\ '%0'.=Tidak bisa menemukan berkas '%0'.
 Number\ of\ entries\ successfully\ imported=Jumlah entri yang berhasil diimpor
 Import\ canceled\ by\ user=Impor dibatalkan oleh pengguna
-Progress\:\ %0\ of\ %1=Berlangsung\: %0 of %1
 Error\ while\ fetching\ from\ %0=Kesalahan ketika mengambil dari %0
 
-Please\ enter\ a\ valid\ number=Tuliskan nomor yang benar
 Show\ search\ results\ in\ a\ window=Tampilkan hasil pencarian di jendela
 Show\ global\ search\ results\ in\ a\ window=Tampilkan hasil pencarian global di jendela
 Search\ in\ all\ open\ libraries=Cari di semua perpustakaan yang terbuka
-Move\ file\ to\ file\ directory?=Pindah berkas ke direktori berkas?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=Basisdata dilindungi. Tidak bisa disimpan sebelum perubahan eksternal diperiksa.
-Protected\ library=Basisdata terlindungi
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Menolak menyimpan basisdata sebelum perubahan eksternal diperiksa.
 Library\ protection=Perlindungan basisdata
 Unable\ to\ save\ library=Tidak bisa menyimpan basisdata
@@ -1218,16 +1163,13 @@ MIME\ type=Tipe MIME
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Fitur ini memungkinkan berkas baru atau impor ke jendela JabRef yang aktif<br>bukan membuat baru. Hal ini berguna ketika anda membuka berkas di JabRef<br>dari halaman web.<br>Hal ini akan menghindari anda membuka beberapa JabRef pada saat yang sama.
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Jalankan Pengambil, misal. "--fetch\=Medline\:cancer"
 
-The\ ACM\ Digital\ Library=Pustaka ACM Dijital
 Reset=Atur ulang
 
 Use\ IEEE\ LaTeX\ abbreviations=Gunakan singkatan IEEE LaTeX
-The\ Guide\ to\ Computing\ Literature=Panduan untuk Computing Literature
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Ketika membuka tautan berkas, cari berkas yang sesuai
 Settings\ for\ %0=Pengaturan untuk
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Urutkan bidang berikut sepeerti angka
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Baris %0\: Ditemukan kunci BibTeX ada kesalahan.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Baris %0\: Ditemukan kunci BibTeX ada kesalahan (mengandung spasi kosong).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Baris %0\: Ditemukan kunci BibTeX ada kesalahan (tidak ada koma).
@@ -1239,7 +1181,6 @@ Append\ field=Tambahkan bidang
 Append\ to\ fields=Tambahkan ke bidang
 Rename\ field\ to=Ganti nama bidang menjadi
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Pindah isi dari bidang ke bidang lain dengan nama lain
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Anda bisa mengganti nama satu bidang dalam satu waktu
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Tidak bisa memakai port %0 untuk operasi jauh; aplikasi lain mungkin sedang menggunakan. Coba port lain.
 
@@ -1259,9 +1200,6 @@ Formatter\ not\ found\:\ %0=Pemformat tidak ditemukan\: %0
 Clear\ inputarea=Bersihkan area masukan
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Tidak bisa menyimpan, berkas dikunci oleh JabRef yang jalan.
-File\ is\ locked\ by\ another\ JabRef\ instance.=Berkas dikunci oleh JabRef lain.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Apakah anda ingin menindih kunci berkas?
-File\ locked=Berkas dikunci
 Current\ tmp\ value=Angka tmp sekarang
 Metadata\ change=Perubahan Metadata
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Perubahan telah dilakukan pada elemen metadata berikut
@@ -1270,7 +1208,6 @@ Generate\ groups\ for\ author\ last\ names=Membuat grup untuk nama belakang penu
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Membuat grup dari katakunci di bidang BibTeX
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Menggunakan karakter legal untuk kunci BibTeX
 
-Save\ without\ backup?=Simpan tanpa cadangan?
 Unable\ to\ create\ backup=Tidak bisa membuat cadangan
 Move\ file\ to\ file\ directory=Pindah berkas ke direktori berkas
 Rename\ file\ to=Ganti nama berkas menjadi
@@ -1309,14 +1246,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Pilih sumber untuk impor metadat
 Create\ entry\ based\ on\ XMP-metadata=Membuat entri berasal data XMP
 Create\ blank\ entry\ linking\ the\ PDF=Membuat entri kosong tautan PDF
 Only\ attach\ PDF=Hanya lampirkan PDF
-Title=Judul
 Create\ new\ entry=membuat Entri Baru
 Update\ existing\ entry=Perbarui Entri Yang Sudah Ada
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Nama isian otomatis hanya untuk format 'Namadepan Namaakhir'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Nama isian otomatis hanya untuk format 'Namaakhir, Namadepan'
 Autocomplete\ names\ in\ both\ formats=Nama isian otomatis untuk kedua format
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=Nama 'kometar' tidak dapat digunakan sebagai tipe nama entri.
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Anda harus menggunakan bilangan bulat di bidang teks untuk
 Send\ as\ email=Kirim sebagai email
 References=Referensi
 Sending\ of\ emails=Sedang Mengirim email
@@ -1438,7 +1373,6 @@ Opens\ the\ file\ browser.=Buka penjelajah berkas.
 Scan\ directory=Pindai direktori
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Mencari berkas yang belum ditautkan dalam direktori pilihan.
 Starts\ the\ import\ of\ BibTeX\ entries.=Memulai impor entri BibTeX.
-Leave\ this\ dialog.=Tinggalkan dialog ini.
 Create\ directory\ based\ keywords=Buat katakunci berdasar direktori
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Buat katakunci dalam entri pembuatan dengan direktori
 Select\ a\ directory\ where\ the\ search\ shall\ start.=Pilih direktori mulaan pencarian.
@@ -1446,11 +1380,9 @@ Select\ file\ type\:=Pilih tipe berkas\:
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=Para berkas ini tidak bertautan dalam basisdata yang aktif
 Entry\ type\ to\ be\ created\:=Tipe entri untuk dibuat\:
 Searching\ file\ system...=Pencarian dalam sistem berkas...
-Importing\ into\ Library...=Impor ke basisdata...
 Select\ directory=Pilih direktori
 Select\ files=Pilih berkas
 BibTeX\ entry\ creation=Pembuatan entri BibTeX
-<No\ selection>=<Tidak ada pilihan>
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=Koneksi ke layanan online FreeCite gagal.
 Parse\ with\ FreeCite=Urai dengan FreeCite
 How\ would\ you\ like\ to\ link\ to\ '%0'?=Bagaimana mau menautkan ke '%0'?
@@ -1492,7 +1424,6 @@ Toggle\ print\ status=Beralih status cetak
 Update\ keywords=Perbarui katakunci
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Tulis isi bidang khusus sebagai bidang terpisah ke BibTeX
 You\ have\ changed\ settings\ for\ special\ fields.=Anda telah merubah pengaturan bidang khusus.
-%0\ entries\ found.\ To\ reduce\ server\ load,\ only\ %1\ will\ be\ downloaded.=%0 entri ditemukan. Untuk mengurangi beban server, hanya %1 akan dimuatturun.
 A\ string\ with\ that\ label\ already\ exists=String dengan label tadi sudah ada
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Sambungan ke OpenOffice/LibreOffice terlepas. Pastikan OpenOffice/LibreOffice dijalankan, dan coba menyambung sekali lagi.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef akan mengirimkan minimal satu permintaan per entri ke penerbit.
@@ -1513,8 +1444,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Berkas gaya anda menspesifikasi format paragraf '%0', yang tidak terdefinisi dalam dokumen OpenOffice/LibreOffice terkini anda.
 
 Searching...=Sedang mencari...
-You\ have\ selected\ more\ than\ %0\ entries\ for\ download.\ Some\ web\ sites\ might\ block\ you\ if\ you\ make\ too\ many\ rapid\ downloads.\ Do\ you\ want\ to\ continue?=Anda memilih lebih dari %0 entri. Sejumlah situs web akan memblokir anda kalau melakukan terlalu banyak pemuatturunan dengan cepat. Apa mau teruskan?
-Confirm\ selection=Mengkonfirmasi pilihan
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Tambahkan {} ke judul kata yang ditentukan pada pencarian untuk menyimpan kasus yang benar
 Import\ conversions=Impor konversi
 Please\ enter\ a\ search\ string=Tuliskan string pencarian
@@ -1525,7 +1454,6 @@ Canceled\ merging\ entries=Penggabungan entri dibatalkan
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Format unit dengan menambahkan pemisah tanpa henti dan menyimpan kasus yang benar pada pencarian
 Merge\ entries=Gabung entri
 Merged\ entries=Entri Gabungan
-Merged\ entry=Entri gabungan
 None=Kosong
 Parse=Urai
 Result=Hasil
@@ -1608,9 +1536,7 @@ Add\ new\ file\ type=Tambahkan tipe berkas yang baru
 
 Left\ entry=Masuk kiri
 Right\ entry=Masuk Kanan
-Use=Menggunakan
 Original\ entry=Entri asli
-Replace\ original\ entry=Ganti entri asli
 No\ information\ added=Tidak ada informasi yang ditambahkan
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Pilih paling sedikit sebuah entri untuk mengatur katakunci.
 OpenDocument\ text=Teks OpenDocument
@@ -1629,7 +1555,6 @@ Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Silahkan memindah berka
 Could\ not\ connect\ to\ %0=Tidak bisa menghubungi %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Peringatan\: %0 dari %1 entri memiliki judul yang tidak terdefinisi.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Peringatan\: %0 dari %1 entri ada kunci BibTeX yang tidak terdefinisi.
-occurrence=kejadian
 Added\ new\ '%0'\ entry.=Entri yang baru '%0' ditambahkan.
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Beberapa entri dipilih. Apakah Anda ingin mengubah jenis semua ini menjadi '%0'?
 Changed\ type\ to\ '%0'\ for=Merubah tipe ke '%0' untuk
@@ -1649,8 +1574,6 @@ Print\ entry\ preview=Cetak pratinjau entri
 Copy\ title=Kopi judul
 Copy\ \\cite{BibTeX\ key}=Salin \\cite{kunci BibTeX}
 Copy\ BibTeX\ key\ and\ title=Salin kunci BibTeX dan judul
-File\ rename\ failed\ for\ %0\ entries.=Perubahan nama berkas gagal untuk %0 entri.
-Merged\ BibTeX\ source\ code=Menggabungkan kode sumber BibTeX
 Invalid\ DOI\:\ '%0'.=DOI salah\: '%0'.
 should\ start\ with\ a\ name=harus bermula dengan nama
 should\ end\ with\ a\ name=harus berakhiran nama
@@ -1741,10 +1664,8 @@ Error\ Occurred=Terjadi kesalahan
 Journal\ file\ %s\ already\ added=File Jurnal %s sudah ditambahkan
 Name\ cannot\ be\ empty=Kolom Nama tidak boleh kosong
 
-Adding\ fetched\ entries=Tambah entri ambilan
 Display\ keywords\ appearing\ in\ ALL\ entries=Tampilkan katakunci yang ada dalam semua entri
 Display\ keywords\ appearing\ in\ ANY\ entry=Menampilkan kata kunci yang muncul dalam ANY entri
-Fetching\ entries\ from\ Inspire=Mengambil entri dari inspire
 None\ of\ the\ selected\ entries\ have\ titles.=Tak satu pun dari entri yang dipilih memiliki judul.
 None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=Tak satu pun dari entri yang dipilih memiliki kunci BibTeX.
 Unabbreviate\ journal\ names=Nama jurnal tidak disingkat
@@ -1759,14 +1680,11 @@ Ill-formed\ entrytype\ comment\ in\ BIB\ file=Komentar Ill-formed entrytype di B
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=Memindahkan file yang berhubungan ke default file direktori %0
 
-Clipboard=Papan klip
-Could\ not\ paste\ entry\ as\ text\:=Entri tidak bisa dimuat sebagai teks\:
 Do\ you\ still\ want\ to\ continue?=Apa masih mau meneruskan?
 This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=Tindakan ini akan mengubah bidang berikut setidaknya dalam satu entri\:
 This\ could\ cause\ undesired\ changes\ to\ your\ entries.=Hal ini bisa menyebabkan perubahan yang tidak diinginkan untuk entri Anda.
 Run\ field\ formatter\:=Jalankan formatter bidang\:
 Table\ font\ size\ is\ %0=Tabel ukuran font adalah %0
-%0\ import\ canceled=Impor %0 dibatalkan
 Internal\ style=Gaya internal
 Add\ style\ file=Tambah berkas gaya
 Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=Apakah anda Yakin ingin menghapus gayanya?
@@ -1984,7 +1902,6 @@ Your\ issue\ was\ reported\ in\ your\ browser.=Masalah Anda dilaporkan di browse
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=Informasi log dan pengecualian disalin ke clipboard Anda.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Silahkan paste informasi ini (dengan Ctrl + V) dalam deskripsi masalah.
 
-Connection=Koneksi
 Connecting...=Menghubungkan...
 Host=Tuan rumah
 Port=Pelabuhan
@@ -2011,9 +1928,7 @@ Shared\ version\:\ %0=Versi bersama\: % 0
 Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Harap gabungkan entri bersama dengan Anda dan tekan "Gabungkan entri" untuk mengatasi masalah ini.
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Membatalkan operasi ini akan membuat perubahan Anda tidak sinkron. Batalkan pula?
 Shared\ entry\ is\ no\ longer\ present=Entri bersama sudah tidak ada lagi
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=Bibit yang Anda kerjakan sekarang telah dihapus di sisi yang sama.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Anda dapat mengembalikan entri menggunakan operasi "Undo".
-Remember\ password?=Ingat kata Sandi?
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Anda sudah terhubung ke database menggunakan rincian koneksi yang dimasukkan.
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Tidak bisa mengutip entri tanpa kunci BibTeX. Buat kunci sekarang?
@@ -2029,7 +1944,6 @@ You\ must\ enter\ at\ least\ one\ field\ name=Anda harus memasukkan setidaknya s
 Non-ASCII\ encoded\ character\ found=Karakter yang dikodekan non-ASCII ditemukan
 Toggle\ web\ search\ interface=Alihkan antarmuka pencarian web
 %0\ files\ found=%0 file ditemukan
-%0\ of\ %1=%0 dari %1
 One\ file\ found=Satu file ditemukan
 The\ import\ finished\ with\ warnings\:=Impor selesai dengan peringatan\:
 There\ was\ one\ file\ that\ could\ not\ be\ imported.=Ada satu file yang tidak bisa diimpor.
@@ -2038,7 +1952,6 @@ There\ were\ %0\ files\ which\ could\ not\ be\ imported.=Ada file %0 yang tidak
 Migration\ help\ information=Migrasi membantu informasi
 Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Memasuki database memiliki struktur usang dan tidak lagi didukung.
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Namun, database baru dibuat bersamaan dengan pra-3.6 satu.
-Click\ here\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=Klik di sini untuk mempelajari tentang migrasi database pra-3.6.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Membuka tautan dimana versi pengembangan saat ini dapat diunduh
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=Lihat apa yang telah diubah di versi JabRef
 Referenced\ BibTeX\ key\ does\ not\ exist=Kunci BibTeX yang dirujuk tidak ada
@@ -2066,7 +1979,6 @@ Existing\ file=Berkas yang ada
 
 ID=ID
 ID\ type=Tipe ID
-ID-based\ entry\ generator=Generator entri berbasis ID
 Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=Fetcher ' % 0 ' tidak menemukan entri untuk id ' % 1 '.
 
 Select\ first\ entry=Pilih entri pertama
@@ -2117,8 +2029,6 @@ journal\ not\ found\ in\ abbreviation\ list=jurnal tidak ditemukan dalam daftar
 Unhandled\ exception\ occurred.=Pengecualian yang tidak tertangani terjadi.
 
 strings\ included=senar disertakan
-Size\ of\ large\ icons=Ukuran ikon besar
-Size\ of\ small\ icons=Ukuran ikon kecil
 Default\ table\ font\ size=Ukuran font tabel default
 Escape\ underscores=Escape menggarisbawahi
 Color=Warna
@@ -2207,3 +2117,7 @@ View\ event\ log=Lihat log aktivitas
 Website=Situs web
 Write\ XMP-metadata\ to\ PDFs=Tulis metadata XMP ke PSF
 
+Override\ default\ font\ settings=Ganti ukuran huruf bawaan
+
+
+
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index b632ec492b9..1f88b742ea7 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -15,8 +15,7 @@
 
 <field\ name>=<nome del campo>
 
-<select>=<seleziona>
-
+<select\ word>=<seleziona parola>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Abbrevia i nomi dei giornali delle voci selezionate (abbreviazioni ISO)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Abbrevia i nomi dei giornali delle voci selezionate (abbreviazioni MEDLINE)
 
@@ -33,12 +32,13 @@ Accept=Accetta
 
 Accept\ change=Accetta la modifica
 
-Action=Azione
 
-What\ is\ Mr.\ DLib?=Cos'è Mr. Dlib?
+Action=Azione
 
 Add=Aggiungi
 
+Add\ new=Aggiungi nuovo
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Aggiungi una classe Importer personalizzata (compilata) da un percorso.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Il percorso non deve necessariamente essere nel classpath di JabRef.
 
@@ -53,16 +53,12 @@ Add\ from\ folder=Aggiungi da una cartella
 
 Add\ from\ JAR=Aggiungi da un file JAR
 
-Add\ new=Aggiungi nuovo
-
 Add\ subgroup=Aggiungi un sottogruppo
 
 Add\ to\ group=Aggiungi al gruppo
 
 Added\ group\ "%0".=Aggiunto gruppo "%0".
 
-Added\ new=Aggiunto nuovo
-
 Added\ string=Aggiunta stringa
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Inoltre, le voci il cui campo <b>%0</b> non contiene <b>%1</b> possono essere assegnate manualmente a questo gruppo selezionandole e utilizzando il menu contestuale o il "drag-and-drop". Questo processo aggiunge il termine <b>%1</b> al campo <b>%0</b> di ciascuna voce. Le voci possono essere rimosse manualmente da questo gruppo selezionandole e utilizzando il menu contestuale. Questo processo elimina il termine  <b>%1</b> dal campo <b>%0</b> di ciascuna voce.
@@ -71,12 +67,8 @@ Advanced=Avanzate
 All\ entries=Tutte le voci
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Tutte le voci di questo tipo saranno definite 'senza tipo'. Continuare?
 
-All\ fields=Tutti i campi
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Riformatta sempre il file BIB quando salvi o esporti
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=Eccezione SAX durante l'analisi di '%0'\:
-
 and=e
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=qualsiasi campo che corrisponda all'espressione regolare <b>%0</b>
@@ -128,6 +120,7 @@ Backup\ old\ file\ when\ saving=Fai una copia di backup del vecchio file quando
 Browse=Sfoglia
 
 by=da
+The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=I campi di queste voci che sono in conflitto tra loro, verranno uniti nel campo 'Commenti'.
 
 Cancel=Annulla
 
@@ -166,6 +159,7 @@ Clear\ fields=Annulla i campi
 
 Close=Chiudi
 
+
 Close\ dialog=Chiudi la finestra di dialogo
 
 Close\ the\ current\ library=Chiudi la libreria corrente
@@ -221,6 +215,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Impossibile eseguire il programma 'vim'.
 Could\ not\ save\ file.=Impossibile salvare il file.
 Character\ encoding\ '%0'\ is\ not\ supported.=La codifica dei caratteri '%0' non è supportata.
 
+
 crossreferenced\ entries\ included=Incluse le voci con riferimenti incrociati
 
 Current\ content=Contenuto corrente
@@ -256,8 +251,6 @@ Default\ grouping\ field=Campo di raggruppamento predefinito
 
 Default\ pattern=Modello predefinito
 
-Default\ sort\ criteria=Criterio di ordinamento predefinito
-
 Delete=Cancella
 
 Delete\ custom\ format=Cancella i formati personalizzati
@@ -278,8 +271,6 @@ Deleted=Cancellato
 
 Permanently\ delete\ local\ file=Cancella file locale
 
-Delimit\ fields\ with\ semicolon,\ ex.=Campi delimitati da punto e virgola, ex.
-
 Descending=Discendente
 
 Description=Descrizione
@@ -334,7 +325,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Raggruppa dina
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Raggruppa dinamicamente le voci ricercando una parola chiave in un campo
 
-Each\ line\ must\ be\ on\ the\ following\ form=Ciascuna linea deve essere nel formato seguente
 
 Edit=Modifica
 
@@ -381,12 +371,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Tipi di voce
 
 Error=Errore
-Error\ exporting\ to\ clipboard=Errore durante l'esportazione negli appunti
 
 Error\ occurred\ when\ parsing\ entry=Errore durante l'elaborazione della voce
 
 Error\ opening\ file=Errore all'apertura del file
 
+
 Error\ while\ writing=Errore durante la scrittura
 
 '%0'\ exists.\ Overwrite\ file?='%0' esiste. Sovrascrivere il file?
@@ -404,6 +394,7 @@ Export\ properties=Esporta proprietà
 
 Export\ to\ clipboard=Esporta negli appunti
 
+Export\ to\ text\ file.=Esporta su file di testo.
 
 Exporting=Esportazione in corso
 Extension=Estensione
@@ -416,8 +407,6 @@ External\ programs=Programmi esterni
 
 External\ viewer\ called=Chiamata a visualizzatore esterno
 
-Fetch=Recupera
-
 Field=Campo
 
 field=campo
@@ -425,8 +414,6 @@ field=campo
 Field\ name=Nome del campo
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=I nomi dei campi non possono contenere spazi o i caratteri seguenti
 
-Field\ to\ filter=Campi da filtrare
-
 Field\ to\ group\ by=Campo di raggruppamento
 
 File=File
@@ -441,13 +428,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=La cartella dei file non 
 
 File\ exists=Il file esiste
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=Il file è stato aggiornato da un'applicazione esterna. Cosa vuoi fare?
-
 File\ not\ found=File non trovato
 File\ type=Tipo di file
-
-File\ updated\ externally=File aggiornato esternamente
-
 filename=nome del file
 
 Files\ opened=File aperti
@@ -470,6 +452,7 @@ Float=Galleggiante
 
 for=per
 
+
 Format\ of\ author\ and\ editor\ names=Formato dei nomi di autori e curatori
 Format\ string=Stringa di formattazione
 
@@ -480,9 +463,9 @@ found\ in\ AUX\ file=trovate nel file AUX
 
 Full\ name=Nome completo
 
+
 General=Generale
 
-General\ fields=Campi generali
 
 Generate=Genera
 
@@ -503,6 +486,7 @@ Get\ fulltext=Prendi testo completo
 Gray\ out\ non-hits=Disattiva le voci non corrispondenti
 
 Groups=Gruppi
+has/have\ both\ a\ 'Comment'\ and\ a\ 'Review'\ field.=ha/hanno sia un campo 'Commento' che un campo 'Recensione'.
 
 Have\ you\ chosen\ the\ correct\ package\ path?=Il classpath è corretto?
 
@@ -567,15 +551,13 @@ Importing=Importazione in corso
 
 Importing\ in\ unknown\ format=Importazione in formato sconosciuto
 
-Include\ abstracts=Includi il sommario
-Include\ entries=Includi voci
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Includi i sottogruppi\: Quando selezionato, mostra le voci contenute in questo gruppo e nei suoi sottogruppi
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Gruppo indipendente\: Quando selezionato, mostra solo le voci di questo gruppo
 
 Work\ options=Attribuzione dei campi
 
+
 Insert=Inserisci
 
 Insert\ rows=Inserisci righe
@@ -625,10 +607,6 @@ Leave\ file\ in\ its\ current\ directory=Lascia il file nella cartella corrente
 
 Left=Sinistra
 
-Limit\ to\ fields=Restrizioni ai campi
-
-Limit\ to\ selected\ entries=Restrizioni alle voci selezionate
-
 Link=Collegamento
 Link\ local\ file=Collegamento al file locale
 Link\ to\ file\ %0=Collegamento al file %0
@@ -651,9 +629,8 @@ Mark\ new\ entries\ with\ owner\ name=Contrassegna le nuove voci con il nome del
 
 Memory\ stick\ mode=Modalità chiavetta di memoria
 
-Menu\ and\ label\ font\ size=Dimensione del font di menu ed etichette
-
 Merged\ external\ changes=Modifiche esterne incorporate
+Merge\ fields=Unisci campi
 
 Messages=Messaggi
 
@@ -677,6 +654,8 @@ Move\ up=Sposta in su
 
 Moved\ group\ "%0".=Spostato gruppo "%0".
 
+
+
 Name=Nome
 Name\ formatter=Formattazione dei nomi
 
@@ -694,8 +673,6 @@ New\ content=Nuovo contenuto
 
 New\ library\ created.=Nuovo libreria creata
 
-New\ field\ value=Nuovo valore del campo
-
 New\ group=Nuovo gruppo
 
 New\ string=Nuova stringa
@@ -710,9 +687,6 @@ no\ library\ generated=nessuna libreria creata
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Nessuna voce trovata. Verificare che si stia utilizzando il filtro di importazione appropriato.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Nessuna voce trovata in base alla stringa di ricerca '%0'
-
 No\ entries\ imported.=Nessuna voce importata
 
 No\ files\ found.=Nessun file trovato.
@@ -734,8 +708,6 @@ Nothing\ to\ redo=Niente da ripetere
 
 Nothing\ to\ undo=Niente da annullare
 
-occurrences=ricorrenze
-
 OK=Ok
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Una o più chiavi saranno sovrascritte. Continuare?
@@ -775,13 +747,10 @@ Override=Sovrascrivi
 
 Override\ default\ file\ directories=Alternative alle cartelle di file predefinite
 
-Override\ default\ font\ settings=Ignora le impostazioni dei font predefinite
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=Sovrascrivi la chiave BibTeX con il testo selezionato
 
 
 Overwrite=Sovrascrivi
-Overwrite\ existing\ field\ values=Sovrascrivi i valori esistenti del campo
 
 Overwrite\ keys=Sovrascrivi chiavi
 
@@ -817,6 +786,7 @@ Please\ enter\ the\ string's\ label=Immettere l'etichetta della stringa
 
 Please\ select\ an\ importer.=Selezionare un filtro di importazione.
 
+
 Possible\ duplicate\ entries=Voci potenzialmente duplicate
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Possibile duplicazione di una voce esistente. Cliccare per effettuare la verifica.
@@ -852,8 +822,6 @@ Redo=Ripeti
 
 Reference\ library=Libreria di riferimenti
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Riferimenti trovati\: %0. Numero di riferimenti da recuperare?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Perfeziona il super-gruppo\: Quando selezionato, mostra le voci contenute sia in questo gruppo sia nel suo super-gruppo
 
 regular\ expression=Espressione regolare
@@ -912,10 +880,8 @@ Replace\ (regular\ expression)=Sostituisci (espressione regolare)
 
 Replace\ string=Sostituisci stringa
 
-Replace\ with=Sostituisci con
-
-
-Replaced=Sostituito
+Replace\ Unicode\ ligatures=Sostituire legature Unicode
+Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Sostituisce le legature Unicode con la loro forma estesa
 
 Required\ fields=Campo obbligatorio
 
@@ -925,8 +891,11 @@ Resolve\ strings\ for\ all\ fields\ except=Risolve le stringhe per tutti i campi
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Risolve le stringhe solo per i campi BibTeX standard
 
 resolved=risolto
+
+
 Review=Rivedi
 Review\ changes=Rivedi le modifiche
+Review\ Field\ Migration=Revisione Migrazione Campo
 
 Right=Destra
 
@@ -942,10 +911,6 @@ Save\ library\ as...=Salva la libreria come...
 
 Save\ entries\ in\ their\ original\ order=Salva le voci nel loro ordine originale
 
-Save\ failed=Salvataggio fallito
-
-Save\ failed\ during\ backup\ creation=Salvataggio fallito durante la creazione della copia di backup
-
 Saved\ library=Libreria salvata
 
 Saved\ selected\ to\ '%0'.=Salvata la selezione in '%0'.
@@ -959,8 +924,6 @@ Search=Ricerca
 
 Search\ expression=Espressione di ricerca
 
-Search\ for=Ricerca
-
 Searching\ for\ duplicates...=Ricerca di duplicati in corso...
 
 Searching\ for\ files=Ricerca dei file
@@ -969,19 +932,16 @@ Secondary\ sort\ criterion=Criterio di ordinamento secondario
 
 Select\ all=Seleziona tutto
 
-Select\ encoding=Seleziona la codifica
-
 Select\ entry\ type=Seleziona un tipo di voce
-Select\ external\ application=Seleziona un'applicazione esterna
 
 Select\ file\ from\ ZIP-archive=Seleziona un file da un archivio ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Selezionare i nodi dell'albero per vedere ed accettare o rifiutare le modifiche
-Selected\ entries=Voci selezionate
+
 Set\ field=Imposta il campo
 Set\ fields=Imposta i campi
 
-Set\ general\ fields=Definisci i campi generali
+
 Set\ main\ external\ file\ directory=Impostare la cartella principale dei file esterni
 
 Settings=Parametri
@@ -1012,8 +972,10 @@ Show\ required\ fields=Mostra i campi obbligatori
 
 Show\ URL/DOI\ column=Mostra colonna URL/DOI
 
+Show\ validation\ messages=Visualizza i messaggi di convalida
 
 Simple\ HTML=HTML semplice
+Since\ the\ 'Review'\ field\ was\ deprecated\ in\ JabRef\ 4.2,\ these\ two\ fields\ are\ about\ to\ be\ merged\ into\ the\ 'Comment'\ field.=Poiché il campo "Review" è stato deprecato in JabRef 4.2, questi due campi saranno fusi nel campo "Commenti".
 
 Size=Dimensione
 
@@ -1022,6 +984,7 @@ Skipped\ -\ PDF\ does\ not\ exist=Saltato - Il file PDF non esiste
 
 Skipped\ entry.=Voce saltata
 
+Some\ appearance\ settings\ you\ changed\ require\ to\ restart\ JabRef\ to\ come\ into\ effect.=Alcune impostazioni riguardanti l'aspetto, che hai cambiato, richiedono il riavvio di JabRef per entrare in vigore.
 
 source\ edit=modifica sorgente
 Special\ name\ formatters=Formattazioni speciali dei nomi
@@ -1034,8 +997,6 @@ Status=Stato
 
 Stop=Arresta
 
-Strings=Stringa
-
 Strings\ for\ library=Stringhe per la libreria
 
 Sublibrary\ from\ AUX=Sottolibreria da file LaTeX AUX
@@ -1047,6 +1008,7 @@ Target\ file\ cannot\ be\ a\ directory.=L'oggetto deve essere un file, non una c
 
 Tertiary\ sort\ criterion=Criterio di ordinamento terziario
 
+Test=Prova
 
 paste\ text\ here=Area di inserimento testo
 
@@ -1095,13 +1057,18 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Per questa operazione una o più voci devono essere selezionate
 
+
 Toggle\ entry\ preview=Mostra/Nascondi l'anteprima
 Toggle\ groups\ interface=Mostra/Nascondi l'interfaccia dei gruppi
+
+
+
 Try\ different\ encoding=Prova codifiche differenti
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Mostra il nome completo delle riviste per le voci selezionate
 Unabbreviated\ %0\ journal\ names.=%0 nomi di riviste per esteso.
 
+Unable\ to\ open\ %0=Impossibile aprire %0
 Unable\ to\ open\ link.\ The\ application\ '%0'\ associated\ with\ the\ file\ type\ '%1'\ could\ not\ be\ called.=Impossibile aprire il collegamento. L'applicazione '%0' associata con il tipo di file '%1' non può essere aperta.
 unable\ to\ write\ to=Impossibile scrivere su
 
@@ -1128,6 +1095,7 @@ Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Aggiornare i vec
 usage=uso
 Use\ autocompletion\ for\ the\ following\ fields=Usa l'autocompletamento per i seguenti campi
 
+Tweak\ font\ rendering\ for\ entry\ editor\ on\ Linux=Regola il rendering dei font per l'editor delle voci su Linux
 Use\ regular\ expression\ search=Ricerca l'espressione regolare
 
 Username=Nome utente
@@ -1141,8 +1109,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=verifica che
 View=Visualizza
 Vim\ server\ name=Nome del server Vim
 
-Waiting\ for\ ArXiv...=In attesa di ArXiv...
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Avverti della presenza di doppioni non risolti alla chiusura della finestra di ispezione
 
 Warn\ before\ overwriting\ existing\ keys=Avverti prima di sovrascrivere chiavi esistenti
@@ -1174,7 +1140,6 @@ XMP-metadata=Metadati XMP
 XMP-metadata\ found\ in\ PDF\:\ %0=Metadati XMP trovati nel file PDF\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Riavviare JabRef per rendere effettiva la modifica.
 You\ have\ changed\ the\ language\ setting.=La lingua è stata modificata.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=È stata inserita una ricerca non valida '%0'.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Riavviare JabRef per rendere operative le nuove assegnazioni di tasti.
 
@@ -1183,27 +1148,21 @@ Your\ new\ key\ bindings\ have\ been\ stored.=La nuova assegnazione di tasti è
 The\ following\ fetchers\ are\ available\:=Le utilità di ricerca seguenti sono disponibili\:
 Could\ not\ find\ fetcher\ '%0'=Impossibile trovare l'utilità di ricerca '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Esecuzione della query '%0' con l'utilità di ricerca '%1'.
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=La query '%0' con l'utilità di ricerca '%1' non ha prodotto alcun risultato.
 
 Move\ file=Sposta file
 Rename\ file=Rinomina il file
 
+
 Move\ file\ failed=Spostamento del file fallito
 Could\ not\ move\ file\ '%0'.=Impossibile spostare il file '%0'.
 Could\ not\ find\ file\ '%0'.=Impossibile trovare il file '%0'.
 Number\ of\ entries\ successfully\ imported=Numero di voci importate con successo
 Import\ canceled\ by\ user=Importazione interrotta dall'utente
-Progress\:\ %0\ of\ %1=Stato d'avanzamento\: %0 di %1
 Error\ while\ fetching\ from\ %0=Errore durante la ricerca %0
 
-Please\ enter\ a\ valid\ number=Inserire un numero valido
 Show\ search\ results\ in\ a\ window=Mostra i risultati della ricerca in una finestra
 Show\ global\ search\ results\ in\ a\ window=Mostra i risultati della ricerca globale in una finestra
 Search\ in\ all\ open\ libraries=Cerca in tutte le librerie aperte
-Move\ file\ to\ file\ directory?=Spostare i file nella cartella dei file principale?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=La libreria è protetta. Le modifiche esterne devono evvere state riviste prima di poter salvare.
-Protected\ library=Libreria protetta
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Rifiuta di salvare la libreria prima che le modifiche esterne siano state riviste.
 Library\ protection=Protezione della libreria
 Unable\ to\ save\ library=Impossibile salvare la libreria
@@ -1215,7 +1174,6 @@ MIME\ type=Tipo MIME
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Questa funzione permette l'apertura o l'importazione di nuovi file in una istanza di JabRef già aperta<BR>invece di aprirne una nuova. Per esempio, ciò è utile quando un file viene aperto in JabRef<BR>da un browser web.<BR>Questo tuttavia impedisce di aprire più sessioni di JabRef contemporaneamente.
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Lanciare una ricerca, es. "--fetch\=Medline\:cancer"
 
-The\ ACM\ Digital\ Library=ACM Digital Library
 Reset=Reinizializza
 
 Use\ IEEE\ LaTeX\ abbreviations=Usa le abbreviazioni LaTeX IEEE
@@ -1223,17 +1181,18 @@ Use\ IEEE\ LaTeX\ abbreviations=Usa le abbreviazioni LaTeX IEEE
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=All'apertura di un collegamento ad un file, ricercare un file corrispondente se non ne è definito uno.
 Settings\ for\ %0=Parametri  per %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Ordina i campi seguenti come campi numerici
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Riga %0\: chiave BibTeX corrotta.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Riga %0\: chiave BibTeX corrotta (contiene spazi).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Riga %0\: chiave BibTeX corrotta (virgola mancante).
+No\ full\ text\ document\ found=Nessun documento di testo completo trovato
 Update\ to\ current\ column\ order=Salvare l'ordine delle colonne attuale
 Download\ from\ URL=Scarica dall'URL
 Rename\ field=Rinomina il campo
 Set/clear/append/rename\ fields=Imposta / svuota / rinomina i campi
+Append\ field=Aggiungi campo
+Append\ to\ fields=Aggiungi ai campi
 Rename\ field\ to=Rinomina il campo in
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Sposta il contenuto di un campo in un campo con nome diverso
-You\ can\ only\ rename\ one\ field\ at\ a\ time=È possibile rinominare solo un campo per volta
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Impossibile utilizzare la porta %0 per operazioni remote; la porta potrebbe essere in uso da parte di un'altra applicazione. Provare a specificare una porta diversa.
 
@@ -1253,9 +1212,6 @@ Formatter\ not\ found\:\ %0=Formattazione non trovata\: %0
 Clear\ inputarea=Svuota l'area di inserimento
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Impossibile salvare, il file è bloccato da un'altra istanza di JabRef.
-File\ is\ locked\ by\ another\ JabRef\ instance.=Il file è bloccato da un'altra istanza di JabRef.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Vuoi ignorare il blocco del file?
-File\ locked=File bloccato
 Current\ tmp\ value=Variabile "tmp" corrente
 Metadata\ change=Modifica dei metadati
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Sono stati modificati i seguenti elementi dei metadati
@@ -1264,7 +1220,6 @@ Generate\ groups\ for\ author\ last\ names=Genera gruppi in base al cognome dell
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Genera gruppi in base alle parole chiave in un campo BibTeX
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Imponi l'utilizzo dei soli caratteri conformi alla sintassi nelle chiavi BibTeX
 
-Save\ without\ backup?=Salvare senza backup?
 Unable\ to\ create\ backup=Impossibile creare un backup
 Move\ file\ to\ file\ directory=Sposta il file nella cartella dei file
 Rename\ file\ to=Rinomina il file in
@@ -1303,14 +1258,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Scegli la sorgente dei metadati
 Create\ entry\ based\ on\ XMP-metadata=Crea una nuova voce in base ai dati XMP
 Create\ blank\ entry\ linking\ the\ PDF=Crea una voce vuota collegata al file PDF
 Only\ attach\ PDF=Allega solo il file PDF
-Title=Titolo
 Create\ new\ entry=Crea una nuova voce
 Update\ existing\ entry=Aggiorna la voce esistente
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autocompletamento dei nomi solo nel formato 'Firstname Lastname'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autocompletamento dei nomi solo nel formato 'Lastname, Firstname'
 Autocomplete\ names\ in\ both\ formats=Autocompletamento dei nomi in entrambi i formati
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=Il nome 'comment' non può essere utilizzato come nome di tipo di voce.
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Inserire un numero intero nel campo di testo per
 Send\ as\ email=Invia come email
 References=Riferimenti
 Sending\ of\ emails=Invio di email
@@ -1432,7 +1385,6 @@ Opens\ the\ file\ browser.=Apre il dialogo di selezione dei file.
 Scan\ directory=Analizza la cartella
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Ricerca nella cartella selezionata file non collegati.
 Starts\ the\ import\ of\ BibTeX\ entries.=Inizia l'importazione delle voci BibTeX
-Leave\ this\ dialog.=Abbandona questo dialogo.
 Create\ directory\ based\ keywords=Crea parole chiave in base al nome delle cartelle
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Crea parole chiave nelle voci generate in base al percorso delle cartelle
 Select\ a\ directory\ where\ the\ search\ shall\ start.=Seleziona una cartella dalla quale iniziare la ricerca.
@@ -1440,11 +1392,9 @@ Select\ file\ type\:=Seleziona il tipo di file\:
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=Questi file non sono collegati nella libreria attiva.
 Entry\ type\ to\ be\ created\:=Tipo di voci da creare\:
 Searching\ file\ system...=Ricerca nel filesystem...
-Importing\ into\ Library...=Importazione nella libreria
 Select\ directory=Seleziona cartella
 Select\ files=Seleziona file
 BibTeX\ entry\ creation=Creazione della voce BibTeX
-<No\ selection>=<Nessuna selezione>
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=Impossibile connettersi al servizio online FreeCite.
 Parse\ with\ FreeCite=Analizza con FreeCite
 How\ would\ you\ like\ to\ link\ to\ '%0'?=Come vuoi collegare a '%0'?
@@ -1486,7 +1436,6 @@ Toggle\ print\ status=Invertito lo stato di stampa
 Update\ keywords=Aggiorna parole chiave
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Scrivi i valori dei campi speciali come campi separati nelle voci BibTeX
 You\ have\ changed\ settings\ for\ special\ fields.=Sono state modificate le impostazioni per i campi speciali.
-%0\ entries\ found.\ To\ reduce\ server\ load,\ only\ %1\ will\ be\ downloaded.=Trovate %0 voci. Per ridurre il carico sul server ne saranno scaricate solo %1.
 A\ string\ with\ that\ label\ already\ exists=Una stringa con questa etichetta esiste già.
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Perduta la connessione con OpenOffice/LibreOffice. Assicurarsi che OpenOffice/LibreOffice sia in esecuzione e provare a riconnettersi.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef spedirà almeno una richiesta per voce ad un editore.
@@ -1507,8 +1456,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Il file di stile specifica il formato di paragrafo "%0" che non è tuttavia definito nel documento OpenOffice/LibreOffice corrente.
 
 Searching...=Ricerca in corso...
-You\ have\ selected\ more\ than\ %0\ entries\ for\ download.\ Some\ web\ sites\ might\ block\ you\ if\ you\ make\ too\ many\ rapid\ downloads.\ Do\ you\ want\ to\ continue?=Sono state selezionate più di %0 voci da scaricare. Alcuni siti potrebbero bloccare la connessione se si eseguono scaricamenti troppo numerosi e rapidi. Continuare?
-Confirm\ selection=Conferma la selezione
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Aggiungere {} alle parole del titolo specificate per mantenere la corretta capitalizzazione nella ricerca.
 Import\ conversions=Importare le conversioni
 Please\ enter\ a\ search\ string=Inserire una stringa di ricerca
@@ -1519,7 +1466,6 @@ Canceled\ merging\ entries=Accorpamento delle voci cancellato
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Struttura le unità aggiungendo separatori non interrompibili e conservare la corretta capitalizzazione per la ricerca
 Merge\ entries=Unisci voci
 Merged\ entries=Accorpate le voci in una nuova e mantenute le vecchie
-Merged\ entry=Voce accorpata
 None=Nessuna
 Parse=Analizza
 Result=Risultato
@@ -1580,6 +1526,7 @@ Show\ printed\ status=Mostra lo stato di stampa
 Show\ read\ status=Mostra lo stato di lettura
 
 Opens\ JabRef's\ GitHub\ page=Apri la pagina di JabRef su GitHub
+Opens\ JabRef's\ Twitter\ page=Apri la pagina Twitter di JabRef
 Opens\ JabRef's\ Facebook\ page=Apri la pagina Facebook di JabRef
 Opens\ JabRef's\ blog=Apri il blog di JabRef
 Opens\ JabRef's\ website=Apri il sito web di JabRef
@@ -1602,9 +1549,7 @@ Add\ new\ file\ type=Aggiungi un nuovo tipo di file
 
 Left\ entry=Voce di sinistra
 Right\ entry=Voce di destra
-Use=Uso
 Original\ entry=Voce originale
-Replace\ original\ entry=Rimpiazza il voce originale
 No\ information\ added=Non è stata aggiunta alcuna informazione
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Seleziona almeno una voce per gestire le parole chiave
 OpenDocument\ text=Testo di OpenDocument
@@ -1623,7 +1568,6 @@ Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Per favore sposta il fi
 Could\ not\ connect\ to\ %0=Impossibile la connessione a %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Attenzione\: %0 di %1 voci non hanno un titolo definito.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Attenzione\: %0 di %1 voci hanno chiavi BibTeX non definite.
-occurrence=occorrenza
 Added\ new\ '%0'\ entry.=Aggiunta la nuova voce '%0'.
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Selezione multipla. Vuoi cambiare il tipo di tutti questi in '%0'?
 Changed\ type\ to\ '%0'\ for=Tipo cambiato in '%0' per
@@ -1643,8 +1587,6 @@ Print\ entry\ preview=Stampa l'anteprima della voce
 Copy\ title=Copia titolo
 Copy\ \\cite{BibTeX\ key}=Copia \\cite{chiave BibTeX}
 Copy\ BibTeX\ key\ and\ title=Copia la chiave BibTeX ed il titolo
-File\ rename\ failed\ for\ %0\ entries.=Rinominazione dei file fallita per %0 voci.
-Merged\ BibTeX\ source\ code=Codice sorgente BibTeX accorpato
 Invalid\ DOI\:\ '%0'.=DOI non valido\: '%0'.
 should\ start\ with\ a\ name=deve cominciare con un nome
 should\ end\ with\ a\ name=deve finire con un nome
@@ -1719,6 +1661,7 @@ value=valore
 Show\ preferences=Mostra preferenze
 Save\ actions=Salva azioni
 Enable\ save\ actions=Abilita il salvataggio delle azioni
+Convert\ to\ BibTeX\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journaltitle'\ field\ to\ 'journal')=Converti in formato BibTeX (ad esempio, sposta il valore del campo 'titolodiario' su 'diario')
 
 Other\ fields=Altri campi
 Show\ remaining\ fields=Mostra i campi rimanenti
@@ -1736,10 +1679,8 @@ Error\ Occurred=C'è stato un errore
 Journal\ file\ %s\ already\ added=File per rivista %s già aggiunto
 Name\ cannot\ be\ empty=Il nome non può essere vuoto
 
-Adding\ fetched\ entries=Aggiungo le voci estratte
 Display\ keywords\ appearing\ in\ ALL\ entries=Mostra le parole chiave che compaiono in TUTTI le voci
 Display\ keywords\ appearing\ in\ ANY\ entry=Mostra le parole chiave che compaiono in QUALSIASI voce
-Fetching\ entries\ from\ Inspire=Estrae le voci da Inspire
 None\ of\ the\ selected\ entries\ have\ titles.=Nessuna delle voci selezionate ha un titolo.
 None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=Nessuno delle voci selezionate ha chiavi BibTeX.
 Unabbreviate\ journal\ names=Espandi nomi delle riviste (MEDLINE)
@@ -1754,14 +1695,11 @@ Ill-formed\ entrytype\ comment\ in\ BIB\ file=Commento nel tipo di voce malforma
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=Sposta i collegamenti ai file nella cartella predefinita
 
-Clipboard=Appunti
-Could\ not\ paste\ entry\ as\ text\:=Non posso incollare la voce come testo\:
 Do\ you\ still\ want\ to\ continue?=Vuoi ancora continuare?
 This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=Questa azione modificherà i seguenti campi per almeno una voce ciascuno\:
 This\ could\ cause\ undesired\ changes\ to\ your\ entries.=Questo potrebbe causare modifiche indesiderate alle tue voci.
 Run\ field\ formatter\:=Fa andare il formattatore di campo\:
 Table\ font\ size\ is\ %0=La grandezza del carattere e00e8 %0
-%0\ import\ canceled=Importazione da %0 annullata
 Internal\ style=Stile interno
 Add\ style\ file=Aggiungi file di stile
 Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=Sei sicuro di voler rimuovere lo stile?
@@ -1779,6 +1717,7 @@ Changes\ all\ letters\ to\ upper\ case.=Metti tutte le lettere in maiuscolo.
 Changes\ the\ first\ letter\ of\ all\ words\ to\ capital\ case\ and\ the\ remaining\ letters\ to\ lower\ case.=Metti in maiuscolo la prima lettera di tutte le parole e le altre in minuscolo.
 Cleans\ up\ LaTeX\ code.=Pulisci il codice LaTeX.
 Converts\ HTML\ code\ to\ LaTeX\ code.=Converti il codice HTML in LaTeX.
+HTML\ to\ Unicode=HTML a Unicode
 Converts\ HTML\ code\ to\ Unicode.=Converti il codice HTML in Unicode.
 Converts\ LaTeX\ encoding\ to\ Unicode\ characters.=Converti la codice LaTeX in caratteri Unicode.
 Converts\ Unicode\ characters\ to\ LaTeX\ encoding.=Converti i caratteri Unicode in codice LaTeX.
@@ -1790,6 +1729,7 @@ LaTeX\ to\ Unicode=Da LaTeX a Unicode
 Lower\ case=Minuscolo
 Minify\ list\ of\ person\ names=Riduci la lista di nomi di persona
 Normalize\ date=Normalizza la data
+Normalize\ en\ dashes=Normalizza trattini brevi
 Normalize\ month=Normalizza il mese
 Normalize\ month\ to\ BibTeX\ standard\ abbreviation.=Normalizza il mese secondo l'abbreviazione standard di BibTeX.
 Normalize\ names\ of\ persons=Normalizza i nomi di persona
@@ -1797,8 +1737,11 @@ Normalize\ page\ numbers=Normalizza i numeri di pagina
 Normalize\ pages\ to\ BibTeX\ standard.=Normalizza le pagine secondo lo standard di BibTeX.
 Normalizes\ lists\ of\ persons\ to\ the\ BibTeX\ standard.=Normalizza le liste di persone  secondo lo standard di BibTeX.
 Normalizes\ the\ date\ to\ ISO\ date\ format.=Normalizza le date secondo il formato di data ISO
+Normalizes\ the\ en\ dashes.=Normalizza i trattini brevi.
 Ordinals\ to\ LaTeX\ superscript=Da ordinali ad apici LaTeX
 Protect\ terms=Termini protetti
+Add\ enclosing\ braces=Aggiungi parentesi
+Add\ braces\ encapsulating\ the\ complete\ field\ content.=Aggiungi le parentesi che incapsulano il contenuto completo del campo.
 Remove\ enclosing\ braces=Rimuovi le parentesi graffe interne
 Removes\ braces\ encapsulating\ the\ complete\ field\ content.=Rimuovi le parentesi graffe che incapsulano completamente il contenuto dei campi.
 Sentence\ case=Frase maiuscola/minuscola
@@ -1854,6 +1797,7 @@ Redactor=Redattore
 Research\ report=Relazione di ricerca
 Reviser=Revisore
 Section=Sezione
+Software=Software
 Technical\ report=Relazione tecnica
 U.S.\ patent=Brevetto U.S.
 U.S.\ patent\ request=Richiesta di brevetto U.S.
@@ -1978,8 +1922,8 @@ Your\ issue\ was\ reported\ in\ your\ browser.=Il problema è stato segnalato ne
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=Il log e le informazioni dell'eccezione sono stati copiati negli appunti.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Per favore, incolla questa informazione (con Ctrl+V) nella descrizione del problema.
 
-Connection=Connessione
 Connecting...=Connetto...
+Host=Host
 Port=Porta
 Library=Libreria
 User=Utente
@@ -2004,9 +1948,7 @@ Shared\ version\:\ %0=Versione condivisa\: %0
 Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Accorpa la voce condivisa con la tua e premi "Accorpa voci" per risolvere questo problema.
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Cancellare questa operazione lascerà le modifiche non sincronizzate. Cancella comunque?
 Shared\ entry\ is\ no\ longer\ present=La voce condivisa non è più presente
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=La BibEntry su cui stai lavorando è stata cancellata dalla parte che l'ha condivisa.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Puoi ripristinare la voce usando l'"Undo".
-Remember\ password?=Devo ricordare la password?
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Sei già connesso ad una libreria con i dettagli di connessione specificati.
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Non posso citare voci senza chiavi BibTeX. Le genero ora?
@@ -2022,7 +1964,6 @@ You\ must\ enter\ at\ least\ one\ field\ name=Devi inserire almeno il nome di un
 Non-ASCII\ encoded\ character\ found=Trovato un carattere non codificato ASCII
 Toggle\ web\ search\ interface=Inverti la selezione dell'interfaccia di ricerca web
 %0\ files\ found=Trovati %0 file
-%0\ of\ %1=%0 di %1
 One\ file\ found=Trovato un file
 The\ import\ finished\ with\ warnings\:=L'importazione è terminata con degli avvisi\:
 There\ was\ one\ file\ that\ could\ not\ be\ imported.=Un file non è stato importato.
@@ -2031,7 +1972,6 @@ There\ were\ %0\ files\ which\ could\ not\ be\ imported.=%0 file non sono stati
 Migration\ help\ information=Informazioni per la migrazione
 Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=La libreria selezionata ha una struttura obsoleta e non è più supportata.
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Tuttavia è stata creata una nuova libreria oltre a quello pre-3.6.
-Click\ here\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=Clicca qui per informazioni sulla migrazione di librerie pre-3.6
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Apri un collegamento da cui scaricare la versione di sviluppo
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=Vedi cosa è cambiato tra le versioni di JabRef
 Referenced\ BibTeX\ key\ does\ not\ exist=La chiave BibTeX a cui ci si riferisce non esiste
@@ -2044,6 +1984,8 @@ Author=Autore
 Date=Data
 File\ annotations=File di annotazioni
 Show\ file\ annotations=Mostra il file delle annotazioni
+Adobe\ Acrobat\ Reader=Adobe Acrobat Reader
+Sumatra\ Reader=Lettore di Sumatra
 shared=condiviso
 should\ contain\ an\ integer\ or\ a\ literal=deve contenere almeno un intero o una lettera
 should\ have\ the\ first\ letter\ capitalized=la prima lettera deve essere maiuscola
@@ -2057,7 +1999,6 @@ Existing\ file=File esistente
 
 ID=ID
 ID\ type=Tipo di ID
-ID-based\ entry\ generator=Generatore di voci basato su ID
 Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=Il collettore '%0' non ha trovato una voce per l'id '%1'
 
 Select\ first\ entry=Seleziona la prima voce
@@ -2108,8 +2049,6 @@ journal\ not\ found\ in\ abbreviation\ list=rivista non trovata nella lista dell
 Unhandled\ exception\ occurred.=È avvenuta un'eccezione non gestita.
 
 strings\ included=stringhe incluse
-Size\ of\ large\ icons=Dimensione delle icone grandi
-Size\ of\ small\ icons=Dimensione delle icone piccole
 Default\ table\ font\ size=Font predefinito per le tabelle
 Escape\ underscores=Marca i caratteri di sottolineatura
 Color=Colore
@@ -2143,23 +2082,81 @@ Delete\ from\ disk=Cancella dal disco
 Remove\ from\ entry=Rimuovi dalla voce
 There\ exists\ already\ a\ group\ with\ the\ same\ name.=Esiste già almeno un gruppo con lo stesso nome.
 
-
-
-
+Copy\ linked\ files\ to\ folder...=Copia i file collegati nella cartella...
+Copied\ file\ successfully=File copiati correttamente
+Copying\ files...=Copia dei file in corso...
+Copying\ file\ %0\ of\ entry\ %1=Copia del file in corso %0 di %1
+Finished\ copying=Copiatura terminata
+Could\ not\ copy\ file=Impossibile copiare il file
+Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=%0 file su %1 sono stati copiati correttamente in %2
+Rename\ failed=Rinomina non riuscita
+JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef non può accedere al file perché questo è utilizzato da un altro processo.
+Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Visualizza output di console (necessario solo quando viene utilizzato il file di avvio)
+
+Remove\ line\ breaks=Rimuovi interruzioni di riga
+Removes\ all\ line\ breaks\ in\ the\ field\ content.=Rimuove tutte le interruzioni di riga nel contenuto del campo.
+Checking\ integrity...=Verifica dell'integrità...
+
+Remove\ hyphenated\ line\ breaks=Rimuovi le interruzioni di riga con trattino
+Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Rimuove tutte le interruzioni di riga con trattino nel contenuto del campo.
+Note\ that\ currently,\ JabRef\ does\ not\ run\ with\ Java\ 9.=Nota che attualmente, JabRef non funziona con Java 9.
+Your\ current\ Java\ version\ (%0)\ is\ not\ supported.\ Please\ install\ version\ %1\ or\ higher.=La tua versione attuale di Java (%0) non è supportata. Si prega di installare la versione %1 o successiva.
+
+Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Impossibile recuperare dati in ingresso da '%0'.
+Entry\ from\ %0\ could\ not\ be\ parsed.=Non è stato possibile analizzare la voce %0.
+Invalid\ identifier\:\ '%0'.=Identificatore non valido\: '%0'.
+This\ paper\ has\ been\ withdrawn.=Questo documento è stato ritirato.
+Finished\ writing\ XMP-metadata.=Finito di trascrivere i metadati XMP.
 empty\ BibTeX\ key=chiave BibTeX vuota
+Your\ Java\ Runtime\ Environment\ is\ located\ at\ %0.=Il tuo ambiente di Runtime di Java si trova in %0.
 Aux\ file=File aux
+Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Gruppo contenente voci citate in un determinato file TeX
 
 Any\ file=Qualsiasi file
 
-No\ linked\ files\ found\ for\ export.=Nessun file collegati trovati per esportazione.
+No\ linked\ files\ found\ for\ export.=Nessun file collegato trovato per esportazione.
 
+Full\ text\ document\ download\ failed\ for\ entry\ %0=Download del documento di testo completo fallito per la voce %0
+No\ full\ text\ document\ found\ for\ entry\ %0.=Nessun documento di testo completo trovato per la voce %0.
 
+Delete\ Entry=Elimina Voce
+Import\ &\ Export=Importa & Esporta
+Look\ up\ document\ identifier=Ricerca l'identificatore del documento
+Next\ library=Prossima libreria
+Previous\ library=Libreria precedente
 add\ group=aggiungi un gruppo
-
-
-
-
-
+Entry\ is\ contained\ in\ the\ following\ groups\:=La voce è contenuta nei seguenti gruppi\:
+Delete\ entries=Cancella le voci
+Keep\ entries=Mantieni le voci
+Keep\ entry=Mantieni la voce
+Ignore\ backup=Ignora backup
+Restore\ from\ backup=Ripristina da backup
+
+Continue=Continua
+Generate\ key=Genera chiave
+Overwrite\ file=Sovrascrivi file
+Shared\ database\ connection=Connessione database condivisa
+
+Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\ correct\ server\ name.=Impossibile connettersi al server Vim. Assicurati che Vim sta funzionando con il nome corretto del server.
+Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Impossibile connettersi a un processo gnuserv in esecuzione. Assicurarsi che Emacs o XEmacs sia in esecuzione e che il server sia stato avviato (eseguendo il comando 'server-start'/'gnuserv-start').
+Error\ pushing\ entries=Errore nell'invio delle voci
+
+Undefined\ character\ format=Formato del carattere indefinito
+Undefined\ paragraph\ format=Formato del paragrafo indefinito
+
+Edit\ Preamble=Modifica preambolo
+Markings=Segni
+Use\ selected\ instance=Usa istanza selezionata
+
+Hide\ panel=Nascondi pannello
+Move\ panel\ up=Spostare il pannello verso l'alto
+Move\ panel\ down=Spostare il pannello verso il basso
+Linked\ files=File collegati
+Group\ view\ mode\ set\ to\ intersection=Modalità di visualizzazione di gruppo impostata su intersezione
+Group\ view\ mode\ set\ to\ union=Modalità di visualizzazione di gruppo impostata su unione
+Open\ %0\ URL\ (%1)=Apri %0 URL (%1)
+Open\ URL\ (%0)=Apri Url (%0)
+Open\ file\ %0=Apri file %0
 Jump\ to\ entry=Salta alla voce
 The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\ does\ not\ work\ as\ expected.=Il nome di gruppo contiene il separatore di keyword "%0" e quindi probabilmente non funziona come ci si aspetta.
 Abbreviate\ journal\ names\ (ISO)=Abbrevia nomi delle riviste (ISO)
@@ -2170,13 +2167,25 @@ Copy\ DOI\ url=Copia l'url del DOI
 Copy\ citation=Copia la citazione
 Development\ version=Versione di sviluppo
 Export\ selected\ entries=Esporta le voci selezionate
+Export\ selected\ entries\ to\ clipboard=Esportare le voci selezionate negli appunti
+Find\ duplicates=Trova duplicati
 Fork\ me\ on\ GitHub=Esegui il fork da GitHub
 JabRef\ resources=Risorse per JabRef
+Manage\ journal\ abbreviations=Gestire le abbreviazioni del diario
 Manage\ protected\ terms=Gestione dei termini protetti
 New\ %0\ library=Nuova libreria %0
+New\ entry\ from\ plain\ text=Nuova voce dal testo in chiaro
+New\ sublibrary\ based\ on\ AUX\ file=Nuova sublibrary basata su file AUX
 Push\ entries\ to\ external\ application\ (%0)=Invia le voci all'applicazione esterna (%0)
+Quit=Esci
+Recent\ libraries=Librerie recenti
+Set\ up\ general\ fields=Imposta i campi generali
 View\ change\ log=Visualizza la lista delle modifiche
 View\ event\ log=Visualizza il log degli eventi
 Website=Sito web
 Write\ XMP-metadata\ to\ PDFs=Inserisci metadati XMP nei file PDF
 
+Override\ default\ font\ settings=Ignora le impostazioni dei font predefinite
+
+
+
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index ce81b0cd1b9..9825d7cd903 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<フィールド名>
 
-<select>=<選択してください>
-
 <select\ word>=<単語を選択してください>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=選択項目の学術誌名を短縮形にします（ISO式短縮形）
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=選択項目の学術誌名を短縮形にします（MEDLINE式短縮形）
@@ -34,12 +32,13 @@ Accept=受け付ける
 
 Accept\ change=変更を受け付ける
 
-Action=動作
 
-What\ is\ Mr.\ DLib?=Mr. DLibってなにですか？
+Action=動作
 
 Add=追加
 
+Add\ new=新規追加
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=(コンパイルした)ユーザー定義ImportFormatクラスをクラスパスから追加します．
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=このパスは，JabRefのクラスパスにあるとは限りません．
 
@@ -54,16 +53,12 @@ Add\ from\ folder=フォルダから追加
 
 Add\ from\ JAR=jarから追加
 
-Add\ new=新規追加
-
 Add\ subgroup=下層グループを追加
 
 Add\ to\ group=グループに追加
 
 Added\ group\ "%0".=グループ「%0」を追加しました．
 
-Added\ new=新規に追加しました
-
 Added\ string=文字列を追加しました
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=さらに，<b>%0</b>フィールドに<b>%1</b>が含まれていない項目は，選択してからドラッグアンドドロップをするかコンテクストメニューを使うことで，手動でこのグループに割り当てることができます．こうすることによって，各項目の<b>%0</b>フィールドに用語<b>%1</b>が追加されます．
@@ -72,12 +67,8 @@ Advanced=詳細設定
 All\ entries=全項目
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=この型の項目はすべて型なしと宣言されます．続けますか？
 
-All\ fields=全フィールド
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=保存・書出の際，つねにBIBファイルを再整形する
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=「%0」を解析中にSAX例外エラーが発生しました：
-
 and=および
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=正規表現<b>%0</b>に一致するフィールドすべて
@@ -168,6 +159,7 @@ Clear\ fields=フィールドを消去
 
 Close=閉じる
 
+
 Close\ dialog=ダイアログを閉じる
 
 Close\ the\ current\ library=現在のデータベースを閉じる
@@ -223,6 +215,7 @@ Could\ not\ run\ the\ 'vim'\ program.=「vim」プログラムを実行できま
 Could\ not\ save\ file.=ファイルを保存できませんでした
 Character\ encoding\ '%0'\ is\ not\ supported.=．文字エンコーディング「%0」はサポートされていません．
 
+
 crossreferenced\ entries\ included=相互参照している項目を取り込みました
 
 Current\ content=現在の内容
@@ -258,8 +251,6 @@ Default\ grouping\ field=既定のグループ化フィールド
 
 Default\ pattern=既定パターン
 
-Default\ sort\ criteria=既定の整序基準
-
 Delete=削除
 
 Delete\ custom\ format=ユーザー形式を削除
@@ -280,8 +271,6 @@ Deleted=削除しました
 
 Permanently\ delete\ local\ file=ローカルファイルを削除
 
-Delimit\ fields\ with\ semicolon,\ ex.=各フィールドをセミコロンで区切ってください．例)
-
 Descending=降順
 
 Description=説明
@@ -336,7 +325,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=自由型検
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=フィールド中のキーワードを検索して動的にグループ化
 
-Each\ line\ must\ be\ on\ the\ following\ form=各行は以下の形でなくてはなりません
 
 Edit=編集
 
@@ -383,12 +371,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=項目型
 
 Error=エラー
-Error\ exporting\ to\ clipboard=クリップボード書き出し中にエラー発生
 
 Error\ occurred\ when\ parsing\ entry=項目を解析中にエラーが発生
 
 Error\ opening\ file=ファイルを開く際にエラー発生
 
+
 Error\ while\ writing=書き込み中にエラー発生
 
 '%0'\ exists.\ Overwrite\ file?='%0' は存在します．ファイルを上書きしますか？
@@ -406,6 +394,7 @@ Export\ properties=特性を書き出す
 
 Export\ to\ clipboard=クリップボードに書き出す
 
+Export\ to\ text\ file.=テキストファイルにエクスポートします．
 
 Exporting=書き出し中
 Extension=拡張子
@@ -418,8 +407,6 @@ External\ programs=外部プログラム
 
 External\ viewer\ called=外部ビューアが呼び出されました
 
-Fetch=取得
-
 Field=フィールド
 
 field=フィールド
@@ -427,8 +414,6 @@ field=フィールド
 Field\ name=フィールド名
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=フィールド名には，スペースや以下の文字を使うことはできません
 
-Field\ to\ filter=フィルタを掛けるフィールド
-
 Field\ to\ group\ by=グループ化するフィールド
 
 File=ファイル
@@ -443,13 +428,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=ファイルディレク
 
 File\ exists=ファイルが存在します
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=ファイルが外部から更新されました．どうしますか？
-
 File\ not\ found=ファイルが見つかりませんでした
 File\ type=ファイル型
-
-File\ updated\ externally=ファイルが外部から更新されました
-
 filename=ファイル名
 
 Files\ opened=ファイルは開かれています
@@ -472,6 +452,7 @@ Float=上部に表示
 
 for=；対象：
 
+
 Format\ of\ author\ and\ editor\ names=著者名と編集者名の書式
 Format\ string=整形文字列
 
@@ -482,9 +463,9 @@ found\ in\ AUX\ file=AUXファイルを検出
 
 Full\ name=完全な名称
 
+
 General=一般
 
-General\ fields=汎用フィールド
 
 Generate=生成
 
@@ -570,15 +551,13 @@ Importing=読み込んでいます
 
 Importing\ in\ unknown\ format=未知の書式で読み込んでいます
 
-Include\ abstracts=概要を取り込む
-Include\ entries=項目を含める
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=下層グループの取り込み：このグループやその配下の下層グループに含まれている項目を表示
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=独立グループ：このグループの項目のみを表示
 
 Work\ options=作業オプション
 
+
 Insert=挿入
 
 Insert\ rows=行を挿入
@@ -628,10 +607,6 @@ Leave\ file\ in\ its\ current\ directory=ファイルを現ディレクトリに
 
 Left=左側
 
-Limit\ to\ fields=以下のフィールドに制限
-
-Limit\ to\ selected\ entries=選択項目に制限
-
 Link=リンク
 Link\ local\ file=ローカルファイルをリンク
 Link\ to\ file\ %0=ファイル%0へのリンク
@@ -654,8 +629,6 @@ Mark\ new\ entries\ with\ owner\ name=新規項目にオーナー名を記載
 
 Memory\ stick\ mode=メモリースティックモード
 
-Menu\ and\ label\ font\ size=メニューとラベルのフォント寸法
-
 Merged\ external\ changes=外部からの変更を統合しました
 Merge\ fields=フィールドをマージ
 
@@ -681,6 +654,8 @@ Move\ up=上げる
 
 Moved\ group\ "%0".=グループ「%0」を移動しました．
 
+
+
 Name=名称
 Name\ formatter=名前の整形
 
@@ -698,8 +673,6 @@ New\ content=新規内容
 
 New\ library\ created.=新規データベースが作成されました．
 
-New\ field\ value=新規フィールド値
-
 New\ group=新規グループ
 
 New\ string=新規文字列
@@ -714,9 +687,6 @@ no\ library\ generated=データベースは生成されませんでした
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=項目が見つかりませんでした．正しい読み込みフィルタを使用していることを確認してください．
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=検索文字列「%0」に一致する項目が見つかりませんでした．
-
 No\ entries\ imported.=項目は読み込まれませんでした．
 
 No\ files\ found.=ファイルがみつかりません．
@@ -738,8 +708,6 @@ Nothing\ to\ redo=繰り返すべきものがありません
 
 Nothing\ to\ undo=取り消すべきものがありません
 
-occurrences=個
-
 OK=OK
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=一つないしそれ以上の鍵が上書きされます．続けますか？
@@ -779,13 +747,10 @@ Override=上書き
 
 Override\ default\ file\ directories=ファイルディレクトリ既定値の上書き
 
-Override\ default\ font\ settings=既定フォント設定を上書き
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=BibTeX鍵を選択した文字列で上書き
 
 
 Overwrite=上書き
-Overwrite\ existing\ field\ values=既存のフィールド値を上書き
 
 Overwrite\ keys=鍵の上書き
 
@@ -821,6 +786,7 @@ Please\ enter\ the\ string's\ label=文字列のラベルを入力してくだ
 
 Please\ select\ an\ importer.=読込を選択してください．
 
+
 Possible\ duplicate\ entries=重複の可能性のある項目
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=既存項目と重複している可能性があります．解消するにはクリックしてください．
@@ -856,8 +822,6 @@ Redo=繰り返し
 
 Reference\ library=参照データベース
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=%0個の参照を検出しました．いくつの参照を取得しますか？
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=上層グループの絞り込み：このグループとその上層グループの両方に含まれている項目を表示
 
 regular\ expression=正規表現
@@ -916,13 +880,9 @@ Replace\ (regular\ expression)=置換対象（正規表現）
 
 Replace\ string=文字列の置換
 
-Replace\ with=置換文字列
-
 Replace\ Unicode\ ligatures=Unicode合字を置換
 Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Unicode合字を分離形で置換
 
-Replaced=置換しました
-
 Required\ fields=必須フィールド
 
 Reset\ all=すべてリセット
@@ -931,6 +891,8 @@ Resolve\ strings\ for\ all\ fields\ except=文字列を以下を除いた全フ
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=文字列をBibTeX標準フィールドでのみ展開する
 
 resolved=解消しました
+
+
 Review=論評
 Review\ changes=変更を検査する
 Review\ Field\ Migration=Reviewフィールドの取り込み
@@ -949,10 +911,6 @@ Save\ library\ as...=データベースに名前を付けて保存...
 
 Save\ entries\ in\ their\ original\ order=項目をオリジナルの順序で保存
 
-Save\ failed=保存に失敗
-
-Save\ failed\ during\ backup\ creation=バックアップ作成中に保存に失敗
-
 Saved\ library=データベースを保存しました
 
 Saved\ selected\ to\ '%0'.=選択部を以下に保存しました：'%0'
@@ -966,8 +924,6 @@ Search=検索
 
 Search\ expression=検索表現
 
-Search\ for=検索対象
-
 Searching\ for\ duplicates...=重複を検索しています...
 
 Searching\ for\ files=ファイルを検索しています
@@ -976,19 +932,16 @@ Secondary\ sort\ criterion=第二整序基準
 
 Select\ all=すべて選択
 
-Select\ encoding=エンコーディングを選択
-
 Select\ entry\ type=項目型を選択してください
-Select\ external\ application=外部アプリケーションを選択
 
 Select\ file\ from\ ZIP-archive=ZIP書庫からファイルを選択してください
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=ツリーノードを選択して表示させ，変更を受諾ないし拒否してください
-Selected\ entries=選択した項目
+
 Set\ field=フィールドを設定
 Set\ fields=フィールドを設定
 
-Set\ general\ fields=汎用フィールドを設定
+
 Set\ main\ external\ file\ directory=主幹外部ファイルディレクトリを設定してください
 
 Settings=設定
@@ -1044,8 +997,6 @@ Status=状態
 
 Stop=停止
 
-Strings=文字列
-
 Strings\ for\ library=右のデータベースで用いる文字列
 
 Sublibrary\ from\ AUX=AUXからの部分データベース
@@ -1106,8 +1057,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=この操作を行うには，1つ以上の項目が選択されている必要があります．
 
+
 Toggle\ entry\ preview=項目プレビューを入切
 Toggle\ groups\ interface=グループ制御面を入切
+
+
+
 Try\ different\ encoding=別のエンコーディングを試す
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=選択した項目の誌名を非短縮形にする
@@ -1154,8 +1109,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=LyXが実行
 View=表示
 Vim\ server\ name=Vimサーバー名
 
-Waiting\ for\ ArXiv...=ArXivの応答を待っています...
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=精査ウィンドウを閉じる際に解消されていない重複項目に対して警告する
 
 Warn\ before\ overwriting\ existing\ keys=既存の鍵を上書きする前に警告
@@ -1187,7 +1140,6 @@ XMP-metadata=XMPメタデータ
 XMP-metadata\ found\ in\ PDF\:\ %0=PDF中にXMPメタデータを検出しました：%0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=これを有効にするためにはJabRefを再起動する必要があります．
 You\ have\ changed\ the\ language\ setting.=言語設定が変更されました．
-You\ have\ entered\ an\ invalid\ search\ '%0'.=無効な検索「%0」を入力しました．
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=新しいキー割当が正しく機能するようにするためには，JabRefを再起動しなくてはなりません．
 
@@ -1196,27 +1148,21 @@ Your\ new\ key\ bindings\ have\ been\ stored.=新しいキー割当が保管さ
 The\ following\ fetchers\ are\ available\:=以下の取得子が使用できます：
 Could\ not\ find\ fetcher\ '%0'=取得子「%0」を見つけられませんでした
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=取得子「%1」を使用して，クエリ「%0」を実行しています．
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=取得子「%1」を使用したクエリ「%0」は，結果を何も返しませんでした．
 
 Move\ file=ファイルを移動
 Rename\ file=ファイルを改名
 
+
 Move\ file\ failed=ファイルの移動に失敗
 Could\ not\ move\ file\ '%0'.=ファイルを%0移動できませんでした
 Could\ not\ find\ file\ '%0'.=ファイル「%0」を見つけられませんでした．
 Number\ of\ entries\ successfully\ imported=読み込みに成功した項目数
 Import\ canceled\ by\ user=読み込みはユーザーによって取り消されました
-Progress\:\ %0\ of\ %1=進捗状況：%1のうち%0
 Error\ while\ fetching\ from\ %0=%0からの取得中にエラー発生
 
-Please\ enter\ a\ valid\ number=有効な数値を入力してください
 Show\ search\ results\ in\ a\ window=検索結果をウィンドウに表示
 Show\ global\ search\ results\ in\ a\ window=大域検索の結果をウィンドウに表示
 Search\ in\ all\ open\ libraries=全データベースを検索
-Move\ file\ to\ file\ directory?=ファイルをファイルディレクトリに移動しますか？
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=データベースは保護されています．外部からの変更を検査しない限り，保存することができません．
-Protected\ library=保護されたデータベース
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=外部からの変更を検査するまではデータベースを保存することを拒絶する
 Library\ protection=データベース保護
 Unable\ to\ save\ library=データベースを保存することができませんでした
@@ -1228,16 +1174,13 @@ MIME\ type=MIME型
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=この機能は，新規ファイルを，新しいJabRefインスタンスを開かないで，すでに実行されているインスタンスに開いたり<BR>読み込んだりするものです．たとえば，これは，ウェブブラウザからJabRefにファイルを開かせたい時に便利です．<BR>これによって，一度にJabRefのインスタンスを一つしか開けなくなることに注意してください．
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=取得子を実行する．例：「--fetch\=Medline\:cancer」
 
-The\ ACM\ Digital\ Library=ACMデジタルライブラリ
 Reset=リセット
 
 Use\ IEEE\ LaTeX\ abbreviations=IEEEのLaTeX略語を使用
-The\ Guide\ to\ Computing\ Literature=計算科学文献へのガイド
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=ファイルリンクを開く際，リンクが定義されていなければ，一致するファイルを検索する
 Settings\ for\ %0=「%0」の設定
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=以下のフィールドは数値フィールドとして整序
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=%0行め：破損したBibTeX鍵を検出しました．
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=%0行め：破損したBibTeX鍵を発見しました（空白が入っている）．
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=%0行め：破損したBibTeX鍵を発見しました（コンマが欠落）．
@@ -1250,7 +1193,6 @@ Append\ field=フィールドを追加
 Append\ to\ fields=フィールドに追加
 Rename\ field\ to=フィールド名を以下に変更
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=フィールドの内容を別名のフィールドに移動する
-You\ can\ only\ rename\ one\ field\ at\ a\ time=一度に改名できるのはひとつのフィールドだけです
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=リモート操作用に%0ポートを使用することができません．別のアプリケーションが使用している可能性があります．別のポートを指定してみてください．
 
@@ -1270,9 +1212,6 @@ Formatter\ not\ found\:\ %0=整形子が見つかりません：%0
 Clear\ inputarea=入力領域を一掃
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=保存できませんでした．ファイルが他のJabRefインスタンスによってロックされています．
-File\ is\ locked\ by\ another\ JabRef\ instance.=ファイルがもうひとつのJabRefインスタンスによってロックされています．
-Do\ you\ want\ to\ override\ the\ file\ lock?=ファイルロックを上書きしますか？
-File\ locked=ファイルがロックされています
 Current\ tmp\ value=現在のtmp値
 Metadata\ change=メタデータの変更
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=以下のメタデータ要素に変更を加えました
@@ -1281,7 +1220,6 @@ Generate\ groups\ for\ author\ last\ names=著者の姓でグループを生成
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=BibTeXフィールドのキーワードからグループを生成する
 Enforce\ legal\ characters\ in\ BibTeX\ keys=BibTeX鍵で規則に則った文字の使用を強制する
 
-Save\ without\ backup?=バックアップを取らずに保存しますか？
 Unable\ to\ create\ backup=バックアップを作成することができません
 Move\ file\ to\ file\ directory=ファイルをファイルディレクトリに移動
 Rename\ file\ to=ファイル名を以下に改名：
@@ -1320,14 +1258,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=メタデータを読み込む
 Create\ entry\ based\ on\ XMP-metadata=XMPデータに基づいて項目を生成
 Create\ blank\ entry\ linking\ the\ PDF=PDFにリンクした空の項目を生成
 Only\ attach\ PDF=PDFを添付してください
-Title=タイトル
 Create\ new\ entry=新規項目を作成
 Update\ existing\ entry=既存項目を更新
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=「名 姓」形式の名前のみ自動補完
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=「姓, 名」形式の名前のみ自動補完
 Autocomplete\ names\ in\ both\ formats=両方の形式とも自動補完
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=「comment」という名前は，項目型名としては使用することができません．
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=右記のテキストフィールド中には整数値を入力しなくてはなりません：
 Send\ as\ email=電子メールとして送る
 References=書誌情報
 Sending\ of\ emails=電子メールの送付
@@ -1449,7 +1385,6 @@ Opens\ the\ file\ browser.=ファイルブラウザを開きます
 Scan\ directory=ディレクトリを走査
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=選択したディレクトリでリンクされていないファイルを検索
 Starts\ the\ import\ of\ BibTeX\ entries.=BibTeX項目の読み込みを開始します．
-Leave\ this\ dialog.=このダイアログを閉じます．
 Create\ directory\ based\ keywords=ディレクトリに基づいたキーワードを生成
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=生成した項目のキーワードにディレクトリパス名を入れる
 Select\ a\ directory\ where\ the\ search\ shall\ start.=検索を開始するディレクトリを選んでください．
@@ -1457,11 +1392,9 @@ Select\ file\ type\:=ファイル型を選択：
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=これらのファイルは，現在アクティブなデータベースにリンクされていません．
 Entry\ type\ to\ be\ created\:=生成する項目型：
 Searching\ file\ system...=ファイルシステムを検索しています...
-Importing\ into\ Library...=データベースに読み込んでいます...
 Select\ directory=辞書を選択
 Select\ files=ファイルを選択
 BibTeX\ entry\ creation=BibTeX項目の引用
-<No\ selection>=<選択されていません>
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=freeciteオンラインサービスに接続できませんでした．
 Parse\ with\ FreeCite=FreeCiteで解析
 How\ would\ you\ like\ to\ link\ to\ '%0'?=「%0」へのリンクをどうしますか？
@@ -1503,7 +1436,6 @@ Toggle\ print\ status=印刷済情報を変更
 Update\ keywords=キーワードを更新
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=特殊フィールドの値を独立したフィールドとしてBibTeXに書き込む
 You\ have\ changed\ settings\ for\ special\ fields.=特殊フィールドの設定が変更されました．
-%0\ entries\ found.\ To\ reduce\ server\ load,\ only\ %1\ will\ be\ downloaded.=%0個の項目が検出されました．サーバー負荷を軽減するため，%1個のみがダウンロードされます．
 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.=OpenOffice/LibreOfficeへの接続が失われました．OpenOffice/LibreOfficeが実行されていることを確認して再接続を試みてください．
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRefは，項目あたり少なくとも一つのリクエストを出版社に送ります．
@@ -1524,8 +1456,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=お使いの様式ファイルは，段落様式「%0」を指定していますが，これは，現在のOpenOffice/LibreOffice文書には定義されていません．
 
 Searching...=検索中...
-You\ have\ selected\ more\ than\ %0\ entries\ for\ download.\ Some\ web\ sites\ might\ block\ you\ if\ you\ make\ too\ many\ rapid\ downloads.\ Do\ you\ want\ to\ continue?=ダウンロードする項目を%0個以上選択しました．あまりに多くのダウンロードを急に行うと，其れをブロックするウェブサイトもあります．続けますか？
-Confirm\ selection=選択範囲を確認
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=大小文字を正しく維持するため，検索中に指定したタイトル語に{}を付け加える
 Import\ conversions=読み込み時変換
 Please\ enter\ a\ search\ string=検索文字列を入力してください
@@ -1536,7 +1466,6 @@ Canceled\ merging\ entries=項目の統合を取り消しました
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=非改行区切りを付して検索で大文字小文字が正しくなるよう単位を整形
 Merge\ entries=項目の統合
 Merged\ entries=項目を統合しました
-Merged\ entry=統合後の項目
 None=なし
 Parse=解析
 Result=結果
@@ -1620,9 +1549,7 @@ Add\ new\ file\ type=新規ファイル形式を追加
 
 Left\ entry=左側の項目
 Right\ entry=右側の項目
-Use=採用
 Original\ entry=元の項目
-Replace\ original\ entry=元の項目を置き換える
 No\ information\ added=情報は追加されていません
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=キーワードを操作するには少なくともひとつの項目を選択してください．
 OpenDocument\ text=OpenDocument文書
@@ -1641,7 +1568,6 @@ Please\ move\ the\ file\ manually\ and\ link\ in\ place.=ファイルを手動
 Could\ not\ connect\ to\ %0=%0に接続することができませんでした
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=警告；%1項目中%0項目に定義されていないタイトルがあります．
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=警告；%1項目中%0項目に定義されていないBibTeX鍵があります．
-occurrence=個
 Added\ new\ '%0'\ entry.=「%0」項目を新規に追加しました．
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=複数の項目を選択しています．これらすべての項目の型を「%0」に変更しますか？
 Changed\ type\ to\ '%0'\ for=右記を「%0」型に変更しました：
@@ -1661,8 +1587,6 @@ Print\ entry\ preview=項目プレビューを印刷
 Copy\ title=タイトルをコピー
 Copy\ \\cite{BibTeX\ key}=\\cite{BibTeX鍵}をコピー
 Copy\ BibTeX\ key\ and\ title=BibTeX鍵とタイトルをコピー
-File\ rename\ failed\ for\ %0\ entries.=%0項目のファイル名変更が失敗しました．
-Merged\ BibTeX\ source\ code=統合後のBibTeXソースコード
 Invalid\ DOI\:\ '%0'.=無効なDOIです：'%0'.
 should\ start\ with\ a\ name=始まりは名前でなくてはなりません
 should\ end\ with\ a\ name=終わりは名前でなくてはなりません
@@ -1755,10 +1679,8 @@ Error\ Occurred=エラーが発生しました
 Journal\ file\ %s\ already\ added=がくじゅつしふぁいる%sは追加済みです
 Name\ cannot\ be\ empty=名称は空にはできません
 
-Adding\ fetched\ entries=取得した項目を追加しています
 Display\ keywords\ appearing\ in\ ALL\ entries=全ての項目に現れるキーワードを表示
 Display\ keywords\ appearing\ in\ ANY\ entry=いずれかの項目に現れるキーワードを表示
-Fetching\ entries\ from\ Inspire=Inspireから項目を取得
 None\ of\ the\ selected\ entries\ have\ titles.=選択した項目のいずれにもタイトルがありません．
 None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=選択した項目のいずれにもBibTeX鍵がありません．
 Unabbreviate\ journal\ names=学術誌名を非短縮形に
@@ -1773,14 +1695,11 @@ Ill-formed\ entrytype\ comment\ in\ BIB\ file=bibファイル中に誤った書
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=リンクを張られたファイルを既定ファイルディレクトリ%0に移動
 
-Clipboard=クリップボード
-Could\ not\ paste\ entry\ as\ text\:=項目をテキストとして貼り付けることができませんでした：
 Do\ you\ still\ want\ to\ continue?=それでも続けますか？
 This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=この動作は，次の各フィールドをそれぞれ少なくとも1項目以上書き換えます：
 This\ could\ cause\ undesired\ changes\ to\ your\ entries.=これはあなたの項目に望ましくない変更を加えるおそれがあります．
 Run\ field\ formatter\:=フィールド整形を実行：
 Table\ font\ size\ is\ %0=表フォント寸法は%0です
-%0\ import\ canceled=%0からの読み込みを取り消しました
 Internal\ style=内部スタイル
 Add\ style\ file=スタイルファイルを追加
 Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=本当にこのスタイルを削除しますか？
@@ -1798,6 +1717,7 @@ Changes\ all\ letters\ to\ upper\ case.=全文字を大文字に変換します
 Changes\ the\ first\ letter\ of\ all\ words\ to\ capital\ case\ and\ the\ remaining\ letters\ to\ lower\ case.=全単語の最初の文字を大文字に変換し，他の文字を小文字に変換します．
 Cleans\ up\ LaTeX\ code.=LaTeXコードを剪定します．
 Converts\ HTML\ code\ to\ LaTeX\ code.=HTMLコードをLaTeXコードに変換します．
+HTML\ to\ Unicode=HTMLからUnicodeへ
 Converts\ HTML\ code\ to\ Unicode.=HTMLコードをUnicodeに変換します．
 Converts\ LaTeX\ encoding\ to\ Unicode\ characters.=LaTeXエンコーディングをUnicode文字に変換します．
 Converts\ Unicode\ characters\ to\ LaTeX\ encoding.=Unicode文字をLaTeXエンコーディングに変換します．
@@ -1809,6 +1729,7 @@ LaTeX\ to\ Unicode=LaTeXからUnicodeへ
 Lower\ case=小文字
 Minify\ list\ of\ person\ names=人名一覧の圧縮
 Normalize\ date=日付を標準化
+Normalize\ en\ dashes=エヌ・ダッシュを正規化
 Normalize\ month=月を標準化
 Normalize\ month\ to\ BibTeX\ standard\ abbreviation.=月をBibTeX標準の短縮形に標準化します．
 Normalize\ names\ of\ persons=人名を標準化
@@ -1816,8 +1737,11 @@ Normalize\ page\ numbers=ページ番号を標準化
 Normalize\ pages\ to\ BibTeX\ standard.=ページをBibTeX標準に標準化します．
 Normalizes\ lists\ of\ persons\ to\ the\ BibTeX\ standard.=人名一覧をBibTeX標準に標準化します．
 Normalizes\ the\ date\ to\ ISO\ date\ format.=日付をISO日付書式に標準化します．
+Normalizes\ the\ en\ dashes.=エヌ・ダッシュを正規化します．
 Ordinals\ to\ LaTeX\ superscript=序数をLaTeX上付き文字に
 Protect\ terms=用語を保護
+Add\ enclosing\ braces=波括弧でくくる
+Add\ braces\ encapsulating\ the\ complete\ field\ content.=フィールドの内容全体を波括弧で括ります．
 Remove\ enclosing\ braces=包含括弧を除去
 Removes\ braces\ encapsulating\ the\ complete\ field\ content.=フィールド内容全体を包含する括弧を除去します．
 Sentence\ case=文の大小文字パターン
@@ -1998,7 +1922,6 @@ Your\ issue\ was\ reported\ in\ your\ browser.=あなたの問題はブラウザ
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=ログと例外情報がクリップボードにコピーされました．
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=この情報を問題の記述部に（Ctrl+Vを使って）貼り付けてください．
 
-Connection=接続
 Connecting...=接続中...
 Host=ホスト
 Port=ポート
@@ -2025,9 +1948,7 @@ Shared\ version\:\ %0=共有のバージョン：%0
 Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=この問題を解決するには，共有項目をローカル項目と統合して「項目を統合」ボタンを押してください．
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=この操作を取り消してしまうと，変更点が同期されないまま残ってしまいます．それでも取り消しますか？
 Shared\ entry\ is\ no\ longer\ present=共有項目がすでに存在しません
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=現在作業しているBibEntryが共有側で削除されています．
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=「取り消し」操作を行って項目を復活させることができます．
-Remember\ password?=パスワードを記憶しますか？
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=入力済みの接続詳細情報を使って，データベースにすでに接続されています．
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=BibTeX鍵がないと，項目を引用することができません．ここで鍵を生成しますか？
@@ -2043,7 +1964,6 @@ You\ must\ enter\ at\ least\ one\ field\ name=少なくとも一つのフィー
 Non-ASCII\ encoded\ character\ found=ASCIIエンコードでない文字が検出されました
 Toggle\ web\ search\ interface=ウェブ検索インタフェースを入切
 %0\ files\ found=%0個のファイルが見つかりました
-%0\ of\ %1=%1のうちの%0
 One\ file\ found=1個のファイルが見つかりました
 The\ import\ finished\ with\ warnings\:=右記の警告とともに読み込みが終了しました：
 There\ was\ one\ file\ that\ could\ not\ be\ imported.=読み込みのできなかったファイルが一つありました．
@@ -2052,7 +1972,6 @@ There\ were\ %0\ files\ which\ could\ not\ be\ imported.=読み込みのでき
 Migration\ help\ information=移出入ヘルプ情報
 Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=入力されたデータベースは旧式の構造を持っていて，もうサポートされていません．
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=しかしながら，pre-3.6データベースに従って，新しいデータベースが生成されました．
-Click\ here\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=pre-3.6データベースの移出入について知るには，ここをクリックしてください．
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=現行開発版をダウンロードできる場所へのリンクを開きます
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=JabRefの各版における変更点を見ます
 Referenced\ BibTeX\ key\ does\ not\ exist=参照されたBibTeX鍵は存在しません
@@ -2080,7 +1999,6 @@ Existing\ file=既存ファイル
 
 ID=ID
 ID\ type=ID型
-ID-based\ entry\ generator=IDから項目を生成
 Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=取得子「%0」は，IDが「%1」の項目を見つけられませんでした．
 
 Select\ first\ entry=最初の項目を選択
@@ -2131,8 +2049,6 @@ journal\ not\ found\ in\ abbreviation\ list=短縮名リストにない学術誌
 Unhandled\ exception\ occurred.=取り扱えない例外が発生しました．
 
 strings\ included=インクルードした文字列
-Size\ of\ large\ icons=大アイコンの大きさ
-Size\ of\ small\ icons=小アイコンの大きさ
 Default\ table\ font\ size=表の既定フォント寸法
 Escape\ underscores=アンダースコアをエスケープ
 Color=色
@@ -2199,12 +2115,15 @@ Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=特定のTeXファイ
 Any\ file=任意のファイル
 
 No\ linked\ files\ found\ for\ export.=エクスポートしようとしましたが，リンク先のファイルが見つかりません．
-Database=データベース
-Database\ type=データベース型
 
 Full\ text\ document\ download\ failed\ for\ entry\ %0=項目%0の文書全文のダウンロードに失敗しました
 No\ full\ text\ document\ found\ for\ entry\ %0.=項目%0の文書全文が見つかりません．
 
+Delete\ Entry=項目を削除
+Import\ &\ Export=インポート及エクスポート
+Look\ up\ document\ identifier=文書IDを検索
+Next\ library=次のライブラリ
+Previous\ library=前のライブラリ
 add\ group=グループを追加
 
 
@@ -2231,3 +2150,7 @@ View\ event\ log=イベントログを表示
 Website=ウェブサイト
 Write\ XMP-metadata\ to\ PDFs=XMPメタデータをPDFに書き出す
 
+Override\ default\ font\ settings=既定フォント設定を上書き
+
+
+
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index e2a0b0579d9..96c5d572ece 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -1,74 +1,73 @@
 #X-Generator: crowdin.com
-%0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 bevat de regular expression <b>%1</b>
+%0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 bevat de standaard-uitdruk <b>%1</b>
 
 %0\ contains\ the\ term\ <b>%1</b>=%0 bevat de term <b>%1</b>
 
-%0\ doesn't\ contain\ the\ regular\ expression\ <b>%1</b>=%0 bevat de regular expression <b>%1</b> niet
+%0\ doesn't\ contain\ the\ regular\ expression\ <b>%1</b>=%0 bevat de standaard-uitdruk <b>%1</b> niet
 
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 bevat de term <b>%1</b> niet
 
+%0\ export\ successful=%0 export succesvol
 
-%0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 komt overeen met de regular expression <b>%1</b>
+%0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 komt overeen met de standaard-uitdruk <b>%1</b>
 
 %0\ matches\ the\ term\ <b>%1</b>=%0 komt overeen met de term <b>%1</b>
 
 <field\ name>=<veldnaam>
 
-<select>=<selecteer>
-
 <select\ word>=<selecteer woord>
-Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Kort tijdschriftennamen met de geselecteerde entries af (ISO afkorting)
-Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Kort tijdschriftennamen met de geselecteerde entries af (MEDLINE afkorting)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Kort logboeknamen met de geselecteerde invoergegevens af (ISO afkorting)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Kort logboeknamen met de geselecteerde invoergegevens af (MEDLINE afkorting)
 
 Abbreviate\ names=Namen afkorten
-Abbreviated\ %0\ journal\ names.=Afgekorte tijdschrift namen
+Abbreviated\ %0\ journal\ names.=Afgekorte %0 logboek namen.
 
 Abbreviation=Afkorting
 
 About\ JabRef=Over JabRef
 
+Abstract=Abstract
 
 Accept=Aanvaarden
 
 Accept\ change=Veranderingen aanvaarden
 
-Action=Actie
 
+Action=Actie
 
 Add=Toevoegen
 
+Add\ new=Voeg nieuw toe
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Voeg een (gecompileerde) externe Importer klasse van een class path toe.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Het pad moet niet in het classpath van JabRef staan.
 
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ ZIP-archive.=Voeg een (gecompileerde) externe Importer klasse van een ZIP-archief toe.
 The\ ZIP-archive\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Het pad moet niet in het classpath van JabRef staan.
 
+Add\ a\ regular\ expression\ for\ the\ key\ pattern.=Een reguliere expressie voor het belangrijkste patroon toevoegen.
 
+Add\ selected\ entries\ to\ this\ group=Voeg de geselecteerde items toe aan deze groep
 
 Add\ from\ folder=Voeg toe uit map
 
 Add\ from\ JAR=Voeg toe uit JAR
 
-Add\ new=Voeg nieuw toe
-
 Add\ subgroup=Voeg subgroep toe
 
 Add\ to\ group=Voeg toe aan groep
 
 Added\ group\ "%0".=Toegevoegde groep "%0".
 
-Added\ new=Nieuwe toegevoegd
-
 Added\ string=Toegevoegde constante
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Bijkomstig, entries waarvan het <b>%0</b> veld niet <b>%1</b> bevatten kunnen manueel toegekend worden aan deze groep door ze te selecteren gebruik makend van "drag and drop" of het contextmenu. Dit proces voegt de term <b>%1</b> aan het <b>%0</b> veld van elke entry toe. Entries kunnen manueel verwijderd worden van deze groep door ze te selecteren gebruik makend van het contextmenu. Dit proces verwijdert de term van het <b>%0</b> veld van elke entry.
 
 Advanced=Geavanceerd
 All\ entries=Alle entries
+All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Alle invoergegevens van dit type zullen ongetypeerd worden verklaard. Doorgaan?
 
-All\ fields=Alle velden
-
-
+Always\ reformat\ BIB\ file\ on\ save\ and\ export=Formatteer BIB bestanden altijd op opslaan en exporteren
 
 and=en
 
@@ -98,7 +97,9 @@ Attach\ URL=URL bijvoegen
 
 Autogenerate\ BibTeX\ keys=BibTeX-sleutels automatisch genereren
 
+Autolink\ files\ with\ names\ starting\ with\ the\ BibTeX\ key=Autolink bestanden met namen starten met de BibTeX sleutel
 
+Autolink\ only\ files\ that\ match\ the\ BibTeX\ key=Autolink alleen bestanden die overeenkomen met de BibTeX sleutel
 
 Automatically\ create\ groups=Groepen automatisch aanmaken
 
@@ -119,6 +120,7 @@ Backup\ old\ file\ when\ saving=Maak reservekopie van oud bestand bij het opslaa
 Browse=Bladeren
 
 by=door
+The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=De tegenstrijdige velden van deze boekingen zullen worden samengevoegd in het veld 'Opmerking'.
 
 Cancel=Annuleren
 
@@ -143,11 +145,13 @@ Change\ of\ Grouping\ Method=Wijzig groepering methode
 
 change\ preamble=wijzig inleiding
 
+Change\ table\ column\ and\ General\ fields\ settings\ to\ use\ the\ new\ feature=Verander tabel-kolom en algemene veld-instellingen om de nieuwe functies te gebruiken
 
 Changed\ language\ settings=Gewijzigde taal instellingen
 
 Changed\ preamble=Gewijzigde inleiding
 
+Cite\ command=Citeer opdracht
 
 Clear=Wissen
 
@@ -155,6 +159,7 @@ Clear\ fields=Velden wissen
 
 Close=Sluiten
 
+
 Close\ dialog=Sluit dialoog
 
 Close\ the\ current\ library=Sluit de huidige library
@@ -166,6 +171,7 @@ Closed\ library=Sluit library
 Column\ width=Kolombreedte
 
 Command\ line\ id=Commandoregel id
+Comments=Opmerkingen
 
 Contained\ in=bevat in
 
@@ -173,16 +179,20 @@ Content=Inhoud
 
 Copied=Gekopieerd
 
+Copied\ title=Gekopieerde titel
 
 Copied\ key=Gekopieerde BibTeX-sleutel
 
+Copied\ titles=Gekopieerde titels
 
 Copied\ keys=Gekopieerde BibTeX-sleutels
 
 Copy=Kopiëren
 
 Copy\ BibTeX\ key=Kopieer BibTeX-sleutel
+Copy\ file\ to\ file\ directory=Kopiëren naar bestandsmap
 
+Copy\ to\ clipboard=Kopiëren naar klembord
 
 Could\ not\ call\ executable=Kon executable niet oproepen
 
@@ -196,10 +206,15 @@ Could\ not\ import\ preferences=Kon instellingen niet importeren
 Could\ not\ instantiate\ %0=Kon geen instantie van %0 aanmaken
 Could\ not\ instantiate\ %0\ %1=Kon geen instantie van %0 %1 aanmaken
 Could\ not\ instantiate\ %0.\ Have\ you\ chosen\ the\ correct\ package\ path?=Kon geen instantie van %0 aanmaken. Heeft u het correcte pakket pad gekozen?
+Could\ not\ open\ link=Kan bestand niet openen
 
+Could\ not\ print\ preview=Kan geen afdrukvoorbeeld weergeven
 
+Could\ not\ run\ the\ 'vim'\ program.=Het programma 'vim' kon niet worden uitgevoerd.
 
 Could\ not\ save\ file.=Kon het bestand niet opslaan.
+Character\ encoding\ '%0'\ is\ not\ supported.=Tekencodering '%0' wordt niet ondersteund.
+
 
 crossreferenced\ entries\ included=inclusief kruisgerefereerde entries
 
@@ -236,8 +251,6 @@ Default\ grouping\ field=Standaard groeperingsveld
 
 Default\ pattern=Standaard patroon
 
-Default\ sort\ criteria=Standaard sorteercriteria
-
 Delete=Verwijderen
 
 Delete\ custom\ format=Verwijder aangepast formaat
@@ -256,14 +269,14 @@ Delete\ strings=Verwijder constanten
 
 Deleted=Verwijderd
 
-
-Delimit\ fields\ with\ semicolon,\ ex.=Scheid velden met puntkomma, bv.
+Permanently\ delete\ local\ file=Lokaal bestand permanent verwijderen
 
 Descending=Afdalend
 
 Description=Beschrijving
 
 Deselect\ all=Alle selecties ongedaan maken
+Deselect\ all\ duplicates=Deselecteer alle duplicaten
 
 Disable\ this\ confirmation\ dialog=Maak deze bevestigingsdialoog onbeschikbaar
 
@@ -283,9 +296,12 @@ Do\ not\ import\ entry=Entry niet importeren
 Do\ not\ open\ any\ files\ at\ startup=Geen bestanden openen bij het opstarten
 
 Do\ not\ overwrite\ existing\ keys=Bestaande BibTeX-sleutels niet overschrijven
+Do\ not\ show\ these\ options\ in\ the\ future=Deze opties in de toekomst niet meer weergeven
 
 Do\ not\ wrap\ the\ following\ fields\ when\ saving=De volgende velden niet bij het opslaan afbreken
+Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata\:=Schrijf de volgende velden niet naar XMP metagegevens\:
 
+Do\ you\ want\ JabRef\ to\ do\ the\ following\ operations?=Wilt u dat JabRef de volgende bewerkingen doet?
 
 Donate\ to\ JabRef=Doneer aan JabRef
 
@@ -293,7 +309,9 @@ Down=Omlaag
 
 Download\ file=Download bestand
 
+Downloading...=Downloaden...
 
+Drop\ %0=Laat %0 achterwege
 
 duplicate\ removal=dubbels verwijderen
 
@@ -307,32 +325,38 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Dynamisch entr
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Dynamisch entries groeperen door een veld te zoeken via een sleutelwoord
 
-Each\ line\ must\ be\ on\ the\ following\ form=Elke regel moet in de volgende vorm zijn
 
 Edit=Bewerken
 
 Edit\ custom\ export=Externe exportfilter bewerken
 Edit\ entry=Entry bewerken
+Save\ file=Bestand opslaan
+Edit\ file\ type=Bestandstype bewerken
 
 Edit\ group=Groep bewerken
 
 
 Edit\ preamble=Inleiding bewerken
 Edit\ strings=Constanten bewerken
+Editor\ options=Editor opties
 
 empty\ library=lege library
+Enable\ word/name\ autocompletion=Inschakelen automatisch aanvullen woord/naam
 
 Enter\ URL=URL ingeven
 
 Enter\ URL\ to\ download=Geef URL om te downloaden in
 
+entries=invoeren
 
 Entries\ cannot\ be\ manually\ assigned\ to\ or\ removed\ from\ this\ group.=Entries kunnen niet manueel toegekend of verwijderd worden van deze groep.
 
 Entries\ exported\ to\ clipboard=Entries geëxporteerd naar het klembord
 
 
+entry=invoer
 
+Entry\ editor=Invoerbewerker
 
 Entry\ preview=Entry voorbeeld
 
@@ -340,6 +364,7 @@ Entry\ table=Entry tabel
 
 Entry\ table\ columns=Entry tabelkolommen
 
+Entry\ type=Invoertype
 
 Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Entry typenamen mogen geen witruimtes of de volgende tekens bevatten
 
@@ -351,6 +376,7 @@ Error\ occurred\ when\ parsing\ entry=Foutmelding bij het ontleden van de entry
 
 Error\ opening\ file=Foutmelding bij het openen van het bestand
 
+
 Error\ while\ writing=Foutmelding bij het schrijven
 
 '%0'\ exists.\ Overwrite\ file?='%0' bestaat reeds. Bestand overschrijven?
@@ -368,48 +394,53 @@ Export\ properties=Eigenschappen exporteren
 
 Export\ to\ clipboard=Exporteer naar klembord
 
+Export\ to\ text\ file.=Exporteer naar tekstbestand.
 
 Exporting=Exporteren...
+Extension=Extensie
 
 External\ changes=Externe wijzigingen
 
+External\ file\ links=Externe bestand links
 
 External\ programs=Externe programma's
 
 External\ viewer\ called=Externe viewer opgeroepen
 
-Fetch=Ophalen
-
 Field=Veld
 
 field=veld
 
 Field\ name=Veldnaam
-
+Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Veldnamen mogen geen lege ruimtes of de volgende tekens bevallen
 
 Field\ to\ group\ by=Veld te groeperen op
 
 File=Bestand
 
 file=bestand
+File\ '%0'\ is\ already\ open.=Bestand '%0' is reeds geopend.
 
 File\ changed=Bestand veranderd
+File\ directory\ is\ '%0'\:=Bestandsmap is '%0'\:
 
+File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Bestandsmap is niet ingesteld of bestaat niet\!
 
 File\ exists=Bestand bestaat
 
-
 File\ not\ found=Bestand niet gevonden
-
-File\ updated\ externally=Bestand extern geupdate
-
+File\ type=Bestandstype
 filename=bestandsnaam
 
 Files\ opened=Bestanden geopend
 
+Filter=Filteren
 
+Filter\ All=Alles filteren
 
+Filter\ None=Geen filter
 
+Finished\ automatically\ setting\ external\ links.=Automatisch instellen van de externe links voltooid.
 
 Finished\ writing\ XMP\ for\ %0\ file\ (%1\ skipped,\ %2\ errors).=XMP schrijven voor %0 bestand voltooid (%1 overgeslagen, %2 fouten).
 
@@ -417,20 +448,24 @@ First\ select\ the\ entries\ you\ want\ keys\ to\ be\ generated\ for.=Selecteer
 
 Fit\ table\ horizontally\ on\ screen=Pas tabel horizontaal aan op het scherm
 
+Float=Zweven
 
 for=voor
 
+
 Format\ of\ author\ and\ editor\ names=Formaat van de auteur- en editornamen
+Format\ string=Tekenreeks opmaak
 
 Format\ used=Formaat gebruikt
+Formatter\ name=Naam van de opmaak
 
 found\ in\ AUX\ file=gevonden in AUX bestand
 
 Full\ name=Volledige naam
 
+
 General=Algemeen
 
-General\ fields=Algemene velden
 
 Generate=Genereren
 
@@ -439,19 +474,23 @@ Generate\ BibTeX\ key=Genereer BibTeX-sleutel
 Generate\ keys=Genereer sleutels
 
 Generate\ keys\ before\ saving\ (for\ entries\ without\ a\ key)=Genereer sleutels voor het opslaan (voor entries zonder een sleutel)
+Generate\ keys\ for\ imported\ entries=Genereer sleutels voor de geïmporteerde posten
 
 Generate\ now=Genereer nu
 
 Generated\ BibTeX\ key\ for=Gegenereerde BibTeX-sleutel voor
 
 Generating\ BibTeX\ key\ for=BibTeX-sleutel aan het genereren voor
+Get\ fulltext=Verkrijg volledige tekst
 
 Gray\ out\ non-hits=Maak niet gevonden items grijs
 
 Groups=Groepen
+has/have\ both\ a\ 'Comment'\ and\ a\ 'Review'\ field.=heeft/hebben zowel een 'bericht' en een 'review' veld.
 
 Have\ you\ chosen\ the\ correct\ package\ path?=Heeft u het correcte pakket pad gekozen?
 
+Help=Hulp
 
 Help\ on\ key\ patterns=Help over sleutelpatronen
 Help\ on\ regular\ expression\ search=Help over Regular Expression Zoekopdracht
@@ -461,11 +500,18 @@ Hide\ non-hits=Verberg niet gevonden objecten
 Hierarchical\ context=Hiërarchische context
 
 Highlight=Markeren
+Marking=Markering
+Underline=Onderstrepen
+Empty\ Highlight=Lege highlight
+Empty\ Marking=Lege markering
+Empty\ Underline=Lege onderstreping
+The\ marked\ area\ does\ not\ contain\ any\ legible\ text\!=Het gemarkeerde gebied bevat geen leesbare tekst\!
 
 Hint\:\ To\ search\ specific\ fields\ only,\ enter\ for\ example\:<p><tt>author\=smith\ and\ title\=electrical</tt>=Hint\: Om specifieke velden alleen te zoeken, geef bijvoorbeeld in\:<p><tt>auteur\=smith en titel\=electrical</tt>
 
 HTML\ table=HTML tabel
 HTML\ table\ (with\ Abstract\ &\ BibTeX)=HTML tabel (met Abstract & BibTeX)
+Icon=Icoon
 
 Ignore=Negeren
 
@@ -505,13 +551,12 @@ Importing=Aan het importeren
 
 Importing\ in\ unknown\ format=Aan het Importeren in onbekend formaat
 
-Include\ abstracts=Abstracts insluiten
-Include\ entries=Entries insluiten
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Subgroepen insluiten\: Wanneer geselecteerd, toon entries in deze groep of in zijn subgroepen
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Onafhankelijke groep\: Wanneer geselecteerd, toon enkel de entries van deze groep
 
+Work\ options=Werk opties
+
 
 Insert=Invoegen
 
@@ -525,10 +570,13 @@ Invalid\ date\ format=Ongeldig datumformaat
 
 Invalid\ URL=Ongeldige URL
 
+Online\ help=Online hulp
 
 JabRef\ preferences=JabRef instellingen
 
+Join=Aansluiten
 
+Joins\ selected\ keywords\ and\ deletes\ selected\ keywords.=Sluit zich aan bij, en verwijderd geselecteerde zoekwoorden.
 
 Journal\ abbreviations=Tijdschrift afkortingen
 
@@ -548,22 +596,25 @@ keys\ in\ library=sleutels in library
 
 Keyword=Sleutelwoord
 
+Label=Label
 
 Language=Taal
 
 Last\ modified=Laatst gewijzigd
 
 LaTeX\ AUX\ file=LaTeX AUX-bestand
+Leave\ file\ in\ its\ current\ directory=Laat het bestand in de huidige map staan
 
 Left=Links
 
-Limit\ to\ fields=De volgende velden begrenzen
-
-Limit\ to\ selected\ entries=De volgende geselecteerde entries begrenzen
-
+Link=Link
+Link\ local\ file=Lokaal bestand koppelen
+Link\ to\ file\ %0=Koppelen aan bestand %0
 
 Listen\ for\ remote\ operation\ on\ port=Luister naar operatie vanop afstand op poort
+Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Laden en opstaan voorkeuren van/naar jabref.xml bij het opstarten (geheugenstick-modus)
 
+Main\ file\ directory=Hoofdbestand map
 
 Main\ layout\ file=Hoofd layoutbestand
 
@@ -576,10 +627,10 @@ Mark\ new\ entries\ with\ addition\ date=Markeer nieuwe entries met datum van to
 
 Mark\ new\ entries\ with\ owner\ name=Markeer nieuwe entries met naam van eigenaar
 
-
-Menu\ and\ label\ font\ size=Menu en label lettertypegrootte
+Memory\ stick\ mode=Geheugenstick-modus
 
 Merged\ external\ changes=Voeg externe veranderingen samen
+Merge\ fields=Velden samenvoegen
 
 Messages=Berichten
 
@@ -595,6 +646,7 @@ Modify=Wijzigen
 
 Move\ down=Verplaats naar beneden
 
+Move\ external\ links\ to\ 'file'\ field=Externe links naar 'bestand' veld verplaatsen
 
 move\ group=verplaats groep
 
@@ -602,7 +654,10 @@ Move\ up=Verplaats naar boven
 
 Moved\ group\ "%0".=Verplaatste Groep "%0".
 
+
+
 Name=Naam
+Name\ formatter=Naam formateerder
 
 Natbib\ style=Natbib stijl
 
@@ -618,8 +673,6 @@ New\ content=Nieuwe inhoud
 
 New\ library\ created.=Nieuwe library aangemaakt.
 
-New\ field\ value=Nieuwe veld waarde
-
 New\ group=Nieuwe groep
 
 New\ string=Nieuwe constante
@@ -634,10 +687,9 @@ no\ library\ generated=Geen library gegenereerd
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Geen entries gevonden. Zorg er a.u.b. voor dat u de juiste importfilter gebruikt.
 
-
-
 No\ entries\ imported.=Geen entries geïmporteerd.
 
+No\ files\ found.=Geen bestanden gevonden.
 
 No\ GUI.\ Only\ process\ command\ line\ options.=Geen GUI. Alleen proces commandoregel opties.
 
@@ -645,6 +697,7 @@ No\ journal\ names\ could\ be\ abbreviated.=Er konden geen tijdschrift namen afg
 
 No\ journal\ names\ could\ be\ unabbreviated.=Geen afkortingen van tijdschrift namen konden ongedaan gemaakt worden.
 
+Open\ PDF=PDF openen
 
 No\ URL\ defined=Geen URL gedefinieerd
 not=niet
@@ -655,14 +708,14 @@ Nothing\ to\ redo=Niets om te herstellen
 
 Nothing\ to\ undo=Niets om ongedaan te maken
 
-occurrences=voorkomens
-
+OK=Ok
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Eén of meerdere sleutels zullen overschreven worden. Verder gaan?
 
 
 Open=Openen
 
+Open\ library=Bibliotheek openen
 
 Open\ editor\ when\ a\ new\ entry\ is\ created=Open editor wanneer een nieuwe entry aangemaakt werd
 
@@ -670,6 +723,7 @@ Open\ file=Open bestand
 
 Open\ last\ edited\ libraries\ at\ startup=Open laatst aangepaste libraries bij het opstarten
 
+Connect\ to\ shared\ database=Verbinding maken met de gedeelde database
 
 Open\ terminal\ here=Open nieuwe command prompt hier
 
@@ -693,29 +747,32 @@ Override=Wijzigen
 
 Override\ default\ file\ directories=Wijzig standaard bestandsmappen
 
-Override\ default\ font\ settings=Wijzig standaard lettertypeinstellingen
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=Wijzig de BibTeX-sleutel door de geselecteerde tekst
 
 
-Overwrite\ existing\ field\ values=Overschrijf bestaande veld waarden
+Overwrite=Overschrijven
 
 Overwrite\ keys=Overschrijf sleutels
 
 pairs\ processed=paren verwerkt
+Password=Wachtwoord
 
 Paste=Plakken
 
 paste\ entries=plak entries
 
 paste\ entry=plak entry
+Paste\ from\ clipboard=Plakken vanaf klembord
 
 Pasted=Geplakt
 
+Path\ to\ %0\ not\ defined=Pad naar %0 niet gedefinieerd
 
 Path\ to\ LyX\ pipe=Pad naar LyX-pipe
 
+PDF\ does\ not\ exist=PDF bestaat niet
 
+File\ has\ no\ attached\ annotations=Bestand heeft geen gekoppelde aantekeningen
 
 Plain\ text\ import=Onopgemaakte tekst importeren
 
@@ -729,6 +786,7 @@ Please\ enter\ the\ string's\ label=Geef a.u.b. het label van de constante in
 
 Please\ select\ an\ importer.=Selecteer a.u.b. een importer.
 
+
 Possible\ duplicate\ entries=Mogelijke dubbele entries
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Mogelijk duplicaat van bestaande entry.
@@ -738,11 +796,21 @@ Preferences=Instellingen
 Preferences\ recorded.=Instellingen opgeslagen.
 
 Preview=Voorbeeld
+Citation\ Style=Citeerwijze
+Current\ Preview=Huidig voorbeeld
+Cannot\ generate\ preview\ based\ on\ selected\ citation\ style.=Kan geen voorbeeld genereren op basis van geselecteerde citeerwijze.
+Bad\ character\ inside\ entry=Invoer bevat gebrekkig teken
+Error\ while\ generating\ citation\ style=Fout bij het genereren van de citatiestijl
+Preview\ style\ changed\ to\:\ %0=Voorbeeld van de stijl gewijzigd naar\: %0
+Next\ preview\ layout=Volgend lay-out voorbeeld
+Previous\ preview\ layout=Vorig lay-out voorbeeld
 
 Previous\ entry=Vorige entry
 
 Primary\ sort\ criterion=Primair sorteercriterium
 Problem\ with\ parsing\ entry=Probleem met entry ontleding
+Processing\ %0=Verwerken %0
+Pull\ changes\ from\ shared\ database=Trek wijzigingen van de gedeelde database
 
 
 Quit\ JabRef=JabRef afsluiten
@@ -753,12 +821,11 @@ Redo=Herstellen
 
 Reference\ library=Referentie library
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Referenties gevonden\: %0. Aantal referenties om op te halen?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Verfijn supergroep\: Wanneer geselecteerd, toon de entries die in deze groep en zijn supergroep zitten
 
-regular\ expression=Regular Expression
+regular\ expression=reguliere uitdrukking
 
+Related\ articles=Gerelateerde artikelen
 
 Remote\ operation=Externe operatie
 
@@ -772,6 +839,7 @@ Remove\ all\ subgroups\ of\ "%0"?=Alle subgroepen van "%0" verwijderen?
 
 Remove\ entry\ from\ import=Verwijder entry uit importering
 
+Remove\ selected\ entries\ from\ this\ group=Geselecteerde items uit deze groep verwijderen
 
 Remove\ entry\ type=Verwijder entry type
 
@@ -791,6 +859,7 @@ remove\ group\ and\ subgroups=verwijder groep en subgroepen
 
 Remove\ group\ and\ subgroups=Verwijder groep en subgroepen
 
+Remove\ link=Verwijder link
 
 Remove\ old\ entry=Verwijder oude entry
 
@@ -804,29 +873,35 @@ Removed\ string=Constante verwijderd
 
 Renamed\ string=Constante hernoemd
 
+Replace=Vervangen
 
 Replace\ (regular\ expression)=Vervang (regular expression)
 
 Replace\ string=Tekst vervangen
 
-Replace\ with=Vervang door
-
-
-Replaced=Vervangen
+Replace\ Unicode\ ligatures=Vervang Unicode verbindingen
+Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Vervangt Unicode ligaturen met hun uitgebreide vorm
 
 Required\ fields=Vereiste velden
 
 Reset\ all=Herstel alles
 
+Resolve\ strings\ for\ all\ fields\ except=Oplossen tekenreeksen voor alle velden, behalve
+Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Oplossen tekenreeksen alleen voor standaard BibTeX velden
 
 resolved=opgelost
+
+
 Review=Recensie
 Review\ changes=Bekijk veranderingen
+Review\ Field\ Migration=Veldmigratie controleren
 
 Right=Rechts
 
 Save=Opslaan
+Save\ all\ finished.=Opslaan en afsluiten.
 
+Save\ all\ open\ libraries=Sla alle geopende bibliotheken op
 
 Save\ before\ closing=Opslaan voor afsluiten
 
@@ -835,15 +910,12 @@ Save\ library\ as...=Library opslaan als ...
 
 Save\ entries\ in\ their\ original\ order=Sla entries in hun originele volgorde op
 
-Save\ failed=Opslaan mislukt
-
-Save\ failed\ during\ backup\ creation=Opslaan mislukt tijdens creatie van backup
-
 Saved\ library=Library opgeslagen
 
 Saved\ selected\ to\ '%0'.=Geselecteerde opgeslagen naar '%0'.
 
 Saving=Aan het opslaan
+Saving\ all\ libraries...=Alle bibliotheken opslaan...
 
 Saving\ library=Library aan het opslaan
 
@@ -851,28 +923,25 @@ Search=Zoeken
 
 Search\ expression=Zoek expressie
 
-Search\ for=Zoek naar
-
 Searching\ for\ duplicates...=Aan het zoeken naar dubbels
 
+Searching\ for\ files=Zoeken naar bestanden
 
 Secondary\ sort\ criterion=Secundair sorteercriterium
 
 Select\ all=Alles selecteren
 
-Select\ encoding=Selecteer encodering
-
 Select\ entry\ type=Selecteer entry type
-Select\ external\ application=Selecteer externe applicatie
 
 Select\ file\ from\ ZIP-archive=Selecteer bestand van ZIP-archief
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Selecteer de boom knopen om veranderingen te tonen en te accepteren of afwijzen
-Selected\ entries=Geselecteerde entries
+
 Set\ field=Veld instellen
 Set\ fields=Velden instellen
 
-Set\ general\ fields=Algemene velden instellen
+
+Set\ main\ external\ file\ directory=Instellen externe hoofdbestand map
 
 Settings=Instellingen
 
@@ -890,6 +959,7 @@ Show\ confirmation\ dialog\ when\ deleting\ entries=Toon bevestigingsdialoog bij
 
 Show\ description=Toon beschrijving
 
+Show\ file\ column=Bestandskolom weergeven
 
 Show\ last\ names\ only=Toon enkel laatste namen
 
@@ -901,8 +971,10 @@ Show\ required\ fields=Toon vereiste velden
 
 Show\ URL/DOI\ column=Toon URL/DOI-kolom
 
+Show\ validation\ messages=Weergeven van validatieberichten
 
 Simple\ HTML=Eenvoudige HTML
+Since\ the\ 'Review'\ field\ was\ deprecated\ in\ JabRef\ 4.2,\ these\ two\ fields\ are\ about\ to\ be\ merged\ into\ the\ 'Comment'\ field.=Aangezien het 'Review' veld verouderd is in JabRef 4.2, zullen deze twee velden worden samengevoegd naar het veld 'Opmerking'.
 
 Size=Grootte
 
@@ -911,6 +983,7 @@ Skipped\ -\ PDF\ does\ not\ exist=Overgeslagen - PDF bestaat niet
 
 Skipped\ entry.=Overgeslagen entry.
 
+Some\ appearance\ settings\ you\ changed\ require\ to\ restart\ JabRef\ to\ come\ into\ effect.=Sommige weergave-instellingen die u heeft gewijzigd, vereisen dat JabRef herstart wordt.
 
 source\ edit=broncode aanpassen
 
@@ -918,9 +991,9 @@ Special\ table\ columns=Speciale tabelkolommen
 
 Statically\ group\ entries\ by\ manual\ assignment=Groepeer entries statisch door manuele toekenning
 
+Status=Status
 
-
-Strings=Constanten
+Stop=Stop
 
 Strings\ for\ library=Constanten voor library
 
@@ -929,14 +1002,17 @@ Sublibrary\ from\ AUX=Sublibrary van AUX
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Schakelt tussen volledige en afgekorte tijdschriftnaam als het tijdschrift gekend is.
 
 Tabname=Tabblad naam
+Target\ file\ cannot\ be\ a\ directory.=Doelbestand kan geen map zijn.
 
 Tertiary\ sort\ criterion=Tertiair sorteercriterium
 
+Test=Test
 
 paste\ text\ here=Tekst Invoer Gebied
 
 The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Het gekozen datumformaat voor nieuwe entries is niet geldig
 
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=De gekozen codering '%0' kan de volgende tekens niet coderen\:
 
 
 the\ field\ <b>%0</b>=het veld <b>%0</b>
@@ -952,8 +1028,10 @@ The\ label\ of\ the\ string\ cannot\ contain\ spaces.=Het label van een constant
 The\ label\ of\ the\ string\ cannot\ contain\ the\ '\#'\ character.=Het label van een constante mag het '\#' teken niet bevatten.
 
 The\ output\ option\ depends\ on\ a\ valid\ import\ option.=De uitvoeroptie is afhankelijk van een geldige importeeroptie.
+The\ PDF\ contains\ one\ or\ several\ BibTeX-records.=De PDF bevat één of meerdere BibTeX-archieven.
+Do\ you\ want\ to\ import\ these\ as\ new\ entries\ into\ the\ current\ library?=Wilt u deze als nieuwe invoergegevens importeren naar de huidige bibliotheek?
 
-The\ regular\ expression\ <b>%0</b>\ is\ invalid\:=De regular expression <b>%0</b> is ongeldig\:
+The\ regular\ expression\ <b>%0</b>\ is\ invalid\:=De reguliere uitdrukking <b>%0</b> is ongeldig\:
 
 The\ search\ is\ case\ insensitive.=De zoekopdracht is hoofdletterongevoelig.
 
@@ -963,6 +1041,7 @@ The\ string\ has\ been\ removed\ locally=De constante werd lokaal verwijderd
 
 There\ are\ possible\ duplicates\ (marked\ with\ an\ icon)\ that\ haven't\ been\ resolved.\ Continue?=Er zijn mogelijke dubbels (aangeduid met een icoon) die nog niet opgelost werden. Verdergaan?
 
+This\ entry\ has\ no\ BibTeX\ key.\ Generate\ key\ now?=Deze invoer heeft geen BibTeX-sleutel. Sleutel nu genereren?
 
 This\ entry\ type\ cannot\ be\ removed.=Dit entry type kan niet verwijderd worden.
 
@@ -976,12 +1055,19 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Deze operatie vereist dat een of meer entries geselecteerd zijn.
 
+
 Toggle\ entry\ preview=Toon entry voorbeeld
 Toggle\ groups\ interface=Toon groepenvenster
+
+
+
 Try\ different\ encoding=Probeer een andere encodering
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Maak afkortingen van tijdschriftnamen van geselecteerde entries ongedaan
+Unabbreviated\ %0\ journal\ names.=Onverkorte %0 logboek namen.
 
+Unable\ to\ open\ %0=Kan %0 niet openen
+Unable\ to\ open\ link.\ The\ application\ '%0'\ associated\ with\ the\ file\ type\ '%1'\ could\ not\ be\ called.=Kan koppeling niet openen. De applicatie '%0' die gekoppeld is aan het bestandstype '%1' kon niet worden aangeroepen.
 unable\ to\ write\ to=kan niet schrijven naar
 
 Undo=Ongedaan maken
@@ -1000,11 +1086,17 @@ Up=Omhoog
 
 Update\ to\ current\ column\ widths=Update naar huidige kolombreedtes
 
+Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Upgrade externe PDF/PS links om het veld '%0' te gebruiken.
+Upgrade\ file=Bestand upgraden
+Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Oude externe bestandslinks upgraden om de nieuwe functie te gebruiken
 
 usage=gebruik
+Use\ autocompletion\ for\ the\ following\ fields=Gebruik automatische aanvulling voor de volgende velden
 
+Tweak\ font\ rendering\ for\ entry\ editor\ on\ Linux=Tweak-lettertype renderen voor ingangseditor op Linux
 Use\ regular\ expression\ search=Gebruik Regular Expression Zoekopdracht
 
+Username=Gebruikersnaam
 
 Value\ cleared\ externally=Waarde extern gewist
 
@@ -1013,7 +1105,7 @@ Value\ set\ externally=Waarde extern ingesteld
 verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=verifieer dat LyX draait en dat de lyxpipe geldig is
 
 View=Beeld
-
+Vim\ server\ name=Vim servernaam
 
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Waarschuw bij onopgeloste dubbels bij het sluiten van het inspectievenster
 
@@ -1035,11 +1127,15 @@ with=met
 Write\ BibTeXEntry\ as\ XMP-metadata\ to\ PDF.=Schrijf BibTeX-entry als XMP-metadata naar PDF.
 
 Write\ XMP=Schrijf XMP
+Write\ XMP-metadata=Schrijven van XMP-metagegevens
+Write\ XMP-metadata\ for\ all\ PDFs\ in\ current\ library?=Schrijf XMP-metagegevens voor alle PDF's in huidige bibliotheek?
 Writing\ XMP-metadata...=XMP metadata aan het schrijven...
 Writing\ XMP-metadata\ for\ selected\ entries...=XMP metadata voor geselecteerde entries aan het schrijven...
 
 XMP-annotated\ PDF=XMP geannoteerde PDF
+XMP\ export\ privacy\ settings=XMP privacy-instellingen exporteren
 XMP-metadata=XMP metadata
+XMP-metadata\ found\ in\ PDF\:\ %0=XMP-metagegevens gevonden in PDF\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=U moet JabRef herstarten om dit toe te passen.
 You\ have\ changed\ the\ language\ setting.=U heeft de taalinstelling veranderd.
 
@@ -1047,147 +1143,1007 @@ You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=U
 
 Your\ new\ key\ bindings\ have\ been\ stored.=Uw nieuwe sneltoetsen zijn opgeslagen.
 
+The\ following\ fetchers\ are\ available\:=De volgende fetchers zijn beschikbaar\:
+Could\ not\ find\ fetcher\ '%0'=Kon fetcher '%0' niet vinden
+Running\ query\ '%0'\ with\ fetcher\ '%1'.=Query '%0' uitvoeren met '%1' fetcher.
 
+Move\ file=Bestand verplaatsen
+Rename\ file=Bestand hernoemen
 
 
+Move\ file\ failed=Bestand verplaatsen mislukt
+Could\ not\ move\ file\ '%0'.=Kon bestand '%0' niet verplaatsen.
+Could\ not\ find\ file\ '%0'.=Kon bestand '%0' niet vinden.
+Number\ of\ entries\ successfully\ imported=Aantal invoergegevens succesvol geïmporteerd
+Import\ canceled\ by\ user=Importeren geannuleerd door gebruiker
+Error\ while\ fetching\ from\ %0=Fout tijdens het ophalen van %0
 
+Show\ search\ results\ in\ a\ window=Zoekresultaten in een venster weergeven
+Show\ global\ search\ results\ in\ a\ window=Toon globale zoekresultaten in een venster
+Search\ in\ all\ open\ libraries=Zoeken in alle open bibliotheken
+Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Weigeren om de bibliotheek op te slaan voordaat externe wijzigingen zijn onderzocht.
+Library\ protection=Bibliotheek bescherming
+Unable\ to\ save\ library=Kan bibliotheek niet opslaan
 
+BibTeX\ key\ generator=BibTex sleutel generator
+Unable\ to\ open\ link.=Link openen niet mogelijk.
+MIME\ type=MIME type
 
 
+Reset=Herstellen
 
+Use\ IEEE\ LaTeX\ abbreviations=IEEE LaTeX afkortingen gebruiken
 
+When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Als er geen link is bepaald, zoek dan naar overeenkomend bestand als de bestandslink wordt geopend
+Settings\ for\ %0=Instellingen voor %0
 
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Regel %0\: Corrupte BibTeX-sleutel gevonden.
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Regel %0\: Corrupte BibTeX-sleutel gevonden (bevat spaties).
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Regel %0\: Corrupte BibTeX-sleutel gevonden (komma ontbreekt).
+No\ full\ text\ document\ found=Geen volledig tekstdocument gevonden
+Update\ to\ current\ column\ order=Bijwerken naar huidige kolomvolgorde
+Download\ from\ URL=Download vanaf URL
+Rename\ field=Veld hernoemen
 Set/clear/append/rename\ fields=Instellen/wissen/hernoemen van velden
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+Append\ field=Veld toevoegen
+Append\ to\ fields=Toevoegen aan velden
+Rename\ field\ to=Veld hernoemen naar
+Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Verplaats de inhoud van een veld naar een veld met een andere naam
+
+Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Kan poort %0 niet gebruiken voor bediening op afstand; een andere applicatie heeft deze mogelijk in gebruik. Probeer een andere poort op te geven.
+
+Looking\ for\ full\ text\ document...=Op zoek naar volledig tekstdocument...
+Autosave=Automatisch opslaan
+A\ local\ copy\ will\ be\ opened.=Een lokale kopie zal worden geopend.
+Autosave\ local\ libraries=Automatisch opslaan lokale bibliotheken
+Automatically\ save\ the\ library\ to=Bibliotheek automatisch opslaan naar
+Please\ enter\ a\ valid\ file\ path.=Voer een geldig bestandspad in.
+
+
+Export\ in\ current\ table\ sort\ order=Tabel in de huidige sorteervolgorde exporteren
+Export\ entries\ in\ their\ original\ order=Exporteer boekingen in hun originele volgorde
+Error\ opening\ file\ '%0'.=Fout bij openen van bestand '%0'.
+
+Formatter\ not\ found\:\ %0=Formateerder niet gevonden\: %0
+Clear\ inputarea=Leegmaken invoerveld
+
+Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Kon niet opslaan, bestand vergrendeld door een ander JabRef exemplaar.
+Current\ tmp\ value=Huidige tmp waarde
+Metadata\ change=Wijziging metagegevens
+Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Wijzigingen zijn aangebracht aan de volgende metadata elementen
+
+Generate\ groups\ for\ author\ last\ names=Genereer groepen voor achternamen auteur
+Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Genereer groepen van trefwoorden in een BibTeX-veld
+Enforce\ legal\ characters\ in\ BibTeX\ keys=Bekrachtig geldige tekens in BibTeX-sleutels
+
+Unable\ to\ create\ backup=Back-up maken niet mogelijk
+Move\ file\ to\ file\ directory=Verplaats bestand naar map
+Rename\ file\ to=Bestand hernoemen naar
+static\ group=statische groep
+dynamic\ group=dynamische groep
+refines\ supergroup=verfijnen supergroep
+includes\ subgroups=inclusief subgroep
+contains=bevat
+search\ expression=zoek expressie
+
+Optional\ fields\ 2=Optionele velden 2
+Waiting\ for\ save\ operation\ to\ finish=Aan het wachten tot de operatie geslaagd is
+Resolving\ duplicate\ BibTeX\ keys...=Oplossen van dubbele BibTeX-sleutels...
+Finished\ resolving\ duplicate\ BibTeX\ keys.\ %0\ entries\ modified.=Klaar met het oplossen van dubbele BibTeX-sleutels. %0 boekingen gewijzigd.
+This\ library\ contains\ one\ or\ more\ duplicated\ BibTeX\ keys.=Deze bibliotheek bevat een of meerdere gedupliceerde BibTeX-sleutels.
+Do\ you\ want\ to\ resolve\ duplicate\ keys\ now?=Wilt u dubbele sleutels nu oplossen?
+
+Find\ and\ remove\ duplicate\ BibTeX\ keys=Vinden en verwijderen dubbele BibTeX-sleutels
+Expected\ syntax\ for\ --fetch\='<name\ of\ fetcher>\:<query>'=Verwachte syntax voor --fetch\='<name of fetcher>\:<query>'
+Duplicate\ BibTeX\ key=BibTeX duplicaatsleutel
+Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Voeg altijd een letter (a, b, ...) toe aan gegenereerde sleutels
+
+Ensure\ unique\ keys\ using\ letters\ (a,\ b,\ ...)=Waarborg unieke sleutels door het gebruik van letters (a, b, ...)
+Ensure\ unique\ keys\ using\ letters\ (b,\ c,\ ...)=Waarborg unieke sleutels door het gebruik van letters (b, c, ...)
+
+General\ file\ directory=Algemene bestandsmap
+User-specific\ file\ directory=Gebruiker-specifieke map
+Search\ failed\:\ illegal\ search\ expression=Zoeken mislukt\: verboden zoekformule
+Show\ ArXiv\ column=ArXiv kolom tonen
+
+You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535\ in\ the\ text\ field\ for=U moet een geheel getal invoeren in het interval 1025-65535 in het tekstveld voor
+Automatically\ open\ browse\ dialog\ when\ creating\ new\ file\ link=Bladervenster automatisch openen bij het maken van een nieuwe bestandslink
+Import\ metadata\ from\:=Importeren metadata vanuit\:
+Choose\ the\ source\ for\ the\ metadata\ import=Kies de bron voor de metadata importering
+Create\ entry\ based\ on\ XMP-metadata=Maak invoer gebaseerd op XMP-metadata
+Create\ blank\ entry\ linking\ the\ PDF=Maak blanke invoer voor koppeling met PDF
+Only\ attach\ PDF=Alleen PDF aanhechten
+Create\ new\ entry=Maak nieuwe invoer
+Update\ existing\ entry=Bestaande invoer bijwerken
+Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Vul namen in de vorm 'Voornaam Achternaam' formaat automatisch in
+Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Vul namen in de vorm 'Achternaam, Voornaam' formaat automatisch in
+Autocomplete\ names\ in\ both\ formats=Namen in beide formaten automatisch aanvullen
+The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=De naam 'opmerking' kan niet worden gebruikt als een invoer naamtype.
+Send\ as\ email=Verstuur als e-mail
+References=Referenties
+Sending\ of\ emails=E-mails verzenden
+Subject\ for\ sending\ an\ email\ with\ references=Onderwerp voor versturen van een e-mail met referenties
+Automatically\ open\ folders\ of\ attached\ files=Mappen van bijgevoegde bestanden automatisch openen
+Create\ entry\ based\ on\ content=Maak invoer gebaseerd op inhoud
+Do\ not\ show\ this\ box\ again\ for\ this\ import=Laat dit venster niet nogmaals zien voor deze import
+Always\ use\ this\ PDF\ import\ style\ (and\ do\ not\ ask\ for\ each\ import)=Gebruik altijd deze PDF importstijl (en vraag niet voor elke import)
+Error\ creating\ email=Fout tijdens het maken van e-mail
+Entries\ added\ to\ an\ email=Invoergegevens die zijn toegevoegd aan een e-mail
+exportFormat=exportFormaat
+Output\ file\ missing=Ontbrekende bestandsuitvoer
+No\ search\ matches.=Geen zoekovereenkomsten.
+The\ output\ option\ depends\ on\ a\ valid\ input\ option.=De uitvoeroptie is afhankelijk van een geldige invoeroptie.
+Default\ import\ style\ for\ drag\ and\ drop\ of\ PDFs=Standaard importstijl voor het slepen en neerzetten van PDF's
+Default\ PDF\ file\ link\ action=Standaard PDF bestand link actie
+Filename\ format\ pattern=Bestandsformaat-patroon
+Additional\ parameters=Aanvullende parameters
+Cite\ selected\ entries\ between\ parenthesis=Citeer geselecteerde invoeren tussen haakjes
+Cite\ selected\ entries\ with\ in-text\ citation=Citeer geselecteerde invoeren met in-tekst citatie
+Cite\ special=Citeren speciaal
+Extra\ information\ (e.g.\ page\ number)=Extra informatie (bv. paginanummer)
+Manage\ citations=Citaten beheren
+Problem\ modifying\ citation=Probleem met citaat wijzigen
+Citation=Citaat
+Extra\ information=Extra informatie
+Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Kon BibTeX item for citaat marker '%0' niet oplossen.
+Select\ style=Selecteer stijl
+Journals=Logboeken
+Cite=Citeren
+Cite\ in-text=Citeer in de tekst
+Insert\ empty\ citation=Voeg leeg citaat toe
+Merge\ citations=Citaten samenvoegen
+Manual\ connect=Handmatig verbinding maken
+Select\ Writer\ document=Selecteer Writer document
+Sync\ OpenOffice/LibreOffice\ bibliography=Synchroniseren OpenOffice/LibreOffice bibliografie
+Select\ which\ open\ Writer\ document\ to\ work\ on=Selecteer aan welk open Writer document u wilt werken
+Connected\ to\ document=Verbonden met document
+Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Invoegen van een citaat zonder tekst (de vermelding wordt weergegeven in de referentielijst)
+Cite\ selected\ entries\ with\ extra\ information=Citeer geselecteerde entries met extra informatie
+Ensure\ that\ the\ bibliography\ is\ up-to-date=Zorg ervoor dat de bibliografie actueel is
+Your\ OpenOffice/LibreOffice\ document\ references\ the\ BibTeX\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=Uw OpenOffice/LibreOffice document refereert naar de BibTeX-sleutel '%0', welke niet kon worden gevonden in uw huidige bibliotheek.
+Unable\ to\ synchronize\ bibliography=Niet in staat om bibliografie te synchroniseren
+Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Combineer citaat-koppels die alleen door spaties worden gescheiden
+Autodetection\ failed=Autodetectie mislukt
+Connecting=Verbinden
+Please\ wait...=Even geduld...
+Set\ connection\ parameters=Verbindingsparameters instellen
+Path\ to\ OpenOffice/LibreOffice\ directory=Pad naar de OpenOffice/LibreOffice map
+Path\ to\ OpenOffice/LibreOffice\ executable=Pad naar OpenOffice/LibreOffice uitvoerbaar
+Path\ to\ OpenOffice/LibreOffice\ library\ dir=Pad naar OpenOffice/LibreOffice bibliotheek map
+Connection\ lost=Verbinding verbroken
+Automatically\ sync\ bibliography\ when\ inserting\ citations=Synchroniseer bibliografie automatisch bij het invoegen van citaten
+Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=BibTeX invoergegevens enkel in het actieve tabblad opzoeken
+Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=BibTex invoergegevens in alle open bibliotheken opzoeken
+Autodetecting\ paths...=Paden automatisch detecteren...
+Could\ not\ find\ OpenOffice/LibreOffice\ installation=Kon de OpenOffice/LibreOffice installatie niet vinden
+Found\ more\ than\ one\ OpenOffice/LibreOffice\ executable.=Meer dan een OpenOffice/LibreOffice uitvoerbaar gevonden.
+Please\ choose\ which\ one\ to\ connect\ to\:=Kies met welke u verbinding wenst te maken\:
+Choose\ OpenOffice/LibreOffice\ executable=Kies OpenOffice/LibreOffice uitvoerbaar
+Select\ document=Selecteer document
+HTML\ list=HTML-lijst
+If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Indien mogelijk, deze lijst met namen normaliseren om te voldoen aan de standaard BibTeX naamopmaak
+Could\ not\ open\ %0=%0 kan niet worden geopend
+Unknown\ import\ format=Onbekende importformaat
+Web\ search=Zoeken op het web
+Style\ selection=Stijl-selectie
+No\ valid\ style\ file\ defined=Geen geldige stijl gedefinieerd
+Choose\ pattern=Kies patroon
+Use\ the\ BIB\ file\ location\ as\ primary\ file\ directory=De locatie van de BIB-bestaanden gebruiken als primaire bestandsmap
+Could\ not\ run\ the\ gnuclient/emacsclient\ program.\ Make\ sure\ you\ have\ the\ emacsclient/gnuclient\ program\ installed\ and\ available\ in\ the\ PATH.=Kon het gnuclient/emacsclient-programma niet uitvoeren. Zorg ervoor dat het emacsclient/gnuclient-programma is geïnstalleerd en beschikbaar is in het PAD.
+OpenOffice/LibreOffice\ connection=OpenOffice/LibreOffice verbinding
+You\ must\ select\ either\ a\ valid\ style\ file,\ or\ use\ one\ of\ the\ default\ styles.=U moet een geldige bestandsstijl selecteren, of gebruikmaken van een van de standaardstijlen.
+
+This\ is\ a\ simple\ copy\ and\ paste\ dialog.\ First\ load\ or\ paste\ some\ text\ into\ the\ text\ input\ area.<br>After\ that,\ you\ can\ mark\ text\ and\ assign\ it\ to\ a\ BibTeX\ field.=Dit is een eenvoudig dialoogvenster voor knippen en plakken. Laadt of plak eerst tekst in het tekstvak. <br>Daarna kunt u de tekst markeren en toewijzen aan een BibTex-veld.
+This\ feature\ generates\ a\ new\ library\ based\ on\ which\ entries\ are\ needed\ in\ an\ existing\ LaTeX\ document.=Deze functie genereert een nieuwe bibliotheek die gebaseerd is op invoeren die nodig zijn in een bestaand LaTeX-document.
+You\ need\ to\ select\ one\ of\ your\ open\ libraries\ from\ which\ to\ choose\ entries,\ as\ well\ as\ the\ AUX\ file\ produced\ by\ LaTeX\ when\ compiling\ your\ document.=U moet een van uw open bibliotheken selecteren waaruit u invoergegevens kunt kiezen, evenals het AUX-bestand dat door LaTeX is geproduceerd bij het compileren van uw document.
+
+First\ select\ entries\ to\ clean\ up.=Selecteer eerst invoeren om op te schonen.
+Cleanup\ entry=Invoer opschonen
+Autogenerate\ PDF\ Names=PDF namen automatisch genereren
+Auto-generating\ PDF-Names\ does\ not\ support\ undo.\ Continue?=Ongedaan maken van automatisch genereren van PDF-namen wordt niet ondersteunt. Doorgaan?
+
+Use\ full\ firstname\ whenever\ possible=Gebruik volledige voornaam indien mogelijk
+Use\ abbreviated\ firstname\ whenever\ possible=Gebruik afgekorte voornaam indien mogelijk
+Use\ abbreviated\ and\ full\ firstname=Gebruik afgekorte en volledige voornaam
+Autocompletion\ options=Automatische voltooiing opties
+Name\ format\ used\ for\ autocompletion=Naamindeling die wordt gebruikt voor automatische aanvulling
+Treatment\ of\ first\ names=Behandeling van voornamen
 Cleanup\ entries=Entries schoonmaken
-
-
-
+Automatically\ assign\ new\ entry\ to\ selected\ groups=Nieuwe invoer automatisch toewijzen aan geselecteerde groepen
+%0\ mode=%0 modus
+Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=Verplaats DOI's van notitie- en URL-veld naar DOI-veld en verwijder het http-voorvoegsel
+Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=Paden van gekoppelde bestanden relatief maken (indien mogelijk)
+Rename\ PDFs\ to\ given\ filename\ format\ pattern=Wijzig de naam van PDF's in gegeven bestandsformaat-patroon
+Rename\ only\ PDFs\ having\ a\ relative\ path=Alleen PDF's met een relatief pad wijzigen
+Doing\ a\ cleanup\ for\ %0\ entries...=Een opruimactie uitvoeren voor %0 invoergegevens...
+No\ entry\ needed\ a\ clean\ up=Geen enkele invoer had opschoning nodig
+One\ entry\ needed\ a\ clean\ up=Eén invoer had opschoning nodig
+%0\ entries\ needed\ a\ clean\ up=%0 invoergegevens hadden opschoning nodig
+
+Remove\ selected=Selectie verwijderen
+
+Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=Groepsboom kon niet worden geparseerd. Als u de BibTeX-blibliotheek opslaat, zullen alle groepen verloren gaan.
+Attach\ file=Bestand toevoegen
+Setting\ all\ preferences\ to\ default\ values.=Alle voorkeuren op standaardwaarden instellen.
+Resetting\ preference\ key\ '%0'=Voorkeur-sleutel '%0' resetten
+Unknown\ preference\ key\ '%0'=Onbekende voorkeur-sleutel '%0'
+Unable\ to\ clear\ preferences.=Niet in staat om voorkeuren te wissen.
+
+Reset\ preferences\ (key1,key2,...\ or\ 'all')=Voorkeuren resetten (sleutel1, sleutel2,... of 'alles')
+Find\ unlinked\ files=Niet-gelinkte bestanden vinden
+Unselect\ all=Alles deselecteren
+Expand\ all=Alles uitvouwen
+Collapse\ all=Alles inklappen
+Opens\ the\ file\ browser.=Opent de bestandsbrowser.
+Scan\ directory=Map scannen
+Searches\ the\ selected\ directory\ for\ unlinked\ files.=Zoekt in de geselecteerde map voor niet-gelinkte bestanden.
+Starts\ the\ import\ of\ BibTeX\ entries.=Start de importering van BibTeX invoergegevens.
+Create\ directory\ based\ keywords=Map maken gebaseerd op trefwoorden
+Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Maakt trefwoorden in gemaakte invoergegevens met namen van map-paden
+Select\ a\ directory\ where\ the\ search\ shall\ start.=Selecteer een map waar de zoekopdracht gestart zal worden.
+Select\ file\ type\:=Selecteer bestandstype\:
+These\ files\ are\ not\ linked\ in\ the\ active\ library.=Deze bestanden zijn niet in de actieve bibliotheek gekoppeld.
+Entry\ type\ to\ be\ created\:=Te maken invoertype\:
+Searching\ file\ system...=Zoeken in bestandssysteem...
+Select\ directory=Map selecteren
+Select\ files=Bestand selecteren
+BibTeX\ entry\ creation=Maak BibTeX invoer
+Unable\ to\ connect\ to\ FreeCite\ online\ service.=Verbinden met FreeCite online service niet mogelijk.
+Parse\ with\ FreeCite=Met FreeCite parsen
+How\ would\ you\ like\ to\ link\ to\ '%0'?=Hoe wilt u linken naar '%0'?
+BibTeX\ key\ patterns=BibTeX sleutelpatronen
+Changed\ special\ field\ settings=Speciale veldinstellingen gewijzigd
+Clear\ priority=Prioriteit wissen
+Clear\ rank=Rang wissen
+Enable\ special\ fields=Speciale velden inschakelen
+One\ star=Een ster
+Two\ stars=Twee sterren
+Three\ stars=Drie sterren
+Four\ stars=Vier sterren
+Five\ stars=Vijf sterren
+Help\ on\ special\ fields=Hulp op speciale gebieden
+Keywords\ of\ selected\ entries=Trefwoorden van geselecteerde invoeren
+Manage\ content\ selectors=Beheer inhoudselectoren
 Manage\ keywords=Beheer sleutelwoorden
-
-
+No\ priority\ information=Geen prioriteitsinformatie
+No\ rank\ information=Geen ranggegevens
+Priority=Prioriteit
+Priority\ high=Prioriteit hoog
+Priority\ low=Prioriteit laag
+Priority\ medium=Prioriteit medium
+Quality=Kwaliteit
+Rank=Rang
+Relevance=Relevantie
+Set\ priority\ to\ high=Hoge prioriteit instellen
+Set\ priority\ to\ low=Lage prioriteit instellen
+Set\ priority\ to\ medium=Medium prioriteit instellen
+Show\ priority=Toon prioriteit
+Show\ quality=Toon kwaliteit
+Show\ rank=Toon rank
+Show\ relevance=Toon relevantie
+Synchronize\ with\ keywords=Synchroniseren met trefwoorden
+Synchronized\ special\ fields\ based\ on\ keywords=Gesynchroniseerde speciale velden op basis van trefwoorden
+Toggle\ relevance=Relevantie in-/uitschakelen
+Toggle\ quality\ assured=Kwaliteit in-/uitschakelen
+Toggle\ print\ status=Printstatus in-/uitschakelen
+Update\ keywords=Sleutelwoorden bijwerken
+Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Schrijfwaarden van speciale velden als afzonderlijke velden naar BibTeX
+You\ have\ changed\ settings\ for\ special\ fields.=U heeft instellingen voor speciale velden gewijzigd.
+A\ string\ with\ that\ label\ already\ exists=Er bestaat al een tekenreeks met dat label
+Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=De verbinding met OpenOffice/LibreOffice is verbroken. Controleer of OpenOffice/LibreOffice draait, en probeer opnieuw verbinding te maken.
+JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef stuurt ten minste één verzoek per invoer naar een uitgever.
+Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Corrigeer de invoer en open de editor opnieuw om de bron weer te geven/te bewerken.
+Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Verbinden met actieve OpenOffice/LibreOffice mislukt.
+Make\ sure\ you\ have\ installed\ OpenOffice/LibreOffice\ with\ Java\ support.=Zorg ervoor dat u OpenOffice/LibreOffice met Java-ondersteuning heeft geïnstalleerd.
+If\ connecting\ manually,\ please\ verify\ program\ and\ library\ paths.=Als u handmatig verbinding maakt, controleer programma en bibliotheek paden.
+Error\ message\:=Foutmelding\:
+If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Als een geplakte of geïmporteerde invoer al bestaat in de veldenset, overschrijven.
+Import\ metadata\ from\ PDF=Metadata importeren van PDF
+Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Met geen enkel Writer document verbonden. Zorg dat er een document is geopend, en gebruik de 'Selecteer Writer document' knop om te verbinden.
+Removed\ all\ subgroups\ of\ group\ "%0".=Alle subgroepen van groep "%0" verwijderd.
+To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Om de geheugenstick modus in te schakelen, hernoem of verwijder het jabref.xml bestand in dezelfde folder als JabRef.
+Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Verbinden niet mogelijk. Een mogelijke reden is, dat JabRef en OpenOffice/LibreOffice niet beiden in 32 bit modus ofwel 64 bit modus draaien.
+Use\ the\ following\ delimiter\ character(s)\:=Gebruik de volgende scheidingstekens\:
+When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ prefer\ the\ BIB\ file\ location\ rather\ than\ the\ file\ directory\ set\ above=Bij het downloaden van bestanden of het verplaatsen van gekoppelde bestanden naar de bestandsmap, geeft u de voorkeur aan de locatie van het BIB-bestand in plaats van de hierboven ingestelde bestandsdirectory
+Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Uw stijlbestand specificeert de tekenopmaak '%0', die in huw huidige OpenOffice/LibreOffice document ongedefinieerd is.
+Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Uw stijlbestand specificeert de alinea-opmaak '%0', die in uw huidige OpenOffice/LibreOffice document ongedefinieerd is.
+
+Searching...=Zoeken...
+Import\ conversions=Conversies importeren
+Please\ enter\ a\ search\ string=Voer een zoekterm in
+Please\ open\ or\ start\ a\ new\ library\ before\ searching=Open of begin een nieuwe bibliotheek voordat u start met zoeken
+
+Canceled\ merging\ entries=Samengevoegde invoergegevens annuleren
 
 Merge\ entries=Voeg entries samen
-
-
+Merged\ entries=Samengevoegde invoergegevens
+None=Geen
+Parse=Verwerk
+Result=Resultaat
+Show\ DOI\ first=DOI eerst tonen
+Show\ URL\ first=URL eerst tonen
+Use\ Emacs\ key\ bindings=Gebruik Emac's sleutelbindingen
+You\ have\ to\ choose\ exactly\ two\ entries\ to\ merge.=U dient exact twee invoergegevens kiezen om samen te voegen.
+
+Update\ timestamp\ on\ modification=Tijdsstempel bij wijziging bijwerken
+All\ key\ bindings\ will\ be\ reset\ to\ their\ defaults.=Alle sleutelbindingen worden teruggezet naar hun standaardwaarden.
+
+Automatically\ set\ file\ links=Bestandslinks automatisch instellen
+Resetting\ all\ key\ bindings=Sleutelbindingen allemaal resetten
+Hostname=Hostnaam
+Invalid\ setting=Ongeldige instelling
 Network=Netwerk
-
-
-
-
-
-
+Please\ specify\ both\ hostname\ and\ port=Specificeer aub zowel de hostnaam en de poort
+Please\ specify\ both\ username\ and\ password=Voer aub zowel uw gebruikersnaam als uw wachtwoord in
+
+Use\ custom\ proxy\ configuration=Gebruikt aangepaste proxyconfiguratie
+Proxy\ requires\ authentication=Proxy vereist authenticatie
+Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Opgelet\: Wachtwoord wordt opgeslagen in platte tekst\!
+Clear\ connection\ settings=Verbindingsinstellingen wissen
+
+Rebind\ C-a,\ too=Opnieuw koppelen C-a, ook
+Rebind\ C-f,\ too=Opnieuw koppelen C-f, ook
+
+Open\ folder=Map openen
+Searches\ for\ unlinked\ PDF\ files\ on\ the\ file\ system=Hiermee zoekt u naar niet-gekoppelde PDF-bestanden in het bestandssysteem
+Export\ entries\ ordered\ as\ specified=Invoergegevens exporteren zoals gespecificeerd
+Export\ sort\ order=Sorteervolgorde exporteren
+Export\ sorting=Sortering exporteren
+Newline\ separator=Nieuwelijn scheidingsteken
+
+Save\ entries\ ordered\ as\ specified=Opslaan invoergegvens zoals gespecificeerd
+Save\ sort\ order=Sorteervolgorde opslaan
+Show\ extra\ columns=Extra kolommen tonen
+Parsing\ error=Parseerfout
+illegal\ backslash\ expression=illegale backslash-expressie
+
+Move\ to\ group=Naar groep verplaatsen
+
+Clear\ read\ status=Status lezen wissen
+Convert\ to\ biblatex\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journal'\ field\ to\ 'journaltitle')=Converteer naar biblatex indeling (bijvoorbeeld, verplaast de waarde van het 'logboek' veld naar 'logboektitel')
+Could\ not\ apply\ changes.=Kon geen wijzigingen aanbrengen.
+Deprecated\ fields=Afgekeurde velden
+No\ read\ status\ information=Geen leesstatus informatie
+Printed=Afgedrukt
+Read\ status=Lees status
+Read\ status\ read=Lees-status lezen
+Read\ status\ skimmed=Lees-status afgeroomd
 Save\ selected\ as\ plain\ BibTeX...=Sla selectie op als platte BibTex...
+Set\ read\ status\ to\ read=Lees-status instellen naar lezen
+Set\ read\ status\ to\ skimmed=Lees-status instellen naar afgeroomd
+Show\ deprecated\ BibTeX\ fields=Verouderde BibTeX-velden tonen
 
+Show\ printed\ status=Afgedrukt status tonen
+Show\ read\ status=Lees-status tonen
 
+Opens\ JabRef's\ GitHub\ page=Opent JabRef's GitHub-pagina
+Opens\ JabRef's\ Twitter\ page=Opent JabRef's Twitter-pagina
+Opens\ JabRef's\ Facebook\ page=Opent JabRef's Facebook-pagina
+Opens\ JabRef's\ blog=Opent JabRef's blog
+Opens\ JabRef's\ website=Opent JabRef's website
 
+Could\ not\ open\ browser.=Kon browser niet openen.
+Please\ open\ %0\ manually.=Aub handmatig %0 openen.
+The\ link\ has\ been\ copied\ to\ the\ clipboard.=De link is gekopieerd naar het klembord.
 
+Open\ %0\ file=%0 bestand openen
 
+Cannot\ delete\ file=Kan het bestand niet verwijderen
+File\ permission\ error=Fout bij bestandsrechten
 Push\ to\ %0=Stuur selectie naar %0
-
-
+Path\ to\ %0=Pad naar %0
+Convert=Converteren
+Normalize\ to\ BibTeX\ name\ format=Normaliseren tot BibTeX naamnotatie
+Help\ on\ Name\ Formatting=Hulp bij de naam-opmaak
+
+Add\ new\ file\ type=Nieuw bestandstype toevoegen
+
+Left\ entry=Linkse invoer
+Right\ entry=Rechtse invoer
+Original\ entry=Originele invoer
+No\ information\ added=Geen informatie toegevoegd
+Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Selecteer minimaal één invoer om zoekwoorden te beheren.
+OpenDocument\ text=OpenDocument tekst
+OpenDocument\ spreadsheet=OpenDocument spreadsheet
+OpenDocument\ presentation=OpenDocument presentatie
+%0\ image=%0 afbeelding
+Added\ entry=Toegevoegde invoer
+Modified\ entry=Gewijzigde invoer
+Deleted\ entry=Verwijderde invoer
+Modified\ groups\ tree=Groepsstructuur gewijzigd
+Removed\ all\ groups=Alle groepen verwijderd
+Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=Het accepteren van de wijziging vervangt de volledige groepenboom met de extern gewijzigde groepenboom.
+Select\ export\ format=Selecteer exportindeling
+Return\ to\ JabRef=Terug naar JabRef
+Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Gelieve het bestand handmatig terug te plaatsen en koppelen.
+Could\ not\ connect\ to\ %0=Kon niet verbinden met%0
+Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Waarschuwing\: %0 van de %1 invoergegevens hebben een ongedefinieerde titel.
+Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Waarschuwing\: %0 van de %1 invoergegevens hebben een ongedefinieerde BibTeX-sleutel.
+Added\ new\ '%0'\ entry.=Nieuwe '%0' invoer toegevoegd.
+Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Meerdere invoeren geselecteerd. Wilt u het type van allen veranderen naar '%0'?
 Changed\ type\ to\ '%0'\ for=Type gewijzigd naar '%0' voor
+Really\ delete\ the\ selected\ entry?=Geselecteerde invoer echt verwijderen?
+Really\ delete\ the\ %0\ selected\ entries?=Weet u zeker dat u de %0 geselecteerde invoeren wenst te verwijderen?
+Keep\ merged\ entry\ only=Enkel samengevoegde invoer behouden
+Keep\ left=Links aanhouden
+Keep\ right=Rechts aanhouden
+Old\ entry=Oude invoer
+From\ import=Van de import
+No\ problems\ found.=Geen problemen gevonden.
+%0\ problem(s)\ found=%0 proble(e)m(en) gevonden
+Save\ changes=Wijzigingen opslaan
+Discard\ changes=Verwerp wijzigingen
+Library\ '%0'\ has\ changed.=Bibliotheek '%0' is veranderd.
+Print\ entry\ preview=Afdrukvoorbeeld printen
+Copy\ title=Titel kopiëren
 Copy\ \\cite{BibTeX\ key}=Kopieer \\cite{BibTeX-sleutel}
 Copy\ BibTeX\ key\ and\ title=Kopieer BibTeX sleutel en titel
 Invalid\ DOI\:\ '%0'.=Ongeldig DOI\: '%0'.
+should\ start\ with\ a\ name=moet beginnen met een naam
+should\ end\ with\ a\ name=moet eindigen met een naam
+unexpected\ closing\ curly\ bracket=onverwachte accolade sluiten
+unexpected\ opening\ curly\ bracket=onverwachte accolade openen
+capital\ letters\ are\ not\ masked\ using\ curly\ brackets\ {}=hoofdletters worden niet gemaskeerd met accolades {}
+should\ contain\ a\ four\ digit\ number=moet een viercijferig nummer bevatten
+should\ contain\ a\ valid\ page\ number\ range=zou een geldig paginanummer rang moeten bevatten
+Filled=Gevuld
+Field\ is\ missing=Veld ontbreekt
 Search\ %0=Zoek %0
 
-
-
+Search\ results\ in\ all\ libraries\ for\ %0=Zoekresultaten in alle bibliotheken voor %0
+Search\ results\ in\ library\ %0\ for\ %1=Zoekresultaten in bibliotheek %0 voor %1
+Search\ globally=Zoek wereldwijd
+No\ results\ found.=Geen resultaten gevonden.
+Found\ %0\ results.=%0 resultaten gevonden.
+plain\ text=onopgemaakte tekst
+This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ regular\ expression\ <b>%0</b>=Deze zoekopdracht bevat invoergegevens waarin elk veld de reguliere expressie <b>%0</b> bevat
+This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ term\ <b>%0</b>=Deze zoekopdracht bevat invoergegevens waarin elk veld de term <b>%0</b> bevat
+This\ search\ contains\ entries\ in\ which=Deze zoekopdracht bevat invoergegevens waarin
+
+Unable\ to\ autodetect\ OpenOffice/LibreOffice\ installation.\ Please\ choose\ the\ installation\ directory\ manually.=Kan de OpenOffice/LibreOffice-installatie niet automatisch detecteren. Kies de installatiemap handmatig.
+JabRef\ no\ longer\ supports\ 'ps'\ or\ 'pdf'\ fields.<br>File\ links\ are\ now\ stored\ in\ the\ 'file'\ field\ and\ files\ are\ stored\ in\ an\ external\ file\ directory.<br>To\ make\ use\ of\ this\ feature,\ JabRef\ needs\ to\ upgrade\ file\ links.<br><br>=JabRef ondersteunt niet langer 'ps' of 'pdf' velden.<br>Bestandslinks worden nu opgeslagen in het 'bestand' veld en bestanden worden opgeslagen in een externe bastandsmap.<br>Om gebruik te maken van deze functie, moet JabRef bestandslinks upgraden.<br><br>
+This\ library\ uses\ outdated\ file\ links.=Deze bibliotheek gebruikt verouderde bestandslinks.
+
+Close\ library=Sluit bibliotheek
+Decrease\ table\ font\ size=Tabel tekengrootte verkleinen
+Entry\ editor,\ next\ entry=Invoer editor, volgende invoer
+Entry\ editor,\ next\ panel=Invoer editor, volgende paneel
+Entry\ editor,\ next\ panel\ 2=Invoer editor, volgende paneel 2
+Entry\ editor,\ previous\ entry=Invoer editor, vorige invoer
+Entry\ editor,\ previous\ panel=Invoer editor, vorig paneel
+Entry\ editor,\ previous\ panel\ 2=Invoer editor, vorig paneel 2
+File\ list\ editor,\ move\ entry\ down=Bestandslijst editor, invoer omlaag verplaatsen
+File\ list\ editor,\ move\ entry\ up=Bestandslijst editor, invoer omhoog verplaatsen
 Focus\ entry\ table=Focus op invoertabel
 Import\ into\ current\ library=Importeer in huidige library
 Import\ into\ new\ library=Importeer in nieuwe library
+Increase\ table\ font\ size=Tabel tekengrootte vergroten
+New\ article=Nieuw artikel
+New\ book=Nieuw boek
+New\ entry=Nieuwe invoer
+New\ from\ plain\ text=Nieuw vanuit onopgemaakte tekst
+New\ inbook=Nieuwe boeking
+New\ mastersthesis=Nieuwe masterthesis
+New\ phdthesis=Nieuwe phdthesis
+New\ proceedings=Nieuwe handelingen
+New\ unpublished=Nieuw ongepubliceerd
+Preamble\ editor,\ store\ changes=Preambule-editor, winkelwijzigingen
+Refresh\ OpenOffice/LibreOffice=OpenOffice/LibreOffice vernieuwen
 Resolve\ duplicate\ BibTeX\ keys=Dubbele BibTeX steutels aanpakken
 Save\ all=Bewaar alles
-
-
-
+String\ dialog,\ add\ string=Tekenreeks dialoog, voeg reeks toe
+String\ dialog,\ remove\ string=Tekenreeks dialoog, verwijder reeks
+Synchronize\ files=Bestanden synchroniseren
+Unabbreviate=Niet afkorten
+should\ contain\ a\ protocol=zou een protocol moeten bevatten
+Copy\ preview=Kopie voorbeeld
+Show\ debug\ level\ messages=Foutopsporingsberichten tonen
+Default\ bibliography\ mode=Standaard bibliografiemodus
+New\ %0\ library\ created.=Nieuwe %0 bibliotheek aangemaakt.
+Show\ only\ preferences\ deviating\ from\ their\ default\ value=Toon enkel voorkeuren die afwijken van hun standaardwaarde
+default=standaard
+key=sleutel
+type=type
+value=waarde
+Show\ preferences=Voorkeuren tonen
+Save\ actions=Acties opslaan
+Enable\ save\ actions=Inschakelen acties opslaan
+Convert\ to\ BibTeX\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journaltitle'\ field\ to\ 'journal')=Converteer naar BibTeX indeling (bijvoorbeeld, verplaats de waarde van het 'logboektitel' veld naar 'logboek')
+
+Other\ fields=Andere velden
+Show\ remaining\ fields=Resterende velden tonen
+
+link\ should\ refer\ to\ a\ correct\ file\ path=link zou moeten verwijzen naar een correct bestandspad
+abbreviation\ detected=afkorting gevonden
+wrong\ entry\ type\ as\ proceedings\ has\ page\ numbers=verkeerde invoergegevens omdat de procedure paginanummers heeft
+Abbreviate\ journal\ names=Logboek namen afkorten
+Abbreviating...=Afkorten...
+Abbreviation\ %s\ for\ journal\ %s\ already\ defined.=Afkorten %s voor logboek %s al gedefinieerd.
+Abbreviation\ cannot\ be\ empty=Afkorting mag niet leeg zijn
+Duplicated\ Journal\ Abbreviation=Gedupliceerde afkorting logboek
+Duplicated\ Journal\ File=Gedupliceerd logboekbestand
+Error\ Occurred=Fout opgetreden
+Journal\ file\ %s\ already\ added=Logboek bestand %s al toegevoegd
+Name\ cannot\ be\ empty=Naam mag niet leeg zijn
+
+Display\ keywords\ appearing\ in\ ALL\ entries=Trefwoorden die voorkomen in ALLE invoergegevens weergeven
+Display\ keywords\ appearing\ in\ ANY\ entry=Trefwoorden die voorkomen in ELKE invoer weergeven
+None\ of\ the\ selected\ entries\ have\ titles.=Geen van de geselecteerde invoergegevens hebben bevatten titels.
+None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=Geen van de gelecteerde invoergegevens bevatten BibTeX sleutels.
 Unabbreviate\ journal\ names=Maak afkorting van tijdschriftnamen ongedaan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+Unabbreviating...=Niet afkorten...
+Usage=Gebruik
+
+
+Adds\ {}\ brackets\ around\ acronyms,\ month\ names\ and\ countries\ to\ preserve\ their\ case.=Voegt {} haakjes toe rond acroniemen, maandnamen en landen voor het behoud van hun case.
+Are\ you\ sure\ you\ want\ to\ reset\ all\ settings\ to\ default\ values?=Weet u zeker dat u alle instellingen wilt resetten naar standaardwaardes?
+Reset\ preferences=Voorkeuren resetten
+Ill-formed\ entrytype\ comment\ in\ BIB\ file=Slechtgevormde opmerking bij invoertype in BIB-bestand\n
+
+Move\ linked\ files\ to\ default\ file\ directory\ %0=Gekoppelde bestanden verplaatsen naar standaard bestandsmap %0
+
+Do\ you\ still\ want\ to\ continue?=Wilt u toch doorgaan?
+This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=Met deze actie worden de volgende velden in ten minste één invoer elk gewijzigd\:
+This\ could\ cause\ undesired\ changes\ to\ your\ entries.=Dit kan ongewenste wijzigingen in uw invoergegevens veroorzaken.
+Table\ font\ size\ is\ %0=Tabel tekengrootte is %0
+Internal\ style=Interne stijl
+Add\ style\ file=Bestandsstijl toevoegen
+Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=Weet u zeker dat u deze stijl wilt verwijderen?
+Current\ style\ is\ '%0'=Huidige stijl is '%0'
+Remove\ style=Stijl verwijderen
+Select\ one\ of\ the\ available\ styles\ or\ add\ a\ style\ file\ from\ disk.=Selecteer een van de beschikbare stijlen of voeg een stijlbestand van de schijf toe.
+You\ must\ select\ a\ valid\ style\ file.=U moet een geldig stijlbestand selecteren.
+Reload=Vernieuwen
+
+Capitalize=Kapitaliseren
+Capitalize\ all\ words,\ but\ converts\ articles,\ prepositions,\ and\ conjunctions\ to\ lower\ case.=Kapitaliseert alle woorden, maar converteert artikelen, voorzetsels en voegwoorden naar kleine letters.
+Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Gebruik hoofdletter bij het eerste woord, andere woorden omzetten naar kleine letters.
+Changes\ all\ letters\ to\ lower\ case.=Hiermee wijzigt u alle letters naar kleine letters.
+Changes\ all\ letters\ to\ upper\ case.=Verander alle letters naar hoofdletters.
+Changes\ the\ first\ letter\ of\ all\ words\ to\ capital\ case\ and\ the\ remaining\ letters\ to\ lower\ case.=Hiermee wijzigt u de eerste letter van alle woorden naar hoofdletters, en de resterende letters naar kleine letters.
+Cleans\ up\ LaTeX\ code.=Schoont LaTeX-code op.
+Converts\ HTML\ code\ to\ LaTeX\ code.=Converteert HTML-code naar LeTeX-code.
+HTML\ to\ Unicode=HTML naar Unicode
+Converts\ HTML\ code\ to\ Unicode.=Zet HTML code om naar Unicode.
+Converts\ LaTeX\ encoding\ to\ Unicode\ characters.=Zet LaTeX-codering om naar Unicode-tekens.
+Converts\ Unicode\ characters\ to\ LaTeX\ encoding.=Zet Unicode-tekens om naar LaTeX-codering.
+Converts\ ordinals\ to\ LaTeX\ superscripts.=Converteert ordinalen naar LaTeX superscripts.
+Converts\ units\ to\ LaTeX\ formatting.=Converteert eenheden naar LaTeX opmaak.
+HTML\ to\ LaTeX=HTML naar LaTeX
+LaTeX\ cleanup=LaTeX opschoning
+LaTeX\ to\ Unicode=LaTeX naar Unicode
+Lower\ case=Kleine letters
+Minify\ list\ of\ person\ names=Verklein lijst met persoonsnamen
+Normalize\ date=Datum normaliseren
+Normalize\ en\ dashes=Normaliseren en streepjes
+Normalize\ month=Maand normaliseren
+Normalize\ month\ to\ BibTeX\ standard\ abbreviation.=Normaliseer maand naar BibTeX standaard afkorting.
+Normalize\ names\ of\ persons=Namen van personen normaliseren
+Normalize\ page\ numbers=Paginanummers normaliseren
+Normalize\ pages\ to\ BibTeX\ standard.=Normaliseer pagina's naar BibTeX standaard.
+Normalizes\ lists\ of\ persons\ to\ the\ BibTeX\ standard.=Normaliseert lijsten van personen naar de BibTeX standaard.
+Normalizes\ the\ date\ to\ ISO\ date\ format.=Normaliseert de datum naar ISO datumnotatie.
+Normalizes\ the\ en\ dashes.=Normaliseren de en-streepjes.
+Ordinals\ to\ LaTeX\ superscript=Rangtelwoorden naar LaTeX superscript
+Protect\ terms=Voorwaarden beschermen
+Add\ enclosing\ braces=Accolades toevoegen
+Add\ braces\ encapsulating\ the\ complete\ field\ content.=Voeg accolades toe die de volledige veldinhoud inkapselen.
+Remove\ enclosing\ braces=Accolades verwijderen
+Removes\ braces\ encapsulating\ the\ complete\ field\ content.=Verwijdert accolades die de volledige veldinhoud inkapselen.
+Unicode\ to\ LaTeX=Unicode naar LaTeX
+Units\ to\ LaTeX=Units naar LaTeX
+Upper\ case=Hoofdletters
+Does\ nothing.=Doet niets.
+Identity=Identiteit
+Clears\ the\ field\ completely.=Wist het veld volledig.
+Directory\ not\ found=Directory niet gevonden
+Main\ file\ directory\ not\ set\!=Hoofdbestand map niet ingesteld\!
+This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Deze bewerking vereist dat precies één item wordt geselecteerd.
+Importing\ in\ %0\ format=Importeren in %0 indeling
+Female\ name=Vrouwelijke naam
+Female\ names=Vrouwelijke namen
+Male\ name=Mannelijke naam
+Male\ names=Mannelijke namen
+Mixed\ names=Gemengde namen
+Neuter\ name=Onzijdige naam
+Neuter\ names=Onzijdige namen
+
+Look\ up\ %0=Zoek op %0
+Looking\ up\ %0...\ -\ entry\ %1\ out\ of\ %2\ -\ found\ %3=Opzoeken van %0... - invoer %1 uit %2 - %3 gevonden
+
+Audio\ CD=Audio-CD
+British\ patent=Brits octrooi
+British\ patent\ request=Brits octrooi aanvraag
+Candidate\ thesis=Kandidaat thesis
+Collaborator=Medewerker
+Column=Kolom
+Compiler=Compilator
+Continuator=Opvolger
+Data\ CD=Gegevens CD
+Editor=Bewerker
+European\ patent=Europees octrooi
+European\ patent\ request=Europees octrooiaanvraag
+Founder=Oprichter
+French\ patent=Frans octrooi
+French\ patent\ request=Frans octrooiaanvraag
+German\ patent=Duits octrooi
+German\ patent\ request=Duits octrooiaanvraag
+Line=Lijn
+Page=Pagina
+Paragraph=Paragraaf
+Patent=Octrooi
+Patent\ request=Octrooiaanvraag
+PhD\ thesis=Doctoraat thesis
+Redactor=Redacteur
+Research\ report=Onderzoeksrapport
+Section=Sectie
+Software=Software
+Technical\ report=Technisch verslag
+U.S.\ patent=VS octrooi
+U.S.\ patent\ request=VS octrooiaanvraag
+Verse=Vers
+
+change\ entries\ of\ group=invoergegevens van groep veranderen
+
+Plain\ text=Onopgemaakte tekst
+character=karakter
+word=woord
+Copy\ Version=Versie kopiëren
+Developers=Ontwikkelaars
+Authors=Auteurs
+License=Licentie
+
+HTML\ encoded\ character\ found=HTML gecodeerd teken gevonden
+booktitle\ ends\ with\ 'conference\ on'=boektitel eindigt met 'conferentie over'
+
+All\ external\ files=Alle externe bestanden
+
+OpenOffice/LibreOffice\ integration=OpenOffice/LibreOffice integratie
+
+incorrect\ control\ digit=onjuist controlegetal
+incorrect\ format=onjuiste format
+Copied\ version\ to\ clipboard=Versie gekopieerd naar klembord
+
+BibTeX\ key=BibTeX-sleutel
+Message=Bericht
+
+
+MathSciNet\ Review=MathSciNet Review
+Reset\ Bindings=Reset bindingen
+
+Decryption\ not\ supported.=Decodering niet ondersteund.
+
+Cleared\ '%0'\ for\ %1\ entries='%0' gewist voor %1 invoergegevens
+Set\ '%0'\ to\ '%1'\ for\ %2\ entries=Stel '%0' naar '%1' in voor %2 invoergegevens
+
+Check\ for\ updates=Controleren op updates
+Download\ update=Update downloaden
+New\ version\ available=Nieuwe versie beschikbaar
+Installed\ version=Geïnstalleerde versie
+Remind\ me\ later=Herinner me later
+Ignore\ this\ update=Negeer deze update
+Could\ not\ connect\ to\ the\ update\ server.=Kon niet verbinden met de update server.
+Please\ try\ again\ later\ and/or\ check\ your\ network\ connection.=Probeer het later nog eens en/of controleer uw internetverbinding.
+To\ see\ what\ is\ new\ view\ the\ changelog.=Om te zien wat nieuw is, bekijk de changelog.
+A\ new\ version\ of\ JabRef\ has\ been\ released.=Een nieuwe versie van JabRef is vrijgegeven.
+JabRef\ is\ up-to-date.=JabRef is bijgewerkt.
+Latest\ version=Laatste versie
+Online\ help\ forum=Online hulp forum
+Custom=Aangepast
+
+Export\ cited=Citatie exporteren
+Unable\ to\ generate\ new\ library=Niet mogelijk om een nieuwe bibliotheek te genereren
+
+Open\ console=Console openen
+Use\ default\ terminal\ emulator=Gebruik standaard terminal-emulator\n
+Execute\ command=Commando uitvoeren
+Executing\ command\ "%0"...=Commando "%0" uitvoeren...
+Error\ occured\ while\ executing\ the\ command\ "%0".=Er is een fout opgetreden tijdens het uitvoeren van commando "%0".
+
+Countries\ and\ territories\ in\ English=Landen en gebieden in het Engels
+Enabled=Ingeschakeld
+Internal\ list=Interne lijst
+Manage\ protected\ terms\ files=Beschermde voorwaarden bestanden beheren
+Months\ and\ weekdays\ in\ English=Maanden en weekdagen in het Engels
+The\ text\ after\ the\ last\ line\ starting\ with\ \#\ will\ be\ used=De tekst na de laatste zin startend met een \# zal worden gebruikt
+Add\ protected\ terms\ file=Voeg beschermde voorwaardenbestand toe
+Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=Weet u zeker dat u het beschermde voorwaardenbestand wilt verwijderen?
+Remove\ protected\ terms\ file=Verwijder beschermde voorwaardenbestand
+Add\ selected\ text\ to\ list=Geselecteerde tekst toevoegen aan de lijst
+Add\ {}\ around\ selected\ text=Voeg {} toe om de geselecteerde tekst
+Format\ field=Veld format
+New\ protected\ terms\ file=Nieuw beschermde voorwaarden bestand
+change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=verander veld %0 van invoer %1 van %2 naar %3
+change\ key\ from\ %0\ to\ %1=verander sleutel van %0 naar %1
+change\ string\ content\ %0\ to\ %1=verander tekenreeksinhoud %0 naar %1
+change\ string\ name\ %0\ to\ %1=verander tekenreeks naam %0 naar %1
+change\ type\ of\ entry\ %0\ from\ %1\ to\ %2=verander type van invoer %0 van %1 naar %2
+insert\ entry\ %0=invoer invoegen %0
+insert\ string\ %0=tekenreeks invoegen %0
+remove\ entry\ %0=verwijderen invoer %0
+remove\ string\ %0=verwijder tekenreeks %0
+undefined=niet gedefinieerd
+Cannot\ get\ info\ based\ on\ given\ %0\:\ %1=Kan geen info verkrijgen gebaseerd op %0\: %1
+Get\ BibTeX\ data\ from\ %0=BibTeX gegevens ophalen uit %0
+No\ %0\ found=Geen %0 gevonden
+Entry\ from\ %0=Invoer van %0
+Merge\ entry\ with\ %0\ information=Voeg invoer samen met %0 informatie
+Updated\ entry\ with\ info\ from\ %0=Invoer bijgewerkt met info van %0
+
+Add\ existing\ file=Bestaand bestand toevoegen
+Create\ new\ list=Nieuwe lijst maken
+Remove\ list=Lijst verwijderen
+Full\ journal\ name=Volledige naam logboek
+Abbreviation\ name=Afkorting naam
+
+No\ abbreviation\ files\ loaded=Geen afgekortingen bestanden geladen
+
+
+
+Event\ log=Gebeurtenislogboek
+We\ now\ give\ you\ insight\ into\ the\ inner\ workings\ of\ JabRef's\ internals.\ This\ information\ might\ be\ helpful\ to\ diagnose\ the\ root\ cause\ of\ a\ problem.\ Please\ feel\ free\ to\ inform\ the\ developers\ about\ an\ issue.=We geven u nu inzicht in de interne werking van de interne onderdelen van JabRef. Deze informatie kan handig zijn om de oorzaak van een probleem te achterhalen. Aarzel niet om de ontwikkelaars op de hoogte te stellen van een probleem.
+Log\ copied\ to\ clipboard.=Log naar klembord gekopieerd.
+Copy\ Log=Kopiëren logboek
+Clear\ Log=Wissen logboek
+Report\ Issue=Probleem melden
+Issue\ on\ GitHub\ successfully\ reported.=Probleem succesvol op GitHub gerapporteerd.
+Issue\ report\ successful=Probleem melden geslaagd
+Your\ issue\ was\ reported\ in\ your\ browser.=Uw probleem is gerapporteerd in uw browser.
+The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=De log- en uitzonderingsinformatie is gekopieerd naar uw klembord.
+Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Plak deze informatie (met Ctrl + V) in de probleemomschrijving.
+
+Connecting...=Verbinden...
+Host=Host
 Port=Poort
+Library=Bibliotheek
+User=Gebruiker
 Connect=Verbinden
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+Connection\ error=Verbindingsfout
+Connection\ to\ %0\ server\ established.=Verbinding met %0 server gemaakt.
+Required\ field\ "%0"\ is\ empty.=Vereist veld "%0" is leeg.
+%0\ driver\ not\ available.=%0 driver niet beschikbaar.
+The\ connection\ to\ the\ server\ has\ been\ terminated.=De verbinding met de server is beëindigd.
+Connection\ lost.=Verbinding verbroken.
+Reconnect=Opnieuw verbinden
+Work\ offline=Offline werken
+Working\ offline.=Werk offline.
+Update\ refused.=Update geweigerd.
+Update\ refused=Update geweigerd
+Local\ entry=Lokale invoer
+Shared\ entry=Gedeelde invoer
+Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Update kon niet worden uitgevoerd vanwege bestaande wijzigingsconflicten.
+You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=U werkt niet aan de nieuwste versie van BibEntry.
+Local\ version\:\ %0=Lokale versie\: %0
+Shared\ version\:\ %0=Gedeelde versie\: %0
+Shared\ entry\ is\ no\ longer\ present=Gedeelde invoer is niet langer aanwezig
+
+New\ technical\ report=Nieuw technisch verslag
+
+%0\ file=%0 bestand
+Custom\ layout\ file=Aangepast lay-out bestand
+Protected\ terms\ file=Beschermde voorwaarden bestand
+Style\ file=Bestandsstijl
+
+Open\ OpenOffice/LibreOffice\ connection=OpenOffice/LibreOffice verbinding openen
+You\ must\ enter\ at\ least\ one\ field\ name=U moet ten minste één veldnaam opgeven
+Toggle\ web\ search\ interface=Web zoek interface in-/uitschakelen
+%0\ files\ found=%0 bestanden gevonden
+One\ file\ found=Één bestand gevonden
+There\ was\ one\ file\ that\ could\ not\ be\ imported.=Er was één bestand dat niet kon worden geïmporteerd.
+There\ were\ %0\ files\ which\ could\ not\ be\ imported.=Er waren %0 bestanden die niet konden worden geïmporteerd.
+
+Migration\ help\ information=Migratie help informatie
+Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Ingevoerde database heeft een verouderde structuur en wordt niet langer ondersteund.
+However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Er is echter een nieuwe database gemaakt naast de pre-3.6.
+See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=Zie wat er is veranderd in de JabRef versies
+Referenced\ BibTeX\ key\ does\ not\ exist=Gerefereerde BibTeX-sleutel bestaat niet
+Finished\ downloading\ full\ text\ document\ for\ entry\ %0.=Klaar met downloaden volledig tekstdocument voor invoer %0.
+Look\ up\ full\ text\ documents=Volledige tekstdocumenten opzoeken
+You\ are\ about\ to\ look\ up\ full\ text\ documents\ for\ %0\ entries.=U staat op het punt om volledige tekstbestanden op te zoeken voor %0 invoergegevens.
+last\ four\ nonpunctuation\ characters\ should\ be\ numerals=de laatste vier niet-leestekens zouden cijfers moeten zijn
+
+Author=Auteur
+Date=Datum
+File\ annotations=Bestandsaantekeningen
+Show\ file\ annotations=Toon bestandsaantekeningen
+Adobe\ Acrobat\ Reader=Adobe Acrobat Reader
+Sumatra\ Reader=Sumatra Reader
+shared=gedeeld
+should\ contain\ an\ integer\ or\ a\ literal=moet een heel getal of een letterlijke waarde bevatten
+should\ have\ the\ first\ letter\ capitalized=moet de eerste letter gekapitaliseerd hebben
+Tools=Hulpmiddelen
+What's\ new\ in\ this\ version?=Wat is er nieuw in deze versie?
+Want\ to\ help?=Wilt u helpen?
+Make\ a\ donation=Maak een donatie
+get\ involved=help mee
+Used\ libraries=Gebruikte bibliotheken
+Existing\ file=Bestaand bestand
+
+ID=ID
+ID\ type=ID type
+Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=Fetcher '%0' vond geen invoer voor id '%1'.
+
+Select\ first\ entry=Selecteer eerste invoer
+Select\ last\ entry=Selecteer laatste invoer
+
+Invalid\ ISBN\:\ '%0'.=Ongeldig ISBN\: '%0'.
+should\ be\ an\ integer\ or\ normalized=moet een geheel getal of genormaliseerd zijn
+should\ be\ normalized=zou moeten worden genormaliseerd
+
+Empty\ search\ ID=Leeg zoek ID
+The\ given\ search\ ID\ was\ empty.=Het opgegeven zoek ID was leeg.
+Copy\ BibTeX\ key\ and\ link=Kopieer BibTeX sleutel en koppeling
+biblatex\ field\ only=uitsluitend biblatex veld
+
+Error\ while\ generating\ fetch\ URL=Fout bij genereren fetch URL
+Backup\ found=Back-up gevonden
+A\ backup\ file\ for\ '%0'\ was\ found.=Een back-up bestand voor '%0' was gevonden.
+Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Wilt u de bibliotheek herstellen van het backup bestand?
+Firstname\ Lastname=Voornaam Achternaam
+
+Recommended\ for\ %0=Aanbevolen voor %0
+Show\ 'Related\ Articles'\ tab=Toon 'Gerelateerde Artikelen' tab
+This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=Dit kan worden veroorzaakt door de verkeersbeperking van Google Scholar (zie 'Help' voor meer informatie).
+
+Could\ not\ open\ website.=Kon de website niet openen.
+Problem\ downloading\ from\ %1=Probleem downloaden van %1
+
+File\ directory\ pattern=Bestandsmap patroon
+Update\ with\ bibliographic\ information\ from\ the\ web=Met bibliografische informatie van het web bijwerken
+
+Could\ not\ find\ any\ bibliographic\ information.=Geen bibliografische informatie gevonden.
+BibTeX\ key\ deviates\ from\ generated\ key=BibTeX-sleutel wijkt af van gegenereerde sleutel
+DOI\ %0\ is\ invalid=DOI %0 is ongeldig
+
+Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences=Selecteerd alle aangepaste types die opgeslagen worden in lokale voorkeuren
+Currently\ unknown=Momenteel onbekend
+Different\ customization,\ current\ settings\ will\ be\ overwritten=Verschillende aanpassingen, de huidige instellingen worden overschreven
+
+Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=Invoertype %0 is alleen gedefinieerd voor Biblatex maar niet voor BibTeX
+
+Copied\ %0\ citations.=%0 citaten gekopieerd.
+Copying...=Kopiëren...
+
+journal\ not\ found\ in\ abbreviation\ list=logboek niet gevonden in afkortingslijst
+Unhandled\ exception\ occurred.=Onverwachte uitzondering opgetreden.
+
+strings\ included=tekenreeks inbegrepen
+Default\ table\ font\ size=Standaard tabel lettergrootte
+Color=Kleur
+Please\ also\ add\ all\ steps\ to\ reproduce\ this\ issue,\ if\ possible.=Indien mogelijk, voer ook alle stappen in om het probleem te reproduceren.
+Fit\ width=Maak breedte passend
+Fit\ a\ single\ page=Op enkele pagina passend maken
+Zoom\ in=Zoom in
+Zoom\ out=Zoom uit
+Previous\ page=Vorige pagina
+Next\ page=Volgende pagina
+Document\ viewer=Documentweergave
+Live=Operationeel
+Locked=Vergrendeld
+Show\ document\ viewer=Toon documentweergave
+Show\ the\ document\ of\ the\ currently\ selected\ entry.=Het document van de huidige geselecteerde invoer weergeven.
+Show\ this\ document\ until\ unlocked.=Dit document tonen tot het ontgrendeld is.
+Set\ current\ user\ name\ as\ owner.=Huidige gebruikersnaam als eigenaar instellen.
+
+Sort\ all\ subgroups\ (recursively)=Alle sub-groepen sorteren (recursief)
+Collect\ and\ share\ telemetry\ data\ to\ help\ improve\ JabRef.=Telemetrie gegevens verzamelen en delen om JabRef te helpen verbeteren.
+Don't\ share=Niet delen
+Share\ anonymous\ statistics=Statistieken anoniem delen
+Telemetry\:\ Help\ make\ JabRef\ better=Telemetrie\: help JabRef te verbeteren
+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.=Om de gebruikerservaring te verbeteren, willen we graag anoniem statistieken verzamelen over de functies die u gebruikt. We slaan alleen op welke functies u opent en hoe vaak u dit doet. We zullen geen persoonlijke gegevens verzamelen of de inhoud van bibliografische gegevens. Als u ervoor kiest toe te staan om gegevens te verzamelen, kunt u dit later nog uitschakelen via Opties -> Voorkeuren -> Algemeen.
+This\ file\ was\ found\ automatically.\ Do\ you\ want\ to\ link\ it\ to\ this\ entry?=Dit bestand werd automatisch gevonden. Wilt u het koppelen aan deze invoer?
+Names\ are\ not\ in\ the\ standard\ %0\ format.=Namen zijn niet in de standaard %0 indeling.
+
+Delete\ the\ selected\ file\ permanently\ from\ disk,\ or\ just\ remove\ the\ file\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ file\ permanently\ from\ disk.=Het geselecteerde bestand permanent verwijderen van de schijf, of alleen het bestand verwijderen uit de invoer? Op delete drukken zal het bestand permanent verwijderen van de schijf.
+Delete\ '%0'=Verwijder '%0'
+Delete\ from\ disk=Van schijf verwijderen
+Remove\ from\ entry=Invoer wissen
+There\ exists\ already\ a\ group\ with\ the\ same\ name.=Er bestaat al een groep met dezelfde naam.
+
+Copy\ linked\ files\ to\ folder...=Gelinkte bestanden kopiëren naar map...
+Copied\ file\ successfully=Bestand succesvol gekopieerd
+Copying\ files...=Bestanden kopiëren...
+Copying\ file\ %0\ of\ entry\ %1=Kopieer bestand %0 van invoer %1
+Finished\ copying=Kopiëren voltooid
+Could\ not\ copy\ file=Kan het bestand niet kopiëren
+Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=%0 bestanden van %1 succesvol gekopieerd naar %2
+Rename\ failed=Hernoemen mislukt
+JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef kan geen toegang krijgen tot dit bestand omdat het door een ander proces wordt gebruikt.
+Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Laat console-uitvoer zien (alleen nodig wanneer het opstartprogramma wordt gebruikt)
+
+Remove\ line\ breaks=Verwijder regeleinden
+Removes\ all\ line\ breaks\ in\ the\ field\ content.=Verwijder alle regeleinden in de veldinhoud.
+Checking\ integrity...=Integriteitscontrole...
+
+Remove\ hyphenated\ line\ breaks=Verwijder afgebroken regeleinden
+Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Verwijdert alle afgebroken regelafbrekingen in de veldinhoud.
+Note\ that\ currently,\ JabRef\ does\ not\ run\ with\ Java\ 9.=Merk op dat JabRef momenteel niet werkt met Java 9.
+Your\ current\ Java\ version\ (%0)\ is\ not\ supported.\ Please\ install\ version\ %1\ or\ higher.=Uw huidige versie van Java (%0) wordt niet ondersteunt. Installeer versie %1 of hoger.
+
+Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Kon geen data ophalen van '%0'.
+Entry\ from\ %0\ could\ not\ be\ parsed.=Invoer van %0 kon niet worden geparseerd.
+Invalid\ identifier\:\ '%0'.=Ongeldig Id\: '%0'.
+This\ paper\ has\ been\ withdrawn.=Dit artikel is ingetrokken.
+Finished\ writing\ XMP-metadata.=Klaar met schrijven van XMP-metadata.
+empty\ BibTeX\ key=lege BibTeX-sleutel
+Your\ Java\ Runtime\ Environment\ is\ located\ at\ %0.=Uw Java Runtime Environment bevindt zich op %0.
+Aux\ file=Aux bestand
+Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Groep bevat invoergegevens aangehaald in een bepaald TeX-bestand
+
+Any\ file=Elk bestand
+
+No\ linked\ files\ found\ for\ export.=Geen gekoppelde bestanden gevonden om te exporteren.
+
+Full\ text\ document\ download\ failed\ for\ entry\ %0=Volledig tekstdocument downloaden mislukt voor invoer %0
+No\ full\ text\ document\ found\ for\ entry\ %0.=Geen volledig tekstdocument gevonden voor invoer %0.
+
+Delete\ Entry=Invoer verwijderen
+Import\ &\ Export=Importeren & exporteren
+Look\ up\ document\ identifier=Zoek document-ID op
+Next\ library=Volgende bibliotheek
+Previous\ library=Vorige bibliotheek
 add\ group=groep toevoegen
-
-
-
-
-
+Entry\ is\ contained\ in\ the\ following\ groups\:=Invoer is opgenomen in de volgende groepen\:
+Delete\ entries=Verwijder boekingen
+Keep\ entries=Invoergegevens behouden
+Keep\ entry=Invoer behouden
+Ignore\ backup=Back-up negeren
+Restore\ from\ backup=Herstellen vanuit back-up
+
+Continue=Doorgaan
+Generate\ key=Genereer sleutel
+Overwrite\ file=Bestand overschrijven
+Shared\ database\ connection=Gedeelde database connectie
+
+Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\ correct\ server\ name.=Kan geen verbinding maken met de Vim server. Controleer of Vim is uitgevoerd met de juiste servernaam.
+Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Kan geen verbinding maken met een lopend proces van gnuserv. Zorg ervoor dat Emacs of XEmacs wordt uitgevoerd, en dat de server is gestart (door het uitvoeren van de opdracht 'server-start' / 'gnuserv-start').
+Error\ pushing\ entries=Foutieve entry ingevoerd
+
+Undefined\ character\ format=Ongedefinieerde tekenopmaak
+Undefined\ paragraph\ format=Ongedefinieerde alineaopmaak
+
+Edit\ Preamble=Bewerk inleiding
+Markings=Markeringen
+Use\ selected\ instance=Gebruik geselecteerd exemplaar
+
+Hide\ panel=Verberg paneel
+Move\ panel\ up=Beweeg paneel opwaarts
+Move\ panel\ down=Beweeg paneel neerwaarts
+Linked\ files=Gekoppelde bestanden
+Group\ view\ mode\ set\ to\ intersection=Groepsweergavemodus ingesteld als kruispunt
+Group\ view\ mode\ set\ to\ union=Groepsweergavemodus ingesteld als eenheid
+Open\ %0\ URL\ (%1)=Open %0 URL (%1)
+Open\ URL\ (%0)=Open URL (%0)
+Open\ file\ %0=Open bestand %0
+Jump\ to\ entry=Ga naar invoer
+The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\ does\ not\ work\ as\ expected.=De naam van de groep bevat het sleutelwoord scheidingsteken "%0" en zal daardoor waarschijnlijk niet werken als verwacht.
 Abbreviate\ journal\ names\ (ISO)=Kort namen van tijdschriften af (ISO)
 Abbreviate\ journal\ names\ (MEDLINE)=Kort namen van tijdschriften af (MEDLINE)
+Blog=Blog
 Check\ integrity=Integriteitscontrole
+Copy\ DOI\ url=DOI url kopiëren
+Copy\ citation=Citatie kopiëren
+Development\ version=Onwikkelingsversie
 Export\ selected\ entries=Exporteer geseleteerde records
+Export\ selected\ entries\ to\ clipboard=Exporteer geselecteerde entries naar het klembord
+Find\ duplicates=Vind duplicaten
 Fork\ me\ on\ GitHub=Forken op GitHub
+JabRef\ resources=JabRef middelen
+Manage\ journal\ abbreviations=Beheer logboek afkortingen
+Manage\ protected\ terms=Beheer beschermde voorwaarden
+New\ %0\ library=Nieuwe %0 bibliotheek
+New\ entry\ from\ plain\ text=Nieuwe invoer van onopgemaakte tekst
+New\ sublibrary\ based\ on\ AUX\ file=Nieuwe sub-bibliotheek gebaseerd op AUX bestand
 Push\ entries\ to\ external\ application\ (%0)=Stuur entries naar externe applicatie
+Quit=Sluiten
+Recent\ libraries=Recente bibliotheken
+Set\ up\ general\ fields=Algemene velden instellen
+View\ change\ log=Verandering logboek weergeven
+View\ event\ log=Afspraken logboek weergeven
+Website=Website
 Write\ XMP-metadata\ to\ PDFs=Schrijf XMP metadata naar PDFs
 
+Override\ default\ font\ settings=Wijzig standaard lettertypeinstellingen
+
+
+
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index 7865901ea54..d0a4868e7e0 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<feltnavn>
 
-<select>=<velg>
-
 <select\ word>=<velg ord>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Forkort journalnavn for de valgte enhetene (ISO-forkortelse)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Forkort journalnavn for de valgte enhetene (MEDLINE-forkortelse)
@@ -34,11 +32,13 @@ Accept=Aksepter
 
 Accept\ change=Aksepter endring
 
-Action=Aksjon
 
+Action=Aksjon
 
 Add=Legg til
 
+Add\ new=Legg til ny
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Legg til en (kompilert) egendefinert Importer-klasse fra en classpath.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Stien trenger ikke å være på JabRefs classpath.
 
@@ -51,16 +51,12 @@ Add\ from\ folder=Legg til fra mappe
 
 Add\ from\ JAR=Legg til fra JAR-fil
 
-Add\ new=Legg til ny
-
 Add\ subgroup=Legg til undergruppe
 
 Add\ to\ group=Legg til i gruppe
 
 Added\ group\ "%0".=La til gruppe "%0".
 
-Added\ new=La til ny
-
 Added\ string=La til streng
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Dessuten, enheter hvis <b>%0</b>-felt ikke inneholder <b>%1</b> kan legges manuelt til denne gruppen ved å velge dem, og enten dra dem over eller bruke kontekstmenyen. Denne prosessen legger til uttrykket <b>%1</b> til hver av enhetenes <b>%0</b>-felt. Enheter kan fjernes manuelt fra denne gruppen ved å velge dem og deretter bruke kontekstmenyen. Denne prosessen fjerner uttrykket <b>%1</b> fra hver av enhetenes <b>%0</b>-felt.
@@ -69,10 +65,6 @@ Advanced=Avansert
 All\ entries=Alle enheter
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Alle enhetene av denne typen vil bli klassifisert som typeløse. Fortsette?
 
-All\ fields=Alle felter
-
-
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=En SAXException forekom ved lesing av '%0'\:
 
 and=og
 
@@ -162,6 +154,7 @@ Clear\ fields=Slett felter
 
 Close=Lukk
 
+
 Close\ dialog=Lukk dialog
 
 Close\ the\ current\ library=Lukk denne libraryn
@@ -213,6 +206,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Kunne ikke kjøre 'vim'-programmet
 
 Character\ encoding\ '%0'\ is\ not\ supported.=Tegnkodingen '%0' er ikke støttet.
 
+
 crossreferenced\ entries\ included=refererte enheter inkludert
 
 Current\ content=Nåværende innhold
@@ -247,8 +241,6 @@ Default\ encoding=Standard koding
 Default\ grouping\ field=Standardfelt for gruppering
 
 
-Default\ sort\ criteria=Standard sorteringskriteria
-
 Delete=Slett
 
 Delete\ custom\ format=Slett tilpasset type
@@ -268,8 +260,6 @@ Delete\ strings=Slett strenger
 Deleted=Slettet
 
 
-Delimit\ fields\ with\ semicolon,\ ex.=Avgrens felter med semikolon, f.eks.
-
 Descending=Synkende
 
 Description=Beskrivelse
@@ -324,7 +314,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Grupper enhete
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Grupper enheter dynamisk ved å søke etter nøkkelord i et felt
 
-Each\ line\ must\ be\ on\ the\ following\ form=Hver av linjene må være på den følgende formen
 
 Edit=Rediger
 
@@ -371,12 +360,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Enhetstyper
 
 Error=Feil
-Error\ exporting\ to\ clipboard=Feil ved eksport til utklippstavle
 
 Error\ occurred\ when\ parsing\ entry=En feil oppsto ved lesing av enhet
 
 Error\ opening\ file=Feil ved åpning av fil
 
+
 Error\ while\ writing=En feil oppsto ved skriving
 
 '%0'\ exists.\ Overwrite\ file?='%0' eksisterer. Erstatt filen?
@@ -406,8 +395,6 @@ External\ programs=Eksterne programmer
 
 External\ viewer\ called=Eksternt program kalt opp
 
-Fetch=Hent
-
 Field=Felt
 
 field=felt
@@ -415,8 +402,6 @@ field=felt
 Field\ name=Feltnavn
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Feltnavn kan ikke inneholde opperom eller de følgende tegnene
 
-Field\ to\ filter=Felt som skal filtreres
-
 Field\ to\ group\ by=Grupperingsfelt
 
 File=Fil
@@ -431,13 +416,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Filkatalogen er ikke satt
 
 File\ exists=Filen eksisterer
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=Filen har blitt endret eksternt. Hva vil du gjøre?
-
 File\ not\ found=Fant ikke filen
 File\ type=Filtype
-
-File\ updated\ externally=Filen har blitt endret eksternt
-
 filename=filnavn
 
 Files\ opened=Filer åpnet
@@ -456,6 +436,7 @@ Fit\ table\ horizontally\ on\ screen=Tilpass tabellbredden horisontalt
 Float=Flyt
 
 
+
 Format\ of\ author\ and\ editor\ names=Formatering av forfatter- og redaktørnavn
 Format\ string=Formatstreng
 
@@ -466,9 +447,9 @@ found\ in\ AUX\ file=funnet i AUX-fil
 
 Full\ name=Fullt navn
 
+
 General=Generelt
 
-General\ fields=Generelle felter
 
 Generate=Generer
 
@@ -546,14 +527,12 @@ Importing=Importerer
 
 Importing\ in\ unknown\ format=Importerer ukjent format
 
-Include\ abstracts=Inkluder sammendrag
-Include\ entries=Inkluder enheter
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Inkluder undergrupper\: Vis enheter inneholdt i denne gruppen eller en undergruppe
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Uavhengig gruppe\: Vis bare denne gruppens enheter
 
 
+
 Insert=Legg til
 
 Insert\ rows=Legg til rader
@@ -601,10 +580,6 @@ Leave\ file\ in\ its\ current\ directory=La filen ligge i katalogen den ligger i
 
 Left=Venstre
 
-Limit\ to\ fields=Begrens til følgende felter
-
-Limit\ to\ selected\ entries=Begrens til valgte enheter
-
 Link\ local\ file=Link til lokal fil
 Link\ to\ file\ %0=Link til filen %0
 
@@ -626,8 +601,6 @@ Mark\ new\ entries\ with\ owner\ name=Merk nye enheter med navn på eier
 
 Memory\ stick\ mode=Minnepinne-modus
 
-Menu\ and\ label\ font\ size=Størrelse av menyfonter
-
 Merged\ external\ changes=Inkorporerte eksterne endringer
 
 Messages=Meldinger
@@ -652,6 +625,8 @@ Move\ up=Flytt opp
 
 Moved\ group\ "%0".=Flyttet gruppen "%0".
 
+
+
 Name=Navn
 Name\ formatter=Navneformaterer
 
@@ -669,8 +644,6 @@ New\ content=Nytt innhold
 
 New\ library\ created.=Opprettet ny library.
 
-New\ field\ value=Ny verdi
-
 New\ group=Ny gruppe
 
 New\ string=Ny streng
@@ -685,9 +658,6 @@ no\ library\ generated=ingen library generert
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Ingen enheter funnet. Kontroller at du bruker riktig importfilter.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Fant ingen enheter for søketeksten '%0'
-
 No\ entries\ imported.=Ingen enheter importert.
 
 No\ files\ found.=Ingen filer funnet.
@@ -708,8 +678,6 @@ Nothing\ to\ redo=Ingenting å gjenta
 
 Nothing\ to\ undo=Ingenting å angre
 
-occurrences=treff
-
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=En eller flere nøkler vil bli skrevet over. Fortsett?
 
@@ -748,13 +716,10 @@ Override=Skriv over
 
 Override\ default\ file\ directories=Overstyr hovekataloger for filer
 
-Override\ default\ font\ settings=Overstyr standardfonter
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=Overskriv BibTeX-nøkkelen med den valgte teksten
 
 
 Overwrite=Skriv over
-Overwrite\ existing\ field\ values=Skriv over eksisterende verdier
 
 Overwrite\ keys=Skriv over nøkler
 
@@ -789,6 +754,7 @@ Please\ enter\ the\ string's\ label=Skriv inn et navn for strengen
 
 Please\ select\ an\ importer.=Velg et importfilter.
 
+
 Possible\ duplicate\ entries=Mulige duplikater
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Mulig duplikat av eksisterende enhet. Klikk for å håndtere.
@@ -815,8 +781,6 @@ Redo=Gjenta
 
 Reference\ library=Referanselibrary
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Referanser funnet\: %0. Antall referanser som skal hentes?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Undergruppe\: Vis enheter innehold både i denne gruppen og gruppen over
 
 regular\ expression=Regulæruttrykk
@@ -871,10 +835,6 @@ Replace\ (regular\ expression)=Erstatt (regulæruttrykk)
 
 Replace\ string=Erstatt streng
 
-Replace\ with=Erstatt med
-
-
-Replaced=Erstattet
 
 Required\ fields=Nødvendige felter
 
@@ -884,6 +844,8 @@ Resolve\ strings\ for\ all\ fields\ except=Slå opp strenger for alle felter unn
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Slå opp strenger kun for standard BibTeX-felter
 
 resolved=tatt hånd om
+
+
 Review=Kommentarer
 Review\ changes=Se over endringer
 
@@ -901,10 +863,6 @@ Save\ library\ as...=Lagre library som ...
 
 Save\ entries\ in\ their\ original\ order=Lagre enheter i opprinnelig rekkefølge
 
-Save\ failed=Lagring mislyktes
-
-Save\ failed\ during\ backup\ creation=Lagring mislyktes ved opprettelse av sikkerhetskopi
-
 Saved\ library=Lagret library
 
 Saved\ selected\ to\ '%0'.=Lagret valgte i '%0'.
@@ -918,8 +876,6 @@ Search=Søk
 
 Search\ expression=Søkeuttrykk
 
-Search\ for=Søk etter
-
 Searching\ for\ duplicates...=Søker etter duplikater...
 
 Searching\ for\ files=Søker etter filer
@@ -928,19 +884,16 @@ Secondary\ sort\ criterion=Andre sorteringskriterium
 
 Select\ all=Velg alle
 
-Select\ encoding=Velg koding
-
 Select\ entry\ type=Velg enhetstype
-Select\ external\ application=Velg ekstern applikasjon
 
 Select\ file\ from\ ZIP-archive=Velg fil fra ZIP-fil
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Velg trenodene for å inspisere og akseptere eller avslå endringer
-Selected\ entries=Valgte enheter
+
 Set\ field=Sett felt
 Set\ fields=Sett felter
 
-Set\ general\ fields=Tilpass generelle felter
+
 Set\ main\ external\ file\ directory=Sett hovedkatalog for eksterne linker
 
 Settings=Innstillinger
@@ -992,8 +945,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Grupper enheter statisk ved m
 
 Stop=Stopp
 
-Strings=Strenger
-
 Strings\ for\ library=Strenger for library
 
 Sublibrary\ from\ AUX=Dellibrary fra AUX-fil
@@ -1053,8 +1004,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Denne operasjonen krever at en eller flere enheter er valgt.
 
+
 Toggle\ entry\ preview=Vis/skjul forhåndsvisning
 Toggle\ groups\ interface=Vis/skjul grupperingskontroll
+
+
+
 Try\ different\ encoding=Prøv en annen tegnkoding
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Ekspander journalnavn for de valgte enhetene
@@ -1098,8 +1053,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=kontroller at
 View=Vis
 Vim\ server\ name=Navn på Vim-server
 
-Waiting\ for\ ArXiv...=Venter på ArXiv
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Advar om duplikater som ikke er blitt håndtert når inspeksjonsvinduet lukkes
 
 Warn\ before\ overwriting\ existing\ keys=Gi advarsel før eksisterende nøkler skrives over
@@ -1130,7 +1083,6 @@ XMP\ export\ privacy\ settings=Innstillinger for XMP-eksport
 XMP-metadata\ found\ in\ PDF\:\ %0=XMP-metadata funnet i PDF\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Du må starte JabRef på nytt for at dette skal tre i kraft.
 You\ have\ changed\ the\ language\ setting.=Du har valgt et nytt språk.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Ugyldig søkeuttrykk '%0'.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Du må starte JabRef på nytt for at de nye hurtigtastene skal fungere.
 
@@ -1139,25 +1091,19 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Dine nye hurtigtaster har blitt la
 The\ following\ fetchers\ are\ available\:=De følgende nedlasterne er tilgjengelige\:
 Could\ not\ find\ fetcher\ '%0'=Kunne ikke finne nedlasteren '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Utfører søk '%0' med nedlaster '%1'.
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=Søket '%0' med nedlaster '%1' ga ingen resultater.
 
 Move\ file=Flytt fil
 Rename\ file=endre navn på fil
 
+
 Move\ file\ failed=Flytting av fil mislyktes
 Could\ not\ move\ file\ '%0'.=Kunne ikke flytte filen '%0'.
 Could\ not\ find\ file\ '%0'.=Kunne ikke finne filen '%0'.
 Number\ of\ entries\ successfully\ imported=Antall enheter importert
 Import\ canceled\ by\ user=Import avbrutt av bruker
-Progress\:\ %0\ of\ %1=Framdrift\: %0 av %1
 Error\ while\ fetching\ from\ %0=Feil ved henting fra %0
 
-Please\ enter\ a\ valid\ number=Vennligst skriv inn et gyldig tall
 Show\ search\ results\ in\ a\ window=Vis søkeresultatene i et vundu
-Move\ file\ to\ file\ directory?=Flytt filen til hovedkatalogen for filer?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=Libraryn er beskyttet. Kan ikke lagre før eksterne endringer har blitt gjennomgått.
-Protected\ library=Beskyttet library
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Nekt å lagre libraryn før eksterne endringer har blitt gjennomgått.
 Library\ protection=Librarybeskyttelse
 Unable\ to\ save\ library=Kan ikke lagre libraryn
@@ -1168,7 +1114,6 @@ MIME\ type=MIME-type
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Denne funksjonen lar deg åpne eller importere nye filer til en allerede kjørende instans av JabRef<br>fra nettleseren din.<br>Merk at dette vil hindre deg i å kjøre mer enn en instans av JabRef av gangen.
 
-The\ ACM\ Digital\ Library=ACM Digital Library
 Reset=Resett
 
 Use\ IEEE\ LaTeX\ abbreviations=Bruk IEEE-LaTeX-forkortelser
@@ -1176,7 +1121,6 @@ Use\ IEEE\ LaTeX\ abbreviations=Bruk IEEE-LaTeX-forkortelser
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Ved åpning av linke, s¸k etter matchende fil hvis ingen er definert
 Settings\ for\ %0=Innstillinger for %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Sorter de følgende feltene som tall
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Linje %0\: Fant ugyldig BibTeX-n¸kkel.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Linje %0\: Fant ugyldig BibTeX-n¸kkel (inneholder mellomrom).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Linje %0\: Fant ugyldig BibTeX-n¸kkel (manglende komma).
@@ -1185,7 +1129,6 @@ Rename\ field=Endre navn på felt
 Set/clear/append/rename\ fields=Sett/slett/endre navn på felter
 Rename\ field\ to=Endre navn på felt til
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Flytt innholdet i et felt til et annet felt
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Du kan bare endre navn på ett felt av gangen
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Kan ikke bruke port %0 for fjernstyring; den kan være i bruk av et annet program. Pr¸v å spesifisere en annen port.
 
@@ -1201,9 +1144,6 @@ Formatter\ not\ found\:\ %0=Fant ikke formaterer\: %0
 Clear\ inputarea=T¸m inputfelt
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Kunne ikke lagre, filen er låst av en annen instans av JabRef.
-File\ is\ locked\ by\ another\ JabRef\ instance.=Filen er låst av en annen instans av JabRef.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Vil du overstyre fillåsen?
-File\ locked=Filen er låst
 Current\ tmp\ value=Nåværende tmp-verdi
 Metadata\ change=Endring av metadata
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Endringer er gjort for de f¸lgende metadata-elementene
@@ -1212,7 +1152,6 @@ Generate\ groups\ for\ author\ last\ names=Generer grupper for etternavn fra aut
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Generer grupper fra n¸kkelord i et BibTeX-felt
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Forby tegn i BibTeX-n¸kler som ikke aksepteres av BibTeX
 
-Save\ without\ backup?=Lagre uten backup?
 Unable\ to\ create\ backup=Kan ikke lagre backup?
 Move\ file\ to\ file\ directory=Flytt fil til filkatalog
 Rename\ file\ to=Endre navn på fil til
@@ -1250,14 +1189,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Velg kilde for import av metadat
 Create\ entry\ based\ on\ XMP-metadata=Lag enhet basert på XMP-data
 Create\ blank\ entry\ linking\ the\ PDF=Lag blank enhet med lenke til PDF
 Only\ attach\ PDF=Bare lenk til PDF
-Title=Tittel
 Create\ new\ entry=Lag ny enhet
 Update\ existing\ entry=Oppdater eksisterende enhet
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autokompletter navn i 'Fornavn Etternavn'-format
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autokompletter navn i 'Etternavn, Fornavn'-format
 Autocomplete\ names\ in\ both\ formats=Autokompletter navn i begge format
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=Navnet 'comment' kan ikke brukes som navn på en enhetstype
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Du må skrive inn en heltallverdi i tekstfeltet for
 Send\ as\ email=Send som e-post
 References=Referanser
 Sending\ of\ emails=Sending av e-post
@@ -1393,7 +1330,6 @@ Unabbreviate\ journal\ names=Ekspander journalnavn
 
 
 
-%0\ import\ canceled=%0-import kansellert
 
 
 
@@ -1469,3 +1405,7 @@ View\ change\ log=Vis endringslogg
 Website=Nettsted
 Write\ XMP-metadata\ to\ PDFs=Skriv XMP-metadata til PDF-filer
 
+Override\ default\ font\ settings=Overstyr standardfonter
+
+
+
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index 0ec55dd71ac..b683d07c9da 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<nome do campo>
 
-<select>=<selecionar>
-
 <select\ word>=<selecionar palavra>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Abreviar nomes de periódicos das referências selecionadas (abreviação ISO)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Abreviar nomes de periódicos das referências selecionadas (abreviação MEDLINE)
@@ -34,11 +32,13 @@ Accept=Aceitar
 
 Accept\ change=Aceitar modificação
 
-Action=Ação
 
+Action=Ação
 
 Add=Adicionar
 
+Add\ new=Adicionar novo
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Adicionar uma classe Importer customizada (compilada) a partir de um classpath.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=O caminho não precisa estar no classpath do JabRef.
 
@@ -51,16 +51,12 @@ Add\ from\ folder=Adicionar a partir de uma pasta
 
 Add\ from\ JAR=Adicionar a partir de um JAR
 
-Add\ new=Adicionar novo
-
 Add\ subgroup=Adicionar subgrupo
 
 Add\ to\ group=Adicionar ao grupo
 
 Added\ group\ "%0".=O grupo "%0" foi adicionado.
 
-Added\ new=Adicionado novo
-
 Added\ string=Adicionada string
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Adicionalmente, as referências cujo campo <b>%0</b>não contem <b>%1</b> podem ser atribuídos a este grupo manualmente, selecionandos-as e depois arrastando e soltando no menu de contexto. Este processo inclui o termo <b>%1</b> para cada referência <b>%0</b>. Referências podem ser removidas manualmente deste grupo selecionando-as utilizando o menu de contexto. O processo remove o termo <b>%1</b> de cada referência <b>%0</b>.
@@ -69,10 +65,6 @@ Advanced=Avançado
 All\ entries=Todas as referências
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Todas as referências serão consideradas sem tipo. Continuar?
 
-All\ fields=Todos os campos
-
-
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=Uma exceção ocorreu durante a análise de '%0'
 
 and=e
 
@@ -163,6 +155,7 @@ Clear\ fields=Limpar campos
 
 Close=Fechar
 
+
 Close\ dialog=Fechar janela de diálogo
 
 Close\ the\ current\ library=Fechar a base de dados atual
@@ -215,6 +208,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Não foi possível executar o programa 'vi
 Could\ not\ save\ file.=Não foi possível salvar o arquivo.
 Character\ encoding\ '%0'\ is\ not\ supported.=A codificação de caracteres '%0' não é suportada.
 
+
 crossreferenced\ entries\ included=Registros com referências cruzadas incluídos
 
 Current\ content=Conteúdo atual
@@ -250,8 +244,6 @@ Default\ grouping\ field=Agrupamento de campo padrão
 
 Default\ pattern=Ppadrão predefinido
 
-Default\ sort\ criteria=Critério de ordenação padrão
-
 Delete=Remover
 
 Delete\ custom\ format=Remover formato personalizado
@@ -272,8 +264,6 @@ Deleted=Removido
 
 Permanently\ delete\ local\ file=Remover arquivo local
 
-Delimit\ fields\ with\ semicolon,\ ex.=Delimitar campos com ponto e vírgula, ex.
-
 Descending=Descendente
 
 Description=Descrição
@@ -328,7 +318,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Agrupar refer
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Agrupar referências dinamicamente selecionando um campo ou palavra-chave
 
-Each\ line\ must\ be\ on\ the\ following\ form=Cada linha deve posuir o seguinte formato
 
 Edit=Editar
 
@@ -375,12 +364,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Tipos de referência
 
 Error=Erro
-Error\ exporting\ to\ clipboard=Erro ao exportar para a área de transferência
 
 Error\ occurred\ when\ parsing\ entry=Ocorreu um erro ao analisar a referência
 
 Error\ opening\ file=Erro ao abrir o arquivo
 
+
 Error\ while\ writing=Erro durante a escrita
 
 '%0'\ exists.\ Overwrite\ file?='%0' existe. Sobrescrever o arquivo?
@@ -410,8 +399,6 @@ External\ programs=Programas externos
 
 External\ viewer\ called=Visualizador externo chamado
 
-Fetch=Recuperar
-
 Field=Campo
 
 field=campo
@@ -419,8 +406,6 @@ field=campo
 Field\ name=Nome do campo
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=O nome dos campos não devem possuir espaços em branco ou os seguintes caracteres
 
-Field\ to\ filter=Campos a serem filtrados
-
 Field\ to\ group\ by=Campos como critério de agrupamento
 
 File=Arquivo
@@ -435,13 +420,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=O diretório do arquivo n
 
 File\ exists=O arquivo existe
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=O arquivo foi atualizado externamente. O que você deseja fazer?
-
 File\ not\ found=Arquivo não encontrado
 File\ type=Tipo de arquivo
-
-File\ updated\ externally=Arquivo atualizado externamente
-
 filename=nome do arquivo
 
 Files\ opened=Arquivos abertos
@@ -462,6 +442,7 @@ Float=Manter no topo
 
 for=para
 
+
 Format\ of\ author\ and\ editor\ names=Formato dos nomes do autor e editor
 Format\ string=Formato de string
 
@@ -472,9 +453,9 @@ found\ in\ AUX\ file=encontrado em arquivo AUX
 
 Full\ name=Nome completo
 
+
 General=Geral
 
-General\ fields=Campos gerais
 
 Generate=Gerar
 
@@ -552,15 +533,13 @@ Importing=Importando
 
 Importing\ in\ unknown\ format=Importando em formato desconhecido
 
-Include\ abstracts=Incluir resumos
-Include\ entries=Incluir referências
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Incluir subgrupos\: Quando selecionado, visualizar referências contidas neste grupo ou em seus subgrupos
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Grupo independente\: Quando selecionado, mostra apenas as referências deste grupo
 
 Work\ options=Atribuição do campo
 
+
 Insert=Inserir
 
 Insert\ rows=Inseir linhas
@@ -607,10 +586,6 @@ Leave\ file\ in\ its\ current\ directory=Manter arquivos em seu diretório atual
 
 Left=Esquerdo(a)
 
-Limit\ to\ fields=Limitar aos campos
-
-Limit\ to\ selected\ entries=Limitar às referência selecionadas
-
 Link=Linkar
 Link\ local\ file=Link arquivo local
 Link\ to\ file\ %0=Link para o arquivo %0
@@ -633,8 +608,6 @@ Mark\ new\ entries\ with\ owner\ name=Marcar novas referências com o nome do us
 
 Memory\ stick\ mode=Modo cartão de memória
 
-Menu\ and\ label\ font\ size=Tamanho da fonte do menu e dos rótulo
-
 Merged\ external\ changes=Mudanças externas mescladas
 
 Messages=Mensagens
@@ -659,6 +632,8 @@ Move\ up=Mover para cima
 
 Moved\ group\ "%0".=Grupo "%0" movido
 
+
+
 Name=Nome
 Name\ formatter=Formatador de nomes
 
@@ -676,8 +651,6 @@ New\ content=Novo conteúdo
 
 New\ library\ created.=Nova base de dados criada
 
-New\ field\ value=Novo valor de campo
-
 New\ group=Novo grupo
 
 New\ string=Nova string
@@ -692,9 +665,6 @@ no\ library\ generated=Nenhuma base de dados gerada
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Nenhuma referência encontrada. Por favor, certifique-se que você está utilizando o filtro de importação correto.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Nenhuma referência encontrada para a string pesquisada '%0'
-
 No\ entries\ imported.=Nenhuma referência importada.
 
 No\ files\ found.=Nenhum arquivo encontrado.
@@ -715,8 +685,6 @@ Nothing\ to\ redo=Nada para refazer
 
 Nothing\ to\ undo=Nada para desfazer
 
-occurrences=ocorrências
-
 OK=Ok
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Uma ou mais chaves serão sobrescritas. Continuar?
@@ -755,13 +723,10 @@ Override=Substituir
 
 Override\ default\ file\ directories=Substituir os diretórios de arquivo padrão
 
-Override\ default\ font\ settings=Substituir configurações de fonte padrão
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=Substituir a chave BibTeX pelo texto selecionado
 
 
 Overwrite=Sobrescrever
-Overwrite\ existing\ field\ values=Sobrescrever valores de campo existentes
 
 Overwrite\ keys=Sobrescrever chaves
 
@@ -796,6 +761,7 @@ Please\ enter\ the\ string's\ label=Por favor, digite o rótulo da string
 
 Please\ select\ an\ importer.=Por favor, selecione um importador.
 
+
 Possible\ duplicate\ entries=Possíveis referências duplicadas
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Possível duplicata de referência existente. Clique para resolver.
@@ -822,8 +788,6 @@ Redo=Refazer
 
 Reference\ library=Base de dados de referência
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Referências encontradas\: %0. Números de referências para recuperar?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Refinar supergrupo\: Quando selecionado, visualiza referências contidas em ambos os grupos e seu supergrupo.
 
 regular\ expression=Expressão regular
@@ -879,10 +843,6 @@ Replace\ (regular\ expression)=Substituir (expressão regular)
 
 Replace\ string=Substituir string
 
-Replace\ with=Substituir por
-
-
-Replaced=Substituído
 
 Required\ fields=Campos obrigatórios
 
@@ -892,6 +852,8 @@ Resolve\ strings\ for\ all\ fields\ except=Resolver strings para todos os campos
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Resolver strings apenas para campos BibTeX padrões
 
 resolved=resolvido
+
+
 Review=Revisar
 Review\ changes=Revisar mudanças
 
@@ -909,10 +871,6 @@ Save\ library\ as...=Salvar base de dados como...
 
 Save\ entries\ in\ their\ original\ order=Referências salvas em sua ordem original
 
-Save\ failed=Falha ao salvar
-
-Save\ failed\ during\ backup\ creation=Falha ao salvar durante a criação do backup
-
 Saved\ library=Base de dados salva
 
 Saved\ selected\ to\ '%0'.=Seleção salva para '%0'.
@@ -926,8 +884,6 @@ Search=Pesquisar
 
 Search\ expression=Pesquisar expressão
 
-Search\ for=Pesquisar por
-
 Searching\ for\ duplicates...=Procurando por duplicatas...
 
 Searching\ for\ files=Procurando por arquivos...
@@ -936,19 +892,16 @@ Secondary\ sort\ criterion=Critério de ordenação secundário
 
 Select\ all=Selecionar tudo
 
-Select\ encoding=Selecionar codificação
-
 Select\ entry\ type=Selecionar tipo de referência
-Select\ external\ application=Selecionar aplicação externa
 
 Select\ file\ from\ ZIP-archive=Selecionar arquivo a partir de um arquivo ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Selecione os nós da árvore para visualizar e aceitar ou rejeitar mudanças
-Selected\ entries=Referências selecionadas
+
 Set\ field=Configurar campo
 Set\ fields=Configurar campos
 
-Set\ general\ fields=Definir campos gerais
+
 Set\ main\ external\ file\ directory=Definir diretório principal de arquivo externo
 
 Settings=Configurações
@@ -1000,7 +953,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Agrupar referências manualme
 
 Stop=Parar
 
-
 Strings\ for\ library=Strings para a base de dados
 
 Sublibrary\ from\ AUX=Sub-base de dados a partir do LaTeX AUX
@@ -1061,8 +1013,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Esta operação exige que uma ou mais referências sejam selecionadas
 
+
 Toggle\ entry\ preview=Habilitar/Desabilitar previsualização da referência
 Toggle\ groups\ interface=Habilitar/Desabilitar interface de grupos
+
+
+
 Try\ different\ encoding=Tente uma codificação diferente
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Reverter abreviações dos nomes de periódicos das referências selecionadas
@@ -1107,8 +1063,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=verifique que
 View=Visualizar
 Vim\ server\ name=Nome do servidor Vim
 
-Waiting\ for\ ArXiv...=Aguardando por ArXiv...
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Alertar sobre duplicatas não resolvidas ao fechar a janela de inspeção
 
 Warn\ before\ overwriting\ existing\ keys=Alertar ao sobrescrever chaves existentes
@@ -1140,7 +1094,6 @@ XMP-metadata=Metaddos XMP
 XMP-metadata\ found\ in\ PDF\:\ %0=Metadados XMP encontrados no PDF\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Você deve reiniciar o JabRef para a alteração tenha efeito.
 You\ have\ changed\ the\ language\ setting.=Você configurou a configuração de idioma.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Você digitou um termo de busca inválido '%0'.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=O JabRef precisa ser reiniciado para que as novas atribuições de chave funcionem corretamente.
 
@@ -1149,25 +1102,19 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Suas novas atribuições de chave
 The\ following\ fetchers\ are\ available\:=As seguintes ferramentas de pesquisa estão disponíveis\:
 Could\ not\ find\ fetcher\ '%0'=Não foi possível encontrar a ferramenta de pesquisa '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Executando consulta '%0' com ferramenta de pesquisa '%1'.
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=Consulta '%0' com ferramenta de pesquisa '%1' não retornou resultados.
 
 Move\ file=Mover arquivo
 Rename\ file=Renomear arquivo
 
+
 Move\ file\ failed=Movimentação do arquivo falhou
 Could\ not\ move\ file\ '%0'.=Não foi possível mover o arquivo '%0'.
 Could\ not\ find\ file\ '%0'.=Não foi possível encontrar o arquivo '%0'.
 Number\ of\ entries\ successfully\ imported=Número de referências importadas com sucesso
 Import\ canceled\ by\ user=Importação cancelada pelo usuário
-Progress\:\ %0\ of\ %1=Progresso\: %0 de %1
 Error\ while\ fetching\ from\ %0=Erro ao recuperar do %0
 
-Please\ enter\ a\ valid\ number=Por favor, digite um número válido
 Show\ search\ results\ in\ a\ window=Exibir resultados de busca em uma janela
-Move\ file\ to\ file\ directory?=Mover arquivo para o diretório de arquivos?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=A base de dados está protegida. Não é possível salvar antes que mudanças externas sejam revisadas.
-Protected\ library=Base de dados protegida
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Recusa em salvar a base de dados antes de mudanças externas serem revisadas.
 Library\ protection=Proteção da base de dados
 Unable\ to\ save\ library=Não foi possível salvar a base de dados
@@ -1178,16 +1125,13 @@ Unable\ to\ open\ link.=Não foi possível abrir link.
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Esta funcionalidade permite que novos arquivos sejam abertos ou importados para uma instância do JabRef já aberta<br> ao invés de abrir uma nova instância. Por exemplo, isto é útil quando você abre um arquivo no JabRef<br> a partir de ser navegador web.<BR> Note que isto irá previnir que você execute uma ou mais instâncias do JabRef ao mesmo tempo.
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Executar Pesquisar , e.g., "--fetch\=Medline\:cancer"
 
-The\ ACM\ Digital\ Library=A Biblioteca Digital ACM
 Reset=Redefinir
 
 Use\ IEEE\ LaTeX\ abbreviations=Utilizar abreviações LaTeX IEEE
-The\ Guide\ to\ Computing\ Literature=O Guia da Literatura em Computação
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Ao abrir o link do arquivo, procurar por arquivo correspondente se nenhum link está definido
 Settings\ for\ %0=Configurações para %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Ordenar os seguintes campos como campos numéricos
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Linha %0\: Chave BibTeX corrompida encontrada.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Linha %0\: Chave BibTeX corrompida encontrada (contém espaços em branco).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Linha %0\: Chave BibTeX corrompida encontrada (vírgula faltando).
@@ -1196,7 +1140,6 @@ Rename\ field=Renomear campo
 Set/clear/append/rename\ fields=Definir/Limpar/Renomear campos
 Rename\ field\ to=Renomear campo para
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Mover conteúdo de um campo para um campo com nome diferente
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Você pode renomear apenas um campo por vez
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Não é possível utilizar a porta %0 para operação remota; outra aplicação pode estar usando-a. Tente utilizar uma outra porta.
 
@@ -1216,9 +1159,6 @@ Formatter\ not\ found\:\ %0=Formatador não encontrado\: %0
 Clear\ inputarea=Limpar área de entrada
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Não foi possível salvar, o arquivo está bloqueado por outra instância JabRef.
-File\ is\ locked\ by\ another\ JabRef\ instance.=O arquivo está bloqueado por outra instância JabRef.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Deseja substituir o bloqueio do arquivo?
-File\ locked=Arquivo bloqueado
 Current\ tmp\ value=Valor tmp atual
 Metadata\ change=Mudança de metadados
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Mudanças foram realizadas nos seguintes elementos de metadados
@@ -1227,7 +1167,6 @@ Generate\ groups\ for\ author\ last\ names=Gerar grupos a partir dos últimos no
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Gerar grupos a partir de palavras chaves em um campo BibTeX
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Forçar caracteres permitidos em chaves BibTeX
 
-Save\ without\ backup?=Salvar sem backup?
 Unable\ to\ create\ backup=Não foi possível criar o backup
 Move\ file\ to\ file\ directory=Mover arquivo para diretório de arquivo
 Rename\ file\ to=Renomear arquivo para
@@ -1266,14 +1205,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Escolher a fonte para a importa
 Create\ entry\ based\ on\ XMP-metadata=Criar referência baseada em dados XMP
 Create\ blank\ entry\ linking\ the\ PDF=Criar referência em branco linkando o PDF
 Only\ attach\ PDF=Anexar apenas PDF
-Title=Título
 Create\ new\ entry=Criar nova referência
 Update\ existing\ entry=Atualizar referência existente
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autocompletar nome em um formato 'Nome, Sobrenome' apenas
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autocompletar nomes em um formato 'Sobrenome, Nome' apenas
 Autocomplete\ names\ in\ both\ formats=Autocompletar nomes em ambos os formatos
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=O nome 'comment' não pode ser utilizado como um nome de tipo de referência.
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Você deve digitar um valor inteiro no campo de texto para
 Send\ as\ email=Enviar como email
 References=Referências
 Sending\ of\ emails=Envio de emails
@@ -1394,7 +1331,6 @@ Opens\ the\ file\ browser.=Abrir o gerenciador de arquivos
 Scan\ directory=Varrer diretório
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Buscar arquivos não referenciados no diretório selecionado
 Starts\ the\ import\ of\ BibTeX\ entries.=Iniciar a importação de entradas BibTeX
-Leave\ this\ dialog.=Deixar esse diálogo.
 Create\ directory\ based\ keywords=Criar diretórios baseados em palavras-chave
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Criar palavras-chave nas referências criadas com caminhos de diretórios
 Select\ a\ directory\ where\ the\ search\ shall\ start.=Selecione um diretório em que a busca deve começar
@@ -1402,11 +1338,9 @@ Select\ file\ type\:=Selecione o arquivo
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=Esses arquivos não são referenciados na base de dados ativa
 Entry\ type\ to\ be\ created\:=Tipo de referência a ser criada
 Searching\ file\ system...=Buscando sistema de arquivo...
-Importing\ into\ Library...=Importando na base de dados
 Select\ directory=Selecionar diretório
 Select\ files=Selecionar arquivos
 BibTeX\ entry\ creation=Criação de referência BibTeX
-<No\ selection>=<Sem seleção>
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=Não foi possível conectar ao serviço FreeCite
 Parse\ with\ FreeCite=Interpretar com FreeCite
 How\ would\ you\ like\ to\ link\ to\ '%0'?=Como deseja ligar ao '%0'?
@@ -1448,7 +1382,6 @@ Toggle\ print\ status=Status de leitura alternado
 Update\ keywords=Atualizar palavras-chave
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Escrever valores dos campos especiais como campos separados do BibTeX
 You\ have\ changed\ settings\ for\ special\ fields.=Você alterou as configurações de campos especiais
-%0\ entries\ found.\ To\ reduce\ server\ load,\ only\ %1\ will\ be\ downloaded.=%0 entradas encontradas. Para reduzir a carga do servidor, apenas %1 serão baixados.
 A\ string\ with\ that\ label\ already\ exists=Uma string com esse label já existe
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Conexão com o OpenOffice/LibreOffice foi perdida. Por favor certifique-se de que o OpenOffice/LibreOffice está rodando, e tente reconectar
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Corrija a referência, e abra o editor novamente para mostrar/editar o fonte
@@ -1468,8 +1401,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Seu arquivo de estilo especifica o formato de parágrafo '%0', que não está definido no seu documento OpenOffice/LibreOffice atual
 
 Searching...=Buscando...
-You\ have\ selected\ more\ than\ %0\ entries\ for\ download.\ Some\ web\ sites\ might\ block\ you\ if\ you\ make\ too\ many\ rapid\ downloads.\ Do\ you\ want\ to\ continue?=Você selecionou mais de %0 entradas para download. Alguns sites podem bloquear seu acesso se você fizer muitos downloads num período curto de tempo. Deseja continuar mesmo assim?
-Confirm\ selection=Confirmar seleção
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Adicione {} às palavras do título na busca para manter maiúsculas minúsculas
 Import\ conversions=Importar conversões
 Please\ enter\ a\ search\ string=Favor digitar uma string de busca
@@ -1480,7 +1411,6 @@ Canceled\ merging\ entries=União das referências cancelada
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Formatar unidades adicionando separadores sem quebras e manter maiúsculas e minúsculas na busca
 Merge\ entries=Unir entradas
 Merged\ entries=Mesclou referências em uma nova e manteve a antiga
-Merged\ entry=Referência mesclada
 Parse=Interpretar
 Result=Resultado
 Show\ DOI\ first=Mostrar DOI antes
@@ -1555,9 +1485,7 @@ Add\ new\ file\ type=Adicionar novo tipo de arquivo
 
 Left\ entry=Referência da esquerda
 Right\ entry=Referência da direita
-Use=Usar
 Original\ entry=Referência original
-Replace\ original\ entry=Substituir referência original
 No\ information\ added=Nenhuma informação foi adicionada
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Selecione pelo menos uma entrada para gerenciar as chaves.
 OpenDocument\ text=Texto OpenDocument
@@ -1576,7 +1504,6 @@ Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Por favor mova o arquiv
 Could\ not\ connect\ to\ %0=Não foi possível conectar a %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Alerta\: %0 de %1 referências não tem título definido.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Alerta\: %0 de %1 referências não tem chave definida.
-occurrence=ocorrência
 Added\ new\ '%0'\ entry.=%0 novas referências adicionadas
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Múltiplas referências selecionadas. Deseja alterar o tipo de todas?
 Changed\ type\ to\ '%0'\ for=Tipo modificado para '%0' para
@@ -1596,8 +1523,6 @@ Print\ entry\ preview=Imprimir preview da referência
 Copy\ title=Copiar título
 Copy\ \\cite{BibTeX\ key}=Copiar como \\cite{chave BibTeX}
 Copy\ BibTeX\ key\ and\ title=Copiar chave BibTeX e título
-File\ rename\ failed\ for\ %0\ entries.=Renomeação de arquivo falho para %0 referências
-Merged\ BibTeX\ source\ code=Código BibTex combinado
 Invalid\ DOI\:\ '%0'.=DOI inválida\: '%0'.
 should\ start\ with\ a\ name=deve iniciar com um nome
 should\ end\ with\ a\ name=deve terminar com um nome
@@ -1641,7 +1566,6 @@ abbreviation\ detected=abreviação detectada
 Abbreviate\ journal\ names=Abreviar nomes de periódicos
 Abbreviating...=Abreviando...
 
-Adding\ fetched\ entries=Adicionando referências recuperadas
 Unabbreviate\ journal\ names=Reverter abreviações de nomes de periódicos
 Unabbreviating...=Revertendo abreviação
 Usage=Utilização
@@ -1651,8 +1575,6 @@ Are\ you\ sure\ you\ want\ to\ reset\ all\ settings\ to\ default\ values?=Você
 Reset\ preferences=Redefinir preferências
 
 
-Clipboard=Área de transferência
-%0\ import\ canceled=Importação a partir do %0 cancelada
 
 
 
@@ -1734,3 +1656,7 @@ Push\ entries\ to\ external\ application\ (%0)=Enviar referências para um aplic
 View\ change\ log=Ver changelog
 Write\ XMP-metadata\ to\ PDFs=Escrever metadados XMP para PDFs
 
+Override\ default\ font\ settings=Substituir configurações de fonte padrão
+
+
+
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index bed7acaad7f..2e9c0184b7e 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<имя поля>
 
-<select>=<выбрать>
-
 <select\ word>=<выбрать слово>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Сокращения названий журналов для выбранных записей (аббр. ISO)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Сокращения названий журналов для выбранных записей (аббр. MEDLINE)
@@ -34,11 +32,13 @@ Accept=Принять
 
 Accept\ change=Принять изменение
 
-Action=Действие
 
+Action=Действие
 
 Add=Добавить
 
+Add\ new=Добавить новую
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Добавить (скомпил.) пользовательский класс Importer из пути класса.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Путь может не совпадать с путем классов JabRef.
 
@@ -51,16 +51,12 @@ Add\ from\ folder=Добавить из папки
 
 Add\ from\ JAR=Добавить из JAR
 
-Add\ new=Добавить новую
-
 Add\ subgroup=Добавить подгруппу
 
 Add\ to\ group=Добавить в группу
 
 Added\ group\ "%0".=Группа "%0" добавлена.
 
-Added\ new=Добавлена новая
-
 Added\ string=Строка добавлена
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Кроме того, записи, в которых поле <b>%0</b> не содержит <b>%1</b> могут быть назначены этой группе вручную путем их выбора и перетаскивания в группу или с помощью команды контекстного меню. В этом случае условие<b>%1</b> будет добавлено к полю <b>%0</b> каждой записи. Чтобы вручную удалить записи из этой группы, выберите записи и примените команду контекстного меню. В этом случае условие <b>%1</b> будет удалено из поля <b>%0</b> каждой записи.
@@ -69,12 +65,8 @@ Advanced=Расширенные
 All\ entries=Все записи
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Все записи этого типа будут объявлены записями 'без типа'. Продолжть?
 
-All\ fields=Все поля
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Всегда преобразовывать формат файла BIB при сохранении и экспорте
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=Исключение SAX при анализе '%0'\:
-
 and=и
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=любое поле, соответствующее регулярному выражению <b>%0</b>
@@ -164,6 +156,7 @@ Clear\ fields=Очистить поля
 
 Close=Закрыть
 
+
 Close\ dialog=Закрыть диалоговое окно
 
 Close\ the\ current\ library=Закрыть текущую БД
@@ -216,6 +209,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Не удалось запустить п
 Could\ not\ save\ file.=Не удалось сохранить файл.
 Character\ encoding\ '%0'\ is\ not\ supported.=Кодировка '%0' не поддерживается.
 
+
 crossreferenced\ entries\ included=записи с перекрестными ссылками
 
 Current\ content=Текущее содержимое
@@ -251,8 +245,6 @@ Default\ grouping\ field=Поле группировки по умолчанию
 
 Default\ pattern=Шаблон по умолчанию
 
-Default\ sort\ criteria=Критерий сортировки по умолчанию
-
 Delete=Удалить
 
 Delete\ custom\ format=Удалить пользовательский формат
@@ -273,8 +265,6 @@ Deleted=Удалено
 
 Permanently\ delete\ local\ file=Удалить локальный файл
 
-Delimit\ fields\ with\ semicolon,\ ex.=Разделитель для полей\: точка с запятой, напр.\:
-
 Descending=В порядке убывания
 
 Description=Описание
@@ -329,7 +319,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Динамич
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Динамическая группировка записей по поиску ключегого слова в поле
 
-Each\ line\ must\ be\ on\ the\ following\ form=Каждая строка должна иметь следующую форму
 
 Edit=Изменить
 
@@ -376,12 +365,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Типы записей
 
 Error=Ошибка
-Error\ exporting\ to\ clipboard=Ошибка экспорта в буфер обмена
 
 Error\ occurred\ when\ parsing\ entry=Ошибка анализа записи
 
 Error\ opening\ file=Ошибка при открытии файла
 
+
 Error\ while\ writing=Ошибка при записи
 
 '%0'\ exists.\ Overwrite\ file?='%0' существует. Перезаписать файл?
@@ -411,8 +400,6 @@ External\ programs=Внешние программы
 
 External\ viewer\ called=Вызов внешней программы просмотра
 
-Fetch=Выборка
-
 Field=Поле
 
 field=поле
@@ -420,8 +407,6 @@ field=поле
 Field\ name=Имя поля
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Имена полей не должны содержать пробелов или следующих знаков
 
-Field\ to\ filter=Поле для фильтра
-
 Field\ to\ group\ by=Поле для группировки
 
 File=Файл
@@ -436,13 +421,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Каталог файло
 
 File\ exists=Файл существует
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=Файл изменен внешними средствами. Выберите дальнейшие действия.
-
 File\ not\ found=Файл не найден
 File\ type=Тип файла
-
-File\ updated\ externally=Файл изменен внешними средствами
-
 filename=имя файла
 
 Files\ opened=Открытые файлы
@@ -463,6 +443,7 @@ Float=Нефиксированные
 
 for=для
 
+
 Format\ of\ author\ and\ editor\ names=Формат имени автора/редактора
 Format\ string=Форматировать строку
 
@@ -473,9 +454,9 @@ found\ in\ AUX\ file=найдено в файле AUX
 
 Full\ name=Полное имя
 
+
 General=Общие
 
-General\ fields=Общие поля
 
 Generate=Создать
 
@@ -554,15 +535,13 @@ Importing=Импорт
 
 Importing\ in\ unknown\ format=Импорт неизвестного формата
 
-Include\ abstracts=Включить конспект
-Include\ entries=Включить записи
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Включить подгруппы\: Просмотр записей, содержащихся в этой группе или ее подгруппах (если выбрано)
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Независимая группа\: Просмотр записей только этой группы (если выбрано)
 
 Work\ options=Рабочие параметры
 
+
 Insert=Вставить
 
 Insert\ rows=Вставить строки
@@ -610,10 +589,6 @@ Leave\ file\ in\ its\ current\ directory=Сохранить файл в теку
 
 Left=Левый
 
-Limit\ to\ fields=Ограничение для полей
-
-Limit\ to\ selected\ entries=Ограничение для выбранных записей
-
 Link=Ссылка
 Link\ local\ file=Ссылка на локальный файл
 Link\ to\ file\ %0=Ссылка на файл %0
@@ -636,8 +611,6 @@ Mark\ new\ entries\ with\ owner\ name=Метка имени владельца 
 
 Memory\ stick\ mode=Режим флеш-памяти
 
-Menu\ and\ label\ font\ size=Кегль меню и подписи
-
 Merged\ external\ changes=Внешние изменения с объединением
 
 Messages=Сообщения
@@ -662,6 +635,8 @@ Move\ up=Переместить вверх
 
 Moved\ group\ "%0".=Перемещенная группа "%0".
 
+
+
 Name=Имя
 Name\ formatter=Программа форматирования имени
 
@@ -679,8 +654,6 @@ New\ content=Создать контент
 
 New\ library\ created.=Создана новая БД.
 
-New\ field\ value=Создать значение поля
-
 New\ group=Создать группу
 
 New\ string=Создать строку
@@ -695,9 +668,6 @@ no\ library\ generated=БД не создана
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Записи не найдены. Убедитесь, что используется правильный фильтр импорта.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Не найдены записи для строки поиска '%0'
-
 No\ entries\ imported.=Записи не импортированы.
 
 No\ files\ found.=Файлы не найдены.
@@ -718,8 +688,6 @@ Nothing\ to\ redo=Нет действий для повтора
 
 Nothing\ to\ undo=Нет действий для отмены
 
-occurrences=встречаемость
-
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Один или несколько ключей будут перезаписаны. Продолжить?
 
@@ -758,13 +726,10 @@ Override=Переопределить
 
 Override\ default\ file\ directories=Переопределить каталоги файлов, заданные по умолчанию
 
-Override\ default\ font\ settings=Переопределить настройки шрифта, заданные по умолчанию
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=заменить ключ BibTeX на выделенный текст
 
 
 Overwrite=Перезаписать
-Overwrite\ existing\ field\ values=Перезаписать текущие значения полей
 
 Overwrite\ keys=Перезаписать ключи
 
@@ -799,6 +764,7 @@ Please\ enter\ the\ string's\ label=Введите подпись для стр
 
 Please\ select\ an\ importer.=Выберите фильтр импорта.
 
+
 Possible\ duplicate\ entries=Возможные дубликаты записей
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Возможный дубликат существующей записи. Щелкните для разрешения.
@@ -826,8 +792,6 @@ Redo=Повторить
 
 Reference\ library=БД для ссылки
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Найдены ссылки\: %0. Число ссылок для выборки?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Детализировать супергруппу\: Просмотр записей, содержащихся в группе и ее супергруппе (если выбрано)
 
 regular\ expression=Регулярное выражение
@@ -883,10 +847,6 @@ Replace\ (regular\ expression)=Заменить (регулярное выраж
 
 Replace\ string=Заменить строку
 
-Replace\ with=Заменить на
-
-
-Replaced=Заменено
 
 Required\ fields=Обязательные поля
 
@@ -896,6 +856,8 @@ Resolve\ strings\ for\ all\ fields\ except=Разрешение для стро
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Разрешение для строк только стандартных полей BibTeX
 
 resolved=разрешено
+
+
 Review=Просмотр
 Review\ changes=Просмотр изменений
 
@@ -913,10 +875,6 @@ Save\ library\ as...=Сохранить БД как...
 
 Save\ entries\ in\ their\ original\ order=Сохранить записи в исходном порядке
 
-Save\ failed=Ошибка сохранения
-
-Save\ failed\ during\ backup\ creation=Ошибка сохранения при создании резервной копии
-
 Saved\ library=БД сохранена
 
 Saved\ selected\ to\ '%0'.=Сохранить выбранное в '%0'.
@@ -930,8 +888,6 @@ Search=Поиск
 
 Search\ expression=Выражение для поиска
 
-Search\ for=Поиск
-
 Searching\ for\ duplicates...=Выполняется поиск дубликатов...
 
 Searching\ for\ files=Выполняется поиск файлов...
@@ -940,19 +896,16 @@ Secondary\ sort\ criterion=Вторичный критерий сортиров
 
 Select\ all=Выбрать все
 
-Select\ encoding=Выбрать кодировку
-
 Select\ entry\ type=Выбрать тип записи
-Select\ external\ application=Выбрать внешнее приложение
 
 Select\ file\ from\ ZIP-archive=Выбрать файл из ZIP-архива
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Выбрать узлы дерева для просмотра и применения/отклонения изменений
-Selected\ entries=Записи выбраны
+
 Set\ field=Настройка поля
 Set\ fields=Настройка полей
 
-Set\ general\ fields=Настройка общих полей
+
 Set\ main\ external\ file\ directory=Задать основной файловый каталог внешних файлов
 
 Settings=Параметры
@@ -1005,8 +958,6 @@ Status=Статус
 
 Stop=Остановить
 
-Strings=Строки
-
 Strings\ for\ library=Строки БД
 
 Sublibrary\ from\ AUX=Подчиненная БД из AUX
@@ -1067,8 +1018,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Для этой операции необходимо выбрать одну или несколько записей.
 
+
 Toggle\ entry\ preview=Показать/скрыть просмотр записи
 Toggle\ groups\ interface=Показать/скрыть интерфейс групп
+
+
+
 Try\ different\ encoding=Используйте другую кодировку
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Развернуть названия журналов для выбранных записей
@@ -1113,8 +1068,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=убедит
 View=Вид
 Vim\ server\ name=Имя сервера Vim
 
-Waiting\ for\ ArXiv...=Ожидание ArXiv...
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Выдать предупреждение о неразрешенных дубликатах при закрытии окна контроля
 
 Warn\ before\ overwriting\ existing\ keys=Выдать предупреждение при перезаписи текущих ключей
@@ -1146,7 +1099,6 @@ XMP-metadata=Метаданные XMP
 XMP-metadata\ found\ in\ PDF\:\ %0=Найдены метаданные XMP в PDF\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Для применения изменений необходимо перезапустить JabRef.
 You\ have\ changed\ the\ language\ setting.=Настройки языка изменены пользователем.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Указано недопустимое значение для поиска '%0'.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Для правильной работы новых назначений функциональных клавиш необходимо перезапустить JabRef.
 
@@ -1155,26 +1107,20 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Новые назначения ф
 The\ following\ fetchers\ are\ available\:=Доступны следующие инструменты выборки\:
 Could\ not\ find\ fetcher\ '%0'=Не удалось найти инструмент выборки '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Выполняется запрос '%0' для инструмента выборки '%1'.
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=Не найдено результатов запроса '%0' для инструмента выборки '%1'.
 
 Move\ file=Переместить файл
 Rename\ file=Ппереименовать файл
 
+
 Move\ file\ failed=Ошибка перемещения файла
 Could\ not\ move\ file\ '%0'.=Не удалось переместить файл '%0'.
 Could\ not\ find\ file\ '%0'.=Не удалось найти файл '%0'.
 Number\ of\ entries\ successfully\ imported=Число успешно импортированных записей
 Import\ canceled\ by\ user=Импорт отменен пользователем
-Progress\:\ %0\ of\ %1=Выполнено\: %0 из %1
 Error\ while\ fetching\ from\ %0=Ошибка выполнения выборки %0
 
-Please\ enter\ a\ valid\ number=Введите допустимое число
 Show\ search\ results\ in\ a\ window=Показать результаты в окне
 Search\ in\ all\ open\ libraries=Поиск во всех открытых БД
-Move\ file\ to\ file\ directory?=Файл будет перемещен в каталог файлов. Продолжить?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=Защищенная БД. Невозможно сохранить без просмотра внешних изменений.
-Protected\ library=Защищенная БД
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Невозможно сохранить БД без просмотра внешних изменений.
 Library\ protection=Защита БД
 Unable\ to\ save\ library=Не удалось сохранить БД
@@ -1186,16 +1132,13 @@ MIME\ type=MIME-тип
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Эта функция позволяет открывать или импортировать файлы в работающий экземпляр JabRef<BR>без запуска нового экземпляра приложения. Например, при передаче файла в JabRef<br>из веб-браузера.<BR>Обратите внимание, что эта функция позволяет не запускать несколько экземпляров JabRef одновременно.
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Запуск инструмента выборки, напр.\: "--fetch\=Medline\:cancer"
 
-The\ ACM\ Digital\ Library=Цифровая библиотека ACM
 Reset=Инициализировать
 
 Use\ IEEE\ LaTeX\ abbreviations=Использовать сокращения LaTeX для IEEE
-The\ Guide\ to\ Computing\ Literature=ACM - Каталог публикаций по информатике и ВТ
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=При переходе по ссылке выполнять поиск соответствующего файла, если ссылка не определена
 Settings\ for\ %0=Настройки для %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Сортировать следующие поля как числовые
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Строка %0\: Найден поврежденный ключ BibTeX.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Строка %0\: Найден поврежденный ключ BibTeX (содержит пробелы)
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Строка %0\: Найден поврежденный ключ BibTeX (пропущена запятая)
@@ -1205,7 +1148,6 @@ Rename\ field=Переименовать поле
 Set/clear/append/rename\ fields=Задать/очистить/переименовать поля
 Rename\ field\ to=Переименовать поле в
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Переместить содержимое поля в поле с другим именем
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Возможно переименовать только одно поле одновременно
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Невозможно использовать порт %0 для удаленного подключения; another application may be using it. Try specifying another port.
 
@@ -1221,9 +1163,6 @@ Formatter\ not\ found\:\ %0=Не найдена программа формат
 Clear\ inputarea=Очистить область ввода
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Сохранение не удалось, файл заблокирован другим экземпляром JabRef.
-File\ is\ locked\ by\ another\ JabRef\ instance.=Файл заблокирован другим экземпляром JabRef.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Блокировка файла будет переопределена. Продолжить?
-File\ locked=Файл заблокирован
 Current\ tmp\ value=Текущее значение TMP
 Metadata\ change=Изменение метаданных
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Произведены изменения для следующих элементов метаданных
@@ -1232,7 +1171,6 @@ Generate\ groups\ for\ author\ last\ names=Создание групп для ф
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Создание групп из ключевых слов в поле BibTeX
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Принудительное использование допустимого набора символов в ключах BibTeX
 
-Save\ without\ backup?=Выполнить сохранение без создания резервной копии?
 Unable\ to\ create\ backup=Не удалось создать резервную копию
 Move\ file\ to\ file\ directory=Переместить файл в каталог файлов
 Rename\ file\ to=Переименовать файл в
@@ -1271,14 +1209,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Выбрать источник
 Create\ entry\ based\ on\ XMP-metadata=Создание записи на основе данных XMP
 Create\ blank\ entry\ linking\ the\ PDF=Создание пустой записи со ссылкой на PDF
 Only\ attach\ PDF=Приложить только PDF
-Title=Заглавие
 Create\ new\ entry=Создание новой записи
 Update\ existing\ entry=Изменение существующей записи
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Автозавершение имен только для формата 'Имя Фамилия'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Автозавершение имен только для формата 'Фамилия, Имя'
 Autocomplete\ names\ in\ both\ formats=Автозавершение имен в обоих форматах
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=Имя 'комментарий' не может использоваться как имя типа записи.
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Необходимо ввести целое число в текстовое поле для
 Send\ as\ email=Отправить по эл.почте
 References=Ссылки
 Sending\ of\ emails=Выполняется отправка эл.почты
@@ -1400,7 +1336,6 @@ Opens\ the\ file\ browser.=Открывает окно обзора файлов
 Scan\ directory=Сканировать каталог файлов
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Выполняет поиск несвязанных файлов в выбранном каталоге файлов.
 Starts\ the\ import\ of\ BibTeX\ entries.=Начинает импорт записей BibTeX.
-Leave\ this\ dialog.=Выйти из диалогового окна.
 Create\ directory\ based\ keywords=Создать ключевые слова на основе каталога файлов
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Создает ключевые слова для созданных записей с путями каталога файлов
 Select\ a\ directory\ where\ the\ search\ shall\ start.=Выбирает каталог файлов для начала поиска.
@@ -1408,11 +1343,9 @@ Select\ file\ type\:=Выбор типа файла\:
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=Эти файлы не связаны в активной БД.
 Entry\ type\ to\ be\ created\:=Создаваемый тип записи\:
 Searching\ file\ system...=Выполняется поиск в файловой системе...
-Importing\ into\ Library...=Выполняется импорт в БД...
 Select\ directory=Выбрать каталог файлов
 Select\ files=Выбрать файлы
 BibTeX\ entry\ creation=Создание записи BibTeX
-<No\ selection>=<Не выбрано>
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=Не удалось подключиться к он-лайн службе FreeCite.
 Parse\ with\ FreeCite=Анализ с помощью FreeCite
 How\ would\ you\ like\ to\ link\ to\ '%0'?=Выберите тип ссылки для '%0'.
@@ -1454,7 +1387,6 @@ Toggle\ print\ status=Изменить статус 'печать'
 Update\ keywords=Изменить ключевые слова
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Записать значения полей особых отметок в отдельные поля BibTeX
 You\ have\ changed\ settings\ for\ special\ fields.=Настройки полей особых отметок изменены пользователем.
-%0\ entries\ found.\ To\ reduce\ server\ load,\ only\ %1\ will\ be\ downloaded.=Найдено записей\: %0. Для снижения нагрузки сервера, будет загружено записей\: %1.
 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.=Соединение с OpenOffice/LibreOffice прервано. Убедитесь, что приложение OpenOffice/LibreOffice запущено и повторите соединение.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Исправить запись и повторно открыть редактор для отображения/изменения исходника.
@@ -1474,8 +1406,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=В пользовательском файле стиля указан формат абзаца '%0', не определенный в текущем документе OpenOffice/LibreOffice.
 
 Searching...=Выполняется поиск...
-You\ have\ selected\ more\ than\ %0\ entries\ for\ download.\ Some\ web\ sites\ might\ block\ you\ if\ you\ make\ too\ many\ rapid\ downloads.\ Do\ you\ want\ to\ continue?=Выбрано более %0 записей для загрузки. Возможна блокировка пользователя некоторыми веб-сайтами при большом числе быстрых загрузок. Продолжить?
-Confirm\ selection=Подтвердить выбор
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Добавлять {} к указанным заглавным словам при поиске для соблюдения правильности регистра
 Import\ conversions=Импорт преобразований
 Please\ enter\ a\ search\ string=Введите строку для поиска
@@ -1486,7 +1416,6 @@ Canceled\ merging\ entries=Слияние записей отменено
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Форматирование единиц с помощью неразрывных символов-разделителей с сохранением правильного регистра при поиске
 Merge\ entries=Объединение записей
 Merged\ entries=Записи с объединением в новую и сохранением старой
-Merged\ entry=Запись с объединением
 None=Ни одной
 Parse=Анализ
 Result=Результат
@@ -1566,9 +1495,7 @@ Add\ new\ file\ type=Добавить новый тип файлов
 
 Left\ entry=Запись слева
 Right\ entry=Запись справа
-Use=Использовать
 Original\ entry=Исходная запись
-Replace\ original\ entry=Заменить исходную запись
 No\ information\ added=Сведения не добавлены
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Выберите минимум одну запись для управления ключевыми словами.
 OpenDocument\ text=Текст OpenDocument
@@ -1586,7 +1513,6 @@ Return\ to\ JabRef=Вернуться в JabRef
 Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Переместите файл вручную и укажите локальную ссылку.
 Could\ not\ connect\ to\ %0=Не удалось подключиться к серверу %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Предупреждение. Для %0 из %1 записей не определен ключ BibTeX.
-occurrence=вхождения
 Added\ new\ '%0'\ entry.=Добавлена новая запись '%0'.
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Выбрано несколько записей. Изменить тип всех этих записей на '%0'?
 Changed\ type\ to\ '%0'\ for=Тип с изменением на '%0' для
@@ -1605,8 +1531,6 @@ Library\ '%0'\ has\ changed.=БД '%0' изменена.
 Print\ entry\ preview=Предварительный просмотр записи для печати
 Copy\ \\cite{BibTeX\ key}=Копировать \\цитировать{ключ BibTeX}
 Copy\ BibTeX\ key\ and\ title=Копировать ключ и заголовок BibTeX
-File\ rename\ failed\ for\ %0\ entries.=Ошибка переименования файла для %0 записи.
-Merged\ BibTeX\ source\ code=Объединенный исходный код BibTeX
 Invalid\ DOI\:\ '%0'.=Недопустимый DOI-адрес\: '%0'.
 should\ start\ with\ a\ name=должно начинаться с имени
 should\ end\ with\ a\ name=должно заканчиваться именем
@@ -1691,10 +1615,8 @@ wrong\ entry\ type\ as\ proceedings\ has\ page\ numbers=неверный тип
 Abbreviate\ journal\ names=Сокращения названий журналов
 Abbreviating...=Создание сокращений...
 
-Adding\ fetched\ entries=Добавление записей из выборки
 Display\ keywords\ appearing\ in\ ALL\ entries=Отображение ключевых слов, относящихся ко ВСЕМ записям
 Display\ keywords\ appearing\ in\ ANY\ entry=Отображение ключевых слов, относящихся к КАКОЙ-ЛИБО записи
-Fetching\ entries\ from\ Inspire=Выборка записей из Inspire
 None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=Для выбранных записей отсутствуют ключи BibTeX.
 Unabbreviate\ journal\ names=Полные названия журналов
 Unabbreviating...=Отмена сокращений...
@@ -1708,14 +1630,11 @@ Ill-formed\ entrytype\ comment\ in\ BIB\ file=Неверный формат ко
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=Переместить связанные файлы в каталог файлов по умолчанию %0
 
-Clipboard=Буфер обмена
-Could\ not\ paste\ entry\ as\ text\:=Не удалось вставить запись как текст\:
 Do\ you\ still\ want\ to\ continue?=Продолжить?
 This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=Это действие изменит минимум одну запись в каждом из следующих полей\:
 This\ could\ cause\ undesired\ changes\ to\ your\ entries.=Это может привести к нежелательным изменениям ваших записей.
 Run\ field\ formatter\:=Запуск средства форматирования полей\:
 Table\ font\ size\ is\ %0=Размер шрифта в таблице\: %0
-%0\ import\ canceled=Импорт %0 отменен
 Internal\ style=Встроенный стиль
 Add\ style\ file=Добавить файл стиля
 Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=Подтвердите удаление стиля.
@@ -1904,7 +1823,6 @@ Updated\ entry\ with\ info\ from\ %0=Обновленная запись со с
 
 
 
-Connection=Подключение
 Host=Хост
 Port=Порт
 Library=База данных
@@ -1929,7 +1847,6 @@ Local\ version\:\ %0=Локальная версия\: %0
 Shared\ version\:\ %0=Версия с общим доступом\: %0
 Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Объедините запись с общим доступом и вашу запись, а затем нажмите "Объединение записей" для разрешения этой проблемы.
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=При отмене этой операции ваши изменения не будут синхронизированы. Отменить операцию?
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=Текущая рабочая запись BibEntry удалена на стороне общего доступа.
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Цитирование записей без ключей BibTeX невозможно. Создать ключи сейчас?
 
@@ -1943,7 +1860,6 @@ You\ must\ enter\ at\ least\ one\ field\ name=Необходимо ввести
 Non-ASCII\ encoded\ character\ found=Обнаружен символ не в кодировке ASCII
 Toggle\ web\ search\ interface=Переключение интерфейса веб-поиска
 %0\ files\ found=Найдено файлов\: %0
-%0\ of\ %1=%0 из %1
 One\ file\ found=Найден один файл
 The\ import\ finished\ with\ warnings\:=Импорт завершен с предупреждениями\:
 There\ was\ one\ file\ that\ could\ not\ be\ imported.=Существует один файл, который не удалось импортировать.
@@ -2002,3 +1918,7 @@ View\ event\ log=Просмотр журнала событий
 Website=Веб-сайт
 Write\ XMP-metadata\ to\ PDFs=Запись метаданных XMP в PDF-файл
 
+Override\ default\ font\ settings=Переопределить настройки шрифта, заданные по умолчанию
+
+
+
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index 6898689a961..966e5477366 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<fältnamn>
 
-<select>=<välj>
-
 <select\ word>=<välj ord>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Förkorta tidskriftsnamnen för valda poster (ISO-förkortningar)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Förkorta tidskriftsnamnen för valda poster (MEDLINE-förkortningar)
@@ -34,11 +32,13 @@ Accept=Acceptera
 
 Accept\ change=Acceptera ändring
 
-Action=Händelse
 
+Action=Händelse
 
 Add=Lägg till
 
+Add\ new=Lägg till ny
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Lägg till en (kompilerad) Importer-klass från en sökväg till en klass.
 
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ ZIP-archive.=Lägg till en (kompilerad) Importer-klass från en zip-fil.
@@ -49,16 +49,12 @@ Add\ from\ folder=Lägg till från mapp
 
 Add\ from\ JAR=Lägg till från JAR-fil
 
-Add\ new=Lägg till ny
-
 Add\ subgroup=Lägg till undergrupp
 
 Add\ to\ group=Lägg till i grupp
 
 Added\ group\ "%0".=Lade till gruppen "%0".
 
-Added\ new=Lade till ny
-
 Added\ string=Lade till sträng
 
 
@@ -66,12 +62,8 @@ Advanced=Avancerad
 All\ entries=Alla poster
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Alla poster av denna typ kommer att bli typlösa. Fortsätt?
 
-All\ fields=Alla fält
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Formattera alltid om BIB-filen vid när den sparas eller exporteras
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=Ett SAX-undantag inträffade när '%0' tolkades\:
-
 and=och
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=något fält som matchar det reguljära uttrycket <b>%0</b>
@@ -159,6 +151,7 @@ Clear\ fields=Rensa fält
 
 Close=Stäng
 
+
 Close\ dialog=Stäng dialog
 
 Close\ the\ current\ library=Stäng aktuell databas
@@ -211,6 +204,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Kunde inte köra 'vim'.
 Could\ not\ save\ file.=Kunde inte spara fil.
 Character\ encoding\ '%0'\ is\ not\ supported.=Teckenkodningen '%0' stöds inte.
 
+
 crossreferenced\ entries\ included=korsrefererade poster inkluderade
 
 Current\ content=Nuvarande innehåll
@@ -246,8 +240,6 @@ Default\ grouping\ field=Standardfält för gruppering
 
 Default\ pattern=Standardmönster
 
-Default\ sort\ criteria=Standardsortering
-
 Delete=Radera
 
 Delete\ custom\ format=Radera eget format
@@ -268,8 +260,6 @@ Deleted=Raderade
 
 Permanently\ delete\ local\ file=Radera lokal fil
 
-Delimit\ fields\ with\ semicolon,\ ex.=Avgränsa fält med semikolon, t.ex.
-
 Descending=Fallande
 
 Description=Beskrivning
@@ -320,7 +310,6 @@ Dynamic\ groups=Dynamiska grupper
 
 
 
-Each\ line\ must\ be\ on\ the\ following\ form=Varje rad måste vara på följande form
 
 Edit=Editera
 
@@ -366,12 +355,12 @@ Entry\ type=Posttyp
 Entry\ types=Posttyper
 
 Error=Fel
-Error\ exporting\ to\ clipboard=Fel vid export till urklipp
 
 Error\ occurred\ when\ parsing\ entry=Fel vid inläsning av post
 
 Error\ opening\ file=Fel vid öppning av fil
 
+
 Error\ while\ writing=Fel vid skrivning
 
 '%0'\ exists.\ Overwrite\ file?='%0' finns redan. Skriv över filen?
@@ -401,16 +390,12 @@ External\ programs=Externa program
 
 External\ viewer\ called=Öppnar i externt program
 
-Fetch=Hämta
-
 Field=Fält
 
 field=fält
 
 Field\ name=Fältnamn
 
-Field\ to\ filter=Fält att filtrera
-
 Field\ to\ group\ by=Fält att använda för gruppering
 
 File=Fil
@@ -425,13 +410,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Filmapp är inte satt elle
 
 File\ exists=Filen finns redan
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=Fil har ändrats utanför JabRef. Vad vill du göra?
-
 File\ not\ found=Hittar ej filen
 File\ type=Filtyp
-
-File\ updated\ externally=Filen uppdaterad utanför JabRef
-
 filename=filnamn
 
 Files\ opened=Filer öppnade
@@ -449,6 +429,7 @@ Float=Visa först
 
 for=för
 
+
 Format\ of\ author\ and\ editor\ names=Format för författar- och redaktörsnamn
 Format\ string=Formatsträng
 
@@ -458,9 +439,9 @@ Formatter\ name=Formatnamn
 found\ in\ AUX\ file=hittades i AUX-fil
 
 
+
 General=Generellt
 
-General\ fields=Generella fält
 
 Generate=Generera
 
@@ -538,8 +519,6 @@ Importing=Importerar
 
 Importing\ in\ unknown\ format=Importerar i okänt format
 
-Include\ abstracts=Inkludera sammanfattning
-Include\ entries=Inkludera poster
 
 
 
@@ -590,10 +569,6 @@ Leave\ file\ in\ its\ current\ directory=Lämna filen i nuvarande mapp
 
 Left=Vänster
 
-Limit\ to\ fields=Begränsa till fält
-
-Limit\ to\ selected\ entries=Begränsa till valda poster
-
 Link=Länk
 Link\ local\ file=Länka till lokal fil
 Link\ to\ file\ %0=Länka till fil %0
@@ -615,7 +590,6 @@ Mark\ new\ entries\ with\ owner\ name=Märk nya poster med ägarnamn
 
 
 
-
 Messages=Meddelanden
 
 Modification\ of\ field=Ändring i fält
@@ -638,6 +612,8 @@ Move\ up=Flytta uppåt
 
 Moved\ group\ "%0".=Flyttade grupp "%0"
 
+
+
 Name=Namn
 Name\ formatter=Namnformattering
 
@@ -653,8 +629,6 @@ new=ny
 
 New\ library\ created.=Skapade ny databas.
 
-New\ field\ value=Nytt fältvärde
-
 New\ group=Ny grupp
 
 New\ string=Ny sträng
@@ -666,9 +640,6 @@ Next\ entry=Nästa post
 no\ library\ generated=ingen databas genererades
 
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Inga poster hittades för söksträngen '%0'
-
 No\ entries\ imported.=Inga poster importerades.
 
 No\ files\ found.=Inga filer hittades.
@@ -688,8 +659,6 @@ Nothing\ to\ redo=Inget att göra om.
 
 Nothing\ to\ undo=Inget att ångra.
 
-occurrences=förekomster
-
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=En eller flera BibTeX-nycklar kommer skrivas över. Fortsätt?
 
@@ -727,12 +696,9 @@ Override=Ignorera
 
 Override\ default\ file\ directories=Ignorerar normala filmappar
 
-Override\ default\ font\ settings=Ignorera normala typsnittsinställningar
-
 
 
 Overwrite=Skriv över
-Overwrite\ existing\ field\ values=Skriv över befintligt fältinnehåll
 
 Overwrite\ keys=Skriv över nycklar
 
@@ -764,6 +730,7 @@ Please\ enter\ the\ field\ to\ search\ (e.g.\ <b>keywords</b>)\ and\ the\ keywor
 Please\ enter\ the\ string's\ label=Ange namnet på strängen
 
 
+
 Possible\ duplicate\ entries=Möjliga dubbletter
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Möjlig dubblett av befintlig post. Klicka för att reda ut.
@@ -791,8 +758,6 @@ Redo=Gör igen
 
 Reference\ library=Referensdatabas
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Referenser hittade\: %0. Antal referenser som ska hämtas?
-
 
 regular\ expression=reguljärt uttryck
 
@@ -847,10 +812,6 @@ Replace\ (regular\ expression)=Ersätt (reguljärt uttryck)
 
 Replace\ string=Ersätt sträng
 
-Replace\ with=Ersätt med
-
-
-Replaced=Ersatte
 
 Required\ fields=Obligatoriska fält
 
@@ -859,6 +820,8 @@ Reset\ all=Återställ alla
 Resolve\ strings\ for\ all\ fields\ except=Ersätt strängar för alla fält utom
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Ersätt bara strängar för de vanliga BibTeX-fälten
 
+
+
 Review\ changes=Kontrollera ändringar
 
 Right=Höger
@@ -875,10 +838,6 @@ Save\ library\ as...=Spara databas som ...
 
 Save\ entries\ in\ their\ original\ order=Spara poster i ursprunglig ordning
 
-Save\ failed=Sparningen misslyckades
-
-Save\ failed\ during\ backup\ creation=Sparningen misslyckades när säkerhetskopian skulle skapas
-
 Saved\ library=Sparade databas
 
 Saved\ selected\ to\ '%0'.=Sparade valda till '%0'.
@@ -892,8 +851,6 @@ Search=Sök
 
 Search\ expression=Sökuttryck
 
-Search\ for=Sök efter
-
 Searching\ for\ duplicates...=Söker efter dubbletter...
 
 Searching\ for\ files=Söker efter filer
@@ -902,18 +859,15 @@ Secondary\ sort\ criterion=Andra sorteringskriteriet
 
 Select\ all=Välj alla
 
-Select\ encoding=Välj teckenkodning
-
 Select\ entry\ type=Välj posttyp
-Select\ external\ application=Välj program
 
 Select\ file\ from\ ZIP-archive=Välj fil från ZIP-arkiv
 
-Selected\ entries=Valda poster
+
 Set\ field=Sätt fält
 Set\ fields=Sätt fält
 
-Set\ general\ fields=Sätt generella fält
+
 Set\ main\ external\ file\ directory=Välj huvudmapp för filer
 
 Settings=Alternativ
@@ -964,8 +918,6 @@ Special\ table\ columns=Speciella kolumner
 
 Stop=Stanna
 
-Strings=Strängar
-
 Strings\ for\ library=Strängar för libraryn
 
 Sublibrary\ from\ AUX=Databas baserad på AUX-fil
@@ -1023,8 +975,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Den här operationen kräver att en eller flera poster är valda.
 
+
 Toggle\ entry\ preview=Växla postvisning
 Toggle\ groups\ interface=Växla grupphantering
+
+
+
 Try\ different\ encoding=Prova en annan teckenkodning
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Expandera förkortade tidskriftsnamn för de valda posterna
@@ -1067,8 +1023,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=kontrollera a
 View=Visa
 Vim\ server\ name=Vim-servernamn
 
-Waiting\ for\ ArXiv...=Väntar på ArXiv...
-
 
 Warn\ before\ overwriting\ existing\ keys=Varna innan befintliga nycklar skrivs över
 
@@ -1096,7 +1050,6 @@ Writing\ XMP-metadata\ for\ selected\ entries...=Skriver XMP-metadata för valda
 XMP-metadata\ found\ in\ PDF\:\ %0=XMP-metadata funnen i PDF\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Du måste starta om JabRef för att ändringen ska slå igenom.
 You\ have\ changed\ the\ language\ setting.=Du har ändrat språkinställningarna.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Du har angett en ogiltig sökning '%0'.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Du måste starta om JabRef för att tangentbordsbindningarna ska fungera ordentligt.
 
@@ -1107,20 +1060,15 @@ Could\ not\ find\ fetcher\ '%0'=Kunde inte hitta hämtaren '%0'
 Move\ file=Flytta fil
 Rename\ file=Döp om fil
 
+
 Move\ file\ failed=Gick inte att flytta fil
 Could\ not\ move\ file\ '%0'.=Kunde inte flytta filen '%0'
 Could\ not\ find\ file\ '%0'.=Kunde inte hitta filen '%0'.
 Number\ of\ entries\ successfully\ imported=Antal poster som lyckades importeras
 Import\ canceled\ by\ user=Import avbröts av användare
-Progress\:\ %0\ of\ %1=Händelseförlopp\: %0 av %1
 Error\ while\ fetching\ from\ %0=Fel vid hämtning från %0
 
-Please\ enter\ a\ valid\ number=Ange ett giltigt tal
 Show\ search\ results\ in\ a\ window=Visa sökresultaten i ett fönster
-Move\ file\ to\ file\ directory?=Flytta fil till filmapp?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=Libraryn är skyddad. Kan inte spara innan externa ändringar är kontrollerade.
-Protected\ library=Skyddad databas
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Vägra att spara libraryn innan externa ändringar har kontrollerats.
 Library\ protection=Databasskydd
 Unable\ to\ save\ library=Kan inte spara databas
@@ -1130,14 +1078,12 @@ Unable\ to\ open\ link.=Kan inte öppna länk.
 MIME\ type=MIME-typ
 
 
-The\ ACM\ Digital\ Library=ACMs digitala bibliotek
 Reset=Återställ
 
 Use\ IEEE\ LaTeX\ abbreviations=Använd IEEE LaTeX-förkortningar
 
 Settings\ for\ %0=Alternativ för %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Sortera följande fält som tal
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Rad %0\: Hittade felaktig BibTeX-nyckel.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Rad %0\: Hittade felaktig BibTeX-nyckel (kommatecken saknas).
 Update\ to\ current\ column\ order=Uppdatera till aktuell kolumnordning
@@ -1146,7 +1092,6 @@ Rename\ field=Byt namn på fält
 Set/clear/append/rename\ fields=Sätt/rensa/byt namn på fält
 Rename\ field\ to=Byt namn på fält till
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Flytta innehållet i ett fält till ett fält med ett annat namn
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Du kan bara döpa om en fil i taget
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Kan inte använda port "%0" för fjärråtkomst; ett annat program kanske använder den. Försök med en annan port.
 
@@ -1162,8 +1107,6 @@ Formatter\ not\ found\:\ %0=Hittade ej formatterare\: %0
 Clear\ inputarea=Rensa inmatningsområdet
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Kunde inte spara. Filen låst av en annan JabRef-instans.
-File\ is\ locked\ by\ another\ JabRef\ instance.=Filen är låst av en annan JabRef-instans.
-File\ locked=Filen är låst
 Current\ tmp\ value=Nuvarande temporära värde
 Metadata\ change=Ändring i metadata
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Ändringar har gjorts i följande metadata-element
@@ -1172,7 +1115,6 @@ Generate\ groups\ for\ author\ last\ names=Generera grupper baserat på författ
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Generera grupper baserat på nyckelord i ett fält
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Framtvinga giltiga tecken i BibTeX-nycklar
 
-Save\ without\ backup?=Spara utan att göra backup?
 Unable\ to\ create\ backup=Kan inte skapa säkerhetskopia
 Move\ file\ to\ file\ directory=Flytta fil till filmapp
 Rename\ file\ to=Byt namn på fil till
@@ -1207,14 +1149,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Välj källa för metadata-impor
 Create\ entry\ based\ on\ XMP-metadata=Skapa post baserat på XMP-data
 Create\ blank\ entry\ linking\ the\ PDF=Skapa tom post som länkar till PDF\:en
 Only\ attach\ PDF=Lägg bara till PDF
-Title=Titel
 Create\ new\ entry=Skapa ny post
 Update\ existing\ entry=Uppdatera befintlig post
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Komplettera enbart namn i 'Förnamn Efternamn'-format
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Komplettera enbart namn i 'Efternamn, Förnamn'-format
 Autocomplete\ names\ in\ both\ formats=Komplettera namn automatiskt i bägge formaten
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=En posttyp kan inte döpas till 'comment'.
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Du måste ange ett heltal i fältet för
 Send\ as\ email=Skicka som epost
 References=Referenser
 Sending\ of\ emails=Skicka epost
@@ -1322,7 +1262,6 @@ Opens\ the\ file\ browser.=Öppnar filbläddraren
 Scan\ directory=Sök igenom mapp
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Söker i den valda mappen efter filer som ej är länkade i libraryn
 Starts\ the\ import\ of\ BibTeX\ entries.=Börjar importen av BibTeX-poster.
-Leave\ this\ dialog.=Lämna denna dialog.
 Create\ directory\ based\ keywords=Skapa nyckelord baserade på mapp
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Skapar nyckelord med sökvägen till mappen i de skapade posterna
 Select\ a\ directory\ where\ the\ search\ shall\ start.=Välj en mapp där sökningen ska börja.
@@ -1330,11 +1269,9 @@ Select\ file\ type\:=Välj filtyp\:
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=Dessa filerna är inte länkade i den aktiva libraryn.
 Entry\ type\ to\ be\ created\:=Posttyper som kommer att skapas\:
 Searching\ file\ system...=Söker på filsystemet...
-Importing\ into\ Library...=Importerar till databas...
 Select\ directory=Välj mapp
 Select\ files=Välj filer
 BibTeX\ entry\ creation=Skapande av BibTeX-poster
-<No\ selection>=<Inget val>
 How\ would\ you\ like\ to\ link\ to\ '%0'?=Hur vill du länka till '%0'?
 BibTeX\ key\ patterns=BibTeX-nyckelmönster
 Changed\ special\ field\ settings=Ändrade inställningar för specialfält
@@ -1373,7 +1310,6 @@ Toggle\ quality\ assured=Växla kvalitetssäkring
 Toggle\ print\ status=Växla utskriftsstatus
 Update\ keywords=Uppdatera nyckelord
 You\ have\ changed\ settings\ for\ special\ fields.=Du har ändrat inställningarna för specialfält.
-%0\ entries\ found.\ To\ reduce\ server\ load,\ only\ %1\ will\ be\ downloaded.=%0 poster hittades. För att minska lasten på servern kommer bara %1 att laddas ned.
 A\ string\ with\ that\ label\ already\ exists=En sträng med det namnet finns redan
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Anslutningen till OpenOffice/LibreOffice försvann. Se till att OpenOffice/LibreOffice körs och anslut på nytt.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef ska sända minst en begäran för varje post till en förläggare.
@@ -1388,7 +1324,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Din stilfil anger styckesformatet '%0', som är odefinierat i ditt nuvarande OpenOffice/LibreOffice-dokument.
 
 Searching...=Söker...
-Confirm\ selection=Bekräfta val
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Lägg till {} runt skyddade ord i titeln för att bevara skiftläget vid sökning
 Import\ conversions=Konverteringar vid import
 Please\ enter\ a\ search\ string=Ange en söksträng
@@ -1398,7 +1333,6 @@ Canceled\ merging\ entries=Avbröt sammanslagning av poster
 
 Merge\ entries=Slå samman poster
 Merged\ entries=Kombinerade poster
-Merged\ entry=Kombinerad post
 Result=Resultat
 Show\ DOI\ first=Visa DOI först
 Show\ URL\ first=Visa URL först
@@ -1471,9 +1405,7 @@ Add\ new\ file\ type=Lägg till ny filtyp
 
 Left\ entry=Vänster post
 Right\ entry=Höger post
-Use=Använd
 Original\ entry=Ursprunglig post
-Replace\ original\ entry=Ersätt ursprunglig post
 No\ information\ added=Ingen information tillagd
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Välj åtminstone en post för att hantera nyckelord.
 OpenDocument\ text=OpenDocument-text
@@ -1489,7 +1421,6 @@ Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ extern
 Return\ to\ JabRef=Återgå till JabRef
 Could\ not\ connect\ to\ %0=Kunde inte ansluta till %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Varning\: %0 av %1 poster har odefinierade BibTeX-nycklar.
-occurrence=förekomst
 Added\ new\ '%0'\ entry.=Lade till ny '%0'-post.
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Flera poster valda. Vill du ändra typen för alla dessa till '%0'?
 Changed\ type\ to\ '%0'\ for=Ändrade typ till '%0' för
@@ -1508,8 +1439,6 @@ Library\ '%0'\ has\ changed.=Libraryn '%0' har ändrats.
 Print\ entry\ preview=Skriv ut postvisning
 Copy\ \\cite{BibTeX\ key}=Kopiera \\cite{BibTeX-nyckel}
 Copy\ BibTeX\ key\ and\ title=Kopiera BibTeX-nyckel och titel
-File\ rename\ failed\ for\ %0\ entries.=Döpa om filen misslyckades för %0 poster.
-Merged\ BibTeX\ source\ code=Kombinerad BibTeX-källkod
 Invalid\ DOI\:\ '%0'.=Ogiltig DOI\: '%0'.
 should\ start\ with\ a\ name=ska börja med ett namn
 should\ end\ with\ a\ name=ska avslutas med ett namn
@@ -1591,10 +1520,8 @@ wrong\ entry\ type\ as\ proceedings\ has\ page\ numbers=fel posttyp eftersom pro
 Abbreviate\ journal\ names=Förkorta tidskriftsnamn
 Abbreviating...=Förkortar...
 
-Adding\ fetched\ entries=Lägger till hämtade poster
 Display\ keywords\ appearing\ in\ ALL\ entries=Visa nyckelord som finns i ALLA poster
 Display\ keywords\ appearing\ in\ ANY\ entry=Visa nyckelord som finns i NÅGON post
-Fetching\ entries\ from\ Inspire=Hämtar poster från Inspire
 None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=Ingen av de valda posterna har någon BibTeX-nyckel.
 Unabbreviate\ journal\ names=E&xpandera förkortade tidskriftsnamn
 Unabbreviating...=Expanderar förkortningar...
@@ -1606,12 +1533,9 @@ Reset\ preferences=Återställ inställningar
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=Flytta länkade filer till standardfilmappen %0
 
-Clipboard=Urklipp
-Could\ not\ paste\ entry\ as\ text\:=Kunde inte klista in post so text\:
 Do\ you\ still\ want\ to\ continue?=Vill du fortfarande fortsätta`?
 This\ could\ cause\ undesired\ changes\ to\ your\ entries.=Detta kan leda till oönskade effekter för dina poster.
 Table\ font\ size\ is\ %0=Typsnittstorlek för tabellen är %0
-%0\ import\ canceled=Import från %0 avbruten
 Internal\ style=Intern stil
 Add\ style\ file=Lägg till stilfil
 Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=Är du säker på att du vill ta bort stilen?
@@ -1789,7 +1713,6 @@ Updated\ entry\ with\ info\ from\ %0=Uppdaterade post med information från %0
 
 
 
-Connection=Anslutning
 Connecting...=Ansluter...
 Host=Värd
 Library=Databas
@@ -1811,8 +1734,6 @@ You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=Du arbetar inte
 Local\ version\:\ %0=Lokal version\: %0
 Shared\ version\:\ %0=Delad version\: %0
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Om denna operation avbryts kommer din ändringar ej bli synkroniserade. Avbryt ändå?
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=Posten du arbetar med har tagits bort från den delade libraryn.
-Remember\ password?=Kom ihåg lösenord?
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Kan inte citera poster utan BibTeX-nycklar. Generera nycklar nu?
 New\ technical\ report=Ny teknisk rapport
@@ -1827,14 +1748,12 @@ You\ must\ enter\ at\ least\ one\ field\ name=Du måste ange minst ett fältnamn
 Non-ASCII\ encoded\ character\ found=Bokstäver som inte är ASCII-kodade hittades
 Toggle\ web\ search\ interface=Växla webbsökning
 %0\ files\ found=%0 filer hittades
-%0\ of\ %1=%0 av %1
 One\ file\ found=En fil hittades
 The\ import\ finished\ with\ warnings\:=Importen avslutades med varningar\:
 There\ was\ one\ file\ that\ could\ not\ be\ imported.=Det fanns en fil som ej kunde importeras.
 There\ were\ %0\ files\ which\ could\ not\ be\ imported.=Det fanns %0 filer som ej kunde importeras.
 
 Migration\ help\ information=Migrationshjälp
-Click\ here\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=Klicka här för att se mer information om migration av libraryr från innan version 3.6.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Öpnnar en länk där den senaste utvecklingsversionen kan laddas ned
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=Se vad som har ändrats i de olika JabRef-versionerna
 Referenced\ BibTeX\ key\ does\ not\ exist=Refererad BibTeX-nyckel finns ej
@@ -1888,3 +1807,7 @@ View\ change\ log=Visa ändringar
 Website=Hemsida
 Write\ XMP-metadata\ to\ PDFs=Skriv XMP-metadata till PDFer
 
+Override\ default\ font\ settings=Ignorera normala typsnittsinställningar
+
+
+
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index 0f326aa3db2..99ae914743a 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<field name>
 
-<select>=<select>
-
 <select\ word>=<select word>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Paikliin ang talaarawan ng mga pangalan sa mga piniling entries (ISO ay pinaikli)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Paikliin ang talaarawan ng mga pangalan sa mga piniling entries (MEDLINE ay pinaikli)
@@ -34,12 +32,13 @@ Accept=Tanggapin
 
 Accept\ change=Tanggapin ang pagbabago
 
-Action=Aksyon
 
-What\ is\ Mr.\ DLib?=Ano ang Mr. DLib?
+Action=Aksyon
 
 Add=Magdagdag
 
+Add\ new=Magdagdag ng bago
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Idagdag ang (naipon) pasadya na importer ng klase mula sa klase ng landas.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Ang landas ay kinakailangan hindi sa classpath ng JabRef.
 
@@ -54,16 +53,12 @@ Add\ from\ folder=Magdagdag mula sa folder
 
 Add\ from\ JAR=Magdagdag mula sa JAR
 
-Add\ new=Magdagdag ng bago
-
 Add\ subgroup=Magdagdag ng mababang grupo
 
 Add\ to\ group=Idagdag sa grupo
 
 Added\ group\ "%0".=Nadagdag sa grupo "%0".
 
-Added\ new=Magdagdag ng bago
-
 Added\ string=Idinagdag na string
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Bukod pa nito, ang entries na <b>%0</b> ang patlang ay hindi naglalaman <b>%1</b> ay maaring italaga na manu-mano dito sa grupo sa pagpili nila tapos gumamit ng drag at drop o sa menu ng konteksto. Itong proseso ay nagdagdag ng mga termino <b>%1</b> sa bawat entry's <b>%0</b> sa patlang. Ang entries ay maaring maalis ng manu-mano mula dito sa grupo sa pagpili nila tapos paggamit sa menu ng konteksto. Itong proseso ay nag-aalis sa mga termino <b>%1</b> mula sa isang entry's <b>%0</b> sa patlang.
@@ -72,12 +67,8 @@ Advanced=Advanced
 All\ entries=Lahat ng entries
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Ang lahat ng entries ng ganitong uri ay idineklara ng hindi palatandaan. Pagpatuloy?
 
-All\ fields=Lahat ng mga patlang
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Palaging mag reformat sa BIB file sa pag-save at sa pag-export
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=Ang pagpatupad ng SAX ay naganap habang nag parsing '%0'\:
-
 and=at
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=anumang patlang ang nagtugma sa regular na ekspresyon <b>%0</b>
@@ -168,6 +159,7 @@ Clear\ fields=Malinaw na patlang
 
 Close=Sarado
 
+
 Close\ dialog=Isara ang dialog
 
 Close\ the\ current\ library=Isara ang kasalukuyang library
@@ -223,6 +215,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Hindi maaring tumakbo ang 'vim' programa.
 Could\ not\ save\ file.=Hindi makakapag-save ng file.
 Character\ encoding\ '%0'\ is\ not\ supported.=Pagkod ng mga Karakter '%0' ay hindi suportado.
 
+
 crossreferenced\ entries\ included=kasama ang mga crossreferenced entries
 
 Current\ content=Kasalukuyang nilalaman
@@ -258,8 +251,6 @@ Default\ grouping\ field=Default ang patlang na grupo
 
 Default\ pattern=Default na pattern
 
-Default\ sort\ criteria=Default na pamantayan ng pag-uuri
-
 Delete=Burahin
 
 Delete\ custom\ format=Tanggalin ang custom na format
@@ -279,8 +270,6 @@ Deleted=Na tanggal
 
 Permanently\ delete\ local\ file=Permanenting na tanggal ang lokal na file
 
-Delimit\ fields\ with\ semicolon,\ ex.=Ipinaglimit ang mga patlang na may semicolon, ex.
-
 Descending=Pababa na nagsunod-sunod
 
 Description=Paglalarawan
@@ -334,7 +323,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Dynamically an
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Dynamically ang grupo ng entries sa pamamagitan ng paghahanap sa patlang para sa keyword
 
-Each\ line\ must\ be\ on\ the\ following\ form=Bawat linya ay dapat nasa sumusunod na porma
 
 Edit=Baguhin
 
@@ -381,12 +369,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Uri ng entry
 
 Error=Nagkamali
-Error\ exporting\ to\ clipboard=Mali ang pagpapalabas sa clipboard
 
 Error\ occurred\ when\ parsing\ entry=Nagkaroon ng pagkakamali kapag nagpa-parse ng entry
 
 Error\ opening\ file=May mali sa pag bukas ng file
 
+
 Error\ while\ writing=Nagkamali habang nagsusulat
 
 '%0'\ exists.\ Overwrite\ file?='%0' umiiral. I-overwrite ang file?
@@ -416,8 +404,6 @@ External\ programs=Panlabas na mga programa
 
 External\ viewer\ called=Panlabas na pananaw ang tawag
 
-Fetch=Kunin
-
 Field=Patlang
 
 field=patlang
@@ -425,8 +411,6 @@ field=patlang
 Field\ name=Pangalan ng patlang
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Pangalan ng patlang ay hindi pinapayagan na maglaman ng puting espasyo o mga sumusunod na mga karakter
 
-Field\ to\ filter=Patlang para sa pag sala
-
 Field\ to\ group\ by=Patlang sa pamamagitan ng pag grupo
 
 File=File
@@ -441,13 +425,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Direktoryo ng file ay hind
 
 File\ exists=Umiiral ang file
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=Ang file ay na-update sa panlabas. Ano ang gusto mong gawin?
-
 File\ not\ found=Hindi makita ang file
 File\ type=Uri ng file
-
-File\ updated\ externally=Ang file ay na-update sa panlabas
-
 filename=filename
 
 Files\ opened=Nabuksan ang files
@@ -470,6 +449,7 @@ Float=Float
 
 for=para sa
 
+
 Format\ of\ author\ and\ editor\ names=Format ng may-adk at mga pangalan ng taga bago
 Format\ string=Format string
 
@@ -480,9 +460,9 @@ found\ in\ AUX\ file=nakita sa AUX na file
 
 Full\ name=Buong pangalan
 
+
 General=Pangkalahatan
 
-General\ fields=Pangkalahatang patlang
 
 Generate=Pagbuo
 
@@ -568,15 +548,13 @@ Importing=Nag-iimport
 
 Importing\ in\ unknown\ format=Nag-iimport sa di malamang format
 
-Include\ abstracts=Isama ang mga abstrak
-Include\ entries=Isama ang mga entries
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Isama ang mga mababang grupo\: Kapag napili, tingnan ang mga entries na nilalaman ng grupo o sa mababang grupo
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Malayang grupo\: Kapag pumili, tingnan lamang ang grupo ng mga entries
 
 Work\ options=Opsyon ng pagtatrabaho
 
+
 Insert=Ipasok
 
 Insert\ rows=Ipasok ang mga hanay
@@ -625,10 +603,6 @@ Leave\ file\ in\ its\ current\ directory=I-alis ang file sa kanyang kasalukuyang
 
 Left=Naiwan
 
-Limit\ to\ fields=Limitasyon ng mga patlang
-
-Limit\ to\ selected\ entries=Limitasyon sa pagpili ng mga entries
-
 Link=Ang link
 Link\ local\ file=Ang lokal na link ng file
 Link\ to\ file\ %0=Ang like sa file %0
@@ -650,8 +624,6 @@ Mark\ new\ entries\ with\ owner\ name=Markahan ang bagong entries na may pangala
 
 Memory\ stick\ mode=Memory stick mode
 
-Menu\ and\ label\ font\ size=Menu at libel sa laki ng font
-
 Merged\ external\ changes=Pagsamahin ang eksternal na pagbabago
 Merge\ fields=Pagsamahin ang patlang
 
@@ -677,6 +649,8 @@ Move\ up=Gumalaw paitaas
 
 Moved\ group\ "%0".=Nagalaw ang grupo "%0".
 
+
+
 Name=Pangalan
 Name\ formatter=Pangalan ng taga-format
 
@@ -694,8 +668,6 @@ New\ content=Bago ang nilalaman
 
 New\ library\ created.=May bagong library na nagawa.
 
-New\ field\ value=Bago ang halaga ng patlang
-
 New\ group=Bagong grupo
 
 New\ string=Bagong string
@@ -710,9 +682,6 @@ no\ library\ generated=walang library ang nabuo
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Walang entries ang nakita. Pakiusap na isigurado ang iyong paggamit sa wastong import filter.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Walang entries ang nakita para sa string ng paghahanap '%0'
-
 No\ entries\ imported.=Walang entries na napasok.
 
 No\ files\ found.=Walang nakitang file.
@@ -734,8 +703,6 @@ Nothing\ to\ redo=Walang dapat e-redo
 
 Nothing\ to\ undo=Walang ma-undo
 
-occurrences=mga pangyayari
-
 OK=OK
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Isa o mahigit na susi ang ma-overwrite. Ipagpatuloy?
@@ -772,13 +739,10 @@ Override=Override
 
 Override\ default\ file\ directories=I-override ang mga file na naka-default sa direktoryo
 
-Override\ default\ font\ settings=I-override ang mga default na font settings
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=I-override ang BibTex na patlang sa pamamagitan ng napili na teksyo
 
 
 Overwrite=I-overwrite
-Overwrite\ existing\ field\ values=I-overwrite ang umiiral na bilang ng patlang
 
 Overwrite\ keys=I-overwrite ang keys
 
@@ -814,6 +778,7 @@ Please\ enter\ the\ string's\ label=Pakiusap ipasok ang libel ng string
 
 Please\ select\ an\ importer.=Pakiusap pumili ng taga labas
 
+
 Possible\ duplicate\ entries=Maaari na makopya ang entries
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Maaari na makopya ang umiiral na entry. I-click upang malutas.
@@ -848,8 +813,6 @@ Redo=I-redo
 
 Reference\ library=Ang reference ng library
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=%0 references ay nakita. Bilang ng references ang kukunin?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Pinuhin ang supergroup\: Kapag napili, tingnan ang entries na nilalaman ng kapwa grupo at supergroup
 
 regular\ expression=regular na ekspresyon
@@ -908,13 +871,9 @@ Replace\ (regular\ expression)=Palitan (regular na ekspresyon)
 
 Replace\ string=Palitan ang string
 
-Replace\ with=Palitan ng
-
 Replace\ Unicode\ ligatures=Palitan ang Unicode ligatures
 Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Palitan ang mga Unicode ligatures na may pinalawak na porma
 
-Replaced=Palitan
-
 Required\ fields=Mga kailangan na patlang
 
 Reset\ all=I-reset ang lahat
@@ -923,6 +882,8 @@ Resolve\ strings\ for\ all\ fields\ except=Lutasin ang mga strings para sa lahat
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Lutasin ang mga strings para sa pamantayan ng BibTeX sa patlang lamang
 
 resolved=nalutas
+
+
 Review=Mag balig-aral
 Review\ changes=Suriin ang mga pagbabago
 Review\ Field\ Migration=Suriin ang patlang ng paglipat
@@ -941,10 +902,6 @@ Save\ library\ as...=I-save ang library bilang...
 
 Save\ entries\ in\ their\ original\ order=I-save ang entries sa kanilang orihinal na pagkasunod-sunod
 
-Save\ failed=Nabigo sa pag-save
-
-Save\ failed\ during\ backup\ creation=Nabigo sa pag-save habang gumagawa ng backup
-
 Saved\ library=Na-saved sa library
 
 Saved\ selected\ to\ '%0'.=I-saved ang napili sa '%0'.
@@ -958,8 +915,6 @@ Search=Ang paghahanap
 
 Search\ expression=Hanapin ang ekspresyon
 
-Search\ for=Hanapin ang
-
 Searching\ for\ duplicates...=Naghahanap ng kakopya...
 
 Searching\ for\ files=Naghahanap nga mga files
@@ -968,19 +923,16 @@ Secondary\ sort\ criterion=Pangalawang uri ng kriterya
 
 Select\ all=Piliin ang lahat
 
-Select\ encoding=Piliin ang encoding
-
 Select\ entry\ type=Piliin ang uri ng entry
-Select\ external\ application=Piliin ang eksternal na aplikasyon
 
 Select\ file\ from\ ZIP-archive=Piliin ang file mula sa na arkiba na ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Piliin ang nodes na puno para makita at matanggap o matanggihan ang pagbabago
-Selected\ entries=Ang mga napiling entries
+
 Set\ field=Ihanda ang patlang
 Set\ fields=Ihanda ang patlang
 
-Set\ general\ fields=Ihanda ang pangkalahatang patlang
+
 Set\ main\ external\ file\ directory=Itakda ang pangunahing eksternal na direktoryo ng file
 
 Settings=Mga settings
@@ -1036,8 +988,6 @@ Status=Katayuan
 
 Stop=Paghinto
 
-Strings=Mga strings
-
 Strings\ for\ library=Mga strings para sa library
 
 Sublibrary\ from\ AUX=Sublibrary mula sa AUX
@@ -1098,8 +1048,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Ang operasyong ito ay nangangailangan ng isa o higit pang mga entry na mapili.
 
+
 Toggle\ entry\ preview=I-toggle ang preview ng entry
 Toggle\ groups\ interface=I-toggle ang mga interface ng grupo
+
+
+
 Try\ different\ encoding=Subukan ang iba't ibang pag-encode
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Hindi nabuo ang mga pangalan ng journal ng napiling mga entry
@@ -1145,8 +1099,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=i-verifiy na
 View=Tanawin
 Vim\ server\ name=Pangalan ng serber sa Vim
 
-Waiting\ for\ ArXiv...=Naghihintay sa ArXiv...
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Balaan ang tungkol sa hindi pagkalutas ng kakopya kapag naisara ang inspeksyon na window
 
 Warn\ before\ overwriting\ existing\ keys=Balaan bago i-overwrite ang umiiral na mga susi
@@ -1178,7 +1130,6 @@ XMP-metadata=Ang XMP-metadata
 XMP-metadata\ found\ in\ PDF\:\ %0=Ang XMP-metadata ay nakita sa PDF\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Dapat mong i-restart ang JabRef para gumana ito.
 You\ have\ changed\ the\ language\ setting.=Pinalitan mo ang wika ng setting.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Naipasok mo ang isang hindi balidong paghahanap '%0'.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Dapat mong i-restart ang JabRef para ang bagong susi na bindings para gumana ng maayus.
 
@@ -1187,27 +1138,21 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Ang iyong bagong susi na bindings
 The\ following\ fetchers\ are\ available\:=Ang mga sumusunod na taga kuha ay magagamit\:
 Could\ not\ find\ fetcher\ '%0'=Hindi makita ang tagakuha '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Pagpapatakbo ng query '%0' na may tagakuha '%1'.
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=Query '%0' na may tagakuha '%1' hindi nagpabalik ng kahit anong mga resulta.
 
 Move\ file=Ang pagpalipat ng file
 Rename\ file=Palitan ulit ng pangalan ang file
 
+
 Move\ file\ failed=Ang paglipat ng file ay nabigo
 Could\ not\ move\ file\ '%0'.=Hindi mailipat ang file '%0'.
 Could\ not\ find\ file\ '%0'.=Hindi mahanap ang file na '%0'.
 Number\ of\ entries\ successfully\ imported=Ang bilang ng mga entry ay matagumpay na na-import
 Import\ canceled\ by\ user=Kinansela ang pag-import ng user
-Progress\:\ %0\ of\ %1=Isinasagawa\: %0 of %1
 Error\ while\ fetching\ from\ %0=Error habang kinukuha mula sa %0
 
-Please\ enter\ a\ valid\ number=Mangyaring magpasok ng wastong numero
 Show\ search\ results\ in\ a\ window=Ipakita ang mga resulta ng paghahanap sa isang window
 Show\ global\ search\ results\ in\ a\ window=Ipakita ang mga pandaigdigang resulta ng paghahanap sa isang window
 Search\ in\ all\ open\ libraries=Maghanap sa lahat ng bukas na mga aklatan
-Move\ file\ to\ file\ directory?=Ilipat ang file sa direktoryo ng file?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=Protektado ang library. Hindi mai-save hanggang sa masuri ang mga panlabas na pagbabago.
-Protected\ library=Protektadong library
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Tumangging i-save ang library bago masuri ang mga panlabas na pagbabago.
 Library\ protection=Proteksyon sa library
 Unable\ to\ save\ library=Hindi mai-save ang library
@@ -1219,16 +1164,13 @@ MIME\ type=Uri ng MIME
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Ang tampok na ito ay nagbibigay-daan sa mga bagong file na mabuksan o ma-import sa isang tumatakbo na halimbawa ng JabRef <BR> sa halip ng pagbubukas ng isang bagong pagkakataon. Halimbawa, ito ay kapaki-pakinabang kapag binuksan mo ang isang file sa JabRef <br> mula sa iyong web browser. <BR> Tandaan na ito ay pipigil sa iyo mula sa pagpapatakbo ng higit sa isang halimbawa ng JabRef sa isang pagkakataon.
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Magpatakbo ng fetcher, hal. "--fetch\=Medline\:cancer"
 
-The\ ACM\ Digital\ Library=Ang ACM Digital Library
 Reset=I-reset
 
 Use\ IEEE\ LaTeX\ abbreviations=Gumamit ng mga abbreviation ng IEEE LaTeX
-The\ Guide\ to\ Computing\ Literature=Ang Gabay sa Computing Literature
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Kapag binubuksan ang link ng file, maghanap ng pagtutugma ng file kung walang tinukoy na link
 Settings\ for\ %0=Mga setting para sa %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Pagsunod-sunurin ang mga sumusunod na patlang bilang mga numerong field
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Linya%0\: Natagpuan ang napinsala na BibTeX key.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Line %0\: Natagpuan ang napinsala na key ng BibTeX (naglalaman ng mga whitespace).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Line %0\: Natagpuan ang napinsala na BibTeX key (nawawala ang comma).
@@ -1239,7 +1181,6 @@ Append\ field=Ilagay ang field
 Append\ to\ fields=Ilagay sa mga patlang
 Rename\ field\ to=Palitan ang pangalan ng patlang sa
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Ilipat ang mga nilalaman ng isang patlang sa isang patlang na may ibang pangalan
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Maari mo lamang palitan ang pangalan ng isang patlang sa isang pagkakataon
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Hindi magagamit ang port %0 para sa remote na operasyon; maaaring gamitin ng isa pang application. Subukan ang pagtukoy ng isa pang port.
 
@@ -1259,9 +1200,6 @@ Formatter\ not\ found\:\ %0=Hindi nakita ang formater\: %0
 Clear\ inputarea=Maaliwalas na input
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Hindi mai-save, file na naka-lock sa pamamagitan ng isa pang halimbawa ng JabRef.
-File\ is\ locked\ by\ another\ JabRef\ instance.=Ang file ay naka-lock sa pamamagitan ng isa pang halimbawa ng JabRef.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Gusto mo bang i-override ang lock ng file?
-File\ locked=Naka-lock ang file
 Current\ tmp\ value=Kasalukuyang halaga ng tmp
 Metadata\ change=Pagbabago ng Metadata
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Ginawa ang mga pagbabago sa mga sumusunod na elemento ng metada
@@ -1270,7 +1208,6 @@ Generate\ groups\ for\ author\ last\ names=Bumuo ng mga grupo para sa mga huling
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Bumuo ng mga grupo mula sa mga keyword sa isang field ng BibTeX
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Ipatupad ang mga legal na karakter sa mga key ng BibTeX
 
-Save\ without\ backup?=I-save nang walang backup?
 Unable\ to\ create\ backup=Hindi makalikha ng backup
 Move\ file\ to\ file\ directory=Ilipat ang file sa file direktoryo
 Rename\ file\ to=Palitan ang pangalan ng file sa
@@ -1309,14 +1246,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Piliin ang pinagmulan para sa pa
 Create\ entry\ based\ on\ XMP-metadata=Lumikha ng entry batay sa XMP-metadata
 Create\ blank\ entry\ linking\ the\ PDF=Gumawa ng blangko na entry na nagli-link sa PDF
 Only\ attach\ PDF=Maglakip lamang ng PDF
-Title=Pamagat
 Create\ new\ entry=Lumikha ng bagong entry
 Update\ existing\ entry=Lumikha ng bagong entry
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Awtomatikong isali ang mga pangalan sa format ng 'Firstname Lastname'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Awtomatikong isali ang mga pangalan sa format ng 'Firstname Lastname' lamang
 Autocomplete\ names\ in\ both\ formats=Mga pangalan ng autocomplete sa parehong mga format
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.=Ang 'komento' na pangalan ay hindi maaaring gamitin bilang pangalan ng uri ng entry.
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Dapat kang maglagay ng isang integer na halaga sa patlang ng teksto para sa
 Send\ as\ email=Ipadala bilang email
 References=Mga reperensya
 Sending\ of\ emails=Pagpapadala ng mga email
@@ -1437,7 +1372,6 @@ Opens\ the\ file\ browser.=Buksan ang file browser.
 Scan\ directory=I-scan ang direktoryo
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Paghahanap ng mga napiling direktoryo para sa mga unlinked files.
 Starts\ the\ import\ of\ BibTeX\ entries.=Nagsisimula ang pag-import ng mga entry sa BibTeX.
-Leave\ this\ dialog.=Iwanan ang diaglog na ito.
 Create\ directory\ based\ keywords=Gumawa ng mga keyword batay sa direktoryo
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Lumikha ng mga keyword sa mga nilikha na entry sa mga pathname ng direktoryo
 Select\ a\ directory\ where\ the\ search\ shall\ start.=Pumili ng direktoryo kung saan magsisimula ang paghahanap.
@@ -1445,11 +1379,9 @@ Select\ file\ type\:=Pumili ng uri ng file\:
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=Ang mga file na ito ay hindi naka-link sa aktibong library.
 Entry\ type\ to\ be\ created\:=Uri ng pag-type na lilikhain\:
 Searching\ file\ system...=Naghahanap ng file system...
-Importing\ into\ Library...=Pag-import sa Library...
 Select\ directory=Piliin ang direktoryo
 Select\ files=Pumili ng mga file
 BibTeX\ entry\ creation=Paglikha ng BibTeX entry
-<No\ selection>=<No selection>
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=Hindi makakonekta sa serbisyong online ng FreeCite.
 Parse\ with\ FreeCite=Parse sa FreeCite
 How\ would\ you\ like\ to\ link\ to\ '%0'?=Paano mo gusto mag-link sa '%0'?
@@ -1490,7 +1422,6 @@ Toggle\ print\ status=I-toggle ang katayuan ng print
 Update\ keywords=I-update ang keywords
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Isulat ang halaga nga mga espesyal na patlang bilang hiwalay na patlang sa BibTeX
 You\ have\ changed\ settings\ for\ special\ fields.=Nabago mo ang settings para sa espesyal na mga patlang.
-%0\ entries\ found.\ To\ reduce\ server\ load,\ only\ %1\ will\ be\ downloaded.=%0 entries ang nakita. Para mabawasan ang serber rload, lamang %1 ang i-download.
 A\ string\ with\ that\ label\ already\ exists=Isang string na may libel ay umiiral na
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Koneksyon sa OpenOffice/LibreOffice ay nawala. Pakiusap na isigurado ang OpenOffie/LibreOffice ay tumatakbo, at subukang magkonek ulit.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=Ang JabRef ay magpapadala ng isang hiling bawat entry sa isang publisher.
@@ -1511,8 +1442,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Ang iyong estilo ng file ay nakatukoy sa nakatalata na format '%0', kung saan hindi natukoy ang iyong kasalukuyang OpenOffice/LibreOffice na dokumento.
 
 Searching...=Naghahanap...
-You\ have\ selected\ more\ than\ %0\ entries\ for\ download.\ Some\ web\ sites\ might\ block\ you\ if\ you\ make\ too\ many\ rapid\ downloads.\ Do\ you\ want\ to\ continue?=Ikay ay nakapili ng mahigit sa %0 na entries para sa iyong pag-download. May mga ilang web site na maaaring harangan ka sa iyong masyadong maramihang pag-download ng mabilis. Gusto mo bang ipagpatuloy?
-Confirm\ selection=Kumpirmahin ang napili
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Idagdag {} sa natukoy na salitang pamagat sa paghahanap para panatilihin na wasto ang kaso
 Import\ conversions=Pagpapasok ng mga conversyons
 Please\ enter\ a\ search\ string=Pakiusap sa pagpapasok ng string sa paghahanap
@@ -1522,7 +1451,6 @@ Canceled\ merging\ entries=Ikansela ang pagsama-sama ng mga entries
 
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=I-format ang mga yunit sa pamamagitan ng pagdaragdag ng mga non-breaking separator at pagsunod sa tamang kaso sa paghahhanap
 Merged\ entries=Pinagsama na mga entry
-Merged\ entry=Pinagsama na entry
 None=Wala
 Parse=Parse
 Result=Resulta
@@ -1604,9 +1532,7 @@ Add\ new\ file\ type=Magdagdag ng bagong uri ng file
 
 Left\ entry=Kaliwang entry
 Right\ entry=Kanang entry
-Use=Gamit
 Original\ entry=Ang orihinal na entry
-Replace\ original\ entry=Palitan ang orihinal na entry
 No\ information\ added=Walang impormasyon ang na dagdag
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Piliin kahit isang entry lamang para mag pamahalaan ang keywords.
 OpenDocument\ text=OpenDocument na teksto
@@ -1625,7 +1551,6 @@ Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Pakiusap ilipat ang fil
 Could\ not\ connect\ to\ %0=Hindi maka konekta sa %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Babala\: %0 mula sa %1 na entries ay hindi natukoy ang pamagat.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Babala\: %0 mula sa %1 na entries ang hindi natukoy sa BibTeX na susi.
-occurrence=mga pangyayari
 Added\ new\ '%0'\ entry.=Nadagdag ang bagong '%0' entry.
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Maramihang entries ang napili. Gusto mo bang bagohin ang uri ng lahat ng to '%0'?
 Changed\ type\ to\ '%0'\ for=Palitang ang uri sa '%0' para
@@ -1644,8 +1569,6 @@ Library\ '%0'\ has\ changed.=Binago ang Library '%0'.
 Print\ entry\ preview=I-print ang preview ng entry
 Copy\ title=Kopyahin ang pamagat
 Copy\ \\cite{BibTeX\ key}=Kopyahin \\cite{BibTeX key}
-File\ rename\ failed\ for\ %0\ entries.=Nabigo ang rename file para sa %0 entries.
-Merged\ BibTeX\ source\ code=Pinagsama ang source code ng BibTeX
 Invalid\ DOI\:\ '%0'.=Di-wastong DOI\: '%0'.
 should\ start\ with\ a\ name=dapat magsimula sa isang pangalan
 should\ end\ with\ a\ name=dapat magtapos sa isang pangalan
@@ -1749,9 +1672,7 @@ Shared\ version\:\ %0=Ibinahagi na bersyon\: %0
 Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Mangyaring pagsamahin ang nakabahaging entry sa iyo at pindutin ang "Pagsamahin ang mga entry" upang malutas ang problemant ito.
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Ang pagkansela sa operasyon ito ay iiwan ang iyong mga pagbabago na hindi naka-sync. Kanselahin pa rin?
 Shared\ entry\ is\ no\ longer\ present=Ang nakabahaging entry ay wala na
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=Ang BibEntry na kasalukuyang ginagawa mo ay tinanggal na sa shared side.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Maaari mong ibalik ang entry gamit ang "I-undo" na operasyon.
-Remember\ password?=Tandaan ang password?
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Nakakonekta ka na sa database gamit ang mga detalye ng koneksyon.
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Hindi mai-cite ang mga entry nang walang BibTeX key. Bumuo ng mga key ngayon?
@@ -1767,7 +1688,6 @@ You\ must\ enter\ at\ least\ one\ field\ name=Dapat kang magpasok ng hindi babab
 Non-ASCII\ encoded\ character\ found=Natagpuan ang naka-encode na karakter na hindi-ASCII
 Toggle\ web\ search\ interface=I-toggle ang interface ng paghahanap sa web
 %0\ files\ found=%0 na mga natagpuang file
-%0\ of\ %1=%0 ng %1
 One\ file\ found=Natagpuan ang isang file
 The\ import\ finished\ with\ warnings\:=Ang pag-import ay tapos na sa mga babala\:
 There\ was\ one\ file\ that\ could\ not\ be\ imported.=Merong isang file na hindi ma-import.
@@ -1776,7 +1696,6 @@ There\ were\ %0\ files\ which\ could\ not\ be\ imported.=May mga %0 na mga file
 Migration\ help\ information=Impormasyon ng tulong sa paglilipat
 Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Ang pinasok na database ay lipas na istraktura at hindi na sinusuportahan.
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Gayunpaman, isang bagong database ay nilikha sa tabi ng pre-3.6 na isa.
-Click\ here\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=Mag-click dito upang malaman ang tungkol sa migration ng mga pre-3.6 database.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Binubuksan ang isang link kung saan maaaring ma-download ang kasalukuyang bersyon ng pag-unlad
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=Tingnan kung ano ang nabago sa mga bersyon ng JabRef
 Referenced\ BibTeX\ key\ does\ not\ exist=Ang naka-refer na BibTeX key ay hindi umiiral
@@ -1869,3 +1788,7 @@ Abbreviate\ journal\ names\ (ISO)=Paikliin ang mga pangalan sa jurnal(ISO)
 Abbreviate\ journal\ names\ (MEDLINE)=Paikliin ang mga pangalan sa jurnal (MEDLINE)
 New\ %0\ library=Bago ang %0 library
 
+Override\ default\ font\ settings=I-override ang mga default na font settings
+
+
+
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index f77b954bf0e..74a54e41bbf 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<alan adı>
 
-<select>=<seç>
-
 <select\ word>=<sözcük seç>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Seçili girdilerin dergi isimlerini kısalt (ISO kısaltması)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Seçili girdilerin dergi isimlerini kısalt (MEDLINE kısaltması)
@@ -34,12 +32,13 @@ Accept=Kabul et
 
 Accept\ change=Değişikliği kabul et
 
-Action=Eylem
 
-What\ is\ Mr.\ DLib?=Bay DLib nedir?
+Action=Eylem
 
 Add=Ekle
 
+Add\ new=Yeni ekle
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Bir sınıf yolundan (derlenmiş) özel İçeAlmaBiçemi sınıfı ekle.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Yolun JabRef'in sınıf yolunda olması gerekmez.
 
@@ -54,16 +53,12 @@ Add\ from\ folder=Klasörden ekle
 
 Add\ from\ JAR=JAR'dan ekle
 
-Add\ new=Yeni ekle
-
 Add\ subgroup=Altgrup ekle
 
 Add\ to\ group=Gruba ekle
 
 Added\ group\ "%0".="%0" grubu eklendi.
 
-Added\ new=Yeni eklendi
-
 Added\ string=Dizgi eklendi
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Ek olarak, <b>%0</b> alanları <b>%1</b> içermeyen girdiler seçilip, bu gruba sürükle ve bırak ya da bağlam menüsü kullanılarak elle atanabilir. Bu süreç her bir girdinin <b>%0</b> alanına <b>%1</b> terimini ekler. Girdiler
@@ -72,12 +67,8 @@ Advanced=Gelişmiş
 All\ entries=Tüm girdiler
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Bu türeden tüm girdiler türsüz olarak bildirilecek. Devam edilsin mi?
 
-All\ fields=Tüm alanlar
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Kaydetme ve dışa aktarmada BIB dosyasını her zaman yeniden biçemle
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:='%0' ayrıştırılırken bir SAXİstisnası oluştu\:
-
 and=ve
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=<b>%0</b> düzenli ifadesine uyan herhangi bir alan
@@ -129,6 +120,7 @@ Backup\ old\ file\ when\ saving=Kaydederken eski dosyayı yedekle
 Browse=Göz at
 
 by=ile
+The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=Bu girdilerin çakışan alanları 'Yorum' alanına katıştırılır.
 
 Cancel=İptal
 
@@ -167,6 +159,7 @@ Clear\ fields=Alanları sil
 
 Close=Kapat
 
+
 Close\ dialog=Dialoğu kapat
 
 Close\ the\ current\ library=Güncel veritabanını kapat
@@ -222,6 +215,7 @@ Could\ not\ run\ the\ 'vim'\ program.='Vim' programı çalıştırılamıyor.
 Could\ not\ save\ file.=Dosya kaydedilemiyor.
 Character\ encoding\ '%0'\ is\ not\ supported.='%0' karakter kodlaması desteklenmiyor.
 
+
 crossreferenced\ entries\ included=çapraz bağlantılı girdiler dahil edildi
 
 Current\ content=Güncel içerik
@@ -257,8 +251,6 @@ Default\ grouping\ field=Öntanımlı gruplama alanı
 
 Default\ pattern=Öntanımlı desen
 
-Default\ sort\ criteria=Öntanımlı sıralama ölçütleri
-
 Delete=Sil
 
 Delete\ custom\ format=Özel biçemi sil
@@ -279,8 +271,6 @@ Deleted=Silindi
 
 Permanently\ delete\ local\ file=Yerel dosyayı sil
 
-Delimit\ fields\ with\ semicolon,\ ex.=Alanları ör. noktalı virgülle sınırlandır
-
 Descending=Azalan
 
 Description=Tarif
@@ -335,7 +325,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Serbest form a
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Bir alan ya da anahtar sözcük aramayla devingence grup girdileri
 
-Each\ line\ must\ be\ on\ the\ following\ form=Her satır aşağıdaki biçimde olmalıdır
 
 Edit=Düzenle
 
@@ -382,12 +371,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Girdi türleri
 
 Error=Hata
-Error\ exporting\ to\ clipboard=Panoya aktarmada hata
 
 Error\ occurred\ when\ parsing\ entry=Girdi ayrıştırılırken hata oluştu
 
 Error\ opening\ file=Dosya açmada hata
 
+
 Error\ while\ writing=Yazarken hata
 
 '%0'\ exists.\ Overwrite\ file?='%0' mevcut. Dosyanın üzerine yazılsın mı?
@@ -405,6 +394,7 @@ Export\ properties=Özellikleri dışa aktar
 
 Export\ to\ clipboard=Panoya aktar
 
+Export\ to\ text\ file.=Metin dosyasına aktar.
 
 Exporting=Dışa aktarılıyor
 Extension=Uzantı
@@ -417,8 +407,6 @@ External\ programs=Harici programlar
 
 External\ viewer\ called=Harici görüntüleyici çağrıldı
 
-Fetch=Getir
-
 Field=Alan
 
 field=alan
@@ -426,8 +414,6 @@ field=alan
 Field\ name=Alan adı
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Alan adlarının boşluk ya da aşağıdaki karakterleri içermesine izin verilmez
 
-Field\ to\ filter=Süzülecek alan
-
 Field\ to\ group\ by=Gruplanacak alan
 
 File=Dosya
@@ -442,13 +428,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Dosya dizini kurulmadı ya
 
 File\ exists=Dosya mevcut
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=Dosya haricen değiştirildi. Ne yapmak istersiniz?
-
 File\ not\ found=Dosya bulunamadı
 File\ type=Dosya türü
-
-File\ updated\ externally=Dosya haricen güncellendi
-
 filename=dosya adı
 
 Files\ opened=Açılmış dosyalar
@@ -471,6 +452,7 @@ Float=Yüzdür
 
 for=için
 
+
 Format\ of\ author\ and\ editor\ names=Yazar ve düzenleyici adları biçemi
 Format\ string=Dizgeyi Biçimle
 
@@ -481,9 +463,9 @@ found\ in\ AUX\ file=yardımcı dosyada bulundu
 
 Full\ name=Tam ad
 
+
 General=Genel
 
-General\ fields=Genel alanlar
 
 Generate=Oluştur
 
@@ -504,6 +486,7 @@ Get\ fulltext=Tammetni getir
 Gray\ out\ non-hits=İsabet almayanları grileştir
 
 Groups=Gruplar
+has/have\ both\ a\ 'Comment'\ and\ a\ 'Review'\ field.=hem 'Yorum' hem de 'İnceleme' alani var.
 
 Have\ you\ chosen\ the\ correct\ package\ path?=Doğru paket yolunu seçtiniz mi?
 
@@ -568,15 +551,13 @@ Importing=İçe aktarılıyor
 
 Importing\ in\ unknown\ format=Bilinmeyen biçemde içe aktarılıyor
 
-Include\ abstracts=Özetleri içer
-Include\ entries=Alanları içer
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Altgrupları içer\: Seçildiğinde, bu grup ya da altgruplarındaki girdileri göster
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Bağımsız grup\: Seçildiğinde, yalnızca bu grubun girdilerini göster
 
 Work\ options=Çalışma seçenekleri
 
+
 Insert=Ekle
 
 Insert\ rows=Satır ekle
@@ -626,10 +607,6 @@ Leave\ file\ in\ its\ current\ directory=Dosyayı şimdiki dizininde bırak
 
 Left=Sol
 
-Limit\ to\ fields=Alanlara kısıtla
-
-Limit\ to\ selected\ entries=Seçili girdilere kısıtla
-
 Link=Bağlantı
 Link\ local\ file=Yerel dosyayı bağla
 Link\ to\ file\ %0=%0 dosyasına bağla
@@ -652,9 +629,8 @@ Mark\ new\ entries\ with\ owner\ name=Yeni girdileri sahip adıyla işaretle
 
 Memory\ stick\ mode=Bellek Çubuğu Kipi
 
-Menu\ and\ label\ font\ size=Menü ve etiket yazı tipi boyutu
-
 Merged\ external\ changes=Harici değişiklikler birleştirildi
+Merge\ fields=Alanları birleştir
 
 Messages=Mesajlar
 
@@ -678,6 +654,8 @@ Move\ up=Yukarı taşı
 
 Moved\ group\ "%0".="%0" grubu taşındı.
 
+
+
 Name=Ad
 Name\ formatter=Ad biçemleyici
 
@@ -695,8 +673,6 @@ New\ content=Yeni içerik
 
 New\ library\ created.=Yeni veritabanı oluşturuldu.
 
-New\ field\ value=Yeni alan değeri
-
 New\ group=Yeni grup
 
 New\ string=Yeni dizge
@@ -711,9 +687,6 @@ no\ library\ generated=veritabanı üretilmedi
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Girdi bulunmadı. Lütfen doğru içe aktarma süzgecini kullandığınızdan emin olun.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Arama dizgesi '%0' için bir girdi bulunmadı
-
 No\ entries\ imported.=Hiçbir girdi içe aktarılmadı.
 
 No\ files\ found.=Hiçbir dosya bulunmadı.
@@ -735,8 +708,6 @@ Nothing\ to\ redo=Yinelenecek bir şey yok
 
 Nothing\ to\ undo=Geriye alınacak bir şey yok
 
-occurrences=görülme sıklığı
-
 OK=Tamam
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Bir ya da daha çok anahtarın üzerine yazılacak. Devam edilsin mi?
@@ -776,13 +747,10 @@ Override=Geçersiz kıl
 
 Override\ default\ file\ directories=Öntanımlı dosya dizinlerini geçersiz kıl
 
-Override\ default\ font\ settings=Öntamınlı yazıtipi ayarlarını geçersiz kıl
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=BibTeX anahtarını seçili metinle yenile
 
 
 Overwrite=Üzerine yaz
-Overwrite\ existing\ field\ values=Mevcut alan değerlerinin üzerine yaz
 
 Overwrite\ keys=Anahtarların üzerine yaz
 
@@ -818,6 +786,7 @@ Please\ enter\ the\ string's\ label=Lütfen dizgenin etiketini giriniz
 
 Please\ select\ an\ importer.=Lütfen bir içe aktarıcı seçiniz.
 
+
 Possible\ duplicate\ entries=Olası çift nüsha girdiler
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Mevcut girdinin olası çift nüshası. Düzeltmek için tıklayınız.
@@ -853,8 +822,6 @@ Redo=Yeniden yap
 
 Reference\ library=Başvuru veritabanı
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Bulunan başvurular\: %0. Getirilecek başvuru sayısı?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Supergrubu arıt\: Seçildiğinde, hem bu grubun, hem de süpergrubunun içerdiği girdileri görüntüle
 
 regular\ expression=Düzenli İfade
@@ -913,10 +880,8 @@ Replace\ (regular\ expression)=Yerine koy (düzenli ifade)
 
 Replace\ string=Dizgenin yerine koy
 
-Replace\ with=Şununla değiştir
-
-
-Replaced=Değiştirildi
+Replace\ Unicode\ ligatures=Unicode bitişik harfleri başkalarıyla değiştir
+Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Unicode bitişik harfleri genişletilmiş formlarıyla değiştirir
 
 Required\ fields=Zorunlu alanlar
 
@@ -926,8 +891,11 @@ Resolve\ strings\ for\ all\ fields\ except=Şu hariç tüm alanların dizgelerin
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Yalnızca standart BibTeX alan dizgelerini çözümle
 
 resolved=çözümlendi
+
+
 Review=Gözden geçir
 Review\ changes=Değişklikleri incele
+Review\ Field\ Migration=Alan Birleştirmeyi İncele
 
 Right=Sağ
 
@@ -943,10 +911,6 @@ Save\ library\ as...=Veritabanını farklı kaydet ...
 
 Save\ entries\ in\ their\ original\ order=Girdileri orijinal sıralarında kaydet
 
-Save\ failed=Kaydetme başarısız
-
-Save\ failed\ during\ backup\ creation=Yedek oluşturulurken kaydetme başarısız
-
 Saved\ library=Kaydedilmiş veritabanı
 
 Saved\ selected\ to\ '%0'.=Seçim şuraya kaydedildi '%0'.
@@ -960,8 +924,6 @@ Search=Ara
 
 Search\ expression=İfade ara
 
-Search\ for=Şunu ara
-
 Searching\ for\ duplicates...=Çift nüshalar aranıyor...
 
 Searching\ for\ files=Dosyalar aranıyor
@@ -970,19 +932,16 @@ Secondary\ sort\ criterion=İkincil sıralama kriteri
 
 Select\ all=Tümünü seç
 
-Select\ encoding=Kodlamayı seç
-
 Select\ entry\ type=Girdi türünü seç
-Select\ external\ application=Harici uygulamayı seç
 
 Select\ file\ from\ ZIP-archive=ZIP arşivinden dosyayı seçiniz
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Değişiklikleri görmek ve kabul ya da reddetmek için ağaç düğümlerini seçiniz
-Selected\ entries=Seçili girdiler
+
 Set\ field=Alanı ata
 Set\ fields=Alanları ata
 
-Set\ general\ fields=Genel alanları ata
+
 Set\ main\ external\ file\ directory=Ana harici dosya dizinini ayarla
 
 Settings=Ayarlar
@@ -1013,8 +972,10 @@ Show\ required\ fields=Zorunlu alanları göster
 
 Show\ URL/DOI\ column=URL/DOI sütununu göster
 
+Show\ validation\ messages=Doğrulama iletileri göster
 
 Simple\ HTML=Basit HTML
+Since\ the\ 'Review'\ field\ was\ deprecated\ in\ JabRef\ 4.2,\ these\ two\ fields\ are\ about\ to\ be\ merged\ into\ the\ 'Comment'\ field.='İnceleme' alanı JabRef 4.2'de bulunmadığı için, bu iki alan 'Yorum' alanında birleştirilmek üzeredir.
 
 Size=Boyut
 
@@ -1023,6 +984,7 @@ Skipped\ -\ PDF\ does\ not\ exist=Atlandı - PDF mevcut değil
 
 Skipped\ entry.=Girdi atlandı.
 
+Some\ appearance\ settings\ you\ changed\ require\ to\ restart\ JabRef\ to\ come\ into\ effect.=Değiştirdiğiniz bazı görünüm ayarlarının yürürlüğe girmesi için, JabRef'in yeniden başlatılması gerekmektedir.
 
 source\ edit=kaynak düzenle
 Special\ name\ formatters=Özel Ad Biçemleyicileri
@@ -1035,8 +997,6 @@ Status=Durum
 
 Stop=Dur
 
-Strings=Dizgeler
-
 Strings\ for\ library=Veritabanı için dizgeler
 
 Sublibrary\ from\ AUX=Yardımcıdan (AUX) altveritabanı
@@ -1097,13 +1057,18 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Bu işlem, bir ya da daha çok girdinin seçili olmasını gerektirir.
 
+
 Toggle\ entry\ preview=Girdi önizlemeyi aç/kapat
 Toggle\ groups\ interface=Grup arayüzünü aç/kapat
+
+
+
 Try\ different\ encoding=Başka kodlama deneyin
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Seçili girdilerin dergi adlarını kısaltma
 Unabbreviated\ %0\ journal\ names.=%0 dergi adı kısaltması kaldırıldı.
 
+Unable\ to\ open\ %0=%0 açılamıyor
 Unable\ to\ open\ link.\ The\ application\ '%0'\ associated\ with\ the\ file\ type\ '%1'\ could\ not\ be\ called.=Link açılamadı. '%1' dosya türüyle ilişkili '%0' uygulaması çağrılamadı.
 unable\ to\ write\ to=Şuraya yazılamadı
 
@@ -1130,6 +1095,7 @@ Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Eski harici dosy
 usage=kullanım
 Use\ autocompletion\ for\ the\ following\ fields=Aşağıdaki alanlar için otomatik tamamlamayı kullan
 
+Tweak\ font\ rendering\ for\ entry\ editor\ on\ Linux=Linux'un girdi düzenleyicisi için yazıtipi ince ayarları
 Use\ regular\ expression\ search=Düzenli İfade Aramayı kullan
 
 Username=Kullanıcı adı
@@ -1143,8 +1109,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=LyX'in çalı
 View=Görüntüle
 Vim\ server\ name=Vim Sunucu Adı
 
-Waiting\ for\ ArXiv...=ArXiv bekleniyor...
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=İnceleme penceresi kapanırken çözülmemiş çift nüshalar hakkında uyar
 
 Warn\ before\ overwriting\ existing\ keys=Mevcut anahtarların üzerine yazmadan önce uyar
@@ -1176,7 +1140,6 @@ XMP-metadata=XMP metaverisi
 XMP-metadata\ found\ in\ PDF\:\ %0=PDF'de XMP metaverisi bulundu\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Bunun etkinleşmesi için JabRefi yeniden başlatmalısınız.
 You\ have\ changed\ the\ language\ setting.=Dil ayarını değiştirdiniz.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Geçersiz bir arama girdiniz '%0'.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Yeni anahtar demetlerinin düzgün çalışması için JabRef'i yeniden başlatmalısınız.
 
@@ -1185,27 +1148,21 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Yeni anahtar demetleriniz kaydedil
 The\ following\ fetchers\ are\ available\:=Aşağıdaki getiriciler kullanıma hazırdır\:
 Could\ not\ find\ fetcher\ '%0'='%0' getiricisi bulunamadı
 Running\ query\ '%0'\ with\ fetcher\ '%1'.='%0' sorgusu '%1' getiricisiyle çalıştırılıyor.
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.='%1' getiricisiyle '%0' sorgusu hiçbir sonuç döndürmedi.
 
 Move\ file=Dosya Taşı adlandır
 Rename\ file=Yeniden adlandır
 
+
 Move\ file\ failed=Dosya taşıma başarısız
 Could\ not\ move\ file\ '%0'.='%0' dosya taşınamıyor.
 Could\ not\ find\ file\ '%0'.='%0' dosyası bulunamadı.
 Number\ of\ entries\ successfully\ imported=Girdi sayısı başarıyla içe aktarıldı
 Import\ canceled\ by\ user=İçe aktrım kullanıcı tarafından iptal edildi
-Progress\:\ %0\ of\ %1=İlerleme\: %1'in %0'i
 Error\ while\ fetching\ from\ %0=%0'dan getirme sırasında hata
 
-Please\ enter\ a\ valid\ number=Lütfen geçerli bir sayı giriniz
 Show\ search\ results\ in\ a\ window=Arama sonuçlarını bir pencerede göster
 Show\ global\ search\ results\ in\ a\ window=Küresel arama sonuçlarını bir pencerede göster
 Search\ in\ all\ open\ libraries=Tüm açık veri tabanlarında ara
-Move\ file\ to\ file\ directory?=Dosya, dosya dizinine taşınsın mı?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=Veritabanı korunuyor. Harici değişiklikler gözden geçirilene dek kaydedemezsiniz.
-Protected\ library=Korunan veritabanı
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Harici değişiklikler gözden geçirilene dek veritabanının kaydedilmesini reddet.
 Library\ protection=Veirtabanı koruması
 Unable\ to\ save\ library=Veritabanı kaydedilemedi
@@ -1217,26 +1174,25 @@ MIME\ type=MIME türü
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Bu özellik yeni dosyaların yeni bir oturum açmaktansa halen çalışmakta olan bir<BR>JabRef oturumu içine açılması ya da aktrılmasını sağlar. Örneğin bu, tarayıcınızdan bir dosyayı<br>JabRef içine açtığnızda kullanışlıdır.<BR>Bunun, birden fazla JabRef oturumunu aynı anda çalıştırmanızı önleyeceğini not ediniz.
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Getiriciyi Çalıştır, Örnek "--fetch\=Medline\:cancer"
 
-The\ ACM\ Digital\ Library=ACM Sayısal Kütüphane
 Reset=Sıfırla
 
 Use\ IEEE\ LaTeX\ abbreviations=IEEE LaTeX kısaltmaları kullanınız
-The\ Guide\ to\ Computing\ Literature=Bilgi İşlem Literatürü Klavuzu
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Dosya bağlantısını açarken, eğer link tanımlanmamışsa eşleşen dosyayı ara
 Settings\ for\ %0=%0 için ayarlar
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Aşağıdaki alanları sayısal olarak sırala
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Satır %0\: Bozulmuş BibTeX-anahtarı bulundu.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Satır %0\: Bozulmuş BibTeX-anahtarı bulundu (beyaz boşluk içeriyor).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Satır %0\: Bozulmuş BibTeX-anahtarı bulundu (virgül kayıp).
+No\ full\ text\ document\ found=Tam metin belge bulunamadı
 Update\ to\ current\ column\ order=Varolan sütun sırasına güncelle
 Download\ from\ URL=URL'den indir
 Rename\ field=Alanın adını değiştir
 Set/clear/append/rename\ fields=Alanları ata/sil/yeniden adlandır
+Append\ field=Alan ekle
+Append\ to\ fields=Alanlara ekle
 Rename\ field\ to=Alan adını şuna değiştir
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Alan içeriğini başka isimli bir alanın içine taşı
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Bir seferde yalnızca bir alanın adını değiştirebilirsiniz
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Uzak operasyon için bağlantı noktası %0 kullanılamıyor; bir başka program kullanıyor olabilir. Başka bir bağlantı noktası deneyin.
 
@@ -1256,9 +1212,6 @@ Formatter\ not\ found\:\ %0=Biçimleyici bulunamadı\: %0
 Clear\ inputarea=Girdi alanını temizle
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Kaydedilemiyor, dosya başka bir JabRef oturumunca kilitlenmiş.
-File\ is\ locked\ by\ another\ JabRef\ instance.=Dosya başka bir JabRef oturumunca kilitlenmiş.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Dosya kilidini geçersiz kılmak ister misiniz?
-File\ locked=Dosya kilitli
 Current\ tmp\ value=Mevcut tmp değeri
 Metadata\ change=Metadata değişikliği
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Aşağıdaki metadata ögelerinde değişiklik yapıldı
@@ -1267,7 +1220,6 @@ Generate\ groups\ for\ author\ last\ names=Yazar soyadları için grup oluştur
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Bir BibTeX alanındaki anahtar sözcüklerden grup oluştur
 Enforce\ legal\ characters\ in\ BibTeX\ keys=BibTeX anahtarlarında yasal karakterleri zorla
 
-Save\ without\ backup?=Yedeklemeden kaydedilsin mi?
 Unable\ to\ create\ backup=Yedek oluşturulamadı
 Move\ file\ to\ file\ directory=Dosyayı dosya dizinine taşı
 Rename\ file\ to=Dosyayı şuna yeniden adlandır
@@ -1306,14 +1258,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=Metaverisini içe aktarmak için
 Create\ entry\ based\ on\ XMP-metadata=XMP verisine dayanarak girdi oluştur
 Create\ blank\ entry\ linking\ the\ PDF=PDF'yle bağlantılı olarak boş girdi oluştur
 Only\ attach\ PDF=Yalnızca PDF'yi ekle
-Title=Başlık
 Create\ new\ entry=Yeni Girdi Oluştur
 Update\ existing\ entry=Mevcut Girdiyi Güncelle
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=İsimleri yalnızca 'Ad Soyad' biçiminde otomatik tamamla
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=İsimleri yalnızca 'Soyad, Ad' biçiminde otomatik tamamla
 Autocomplete\ names\ in\ both\ formats=İsimleri her iki biçimde otomatik tamamla
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.='comment' ismi bir girdi türü ismi olarak kullanılamaz.
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=Şunun için metin alanına bir tamsayı girmelisiniz
 Send\ as\ email=Eposta olarak gönder
 References=Kaynaklar
 Sending\ of\ emails=Epostalar gönderiliyor
@@ -1435,7 +1385,6 @@ Opens\ the\ file\ browser.=Dosya göz atıcısını başlatır.
 Scan\ directory=Dizini tara
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Seçili dizini bağlantısız dosyalar için tarar.
 Starts\ the\ import\ of\ BibTeX\ entries.=BibTeX girdilerinin içe aktarımı başlatır.
-Leave\ this\ dialog.=Bu iletişim kutusunu terket.
 Create\ directory\ based\ keywords=Dizin tabanlı anahtar sözcükler oluştur
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=Oluşturulan girdilerde dizin yol adlarıyla anahtar sözcükler oluşturur
 Select\ a\ directory\ where\ the\ search\ shall\ start.=Aramanın başlayacağı dizini seçin.
@@ -1443,11 +1392,9 @@ Select\ file\ type\:=Dosya türü seçin\:
 These\ files\ are\ not\ linked\ in\ the\ active\ library.=Bu dosyaların aktif veri tabanında bağlantıları yok.
 Entry\ type\ to\ be\ created\:=Oluşturulacak girdi türü\:
 Searching\ file\ system...=Dosya sistemi aranıyor...
-Importing\ into\ Library...=Veritabanına aktarılıyor...
 Select\ directory=Dizin seç
 Select\ files=Dosya seç
 BibTeX\ entry\ creation=BibTeX girdisi oluşturma
-<No\ selection>=<Seçim yok>
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=FreeCite çevrimiçi servisine bağlanılamadı.
 Parse\ with\ FreeCite=FreeCite ile çözümle
 How\ would\ you\ like\ to\ link\ to\ '%0'?='%0'a nasıl bağlantı istersiniz?
@@ -1489,7 +1436,6 @@ Toggle\ print\ status=Yazdırma statüsünü değiştir
 Update\ keywords=Anahtar sözcükleri güncelle
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Özel alan değerlerini BibTeX'e ayrı alanlar olarak yaz
 You\ have\ changed\ settings\ for\ special\ fields.=Özel alan ayarlarını değiştirdiniz.
-%0\ entries\ found.\ To\ reduce\ server\ load,\ only\ %1\ will\ be\ downloaded.=%0 girdi bulundu. Sunucu yükünü azaltmak için yalnızca %1 indirilecek.
 A\ string\ with\ that\ label\ already\ exists=Bu etikete sahip bir dizge zaten mevcut
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=OpenOffice/LibreOffice bağlantısı koptu. Lütfen OpenOffice/LibreOffice'in açık olduğunu teyid edin, ve tekrar bağlanmayı deneyin.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef bir yayıncıya en az bir istem gönderecek.
@@ -1510,8 +1456,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Stil dosyanız, mevcut OpenOffice/LibreOffice belgenizde tanımlanmamış olan '%0' paragraf formatını belirtiyor.
 
 Searching...=Arıyor...
-You\ have\ selected\ more\ than\ %0\ entries\ for\ download.\ Some\ web\ sites\ might\ block\ you\ if\ you\ make\ too\ many\ rapid\ downloads.\ Do\ you\ want\ to\ continue?=İndirmek için %0'dan fazla girdi seçtiniz. Çok sayıda hızlı indirme yaparsanız bazı web siteleri sizi bloke edebilir. Devam etmek istiyor musunuz?
-Confirm\ selection=Seçimi onayla
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Aramada doğru küçük büyük harf seçimi için belirli başlık sözcüklerine {} ekleyin
 Import\ conversions=Dönüşümleri içe aktar
 Please\ enter\ a\ search\ string=Lütfen bir arama dizgesi girin
@@ -1522,7 +1466,6 @@ Canceled\ merging\ entries=Girdilerin birleştirilmesi iptal edildi
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Birimleri bölünemez ayraçlar ekleyerek ve aramadaki büyük küçük harfleri koruyarak biçimle
 Merge\ entries=Girdileri birleştir
 Merged\ entries=Girdiler yeni birine birleştirildi ve eskiler korundu
-Merged\ entry=Birleşmiş girdi
 None=Hiç
 Parse=Ayrıştır
 Result=Sonuç
@@ -1583,6 +1526,7 @@ Show\ printed\ status=Yazdırma statüsünü göster
 Show\ read\ status=Okunma statüsünü göster
 
 Opens\ JabRef's\ GitHub\ page=JabRef'in GitHub sayfasını açar
+Opens\ JabRef's\ Twitter\ page=JabRef'in Twitter sayfasını açar
 Opens\ JabRef's\ Facebook\ page=JabRef'in Facebook sayfasını açar
 Opens\ JabRef's\ blog=JabRef'in ağ güncesini açar
 Opens\ JabRef's\ website=JabRef'in web sitesini açar
@@ -1605,9 +1549,7 @@ Add\ new\ file\ type=Yeni dosya türü ekle
 
 Left\ entry=Sol girdi
 Right\ entry=Sağ girdi
-Use=Kullan
 Original\ entry=Orjinal girdi
-Replace\ original\ entry=Orjinal girdinin yerine koy
 No\ information\ added=Bilgi eklenmedi
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Anahtar sözcükleri yönetmek için en az bir girdi seçiniz.
 OpenDocument\ text=AçıkBelge metni
@@ -1626,7 +1568,6 @@ Please\ move\ the\ file\ manually\ and\ link\ in\ place.=Lütfen dosyayı elle t
 Could\ not\ connect\ to\ %0=%0'e bağlanılamadı
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Uyarı\: %1 girdiden %0'inin tanımlanmamış başlığı var.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=Uyarı\:%1 girdiden %0'inde tanımlanmamış BibTeX anahtarı var.
-occurrence=görülme
 Added\ new\ '%0'\ entry.='%0' yebi girdi eklendi.
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=Çok sayıda girdi seçili. Tüm bunların türünü '%0'e değiştirmek ister misiniz?
 Changed\ type\ to\ '%0'\ for=Tür '%0'e değiştirildi
@@ -1646,8 +1587,6 @@ Print\ entry\ preview=Girdi yazdırma önizleme
 Copy\ title=Başlığı kopyala
 Copy\ \\cite{BibTeX\ key}=\\cite{BibTeX anahtarı}'nı kopyala
 Copy\ BibTeX\ key\ and\ title=BibTeX anahtarı ve başlığını kopyala
-File\ rename\ failed\ for\ %0\ entries.=%0 girdide dosya yeniden adlandırma başarısız.
-Merged\ BibTeX\ source\ code=Birleşik BibTeX kaynak kodu
 Invalid\ DOI\:\ '%0'.=Geçersiz DOI\: '%0'.
 should\ start\ with\ a\ name=bir isimle başlamalı
 should\ end\ with\ a\ name=bir isimle sonlanmalı
@@ -1722,6 +1661,7 @@ value=değer
 Show\ preferences=Tercihleri göster
 Save\ actions=Eylemleri kaydet
 Enable\ save\ actions=Eylemleri kaydetmeyi etkinleştir
+Convert\ to\ BibTeX\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journaltitle'\ field\ to\ 'journal')=BibTeX biçimine dönüştür (örneğin, 'journaltitle' alanının değerini 'journal'a taşı)
 
 Other\ fields=Diğer alanlar
 Show\ remaining\ fields=Kalan alanları göster
@@ -1739,10 +1679,8 @@ Error\ Occurred=Hata Oluştu
 Journal\ file\ %s\ already\ added=%s dergi dosyası zaten eklendi
 Name\ cannot\ be\ empty=İsim boş olamaz
 
-Adding\ fetched\ entries=Getirilen girdiler ekleniyor
 Display\ keywords\ appearing\ in\ ALL\ entries=TÜM girdilerde görünen anahtar sözcükleri göster
 Display\ keywords\ appearing\ in\ ANY\ entry=HERHANGİ BİR girdide görünen anahtar sözcükleri göster
-Fetching\ entries\ from\ Inspire=Girdiler Inspire'dan getiriliyor
 None\ of\ the\ selected\ entries\ have\ titles.=Seçili girdilerin hiç birinde başlık yok.
 None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=Seçili girdilerin hiçbirinde BibTeX anahtarı yok.
 Unabbreviate\ journal\ names=Kısaltma dergi adlarını aç
@@ -1757,14 +1695,11 @@ Ill-formed\ entrytype\ comment\ in\ BIB\ file=Bib dosyasında kötü biçimli gi
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=Bağlantılı dosyaları öntanımlı dosya dizinine aktar %0
 
-Clipboard=Pano
-Could\ not\ paste\ entry\ as\ text\:=Girdi metin olarak yapıştırılamıyor\:
 Do\ you\ still\ want\ to\ continue?=Hala devam etmek istiyor musunuz?
 This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=Bu eylem aşağıdaki alanları en az bir girdide değiştirecek\:
 This\ could\ cause\ undesired\ changes\ to\ your\ entries.=Bu, girdilerinizde istenmeyen değişikliklere yol açabilir.
 Run\ field\ formatter\:=Alan biçimlendiriciyi çalıştır\:
 Table\ font\ size\ is\ %0=Tablo yazıtipi boyutu %0'dır
-%0\ import\ canceled=%0 içe aktarımı iptal edildi
 Internal\ style=Dahili stil
 Add\ style\ file=Stil dosyası ekle
 Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=Stili silmek istediğinizden emin misiniz?
@@ -1782,6 +1717,7 @@ Changes\ all\ letters\ to\ upper\ case.=Tüm harfleri büyük harfe dönüştür
 Changes\ the\ first\ letter\ of\ all\ words\ to\ capital\ case\ and\ the\ remaining\ letters\ to\ lower\ case.=Tüm sözcüklerin ilk harfini büyük harfe, diğer tüm harflerini küçük harfe dönüştür.
 Cleans\ up\ LaTeX\ code.=LaTeX kodunu temizler.
 Converts\ HTML\ code\ to\ LaTeX\ code.=HTML kodunu LaTeX koduna dönüştürür.
+HTML\ to\ Unicode=HTML'den Unicode'a
 Converts\ HTML\ code\ to\ Unicode.=HTML kodunu Unicode'a dönüştürür.
 Converts\ LaTeX\ encoding\ to\ Unicode\ characters.=LaTeX kodunu Unicode karakterlerine dönüştürür.
 Converts\ Unicode\ characters\ to\ LaTeX\ encoding.=Unicode karakterlerini LaTeX koduna dönüştürür.
@@ -1793,6 +1729,7 @@ LaTeX\ to\ Unicode=LaTeX'ten Unicode'a
 Lower\ case=Küçük harf
 Minify\ list\ of\ person\ names=Kişi adları listesini küçült
 Normalize\ date=Günü normalleştir
+Normalize\ en\ dashes=Uzun tireleri normalleştir
 Normalize\ month=Ayı normalleştir
 Normalize\ month\ to\ BibTeX\ standard\ abbreviation.=Ayı BibTeX standart kısaltmasına normalleştir
 Normalize\ names\ of\ persons=Kişi adlarını normalleştir
@@ -1800,8 +1737,11 @@ Normalize\ page\ numbers=Sayfa numaralarını normalleştir
 Normalize\ pages\ to\ BibTeX\ standard.=Sayfaları BibTeX standardına normalleştir.
 Normalizes\ lists\ of\ persons\ to\ the\ BibTeX\ standard.=Kişi listelerini BibTeX standardına normalleştirir.
 Normalizes\ the\ date\ to\ ISO\ date\ format.=Günü, ISO gün biçemine normalleştirir.
+Normalizes\ the\ en\ dashes.=Uzun tireleri normalleştirir.
 Ordinals\ to\ LaTeX\ superscript=Sıra sayılarını LaTeX üstyazısına
 Protect\ terms=Proje koşulları
+Add\ enclosing\ braces=Kapsayan kaşlı ayraçlar ekle
+Add\ braces\ encapsulating\ the\ complete\ field\ content.=Tam alan içeriğini kapsayan kaşlı ayraçlar ekle.
 Remove\ enclosing\ braces=Çevreleyen küme parantezlerini kaldır
 Removes\ braces\ encapsulating\ the\ complete\ field\ content.=Tüm alan içeriğini kapsayan küme parantezlerini kaldırır.
 Sentence\ case=Cümle (harf) şekli
@@ -1850,6 +1790,7 @@ Line=Satır
 Master's\ thesis=Master tezi
 Page=Sayfa
 Paragraph=Paragraf
+Patent=Patent
 Patent\ request=Patent başvurusu
 PhD\ thesis=Doktora tezi
 Redactor=Redaktör
@@ -1890,6 +1831,7 @@ BibTeX\ key=BibTeX anahtarı
 Message=Mesaj
 
 
+MathSciNet\ Review=MathSciNet İncelemesi
 Reset\ Bindings=Bağlantıları Sıfırla
 
 Decryption\ not\ supported.=Şifre çözme desteklenmiyor.
@@ -1980,7 +1922,6 @@ Your\ issue\ was\ reported\ in\ your\ browser.=Sorununuz tarayıcınızda rapor
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=Kayıt dosyası ve istisna bilgisi panonuza kopyalandı.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Lütfen bu bilgiyi sorun tarifine (Ctrl+V ile) yapıştırın.
 
-Connection=Bağlantı
 Connecting...=Bağlanıyor...
 Host=Makine
 Port=Bağlantı noktası
@@ -2007,9 +1948,7 @@ Shared\ version\:\ %0=Paylaşılmış sürüm\: %0
 Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Bu sorunu çözmek için lütfen paylaşılmış girdiyle sizinkini birleştirin ve "Girdileri birleştir"'e basın.
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Bu işlemi iptal etmek değişkliklerinizi eşzamanlanmamış halde bırakacak. Yine de iptal edilsin mi?
 Shared\ entry\ is\ no\ longer\ present=Paylaşılmış girdi artık mevcut değil
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=Üzerinde çalıştığınız BibEntry paylaşılmış tarafta silindi.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.="Geri al" işlemiyle girdiyi restore edebilirsiniz.
-Remember\ password?=Parola hatırlansın mı?
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Girilmiş bağlantı ayarlarıyla bir veritabanına zaten bağlısınız.
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=BibTeX anahtarları olmadan girdiler alıntılanamaz. Anahtarlar şimdi oluşturulsun mu?
@@ -2025,7 +1964,6 @@ You\ must\ enter\ at\ least\ one\ field\ name=En az bir alan adı girmelisiniz
 Non-ASCII\ encoded\ character\ found=ASCII koduyla kodlanmamış karakter bulundu
 Toggle\ web\ search\ interface=Ağ arama arayüzünü değiştir
 %0\ files\ found=%0 dosya bulundu
-%0\ of\ %1=%1'in %0'i
 One\ file\ found=Bir dosya bulundu
 The\ import\ finished\ with\ warnings\:=İçe aktarım uyarılarla bitti\:
 There\ was\ one\ file\ that\ could\ not\ be\ imported.=İçe aktarılamayan bir dosya mevcuttu.
@@ -2034,7 +1972,6 @@ There\ were\ %0\ files\ which\ could\ not\ be\ imported.=İçe aktarılamayan %0
 Migration\ help\ information=Gçö yardımı bilgisi
 Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Girilen veritanbanı kullanılmayan yapıya sahip ve artık desteklenmiyor.
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Ancak, 3.6 öncesinin yanı sıra yeni bir veritabanı oluşturuldu.
-Click\ here\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=3.6 öncesi veritabanlarının göçünü öğrenmek için burayı tıklayın.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Mevcut geliştirme sürümünün indirilebileceği bir bağlantı açar
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=JabRef sürümlerinde nelerin değişmiş olduğuu görün
 Referenced\ BibTeX\ key\ does\ not\ exist=Başvurulan BibTeX anahtarı mevcut değil
@@ -2062,7 +1999,6 @@ Existing\ file=Varolan dosya
 
 ID=ID(kimlik)
 ID\ type=ID türü
-ID-based\ entry\ generator=ID-tabanlı girdi oluşturucu
 Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.='%0' getiricisi '%1' kimliği için bir girdi bulamadı.
 
 Select\ first\ entry=İlk girdiyi seç
@@ -2113,8 +2049,6 @@ journal\ not\ found\ in\ abbreviation\ list=kısaltma listesinde dergi bulunamad
 Unhandled\ exception\ occurred.=İşlenmemiş istisna oluştu.
 
 strings\ included=dizgeler dahil edildi
-Size\ of\ large\ icons=Büyük simge boyutu
-Size\ of\ small\ icons=Küçük simge boyutu
 Default\ table\ font\ size=Öntanımlı tablo yazıtipi boyutu
 Escape\ underscores=Altçizgileri öncele
 Color=Renk
@@ -2148,23 +2082,81 @@ Delete\ from\ disk=Diskten sil
 Remove\ from\ entry=Girdiden sil
 There\ exists\ already\ a\ group\ with\ the\ same\ name.=Aynı isimli bir grup zaten var.
 
+Copy\ linked\ files\ to\ folder...=Bağlı dosyaları klasöre kopyala...
+Copied\ file\ successfully=Dosya başarıyla kopyalandı
+Copying\ files...=Dosyalar kopyalanıyor...
+Copying\ file\ %0\ of\ entry\ %1=%1 girdisinin %0 dosyası kopyalanıyor
+Finished\ copying=Kopyalama tamamlandı
+Could\ not\ copy\ file=Dosya kopyalanamadı
+Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=%1 dosyanın %0'ı başarıyla %2'ye kopyalandı
 Rename\ failed=Yeniden adlandırma başarısız oldu
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef dosyaya erişemiyor çünkü dosya başka bir süreç tarafından kullanılıyor.
 Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Consol çıktısını göster (sadece başlatıcı kullanıldığında gereklidir)
 
+Remove\ line\ breaks=Satır sonlarını kaldır
+Removes\ all\ line\ breaks\ in\ the\ field\ content.=Alan içeriğindeki tüm satır sonlarını kaldırır.
+Checking\ integrity...=Bütünlük denetleniyor...
 
+Remove\ hyphenated\ line\ breaks=Hecelenmiş satır sonlarını kaldır
+Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Alan içeriğindeki tüm hecelenmiş satır sonlarını kaldırır.
+Note\ that\ currently,\ JabRef\ does\ not\ run\ with\ Java\ 9.=Dikkatinize\: JabRef halen Java 9'la çalışmaz.
+Your\ current\ Java\ version\ (%0)\ is\ not\ supported.\ Please\ install\ version\ %1\ or\ higher.=Mevcut Java sürümünüz (%0) desteklenmiyor. Lütfen sürüm %1 ya da daha güncelini kurunuz.
 
+Could\ not\ retrieve\ entry\ data\ from\ '%0'.='%0' dan girdi verileri alınamadı.
+Entry\ from\ %0\ could\ not\ be\ parsed.=%0'dan girdi çözümlenemedi.
+Invalid\ identifier\:\ '%0'.=Geçersiz tanımlayıcı\: '%0 '.
+This\ paper\ has\ been\ withdrawn.=Bu yayın geri çekildi.
+Finished\ writing\ XMP-metadata.=XMP-meta veri yazımı bitti.
 empty\ BibTeX\ key=boş BibTeX anahtarı
+Your\ Java\ Runtime\ Environment\ is\ located\ at\ %0.=Sizin Java Runtime Environment'ınız %0'da yer alır.
+Aux\ file=Aux dosya
+Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Belirli bir TeX dosyasında alıntılanmış girdileri içeren grup
 
+Any\ file=Herhangi bir dosya
 
+No\ linked\ files\ found\ for\ export.=Dışarı aktarılacak dosya bulunamadı.
 
+Full\ text\ document\ download\ failed\ for\ entry\ %0=%0 girdisi için tam metin belgesinin indirilmesi başarısız
+No\ full\ text\ document\ found\ for\ entry\ %0.=%0 girdisi için tam metin belge bulunamadı.
 
+Delete\ Entry=Girdiyi Sil
+Import\ &\ Export=İçeri aktar / Dışa aktar
+Look\ up\ document\ identifier=Belge tanımlayıcıyı ara
+Next\ library=Sonraki kütüphane
+Previous\ library=Önceki kütüphane
 add\ group=grup ekle
-
-
-
-
-
+Entry\ is\ contained\ in\ the\ following\ groups\:=Girdi, aşağıdaki gruplarda yer alır\:
+Delete\ entries=Girdileri sil
+Keep\ entries=Girdileri tut
+Keep\ entry=Girdiyi tut
+Ignore\ backup=Yedeği yok say
+Restore\ from\ backup=Yedekten geri yükle
+
+Continue=Devam et
+Generate\ key=Anahtar oluştur
+Overwrite\ file=Dosyanın üzerine yaz
+Shared\ database\ connection=Paylaşılan veri tabanı bağlantısı
+
+Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\ correct\ server\ name.=Vim sunucusuna bağlanılamadı. Vim'in doğru sunucu adıyla çalıştığına emin olun.
+Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Çalışan bir gnuserv sürecine bağlanılamadı. Emacs ya da XEmacs'ın çalıştığına ve sunucunun başlatıldığına ('server-start'/'gnuserv-start' komutu çalıştırılarak) emin olun.
+Error\ pushing\ entries=Girdileri itelemede hata
+
+Undefined\ character\ format=Tanımlanmamış karakter biçimi
+Undefined\ paragraph\ format=Tanımlanmamış paragraf biçimi
+
+Edit\ Preamble=Öncülü düzenle
+Markings=İşaretler
+Use\ selected\ instance=Seçili örneği kullan
+
+Hide\ panel=Paneli gizle
+Move\ panel\ up=Paneli yukarı taşı
+Move\ panel\ down=Paneli aşağı taşı
+Linked\ files=Bağlı dosyalar
+Group\ view\ mode\ set\ to\ intersection=Grup görüntüleme kipi kesişime ayarlandı
+Group\ view\ mode\ set\ to\ union=Grup görüntüleme kipi birleşime ayarlandı
+Open\ %0\ URL\ (%1)=%0'i Aç, URL (%1)
+Open\ URL\ (%0)=URL Aç (%0)
+Open\ file\ %0=Dosya Aç %0
 Jump\ to\ entry=Girdiye atla
 The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\ does\ not\ work\ as\ expected.=Grup adı anahtar sözcük ayracı olan "%0" içeriyor ve bu sebeple muhtemelen beklendiğini gibi çalışmayacak.
 Abbreviate\ journal\ names\ (ISO)=Dergi adlarını kısalt (ISO)
@@ -2175,13 +2167,25 @@ Copy\ DOI\ url=DOI url'sini kopyala
 Copy\ citation=Atıf'ı kopyala
 Development\ version=Geliştirme sürümü
 Export\ selected\ entries=Seçili girdileri dışa aktar
+Export\ selected\ entries\ to\ clipboard=Seçili girdileri panoya aktar
+Find\ duplicates=Yinelenenleri bul
 Fork\ me\ on\ GitHub=Beni GitHub'da çatalla
 JabRef\ resources=JabRef kaynakları
+Manage\ journal\ abbreviations=Dergi kısaltmalarını yönet
 Manage\ protected\ terms=Korunmuş terimleri yönet
 New\ %0\ library=Yeni %0 veri tabanı
+New\ entry\ from\ plain\ text=Düz metinden yeni girdi
+New\ sublibrary\ based\ on\ AUX\ file=AUX dosyasını temel alan yeni alt-kütüphane
 Push\ entries\ to\ external\ application\ (%0)=Girdileri harici uygulamaya itele (%0)
+Quit=Çıkış
+Recent\ libraries=Son kullanılan kütüphaneler
+Set\ up\ general\ fields=Genel alanları ayarla
 View\ change\ log=Değişiklik kütüğünü göster
 View\ event\ log=Olay kayıt dosyasını göster
 Website=Web sitesi
 Write\ XMP-metadata\ to\ PDFs=XMP-metaverisini PDF'ye yaz
 
+Override\ default\ font\ settings=Öntamınlı yazıtipi ayarlarını geçersiz kıl
+
+
+
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
index 65f14008145..42cef4dbd9b 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<tên trường>
 
-<select>=<chọn>
-
 <select\ word>=<chọn từ>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Viết tắt tên tạp chí của các mục được chọn (viết tắt kiểu ISO)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Viết tắt tên tạp chí của các mục được chọn (viết tắt kiểu MEDLINE)
@@ -34,12 +32,13 @@ Accept=Chấp nhận
 
 Accept\ change=Chấp nhận thay đổi
 
-Action=Hành động
 
-What\ is\ Mr.\ DLib?=Ông DLib là gì?
+Action=Hành động
 
 Add=Thêm
 
+Add\ new=Thêm mới
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Thêm một lớp ĐịnhdạngNhập tùy biến (được biên dịch) từ đường dẫn lớp.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Đường dẫn không được trùng với đường dẫn lớp của JabRef.
 
@@ -54,16 +53,12 @@ Add\ from\ folder=Thêm từ thư mục
 
 Add\ from\ JAR=Thêm từ tập tin JAR
 
-Add\ new=Thêm mới
-
 Add\ subgroup=Thêm nhóm con
 
 Add\ to\ group=Thêm vào nhóm
 
 Added\ group\ "%0".=Nhóm được thêm "%0".
 
-Added\ new=Mới được thêm
-
 Added\ string=Chuỗi được thêm
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Ngoài ra, những mục nào có dữ liệu <b>%0</b> không chứa <b>%1</b> có thể được gán thủ công vào nhóm này bằng cách chọn chúng rồi kéo thả hoặc dùng menu ngữ cảnh. Quá trình này thêm thuật ngữ <b>%1</b> vào dữ liệu <b>%0</b> của mỗi mục. Các mục có thể được loại bỏ thủ công khỏi nhóm này bằng cách chọn chúng rồi dùng menu ngữ cảnh. Quá trình này loại bỏ thuật ngữ <b>%1</b> khỏi dữ liệu <b>%0</b> của mỗi mục.
@@ -72,12 +67,8 @@ Advanced=Nâng cao
 All\ entries=Tất cả các mục
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=Tất cả các mục thuộc kiểu này sẽ được đổi thành không có kiểu. Tiếp tục không?
 
-All\ fields=Tất cả các dữ liệu
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Luôn luôn định dạng lại file BIB khi lưu và xuất
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=Một lỗi SAXException xảy ra khi đang phân tách '%0'\:
-
 and=và
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=bất kỳ dữ liệu nào khớp Biểu thức Chính tắc <b>%0</b>
@@ -168,6 +159,7 @@ Clear\ fields=Xóa các dữ liệu
 
 Close=Đóng
 
+
 Close\ dialog=Đóng hộp thoại
 
 Close\ the\ current\ library=Đóng CSDL hiện tại
@@ -221,6 +213,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Không thể chạy chương trình 'vim'.
 Could\ not\ save\ file.=Không thể lưu tập tin.
 Character\ encoding\ '%0'\ is\ not\ supported.=Mã hóa ký tự '%0' không được hỗ trợ.
 
+
 crossreferenced\ entries\ included=các mục có tham chiếu chéo được đưa vào
 
 Current\ content=Nội dung hiện tại
@@ -256,8 +249,6 @@ Default\ grouping\ field=Dữ liệu gộp nhóm mặc định
 
 Default\ pattern=Kiểu mặc định
 
-Default\ sort\ criteria=Các tiêu chuẩn phân loại mặc định
-
 Delete=Xóa
 
 Delete\ custom\ format=Xóa định dạng tùy chọn
@@ -278,8 +269,6 @@ Deleted=Bị xóa
 
 Permanently\ delete\ local\ file=Xóa bỏ tập tin cục bộ
 
-Delimit\ fields\ with\ semicolon,\ ex.=Phân cách các dữ liệu bằng, ví dụ như, dấu chấm phẩy.
-
 Descending=Giảm dần
 
 Description=Mô tả
@@ -334,7 +323,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Gộp nhóm đ
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Gộp nhóm động các mục bằng cách tìm dữ liệu hoặc từ khóa
 
-Each\ line\ must\ be\ on\ the\ following\ form=Mỗi dòng phải có dạng sau
 
 Edit=Chỉnh sửa
 
@@ -381,12 +369,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=Các kiểu của mục
 
 Error=Lỗi
-Error\ exporting\ to\ clipboard=Lỗi xuất ra bộ nhớ tạm
 
 Error\ occurred\ when\ parsing\ entry=Lỗi xảy ra khi đang phân tách mục
 
 Error\ opening\ file=Lỗi khi đang mở tập tin
 
+
 Error\ while\ writing=Lỗi khi đang ghi
 
 '%0'\ exists.\ Overwrite\ file?='%0' đã có. Ghi đè tập tin không?
@@ -416,8 +404,6 @@ External\ programs=Các chương trình ngoài
 
 External\ viewer\ called=Trình xem ngoài được gọi
 
-Fetch=Lấy về
-
 Field=Dữ liệu
 
 field=dữ liệu
@@ -425,8 +411,6 @@ field=dữ liệu
 Field\ name=Tên dữ liệu
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Tên dữ liệu không được phép chứa khoảng trắng hoặc các ký tự sau
 
-Field\ to\ filter=Dữ liệu cần lọc
-
 Field\ to\ group\ by=Dữ liệu gộp nhóm theo
 
 File=Tập tin
@@ -441,13 +425,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Thư mục tập tin khôn
 
 File\ exists=Tập tin đã có
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=Tập tin đã được cập nhật ở ngoài chương trình. Bạn muốn làm gì?
-
 File\ not\ found=Không thấy tập tin
 File\ type=Kiểu tập tin
-
-File\ updated\ externally=Tập tin được cập nhật ngoài chương trình
-
 filename=tên tập tin
 
 Files\ opened=Các tập tin đã mở
@@ -467,6 +446,7 @@ Fit\ table\ horizontally\ on\ screen=Làm cho bảng khít chiều ngang màn h
 
 for=dùng cho
 
+
 Format\ of\ author\ and\ editor\ names=Định dạng tên tác giả và người biên tập
 Format\ string=Định dạng chuỗi
 
@@ -477,9 +457,9 @@ found\ in\ AUX\ file=tìm thấy trong tập tin AUX
 
 Full\ name=Tên đầy đủ
 
+
 General=Tổng quát
 
-General\ fields=Các dữ liệu tổng quát
 
 Generate=Tạo
 
@@ -558,15 +538,13 @@ Importing=Đang nhập
 
 Importing\ in\ unknown\ format=Nhập vào thành định dạng không rõ
 
-Include\ abstracts=Đưa vào cả phần tóm tắt
-Include\ entries=Đưa vào các mục
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Đưa vào các nhóm con\: Khi được chọn, xem các mục chứa trong nhóm này hoặc các nhóm phụ của nó
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Nhóm độc lập\: Khi được chọn, chỉ xem các mục của nhóm này
 
 Work\ options=Các tùy chọn làm việc
 
+
 Insert=Chèn
 
 Insert\ rows=Chèn hàng
@@ -614,10 +592,6 @@ Leave\ file\ in\ its\ current\ directory=Giữ tập tin trong thư mục hiện
 
 Left=Trái
 
-Limit\ to\ fields=Giới hạn cho các dữ liệu
-
-Limit\ to\ selected\ entries=Giới hạn theo các mục được chọn
-
 Link=Liên kết
 Link\ local\ file=Liên kết tập tin cục bộ
 Link\ to\ file\ %0=Liên kết đến tập tin %0
@@ -640,8 +614,6 @@ Mark\ new\ entries\ with\ owner\ name=Đánh dấu các mục mới cùng với
 
 Memory\ stick\ mode=Chế độ thẻ nhớ
 
-Menu\ and\ label\ font\ size=Cỡ phông chữ trình đơn và nhãn
-
 Merged\ external\ changes=Các thay đổi ngoài được gộp lại
 
 Messages=Các thông báo
@@ -666,6 +638,8 @@ Move\ up=Chuyển lên
 
 Moved\ group\ "%0".=Đã chuyển nhóm "%0".
 
+
+
 Name=Tên
 Name\ formatter=Trình định dạng tên
 
@@ -683,8 +657,6 @@ New\ content=Nội dung mới
 
 New\ library\ created.=CSDL mới được tao ra.
 
-New\ field\ value=Giá trị dữ liệu mới
-
 New\ group=Nhóm mới
 
 New\ string=Chuỗi mới
@@ -699,9 +671,6 @@ no\ library\ generated=Không có CSDL nào được tạo ra
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Không tìm thấy mục nào. Hãy đảm bảo rằng bạn đang dùng bộ lọc nhập đúng.
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=Không tìm thấy mục nào với chuỗi tìm kiếm '%0'
-
 No\ entries\ imported.=Không mục nào được nhập.
 
 No\ files\ found.=Không tìm thấy tập tin nào.
@@ -722,8 +691,6 @@ Nothing\ to\ redo=Không có lệnh nào để lặp lại
 
 Nothing\ to\ undo=Không có lệnh nào để quay ngược lại
 
-occurrences=các lần xuất hiện
-
 OK=Đồng ý
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=Một hoặc nhiều khóa sẽ bị ghi đè. Có tiếp tục không?
@@ -763,13 +730,10 @@ Override=Ghi đè
 
 Override\ default\ file\ directories=Ghi đè các thư mục tập tin mặc định
 
-Override\ default\ font\ settings=Ghi đè các thiết lập phông chữ mặc định
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=Ghi đè khóa BibTeX bằng chữ được chọn
 
 
 Overwrite=Ghi đè
-Overwrite\ existing\ field\ values=Ghi đè các giá trị dữ liệu hiện có
 
 Overwrite\ keys=Ghi đè các khóa
 
@@ -804,6 +768,7 @@ Please\ enter\ the\ string's\ label=Vui lòng nhập nhãn của chuỗi
 
 Please\ select\ an\ importer.=Vui lòng chọn một trình nhập.
 
+
 Possible\ duplicate\ entries=Các mục có thể bị trùng
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=Có thể mục hiện có bị trùng. Nhắp chuột để giải.
@@ -839,8 +804,6 @@ Redo=Lặp lại lệnh
 
 Reference\ library=CSDL tham khảo
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=Các tài liệu tham khảo được tìm thấy\: %0. Số lượng tài liệu tham khảo cần lấy về?
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Tinh chỉnh nhóm lớn\: Khi được chọn, xem các mục chứa các trong nhóm này và nhóm lớn của nó
 
 regular\ expression=Biểu thức chính tắc
@@ -896,10 +859,6 @@ Replace\ (regular\ expression)=Thay thế (biểu thức chính tắc)
 
 Replace\ string=Thay thế chuỗi
 
-Replace\ with=Thay thế bởi
-
-
-Replaced=Bị thay thế
 
 Required\ fields=Các dữ liệu cần có
 
@@ -909,6 +868,8 @@ Resolve\ strings\ for\ all\ fields\ except=Giải các chuỗi cho tất cả c
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Chỉ giải các chuỗi cho các dữ liệu BibTeX
 
 resolved=được giải
+
+
 Review=Xem xét lại
 Review\ changes=Xem xét lại các thay đổi
 
@@ -926,10 +887,6 @@ Save\ library\ as...=Lưu CSDL thành ...
 
 Save\ entries\ in\ their\ original\ order=Lưu các mục theo thứ tự gốc của chúng
 
-Save\ failed=Việc lưu thất bại
-
-Save\ failed\ during\ backup\ creation=Việc lưu thất bại khi đang tạo bản sao lưu
-
 Saved\ library=Đã lưu CSDL
 
 Saved\ selected\ to\ '%0'.=Đã lưu phần chọn vào '%0'.
@@ -943,8 +900,6 @@ Search=Tìm
 
 Search\ expression=Biểu thức tìm kiếm
 
-Search\ for=Tìm
-
 Searching\ for\ duplicates...=Đang tìm các mục bị lặp...
 
 Searching\ for\ files=Đang tìm các tập tin
@@ -953,19 +908,16 @@ Secondary\ sort\ criterion=Tiêu chuẩn phân loại thứ cấp
 
 Select\ all=Chọn tất cả
 
-Select\ encoding=Chọn bộ mã hóa
-
 Select\ entry\ type=Chọn kiểu mục
-Select\ external\ application=Chọn ứng dụng ngoài
 
 Select\ file\ from\ ZIP-archive=Chọn tập tin từ tập tin ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Chọn các nốt trên sơ đồ hình cây để xem và chấp nhận hoặc từ chối thay đổi
-Selected\ entries=Các mục được chọn
+
 Set\ field=Thiết lập dữ liệu
 Set\ fields=Thiết lập các dữ liệu
 
-Set\ general\ fields=Thiết lập các dữ liệu tổng quát
+
 Set\ main\ external\ file\ directory=Thiết lập thư mục tập tin ngoài chính
 
 Settings=Các thiết lập
@@ -1018,8 +970,6 @@ Status=Trạng thái
 
 Stop=Dừng
 
-Strings=Các chuỗi
-
 Strings\ for\ library=Các chuỗi dùng cho CSDL
 
 Sublibrary\ from\ AUX=CSDL con từ AUX
@@ -1080,8 +1030,12 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Lệnh này yêu cầu phải chọn trước một hoặc nhiều mục.
 
+
 Toggle\ entry\ preview=Bật/tắt xem trước mục
 Toggle\ groups\ interface=Bật/tắt giao diện nhóm
+
+
+
 Try\ different\ encoding=Thử mã hóa khác
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Bỏ viết tắt tên các tạp chí của những mục được chọn
@@ -1126,8 +1080,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=kiểm tra xe
 View=Xem
 Vim\ server\ name=Tên Server Vim
 
-Waiting\ for\ ArXiv...=Đang chờ ArXiv...
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Cảnh báo về các mục trùng chưa được giải quyết khi đóng cửa sổ kiểm tra
 
 Warn\ before\ overwriting\ existing\ keys=Cảnh báo trước khi ghi đè các khóa hiện có
@@ -1159,7 +1111,6 @@ XMP-metadata=Đặc tả dữ liệu XMP
 XMP-metadata\ found\ in\ PDF\:\ %0=Đặc tả dữ liệu XMP có trong PDF\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Bạn phải khởi động lại JabRef để thay đổi có hiệu lực.
 You\ have\ changed\ the\ language\ setting.=Bạn đã thay đổi thiết lập ngôn ngữ.
-You\ have\ entered\ an\ invalid\ search\ '%0'.=Bạn đã nhập một phép tìm không hợp lệ '%0'.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=Bạn phải khởi động lại JabRef để các tổ hợp phím mới hoạt động được.
 
@@ -1168,26 +1119,20 @@ Your\ new\ key\ bindings\ have\ been\ stored.=Tổ hợp phím tắt mới của
 The\ following\ fetchers\ are\ available\:=Các trình lấy về sau có thể dùng được\:
 Could\ not\ find\ fetcher\ '%0'=Không thể tìm thấy trình lầy về '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Đang chạy truy vấn '%0' với trình lấy về '%1'.
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=Phép truy vấn '%0' bằng trình lấy về '%1' không trả lại kết quả nào.
 
 Move\ file=Chuyển tin
 Rename\ file=Đặt lại tên tập tin
 
+
 Move\ file\ failed=Việc chuyển tập tin thất bại
 Could\ not\ move\ file\ '%0'.=Không thể chuyển tập tin '%0'.
 Could\ not\ find\ file\ '%0'.=Không tìm thấy tập tin '%0'.
 Number\ of\ entries\ successfully\ imported=Số mục được nhập vào thành công
 Import\ canceled\ by\ user=Việc nhập bị người dùng hủy
-Progress\:\ %0\ of\ %1=Tiến trình\: %0 of %1
 Error\ while\ fetching\ from\ %0=Lỗi khi lấy về từ %0
 
-Please\ enter\ a\ valid\ number=Vui lòng nhập một con số hợp lệ
 Show\ search\ results\ in\ a\ window=Hiển thị kết quả tìm trong một cửa sổ
 Search\ in\ all\ open\ libraries=Tìm kiếm trong tất cả CSDL đang mở
-Move\ file\ to\ file\ directory?=Di chuyển tập tin vào thư mục tập tin?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=CSDL được bảo vệ. Không thể lưu cho đến khi những thay đổi ngoài được xem xét.
-Protected\ library=CSDL được bảo vệ
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Từ chối lưu CSDL trước khi những thay đổi ngoài được xem xét.
 Library\ protection=Bảo vệ CSDL
 Unable\ to\ save\ library=Không thể lưu CSDL
@@ -1198,16 +1143,13 @@ MIME\ type=Kiểu MIME
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Tính chất này cho phép các tập tin mới có thể được mở hoặc nhập vào một phiên JabRef đang chạy<BR>thay vì phải mở một phiên làm việc mới. Điều này có ích, ví dụ như khi bạn mở một tập tin trong JabRef<br>từ trình duyệt web của mình.<BR>Lưu ý rằng điều này sẽ không cho phép bạn chạy nhiều hơn một phiên làm việc của JabRef cùng lúc.
 
-The\ ACM\ Digital\ Library=Thư viện số ACM
 Reset=Thiết lập lại
 
 Use\ IEEE\ LaTeX\ abbreviations=Dùng các chữ viết tắt kiểu IEEE LaTeX
-The\ Guide\ to\ Computing\ Literature=Hướng dẫn về tài liệu máy tính
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Khi mở liên kết tập tin, tìm tập tin khớp nếu liên kết không được định nghĩa
 Settings\ for\ %0=Các thiết lập dùng cho %0
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=Xếp thứ tự các dữ liệu sau như thể chúng là các dữ liệu kiểu số
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Dòng %0\: Tìm thấy khóa-BibTeX bị lỗi.
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Dòng %0\: Tìm thấy khóa-BibTeX bị lỗi (chứa khoảng trắng).
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Dòng %0\: Tìm thấy khóa-BibTeX bị lỗi (thiếu dấu phẩy).
@@ -1217,7 +1159,6 @@ Rename\ field=Đổi tên dữ liệu
 Set/clear/append/rename\ fields=Thiết lập/Xóa/Đổi tên trường
 Rename\ field\ to=Đổi tên dữ liệu thành
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Di chuyển nội dung của một dữ liệu sang một dữ liệu có tên khác
-You\ can\ only\ rename\ one\ field\ at\ a\ time=Bạn chỉ có thể đổi tên một dữ liệu một lần
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Không thể dùng cổng %0 cho lệnh chạy từ xa; một ứng dụng khác có thể đang dùng nó. Hãy thử chỉ định một cổng khác.
 
@@ -1225,6 +1166,7 @@ Looking\ for\ full\ text\ document...=Đang tìm tài liệu đầy đủ...
 Autosave=Lưu tự động
 A\ local\ copy\ will\ be\ opened.=Bản sao cục bộ sẽ được mở.
 Autosave\ local\ libraries=Tự động lưu CSDL cục bộ
+Automatically\ save\ the\ library\ to=Tự động lưu thư viện vào
 
 
 Export\ in\ current\ table\ sort\ order=Xuất ra theo trình tự xếp thứ tự của bảng hiện tại
@@ -1235,9 +1177,6 @@ Formatter\ not\ found\:\ %0=Không tìm thấy trình định dạng\: %0
 Clear\ inputarea=Xóa trong vùng nhập liệu
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Không thể lưu, tập tin bị khóa bởi một phiên làm việc khác của JabRef đang chạy.
-File\ is\ locked\ by\ another\ JabRef\ instance.=Tập tin bị khóa bởi một phiên làm việc khác của JabRef.
-Do\ you\ want\ to\ override\ the\ file\ lock?=Bạn có muốn bỏ qua khóa tập tin?
-File\ locked=Tập tin bị khóa
 Current\ tmp\ value=Giá trị tmp hiện tại
 Metadata\ change=Thay đổi đặc tả dữ liệu
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=Các thay đổi đã được thực hiện cho những thành phần đặc tả CSDL sau
@@ -1246,7 +1185,6 @@ Generate\ groups\ for\ author\ last\ names=Tạo các nhóm cho họ của tác
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=Tạo các nhóm theo từ khóa trong một dữ liệu BibTeX
 Enforce\ legal\ characters\ in\ BibTeX\ keys=Buộc phải dùng những ký tự hợp lệ trong khóa BibTeX
 
-Save\ without\ backup?=Lưu không có bản dự phòng?
 Unable\ to\ create\ backup=Không thể tạo bản dự phòng
 Move\ file\ to\ file\ directory=Di chuyển tập tin vào thư mục tập tin
 Rename\ file\ to=Đổi tên tập tin thành
@@ -1285,7 +1223,6 @@ Choose\ the\ source\ for\ the\ metadata\ import=Chọn nguồn để nhập vào
 Create\ entry\ based\ on\ XMP-metadata=Tạo ra mục dựa trên dữ liệu XMP
 Create\ blank\ entry\ linking\ the\ PDF=Tạo ra mục trống thuộc về PDF
 Only\ attach\ PDF=Chỉ kèm PDF
-Title=Danh hiệu
 Create\ new\ entry=Tạo mục mới
 Update\ existing\ entry=Cập nhật mục có sẵn
 Send\ as\ email=Gửi bằng email
@@ -1357,7 +1294,6 @@ Unabbreviate\ journal\ names=Không viết tắt tên các tạp chí
 
 
 
-%0\ import\ canceled=Việc nhập từ %0 bị hủy
 
 
 
@@ -1406,7 +1342,6 @@ Get\ BibTeX\ data\ from\ %0=Nhập dữ liệu BibTex từ %0
 
 
 
-Connection=Sự kết nối
 Connecting...=Đang kết nối...
 Host=Máy chủ
 Port=Cổng
@@ -1433,9 +1368,7 @@ Shared\ version\:\ %0=Phiên bản chia sẻ\: %0
 Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Xin vui lòng phối mục chia sẻ với mục của bạn và nhấn "Phối các mục" để giải quyết lỗi này.
 Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Huỷ bỏ thao tác này bạn sẽ rời khỏi thay đổi không đồng bộ hóa của bạn. Bạn vẫn muốn hủy?
 Shared\ entry\ is\ no\ longer\ present=Mục chia sẻ hiện không còn nữa
-The\ BibEntry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=BibEntry bạn hiện giờ đang làm việc đã bị xoá bên chia sẻ.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Bạn có thể phục hồi mục bằng cách sử dụng thao tác "Hoàn tác".
-Remember\ password?=Lưu mật mã?
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Bạn đã được kết nối với CSDL bằng sử dụng cách nhập chi tiết kết nối.
 
 
@@ -1443,7 +1376,6 @@ You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ detai
 
 Migration\ help\ information=Thông tin trợ giúp dời chuyển
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Tuy nhiên, CSDL mới đã được tạo lập theo CSDL trước 3.6.
-Click\ here\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=Nhấp vào đây để biết về dời chuyển của các CSDL trước 3.6.
 
 
 ID=Mã nhận diện
@@ -1499,3 +1431,7 @@ View\ change\ log=Xem nhật kí thay đổi
 Website=Trang web
 Write\ XMP-metadata\ to\ PDFs=Ghi XMP-metadata thành các PDF
 
+Override\ default\ font\ settings=Ghi đè các thiết lập phông chữ mặc định
+
+
+
diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
index 3d49f0abcb2..dcae489f8aa 100644
--- a/src/main/resources/l10n/JabRef_zh.properties
+++ b/src/main/resources/l10n/JabRef_zh.properties
@@ -15,8 +15,6 @@
 
 <field\ name>=<域名称>
 
-<select>=<选择>
-
 <select\ word>=<下拉菜单项>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=缩写选中记录的期刊名 (ISO 格式缩写)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=缩写选中记录的期刊名 (MEDLINE 格式缩写)
@@ -34,18 +32,20 @@ Accept=接受
 
 Accept\ change=接受修改
 
-Action=动作
 
-What\ is\ Mr.\ DLib?=Mr. DLib 是什么？
+Action=动作
 
 Add=添加
 
+Add\ new=新建
+
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=从一个 class path 添加(编译好的)自定义导入类。
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=该路径不需要在 JabRef 的 classpath 下。
 
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ ZIP-archive.=从一个 ZIP 压缩包中添加(编译好的)自定义导入类。
 The\ ZIP-archive\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=该 ZIP 压缩包不需要在 JabRef 的 classpath 下。
 
+Add\ a\ regular\ expression\ for\ the\ key\ pattern.=对核心模式添加正则表达式。
 
 Add\ selected\ entries\ to\ this\ group=添加选定记录到该组
 
@@ -53,16 +53,12 @@ Add\ from\ folder=从文件夹中添加
 
 Add\ from\ JAR=从 JAR 中添加
 
-Add\ new=新建
-
 Add\ subgroup=添加子分组
 
 Add\ to\ group=添加到分组
 
 Added\ group\ "%0".=已添加分组 "%0"。
 
-Added\ new=已添加
-
 Added\ string=已添加简写字串
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=此外，那些“<b>%0</b>”域里不包含“<b>%1</b>”的记录可以被手动添加到此分组（使用拖放或者右键菜单）——这个操作将会把词组“<b>%1</b>”添加到每条记录的“<b>%0</b>”域中。选中记录后用右键菜单可以将该记录从此分组中移除——这个操作将会把“<b>%1</b>”从被移除记录的“<b>%0</b>”域中去除。
@@ -71,12 +67,8 @@ Advanced=高级
 All\ entries=所有记录
 All\ entries\ of\ this\ type\ will\ be\ declared\ typeless.\ Continue?=所有此类型记录将被标记为无类型记录，是否继续？
 
-All\ fields=所有域
-
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=当保存和导出时重新格式化 BIB 文件
 
-A\ SAX\ exception\ occurred\ while\ parsing\ '%0'\:=当解析'%0'时发生了一个 SAXException\:
-
 and=和
 
 any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=匹配正则表达式 <b>%0</b> 的任何域
@@ -128,6 +120,7 @@ Backup\ old\ file\ when\ saving=保存数据库时保留备份
 Browse=浏览...
 
 by=为
+The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=这些条目的冲突字段将会合并到“注释”字段。
 
 Cancel=取消
 
@@ -166,6 +159,7 @@ Clear\ fields=清除域内容
 
 Close=关闭
 
+
 Close\ dialog=关闭对话框
 
 Close\ the\ current\ library=关闭当前文献库
@@ -196,7 +190,7 @@ Copied\ keys=已复制 BibTeX 键
 Copy=复制
 
 Copy\ BibTeX\ key=复制 BibTeX 键
-Copy\ file\ to\ file\ directory=拷贝文件到文件目录
+Copy\ file\ to\ file\ directory=拷贝文件到文件目录。
 
 Copy\ to\ clipboard=复制到剪贴板
 
@@ -221,6 +215,7 @@ Could\ not\ run\ the\ 'vim'\ program.=无法运行 'vim' 程序。
 Could\ not\ save\ file.=无法保存文件
 Character\ encoding\ '%0'\ is\ not\ supported.=，不支持编码 '%0'。
 
+
 crossreferenced\ entries\ included=包含交叉引用的记录
 
 Current\ content=当前内容
@@ -256,8 +251,6 @@ Default\ grouping\ field=默认分组依据域
 
 Default\ pattern=默认模式
 
-Default\ sort\ criteria=默认排序规则
-
 Delete=删除
 
 Delete\ custom\ format=删除自定义格式
@@ -278,8 +271,6 @@ Deleted=已删除
 
 Permanently\ delete\ local\ file=删除本地文件
 
-Delimit\ fields\ with\ semicolon,\ ex.=使用分号分隔域，例如
-
 Descending=降序
 
 Description=描述
@@ -334,7 +325,6 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=使用自定
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=使用关键词搜索某域创建动态分组
 
-Each\ line\ must\ be\ on\ the\ following\ form=每一行必须使用以下形式
 
 Edit=编辑
 
@@ -381,12 +371,12 @@ Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ follo
 Entry\ types=记录类型
 
 Error=错误
-Error\ exporting\ to\ clipboard=导出到剪贴板错误
 
 Error\ occurred\ when\ parsing\ entry=分析记录时发生错误
 
 Error\ opening\ file=打开文件错误
 
+
 Error\ while\ writing=写入错误
 
 '%0'\ exists.\ Overwrite\ file?='%0' 已存在，覆盖文件？
@@ -404,6 +394,7 @@ Export\ properties=导出属性
 
 Export\ to\ clipboard=导出到剪贴板
 
+Export\ to\ text\ file.=导出到文本文件。
 
 Exporting=正在导出
 Extension=扩展名
@@ -416,8 +407,6 @@ External\ programs=外部程序
 
 External\ viewer\ called=成功调用外部查看器
 
-Fetch=抓取
-
 Field=域
 
 field=域
@@ -425,8 +414,6 @@ field=域
 Field\ name=域名称
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=域名中不可含有空格或以下字符
 
-Field\ to\ filter=要过滤的域
-
 Field\ to\ group\ by=用来分组的域
 
 File=文件
@@ -441,13 +428,8 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=文件目录未设置或
 
 File\ exists=文件已存在
 
-File\ has\ been\ updated\ externally.\ What\ do\ you\ want\ to\ do?=文件被外部程序修改，您要怎么做？
-
 File\ not\ found=无法找到文件
 File\ type=文件类型
-
-File\ updated\ externally=文件被外部程序修改
-
 filename=文件名
 
 Files\ opened=已打开文件
@@ -456,6 +438,7 @@ Filter=过滤
 
 Filter\ All=筛选所有
 
+Filter\ None=无过滤
 
 Finished\ automatically\ setting\ external\ links.=完成自动设置外部链接。
 
@@ -469,6 +452,7 @@ Float=浮动 (结果上浮到最前)
 
 for=为
 
+
 Format\ of\ author\ and\ editor\ names=作者和编者的姓名格式
 Format\ string=格式化简写字串
 
@@ -479,9 +463,9 @@ found\ in\ AUX\ file=在 AUX 发现
 
 Full\ name=全称
 
+
 General=基本设置
 
-General\ fields=General 域
 
 Generate=生成
 
@@ -502,6 +486,7 @@ Get\ fulltext=获取全文
 Gray\ out\ non-hits=置灰未选中
 
 Groups=分组
+has/have\ both\ a\ 'Comment'\ and\ a\ 'Review'\ field.=包含“注释”和“评论”字段。
 
 Have\ you\ chosen\ the\ correct\ package\ path?=您选择了正确的包路径吗？
 
@@ -520,6 +505,7 @@ Underline=下划线
 Empty\ Highlight=清除高亮
 Empty\ Marking=清除标记
 Empty\ Underline=清除下划线
+The\ marked\ area\ does\ not\ contain\ any\ legible\ text\!=标注区域不包含易读文本！
 
 Hint\:\ To\ search\ specific\ fields\ only,\ enter\ for\ example\:<p><tt>author\=smith\ and\ title\=electrical</tt>=提示\: 若想只搜索特定域的话，可以像这样写\:<p><tt>author\=smith and title\=electrical</tt>
 
@@ -565,15 +551,13 @@ Importing=正在导入
 
 Importing\ in\ unknown\ format=以未知格式导入
 
-Include\ abstracts=包含摘要
-Include\ entries=包括的记录
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=包含子分组：当分组被选中时，显示所有它和它的子分组中的记录
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=独立分组：当分组被选中时，只显示属于此分组的记录
 
 Work\ options=工作选项
 
+
 Insert=插入
 
 Insert\ rows=插入行
@@ -592,6 +576,7 @@ JabRef\ preferences=JabRef 首选项
 
 Join=加入
 
+Joins\ selected\ keywords\ and\ deletes\ selected\ keywords.=联结选定的关键字并删除选定的关键字。
 
 Journal\ abbreviations=期刊缩写名
 
@@ -620,10 +605,7 @@ Last\ modified=上次修改的
 LaTeX\ AUX\ file=LaTeX AUX 文件
 Leave\ file\ in\ its\ current\ directory=保留文件的当前位置不改变。
 
-
-Limit\ to\ fields=限制范围到域
-
-Limit\ to\ selected\ entries=限制范围为选中的记录
+Left=左
 
 Link=链接
 Link\ local\ file=链接本地文件
@@ -647,9 +629,8 @@ Mark\ new\ entries\ with\ owner\ name=建立新记录时标记所有者为
 
 Memory\ stick\ mode=记忆棒模式
 
-Menu\ and\ label\ font\ size=菜单和标签字号
-
 Merged\ external\ changes=合并外部修改
+Merge\ fields=合并域
 
 Messages=消息
 
@@ -673,6 +654,8 @@ Move\ up=上移
 
 Moved\ group\ "%0".=移动了分组 "%0"。
 
+
+
 Name=名字
 Name\ formatter=姓名格式化器
 
@@ -690,8 +673,6 @@ New\ content=新内容
 
 New\ library\ created.=创建了新文献库。
 
-New\ field\ value=新的域内容
-
 New\ group=新建分组
 
 New\ string=新建简写字串
@@ -706,9 +687,6 @@ no\ library\ generated=没有生成文献库
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=没有找到记录，请检查是否使用了正确的导入过滤器。
 
-
-No\ entries\ found\ for\ the\ search\ string\ '%0'=没有找到符合查询字符串 '%0' 的记录
-
 No\ entries\ imported.=没有导入记录。
 
 No\ files\ found.=没有找到文件。
@@ -730,8 +708,6 @@ Nothing\ to\ redo=无可重做
 
 Nothing\ to\ undo=无可撤销
 
-occurrences=次
-
 OK=确定
 
 One\ or\ more\ keys\ will\ be\ overwritten.\ Continue?=一个或多个 BibTeX 键将会被覆盖，是否继续？
@@ -771,13 +747,10 @@ Override=跳过
 
 Override\ default\ file\ directories=跳过默认文件目录
 
-Override\ default\ font\ settings=跳过默认字体设置
-
 Override\ the\ BibTeX\ field\ by\ the\ selected\ text=使用选中文字覆盖 BibTeX 键值
 
 
 Overwrite=覆盖
-Overwrite\ existing\ field\ values=覆盖原有域内容
 
 Overwrite\ keys=覆盖键值
 
@@ -813,6 +786,7 @@ Please\ enter\ the\ string's\ label=请输入简写字串的标签
 
 Please\ select\ an\ importer.=请选择一个导入器。
 
+
 Possible\ duplicate\ entries=可能的重复记录
 
 Possible\ duplicate\ of\ existing\ entry.\ Click\ to\ resolve.=可能与已存在记录重复，点击以解决此问题。
@@ -848,8 +822,6 @@ Redo=重做
 
 Reference\ library=参考文献文献库
 
-%0\ references\ found.\ Number\ of\ references\ to\ fetch?=找到参考文献\: %0。 要抓取的引用数？
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=提炼父分组：当分组被选中时，显示同时包含在该分组和它父分组中的记录
 
 regular\ expression=正则表达式
@@ -908,10 +880,8 @@ Replace\ (regular\ expression)=替换 (正则表达式)
 
 Replace\ string=替换字符串
 
-Replace\ with=替换为
-
-
-Replaced=被替换
+Replace\ Unicode\ ligatures=替换Unicode连字
+Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=将Unicode连字替换成它们的扩展格式
 
 Required\ fields=必选域
 
@@ -921,8 +891,11 @@ Resolve\ strings\ for\ all\ fields\ except=处理所有域的简写字串，除
 Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=只处理标准 BibTeX 域的简写字串
 
 resolved=已解决
+
+
 Review=评论
 Review\ changes=复查修改
+Review\ Field\ Migration=查看字段迁移
 
 Right=右
 
@@ -938,10 +911,6 @@ Save\ library\ as...=保存文献库为 ...
 
 Save\ entries\ in\ their\ original\ order=以原始顺序保存记录
 
-Save\ failed=保存失败
-
-Save\ failed\ during\ backup\ creation=保存失败，无法创建备份
-
 Saved\ library=已保存文献库
 
 Saved\ selected\ to\ '%0'.=保存选中到 '%0'.
@@ -955,8 +924,6 @@ Search=查找
 
 Search\ expression=查找表达式
 
-Search\ for=查找
-
 Searching\ for\ duplicates...=正在查找重复记录...
 
 Searching\ for\ files=正在查找文件
@@ -965,19 +932,16 @@ Secondary\ sort\ criterion=次要依据
 
 Select\ all=全选
 
-Select\ encoding=选择编码
-
 Select\ entry\ type=选择记录类型
-Select\ external\ application=选择外部程序
 
 Select\ file\ from\ ZIP-archive=从 ZIP-压缩包中选择文件
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=选择树节点查看和接受/拒绝修改
-Selected\ entries=选中的记录
+
 Set\ field=设置域内容
 Set\ fields=设置域内容
 
-Set\ general\ fields=设置 general 域
+
 Set\ main\ external\ file\ directory=设置外部文件的主目录
 
 Settings=设置
@@ -1008,8 +972,10 @@ Show\ required\ fields=显示必选域
 
 Show\ URL/DOI\ column=显示 URL/DOI 列
 
+Show\ validation\ messages=显示验证消息
 
 Simple\ HTML=简单 HTML
+Since\ the\ 'Review'\ field\ was\ deprecated\ in\ JabRef\ 4.2,\ these\ two\ fields\ are\ about\ to\ be\ merged\ into\ the\ 'Comment'\ field.=因为在JabRef 4.2中，“审核”字段被弃用，所以这两个字段将会合并到“注释”中。
 
 Size=大小
 
@@ -1018,6 +984,7 @@ Skipped\ -\ PDF\ does\ not\ exist=跳过-PDF 不存在
 
 Skipped\ entry.=已跳过记录
 
+Some\ appearance\ settings\ you\ changed\ require\ to\ restart\ JabRef\ to\ come\ into\ effect.=您更改的某些外观设置需要重新启动JabRef软件才能生效。
 
 source\ edit=源代码编辑
 Special\ name\ formatters=特殊的姓名格式化器
@@ -1030,8 +997,6 @@ Status=状态
 
 Stop=停止
 
-Strings=简写字串
-
 Strings\ for\ library=简写字串列表——文献库
 
 Sublibrary\ from\ AUX=从 AUX 文件生成的子文献库
@@ -1092,13 +1057,18 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=这个操作要求选中一条或多条记录。
 
+
 Toggle\ entry\ preview=打开/关闭记录预览
 Toggle\ groups\ interface=打开/关闭组界面
+
+
+
 Try\ different\ encoding=尝试其它编码
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=展开选中记录的缩写期刊名称
 Unabbreviated\ %0\ journal\ names.=展开 %0 期刊名称。
 
+Unable\ to\ open\ %0=无法打开%0
 Unable\ to\ open\ link.\ The\ application\ '%0'\ associated\ with\ the\ file\ type\ '%1'\ could\ not\ be\ called.=无法打开链接。无法调用与文件类型 '%1' 关联的应用程序 '%0' 。
 unable\ to\ write\ to=无法写入
 
@@ -1125,6 +1095,7 @@ Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=升级旧外部
 usage=用法
 Use\ autocompletion\ for\ the\ following\ fields=为以下域开启自动补全功能
 
+Tweak\ font\ rendering\ for\ entry\ editor\ on\ Linux=在Linux上调整条目编辑器的字体渲染
 Use\ regular\ expression\ search=使用正则表达式搜索
 
 Username=用户名
@@ -1138,8 +1109,6 @@ verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=检查 LyX 
 View=视图
 Vim\ server\ name=Vim 服务器名
 
-Waiting\ for\ ArXiv...=等待 ArXiv...
-
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=关闭检视窗口时警告未处理的 BibTeX 键重复情况
 
 Warn\ before\ overwriting\ existing\ keys=覆盖已存在的 BibTeX 键之前发出警告
@@ -1165,12 +1134,12 @@ Write\ XMP-metadata\ for\ all\ PDFs\ in\ current\ library?=将 XMP 元数据写
 Writing\ XMP-metadata...=正在写入 XMP 元数据...
 Writing\ XMP-metadata\ for\ selected\ entries...=正在为选中记录写入 XMP 元数据...
 
+XMP-annotated\ PDF=XMP注释的PDF文档
 XMP\ export\ privacy\ settings=XMP 导出隐私设置
 XMP-metadata=XMP 元数据
 XMP-metadata\ found\ in\ PDF\:\ %0=PDF 中的 XMP 元数据\: %0
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=为使这项更改生效，您必须重启 JabRef。
 You\ have\ changed\ the\ language\ setting.=您已经修改了语言设置。
-You\ have\ entered\ an\ invalid\ search\ '%0'.=您输入了一个非法的查询 '%0'.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=为使热键绑定生效，您必须重启 JabRef。
 
@@ -1179,10 +1148,9 @@ Your\ new\ key\ bindings\ have\ been\ stored.=您的热键绑定已经被存储
 The\ following\ fetchers\ are\ available\:=下面列出的是可用的抓取器\:
 Could\ not\ find\ fetcher\ '%0'=无法找到抓取器 '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=使用抓取器'%1'执行请求'%0'
-Query\ '%0'\ with\ fetcher\ '%1'\ did\ not\ return\ any\ results.=使用抓取器'%1'请求'%0'未返回任何结果。
 
-Move\ file=移动文件
-Rename\ file=重命名文件
+Move\ file=移动 文件
+Rename\ file=重命名 文件
 
 Move\ file\ to\ file\ directory\ and\ rename\ file=移动文件到文件目录重命名文件
 
@@ -1191,17 +1159,11 @@ Could\ not\ move\ file\ '%0'.=无法移动文件 '%0'
 Could\ not\ find\ file\ '%0'.=无法找到文件 '%0'。
 Number\ of\ entries\ successfully\ imported=成功导入的记录数
 Import\ canceled\ by\ user=导入操作被用户取消
-Progress\:\ %0\ of\ %1=进度\: %0 of %1
 Error\ while\ fetching\ from\ %0=从 %0 抓取发生错误
 
-Please\ enter\ a\ valid\ number=请输入一个合法的数字
 Show\ search\ results\ in\ a\ window=在新窗口中显示查询结果
 Show\ global\ search\ results\ in\ a\ window=在窗口中显示全局搜索结果
 Search\ in\ all\ open\ libraries=在所有打开的数据库中搜索
-Move\ file\ to\ file\ directory?=移动文件到文件目录?
-
-Library\ is\ protected.\ Cannot\ save\ until\ external\ changes\ have\ been\ reviewed.=文献库受保护中，在外部修改未被复查前无法执行保存操作。
-Protected\ library=受保护的文献库
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=在外部修改未被复查之前拒绝保存文献库。
 Library\ protection=文献库保护
 Unable\ to\ save\ library=无法保存文献库
@@ -1213,7 +1175,6 @@ MIME\ type=MIME 类型
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef<BR>instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef<br>from\ your\ web\ browser.<BR>Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=该选项使得打开或者导入新文件的操作在已经运行的 JabRef 中进行，而不是新建另一个 JabRef 窗口<BR>来进行这些操作。例如，当您从浏览器中调用 JabRef 打开一个文件时，这个选项将比较有用。<BR>注意：它将阻止您同时运行多个 JabRef 实例。
 Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=运行抓取器，例如 "--fetch\=Medline\:cancer"
 
-The\ ACM\ Digital\ Library=ACM 数字图书馆
 Reset=重置
 
 Use\ IEEE\ LaTeX\ abbreviations=使用 IEEE LaTeX 缩写
@@ -1221,17 +1182,18 @@ Use\ IEEE\ LaTeX\ abbreviations=使用 IEEE LaTeX 缩写
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=打开文件时，如果文件链接未定义，则自动寻找匹配的文件。
 Settings\ for\ %0=%0 的设置
 
-Sort\ the\ following\ fields\ as\ numeric\ fields=以数值方式排序下列域
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=第 %0 行\: 发现错误的 BibTeX 键。
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=第 %0 行\: 发现错误的 BibTeX 键(包含空格)。
 Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=第 %0 行\: 发现错误的 BibTeX 键(逗号丢失)。
+No\ full\ text\ document\ found=未发现完整的文档
 Update\ to\ current\ column\ order=使用当前视图中的列顺序
 Download\ from\ URL=从 URL 下载
 Rename\ field=重命名域
 Set/clear/append/rename\ fields=设置/清除/重命名 域
+Append\ field=添加字段
+Append\ to\ fields=追加到字段
 Rename\ field\ to=重命名该域为
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=将一个域中的内容移动到另一个域中
-You\ can\ only\ rename\ one\ field\ at\ a\ time=一次只能重命名一个域
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=无法使用端口 %0 进行远程操作;该端口可能被其它应用程序占用，请使用其它端口。
 
@@ -1251,9 +1213,6 @@ Formatter\ not\ found\:\ %0=无法找到的格式化器： %0
 Clear\ inputarea=清空输入框
 
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=无法保存，文件被另一个 JabRef 实例锁定。
-File\ is\ locked\ by\ another\ JabRef\ instance.=文件被另一个 JabRef 实例锁定。
-Do\ you\ want\ to\ override\ the\ file\ lock?=您是否希望覆盖文件锁？
-File\ locked=文件被锁定
 Current\ tmp\ value=当前临时值
 Metadata\ change=元数据改变
 Changes\ have\ been\ made\ to\ the\ following\ metadata\ elements=下列元数据元素被改变
@@ -1262,9 +1221,8 @@ Generate\ groups\ for\ author\ last\ names=用作者的姓 (last name) 创建分
 Generate\ groups\ from\ keywords\ in\ a\ BibTeX\ field=用 BibTeX 域中的关键词创建分组
 Enforce\ legal\ characters\ in\ BibTeX\ keys=强制在 BibTeX 键值中使用合法字符
 
-Save\ without\ backup?=保存但不备份？
 Unable\ to\ create\ backup=无法创建备份
-Move\ file\ to\ file\ directory=移动文件到文件目录
+Move\ file\ to\ file\ directory=移动文件到文件目录。
 Rename\ file\ to=将文件更名为
 <b>All\ Entries</b>\ (this\ group\ cannot\ be\ edited\ or\ removed)=<b>所有记录</b>（此分组无法被编辑或者删除）
 static\ group=静态分组
@@ -1301,14 +1259,12 @@ Choose\ the\ source\ for\ the\ metadata\ import=选择导入 metadata 的来源
 Create\ entry\ based\ on\ XMP-metadata=基于 XMP 数据新建一条记录
 Create\ blank\ entry\ linking\ the\ PDF=为 PDF 新建一条空白记录
 Only\ attach\ PDF=只附加 PDF 到记录
-Title=标题
 Create\ new\ entry=创建新记录
 Update\ existing\ entry=更新已有记录
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=仅自动补全形如 'Firstname Lastname' 格式的姓名
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=仅自动补全形如 'Lastname, Firstname' 格式的姓名
 Autocomplete\ names\ in\ both\ formats=自动补全两种格式的姓名
 The\ name\ 'comment'\ cannot\ be\ used\ as\ an\ entry\ type\ name.='comment' 不能用作记录类型名
-You\ must\ enter\ an\ integer\ value\ in\ the\ text\ field\ for=您必须输入一个整数值到文本框
 Send\ as\ email=以邮件形式发送
 References=引用
 Sending\ of\ emails=邮件发送选项
@@ -1327,6 +1283,9 @@ Default\ import\ style\ for\ drag\ and\ drop\ of\ PDFs=拖入 PDF 的默认导
 Default\ PDF\ file\ link\ action=默认 PDF 文件链接操作
 Filename\ format\ pattern=文件名格式化表达式
 Additional\ parameters=额外的参数
+Cite\ selected\ entries\ between\ parenthesis=引用括号中的选定项
+Cite\ selected\ entries\ with\ in-text\ citation=引用文本引文中的选定条目
+Cite\ special=引用特殊
 Extra\ information\ (e.g.\ page\ number)=额外信息（例如：页码）
 Manage\ citations=管理文献引用
 Problem\ modifying\ citation=修改文献引用存在问题
@@ -1336,6 +1295,7 @@ Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=文献引用标
 Select\ style=选择引用样式
 Journals=期刊
 Cite=引用
+Cite\ in-text=引用文本
 Insert\ empty\ citation=插入空文献引用
 Merge\ citations=合并文献引用
 Manual\ connect=手动连接
@@ -1348,6 +1308,7 @@ Cite\ selected\ entries\ with\ extra\ information=引用包含额外信息的选
 Ensure\ that\ the\ bibliography\ is\ up-to-date=保证参考文献是最新的
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ BibTeX\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=您的 OpenOffice/LibreOffice 文档引用了一个当前文献库中不存在的 BibTeX 键值 ”%0”。
 Unable\ to\ synchronize\ bibliography=无法同步参考文献
+Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=合并仅仅由空格分隔的两段引文
 Autodetection\ failed=自动检测失败
 Connecting=正在连接
 Please\ wait...=请稍候...
@@ -1356,6 +1317,8 @@ Path\ to\ OpenOffice/LibreOffice\ directory=到 OpenOffice/LibreOffice 安装位
 Path\ to\ OpenOffice/LibreOffice\ executable=OpenOffice/LibreOffice 可执行文件路径
 Path\ to\ OpenOffice/LibreOffice\ library\ dir=OpenOffice/LibreOffice library 目录
 Connection\ lost=连接丢失
+The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=段落格式由样式文件中的 'ReferenceParagraphFormat' 或者 'ReferenceHeaderParagraphFormat' 属性控制。
+The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=字符格式由样式文件中的 'CitationCharacterFormat' 引文属性控制。
 Automatically\ sync\ bibliography\ when\ inserting\ citations=当插入文献引用时自动同步参考文献
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=在当前标签查找 BibTeX 记录
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=在所有打开的数据库中查找 BibTeX 记录
@@ -1380,6 +1343,7 @@ You\ must\ select\ either\ a\ valid\ style\ file,\ or\ use\ one\ of\ the\ defaul
 
 This\ is\ a\ simple\ copy\ and\ paste\ dialog.\ First\ load\ or\ paste\ some\ text\ into\ the\ text\ input\ area.<br>After\ that,\ you\ can\ mark\ text\ and\ assign\ it\ to\ a\ BibTeX\ field.=这是一个简单的拷贝粘贴对话框。首先加载或者粘贴一些文本内容到文本框中，<br>然后你可以选中文本分配到一个 BibTeX 域中。
 This\ feature\ generates\ a\ new\ library\ based\ on\ which\ entries\ are\ needed\ in\ an\ existing\ LaTeX\ document.=此功能根据一个 LeTeX 文档，将它使用到的记录生成为一个新的文献库。
+You\ need\ to\ select\ one\ of\ your\ open\ libraries\ from\ which\ to\ choose\ entries,\ as\ well\ as\ the\ AUX\ file\ produced\ by\ LaTeX\ when\ compiling\ your\ document.=您需要选择一个开放的库，并从中选择条目以及在编译文档时，由LaTeX生成的AUX文件。
 
 First\ select\ entries\ to\ clean\ up.=首先选择要清理的记录。
 Cleanup\ entry=清理记录
@@ -1395,6 +1359,8 @@ Treatment\ of\ first\ names=Firstname 的处理
 Cleanup\ entries=清理记录
 Automatically\ assign\ new\ entry\ to\ selected\ groups=新增记录分配到选中分组
 %0\ mode=%0 模式
+Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=将备注和URL字段中的DOIs移动到DOI字段中，并且移除http前缀
+Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=使链接文件的所有路径为相对的（如果可能）
 Rename\ PDFs\ to\ given\ filename\ format\ pattern=将 PDF 重命名为给定的文件名格式模式
 Rename\ only\ PDFs\ having\ a\ relative\ path=只重命名具有相对路径的 PDF
 Doing\ a\ cleanup\ for\ %0\ entries...=正在清理%0的条目
@@ -1404,6 +1370,7 @@ One\ entry\ needed\ a\ clean\ up=一个条目需要清理
 
 Remove\ selected=移除选中的
 
+Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=无法解析组树。如果保存BibTeX库，所有组都会丢失。
 Attach\ file=附加文件
 Setting\ all\ preferences\ to\ default\ values.=重置所有首选项到默认值.
 Resetting\ preference\ key\ '%0'=重置首选项 '%0'
@@ -1419,15 +1386,19 @@ Opens\ the\ file\ browser.=打开文件浏览器.
 Scan\ directory=扫描目录
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=在选定目录中搜索未链接的文件。
 Starts\ the\ import\ of\ BibTeX\ entries.=开始导入 BibTeX 条目。
-Leave\ this\ dialog.=离开对话框.
 Create\ directory\ based\ keywords=创建基于目录的关键字
 Creates\ keywords\ in\ created\ entrys\ with\ directory\ pathnames=使用目录路径名在创建的条目中创建关键字
 Select\ a\ directory\ where\ the\ search\ shall\ start.=选择要开始搜索的目录。
 Select\ file\ type\:=选择文件类型\:
+These\ files\ are\ not\ linked\ in\ the\ active\ library.=这些文件未在活动库中链接。
+Entry\ type\ to\ be\ created\:=需要创建的条目类型：
 Searching\ file\ system...=正在搜索文件系统...
-Importing\ into\ Library...=正在导入到文献库...
 Select\ directory=选择目录
 Select\ files=选择文件
+BibTeX\ entry\ creation=BibTeX 条目创建
+Unable\ to\ connect\ to\ FreeCite\ online\ service.=无法连接到FreeCite在线服务。
+Parse\ with\ FreeCite=使用FreeCite解析
+How\ would\ you\ like\ to\ link\ to\ '%0'?=您想到怎样链接到 '%0'？
 BibTeX\ key\ patterns=BibTeX 键特征
 Changed\ special\ field\ settings=已修改特殊字段设置
 Clear\ priority=清除优先级
@@ -1440,6 +1411,7 @@ Four\ stars=四星
 Five\ stars=五星
 Help\ on\ special\ fields=特殊字段帮助
 Keywords\ of\ selected\ entries=选中记录的关键词
+Manage\ content\ selectors=管理内容选择器
 Manage\ keywords=管理关键词
 No\ priority\ information=没有优先级信息
 No\ rank\ information=没有评分信息
@@ -1466,8 +1438,18 @@ Update\ keywords=更新关键词
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=将特殊字段的值以独立字段形式写入 BibTeX
 You\ have\ changed\ settings\ for\ special\ fields.=您已经修改了特殊字段的设置.
 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.=与OpenOffice/LibreOffice的连接已丢失。请确保OpenOffice/LibreOffice正在运行，并尝试重新连接。
+JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef 将会至少每个条目发送一个请求给发布者。
+Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=更正条目，并重新打开编辑器以显示/编辑源代码。
+Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=无法连接到运行中的OpenOffice/LibreOffice。
+Make\ sure\ you\ have\ installed\ OpenOffice/LibreOffice\ with\ Java\ support.=请确保您已安装OpenOffice/LibreOffice并支持Java。
+If\ connecting\ manually,\ please\ verify\ program\ and\ library\ paths.=如果手动连接，请验证程序和库路径。
 Error\ message\:=错误信息\:
+If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=如果粘贴或导入的条目已设置字段，则覆盖它。
 Import\ metadata\ from\ PDF=从 PDF 中导入 metadata
+Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=未连接到任何编辑器文档。请确保文档已打开，并使用“选择编辑器文档”按钮连接到该文档。
+Removed\ all\ subgroups\ of\ group\ "%0".=移除 "%0" 组中的所有子分组。
+To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=要禁用记忆棒模式，请在与JabRef相同的文件夹中重命名或删除jabref.xml文件。
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=无法连接。一个可能的原因是, JabRef 和 OpenOffice/LibreOffice 不是同时在在32位模式或64位模式下运行。
 Use\ the\ following\ delimiter\ character(s)\:=使用以下分隔符字符\:
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ prefer\ the\ BIB\ file\ location\ rather\ than\ the\ file\ directory\ set\ above=在下载文件或将链接的文件移动到文件目录时, 请选择 "BIB" 文件位置, 而不是之前选定的文件目录。
@@ -1475,8 +1457,6 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=您的样式文件指定段落格式为 "%0', 它在您当前的 OpenOffice/LibreOffice 文档中未定义。
 
 Searching...=正在搜索...
-You\ have\ selected\ more\ than\ %0\ entries\ for\ download.\ Some\ web\ sites\ might\ block\ you\ if\ you\ make\ too\ many\ rapid\ downloads.\ Do\ you\ want\ to\ continue?=您选择了超过 %0 下载条目。如果您快速进行了太多的下载, 某些网站可能会阻止您。是否继续？
-Confirm\ selection=确认选择
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=搜索时为特殊的标题单词添加 {} 以保证大小写正确
 Import\ conversions=导入约定
 Please\ enter\ a\ search\ string=请输入一个搜索字符串
@@ -1487,7 +1467,6 @@ Canceled\ merging\ entries=已取消记录合并
 Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=对单元格式化时添加非打断分隔符并在搜索时保留正确的大小写
 Merge\ entries=合并记录
 Merged\ entries=已合并选中记录
-Merged\ entry=已合并的记录
 None=空
 Parse=解析
 Result=结果
@@ -1571,9 +1550,7 @@ Add\ new\ file\ type=增加新的文件的类型
 
 Left\ entry=左侧条目
 Right\ entry=右侧条目
-Use=使用
 Original\ entry=原始条目
-Replace\ original\ entry=替换原始条目
 No\ information\ added=未添加任何信息
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=选中至少一条记录来管理关键字.
 OpenDocument\ text=OpenDocument 文本
@@ -1588,10 +1565,10 @@ Removed\ all\ groups=已移除所有分组
 Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=接受使用外部修改的群组树替换全部的群组树。
 Select\ export\ format=选择导出格式
 Return\ to\ JabRef=返回 JabRef
+Please\ move\ the\ file\ manually\ and\ link\ in\ place.=请手动移动文件并链接到恰当的位置
 Could\ not\ connect\ to\ %0=无法连接到 %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=警告： %1 条记录中有 %0 条包含未定义的标题。
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ BibTeX\ key.=警告： %1 条记录中有 %0 条包含未定义的 BibTeX 键值。
-occurrence=发生
 Added\ new\ '%0'\ entry.=已添加新 '%0' 记录。
 Multiple\ entries\ selected.\ Do\ you\ want\ to\ change\ the\ type\ of\ all\ these\ to\ '%0'?=已选中多条记录，您希望将所有选中记录都修改为 %0 类型？
 Changed\ type\ to\ '%0'\ for=已更改类型为 "%0"为
@@ -1611,11 +1588,16 @@ Print\ entry\ preview=打印记录预览
 Copy\ title=复制标题
 Copy\ \\cite{BibTeX\ key}=复制 \\cite{BibTeX 键值}
 Copy\ BibTeX\ key\ and\ title=复制 BibTeX 键值和标题
-Merged\ BibTeX\ source\ code=已合并 BibTeX 源代码
 Invalid\ DOI\:\ '%0'.=不合法的 DOI\:
+should\ start\ with\ a\ name=请以名称开头
+should\ end\ with\ a\ name=请以名称结尾
+unexpected\ closing\ curly\ bracket=花括号被意外关闭
+unexpected\ opening\ curly\ bracket=花括号被意外打开
 capital\ letters\ are\ not\ masked\ using\ curly\ brackets\ {}=大写字符没有使用花括号 {} 括起来
 should\ contain\ a\ four\ digit\ number=应该包含一个 4 位数字
 should\ contain\ a\ valid\ page\ number\ range=应该包含一个合法的页码范围
+Filled=填充的
+Field\ is\ missing=字段缺失
 Search\ %0=搜索 %0
 
 Search\ results\ in\ all\ libraries\ for\ %0=在所有数据库中搜索 %0 的结果
@@ -1664,6 +1646,7 @@ String\ dialog,\ add\ string=简写字串对话框，添加简写字串
 String\ dialog,\ remove\ string=简写字串对话框，删除简写字串
 Synchronize\ files=同步文件
 Unabbreviate=展开缩写
+should\ contain\ a\ protocol=应当包含协议
 Copy\ preview=拷贝预览
 Automatically\ setting\ file\ links=自动设置文件链接
 Regenerating\ BibTeX\ keys\ according\ to\ metadata=基于 metadata 重新生成 BibTeX 键值
@@ -1679,17 +1662,27 @@ value=值
 Show\ preferences=列表显示首选项
 Save\ actions=保存时附加操作
 Enable\ save\ actions=启用保存附加操作
+Convert\ to\ BibTeX\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journaltitle'\ field\ to\ 'journal')=转换为 BibTeX 格式 (例如，将 "journaltitle" 字段的值移动到 "journal")
 
 Other\ fields=其它域
 Show\ remaining\ fields=显示其它的域
 
 link\ should\ refer\ to\ a\ correct\ file\ path=链接应该指向一个正确的文件路径
 abbreviation\ detected=检测到缩写
+wrong\ entry\ type\ as\ proceedings\ has\ page\ numbers=错误的条目类型，因为出版物中有页码
 Abbreviate\ journal\ names=缩写期刊名
 Abbreviating...=正在缩写...
-
-Adding\ fetched\ entries=正在添加抓取的记录
-Fetching\ entries\ from\ Inspire=从 Inspire 抓取记录
+Abbreviation\ %s\ for\ journal\ %s\ already\ defined.=杂志 %s 的缩写 %s 已经被定义。
+Abbreviation\ cannot\ be\ empty=缩写不能为空
+Duplicated\ Journal\ Abbreviation=日志缩写重复
+Duplicated\ Journal\ File=日志文件重复
+Error\ Occurred=出错了
+Journal\ file\ %s\ already\ added=日志文件 %s 已经被添加
+Name\ cannot\ be\ empty=名称不能为空。
+
+Display\ keywords\ appearing\ in\ ALL\ entries=显示所有条目中出现的关键字
+Display\ keywords\ appearing\ in\ ANY\ entry=显示在任何条目中出现的关键字
+None\ of\ the\ selected\ entries\ have\ titles.=选中的条目都不包含名称。
 None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=选中的记录都不包含 BibTeX 键值。
 Unabbreviate\ journal\ names=展开期刊名称
 Unabbreviating...=正在展开缩写...
@@ -1699,18 +1692,25 @@ Usage=用法
 Adds\ {}\ brackets\ around\ acronyms,\ month\ names\ and\ countries\ to\ preserve\ their\ case.=为 %s 里的缩略语、月份和国家添加花括号 {} 以保持大小写不变。
 Are\ you\ sure\ you\ want\ to\ reset\ all\ settings\ to\ default\ values?=您确认希望将所有设置重置为默认值吗？
 Reset\ preferences=重置所有首选项
+Ill-formed\ entrytype\ comment\ in\ BIB\ file=BIB文件中的Ill-formed输入类型注释
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=移动链接的文件到默认文件目录 %0
 
-Clipboard=剪贴板
 Do\ you\ still\ want\ to\ continue?=是否继续？
+This\ action\ will\ modify\ the\ following\ field(s)\ in\ at\ least\ one\ entry\ each\:=此操作将在每个至少一个条目中修改以下字段：
+This\ could\ cause\ undesired\ changes\ to\ your\ entries.=这可能会对您的条目造成意外更改。
+Run\ field\ formatter\:=运行字段格式化程序：
 Table\ font\ size\ is\ %0=表格字号是 %0
-%0\ import\ canceled=%0 导入被取消
 Internal\ style=内部样式
 Add\ style\ file=添加样式文件
+Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=确实要删除该样式吗？
+Current\ style\ is\ '%0'=当前样式为 "%0"
 Remove\ style=移除样式
+Select\ one\ of\ the\ available\ styles\ or\ add\ a\ style\ file\ from\ disk.=选择可用样式之一或从磁盘添加样式文件。
+You\ must\ select\ a\ valid\ style\ file.=你必须选择一个有效的样式文件。
 Reload=刷新
 
+Capitalize=大写
 Capitalize\ all\ words,\ but\ converts\ articles,\ prepositions,\ and\ conjunctions\ to\ lower\ case.=将所有单词大写，不过将 articles, prepositions 和 conjunctions 转为小写。
 Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=将每句话第一个字母大写, 其余单词改为小写.
 Changes\ all\ letters\ to\ lower\ case.=将所有字母改为小写.
@@ -1718,14 +1718,19 @@ Changes\ all\ letters\ to\ upper\ case.=将所有字母改为大写.
 Changes\ the\ first\ letter\ of\ all\ words\ to\ capital\ case\ and\ the\ remaining\ letters\ to\ lower\ case.=将每个单词的第一个字母改为大写, 其它字母改为小写.
 Cleans\ up\ LaTeX\ code.=清理 LaTeX 代码
 Converts\ HTML\ code\ to\ LaTeX\ code.=将 HTML 代码转换为 LaTeX 代码。
+HTML\ to\ Unicode=HTML 到 Unicode
+Converts\ HTML\ code\ to\ Unicode.=将 HTML 代码转换为 Unicode 代码。
 Converts\ LaTeX\ encoding\ to\ Unicode\ characters.=将 LaTeX 编码转换为 Unicode 字符。
 Converts\ Unicode\ characters\ to\ LaTeX\ encoding.=将 Unicode 字符转换为 LaTeX 编码
 Converts\ ordinals\ to\ LaTeX\ superscripts.=将序号转换成 LaTeX 上标。
+Converts\ units\ to\ LaTeX\ formatting.=将单位转换为LaTeX格式。
 HTML\ to\ LaTeX=HTML 转 LaTeX
 LaTeX\ cleanup=清理 LaTeX
 LaTeX\ to\ Unicode=LaTeX 转 Unicode
 Lower\ case=改为小写
+Minify\ list\ of\ person\ names=缩小人名列表
 Normalize\ date=规范化日期格式
+Normalize\ en\ dashes=破折号规范化
 Normalize\ month=规范化月份格式
 Normalize\ month\ to\ BibTeX\ standard\ abbreviation.=规范化月份为 BibTeX 标准缩写.
 Normalize\ names\ of\ persons=规范化人名格式
@@ -1733,22 +1738,41 @@ Normalize\ page\ numbers=规范化页码格式
 Normalize\ pages\ to\ BibTeX\ standard.=规范化 pages 为 BibTeX 标准.
 Normalizes\ lists\ of\ persons\ to\ the\ BibTeX\ standard.=规范化人名列表为 BibTeX 标准.
 Normalizes\ the\ date\ to\ ISO\ date\ format.=规范化日期为 ISO 日期格式.
+Normalizes\ the\ en\ dashes.=破折号规范化
 Ordinals\ to\ LaTeX\ superscript=序号转为 LaTeX 上标
 Protect\ terms=保护专有名词
+Add\ enclosing\ braces=添加外围花括号
+Add\ braces\ encapsulating\ the\ complete\ field\ content.=添加包含整个字段内容的括号。
 Remove\ enclosing\ braces=移除外围花括号
 Removes\ braces\ encapsulating\ the\ complete\ field\ content.=移除包含整个字段内容的括号。
 Sentence\ case=句首大写
 Shortens\ lists\ of\ persons\ if\ there\ are\ more\ than\ 2\ persons\ to\ "et\ al.".=将多于 2 人的人名列表简化为 "et al."。
 Title\ case=首字母大写
+Unicode\ to\ LaTeX=Unicode 转 LaTeX
+Units\ to\ LaTeX=单位转为LaTeX
 Upper\ case=改为大写
 Does\ nothing.=什么都没干。
+Identity=标识
 Clears\ the\ field\ completely.=完全清除这个字段。
 Directory\ not\ found=目录未找到
 Main\ file\ directory\ not\ set\!=未设置主文件目录\!
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=这个操作仅限对选中的一条记录进行。
 Importing\ in\ %0\ format=正在以 %0 格式导入
-
-
+Female\ name=女性名字
+Female\ names=女性名字
+Male\ name=男性名字
+Male\ names=男性名字
+Mixed\ names=混合名字
+Neuter\ name=中性名字
+Neuter\ names=中性名字
+
+Determined\ %0\ for\ %1\ entries=已确定 %1 项的 %0
+Look\ up\ %0=查找 %0
+Looking\ up\ %0...\ -\ entry\ %1\ out\ of\ %2\ -\ found\ %3=查找 %0... %1 条目包括在 %2 中 - 查找到 %3
+
+Audio\ CD=音频CD
+British\ patent=英国专利
+British\ patent\ request=英国专利申请
 Candidate\ thesis=候选人论文
 Collaborator=合作者
 Column=列
@@ -1800,6 +1824,7 @@ All\ external\ files=所有外部文件
 
 OpenOffice/LibreOffice\ integration=OpenOffice/LibreOffice 整合
 
+incorrect\ control\ digit=错误的控制数字
 incorrect\ format=格式错误
 Copied\ version\ to\ clipboard=版本已复制到剪切板
 
@@ -1813,6 +1838,8 @@ Reset\ Bindings=重设键绑定
 Decryption\ not\ supported.=不支持解码
 
 Cleared\ '%0'\ for\ %1\ entries=对 %1 条目清理了 '%0'
+Set\ '%0'\ to\ '%1'\ for\ %2\ entries=%2 个条目，将 '%0' 设置成 '%1'
+Toggled\ '%0'\ for\ %1\ entries=已切换 %1 条目的 '%0'
 
 Check\ for\ updates=检查更新
 Download\ update=下载更新
@@ -1827,75 +1854,312 @@ A\ new\ version\ of\ JabRef\ has\ been\ released.=发现新版本 JabRef.
 JabRef\ is\ up-to-date.=JabRef 是最新版本.
 Latest\ version=最新版本
 Online\ help\ forum=在线讨论区
+Custom=自定义
 
+Export\ cited=导出已被引用的
+Unable\ to\ generate\ new\ library=无法生成新库
 
 Open\ console=打开终端程序
 Use\ default\ terminal\ emulator=使用默认的模拟终端
 Execute\ command=执行命令
 Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=注意\: 使用 %0 占位符来表示当前打开的文献库文件位置.
-
+Executing\ command\ "%0"...=正在执行命令 “%0”...
+Error\ occured\ while\ executing\ the\ command\ "%0".=执行 "%0" 命令时出错。
+Reformat\ ISSN=重新格式化 ISSN
+
+Countries\ and\ territories\ in\ English=英语国家和区域
+Electrical\ engineering\ terms=电气工程术语
+Enabled=已启用
+Internal\ list=内部列表
+Manage\ protected\ terms\ files=管理受保护的术语文件
+Months\ and\ weekdays\ in\ English=英文的月份和工作日
+The\ text\ after\ the\ last\ line\ starting\ with\ \#\ will\ be\ used=最后一行以 \# 号开头的文本将会被使用
+Add\ protected\ terms\ file=添加受保护的术语文件
+Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=确实要删除受保护的术语文件吗？
+Remove\ protected\ terms\ file=删除受保护的术语文件
+Add\ selected\ text\ to\ list=将选定文本添加到列表中
+Add\ {}\ around\ selected\ text=给选定文本加上 {}
+Format\ field=格式字段
+New\ protected\ terms\ file=新的受保护术语文件
+change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=将 %1 条目中的字段 %0 从 %2 更改为 %3
+change\ key\ from\ %0\ to\ %1=将密钥从 %0 更改为 %1
+change\ string\ content\ %0\ to\ %1=将字符串内容 %0 更改为 %1
+change\ string\ name\ %0\ to\ %1=将字符串名称 %0 更改为 %1
+change\ type\ of\ entry\ %0\ from\ %1\ to\ %2=将条目 %0 的类型从 %1 更改为 %2
+insert\ entry\ %0=插入条目 %0
+insert\ string\ %0=插入字符串 %0
+remove\ entry\ %0=移除条目 %0
+remove\ string\ %0=移除字符串 %0
+undefined=未定义的
+Cannot\ get\ info\ based\ on\ given\ %0\:\ %1=基于给定的 %0\: %1无法获得信息
 Get\ BibTeX\ data\ from\ %0=从 %0 中获取 BibTeX 数据
+No\ %0\ found=找不到 %0
+Entry\ from\ %0=来自 %0 的条目
+Merge\ entry\ with\ %0\ information=与 %0 信息合并条目
 Updated\ entry\ with\ info\ from\ %0=已根据 %0 更新记录
 
-
-
-
-
-
+Add\ existing\ file=添加现有文件
+Create\ new\ list=创建新的列表
+Remove\ list=删除列表
+Full\ journal\ name=完整杂志名称
+Abbreviation\ name=缩写名
+
+No\ abbreviation\ files\ loaded=缩写文件未加载
+
+Loading\ built\ in\ lists=加载内置列表
+
+JabRef\ built\ in\ list=JabRef 内置列表
+IEEE\ built\ in\ list=IEEE 内置列表
+
+Event\ log=事件日志
+We\ now\ give\ you\ insight\ into\ the\ inner\ workings\ of\ JabRef's\ internals.\ This\ information\ might\ be\ helpful\ to\ diagnose\ the\ root\ cause\ of\ a\ problem.\ Please\ feel\ free\ to\ inform\ the\ developers\ about\ an\ issue.=我们现在让您深入了解JabRef内部运作原理。此信息可能有助于诊断导致问题的根本原因。欢迎随时通知我们的开发人员相关问题。
+Log\ copied\ to\ clipboard.=日志已复制到剪贴板。
+Copy\ Log=复制日志
+Clear\ Log=清除日志
+Report\ Issue=报告问题
+Issue\ on\ GitHub\ successfully\ reported.=已成功报告 GitHub 上的问题。
+Issue\ report\ successful=问题报告成功
+Your\ issue\ was\ reported\ in\ your\ browser.=您的问题已在浏览器中报告。
+The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=日志和异常信息已复制到剪贴板中。
+Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=请将此信息粘贴至问题描述中 (用 Ctrl + V)。
+
+Connecting...=连接中...
+Host=主机
 Port=端口
+Library=库
+User=用户
 Connect=连接
+Connection\ error=连接错误
+Connection\ to\ %0\ server\ established.=已建立到 %0 服务器的连接。
+Required\ field\ "%0"\ is\ empty.=必填字段 "%0" 为空。
+%0\ driver\ not\ available.=%0 驱动程序不可用。
+The\ connection\ to\ the\ server\ has\ been\ terminated.=与服务器的连接已终止。
+Connection\ lost.=连接丢失。
+Reconnect=重新连接
+Work\ offline=脱机工作
+Working\ offline.=脱机工作中。
+Update\ refused.=更新被拒绝。
+Update\ refused=更新被拒绝
+Local\ entry=本地条目
+Shared\ entry=共享条目
+Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=由于现有的更改冲突，更新无法执行。
+You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=您没有使用最新版本的BibEntry。
+Local\ version\:\ %0=本地版本： %0
+Shared\ version\:\ %0=共享版本\: %0
+Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=请将共享条目与您的合并，然后按“合并条目”以解决此问题。
+Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=取消此操作将使您的更改不同步。确定取消？
+Shared\ entry\ is\ no\ longer\ present=共享条目不再存在
+You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=您可以使用 "撤消" 操作还原条目。
+You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=你已经用了刚才键入的信息连接了数据库。
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=无法引用 BibTeX 键为空的记录, 现在生成键值?
+New\ technical\ report=新的技术报告
 
+%0\ file=%0 文件
+Custom\ layout\ file=自定义布局文件
+Protected\ terms\ file=受保护的术语文件
+Style\ file=样式文件
 
+Open\ OpenOffice/LibreOffice\ connection=打开 OpenOffice/LibreOffice 连接
+You\ must\ enter\ at\ least\ one\ field\ name=您至少需要输入一个字段名
+Non-ASCII\ encoded\ character\ found=发现Non-ASCII编码字符
 Toggle\ web\ search\ interface=切换网页搜索面板
 %0\ files\ found=找到 %0 个文件
-%0\ of\ %1=%1 中的 %0
 One\ file\ found=找到一个文件
-
+The\ import\ finished\ with\ warnings\:=导入已完成，有错误警告：
+There\ was\ one\ file\ that\ could\ not\ be\ imported.=有一个文件无法导入。
+There\ were\ %0\ files\ which\ could\ not\ be\ imported.=%0 个文件无法导入。
+
+Migration\ help\ information=迁移帮助信息
+Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=输入的数据库的结构太老式了，不受支持。
+However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=但是，在pre-3.6版本中，一个新数据库也一起创建了。
+Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=打开可下载当前开发版本的链接
+See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=查看 JabRef 版本中已更改的内容
 Referenced\ BibTeX\ key\ does\ not\ exist=引用的 BibTeX 键不存在
+Finished\ downloading\ full\ text\ document\ for\ entry\ %0.=下载条目 %0 的全文文档，已完成。
 Look\ up\ full\ text\ documents=查找文档全文
+You\ are\ about\ to\ look\ up\ full\ text\ documents\ for\ %0\ entries.=您将查找 %0 个条目的全文文档。
+last\ four\ nonpunctuation\ characters\ should\ be\ numerals=最后四个字符应当为数字
 
 Author=作者
 Date=日期
+File\ annotations=文件批注
+Show\ file\ annotations=显示文件批注
+Adobe\ Acrobat\ Reader=Adobe Acrobat Reader
+Sumatra\ Reader=Sumatra 阅读器
+shared=共享
+should\ contain\ an\ integer\ or\ a\ literal=应当包含整数或文字
+should\ have\ the\ first\ letter\ capitalized=首字母应当大写
+Tools=工具
+What's\ new\ in\ this\ version?=此版本中有什么新增内容？
+Want\ to\ help?=想帮忙吗？
+Make\ a\ donation=捐助我们
+get\ involved=参与贡献
+Used\ libraries=使用的库
 Existing\ file=已有文件
 
+ID=ID
 ID\ type=ID 类型
+Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=抓取程序 "%0" 未找到 id 为 "%1" 的条目。
 
+Select\ first\ entry=选择首个条目
+Select\ last\ entry=选择最后一个条目
 
+Invalid\ ISBN\:\ '%0'.=无效的ISBN\: "%0"。
+should\ be\ an\ integer\ or\ normalized=应该是整数或被规范化的
+should\ be\ normalized=应当被规范化
 
+Empty\ search\ ID=清空搜索ID
+The\ given\ search\ ID\ was\ empty.=给定的搜索 ID 为空。
 Copy\ BibTeX\ key\ and\ link=拷贝 BibTeX key 和链接
+biblatex\ field\ only=仅 biblatex 字段
 
+Error\ while\ generating\ fetch\ URL=生成提取 URL 时出错
+Error\ while\ parsing\ ID\ list=解析 ID 列表时出错
+Unable\ to\ get\ PubMed\ IDs=无法获取 PubMed IDs
+Backup\ found=备份已找到
+A\ backup\ file\ for\ '%0'\ was\ found.=找到了 "%0" 的备份文件。
+This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=这可能表明, 上次使用该文件时, JabRef 没有完全关闭。
+Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=是否要从备份文件中恢复库？
+Firstname\ Lastname=名字 姓氏
 
+Recommended\ for\ %0=为 %0 推荐
+Show\ 'Related\ Articles'\ tab=显示 "相关文章" 选项卡
+This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=这可能是由于达到了谷歌学术搜索的流量限制（更多详细信息，请参阅“帮助”）。
 
+Could\ not\ open\ website.=无法打开网站。
+Problem\ downloading\ from\ %1=从 %1 下载出错
 
+File\ directory\ pattern=文件目录模式
+Update\ with\ bibliographic\ information\ from\ the\ web=使用来自网络的书目信息进行更新
 
+Could\ not\ find\ any\ bibliographic\ information.=找不到任何书目信息。
 BibTeX\ key\ deviates\ from\ generated\ key=BibTeX 键派生于自动生成的键
+DOI\ %0\ is\ invalid=DOI %0 无效
 
+Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences=选择所有要存储在本地首选项中的所有自定义类型
+Currently\ unknown=当前未知
+Different\ customization,\ current\ settings\ will\ be\ overwritten=不同的自定义项, 当前设置将被覆盖
 
+Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=条目类型 %0 仅为Biblatex定义，但不为BibTeX定义
 
+Copied\ %0\ citations.=%0 个引用已复制。
+Copying...=正在复制...
 
 journal\ not\ found\ in\ abbreviation\ list=在缩写列表中未能找到期刊名
+Unhandled\ exception\ occurred.=发生了无法处理的异常。
 
+strings\ included=包含的字符串
 Default\ table\ font\ size=默认表格字号
+Escape\ underscores=转义下划线
+Color=色彩
+Please\ also\ add\ all\ steps\ to\ reproduce\ this\ issue,\ if\ possible.=如果可能的话，也请添加所有步骤以重现这个问题。
+Fit\ width=适应宽度
+Fit\ a\ single\ page=适应单页
+Zoom\ in=放大
+Zoom\ out=缩小
+Previous\ page=上一页
+Next\ page=下一页
+Document\ viewer=文档查看器
+Live=实时
+Locked=已锁定
 Show\ document\ viewer=打开文档查看器
-
-
-
-
-
-
+Show\ the\ document\ of\ the\ currently\ selected\ entry.=显示当前选定条目的文档。
+Show\ this\ document\ until\ unlocked.=解锁前一直显示此文档。
+Set\ current\ user\ name\ as\ owner.=将当前用户名设置为所有者。
+
+Sort\ all\ subgroups\ (recursively)=对所有子组进行排序 (递归)
+Collect\ and\ share\ telemetry\ data\ to\ help\ improve\ JabRef.=收集和共享遥测数据，用来帮助改善 JabRef。
+Don't\ share=请勿共享
+Share\ anonymous\ statistics=共享匿名统计数据
+Telemetry\:\ Help\ make\ JabRef\ better=遥测：帮助使 JabRef 越来越好
+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.=为了提高用户体验，我们将收集有关您使用功能的匿名统计信息。我们仅仅会记录你访问的功能，以及使用的频率。我们不会收集任何个人信息，更不会收集书目的具体内容。现在您选择允许信息收集，以后您想禁用收集功能，请在选项-> 偏好 -> 通用中设置。
+This\ file\ was\ found\ automatically.\ Do\ you\ want\ to\ link\ it\ to\ this\ entry?=自动查找到文件。你想把它链接到这个条目吗？
+Names\ are\ not\ in\ the\ standard\ %0\ format.=名称不是标准的 %0 格式。
+
+Delete\ the\ selected\ file\ permanently\ from\ disk,\ or\ just\ remove\ the\ file\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ file\ permanently\ from\ disk.=想要永久从磁盘中删除所选中的文件，或者只是将文件从这个条目中删除？按下删除键将永久删除该文件。
+Delete\ '%0'=删除 %0
+Delete\ from\ disk=从磁盘中删除
+Remove\ from\ entry=从条目中移除
+There\ exists\ already\ a\ group\ with\ the\ same\ name.=相同名称的组已经存在。
+
+Copy\ linked\ files\ to\ folder...=复制链接的文件到文件夹...
+Copied\ file\ successfully=已成功复制文件
+Copying\ files...=正在复制文件...
+Copying\ file\ %0\ of\ entry\ %1=正在复制条目 %1 中的文件 %0
+Finished\ copying=复制已完成
+Could\ not\ copy\ file=无法复制文件
+Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=已成功复制 %1 中的 %0 文件到 %2
+Rename\ failed=重命名失败
+JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef 无法访问该文件, 因为另一个进程正在使用它。
+Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=显示控制台输出（只需要在使用启动器时显示）
+
+Remove\ line\ breaks=移除换行符
+Removes\ all\ line\ breaks\ in\ the\ field\ content.=移除字段内容中的所有换行符。
+Checking\ integrity...=正在检查完整性...
+
+Remove\ hyphenated\ line\ breaks=移除带连字符的换行符
+Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=移除字段内容中的所有带连字符的换行符。
+Note\ that\ currently,\ JabRef\ does\ not\ run\ with\ Java\ 9.=请注意，当前版本的JabRef 不能在 Java 9 运行。
+Your\ current\ Java\ version\ (%0)\ is\ not\ supported.\ Please\ install\ version\ %1\ or\ higher.=不支持您当前的 Java 版本 (%0)。请安装 %1 或更高版本。
+
+Could\ not\ retrieve\ entry\ data\ from\ '%0'.=无法从 "%0" 中检索条目数据。
+Entry\ from\ %0\ could\ not\ be\ parsed.=无法解析 %0 中的条目。
+Invalid\ identifier\:\ '%0'.=无效的标识符：'%0'。
+This\ paper\ has\ been\ withdrawn.=这篇论文已被撤回。
+Finished\ writing\ XMP-metadata.=完成编写 XMP-metadata。
 empty\ BibTeX\ key=空 BibTeX 键
+Your\ Java\ Runtime\ Environment\ is\ located\ at\ %0.=您的Java运行环境位于 %0。
+Aux\ file=Aux 文件
+Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=包含给定TeX文件中引用的条目组
 
+Any\ file=任何文件
 
+No\ linked\ files\ found\ for\ export.=没有找到可导出的链接文件。
 
+Full\ text\ document\ download\ failed\ for\ entry\ %0=条目 %0 全文下载失败
+No\ full\ text\ document\ found\ for\ entry\ %0.=未找到用条目 %0 的全文文档。
 
+Delete\ Entry=删除条目
+Import\ &\ Export=导入 & 导出
+Look\ up\ document\ identifier=查找文档标识符
+Next\ library=下一个文献库
+Previous\ library=上一个文献库
 add\ group=添加分组
-
-
-
-
-
+Entry\ is\ contained\ in\ the\ following\ groups\:=以下组中包含条目：
+Delete\ entries=删除条目
+Keep\ entries=保留条目
+Keep\ entry=保留条目
+Ignore\ backup=忽略备份
+Restore\ from\ backup=从备份中还原
+
+Continue=继续
+Generate\ key=生成密钥
+Overwrite\ file=覆盖文件
+Shared\ database\ connection=共享数据库连接
+
+Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\ correct\ server\ name.=无法连接到 Vim 服务器。请确认 Vim 以正确的服务器名称运行。
+Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=无法连接到正在运行的 gnuserv 进程。请确定 Emacs 或 XEmacs 正在运行, 并确保已启动服务器 (通过运行命令 'server-start'/'gnuserv-start')。
+Error\ pushing\ entries=推送条目时出错
+
+Undefined\ character\ format=未定义的字符格式
+Undefined\ paragraph\ format=未定义的段落格式
+
+Edit\ Preamble=编辑序言
+Markings=标示
+Use\ selected\ instance=使用所选的例子
+
+Hide\ panel=隐藏面板
+Move\ panel\ up=向上移动面板
+Move\ panel\ down=向下移动面板
+Linked\ files=链接的文件
+Group\ view\ mode\ set\ to\ intersection=组视图模式设置为交集
+Group\ view\ mode\ set\ to\ union=组视图模式设置为联合
+Open\ %0\ URL\ (%1)=打开 %0 URL (%1)
+Open\ URL\ (%0)=打开 URL (%0)
+Open\ file\ %0=打开文件 %0
+Jump\ to\ entry=跳转到条目
+The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\ does\ not\ work\ as\ expected.=此组名中包含关键字分隔符 "%0"，可能无法按预期工作。
 Abbreviate\ journal\ names\ (ISO)=缩写期刊名称 (ISO)
 Abbreviate\ journal\ names\ (MEDLINE)=缩写期刊名称 (MEDLINE)
 Blog=博客
@@ -1904,12 +2168,25 @@ Copy\ DOI\ url=拷贝 DOI URL
 Copy\ citation=复制 Citation
 Development\ version=开发中版本
 Export\ selected\ entries=导出选中记录
+Export\ selected\ entries\ to\ clipboard=将选定条目导出到剪贴板
+Find\ duplicates=发现重复项
 Fork\ me\ on\ GitHub=去 GitHub Fork JabRef
 JabRef\ resources=JabRef 资源
+Manage\ journal\ abbreviations=管理期刊缩写名
 Manage\ protected\ terms=管理受保护的术语
 New\ %0\ library=新建 %0 文献库
+New\ entry\ from\ plain\ text=纯文本中的新条目
+New\ sublibrary\ based\ on\ AUX\ file=基于AUX 文件，新建的子文献库
 Push\ entries\ to\ external\ application\ (%0)=推送选中记录到外部程序 (%0)
+Quit=退出
+Recent\ libraries=最近的库
+Set\ up\ general\ fields=配置通用字段
 View\ change\ log=查看变更记录
 View\ event\ log=查看事件日志
 Website=网站
 Write\ XMP-metadata\ to\ PDFs=将 XMP 元数据写入到 PDF 中
+
+Override\ default\ font\ settings=跳过默认字体设置
+
+
+

From 065523d84805618c1686e893d1998ea5ce9ca2c7 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sat, 3 Nov 2018 17:11:30 +0100
Subject: [PATCH 155/229] New translations JabRef_en.properties (German)
 (#4455)

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

diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index f266b945a78..74cc9c60665 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -32,6 +32,7 @@ Accept=Übernehmen
 
 Accept\ change=Änderung akzeptieren
 
+Accept\ recommendations\ from\ Mr.\ DLib=Empfehlungen von Mr. DLib akzeptieren
 
 Action=Aktion
 
@@ -159,6 +160,7 @@ Clear\ fields=Felder löschen
 
 Close=Schließen
 
+Close\ entry=Eintrag schließen
 
 Close\ dialog=Dialog schließen
 
@@ -215,6 +217,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Das Programm 'vim' konnte nicht gestartet
 Could\ not\ save\ file.=Datei konnte nicht gespeichert werden.
 Character\ encoding\ '%0'\ is\ not\ supported.=Die Zeichenkodierung '%0' wird nicht unterstützt.
 
+Create\ custom\ fields\ for\ each\ BibTeX\ entry=Erstellen Sie benutzerdefinierte Felder für jeden BibTeX-Eintrag
 
 crossreferenced\ entries\ included=Inklusive querverwiesenen Einträgen
 
@@ -325,6 +328,7 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Dynamisches Gr
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Dynamisches Gruppieren der Einträge anhand eines Stichworts in einem Feld
 
+Each\ line\ must\ be\ of\ the\ following\ form=Jede Zeile muss das folgende Format aufweisen
 
 Edit=Bearbeiten
 
@@ -376,6 +380,7 @@ Error\ occurred\ when\ parsing\ entry=Fehler beim Analysieren des Eintrags
 
 Error\ opening\ file=Fehler beim Öffnen der Datei
 
+Error\ while\ fetching\ from\ Mr.DLib.=Fehler beim Abrufen von Mr.DLib.
 
 Error\ while\ writing=Fehler beim Schreiben
 
@@ -452,6 +457,7 @@ Float=Oben einsortieren
 
 for=für
 
+Format\:\ Tab\:field;field;...\ (e.g.\ General\:url;pdf;note...)=Format\: Tab\:Feld;Feld\:... (z. B. General\:url;pdf\:note...)
 
 Format\ of\ author\ and\ editor\ names=Format der Autoren- und Hrsg.-Namen
 Format\ string=Formatier-Ausdruck
@@ -463,9 +469,11 @@ found\ in\ AUX\ file=gefundene Schlüssel in AUX Datei
 
 Full\ name=Kompletter Name
 
+Further\ information\ about\ Mr\ DLib.\ for\ JabRef\ users.=Weitere Informationen über Mr. DLib für JabRef Benutzer.
 
 General=Allgemein
 
+General\ Fields=Allgemeine Felder
 
 Generate=Erzeugen
 
@@ -557,6 +565,7 @@ Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Unabh
 
 Work\ options=Bearbeitungsoptionen
 
+I\ Agree=Ich stimme zu
 
 Insert=einfügen
 
@@ -654,6 +663,7 @@ Move\ up=Nach oben
 
 Moved\ group\ "%0".=Gruppe "%0" verschoben.
 
+Mr.\ DLib\ is\ an\ external\ service\ which\ provides\ article\ recommendations\ based\ on\ the\ currently\ selected\ entry.\ Data\ about\ the\ selected\ entry\ must\ be\ sent\ to\ Mr.\ DLib\ in\ order\ to\ provide\ these\ recommendations.\ Do\ you\ agree\ that\ this\ data\ may\ be\ sent?=Mr. DLib ist ein externer Service der Artikelempfehlungen basierend auf den aktuell ausgewählten Eintrag anbietet. Daten über den ausgewählten Eintrag müssen an Mr. DLib gesendet werden, um diese Empfehlungen anzubieten. Sind Sie einverstanden, dass diese Daten gesendet werden dürfen?
 
 
 Name=Name
@@ -786,6 +796,7 @@ Please\ enter\ the\ string's\ label=Geben Sie bitte den Namen des Strings ein.
 
 Please\ select\ an\ importer.=Bitte Importer auswählen.
 
+Please\ restart\ JabRef\ for\ preferences\ to\ take\ effect.=Bitte starten Sie die Anwendung neu, damit die Änderungen wirksam werden.
 
 Possible\ duplicate\ entries=Mögliche doppelte Einträge
 
@@ -875,6 +886,9 @@ Removed\ string=String gelöscht
 Renamed\ string=String umbenannt
 
 Replace=Ersetzen
+Replace\ With\:=Ersetzen durch\:
+Limit\ to\ Selected\ Entries=Auf ausgewählten Einträge begrenzen
+Limit\ to\ Fields=Auf folgende Felder begrenzen
 
 Replace\ (regular\ expression)=Ersetzen (regulärer Ausdruck)
 

From 185c47a7a629ad7c33d1728f5d16c377cba8ac03 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sun, 4 Nov 2018 17:00:38 +0100
Subject: [PATCH 156/229] Improve MathSciNet fetcher and add ISBN fetcher to
 entry editor toolbar  (#4444)

* Improve MathSciNet fetcher and add ISBN fetcher to entry editor toolbar

Makes the MathSciNet fetcher more reliable in the case the entry already contains a mrnumber.
Moreover, adds the ISBN fetcher to the list of fetcher available under "Update with bibliographic information from the web" in the entry editor toolbar.

* Fix checkstyle


Co-authored-by: Tobias Diez <tobiasdiez@gmx.de>

* Fix checkstyle

Co-authored-by: Tobias Diez <tobiasdiez@gmx.de>
---
 CHANGELOG.md                                  |  2 +
 .../jabref/logic/importer/WebFetchers.java    |  1 +
 .../logic/importer/fetcher/IsbnFetcher.java   | 38 +++++++++++--------
 .../logic/importer/fetcher/MathSciNet.java    |  7 ++++
 .../importer/fetcher/IsbnFetcherTest.java     | 32 ++++++++++------
 .../importer/fetcher/MathSciNetTest.java      | 13 ++++++-
 6 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2119c71557..0d5069e2517 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We changed the default keyboard shortcuts for moving between entries when the entry editor is active to ̀<kbd>alt</kbd> + <kbd>up/down</kbd>.
 - Opening a new file now prompts the directory of the currently selected file, instead of the directory of the last opened file.
 - Window state is saved on close and restored on start.
+- We made the MathSciNet fetcher more reliable.
+- We added the ISBN fetcher to the list of fetcher available under "Update with bibliographic information from the web" in the entry editor toolbar.
 - Files without a defined external file type are now directly opened with the default application of the operating system
 - We streamlined the process to rename and move files by removing the confirmation dialogs.
 - We removed the redundant new lines of markings and wrapped the summary in the File annotation tab. [#3823](https://github.com/JabRef/jabref/issues/3823)
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index 3329a6215f2..c06849201f3 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -119,6 +119,7 @@ public static List<EntryBasedFetcher> getEntryBasedFetchers(ImportFormatPreferen
         ArrayList<EntryBasedFetcher> list = new ArrayList<>();
         list.add(new AstrophysicsDataSystem(importFormatPreferences));
         list.add(new DoiFetcher(importFormatPreferences));
+        list.add(new IsbnFetcher(importFormatPreferences));
         list.add(new MathSciNet(importFormatPreferences));
         list.add(new CrossRef());
         list.sort(Comparator.comparing(WebFetcher::getName));
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java
index 343d5e3e8cd..c1d13f862e9 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java
@@ -1,23 +1,32 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
+import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 
+import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.IdBasedFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.FieldName;
+import org.jabref.model.util.OptionalUtil;
 
 import org.jsoup.helper.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Fetcher for ISBN trying ebook.de first and then chimbori.com
  */
-public class IsbnFetcher extends AbstractIsbnFetcher {
+public class IsbnFetcher implements EntryBasedFetcher, IdBasedFetcher {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(IsbnFetcher.class);
+    protected final ImportFormatPreferences importFormatPreferences;
 
     public IsbnFetcher(ImportFormatPreferences importFormatPreferences) {
-        super(importFormatPreferences);
+        this.importFormatPreferences = importFormatPreferences;
     }
 
     @Override
@@ -25,12 +34,9 @@ public String getName() {
         return "ISBN";
     }
 
-    /**
-     * Method never used
-     */
     @Override
-    public URL getURLForID(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
-        return null;
+    public Optional<HelpFile> getHelpPage() {
+        return Optional.of(HelpFile.FETCHER_ISBN);
     }
 
     @Override
@@ -39,8 +45,6 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
             return Optional.empty();
         }
 
-        this.ensureThatIsbnIsValid(identifier);
-
         IsbnViaEbookDeFetcher isbnViaEbookDeFetcher = new IsbnViaEbookDeFetcher(importFormatPreferences);
         Optional<BibEntry> bibEntry = isbnViaEbookDeFetcher.performSearchById(identifier);
         // nothing found at ebook.de, try chimbori.com
@@ -55,8 +59,12 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
     }
 
     @Override
-    public void doPostCleanup(BibEntry entry) {
-        // no action needed
+    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+        Optional<String> isbn = entry.getField(FieldName.ISBN);
+        if (isbn.isPresent()) {
+            return OptionalUtil.toList(performSearchById(isbn.get()));
+        } else {
+            return Collections.emptyList();
+        }
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
index 603e84eac60..774d4155c00 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -52,6 +53,12 @@ public String getName() {
      */
     @Override
     public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedURLException, FetcherException {
+        Optional<String> mrNumberInEntry = entry.getField(FieldName.MR_NUMBER);
+        if (mrNumberInEntry.isPresent()) {
+            // We are lucky and already know the id, so use it instead
+            return getURLForID(mrNumberInEntry.get());
+        }
+
         URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mrlookup");
         uriBuilder.addParameter("format", "bibtex");
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
index ed140ff3dc8..b6b34971a17 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 
 import org.jabref.logic.importer.FetcherException;
@@ -18,13 +20,13 @@
 import static org.mockito.Mockito.mock;
 
 @FetcherTest
-public class IsbnFetcherTest {
+class IsbnFetcherTest {
 
     private IsbnFetcher fetcher;
     private BibEntry bibEntry;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         fetcher = new IsbnFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
         bibEntry = new BibEntry();
@@ -41,54 +43,62 @@ public void setUp() {
     }
 
     @Test
-    public void testName() {
+    void testName() {
         assertEquals("ISBN", fetcher.getName());
     }
 
     @Test
-    public void testHelpPage() {
+    void testHelpPage() {
         assertEquals("ISBNtoBibTeX", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
-    public void searchByIdSuccessfulWithShortISBN() throws FetcherException {
+    void searchByIdSuccessfulWithShortISBN() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0134685997");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
     @Test
-    public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
+    void searchByIdSuccessfulWithLongISBN() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780134685991");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
     @Test
-    public void searchByIdReturnsEmptyWithEmptyISBN() throws FetcherException {
+    void searchByIdReturnsEmptyWithEmptyISBN() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("");
         assertEquals(Optional.empty(), fetchedEntry);
     }
 
     @Test
-    public void searchByIdThrowsExceptionForShortInvalidISBN() {
+    void searchByIdThrowsExceptionForShortInvalidISBN() {
         assertThrows(FetcherException.class, () -> fetcher.performSearchById("123456789"));
     }
 
     @Test
-    public void searchByIdThrowsExceptionForLongInvalidISB() {
+    void searchByIdThrowsExceptionForLongInvalidISB() {
         assertThrows(FetcherException.class, () -> fetcher.performSearchById("012345678910"));
     }
 
     @Test
-    public void searchByIdThrowsExceptionForInvalidISBN() {
+    void searchByIdThrowsExceptionForInvalidISBN() {
         assertThrows(FetcherException.class, () -> fetcher.performSearchById("jabref-4-ever"));
     }
 
+    @Test
+    void searchByEntryWithISBNSuccessful() throws FetcherException {
+        BibEntry input = new BibEntry().withField("isbn", "0134685997");
+
+        List<BibEntry> fetchedEntry = fetcher.performSearch(input);
+        assertEquals(Collections.singletonList(bibEntry), fetchedEntry);
+    }
+
     /**
      * This test searches for a valid ISBN. See https://www.amazon.de/dp/3728128155/?tag=jabref-21 However, this ISBN is
      * not available on ebook.de. The fetcher should something as it falls back to Chimbori
      */
     @Test
-    public void searchForIsbnAvailableAtChimboriButNonOnEbookDe() throws FetcherException {
+    void searchForIsbnAvailableAtChimboriButNonOnEbookDe() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3728128155");
         assertNotEquals(Optional.empty(), fetchedEntry);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
index e66d81f0948..cf938c036bb 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.importer.fetcher;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -55,8 +56,16 @@ void searchByEntryFindsEntry() throws Exception {
         searchEntry.setField("journal", "fluid");
 
         List<BibEntry> fetchedEntries = fetcher.performSearch(searchEntry);
-        assertFalse(fetchedEntries.isEmpty());
-        assertEquals(ratiuEntry, fetchedEntries.get(0));
+        assertEquals(Collections.singletonList(ratiuEntry), fetchedEntries);
+    }
+
+    @Test
+    void searchByIdInEntryFindsEntry() throws Exception {
+        BibEntry searchEntry = new BibEntry();
+        searchEntry.setField("mrnumber", "3537908");
+
+        List<BibEntry> fetchedEntries = fetcher.performSearch(searchEntry);
+        assertEquals(Collections.singletonList(ratiuEntry), fetchedEntries);
     }
 
     @Test

From 5548f8f04eb257d148292b6fedff6c2c86518237 Mon Sep 17 00:00:00 2001
From: Stephen Beitzel <sbeitzel@pobox.com>
Date: Tue, 6 Nov 2018 13:12:52 -0800
Subject: [PATCH 157/229] Set auto-update checkbox enable/disable when reading
 preferences (#4446)

* When initializing the UI from prefs, fire an event to make sure dependent controls get updated.

Drive-by code cleanup -- enums are singletons; don't call enum.equals(), just use ==.

* Update changelog to document fix.

* Refactor enable/disable logic to its own method

* Revert CHANGELOG. Change checkbox disable/enable logic to use FX bind / observable.
---
 .../java/org/jabref/gui/preferences/GeneralTab.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
index 2cb74aca865..8e065aab85c 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
@@ -26,6 +26,8 @@
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.preferences.JabRefPreferences;
 
+import static javafx.beans.binding.Bindings.not;
+
 class GeneralTab extends Pane implements PrefsTab {
 
     private final CheckBox useOwner;
@@ -59,10 +61,7 @@ public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
         updateTimeStamp = new CheckBox(Localization.lang("Update timestamp on modification"));
         useTimeStamp = new CheckBox(Localization.lang("Mark new entries with addition date") + ". "
                 + Localization.lang("Date format") + ':');
-        if (!useTimeStamp.isSelected()) {
-            updateTimeStamp.setDisable(true);
-        }
-        useTimeStamp.setOnAction(e->updateTimeStamp.setDisable(!useTimeStamp.isSelected()));
+        updateTimeStamp.disableProperty().bind(not(useTimeStamp.selectedProperty()));
         overwriteOwner = new CheckBox(Localization.lang("Overwrite"));
         overwriteTimeStamp = new CheckBox(Localization.lang("If a pasted or imported entry already has the field set, overwrite."));
         enforceLegalKeys = new CheckBox(Localization.lang("Enforce legal characters in BibTeX keys"));
@@ -182,9 +181,9 @@ public void storeSettings() {
         // Update name of the time stamp field based on preferences
         InternalBibtexFields.updateTimeStampField(prefs.get(JabRefPreferences.TIME_STAMP_FIELD));
         prefs.setDefaultEncoding(encodings.getValue());
-        prefs.putBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE, biblatexMode.getValue().equals(BibDatabaseMode.BIBLATEX));
+        prefs.putBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE, biblatexMode.getValue() == BibDatabaseMode.BIBLATEX);
 
-        if (!languageSelection.getValue().equals(prefs.getLanguage())) {
+        if (languageSelection.getValue() != prefs.getLanguage()) {
             prefs.setLanguage(languageSelection.getValue());
             Localization.setLanguage(languageSelection.getValue());
 

From 57281d279a258b49456183d641ea1cfadd6c006c Mon Sep 17 00:00:00 2001
From: Stephen Beitzel <sbeitzel@pobox.com>
Date: Wed, 7 Nov 2018 11:37:22 -0800
Subject: [PATCH 158/229] respect preference state (#4468)

* When initializing the UI from prefs, fire an event to make sure dependent controls get updated.

Drive-by code cleanup -- enums are singletons; don't call enum.equals(), just use ==.

* Update changelog to document fix.

* Refactor enable/disable logic to its own method

* Revert CHANGELOG. Change checkbox disable/enable logic to use FX bind / observable.

* remove line which overrides the preference for updateTimeStamp
---
 src/main/java/org/jabref/gui/preferences/GeneralTab.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
index 8e065aab85c..d2c27c1a97c 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
@@ -139,7 +139,6 @@ public void setValues() {
         useTimeStamp.setSelected(prefs.getBoolean(JabRefPreferences.USE_TIME_STAMP));
         overwriteTimeStamp.setSelected(prefs.getBoolean(JabRefPreferences.OVERWRITE_TIME_STAMP));
         updateTimeStamp.setSelected(prefs.getBoolean(JabRefPreferences.UPDATE_TIMESTAMP));
-        updateTimeStamp.setSelected(useTimeStamp.isSelected());
         enforceLegalKeys.setSelected(prefs.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
         shouldCollectTelemetry.setSelected(prefs.shouldCollectTelemetry());
         memoryStick.setSelected(prefs.getBoolean(JabRefPreferences.MEMORY_STICK_MODE));

From 144522d61aa286d4604f7ea41c6869786f1161e4 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 7 Nov 2018 21:17:49 +0100
Subject: [PATCH 159/229] Add eprint cleanup (#4445)

* Adds a cleanup operation that detects an arXiv identifier in the note, journal or url field and moves it to the `eprint` field.

I also took the opportunity to convert the cleanup panel to FXML and somewhat simplified/refactored the code around the cleanup.

* Implement feedback

* Fix cleanup
---
 CHANGELOG.md                                  |   2 +
 .../org/jabref/gui/actions/CleanupAction.java |  49 +++----
 .../org/jabref/gui/cleanup/CleanupDialog.java |   5 +-
 .../gui/cleanup/CleanupPresetPanel.fxml       |  33 +++++
 .../gui/cleanup/CleanupPresetPanel.java       | 138 ++++++++----------
 .../cleanup/FieldFormatterCleanupsPanel.java  |   2 +-
 .../jabref/logic/cleanup/CleanupPreset.java   |  42 +-----
 .../jabref/logic/cleanup/CleanupWorker.java   |  59 ++++----
 .../org/jabref/logic/cleanup/DoiCleanup.java  |  11 +-
 .../jabref/logic/cleanup/EprintCleanup.java   |  52 +++++++
 .../entry/identifier/ArXivIdentifier.java     |  71 +++++++--
 .../jabref/preferences/JabRefPreferences.java |  94 +++---------
 src/main/resources/l10n/JabRef_en.properties  |   2 +-
 .../logic/cleanup/EprintCleanupTest.java      |  29 ++++
 .../entry/identifier/ArXivIdentifierTest.java |  48 +++++-
 15 files changed, 367 insertions(+), 270 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml
 create mode 100644 src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
 create mode 100644 src/test/java/org/jabref/logic/cleanup/EprintCleanupTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d5069e2517..83579f5575d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We changed the behavior of the field formatting dialog such that the `bibtexkey` is not changed when formatting all fields or all text fields.
 - We added a "Move file to file directory and rename file" option for simultaneously moving and renaming of document file. [#4166](https://github.com/JabRef/jabref/issues/4166)
 - Use integrated graphics card instead of discrete on macOS [#4070](https://github.com/JabRef/jabref/issues/4070)
+- We added a cleanup operation that detects an arXiv identifier in the note, journal or url field and moves it to the `eprint` field.
+  Because of this change, the last-used cleanup operations were reset.
 - We changed the minimum required version of Java to 1.8.0_171, as this is the latest release for which the automatic Java update works.  [4093](https://github.com/JabRef/jabref/issues/4093)
 - The special fields like `Printed` and `Read status` now show gray icons when the row is hovered.
 - We added a button in the tab header which allows you to close the database with one click. https://github.com/JabRef/jabref/issues/494
diff --git a/src/main/java/org/jabref/gui/actions/CleanupAction.java b/src/main/java/org/jabref/gui/actions/CleanupAction.java
index a4814735c8d..648af8313b7 100644
--- a/src/main/java/org/jabref/gui/actions/CleanupAction.java
+++ b/src/main/java/org/jabref/gui/actions/CleanupAction.java
@@ -10,7 +10,6 @@
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.gui.util.BackgroundTask;
-import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.cleanup.CleanupPreset;
 import org.jabref.logic.cleanup.CleanupWorker;
 import org.jabref.logic.l10n.Localization;
@@ -23,11 +22,6 @@ public class CleanupAction implements BaseAction {
     private final BasePanel panel;
     private final DialogService dialogService;
 
-    /**
-     * Global variable to count unsuccessful renames
-     */
-    private int unsuccessfulRenames;
-
     private boolean isCanceled;
     private int modifiedEntriesCount;
     private final JabRefPreferences preferences;
@@ -44,13 +38,31 @@ public void action() {
         if (isCanceled) {
             return;
         }
-        CleanupDialog cleanupDialog = new CleanupDialog(panel.getBibDatabaseContext(), preferences.getCleanupPreset());
+        CleanupDialog cleanupDialog = new CleanupDialog(panel.getBibDatabaseContext(), preferences.getCleanupPreset(), preferences.getFilePreferences());
 
         Optional<CleanupPreset> chosenPreset = cleanupDialog.showAndWait();
-        chosenPreset.ifPresent(cleanupPreset ->
-                BackgroundTask.wrap(() -> cleanup(cleanupPreset))
-                              .onSuccess(x -> showResults())
-                              .executeWith(Globals.TASK_EXECUTOR));
+
+        if (chosenPreset.isPresent()) {
+            if (chosenPreset.get().isRenamePDFActive() && preferences.getBoolean(JabRefPreferences.ASK_AUTO_NAMING_PDFS_AGAIN)) {
+                boolean confirmed = dialogService.showConfirmationDialogWithOptOutAndWait(Localization.lang("Autogenerate PDF Names"),
+                        Localization.lang("Auto-generating PDF-Names does not support undo. Continue?"),
+                        Localization.lang("Autogenerate PDF Names"),
+                        Localization.lang("Cancel"),
+                        Localization.lang("Disable this confirmation dialog"),
+                        optOut -> Globals.prefs.putBoolean(JabRefPreferences.ASK_AUTO_NAMING_PDFS_AGAIN, !optOut));
+
+                if (!confirmed) {
+                    isCanceled = true;
+                    return;
+                }
+            }
+
+            preferences.setCleanupPreset(chosenPreset.get());
+
+            BackgroundTask.wrap(() -> cleanup(chosenPreset.get()))
+                          .onSuccess(result -> showResults())
+                          .executeWith(Globals.TASK_EXECUTOR);
+        }
     }
 
     public void init() {
@@ -111,21 +123,6 @@ private void showResults() {
     private void cleanup(CleanupPreset cleanupPreset) {
         preferences.setCleanupPreset(cleanupPreset);
 
-        if (cleanupPreset.isRenamePDF() && preferences.getBoolean(JabRefPreferences.ASK_AUTO_NAMING_PDFS_AGAIN)) {
-
-            boolean confirmed = DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showConfirmationDialogWithOptOutAndWait(Localization.lang("Autogenerate PDF Names"),
-                    Localization.lang("Auto-generating PDF-Names does not support undo. Continue?"),
-                    Localization.lang("Autogenerate PDF Names"),
-                    Localization.lang("Cancel"),
-                    Localization.lang("Disable this confirmation dialog"),
-                    optOut -> Globals.prefs.putBoolean(JabRefPreferences.ASK_AUTO_NAMING_PDFS_AGAIN, !optOut)));
-
-            if (!confirmed) {
-                isCanceled = true;
-                return;
-            }
-        }
-
         for (BibEntry entry : panel.getSelectedEntries()) {
             // undo granularity is on entry level
             NamedCompound ce = new NamedCompound(Localization.lang("Cleanup entry"));
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
index 4e672761366..83d9e810b05 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
@@ -6,15 +6,16 @@
 import org.jabref.logic.cleanup.CleanupPreset;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.metadata.FilePreferences;
 
 public class CleanupDialog extends BaseDialog<CleanupPreset> {
 
-    public CleanupDialog(BibDatabaseContext databaseContext, CleanupPreset initialPreset) {
+    public CleanupDialog(BibDatabaseContext databaseContext, CleanupPreset initialPreset, FilePreferences filePreferences) {
         setTitle(Localization.lang("Cleanup entries"));
         getDialogPane().setPrefSize(600, 600);
         getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
 
-        CleanupPresetPanel presetPanel = new CleanupPresetPanel(databaseContext, initialPreset);
+        CleanupPresetPanel presetPanel = new CleanupPresetPanel(databaseContext, initialPreset, filePreferences);
         getDialogPane().setContent(presetPanel);
         setResultConverter(button -> {
             if (button == ButtonType.OK) {
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml
new file mode 100644
index 00000000000..1ca9d6ebafa
--- /dev/null
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.VBox?>
+<fx:root xmlns:fx="http://javafx.com/fxml/1" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/8.0.121"
+         fx:controller="org.jabref.gui.cleanup.CleanupPresetPanel">
+
+    <CheckBox fx:id="cleanUpDOI" text="%Move DOIs from note and URL field to DOI field and remove http prefix"/>
+    <CheckBox fx:id="cleanUpEprint"
+              text="%Move preprint information from 'URL' and 'journal' field to the 'eprint' field"/>
+    <CheckBox fx:id="cleanUpISSN" text="%Reformat ISSN"/>
+    <CheckBox fx:id="cleanUpUpgradeExternalLinks"/>
+    <CheckBox fx:id="cleanUpMovePDF"/>
+    <CheckBox fx:id="cleanUpMakePathsRelative" text="%Make paths of linked files relative (if possible)"/>
+    <CheckBox fx:id="cleanUpRenamePDF" text="%Rename PDFs to given filename format pattern"/>
+    <VBox spacing="5.0">
+        <Label fx:id="cleanupRenamePDFLabel"/>
+        <CheckBox fx:id="cleanUpRenamePDFonlyRelativePaths" text="%Rename only PDFs having a relative path"/>
+        <VBox.margin>
+            <Insets left="40.0"/>
+        </VBox.margin>
+    </VBox>
+
+    <CheckBox fx:id="cleanUpBiblatex"
+              text="%Convert to biblatex format (for example, move the value of the 'journal' field to 'journaltitle')"/>
+    <CheckBox fx:id="cleanUpBibtex"
+              text="%Convert to BibTeX format (for example, move the value of the 'journaltitle' field to 'journal')"/>
+
+    <VBox fx:id="formatterContainer"/>
+
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
index 4bd64ec1f62..9149ef4a5f0 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -6,124 +6,103 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javafx.scene.Group;
+import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
 
-import org.jabref.Globals;
 import org.jabref.logic.cleanup.CleanupPreset;
 import org.jabref.logic.cleanup.Cleanups;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.FieldName;
-import org.jabref.preferences.JabRefPreferences;
+import org.jabref.model.metadata.FilePreferences;
 
-public class CleanupPresetPanel extends ScrollPane {
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class CleanupPresetPanel extends VBox {
 
     private final BibDatabaseContext databaseContext;
-    private CheckBox cleanUpDOI;
-    private CheckBox cleanUpISSN;
-    private CheckBox cleanUpMovePDF;
-    private CheckBox cleanUpMakePathsRelative;
-    private CheckBox cleanUpRenamePDF;
-    private CheckBox cleanUpRenamePDFonlyRelativePaths;
-    private CheckBox cleanUpUpgradeExternalLinks;
-    private CheckBox cleanUpBiblatex;
-    private CheckBox cleanUpBibtex;
+    @FXML private Label cleanupRenamePDFLabel;
+    @FXML private CheckBox cleanUpDOI;
+    @FXML private CheckBox cleanUpEprint;
+    @FXML private CheckBox cleanUpISSN;
+    @FXML private CheckBox cleanUpMovePDF;
+    @FXML private CheckBox cleanUpMakePathsRelative;
+    @FXML private CheckBox cleanUpRenamePDF;
+    @FXML private CheckBox cleanUpRenamePDFonlyRelativePaths;
+    @FXML private CheckBox cleanUpUpgradeExternalLinks;
+    @FXML private CheckBox cleanUpBiblatex;
+    @FXML private CheckBox cleanUpBibtex;
+    @FXML private VBox formatterContainer;
     private FieldFormatterCleanupsPanel cleanUpFormatters;
 
-    private CleanupPreset cleanupPreset;
-
-    public CleanupPresetPanel(BibDatabaseContext databaseContext, CleanupPreset cleanupPreset) {
-        this.cleanupPreset = Objects.requireNonNull(cleanupPreset);
+    public CleanupPresetPanel(BibDatabaseContext databaseContext, CleanupPreset cleanupPreset, FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
-        init();
+
+        // Load FXML
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+
+        init(cleanupPreset, filePreferences);
     }
 
-    private void init() {
-        cleanUpDOI = new CheckBox(
-                Localization.lang("Move DOIs from note and URL field to DOI field and remove http prefix"));
-        cleanUpISSN = new CheckBox(Localization.lang("Reformat ISSN"));
-        Optional<Path> firstExistingDir = databaseContext
-                .getFirstExistingFileDir(JabRefPreferences.getInstance().getFilePreferences());
+    private void init(CleanupPreset cleanupPreset, FilePreferences filePreferences) {
+        Optional<Path> firstExistingDir = databaseContext.getFirstExistingFileDir(filePreferences);
         if (firstExistingDir.isPresent()) {
-            cleanUpMovePDF = new CheckBox(Localization.lang("Move linked files to default file directory %0",
-                    firstExistingDir.get().toString()));
+            cleanUpMovePDF.setText(Localization.lang("Move linked files to default file directory %0", firstExistingDir.get().toString()));
         } else {
-            cleanUpMovePDF = new CheckBox(Localization.lang("Move linked files to default file directory %0", "..."));
-            cleanUpMovePDF.setDisable(true);
+            cleanUpMovePDF.setText(Localization.lang("Move linked files to default file directory %0", "..."));
+
             // Since the directory does not exist, we cannot move it to there. So, this option is not checked - regardless of the presets stored in the preferences.
+            cleanUpMovePDF.setDisable(true);
             cleanUpMovePDF.setSelected(false);
         }
-        cleanUpMakePathsRelative = new CheckBox(
-                Localization.lang("Make paths of linked files relative (if possible)"));
-        cleanUpRenamePDF = new CheckBox(Localization.lang("Rename PDFs to given filename format pattern"));
-        cleanUpRenamePDF.selectedProperty().addListener(
-                                                        event -> cleanUpRenamePDFonlyRelativePaths.setDisable(!cleanUpRenamePDF.isSelected()));
-        cleanUpRenamePDFonlyRelativePaths = new CheckBox(Localization.lang("Rename only PDFs having a relative path"));
-        cleanUpUpgradeExternalLinks = new CheckBox(
-                Localization.lang("Upgrade external PDF/PS links to use the '%0' field.", FieldName.FILE));
-        cleanUpBiblatex = new CheckBox(Localization.lang(
-                "Convert to biblatex format (for example, move the value of the 'journal' field to 'journaltitle')"));
-        cleanUpBibtex = new CheckBox(Localization.lang(
-                "Convert to BibTeX format (for example, move the value of the 'journaltitle' field to 'journal')"));
-        Group biblatexConversion = new Group(); // Only make "to Biblatex" or "to BibTeX" selectable
-        biblatexConversion.getChildren().add(cleanUpBiblatex);
-        biblatexConversion.getChildren().add(cleanUpBibtex);
-
-        cleanUpFormatters = new FieldFormatterCleanupsPanel(Localization.lang("Run field formatter:"),
-                Cleanups.DEFAULT_SAVE_ACTIONS);
 
-        updateDisplay(cleanupPreset);
+        cleanUpRenamePDFonlyRelativePaths.disableProperty().bind(cleanUpRenamePDF.selectedProperty().not());
 
-        GridPane container = new GridPane();
-        container.add(cleanUpDOI, 0, 0);
-        container.add(cleanUpUpgradeExternalLinks, 0, 1);
-        container.add(cleanUpMovePDF, 0, 2);
-        container.add(cleanUpMakePathsRelative, 0, 3);
-        container.add(cleanUpRenamePDF, 0, 4);
-        String currentPattern = Localization.lang("Filename format pattern").concat(": ");
-        currentPattern = currentPattern.concat(Globals.prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
-        container.add(new Label(currentPattern), 0, 5);
-        container.add(cleanUpRenamePDFonlyRelativePaths, 0, 6);
-        container.add(cleanUpBibtex, 0, 7);
-        container.add(cleanUpBiblatex, 0, 8);
-        container.add(cleanUpISSN, 0, 9);
-        container.add(cleanUpFormatters, 0, 10);
-
-        setContent(container);
-        setVbarPolicy(ScrollBarPolicy.AS_NEEDED);
+        cleanUpUpgradeExternalLinks.setText(Localization.lang("Upgrade external PDF/PS links to use the '%0' field.", FieldName.FILE));
+
+        cleanUpFormatters = new FieldFormatterCleanupsPanel(Localization.lang("Run field formatter:"), Cleanups.DEFAULT_SAVE_ACTIONS);
+        formatterContainer.getChildren().setAll(cleanUpFormatters);
+
+        String currentPattern = Localization.lang("Filename format pattern")
+                                            .concat(": ")
+                                            .concat(filePreferences.getFileNamePattern());
+        cleanupRenamePDFLabel.setText(currentPattern);
+
+        updateDisplay(cleanupPreset);
     }
 
     private void updateDisplay(CleanupPreset preset) {
-        cleanUpDOI.setSelected(preset.isCleanUpDOI());
+        cleanUpDOI.setSelected(preset.isActive(CleanupPreset.CleanupStep.CLEAN_UP_DOI));
+        cleanUpEprint.setSelected(preset.isActive(CleanupPreset.CleanupStep.CLEANUP_EPRINT));
         if (!cleanUpMovePDF.isDisabled()) {
-            cleanUpMovePDF.setSelected(preset.isMovePDF());
+            cleanUpMovePDF.setSelected(preset.isActive(CleanupPreset.CleanupStep.MOVE_PDF));
         }
-        cleanUpMakePathsRelative.setSelected(preset.isMakePathsRelative());
-        cleanUpRenamePDF.setSelected(preset.isRenamePDF());
-        cleanUpRenamePDFonlyRelativePaths.setSelected(preset.isRenamePdfOnlyRelativePaths());
-        cleanUpRenamePDFonlyRelativePaths.setDisable(!cleanUpRenamePDF.isSelected());
-        cleanUpUpgradeExternalLinks.setSelected(preset.isCleanUpUpgradeExternalLinks());
-        cleanUpBiblatex.setSelected(preset.isConvertToBiblatex());
-        cleanUpBibtex.setSelected(preset.isConvertToBibtex());
-        cleanUpISSN.setSelected(preset.isCleanUpISSN());
+        cleanUpMakePathsRelative.setSelected(preset.isActive(CleanupPreset.CleanupStep.MAKE_PATHS_RELATIVE));
+        cleanUpRenamePDF.setSelected(preset.isRenamePDFActive());
+        cleanUpRenamePDFonlyRelativePaths.setSelected(preset.isActive(CleanupPreset.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS));
+        cleanUpUpgradeExternalLinks.setSelected(preset.isActive(CleanupPreset.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS));
+        cleanUpBiblatex.setSelected(preset.isActive(CleanupPreset.CleanupStep.CONVERT_TO_BIBLATEX));
+        cleanUpBibtex.setSelected(preset.isActive(CleanupPreset.CleanupStep.CONVERT_TO_BIBTEX));
+        cleanUpISSN.setSelected(preset.isActive(CleanupPreset.CleanupStep.CLEAN_UP_ISSN));
         cleanUpFormatters.setValues(preset.getFormatterCleanups());
     }
 
     public CleanupPreset getCleanupPreset() {
-
         Set<CleanupPreset.CleanupStep> activeJobs = EnumSet.noneOf(CleanupPreset.CleanupStep.class);
 
         if (cleanUpMovePDF.isSelected()) {
             activeJobs.add(CleanupPreset.CleanupStep.MOVE_PDF);
         }
-
         if (cleanUpDOI.isSelected()) {
             activeJobs.add(CleanupPreset.CleanupStep.CLEAN_UP_DOI);
         }
+        if (cleanUpEprint.isSelected()) {
+            activeJobs.add(CleanupPreset.CleanupStep.CLEANUP_EPRINT);
+        }
         if (cleanUpISSN.isSelected()) {
             activeJobs.add(CleanupPreset.CleanupStep.CLEAN_UP_ISSN);
         }
@@ -149,7 +128,6 @@ public CleanupPreset getCleanupPreset() {
 
         activeJobs.add(CleanupPreset.CleanupStep.FIX_FILE_LINKS);
 
-        cleanupPreset = new CleanupPreset(activeJobs, cleanUpFormatters.getFormatterCleanups());
-        return cleanupPreset;
+        return new CleanupPreset(activeJobs, cleanUpFormatters.getFormatterCleanups());
     }
 }
diff --git a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
index b2aaec4108c..ab544366e0d 100644
--- a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
@@ -103,7 +103,7 @@ private void buildLayout() {
         actionsList = new ListView<>(actions);
         actionsList.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         new ViewModelListCellFactory<FieldFormatterCleanup>()
-                .withText(action -> action.getFormatter().getName())
+                .withText(action -> action.getField() + ": " + action.getFormatter().getName())
                 .withTooltip(action -> action.getFormatter().getDescription())
                 .install(actionsList);
         add(actionsList, 1, 1, 3, 1);
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java b/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java
index 06db606b591..a326dc6eed8 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupPreset.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.cleanup;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Objects;
 import java.util.Set;
@@ -12,7 +13,6 @@ public class CleanupPreset {
     private final Set<CleanupStep> activeJobs;
     private final FieldFormatterCleanups formatterCleanups;
 
-
     public CleanupPreset(Set<CleanupStep> activeJobs) {
         this(activeJobs, new FieldFormatterCleanups(false, new ArrayList<>()));
     }
@@ -30,46 +30,14 @@ public CleanupPreset(Set<CleanupStep> activeJobs, FieldFormatterCleanups formatt
         this.formatterCleanups = Objects.requireNonNull(formatterCleanups);
     }
 
-    public boolean isCleanUpUpgradeExternalLinks() {
-        return isActive(CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS);
-    }
-
-    public boolean isCleanUpDOI() {
-        return isActive(CleanupStep.CLEAN_UP_DOI);
-    }
-
-    public boolean isCleanUpISSN() {
-        return isActive(CleanupStep.CLEAN_UP_ISSN);
-    }
-
-    public boolean isFixFileLinks() {
-        return isActive(CleanupStep.FIX_FILE_LINKS);
-    }
-
-    public boolean isMovePDF() {
-        return isActive(CleanupStep.MOVE_PDF);
+    public Set<CleanupStep> getActiveJobs() {
+        return Collections.unmodifiableSet(activeJobs);
     }
 
-    public boolean isMakePathsRelative() {
-        return isActive(CleanupStep.MAKE_PATHS_RELATIVE);
-    }
-
-    public boolean isRenamePDF() {
+    public boolean isRenamePDFActive() {
         return isActive(CleanupStep.RENAME_PDF) || isActive(CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS);
     }
 
-    public boolean isConvertToBiblatex() {
-        return isActive(CleanupStep.CONVERT_TO_BIBLATEX);
-    }
-
-    public boolean isConvertToBibtex() {
-        return isActive(CleanupStep.CONVERT_TO_BIBTEX);
-    }
-
-    public boolean isRenamePdfOnlyRelativePaths() {
-        return isActive(CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS);
-    }
-
     public Boolean isActive(CleanupStep step) {
         return activeJobs.contains(step);
     }
@@ -83,6 +51,7 @@ public enum CleanupStep {
          * Removes the http://... for each DOI. Moves DOIs from URL and NOTE filed to DOI field.
          */
         CLEAN_UP_DOI,
+        CLEANUP_EPRINT,
         MAKE_PATHS_RELATIVE,
         RENAME_PDF,
         RENAME_PDF_ONLY_RELATIVE_PATHS,
@@ -102,5 +71,4 @@ public enum CleanupStep {
         FIX_FILE_LINKS,
         CLEAN_UP_ISSN
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
index c07650436d1..1831064a286 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
@@ -37,38 +37,43 @@ public List<FieldChange> cleanup(CleanupPreset preset, BibEntry entry) {
     private List<CleanupJob> determineCleanupActions(CleanupPreset preset) {
         List<CleanupJob> jobs = new ArrayList<>();
 
-        if (preset.isConvertToBiblatex()) {
-            jobs.add(new ConvertToBiblatexCleanup());
-        }
-        if (preset.isConvertToBibtex()) {
-            jobs.add(new ConvertToBibtexCleanup());
+        for (CleanupPreset.CleanupStep action : preset.getActiveJobs()) {
+            jobs.add(toJob(action));
         }
+
         if (preset.getFormatterCleanups().isEnabled()) {
             jobs.addAll(preset.getFormatterCleanups().getConfiguredActions());
         }
-        if (preset.isCleanUpUpgradeExternalLinks()) {
-            jobs.add(new UpgradePdfPsToFileCleanup());
-        }
-        if (preset.isCleanUpDOI()) {
-            jobs.add(new DoiCleanup());
-        }
-        if (preset.isCleanUpISSN()) {
-            jobs.add(new ISSNCleanup());
-        }
-        if (preset.isFixFileLinks()) {
-            jobs.add(new FileLinksCleanup());
-        }
-        if (preset.isMovePDF()) {
-            jobs.add(new MoveFilesCleanup(databaseContext, filePreferences));
-        }
-        if (preset.isMakePathsRelative()) {
-            jobs.add(new RelativePathsCleanup(databaseContext, filePreferences));
-        }
-        if (preset.isRenamePDF()) {
-            RenamePdfCleanup cleaner = new RenamePdfCleanup(preset.isRenamePdfOnlyRelativePaths(), databaseContext, filePreferences);
-            jobs.add(cleaner);
-        }
 
         return jobs;
     }
+
+    private CleanupJob toJob(CleanupPreset.CleanupStep action) {
+        switch (action) {
+            case CLEAN_UP_DOI:
+                return new DoiCleanup();
+            case CLEANUP_EPRINT:
+                return new EprintCleanup();
+            case MAKE_PATHS_RELATIVE:
+                return new RelativePathsCleanup(databaseContext, filePreferences);
+            case RENAME_PDF:
+                return new RenamePdfCleanup(false, databaseContext, filePreferences);
+            case RENAME_PDF_ONLY_RELATIVE_PATHS:
+                return new RenamePdfCleanup(true, databaseContext, filePreferences);
+            case CLEAN_UP_UPGRADE_EXTERNAL_LINKS:
+                return new UpgradePdfPsToFileCleanup();
+            case CONVERT_TO_BIBLATEX:
+                return new ConvertToBiblatexCleanup();
+            case CONVERT_TO_BIBTEX:
+                return new ConvertToBibtexCleanup();
+            case MOVE_PDF:
+                return new MoveFilesCleanup(databaseContext, filePreferences);
+            case FIX_FILE_LINKS:
+                return new FileLinksCleanup();
+            case CLEAN_UP_ISSN:
+                return new ISSNCleanup();
+            default:
+                throw new UnsupportedOperationException(action.name());
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java b/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
index 03417e00e3e..9bee454b409 100644
--- a/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
@@ -55,14 +55,9 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 Optional<DOI> doi = entry.getField(field).flatMap(DOI::parse);
 
                 if (doi.isPresent()) {
-                    // update Doi
-                    String oldValue = entry.getField(FieldName.DOI).orElse(null);
-                    String newValue = doi.get().getDOI();
-
-                    entry.setField(FieldName.DOI, newValue);
-
-                    FieldChange change = new FieldChange(entry, FieldName.DOI, oldValue, newValue);
-                    changes.add(change);
+                    // Update Doi
+                    Optional<FieldChange> change = entry.setField(FieldName.DOI, doi.get().getDOI());
+                    change.ifPresent(changes::add);
 
                     removeFieldValue(entry, field, changes);
                 }
diff --git a/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java b/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
new file mode 100644
index 00000000000..973fc1d0705
--- /dev/null
+++ b/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
@@ -0,0 +1,52 @@
+package org.jabref.logic.cleanup;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import org.jabref.model.FieldChange;
+import org.jabref.model.cleanup.CleanupJob;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.FieldName;
+import org.jabref.model.entry.identifier.ArXivIdentifier;
+
+/**
+ * Formats the DOI (e.g. removes http part) and also moves DOIs from note, url or ee field to the doi field.
+ */
+public class EprintCleanup implements CleanupJob {
+
+    @Override
+    public List<FieldChange> cleanup(BibEntry entry) {
+
+        List<FieldChange> changes = new ArrayList<>();
+
+        for (String field : Arrays.asList(FieldName.URL, FieldName.JOURNAL, FieldName.JOURNALTITLE, FieldName.NOTE)) {
+            Optional<ArXivIdentifier> arXivIdentifier = entry.getField(field).flatMap(ArXivIdentifier::parse);
+
+            if (arXivIdentifier.isPresent()) {
+                entry.setField(FieldName.EPRINT, arXivIdentifier.get().getNormalized())
+                     .ifPresent(changes::add);
+
+                entry.setField(FieldName.EPRINTTYPE, "arxiv")
+                     .ifPresent(changes::add);
+
+                arXivIdentifier.get().getClassification().ifPresent(classification ->
+                        entry.setField(FieldName.EPRINTCLASS, classification)
+                             .ifPresent(changes::add)
+                );
+
+                entry.clearField(field)
+                     .ifPresent(changes::add);
+
+                if (field.equals(FieldName.URL)) {
+                    // If we clear the URL field, we should also clear the URL-date field
+                    entry.clearField(FieldName.URLDATE)
+                         .ifPresent(changes::add);
+                }
+            }
+        }
+
+        return changes;
+    }
+}
diff --git a/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java b/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
index 8b9287d3e2b..ba01e496518 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
@@ -4,20 +4,72 @@
 import java.net.URISyntaxException;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.jabref.model.entry.FieldName;
 
+/**
+ * Identifier for the arXiv. See https://arxiv.org/help/arxiv_identifier
+ */
 public class ArXivIdentifier implements Identifier {
 
     private final String identifier;
+    private final String classification;
 
     ArXivIdentifier(String identifier) {
-        this.identifier = Objects.requireNonNull(identifier).trim();
+        this(identifier, "");
+    }
+
+    ArXivIdentifier(String identifier, String classification) {
+        this.identifier = identifier.trim();
+        this.classification = classification.trim();
     }
 
     public static Optional<ArXivIdentifier> parse(String value) {
-        String identifier = value.replaceAll("(?i)arxiv:", "");
-        return Optional.of(new ArXivIdentifier(identifier));
+        Pattern identifierPattern = Pattern.compile("(arxiv|arXiv)?\\s?:?\\s?(?<id>\\d{4}.\\d{4,5}(v\\d+)?)\\s?(\\[(?<classification>\\S+)\\])?");
+        Matcher identifierMatcher = identifierPattern.matcher(value);
+        if (identifierMatcher.matches()) {
+            String id = identifierMatcher.group("id");
+            String classification = identifierMatcher.group("classification");
+            if (classification == null) {
+                classification = "";
+            }
+            return Optional.of(new ArXivIdentifier(id, classification));
+        }
+
+        Pattern oldIdentifierPattern = Pattern.compile("(arxiv|arXiv)?\\s?:?\\s?(?<id>(?<classification>[a-z\\-]+(\\.[A-Z]{2})?)/\\d{7})");
+        Matcher oldIdentifierMatcher = oldIdentifierPattern.matcher(value);
+        if (oldIdentifierMatcher.matches()) {
+            String id = oldIdentifierMatcher.group("id");
+            String classification = oldIdentifierMatcher.group("classification");
+            return Optional.of(new ArXivIdentifier(id, classification));
+        }
+
+        Pattern urlPattern = Pattern.compile("(http://arxiv.org/abs/)(?<id>\\S+)");
+        Matcher urlMatcher = urlPattern.matcher(value);
+        if (urlMatcher.matches()) {
+            String id = urlMatcher.group("id");
+            return Optional.of(new ArXivIdentifier(id));
+        }
+
+        return Optional.empty();
+    }
+
+    public Optional<String> getClassification() {
+        if (classification.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(classification);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "ArXivIdentifier{" +
+                "identifier='" + identifier + '\'' +
+                ", classification='" + classification + '\'' +
+                '}';
     }
 
     @Override
@@ -25,18 +77,18 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if ((o == null) || (getClass() != o.getClass())) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
         ArXivIdentifier that = (ArXivIdentifier) o;
-
-        return identifier.equals(that.identifier);
+        return Objects.equals(identifier, that.identifier) &&
+                Objects.equals(classification, that.classification);
     }
 
     @Override
     public int hashCode() {
-        return identifier.hashCode();
+        return Objects.hash(identifier, classification);
     }
 
     @Override
@@ -49,11 +101,6 @@ public String getNormalized() {
         return identifier;
     }
 
-    @Override
-    public String toString() {
-        return "ArXivIdentifier [identifier=" + identifier + "]";
-    }
-
     @Override
     public Optional<URI> getExternalURI() {
         try {
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index eea8a2ee771..65024a89f13 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -286,16 +286,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String USE_UNIT_FORMATTER_ON_SEARCH = "useUnitFormatterOnSearch";
     public static final String USE_CASE_KEEPER_ON_SEARCH = "useCaseKeeperOnSearch";
     public static final String ASK_AUTO_NAMING_PDFS_AGAIN = "AskAutoNamingPDFsAgain";
-    public static final String CLEANUP_DOI = "CleanUpDOI";
-    public static final String CLEANUP_ISSN = "CleanUpISSN";
-    public static final String CLEANUP_MOVE_PDF = "CleanUpMovePDF";
-    public static final String CLEANUP_MAKE_PATHS_RELATIVE = "CleanUpMakePathsRelative";
-    public static final String CLEANUP_RENAME_PDF = "CleanUpRenamePDF";
-    public static final String CLEANUP_RENAME_PDF_ONLY_RELATIVE_PATHS = "CleanUpRenamePDFonlyRelativePaths";
-    public static final String CLEANUP_UPGRADE_EXTERNAL_LINKS = "CleanUpUpgradeExternalLinks";
-    public static final String CLEANUP_CONVERT_TO_BIBLATEX = "CleanUpConvertToBiblatex";
-    public static final String CLEANUP_CONVERT_TO_BIBTEX = "CleanUpConvertToBibtex";
-    public static final String CLEANUP_FIX_FILE_LINKS = "CleanUpFixFileLinks";
+    public static final String CLEANUP = "CleanUp";
     public static final String CLEANUP_FORMATTERS = "CleanUpFormatters";
     public static final String IMPORT_DEFAULT_PDF_IMPORT_STYLE = "importDefaultPDFimportStyle";
     public static final String IMPORT_ALWAYSUSE = "importAlwaysUsePDFImportStyle";
@@ -887,25 +878,16 @@ private static Optional<String> getNextUnit(Reader data) throws IOException {
 
     private static void insertDefaultCleanupPreset(Map<String, Object> storage) {
         EnumSet<CleanupPreset.CleanupStep> deactivatedJobs = EnumSet.of(
-                                                                        CleanupPreset.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS,
-                                                                        CleanupPreset.CleanupStep.MOVE_PDF,
-                                                                        CleanupPreset.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS,
-                                                                        CleanupPreset.CleanupStep.CONVERT_TO_BIBLATEX,
-                                                                        CleanupPreset.CleanupStep.CONVERT_TO_BIBTEX);
-
-        CleanupPreset preset = new CleanupPreset(EnumSet.complementOf(deactivatedJobs), Cleanups.DEFAULT_SAVE_ACTIONS);
-
-        storage.put(CLEANUP_DOI, preset.isCleanUpDOI());
-        storage.put(CLEANUP_ISSN, preset.isCleanUpISSN());
-        storage.put(CLEANUP_MOVE_PDF, preset.isMovePDF());
-        storage.put(CLEANUP_MAKE_PATHS_RELATIVE, preset.isMakePathsRelative());
-        storage.put(CLEANUP_RENAME_PDF, preset.isRenamePDF());
-        storage.put(CLEANUP_RENAME_PDF_ONLY_RELATIVE_PATHS, preset.isRenamePdfOnlyRelativePaths());
-        storage.put(CLEANUP_UPGRADE_EXTERNAL_LINKS, preset.isCleanUpUpgradeExternalLinks());
-        storage.put(CLEANUP_CONVERT_TO_BIBLATEX, preset.isConvertToBiblatex());
-        storage.put(CLEANUP_CONVERT_TO_BIBTEX, preset.isConvertToBibtex());
-        storage.put(CLEANUP_FIX_FILE_LINKS, preset.isFixFileLinks());
-        storage.put(CLEANUP_FORMATTERS, convertListToString(preset.getFormatterCleanups().getAsStringList(OS.NEWLINE)));
+                CleanupPreset.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS,
+                CleanupPreset.CleanupStep.MOVE_PDF,
+                CleanupPreset.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS,
+                CleanupPreset.CleanupStep.CONVERT_TO_BIBLATEX,
+                CleanupPreset.CleanupStep.CONVERT_TO_BIBTEX);
+
+        for (CleanupPreset.CleanupStep action : EnumSet.allOf(CleanupPreset.CleanupStep.class)) {
+            storage.put(JabRefPreferences.CLEANUP + action.name(), !deactivatedJobs.contains(action));
+        }
+        storage.put(CLEANUP_FORMATTERS, convertListToString(Cleanups.DEFAULT_SAVE_ACTIONS.getAsStringList(OS.NEWLINE)));
     }
 
     public EntryEditorPreferences getEntryEditorPreferences() {
@@ -1686,57 +1668,23 @@ public CleanupPreferences getCleanupPreferences(JournalAbbreviationLoader journa
     public CleanupPreset getCleanupPreset() {
         Set<CleanupPreset.CleanupStep> activeJobs = EnumSet.noneOf(CleanupPreset.CleanupStep.class);
 
-        if (this.getBoolean(JabRefPreferences.CLEANUP_DOI)) {
-            activeJobs.add(CleanupPreset.CleanupStep.CLEAN_UP_DOI);
-        }
-        if (this.getBoolean(JabRefPreferences.CLEANUP_ISSN)) {
-            activeJobs.add(CleanupPreset.CleanupStep.CLEAN_UP_ISSN);
-        }
-        if (this.getBoolean(JabRefPreferences.CLEANUP_MOVE_PDF)) {
-            activeJobs.add(CleanupPreset.CleanupStep.MOVE_PDF);
-        }
-        if (this.getBoolean(JabRefPreferences.CLEANUP_MAKE_PATHS_RELATIVE)) {
-            activeJobs.add(CleanupPreset.CleanupStep.MAKE_PATHS_RELATIVE);
-        }
-        if (this.getBoolean(JabRefPreferences.CLEANUP_RENAME_PDF)) {
-            activeJobs.add(CleanupPreset.CleanupStep.RENAME_PDF);
-        }
-        if (this.getBoolean(JabRefPreferences.CLEANUP_RENAME_PDF_ONLY_RELATIVE_PATHS)) {
-            activeJobs.add(CleanupPreset.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS);
-        }
-        if (this.getBoolean(JabRefPreferences.CLEANUP_UPGRADE_EXTERNAL_LINKS)) {
-            activeJobs.add(CleanupPreset.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS);
-        }
-        if (this.getBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBLATEX)) {
-            activeJobs.add(CleanupPreset.CleanupStep.CONVERT_TO_BIBLATEX);
-        }
-        if (this.getBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBTEX)) {
-            activeJobs.add(CleanupPreset.CleanupStep.CONVERT_TO_BIBTEX);
-        }
-        if (this.getBoolean(JabRefPreferences.CLEANUP_FIX_FILE_LINKS)) {
-            activeJobs.add(CleanupPreset.CleanupStep.FIX_FILE_LINKS);
+        for (CleanupPreset.CleanupStep action : EnumSet.allOf(CleanupPreset.CleanupStep.class)) {
+            if (getBoolean(JabRefPreferences.CLEANUP + action.name())) {
+                activeJobs.add(action);
+            }
         }
 
-        FieldFormatterCleanups formatterCleanups = Cleanups.parse(
-                                                                  this.getStringList(JabRefPreferences.CLEANUP_FORMATTERS));
+        FieldFormatterCleanups formatterCleanups = Cleanups.parse(getStringList(JabRefPreferences.CLEANUP_FORMATTERS));
 
         return new CleanupPreset(activeJobs, formatterCleanups);
     }
 
     public void setCleanupPreset(CleanupPreset cleanupPreset) {
-        this.putBoolean(JabRefPreferences.CLEANUP_DOI, cleanupPreset.isActive(CleanupPreset.CleanupStep.CLEAN_UP_DOI));
-        this.putBoolean(JabRefPreferences.CLEANUP_ISSN, cleanupPreset.isActive(CleanupPreset.CleanupStep.CLEAN_UP_ISSN));
-        this.putBoolean(JabRefPreferences.CLEANUP_MOVE_PDF, cleanupPreset.isActive(CleanupPreset.CleanupStep.MOVE_PDF));
-        this.putBoolean(JabRefPreferences.CLEANUP_MAKE_PATHS_RELATIVE, cleanupPreset.isActive(CleanupPreset.CleanupStep.MAKE_PATHS_RELATIVE));
-        this.putBoolean(JabRefPreferences.CLEANUP_RENAME_PDF, cleanupPreset.isActive(CleanupPreset.CleanupStep.RENAME_PDF));
-        this.putBoolean(JabRefPreferences.CLEANUP_RENAME_PDF_ONLY_RELATIVE_PATHS,
-                        cleanupPreset.isActive(CleanupPreset.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS));
-        this.putBoolean(JabRefPreferences.CLEANUP_UPGRADE_EXTERNAL_LINKS,
-                        cleanupPreset.isActive(CleanupPreset.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS));
-        this.putBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBLATEX, cleanupPreset.isActive(CleanupPreset.CleanupStep.CONVERT_TO_BIBLATEX));
-        this.putBoolean(JabRefPreferences.CLEANUP_CONVERT_TO_BIBTEX, cleanupPreset.isActive(CleanupPreset.CleanupStep.CONVERT_TO_BIBTEX));
-        this.putBoolean(JabRefPreferences.CLEANUP_FIX_FILE_LINKS, cleanupPreset.isActive(CleanupPreset.CleanupStep.FIX_FILE_LINKS));
-        this.putStringList(JabRefPreferences.CLEANUP_FORMATTERS, cleanupPreset.getFormatterCleanups().getAsStringList(OS.NEWLINE));
+        for (CleanupPreset.CleanupStep action : EnumSet.allOf(CleanupPreset.CleanupStep.class)) {
+            putBoolean(JabRefPreferences.CLEANUP + action.name(), cleanupPreset.isActive(action));
+        }
+
+        putStringList(JabRefPreferences.CLEANUP_FORMATTERS, cleanupPreset.getFormatterCleanups().getAsStringList(OS.NEWLINE));
     }
 
     public RemotePreferences getRemotePreferences() {
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index f7b09efbf18..46918dfc565 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2229,7 +2229,7 @@ Keystore\:=Keystore\:
 Password\:=Password\:
 Remember\ Password=Remember Password
 Use\ SSL=Use SSL
-
+Move\ preprint\ information\ from\ 'URL'\ and\ 'journal'\ field\ to\ the\ 'eprint'\ field=Move preprint information from 'URL' and 'journal' field to the 'eprint' field
 Default\ drag\ &\ drop\ action=Default drag & drop action
 Copy\ file\ to\ default\ file\ folder=Copy file to default file folder
 Link\ file\ (without\ copying)=Link file (without copying)
diff --git a/src/test/java/org/jabref/logic/cleanup/EprintCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/EprintCleanupTest.java
new file mode 100644
index 00000000000..2ad3bebfb36
--- /dev/null
+++ b/src/test/java/org/jabref/logic/cleanup/EprintCleanupTest.java
@@ -0,0 +1,29 @@
+package org.jabref.logic.cleanup;
+
+import org.jabref.model.entry.BibEntry;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class EprintCleanupTest {
+
+    @Test
+    void cleanupCompleteEntry() {
+        BibEntry input = new BibEntry()
+                .withField("journaltitle", "arXiv:1502.05795 [math]")
+                .withField("note", "arXiv: 1502.05795")
+                .withField("url", "http://arxiv.org/abs/1502.05795")
+                .withField("urldate", "2018-09-07TZ");
+
+        BibEntry expected = new BibEntry()
+                .withField("eprint", "1502.05795")
+                .withField("eprintclass", "math")
+                .withField("eprinttype", "arxiv");
+
+        EprintCleanup cleanup = new EprintCleanup();
+        cleanup.cleanup(input);
+
+        assertEquals(expected, input);
+    }
+}
diff --git a/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java b/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
index 3109f4b3c76..0c9250c5529 100644
--- a/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
@@ -6,19 +6,61 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ArXivIdentifierTest {
+class ArXivIdentifierTest {
 
     @Test
-    public void parseIgnoresArXivPrefix() throws Exception {
+    void parse() throws Exception {
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("0710.0994");
+
+        assertEquals(Optional.of(new ArXivIdentifier("0710.0994")), parsed);
+    }
+
+    @Test
+    void parseWithArXivPrefix() throws Exception {
         Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arXiv:0710.0994");
 
         assertEquals(Optional.of(new ArXivIdentifier("0710.0994")), parsed);
     }
 
     @Test
-    public void parseIgnoresArxivPrefix() throws Exception {
+    void parseWithArxivPrefix() throws Exception {
         Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arxiv:0710.0994");
 
         assertEquals(Optional.of(new ArXivIdentifier("0710.0994")), parsed);
     }
+
+    @Test
+    void parseWithClassification() throws Exception {
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("0706.0001v1 [q-bio.CB]");
+
+        assertEquals(Optional.of(new ArXivIdentifier("0706.0001v1", "q-bio.CB")), parsed);
+    }
+
+    @Test
+    void parseWithArXivPrefixAndClassification() throws Exception {
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arXiv:0706.0001v1 [q-bio.CB]");
+
+        assertEquals(Optional.of(new ArXivIdentifier("0706.0001v1", "q-bio.CB")), parsed);
+    }
+
+    @Test
+    void parseOldIdentifier() throws Exception {
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("math.GT/0309136");
+
+        assertEquals(Optional.of(new ArXivIdentifier("math.GT/0309136", "math.GT")), parsed);
+    }
+
+    @Test
+    void parseOldIdentifierWithArXivPrefix() throws Exception {
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arXiv:math.GT/0309136");
+
+        assertEquals(Optional.of(new ArXivIdentifier("math.GT/0309136", "math.GT")), parsed);
+    }
+
+    @Test
+    void parseUrl() throws Exception {
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("http://arxiv.org/abs/1502.05795");
+
+        assertEquals(Optional.of(new ArXivIdentifier("1502.05795", "")), parsed);
+    }
 }

From bab9ae819675775b480f5335b5035fdc5dcac2d0 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Fri, 9 Nov 2018 18:25:07 +0100
Subject: [PATCH 160/229] Fix move to group always moves first entry (#4457)

* Fix move to group always moves first entry

* clarify comment a bit better
---
 CHANGELOG.md                                    |  2 +-
 .../jabref/gui/groups/GroupAddRemoveDialog.java | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83579f5575d..3ace7046089 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,7 +80,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where the list of XMP Exclusion fields in the preferences was not be saved [#4072](https://github.com/JabRef/jabref/issues/4072)
 - We fixed an issue where the ArXiv Fetcher did not support HTTP URLs [koppor#328](https://github.com/koppor/jabref/issues/328)
 - We fixed an issue where only one PDF file could be imported [#4422](https://github.com/JabRef/jabref/issues/4422)
-
+- We fixed an issue where "Move to group" would always move the first entry in the library and not the selected [#4414](https://github.com/JabRef/jabref/issues/4414)
 
 
 
diff --git a/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java b/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java
index 9cfc6d32bef..870af219e7b 100644
--- a/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java
+++ b/src/main/java/org/jabref/gui/groups/GroupAddRemoveDialog.java
@@ -4,6 +4,7 @@
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -57,9 +58,9 @@ public void action() throws Exception {
         selection = panel.getSelectedEntries();
 
         final JDialog diag = new JDialog((JFrame) null,
-                (add ? (move ? Localization.lang("Move to group") : Localization.lang("Add to group")) : Localization
-                        .lang("Remove from group")),
-                true);
+                                         (add ? (move ? Localization.lang("Move to group") : Localization.lang("Add to group")) : Localization
+                                                                                                                                              .lang("Remove from group")),
+                                         true);
         JButton ok = new JButton(Localization.lang("OK"));
         JButton cancel = new JButton(Localization.lang("Cancel"));
         tree = new JTree(new GroupTreeNodeViewModel(groups.get()));
@@ -166,7 +167,9 @@ private boolean doAddOrRemove() {
             GroupTreeNodeViewModel node = (GroupTreeNodeViewModel) path.getLastPathComponent();
             if (checkGroupEnable(node)) {
 
-                List<BibEntry> entries = Globals.stateManager.getSelectedEntries();
+                //we need to copy the contents of the observable list here, because when removeFromEntries is called,
+                //probably the focus changes to the first entry in the all entries group and thus getSelectedEntries() no longer contains our entry we want to move
+                List<BibEntry> entries = new ArrayList<>(Globals.stateManager.getSelectedEntries());
 
                 if (move) {
                     recuriveRemoveFromNode((GroupTreeNodeViewModel) tree.getModel().getRoot(), entries);
@@ -175,7 +178,7 @@ private boolean doAddOrRemove() {
                 if (add) {
                     node.addEntriesToGroup(entries);
                 } else {
-                    node.removeEntriesFromGroup(Globals.stateManager.getSelectedEntries());
+                    node.removeEntriesFromGroup(entries);
                 }
 
                 return true;
@@ -187,7 +190,7 @@ private boolean doAddOrRemove() {
 
     private void recuriveRemoveFromNode(GroupTreeNodeViewModel node, List<BibEntry> entries) {
         node.removeEntriesFromGroup(entries);
-        for (GroupTreeNodeViewModel child: node.getChildren()) {
+        for (GroupTreeNodeViewModel child : node.getChildren()) {
             recuriveRemoveFromNode(child, entries);
         }
     }
@@ -207,7 +210,7 @@ class AddRemoveGroupTreeCellRenderer extends GroupTreeCellRenderer {
 
         @Override
         public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded,
-                boolean leaf, int row, boolean hasFocus) {
+                                                      boolean leaf, int row, boolean hasFocus) {
             Component c = super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
 
             GroupTreeNodeViewModel node = (GroupTreeNodeViewModel) value;

From 50875f9673aa445f0a158dbe15232bb65639b052 Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus@lynyus.de>
Date: Sun, 11 Nov 2018 14:54:54 +0100
Subject: [PATCH 161/229] Update archunit from 0.9.1 -> 0.9.2

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 24665d8c2be..c24ad34130e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -174,8 +174,8 @@ dependencies {
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.6.2'
     testCompile 'org.xmlunit:xmlunit-matchers:2.6.2'
-    testCompile 'com.tngtech.archunit:archunit-junit5-api:0.9.1'
-    testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.9.1'
+    testCompile 'com.tngtech.archunit:archunit-junit5-api:0.9.2'
+    testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.9.2'
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 

From 38a91e102e1fe8e2f7d26fbeff777b9f5f88ebdd Mon Sep 17 00:00:00 2001
From: Ali_Zhagparov <ali_zhagparov@epam.com>
Date: Thu, 15 Nov 2018 09:51:46 +0600
Subject: [PATCH 162/229] fix save button

---
 .../java/org/jabref/gui/exporter/SaveDatabaseAction.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 60d43a613cb..ecd1d7e6a2f 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -163,7 +163,14 @@ public boolean save() {
             panel.frame().output(Localization.lang("Saving library") + "...");
             panel.setSaving(true);
             return doSave();
+        } else {
+            Optional<Path> savePath = getSavePath();
+            if (savePath.isPresent()) {
+                saveAs(savePath.get());
+                return true;
+            }
         }
+
         return false;
     }
 

From 7412ee5baee876c5f2205f0e226122449f438b37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Nov 2018 09:26:39 +0100
Subject: [PATCH 163/229] Bump applicationinsights-logging-log4j2 from 2.2.0 to
 2.2.1 (#4487)

Bumps [applicationinsights-logging-log4j2](https://github.com/Microsoft/ApplicationInsights-Java) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/Microsoft/ApplicationInsights-Java/releases)
- [Changelog](https://github.com/Microsoft/ApplicationInsights-Java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/ApplicationInsights-Java/compare/2.2.0...2.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c24ad34130e..e4262ceb102 100644
--- a/build.gradle
+++ b/build.gradle
@@ -158,7 +158,7 @@ dependencies {
     errorproneJavac 'com.google.errorprone:javac:1.8.0-u20'
 
     compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.2.0'
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.0'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.1'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1'

From 544a2d55ad91bbadf854681d2a538d38b24a4fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20S=C3=A1nchez?=
 <42875859+AndresSan6@users.noreply.github.com>
Date: Thu, 15 Nov 2018 04:41:35 -0600
Subject: [PATCH 164/229] Added feature to add server timezone when connecting
 to shared database (#4483)

* Added feature to add server timezone when connecting to shared database

* Rolled back to previous version of AUTHORS. When I run the , it added previous users from the computer I am using.
---
 CHANGELOG.md                                      |  1 +
 .../gui/shared/SharedDatabaseLoginDialog.fxml     |  2 ++
 .../gui/shared/SharedDatabaseLoginDialogView.java |  2 ++
 .../SharedDatabaseLoginDialogViewModel.java       |  5 +++++
 .../logic/shared/DBMSConnectionProperties.java    | 15 +++++++++++++--
 .../shared/prefs/SharedDatabasePreferences.java   | 10 ++++++++++
 .../shared/DatabaseConnectionProperties.java      |  2 ++
 src/main/resources/l10n/JabRef_en.properties      |  1 +
 .../jabref/logic/shared/DBMSConnectionTest.java   |  2 +-
 .../org/jabref/logic/shared/TestConnector.java    |  6 +++---
 10 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ace7046089..8da79177b93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ## [Unreleased]
 
 ### Changed
+- Added server timezone parameter when connecting to a shared database.
 - We updated the dialog for setting up general fields.
 - URL field formatting is updated. All whitespace chars, located at the beginning/ending of the url, are trimmed automatically
 - We changed the behavior of the field formatting dialog such that the `bibtexkey` is not changed when formatting all fields or all text fields.
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml
index c8c3d49729c..30808026c50 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml
@@ -52,6 +52,8 @@
                         <CheckBox fx:id="useSSL" mnemonicParsing="false" text="%Use SSL" GridPane.rowIndex="5" />
                         <TextField fx:id="fileKeystore" GridPane.columnIndex="1" GridPane.rowIndex="6" />
                         <Button fx:id="browseKeystore" mnemonicParsing="false" onAction="#showOpenKeystoreFileDialog" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="6" />
+                        <Label text="%Server Timezone:" GridPane.rowIndex="8"/>
+                        <TextField fx:id="serverTimezone" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="8" />
                         <GridPane>
                           <columnConstraints>
                             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
index 4964fd8bb2d..612c2267aea 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
@@ -43,6 +43,7 @@ public class SharedDatabaseLoginDialogView extends BaseDialog<Void> {
     @FXML private TextField fileKeystore;
     @FXML private PasswordField passwordKeystore;
     @FXML private Button browseKeystore;
+    @FXML private TextField serverTimezone;
 
     @Inject private DialogService dialogService;
 
@@ -83,6 +84,7 @@ private void initialize() {
         user.textProperty().bindBidirectional(viewModel.userProperty());
         password.textProperty().bindBidirectional(viewModel.passwordProperty());
         port.textProperty().bindBidirectional(viewModel.portProperty());
+        serverTimezone.textProperty().bindBidirectional(viewModel.serverTimezoneProperty());
         databaseType.valueProperty().bindBidirectional(viewModel.selectedDbmstypeProperty());
 
         folder.textProperty().bindBidirectional(viewModel.folderProperty());
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index 18d0c881baf..dddbce8101a 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -69,6 +69,7 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final StringProperty keystore = new SimpleStringProperty("");
     private final BooleanProperty useSSL = new SimpleBooleanProperty();
     private final StringProperty keyStorePasswordProperty = new SimpleStringProperty("");
+    private final StringProperty serverTimezone = new SimpleStringProperty("");
 
     private final JabRefFrame frame;
     private final DialogService dialogService;
@@ -118,6 +119,7 @@ public void openDatabase() {
         connectionProperties.setPassword(password.getValue());
         connectionProperties.setUseSSL(useSSL.getValue());
         connectionProperties.setKeyStore(keystore.getValue());
+        connectionProperties.setServerTimezone(serverTimezone.getValue());
 
         setupKeyStore();
         openSharedDatabase(connectionProperties);
@@ -200,6 +202,7 @@ private void setPreferences() {
         prefs.setUser(user.getValue());
         prefs.setUseSSL(useSSL.getValue());
         prefs.setKeystoreFile(keystore.getValue());
+        prefs.setServerTimezone(serverTimezone.getValue());
 
         if (rememberPassword.get()) {
             try {
@@ -364,4 +367,6 @@ public ValidationStatus keystoreValidation() {
     public ValidationStatus formValidation() {
         return formValidator.getValidationStatus();
     }
+
+    public StringProperty serverTimezoneProperty() { return serverTimezone; }
 }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
index 6373c1e3035..f39eb8a41a4 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
@@ -28,6 +28,7 @@ public class DBMSConnectionProperties implements DatabaseConnectionProperties {
     private String user;
     private String password;
     private boolean useSSL;
+    private String serverTimezone;
 
     //Not needed for connection, but stored for future login
     private String keyStore;
@@ -41,7 +42,7 @@ public DBMSConnectionProperties(SharedDatabasePreferences prefs) {
     }
 
     public DBMSConnectionProperties(DBMSType type, String host, int port, String database, String user,
-                                    String password, boolean useSSL) {
+                                    String password, boolean useSSL, String serverTimezone) {
         this.type = type;
         this.host = host;
         this.port = port;
@@ -49,6 +50,7 @@ public DBMSConnectionProperties(DBMSType type, String host, int port, String dat
         this.user = user;
         this.password = password;
         this.useSSL = useSSL;
+        this.serverTimezone = serverTimezone;
     }
 
     @Override
@@ -118,6 +120,11 @@ public String getUrl() {
         return type.getUrl(host, port, database);
     }
 
+    @Override
+    public String getServerTimezone() { return serverTimezone; }
+
+    public void setServerTimezone(String serverTimezone) { this.serverTimezone = serverTimezone; }
+
     /**
      * Returns username, password and ssl as Properties Object
      * @return Properties with values for user, password and ssl
@@ -126,6 +133,7 @@ public Properties asProperties() {
         Properties props = new Properties();
         props.setProperty("user", user);
         props.setProperty("password", password);
+        props.setProperty("serverTimezone", serverTimezone);
 
         if (useSSL) {
             props.setProperty("ssl", Boolean.toString(useSSL));
@@ -161,7 +169,9 @@ public boolean equals(Object obj) {
                && Objects.equals(port, properties.getPort())
                && Objects.equals(database, properties.getDatabase())
                && Objects.equals(user, properties.getUser())
-               && Objects.equals(useSSL, properties.isUseSSL());
+               && Objects.equals(useSSL, properties.isUseSSL())
+               && Objects.equals(serverTimezone, properties.getServerTimezone());
+
     }
 
     @Override
@@ -184,6 +194,7 @@ private void setFromPreferences(SharedDatabasePreferences prefs) {
         prefs.getPort().ifPresent(thePort -> this.port = Integer.parseInt(thePort));
         prefs.getName().ifPresent(theDatabase -> this.database = theDatabase);
         prefs.getKeyStoreFile().ifPresent(theKeystore -> this.keyStore = theKeystore);
+        prefs.getServerTimezone().ifPresent(theServerTimezone -> this.serverTimezone = theServerTimezone);
         this.setUseSSL(prefs.isUseSSL());
 
         if (prefs.getUser().isPresent()) {
diff --git a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
index 14b306a6b94..45346f334a2 100644
--- a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
+++ b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
@@ -32,6 +32,7 @@ public class SharedDatabasePreferences {
     private static final String SHARED_DATABASE_REMEMBER_PASSWORD = "sharedDatabaseRememberPassword";
     private static final String SHARED_DATABASE_USE_SSL = "sharedDatabaseUseSSL";
     private static final String SHARED_DATABASE_KEYSTORE_FILE = "sharedDatabaseKeyStoreFile";
+    private static final String SHARED_DATABASE_SERVER_TIMEZONE = "sharedDatabaseServerTimezone";
 
     // This {@link Preferences} is used only for things which should not appear in real JabRefPreferences due to security reasons.
     private final Preferences internalPrefs;
@@ -72,6 +73,10 @@ public Optional<String> getKeyStoreFile() {
         return getOptionalValue(SHARED_DATABASE_KEYSTORE_FILE);
     }
 
+    public Optional<String> getServerTimezone() {
+        return getOptionalValue(SHARED_DATABASE_SERVER_TIMEZONE);
+    }
+
     public boolean getRememberPassword() {
         return internalPrefs.getBoolean(SHARED_DATABASE_REMEMBER_PASSWORD, false);
     }
@@ -116,6 +121,10 @@ public void setKeystoreFile(String keystoreFile) {
         internalPrefs.put(SHARED_DATABASE_KEYSTORE_FILE, keystoreFile);
     }
 
+    public void setServerTimezone(String serverTimezone) {
+        internalPrefs.put(SHARED_DATABASE_SERVER_TIMEZONE, serverTimezone);
+    }
+
     public void clearPassword() {
         internalPrefs.remove(SHARED_DATABASE_PASSWORD);
     }
@@ -142,6 +151,7 @@ public void putAllDBMSConnectionProperties(DatabaseConnectionProperties properti
         setUser(properties.getUser());
         setUseSSL(properties.isUseSSL());
         setKeystoreFile(properties.getKeyStore());
+        setServerTimezone(properties.getServerTimezone());
 
         try {
             setPassword(new Password(properties.getPassword().toCharArray(), properties.getUser()).encrypt());
diff --git a/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java b/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java
index 152078b6af7..d6966994bf0 100644
--- a/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java
+++ b/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java
@@ -20,4 +20,6 @@ public interface DatabaseConnectionProperties {
 
     boolean isUseSSL();
 
+    String getServerTimezone();
+
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 46918dfc565..056a1952eb0 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2227,6 +2227,7 @@ User\:=User\:
 Keystore\ password\:=Keystore password\:
 Keystore\:=Keystore\:
 Password\:=Password\:
+Server\ Timezone\:=Server Timezone\:
 Remember\ Password=Remember Password
 Use\ SSL=Use SSL
 Move\ preprint\ information\ from\ 'URL'\ and\ 'journal'\ field\ to\ the\ 'eprint'\ field=Move preprint information from 'URL' and 'journal' field to the 'eprint' field
diff --git a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
index 1594d8a93da..d7fb060f4d0 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
@@ -26,6 +26,6 @@ public void testGetConnection(DBMSType dbmsType) throws SQLException, InvalidDBM
     @Test
     public void testGetConnectionFail(DBMSType dbmsType) throws SQLException, InvalidDBMSConnectionPropertiesException {
         assertThrows(SQLException.class,
-                () -> new DBMSConnection(new DBMSConnectionProperties(dbmsType, "XXXX", 0, "XXXX", "XXXX", "XXXX", false)).getConnection());
+                () -> new DBMSConnection(new DBMSConnectionProperties(dbmsType, "XXXX", 0, "XXXX", "XXXX", "XXXX", false, "XXXX")).getConnection());
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/TestConnector.java b/src/test/java/org/jabref/logic/shared/TestConnector.java
index 2d42b85e410..9949b83e649 100644
--- a/src/test/java/org/jabref/logic/shared/TestConnector.java
+++ b/src/test/java/org/jabref/logic/shared/TestConnector.java
@@ -17,15 +17,15 @@ public static DBMSConnection getTestDBMSConnection(DBMSType dbmsType) throws SQL
     public static DBMSConnectionProperties getTestConnectionProperties(DBMSType dbmsType) {
 
         if (dbmsType == DBMSType.MYSQL) {
-            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "root", "", false);
+            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "root", "", false, "");
         }
 
         if (dbmsType == DBMSType.POSTGRESQL) {
-            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "postgres", "", false);
+            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "postgres", "", false, "");
         }
 
         if (dbmsType == DBMSType.ORACLE) {
-            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "xe", "travis", "travis", false);
+            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "xe", "travis", "travis", false, "");
         }
 
         return new DBMSConnectionProperties();

From 81f15e9e6cdfbf738098fb252e5458e8b3b39bdc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Nov 2018 11:42:19 +0100
Subject: [PATCH 165/229] Bump applicationinsights-core from 2.2.0 to 2.2.1
 (#4488)

Bumps [applicationinsights-core](https://github.com/Microsoft/ApplicationInsights-Java) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/Microsoft/ApplicationInsights-Java/releases)
- [Changelog](https://github.com/Microsoft/ApplicationInsights-Java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/ApplicationInsights-Java/compare/2.2.0...2.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e4262ceb102..f364470d047 100644
--- a/build.gradle
+++ b/build.gradle
@@ -157,7 +157,7 @@ dependencies {
 
     errorproneJavac 'com.google.errorprone:javac:1.8.0-u20'
 
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.2.0'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.2.1'
     compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.1'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'

From 2953849312b3364f437cb4fbc5d1885a8121ee1d Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Fri, 16 Nov 2018 19:53:00 +0100
Subject: [PATCH 166/229] Change location of some fields in the entry editor
 (#4448)

* Change location of some fields in the entry editor

  - Journal/Year/Month in biblatex mode -> Deprecated (if filled)
  - DOI/URL: General -> Optional
  - Internal fields like ranking, read status and priority: Other -> General
  - Moreover, empty deprecated fields are no longer shown

* Fix tests

* Change Review to Comment field
---
 CHANGELOG.md                                  |  5 ++
 .../gui/entryeditor/DeprecatedFieldsTab.java  |  6 +-
 .../logic/integrity/NoBibtexFieldChecker.java | 23 +++--
 .../model/entry/BiblatexEntryTypes.java       | 87 ++++++++-----------
 .../model/entry/InternalBibtexFields.java     | 28 +++---
 .../jabref/preferences/JabRefPreferences.java |  2 +-
 .../logic/integrity/IntegrityCheckTest.java   | 58 ++++++-------
 .../integrity/NoBibTexFieldCheckerTest.java   | 24 ++---
 8 files changed, 117 insertions(+), 116 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8da79177b93..1067763a760 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,11 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ## [Unreleased]
 
 ### Changed
+- We changed the location of some fields in the entry editor (you might need to reset your preferences for these changes to come into effect)
+  - Journal/Year/Month in biblatex mode -> Deprecated (if filled)
+  - DOI/URL: General -> Optional
+  - Internal fields like ranking, read status and priority: Other -> General
+  - Moreover, empty deprecated fields are no longer shown
 - Added server timezone parameter when connecting to a shared database.
 - We updated the dialog for setting up general fields.
 - URL field formatting is updated. All whitespace chars, located at the beginning/ending of the url, are trimmed automatically
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index 3b3c1c66438..2e372e7a42c 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 import javax.swing.undo.UndoManager;
 
@@ -25,6 +26,9 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext, SuggestionProvide
 
     @Override
     protected Collection<String> determineFieldsToShow(BibEntry entry, EntryType entryType) {
-        return entryType.getDeprecatedFields();
+        return entryType.getDeprecatedFields()
+                        .stream()
+                        .filter(entry::hasField)
+                        .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
index d2e9bfb09d5..cb1eaef67df 100644
--- a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
@@ -10,7 +10,6 @@
 import org.jabref.model.entry.BiblatexEntryTypes;
 import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
-import org.jabref.model.entry.InternalBibtexFields;
 
 /**
  * This checker checks whether the entry does not contain any field appearing only in biblatex (and not in BibTeX)
@@ -20,14 +19,15 @@ public class NoBibtexFieldChecker implements Checker {
     private List<String> getAllBiblatexOnlyFields() {
         Set<String> allBibtexFields = BibtexEntryTypes.ALL.stream().flatMap(type -> type.getAllFields().stream()).collect(Collectors.toSet());
         return BiblatexEntryTypes.ALL.stream()
-                .flatMap(type -> type.getAllFields().stream())
-                .filter(fieldName -> !allBibtexFields.contains(fieldName))
-                // these fields are displayed by JabRef as default
-                .filter(fieldName -> !InternalBibtexFields.DEFAULT_GENERAL_FIELDS.contains(fieldName))
-                .filter(fieldName -> !fieldName.equals(FieldName.ABSTRACT))
-                .filter(fieldName -> !fieldName.equals(FieldName.REVIEW))
-                .sorted()
-                .collect(Collectors.toList());
+                                     .flatMap(type -> type.getAllFields().stream())
+                                     .filter(fieldName -> !allBibtexFields.contains(fieldName))
+                                     // these fields are displayed by JabRef as default
+                                     .filter(fieldName -> !fieldName.equals(FieldName.ABSTRACT))
+                                     .filter(fieldName -> !fieldName.equals(FieldName.COMMENT))
+                                     .filter(fieldName -> !fieldName.equals(FieldName.DOI))
+                                     .filter(fieldName -> !fieldName.equals(FieldName.URL))
+                                     .sorted()
+                                     .collect(Collectors.toList());
     }
 
     @Override
@@ -35,8 +35,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         // non-static initalization of ALL_BIBLATEX_ONLY_FIELDS as the user can customize the entry types during runtime
         final List<String> allBiblatexOnlyFields = getAllBiblatexOnlyFields();
         return entry.getFieldNames().stream()
-                .filter(name ->  allBiblatexOnlyFields.contains(name))
-                .map(name -> new IntegrityMessage(Localization.lang("biblatex field only"), entry, name)).collect(Collectors.toList());
+                    .filter(allBiblatexOnlyFields::contains)
+                    .map(name -> new IntegrityMessage(Localization.lang("biblatex field only"), entry, name)).collect(Collectors.toList());
     }
-
 }
diff --git a/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java b/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java
index a73f39fcf50..f78c20291d8 100644
--- a/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java
+++ b/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java
@@ -21,14 +21,12 @@ public class BiblatexEntryTypes {
                 FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE,
-                    FieldName.orFields(FieldName.JOURNAL, FieldName.JOURNALTITLE),
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.JOURNALTITLE, FieldName.DATE);
             addAllOptional(FieldName.TRANSLATOR, FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.SUBTITLE,
                     FieldName.TITLEADDON, FieldName.EDITOR, FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC,
                     FieldName.JOURNALSUBTITLE, FieldName.ISSUETITLE, FieldName.ISSUESUBTITLE, FieldName.LANGUAGE,
                     FieldName.ORIGLANGUAGE, FieldName.SERIES, FieldName.VOLUME, FieldName.NUMBER, FieldName.EID,
-                    FieldName.ISSUE, FieldName.MONTH, FieldName.PAGES, FieldName.VERSION, FieldName.NOTE,
+                    FieldName.ISSUE, FieldName.PAGES, FieldName.VERSION, FieldName.NOTE,
                     FieldName.ISSN, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
@@ -53,7 +51,7 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC,
                     FieldName.TRANSLATOR, FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.INTRODUCTION,
                     FieldName.FOREWORD, FieldName.AFTERWORD, FieldName.SUBTITLE, FieldName.TITLEADDON,
@@ -84,7 +82,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC,
                     FieldName.TRANSLATOR, FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.INTRODUCTION,
                     FieldName.FOREWORD, FieldName.AFTERWORD, FieldName.SUBTITLE, FieldName.TITLEADDON,
@@ -115,8 +113,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE, FieldName.DATE);
             addAllOptional(FieldName.BOOKAUTHOR, FieldName.EDITOR, FieldName.EDITORA, FieldName.EDITORB,
                     FieldName.EDITORC, FieldName.TRANSLATOR, FieldName.ANNOTATOR, FieldName.COMMENTATOR,
                     FieldName.INTRODUCTION, FieldName.FOREWORD, FieldName.AFTERWORD, FieldName.SUBTITLE,
@@ -195,8 +192,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.HOWPUBLISHED,
                     FieldName.TYPE, FieldName.NOTE, FieldName.LOCATION, FieldName.CHAPTER, FieldName.PAGES,
                     FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
@@ -223,7 +219,7 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC, FieldName.TRANSLATOR,
                     FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.INTRODUCTION, FieldName.FOREWORD,
                     FieldName.AFTERWORD, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.MAINTITLE,
@@ -254,7 +250,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC, FieldName.TRANSLATOR,
                     FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.INTRODUCTION, FieldName.FOREWORD,
                     FieldName.AFTERWORD, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE,
@@ -285,8 +281,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC,
                     FieldName.TRANSLATOR, FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.INTRODUCTION,
                     FieldName.FOREWORD, FieldName.AFTERWORD, FieldName.SUBTITLE, FieldName.TITLEADDON,
@@ -341,8 +336,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.EDITION,
                     FieldName.TYPE, FieldName.SERIES, FieldName.NUMBER, FieldName.VERSION, FieldName.NOTE,
                     FieldName.ORGANIZATION, FieldName.PUBLISHER, FieldName.LOCATION, FieldName.ISBN, FieldName.CHAPTER,
@@ -368,11 +362,10 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.HOWPUBLISHED,
                     FieldName.TYPE, FieldName.VERSION, FieldName.NOTE, FieldName.ORGANIZATION, FieldName.LOCATION,
-                    FieldName.MONTH, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
+                    FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
 
@@ -393,10 +386,9 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.NOTE, FieldName.ORGANIZATION, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE), FieldName.URL);
+            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE, FieldName.DATE, FieldName.URL);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.VERSION,
-                    FieldName.NOTE, FieldName.ORGANIZATION, FieldName.MONTH, FieldName.ADDENDUM, FieldName.PUBSTATE,
+                    FieldName.NOTE, FieldName.ORGANIZATION, FieldName.ADDENDUM, FieldName.PUBSTATE,
                     FieldName.URLDATE);
         }
 
@@ -418,10 +410,9 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.NUMBER,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.NUMBER, FieldName.DATE);
             addAllOptional(FieldName.HOLDER, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.TYPE,
-                    FieldName.VERSION, FieldName.LOCATION, FieldName.NOTE, FieldName.MONTH, FieldName.ADDENDUM,
+                    FieldName.VERSION, FieldName.LOCATION, FieldName.NOTE, FieldName.ADDENDUM,
                     FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE,
                     FieldName.URL, FieldName.URLDATE);
         }
@@ -444,10 +435,10 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC, FieldName.SUBTITLE,
                     FieldName.ISSUETITLE, FieldName.ISSUESUBTITLE, FieldName.LANGUAGE, FieldName.SERIES,
-                    FieldName.VOLUME, FieldName.NUMBER, FieldName.ISSUE, FieldName.MONTH, FieldName.NOTE,
+                    FieldName.VOLUME, FieldName.NUMBER, FieldName.ISSUE, FieldName.NOTE,
                     FieldName.ISSN, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
@@ -496,12 +487,12 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.MAINTITLE,
                     FieldName.MAINSUBTITLE, FieldName.MAINTITLEADDON, FieldName.EVENTTITLE, FieldName.EVENTTITLEADDON,
                     FieldName.EVENTDATE, FieldName.VENUE, FieldName.LANGUAGE, FieldName.VOLUME, FieldName.PART,
                     FieldName.VOLUMES, FieldName.SERIES, FieldName.NUMBER, FieldName.NOTE, FieldName.ORGANIZATION,
-                    FieldName.PUBLISHER, FieldName.LOCATION, FieldName.MONTH, FieldName.YEAR, FieldName.ISBN,
+                    FieldName.PUBLISHER, FieldName.LOCATION, FieldName.ISBN,
                     FieldName.CHAPTER, FieldName.PAGES, FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE,
                     FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL,
                     FieldName.URLDATE);
@@ -527,11 +518,11 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.EVENTTITLE,
                     FieldName.EVENTTITLEADDON, FieldName.EVENTDATE, FieldName.VENUE, FieldName.LANGUAGE,
                     FieldName.VOLUMES, FieldName.SERIES, FieldName.NUMBER, FieldName.NOTE, FieldName.ORGANIZATION,
-                    FieldName.PUBLISHER, FieldName.LOCATION, FieldName.MONTH, FieldName.ISBN, FieldName.PAGETOTAL,
+                    FieldName.PUBLISHER, FieldName.LOCATION, FieldName.ISBN, FieldName.PAGETOTAL,
                     FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS,
                     FieldName.EPRINTTYPE, FieldName.URL,
                     FieldName.URLDATE);
@@ -558,14 +549,13 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.MAINTITLE,
                     FieldName.MAINSUBTITLE, FieldName.MAINTITLEADDON, FieldName.BOOKSUBTITLE, FieldName.BOOKTITLEADDON,
                     FieldName.EVENTTITLE, FieldName.EVENTTITLEADDON, FieldName.EVENTDATE, FieldName.VENUE,
                     FieldName.LANGUAGE, FieldName.VOLUME, FieldName.PART, FieldName.VOLUMES, FieldName.SERIES,
                     FieldName.NUMBER, FieldName.NOTE, FieldName.ORGANIZATION, FieldName.PUBLISHER, FieldName.LOCATION,
-                    FieldName.MONTH, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES, FieldName.ADDENDUM,
+                    FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES, FieldName.ADDENDUM,
                     FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE,
                     FieldName.URL, FieldName.URLDATE);
         }
@@ -661,10 +651,9 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.TYPE, FieldName.INSTITUTION,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.TYPE, FieldName.INSTITUTION, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.NUMBER,
-                    FieldName.VERSION, FieldName.NOTE, FieldName.LOCATION, FieldName.MONTH, FieldName.ISRN,
+                    FieldName.VERSION, FieldName.NOTE, FieldName.LOCATION, FieldName.ISRN,
                     FieldName.CHAPTER, FieldName.PAGES, FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE,
                     FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL,
                     FieldName.URLDATE);
@@ -701,10 +690,9 @@ public String getName() {
                         FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.TYPE, FieldName.INSTITUTION,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.TYPE, FieldName.INSTITUTION, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.NOTE,
-                    FieldName.LOCATION, FieldName.MONTH, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
+                    FieldName.LOCATION, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
                     FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
@@ -727,9 +715,9 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.PUBSTATE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.HOWPUBLISHED,
-                    FieldName.NOTE, FieldName.LOCATION, FieldName.MONTH, FieldName.ADDENDUM, FieldName.PUBSTATE,
+                    FieldName.NOTE, FieldName.LOCATION, FieldName.ADDENDUM, FieldName.PUBSTATE,
                     FieldName.URL, FieldName.URLDATE);
         }
 
@@ -803,10 +791,9 @@ public Set<String> getPrimaryOptionalFields() {
 
         {
             // Treated as alias of "THESIS", except FieldName.TYPE field is optional
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION, FieldName.DATE);
             addAllOptional(FieldName.TYPE, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.NOTE,
-                    FieldName.LOCATION, FieldName.MONTH, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
+                    FieldName.LOCATION, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
                     FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
@@ -831,10 +818,9 @@ public Set<String> getPrimaryOptionalFields() {
 
         {
             // Treated as alias of "THESIS", except FieldName.TYPE field is optional
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION, FieldName.DATE);
             addAllOptional(FieldName.TYPE, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.NOTE,
-                    FieldName.LOCATION, FieldName.MONTH, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
+                    FieldName.LOCATION, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
                     FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
@@ -859,10 +845,9 @@ public Set<String> getPrimaryOptionalFields() {
 
         {
             // Treated as alias of "REPORT", except FieldName.TYPE field is optional
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION, FieldName.DATE);
             addAllOptional(FieldName.TYPE, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE,
-                    FieldName.NUMBER, FieldName.VERSION, FieldName.NOTE, FieldName.LOCATION, FieldName.MONTH,
+                    FieldName.NUMBER, FieldName.VERSION, FieldName.NOTE, FieldName.LOCATION,
                     FieldName.ISRN, FieldName.CHAPTER, FieldName.PAGES, FieldName.PAGETOTAL, FieldName.ADDENDUM,
                     FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE,
                     FieldName.URL, FieldName.URLDATE);
diff --git a/src/main/java/org/jabref/model/entry/InternalBibtexFields.java b/src/main/java/org/jabref/model/entry/InternalBibtexFields.java
index 5de79d360d6..463241b2c6d 100644
--- a/src/main/java/org/jabref/model/entry/InternalBibtexFields.java
+++ b/src/main/java/org/jabref/model/entry/InternalBibtexFields.java
@@ -28,14 +28,8 @@
  * - add a additional properties functionality into the BibtexSingleField class
  */
 public class InternalBibtexFields {
-    /**
-     * These are the fields JabRef always displays as default
-     * {@link org.jabref.preferences.JabRefPreferences#setLanguageDependentDefaultValues()}
-     *
-     * A user can change them. The change is currently stored in the preferences only and not explicitly exposed as separate preferences object
-     */
-    public static final List<String> DEFAULT_GENERAL_FIELDS = Arrays.asList(
-            FieldName.CROSSREF, FieldName.KEYWORDS, FieldName.FILE, FieldName.DOI, FieldName.URL, FieldName.GROUPS, FieldName.OWNER, FieldName.TIMESTAMP
+    private static final List<String> DEFAULT_GENERAL_FIELDS = Arrays.asList(
+            FieldName.CROSSREF, FieldName.KEYWORDS, FieldName.FILE, FieldName.GROUPS, FieldName.OWNER, FieldName.TIMESTAMP
     );
 
     // Lists of fields with special properties
@@ -88,8 +82,10 @@ public class InternalBibtexFields {
 
     private static final List<String> SPECIAL_FIELDS = Arrays.asList(
             SpecialField.PRINTED.getFieldName(),
-            SpecialField.PRIORITY.getFieldName(), SpecialField.QUALITY.getFieldName(),
-            SpecialField.RANKING.getFieldName(), SpecialField.READ_STATUS.getFieldName(),
+            SpecialField.PRIORITY.getFieldName(),
+            SpecialField.QUALITY.getFieldName(),
+            SpecialField.RANKING.getFieldName(),
+            SpecialField.READ_STATUS.getFieldName(),
             SpecialField.RELEVANCE.getFieldName()
     );
 
@@ -473,6 +469,18 @@ public static List<String> getIEEETranBSTctlYesNoFields() {
         return YES_NO_FIELDS;
     }
 
+    /**
+     * These are the fields JabRef always displays as default {@link org.jabref.preferences.JabRefPreferences#setLanguageDependentDefaultValues()}
+     *
+     * A user can change them. The change is currently stored in the preferences only and not explicitly exposed as
+     * separate preferences object
+     */
+    public static List<String> getDefaultGeneralFields() {
+        List<String> defaultGeneralFields = new ArrayList<>(DEFAULT_GENERAL_FIELDS);
+        defaultGeneralFields.addAll(SPECIAL_FIELDS);
+        return defaultGeneralFields;
+    }
+
     /**
      * Insert a field into the internal list
      */
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 65024a89f13..cd69952856f 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -988,7 +988,7 @@ public List<String> getCustomTabFieldNames() {
     public void setLanguageDependentDefaultValues() {
         // Entry editor tab 0:
         defaults.put(CUSTOM_TAB_NAME + "_def0", Localization.lang("General"));
-        String fieldNames = InternalBibtexFields.DEFAULT_GENERAL_FIELDS.stream().collect(Collectors.joining(";"));
+        String fieldNames = InternalBibtexFields.getDefaultGeneralFields().stream().collect(Collectors.joining(";"));
         defaults.put(CUSTOM_TAB_FIELDS + "_def0", fieldNames);
 
         // Entry editor tab 1:
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index 10b75ae8a37..54a1d715e99 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -33,10 +33,10 @@
 import static org.mockito.Mockito.mock;
 
 @ExtendWith(TempDirectory.class)
-public class IntegrityCheckTest {
+class IntegrityCheckTest {
 
     @Test
-    public void testEntryTypeChecks() {
+    void testEntryTypeChecks() {
         assertCorrect(withMode(createContext("title", "sometitle", "article"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("title", "sometitle", "patent"), BibDatabaseMode.BIBTEX));
         assertCorrect((withMode(createContext("title", "sometitle", "patent"), BibDatabaseMode.BIBLATEX)));
@@ -44,7 +44,7 @@ public void testEntryTypeChecks() {
     }
 
     @Test
-    public void testUrlChecks() {
+    void testUrlChecks() {
         assertCorrect(createContext("url", "http://www.google.com"));
         assertCorrect(createContext("url", "file://c:/asdf/asdf"));
         assertCorrect(createContext("url", "http://scikit-learn.org/stable/modules/ensemble.html#random-forests"));
@@ -55,7 +55,7 @@ public void testUrlChecks() {
     }
 
     @Test
-    public void testYearChecks() {
+    void testYearChecks() {
         assertCorrect(createContext("year", "2014"));
         assertCorrect(createContext("year", "1986"));
         assertCorrect(createContext("year", "around 1986"));
@@ -74,7 +74,7 @@ public void testYearChecks() {
     }
 
     @Test
-    public void testEditionChecks() {
+    void testEditionChecks() {
         assertCorrect(withMode(createContext("edition", "Second"), BibDatabaseMode.BIBTEX));
         assertCorrect(withMode(createContext("edition", "Third"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("edition", "second"), BibDatabaseMode.BIBTEX));
@@ -89,7 +89,7 @@ public void testEditionChecks() {
     }
 
     @Test
-    public void testNoteChecks() {
+    void testNoteChecks() {
         assertCorrect(withMode(createContext("note", "Lorem ipsum"), BibDatabaseMode.BIBTEX));
         assertCorrect(withMode(createContext("note", "Lorem ipsum? 10"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("note", "lorem ipsum"), BibDatabaseMode.BIBTEX));
@@ -99,7 +99,7 @@ public void testNoteChecks() {
     }
 
     @Test
-    public void testHowpublishedChecks() {
+    void testHowpublishedChecks() {
         assertCorrect(withMode(createContext("howpublished", "Lorem ipsum"), BibDatabaseMode.BIBTEX));
         assertCorrect(withMode(createContext("howpublished", "Lorem ipsum? 10"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("howpublished", "lorem ipsum"), BibDatabaseMode.BIBTEX));
@@ -109,7 +109,7 @@ public void testHowpublishedChecks() {
     }
 
     @Test
-    public void testMonthChecks() {
+    void testMonthChecks() {
         assertCorrect(withMode(createContext("month", "#mar#"), BibDatabaseMode.BIBTEX));
         assertCorrect(withMode(createContext("month", "#dec#"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("month", "#bla#"), BibDatabaseMode.BIBTEX));
@@ -127,13 +127,13 @@ public void testMonthChecks() {
     }
 
     @Test
-    public void testJournaltitleChecks() {
+    void testJournaltitleChecks() {
         assertWrong(withMode(createContext("journaltitle", "A journal"), BibDatabaseMode.BIBLATEX));
         assertWrong(withMode(createContext("journaltitle", "A journal"), BibDatabaseMode.BIBTEX));
     }
 
     @Test
-    public void testBibtexkeyChecks() {
+    void testBibtexkeyChecks() {
         final BibDatabaseContext correctContext = createContext("bibtexkey", "Knuth2014");
         correctContext.getDatabase().getEntries().get(0).setField("author", "Knuth");
         correctContext.getDatabase().getEntries().get(0).setField("year", "2014");
@@ -146,7 +146,7 @@ public void testBibtexkeyChecks() {
     }
 
     @Test
-    public void testBracketChecks() {
+    void testBracketChecks() {
         assertCorrect(createContext("title", "x"));
         assertCorrect(createContext("title", "{x}"));
         assertCorrect(createContext("title", "{x}x{}x{{}}"));
@@ -156,7 +156,7 @@ public void testBracketChecks() {
     }
 
     @Test
-    public void testAuthorNameChecks() {
+    void testAuthorNameChecks() {
         for (String field : InternalBibtexFields.getPersonNameFields()) {
             // getPersonNameFields returns fields that are available in biblatex only
             // if run without mode, the NoBibtexFieldChecker will complain that "afterword" is a biblatex only field
@@ -173,7 +173,7 @@ public void testAuthorNameChecks() {
     }
 
     @Test
-    public void testTitleChecks() {
+    void testTitleChecks() {
         assertCorrect(withMode(createContext("title", "This is a title"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("title", "This is a Title"), BibDatabaseMode.BIBTEX));
         assertCorrect(withMode(createContext("title", "This is a {T}itle"), BibDatabaseMode.BIBTEX));
@@ -192,7 +192,7 @@ public void testTitleChecks() {
     }
 
     @Test
-    public void testAbbreviationChecks() {
+    void testAbbreviationChecks() {
         for (String field : Arrays.asList("booktitle", "journal")) {
             assertCorrect(createContext(field, "IEEE Software"));
             assertCorrect(createContext(field, ""));
@@ -201,13 +201,13 @@ public void testAbbreviationChecks() {
     }
 
     @Test
-    public void testJournalIsKnownInAbbreviationList() {
+    void testJournalIsKnownInAbbreviationList() {
         assertCorrect(createContext("journal", "IEEE Software"));
         assertWrong(createContext("journal", "IEEE Whocares"));
     }
 
     @Test
-    public void testFileChecks() {
+    void testFileChecks() {
         MetaData metaData = mock(MetaData.class);
         Mockito.when(metaData.getDefaultFileDirectory()).thenReturn(Optional.of("."));
         Mockito.when(metaData.getUserFileDirectory(any(String.class))).thenReturn(Optional.empty());
@@ -220,32 +220,32 @@ public void testFileChecks() {
     }
 
     @Test
-    public void fileCheckFindsFilesRelativeToBibFile(@TempDirectory.TempDir Path testFolder) throws IOException {
+    void fileCheckFindsFilesRelativeToBibFile(@TempDirectory.TempDir Path testFolder) throws IOException {
         Path bibFile = testFolder.resolve("lit.bib");
         Files.createFile(bibFile);
         Path pdfFile = testFolder.resolve("file.pdf");
         Files.createFile(pdfFile);
 
         BibDatabaseContext databaseContext = createContext("file", ":file.pdf:PDF");
-        databaseContext.setDatabaseFile(bibFile.toFile());
+        databaseContext.setDatabaseFile(bibFile);
 
         assertCorrect(databaseContext);
     }
 
     @Test
-    public void testTypeChecks() {
+    void testTypeChecks() {
         assertCorrect(createContext("pages", "11--15", "inproceedings"));
         assertWrong(createContext("pages", "11--15", "proceedings"));
     }
 
     @Test
-    public void testBooktitleChecks() {
+    void testBooktitleChecks() {
         assertCorrect(createContext("booktitle", "2014 Fourth International Conference on Digital Information and Communication Technology and it's Applications (DICTAP)", "proceedings"));
         assertWrong(createContext("booktitle", "Digital Information and Communication Technology and it's Applications (DICTAP), 2014 Fourth International Conference on", "proceedings"));
     }
 
     @Test
-    public void testPageNumbersChecks() {
+    void testPageNumbersChecks() {
         assertCorrect(createContext("pages", "1--2"));
         assertCorrect(createContext("pages", "12"));
         assertWrong(createContext("pages", "1-2"));
@@ -260,7 +260,7 @@ public void testPageNumbersChecks() {
     }
 
     @Test
-    public void testBiblatexPageNumbersChecks() {
+    void testBiblatexPageNumbersChecks() {
         assertCorrect(withMode(createContext("pages", "1--2"), BibDatabaseMode.BIBLATEX));
         assertCorrect(withMode(createContext("pages", "12"), BibDatabaseMode.BIBLATEX));
         assertCorrect(withMode(createContext("pages", "1-2"), BibDatabaseMode.BIBLATEX)); // only diff to bibtex
@@ -275,7 +275,7 @@ public void testBiblatexPageNumbersChecks() {
     }
 
     @Test
-    public void testBibStringChecks() {
+    void testBibStringChecks() {
         assertCorrect(createContext("title", "Not a single hash mark"));
         assertCorrect(createContext("month", "#jan#"));
         assertCorrect(createContext("author", "#einstein# and #newton#"));
@@ -284,7 +284,7 @@ public void testBibStringChecks() {
     }
 
     @Test
-    public void testHTMLCharacterChecks() {
+    void testHTMLCharacterChecks() {
         assertCorrect(createContext("title", "Not a single {HTML} character"));
         assertCorrect(createContext("month", "#jan#"));
         assertCorrect(createContext("author", "A. Einstein and I. Newton"));
@@ -295,7 +295,7 @@ public void testHTMLCharacterChecks() {
     }
 
     @Test
-    public void testISSNChecks() {
+    void testISSNChecks() {
         assertCorrect(createContext("issn", "0020-7217"));
         assertCorrect(createContext("issn", "1687-6180"));
         assertCorrect(createContext("issn", "2434-561x"));
@@ -304,7 +304,7 @@ public void testISSNChecks() {
     }
 
     @Test
-    public void testISBNChecks() {
+    void testISBNChecks() {
         assertCorrect(createContext("isbn", "0-201-53082-1"));
         assertCorrect(createContext("isbn", "0-9752298-0-X"));
         assertCorrect(createContext("isbn", "978-0-306-40615-7"));
@@ -314,7 +314,7 @@ public void testISBNChecks() {
     }
 
     @Test
-    public void testDOIChecks() {
+    void testDOIChecks() {
         assertCorrect(createContext("doi", "10.1023/A:1022883727209"));
         assertCorrect(createContext("doi", "10.17487/rfc1436"));
         assertCorrect(createContext("doi", "10.1002/(SICI)1097-4571(199205)43:4<284::AID-ASI3>3.0.CO;2-0"));
@@ -322,7 +322,7 @@ public void testDOIChecks() {
     }
 
     @Test
-    public void testEntryIsUnchangedAfterChecks() {
+    void testEntryIsUnchangedAfterChecks() {
         BibEntry entry = new BibEntry();
 
         // populate with all known fields
@@ -349,7 +349,7 @@ public void testEntryIsUnchangedAfterChecks() {
     }
 
     @Test
-    public void testASCIIChecks() {
+    void testASCIIChecks() {
         assertCorrect(createContext("title", "Only ascii characters!'@12"));
         assertWrong(createContext("month", "Umlauts are nöt ällowed"));
         assertWrong(createContext("author", "Some unicode ⊕"));
diff --git a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
index 1ce9aae56a7..40295364ecc 100644
--- a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
@@ -9,26 +9,26 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class NoBibTexFieldCheckerTest {
+class NoBibTexFieldCheckerTest {
 
     private final NoBibtexFieldChecker checker = new NoBibtexFieldChecker();
 
     @Test
-    public void abstractIsNotRecognizedAsBiblatexOnlyField() {
+    void abstractIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("abstract", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void addressIsNotRecognizedAsBiblatexOnlyField() {
+    void addressIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("address", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void afterwordIsRecognizedAsBiblatexOnlyField() {
+    void afterwordIsRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("afterword", "test");
         IntegrityMessage message = new IntegrityMessage("biblatex field only", entry, "afterword");
@@ -37,35 +37,35 @@ public void afterwordIsRecognizedAsBiblatexOnlyField() {
     }
 
     @Test
-    public void arbitraryNonBiblatexFieldIsNotRecognizedAsBiblatexOnlyField() {
+    void arbitraryNonBiblatexFieldIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("fieldNameNotDefinedInThebiblatexManual", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void commentIsNotRecognizedAsBiblatexOnlyField() {
+    void commentIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("comment", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void instituationIsNotRecognizedAsBiblatexOnlyField() {
+    void instituationIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("institution", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void journalIsNotRecognizedAsBiblatexOnlyField() {
+    void journalIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("journal", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void journaltitleIsRecognizedAsBiblatexOnlyField() {
+    void journaltitleIsRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("journaltitle", "test");
         IntegrityMessage message = new IntegrityMessage("biblatex field only", entry, "journaltitle");
@@ -74,14 +74,14 @@ public void journaltitleIsRecognizedAsBiblatexOnlyField() {
     }
 
     @Test
-    public void keywordsNotRecognizedAsBiblatexOnlyField() {
+    void keywordsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("keywords", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void locationIsRecognizedAsBiblatexOnlyField() {
+    void locationIsRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("location", "test");
         IntegrityMessage message = new IntegrityMessage("biblatex field only", entry, "location");
@@ -90,7 +90,7 @@ public void locationIsRecognizedAsBiblatexOnlyField() {
     }
 
     @Test
-    public void reviewIsNotRecognizedAsBiblatexOnlyField() {
+    void reviewIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("review", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));

From 64f3209715a9d0a5d2c372c27190ec20e311db3b Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sun, 18 Nov 2018 21:15:30 +0100
Subject: [PATCH 167/229] Fix kbd XML closing tag

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1067763a760..a79e3b73637 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,7 +43,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We removed the redundant new lines of markings and wrapped the summary in the File annotation tab. [#3823](https://github.com/JabRef/jabref/issues/3823)
 - We add auto url formatting when user paste link to URL field in entry editor. [koppor#254](https://github.com/koppor/jabref/issues/254)
 - We added a minimal height for the entry editor so that it can no longer be hidden by accident. [#4279](https://github.com/JabRef/jabref/issues/4279)
-- We added a new keyboard shortcut so that the entry editor could be closed by <kbd>Ctrl<kbd> + <kbd>E<kbd>. [#4222] (https://github.com/JabRef/jabref/issues/4222)
+- We added a new keyboard shortcut so that the entry editor could be closed by <kbd>Ctrl</kbd> + <kbd>E</kbd>. [#4222] (https://github.com/JabRef/jabref/issues/4222)
 - We added an option in the preference dialog box, that allows user to pick the dark or light theme option. [#4130] (https://github.com/JabRef/jabref/issues/4130)
 - We updated updated the Related Articles tab to accept JSON from the new version of the Mr. DLib service
 - We added an option in the preference dialog box that allows user to choose behavior after dragging and dropping files in Entry Editor. [#4356](https://github.com/JabRef/jabref/issues/4356)

From c695230965f16c5f3f1417df7fa3419fd3908eec Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 19 Nov 2018 20:26:05 +0100
Subject: [PATCH 168/229] Add color picker to groups dialog (#4492)

* Add color picker to groups dialog

* Improve layout of group edit window

* Fix build
---
 src/main/java/org/jabref/gui/Base.css         |  21 +-
 .../org/jabref/gui/groups/GroupDialog.java    | 371 ++++++++----------
 .../org/jabref/styletester/StyleTester.fxml   |   3 +-
 src/main/resources/l10n/JabRef_en.properties  |   1 +
 4 files changed, 193 insertions(+), 203 deletions(-)

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 349b7acc6d7..ec78513a06b 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -291,7 +291,6 @@
 .check-box > .box,
 .menu-button,
 .choice-box,
-.color-picker.split-button > .color-picker-label,
 .combo-box-base,
 .combo-box-base:editable > .arrow-button {
     -fx-background-color: transparent;
@@ -956,3 +955,23 @@ We want to have a look that matches our icons in the tool-bar */
 .progress-bar > .track {
     -fx-background-color: -jr-accent;
 }
+
+.jfx-color-picker:armed,
+.jfx-color-picker:hover,
+.jfx-color-picker:focused,
+.jfx-color-picker {
+    -fx-background-color: transparent, transparent, transparent, transparent;
+    -fx-background-radius: 0px;
+    -fx-background-insets: 0px;
+    -fx-effect: null;
+}
+
+.color-palette {
+    -fx-background-color: -fx-background;
+    -fx-background-radius: 0px;
+    -fx-background-insets: 0px;
+}
+
+.color-palette-region .button {
+    -fx-border-width: 0px;
+}
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.java b/src/main/java/org/jabref/gui/groups/GroupDialog.java
index 85f320b0040..3d334919446 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.java
@@ -8,7 +8,6 @@
 
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
-import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.ButtonType;
@@ -20,11 +19,9 @@
 import javafx.scene.control.TextField;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.ColumnConstraints;
-import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import javafx.scene.paint.Color;
+import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
 import javafx.scene.text.FontPosture;
 import javafx.scene.text.Text;
@@ -56,6 +53,8 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jfoenix.controls.JFXColorPicker;
+
 /**
  * Dialog for creating or modifying groups. Operates directly on the Vector
  * containing group information.
@@ -67,15 +66,11 @@ class GroupDialog extends BaseDialog<AbstractGroup> {
     private static final int INDEX_SEARCH_GROUP = 2;
     private static final int INDEX_AUTO_GROUP = 3;
     private static final int INDEX_TEX_GROUP = 4;
-    private static final int TEXTFIELD_LENGTH = 40;
-    private static final int HGAP = 7;
-    private static final int VGAP = 5;
-    private static final Insets PADDING = new Insets(5, 5, 5, 5);
 
     // for all types
     private final TextField nameField = new TextField();
     private final TextField descriptionField = new TextField();
-    private final TextField colorField = new TextField();
+    private final JFXColorPicker colorField = new JFXColorPicker();
     private final TextField iconField = new TextField();
     private final RadioButton explicitRadioButton = new RadioButton(Localization.lang("Statically group entries by manual assignment"));
     private final RadioButton keywordsRadioButton = new RadioButton(Localization.lang("Dynamically group entries by searching a field for a keyword"));
@@ -123,24 +118,9 @@ class GroupDialog extends BaseDialog<AbstractGroup> {
     public GroupDialog(JabRefFrame jabrefFrame, AbstractGroup editedGroup) {
         this.setTitle(Localization.lang("Edit group"));
 
-        nameField.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
-        descriptionField.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
-        colorField.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
-        iconField.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
         explicitRadioButton.setSelected(true);
-        keywordGroupSearchTerm.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
-        keywordGroupSearchField.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
-        searchGroupSearchExpression.setPrefColumnCount(GroupDialog.TEXTFIELD_LENGTH);
-        autoGroupKeywordsField.setPrefColumnCount(10);
-        autoGroupKeywordsDeliminator.setPrefColumnCount(10);
-        autoGroupKeywordsDeliminator.setPrefColumnCount(10);
-        autoGroupPersonsField.setPrefColumnCount(10);
-        texGroupFilePath.setPrefColumnCount(TEXTFIELD_LENGTH);
+
         descriptionWebView.setPrefWidth(585);
-        optionsPanel.setPadding(PADDING);
-        optionsPanel.setStyle("-fx-content-display:top;"
-                              + "-fx-border-insets:0 0 0 0;"
-                              + "-fx-border-color:#D3D3D3");
 
         // set default values (overwritten if editedGroup != null)
         keywordGroupSearchField.setText(jabrefFrame.prefs().get(JabRefPreferences.GROUPS_DEFAULT_FIELD));
@@ -152,181 +132,91 @@ public GroupDialog(JabRefFrame jabrefFrame, AbstractGroup editedGroup) {
         searchRadioButton.setToggleGroup(groupType);
         autoRadioButton.setToggleGroup(groupType);
         texRadioButton.setToggleGroup(groupType);
-        ToggleGroup groupHierarchy = new ToggleGroup();
-        independentButton.setToggleGroup(groupHierarchy);
-        intersectionButton.setToggleGroup(groupHierarchy);
-        unionButton.setToggleGroup(groupHierarchy);
 
-        // build individual layout cards for each group
-        GridPane explicitPanel = new GridPane();
-        GridPane keywordPanel = new GridPane();
-        GridPane searchPanel = new GridPane();
-        GridPane autoPanel = new GridPane();
-        GridPane texPanel = new GridPane();
-        // ... for explicit group
-        optionsPanel.getChildren().add(explicitPanel);
+        // Build individual layout cards for each group
+        VBox explicitPanel = createOptionsExplicitGroup();
         explicitPanel.setVisible(true);
-        // ... for keyword group
-        optionsPanel.getChildren().add(keywordPanel);
-        keywordPanel.setVisible(false);
-        keywordPanel.setHgap(HGAP);
-        keywordPanel.setVgap(VGAP);
-        keywordPanel.setPadding(PADDING);
-        ColumnConstraints keywordPanelLCol = new ColumnConstraints();
-        keywordPanelLCol.setHalignment(HPos.RIGHT);
-        keywordPanel.getColumnConstraints().add(keywordPanelLCol);
-        ColumnConstraints keywordPanelRCol = new ColumnConstraints();
-        keywordPanelRCol.setHalignment(HPos.LEFT);
-        keywordPanel.getColumnConstraints().add(keywordPanelRCol);
-        keywordPanel.add(new Label(Localization.lang("Field")), 0, 0);
-        keywordPanel.add(keywordGroupSearchField, 1, 0);
-        keywordPanel.add(new Label(Localization.lang("Keyword")), 0, 1);
-        keywordPanel.add(keywordGroupSearchTerm, 1, 1);
-        GridPane.setHalignment(keywordGroupCaseSensitive, HPos.LEFT);
-        keywordPanel.add(keywordGroupCaseSensitive, 0, 2, 2, 1);
-        GridPane.setHalignment(keywordGroupRegExp, HPos.LEFT);
-        keywordPanel.add(keywordGroupRegExp, 0, 3, 2, 1);
-        // ... for search group
-        optionsPanel.getChildren().add(searchPanel);
-        searchPanel.setVisible(false);
-        searchPanel.setHgap(HGAP);
-        searchPanel.setVgap(VGAP);
-        searchPanel.setPadding(PADDING);
-        searchPanel.add(new Label(Localization.lang("Search expression")), 0, 0);
-        searchPanel.add(searchGroupSearchExpression, 1, 0, 2, 1);
-        searchPanel.add(searchGroupCaseSensitive, 0, 1, 2, 1);
-        searchPanel.add(searchGroupRegExp, 0, 2, 2, 1);
-        // ... for auto group
-        optionsPanel.getChildren().add(autoPanel);
-        autoPanel.setVisible(false);
-        autoPanel.setHgap(HGAP);
-        autoPanel.setVgap(VGAP);
-        autoPanel.setPadding(PADDING);
-        ToggleGroup tg = new ToggleGroup();
-        autoGroupKeywordsOption.setToggleGroup(tg);
-        autoGroupPersonsOption.setToggleGroup(tg);
-        Label placeholderLabel = new Label();
-        placeholderLabel.setPrefWidth(30);
-        autoPanel.add(autoGroupKeywordsOption, 0, 0, 3, 1);
-        autoPanel.add(placeholderLabel, 0, 1);
-        autoPanel.add(new Label(Localization.lang("Field to group by") + ":"), 1, 1);
-        autoPanel.add(autoGroupKeywordsField, 2, 1);
-        autoPanel.add(new Label(Localization.lang("Use the following delimiter character(s):")), 1, 2);
-        autoPanel.add(autoGroupKeywordsDeliminator, 2, 2);
-        autoPanel.add(autoGroupKeywordsHierarchicalDeliminator, 2, 3);
-        autoPanel.add(autoGroupPersonsOption, 0, 4, 3, 1);
-        autoPanel.add(new Label(Localization.lang("Field to group by") + ":"), 1, 5);
-        autoPanel.add(autoGroupPersonsField, 2, 5);
-        autoGroupKeywordsOption.setSelected(true);
-        autoGroupKeywordsField.setText(Globals.prefs.get(JabRefPreferences.GROUPS_DEFAULT_FIELD));
-        autoGroupKeywordsDeliminator.setText(Globals.prefs.get(JabRefPreferences.KEYWORD_SEPARATOR));
-        autoGroupKeywordsHierarchicalDeliminator.setText(Keyword.DEFAULT_HIERARCHICAL_DELIMITER.toString());
-        autoGroupPersonsField.setText(FieldName.AUTHOR);
-        // ... for tex group
-        optionsPanel.getChildren().add(texPanel);
-        texPanel.setVisible(false);
-        texPanel.setHgap(HGAP);
-        texPanel.setVgap(VGAP);
-        texPanel.setPadding(PADDING);
-        texPanel.add(new Label(Localization.lang("Aux file")), 0, 0);
-        texPanel.add(texGroupFilePath, 1, 0);
+        VBox keywordPanel = createOptionsKeywordGroup();
+        VBox searchPanel = createOptionsSearchGroup();
+        VBox autoPanel = createOptionsAutoGroup();
+        VBox texPanel = createOptionsTexGroup();
+        optionsPanel.getChildren().addAll(explicitPanel, keywordPanel, searchPanel, autoPanel, texPanel);
+        optionsPanel.setPadding(new Insets(0, 0, 0, 10));
 
         // ... for buttons panel
         getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
 
-        // General panel
-        GridPane generalPanel = new GridPane();
-        GridPane textFieldPanel = new GridPane();
-        GridPane selectPanel = new GridPane();
-        generalPanel.add(textFieldPanel, 0, 0);
-        generalPanel.add(selectPanel, 0, 1);
-        generalPanel.setVgap(VGAP);
-        generalPanel.setPadding(PADDING);
-        generalPanel.setStyle("-fx-content-display:top;"
-                              + "-fx-border-insets:0 0 0 0;"
-                              + "-fx-border-color:#D3D3D3");
-
-        ColumnConstraints columnLabel = new ColumnConstraints();
-        columnLabel.setHalignment(HPos.RIGHT);
-        textFieldPanel.getColumnConstraints().add(columnLabel);
-        ColumnConstraints columnTextField = new ColumnConstraints();
-        columnTextField.setHalignment(HPos.LEFT);
-        textFieldPanel.getColumnConstraints().add(columnTextField);
-        textFieldPanel.setVgap(VGAP);
-        textFieldPanel.setHgap(HGAP);
-        textFieldPanel.add(new Label(Localization.lang("Name")), 0, 0);
-        textFieldPanel.add(nameField, 1, 0);
-        textFieldPanel.add(new Label(Localization.lang("Description")), 0, 1);
-        textFieldPanel.add(descriptionField, 1, 1);
-        textFieldPanel.add(new Label(Localization.lang("Color")), 0, 2);
-        textFieldPanel.add(colorField, 1, 2);
-        textFieldPanel.add(new Label(Localization.lang("Icon")), 0, 3);
-        textFieldPanel.add(iconField, 1, 3);
-
-        selectPanel.setVgap(VGAP);
-        selectPanel.add(explicitRadioButton, 0, 0);
-        selectPanel.add(keywordsRadioButton, 0, 1);
-        selectPanel.add(searchRadioButton, 0, 2);
-        selectPanel.add(autoRadioButton, 0, 3);
-        selectPanel.add(texRadioButton, 0, 4);
-
-        // Context panel
-        GridPane contextPanel = new GridPane();
-        contextPanel.setVgap(VGAP);
-        contextPanel.setHgap(HGAP);
-        contextPanel.setPadding(PADDING);
-        contextPanel.setStyle("-fx-content-display:top;"
-                              + "-fx-border-insets:0 0 0 0;"
-                              + "-fx-border-color:#D3D3D3");
-        contextPanel.add(independentButton, 0, 0);
-        contextPanel.add(intersectionButton, 0, 1);
-        contextPanel.add(unionButton, 0, 2);
+        // General information
+        VBox contextPanel = new VBox(10);
+        contextPanel.setPadding(new Insets(0, 0, 0, 10));
+        contextPanel.getChildren().setAll(
+                independentButton,
+                intersectionButton,
+                unionButton
+        );
+        ToggleGroup groupHierarchy = new ToggleGroup();
+        independentButton.setToggleGroup(groupHierarchy);
+        intersectionButton.setToggleGroup(groupHierarchy);
+        unionButton.setToggleGroup(groupHierarchy);
+
+        colorField.setMinHeight(20);
+        VBox generalPanel = new VBox(10);
+        generalPanel.getChildren().setAll(
+                new VBox(
+                        new Label(Localization.lang("Name")),
+                        nameField
+                ),
+                new VBox(
+                        new Label(Localization.lang("Description")),
+                        descriptionField
+                ),
+                new HBox(30,
+                        new VBox(
+                                new Label(Localization.lang("Icon")),
+                                iconField
+                        ),
+                        new VBox(
+                                new Label(Localization.lang("Color")),
+                                colorField
+                        )
+                ),
+                new VBox(5,
+                        new Label(Localization.lang("Hierarchical context")),
+                        contextPanel
+                )
+        );
+
+        VBox selectPanel = new VBox(10,
+                explicitRadioButton,
+                keywordsRadioButton,
+                searchRadioButton,
+                autoRadioButton,
+                texRadioButton
+        );
+        selectPanel.setPadding(new Insets(0, 0, 0, 10));
 
         // Description panel
-        ScrollPane sp = new ScrollPane(descriptionWebView);
-        sp.setPadding(PADDING);
-        sp.setHbarPolicy(ScrollBarPolicy.AS_NEEDED);
-        sp.setVbarPolicy(ScrollBarPolicy.AS_NEEDED);
-        sp.setStyle("-fx-content-display:top;"
-                    + "-fx-border-insets:0 0 0 0;"
-                    + "-fx-border-color:#D3D3D3");
-
-        // create border
-        HBox title1 = new HBox();
-        HBox title2 = new HBox();
-        HBox title3 = new HBox();
-        HBox title4 = new HBox();
-        Label title1Label = new Label(Localization.lang("General"));
-        Label title2Label = new Label(Localization.lang("Hierarchical context"));
-        Label title3Label = new Label(Localization.lang("Options"));
-        Label title4Label = new Label(Localization.lang("Description"));
-        title1Label.setTextFill(Color.web("#778899"));
-        title2Label.setTextFill(Color.web("#778899"));
-        title3Label.setTextFill(Color.web("#778899"));
-        title4Label.setTextFill(Color.web("#778899"));
-        title1.setPadding(new Insets(10, 0, 0, 0));
-        title2.setPadding(new Insets(10, 0, 0, 0));
-        title3.setPadding(new Insets(10, 0, 0, 0));
-        title4.setPadding(new Insets(10, 0, 0, 0));
-        title1.getChildren().add(title1Label);
-        title2.getChildren().add(title2Label);
-        title3.getChildren().add(title3Label);
-        title4.getChildren().add(title4Label);
+        ScrollPane descriptionPane = new ScrollPane(descriptionWebView);
+        descriptionPane.setHbarPolicy(ScrollBarPolicy.AS_NEEDED);
+        descriptionPane.setVbarPolicy(ScrollBarPolicy.AS_NEEDED);
 
         // create layout
-        GridPane mainPanel = new GridPane();
+        VBox mainPanel = new VBox(15);
         getDialogPane().setContent(mainPanel);
-        mainPanel.setPrefHeight(810);
-        mainPanel.setPrefWidth(630);
-        mainPanel.setPadding(new Insets(5, 15, 5, 5));
-        mainPanel.add(title1, 0, 0);
-        mainPanel.add(generalPanel, 0, 1);
-        mainPanel.add(title2, 0, 2);
-        mainPanel.add(contextPanel, 0, 3);
-        mainPanel.add(title3, 0, 4);
-        mainPanel.add(optionsPanel, 0, 5);
-        mainPanel.add(title4, 0, 6);
-        mainPanel.add(sp, 0, 7);
+        mainPanel.setPadding(new Insets(5, 15, 5, 15));
+        mainPanel.getChildren().setAll(
+                generalPanel,
+                new VBox(5,
+                        new Label(Localization.lang("Type")),
+                        selectPanel
+                ),
+                new VBox(
+                        new Label(Localization.lang("Options")),
+                        optionsPanel
+                ),
+                new Label(Localization.lang("Description")),
+                descriptionPane
+        );
 
         updateComponents();
 
@@ -416,11 +306,8 @@ groupName, getContext(),
                         resultingGroup = new TexGroup(groupName, getContext(),
                                 Paths.get(texGroupFilePath.getText().trim()), new DefaultAuxParser(new BibDatabase()), Globals.getFileUpdateMonitor());
                     }
-                    try {
-                        resultingGroup.setColor(Color.valueOf(colorField.getText()));
-                    } catch (IllegalArgumentException ex) {
-                        // Ignore invalid color (we should probably notify the user instead...)
-                    }
+
+                    resultingGroup.setColor(colorField.getValue());
                     resultingGroup.setDescription(descriptionField.getText());
                     resultingGroup.setIconName(iconField.getText());
                     return resultingGroup;
@@ -438,7 +325,6 @@ groupName, getContext(),
                                                 Boolean newBoolean) -> updateComponents();
 
         nameField.textProperty().addListener(caretListener);
-        colorField.textProperty().addListener(caretListener);
         descriptionField.textProperty().addListener(caretListener);
         iconField.textProperty().addListener(caretListener);
         keywordGroupSearchField.textProperty().addListener(caretListener);
@@ -456,7 +342,7 @@ groupName, getContext(),
             setContext(GroupHierarchyType.INDEPENDENT);
         } else {
             nameField.setText(editedGroup.getName());
-            colorField.setText(editedGroup.getColor().map(Color::toString).orElse(""));
+            editedGroup.getColor().ifPresent(colorField::setValue);
             descriptionField.setText(editedGroup.getDescription().orElse(""));
             iconField.setText(editedGroup.getIconName().orElse(""));
 
@@ -527,11 +413,11 @@ private static String formatRegExException(String regExp, Exception e) {
             sb.append(StringUtil.quoteForHTML(sa[i]));
         }
         String s = Localization.lang(
-                                     "The regular expression <b>%0</b> is invalid:",
-                                     StringUtil.quoteForHTML(regExp))
-                   + "<p><tt>"
-                   + sb
-                   + "</tt>";
+                "The regular expression <b>%0</b> is invalid:",
+                StringUtil.quoteForHTML(regExp))
+                + "<p><tt>"
+                + sb
+                + "</tt>";
         if (!(e instanceof PatternSyntaxException)) {
             return s;
         }
@@ -543,6 +429,89 @@ private static String formatRegExException(String regExp, Exception e) {
         return s;
     }
 
+    private VBox createOptionsTexGroup() {
+        VBox texPanel = new VBox();
+        texPanel.setVisible(false);
+        texPanel.getChildren().add(new Label(Localization.lang("Aux file")));
+        texPanel.getChildren().add(texGroupFilePath);
+        return texPanel;
+    }
+
+    private VBox createOptionsAutoGroup() {
+        VBox autoPanel = new VBox(10);
+        autoPanel.setVisible(false);
+        ToggleGroup tg = new ToggleGroup();
+        autoGroupKeywordsOption.setToggleGroup(tg);
+        autoGroupPersonsOption.setToggleGroup(tg);
+        VBox fieldToGroupByKeywords = new VBox(
+                new Label(Localization.lang("Field to group by") + ":"),
+                autoGroupKeywordsField
+        );
+        fieldToGroupByKeywords.setPadding(new Insets(0, 0, 0, 20));
+        VBox delimiterCharacters = new VBox(
+                new Label(Localization.lang("Use the following delimiter character(s):")),
+                new HBox(10,
+                        autoGroupKeywordsDeliminator,
+                        autoGroupKeywordsHierarchicalDeliminator
+                )
+        );
+        delimiterCharacters.setPadding(new Insets(0, 0, 0, 20));
+        VBox fieldToGroupByPersons = new VBox(
+                new Label(Localization.lang("Field to group by") + ":"),
+                autoGroupPersonsField
+        );
+        fieldToGroupByPersons.setPadding(new Insets(0, 0, 0, 20));
+        autoPanel.getChildren().setAll(
+                autoGroupKeywordsOption,
+                fieldToGroupByKeywords,
+                delimiterCharacters,
+                autoGroupPersonsOption,
+                fieldToGroupByPersons
+        );
+        autoGroupKeywordsOption.setSelected(true);
+        autoGroupKeywordsField.setText(Globals.prefs.get(JabRefPreferences.GROUPS_DEFAULT_FIELD));
+        autoGroupKeywordsDeliminator.setText(Globals.prefs.get(JabRefPreferences.KEYWORD_SEPARATOR));
+        autoGroupKeywordsHierarchicalDeliminator.setText(Keyword.DEFAULT_HIERARCHICAL_DELIMITER.toString());
+        autoGroupPersonsField.setText(FieldName.AUTHOR);
+        return autoPanel;
+    }
+
+    private VBox createOptionsSearchGroup() {
+        VBox searchPanel = new VBox(10);
+        searchPanel.setVisible(false);
+        searchPanel.getChildren().setAll(
+                new VBox(
+                        new Label(Localization.lang("Search expression")),
+                        searchGroupSearchExpression
+                ),
+                searchGroupCaseSensitive,
+                searchGroupRegExp
+        );
+        return searchPanel;
+    }
+
+    private VBox createOptionsExplicitGroup() {
+        return new VBox();
+    }
+
+    private VBox createOptionsKeywordGroup() {
+        VBox keywordPanel = new VBox(10);
+        keywordPanel.setVisible(false);
+        keywordPanel.getChildren().setAll(
+                new VBox(
+                        new Label(Localization.lang("Field")),
+                        keywordGroupSearchField
+                ),
+                new VBox(
+                        new Label(Localization.lang("Keyword")),
+                        keywordGroupSearchTerm
+                ),
+                keywordGroupCaseSensitive,
+                keywordGroupRegExp
+        );
+        return keywordPanel;
+    }
+
     private void updateComponents() {
         // all groups need a name
         boolean okEnabled = !nameField.getText().trim().isEmpty();
diff --git a/src/main/java/org/jabref/styletester/StyleTester.fxml b/src/main/java/org/jabref/styletester/StyleTester.fxml
index 6eaf7bae249..1f9d65669cf 100644
--- a/src/main/java/org/jabref/styletester/StyleTester.fxml
+++ b/src/main/java/org/jabref/styletester/StyleTester.fxml
@@ -35,7 +35,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-
+<?import com.jfoenix.controls.JFXColorPicker?>
 <AnchorPane prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.121"
             xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.styletester.StyleTesterView">
     <TabPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
@@ -383,6 +383,7 @@
                                     <Hyperlink maxWidth="1.7976931348623157E308" text="Hyperlink (Visited)"
                                                visited="true"/>
                                     <Separator prefWidth="200.0"/>
+                                    <JFXColorPicker/>
                                 </children>
                             </VBox>
                             <Separator orientation="VERTICAL" prefHeight="200.0"/>
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 056a1952eb0..a79cfd436cb 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2235,3 +2235,4 @@ Default\ drag\ &\ drop\ action=Default drag & drop action
 Copy\ file\ to\ default\ file\ folder=Copy file to default file folder
 Link\ file\ (without\ copying)=Link file (without copying)
 Copy,\ rename\ and\ link\ file=Copy, rename and link file
+Type=Type

From 0b55b3479d8d6df2eaaa828411f7ea8c7ba2453d Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Tue, 20 Nov 2018 08:43:57 +0100
Subject: [PATCH 169/229] Improve page checker (#4498)

Superseeds the PR #4188 and fixes #4113. Now page ranges like `R2-R5` are considered to be correct.
---
 CHANGELOG.md                                  |  1 +
 .../jabref/logic/integrity/PagesChecker.java  | 42 ++++++-----
 .../integrity/PagesCheckerBibLatexTest.java   | 73 +++++++++++++++++++
 3 files changed, 96 insertions(+), 20 deletions(-)
 create mode 100644 src/test/java/org/jabref/logic/integrity/PagesCheckerBibLatexTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a79e3b73637..09ee0dd7875 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where the custom file column were sorted incorrectly. https://github.com/JabRef/jabref/issues/3119
 - We fixed an issues where the entry losses focus when a field is edited and at the same time used for sorting. https://github.com/JabRef/jabref/issues/3373
 - We fixed an issue where the menu on Mac OS was not displayed in the usual Mac-specific way. https://github.com/JabRef/jabref/issues/3146
+- We improved the integrity check for page numbers. [#4113](https://github.com/JabRef/jabref/issues/4113) and [feature request in the forum](http://discourse.jabref.org/t/pages-field-allow-use-of-en-dash/1199)
 - We fixed an issue where the order of fields in customized entry types was not saved correctly. [#4033](http://github.com/JabRef/jabref/issues/4033)
 - We fixed an issue where the groups tree of the last database was still shown even after the database was already closed.
 - We fixed an issue where the "Open file dialog" may disappear behind other windows. https://github.com/JabRef/jabref/issues/3410
diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index 0040afd2f2a..187394f404a 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -10,27 +10,29 @@
 
 public class PagesChecker implements ValueChecker {
 
-    private static final String PAGES_EXP_BIBTEX = "" + "\\A" // begin String
-            + "\\d+" // number
-            + "(?:" // non-capture group
-            + "\\+|\\-{2}\\d+" // + or --number (range)
-            + ")?" // optional group
-            + "(?:" // non-capture group
-            + "," // comma
-            + "\\d+(?:\\+|\\-{2}\\d+)?" // repeat former pattern
-            + ")*" // repeat group 0,*
-            + "\\z"; // end String
+    private static final String PAGES_EXP_BIBTEX = ""
+            + "\\A"                 // begin String
+            + "("
+            + "[A-Za-z]?\\d*"     // optional prefix and number
+            + "("
+            + "\\+|-{2}"    // separator
+            + "[A-Za-z]?\\d*" // optional prefix and number
+            + ")?"
+            + ",?"                // page range separation
+            + ")*"
+            + "\\z";                // end String
 
-    private static final String PAGES_EXP_BIBLATEX = "" + "\\A" // begin String
-            + "\\d+" // number
-            + "(?:" // non-capture group
-            + "\\+|\\-{1,2}\\d+" // + or --number (range)
-            + ")?" // optional group
-            + "(?:" // non-capture group
-            + "," // comma
-            + "\\d+(?:\\+|\\-{1,2}\\d+)?" // repeat former pattern
-            + ")*" // repeat group 0,*
-            + "\\z"; // end String
+    private static final String PAGES_EXP_BIBLATEX = ""
+            + "\\A"                 // begin String
+            + "("
+            + "[A-Za-z]?\\d*"     // optional prefix and number
+            + "("
+            + "\\+|-{1,2}|\u2013" // separator
+            + "[A-Za-z]?\\d*" // optional prefix and number
+            + ")?"
+            + ",?"                // page range separation
+            + ")*"
+            + "\\z";                // end String
 
     private final Predicate<String> isValidPageNumber;
 
diff --git a/src/test/java/org/jabref/logic/integrity/PagesCheckerBibLatexTest.java b/src/test/java/org/jabref/logic/integrity/PagesCheckerBibLatexTest.java
new file mode 100644
index 00000000000..9958b8c4172
--- /dev/null
+++ b/src/test/java/org/jabref/logic/integrity/PagesCheckerBibLatexTest.java
@@ -0,0 +1,73 @@
+package org.jabref.logic.integrity;
+
+import java.util.Optional;
+
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.BibDatabaseMode;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class PagesCheckerBibLatexTest {
+
+    private PagesChecker checker;
+
+    @BeforeEach
+    void setUp() {
+        BibDatabaseContext database = new BibDatabaseContext();
+        database.setMode(BibDatabaseMode.BIBLATEX);
+        checker = new PagesChecker(database);
+    }
+
+    @Test
+    void acceptsSinglePage() {
+        assertEquals(Optional.empty(), checker.checkValue("12"));
+    }
+
+    @Test
+    void acceptsSinglePageRange() {
+        assertEquals(Optional.empty(), checker.checkValue("12-15"));
+    }
+
+    @Test
+    void acceptsSinglePageRangeWithDoubleDashes() {
+        assertEquals(Optional.empty(), checker.checkValue("12--15"));
+    }
+
+    @Test
+    void acceptsSinglePageRangeWithEnDashes() {
+        assertEquals(Optional.empty(), checker.checkValue("12–15"));
+    }
+
+    @Test
+    void acceptsSinglePageRangeWithPagePrefix() {
+        assertEquals(Optional.empty(), checker.checkValue("R795--R804"));
+    }
+
+    @Test
+    void acceptsMultiplePageRange() {
+        assertEquals(Optional.empty(), checker.checkValue("12-15,18-29"));
+    }
+
+    @Test
+    void acceptsOpenEndPageRange() {
+        assertEquals(Optional.empty(), checker.checkValue("-15"));
+    }
+
+    @Test
+    void acceptsOpenStartPageRange() {
+        assertEquals(Optional.empty(), checker.checkValue("12-"));
+    }
+
+    @Test
+    void complainsAboutPPrefix() {
+        assertEquals(Optional.of("should contain a valid page number range"), checker.checkValue("p. 12"));
+    }
+
+    @Test
+    void complainsAboutPPPrefix() {
+        assertEquals(Optional.of("should contain a valid page number range"), checker.checkValue("pp. 12-15"));
+    }
+}

From 614d83cea2706649b0d529be8f34bd466765d0c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Nov 2018 08:44:30 +0100
Subject: [PATCH 170/229] Bump guava from 27.0-jre to 27.0.1-jre (#4499)

Bumps [guava](https://github.com/google/guava) from 27.0-jre to 27.0.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f364470d047..1ea1ba24bdf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,7 +125,7 @@ dependencies {
 
     compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
 
-    compile 'com.google.guava:guava:27.0-jre'
+    compile 'com.google.guava:guava:27.0.1-jre'
 
     // JavaFX stuff
     compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4'

From 58c8fd093a78de605c681d6375b81b577dfcd18c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Nov 2018 08:56:18 +0100
Subject: [PATCH 171/229] Bump mockito-core from 2.23.0 to 2.23.4 (#4502)

Bumps [mockito-core](https://github.com/mockito/mockito) from 2.23.0 to 2.23.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.23.0...v2.23.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1ea1ba24bdf..311d05164ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -168,7 +168,7 @@ dependencies {
     testCompile 'org.junit-pioneer:junit-pioneer:0.3.0'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'
-    testCompile 'org.mockito:mockito-core:2.23.0'
+    testCompile 'org.mockito:mockito-core:2.23.4'
     testCompile 'com.github.tomakehurst:wiremock:2.19.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'

From 86a5f31c9b5759e8f750dd3a4810b0017d71a718 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Nov 2018 08:56:30 +0100
Subject: [PATCH 172/229] Bump archunit-junit5-api from 0.9.2 to 0.9.3 (#4504)

Bumps [archunit-junit5-api](https://github.com/TNG/ArchUnit) from 0.9.2 to 0.9.3.
- [Release notes](https://github.com/TNG/ArchUnit/releases)
- [Commits](https://github.com/TNG/ArchUnit/compare/v0.9.2...v0.9.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 311d05164ff..94fd88a76ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -174,7 +174,7 @@ dependencies {
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.6.2'
     testCompile 'org.xmlunit:xmlunit-matchers:2.6.2'
-    testCompile 'com.tngtech.archunit:archunit-junit5-api:0.9.2'
+    testCompile 'com.tngtech.archunit:archunit-junit5-api:0.9.3'
     testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.9.2'
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"

From c19f3a46ab5c1a2ca342d41eae4b37f2c568141d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Nov 2018 08:57:58 +0100
Subject: [PATCH 173/229] Bump archunit-junit5-engine from 0.9.2 to 0.9.3
 (#4503)

Bumps [archunit-junit5-engine](https://github.com/TNG/ArchUnit) from 0.9.2 to 0.9.3.
- [Release notes](https://github.com/TNG/ArchUnit/releases)
- [Commits](https://github.com/TNG/ArchUnit/compare/v0.9.2...v0.9.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 94fd88a76ed..f9eab028473 100644
--- a/build.gradle
+++ b/build.gradle
@@ -174,8 +174,8 @@ dependencies {
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.6.2'
     testCompile 'org.xmlunit:xmlunit-matchers:2.6.2'
+    testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.9.3'
     testCompile 'com.tngtech.archunit:archunit-junit5-api:0.9.3'
-    testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.9.2'
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 

From 54790707537a4a34397ee54bf4106a98614842f6 Mon Sep 17 00:00:00 2001
From: Ali <alijakparov.kz@gmail.com>
Date: Fri, 23 Nov 2018 21:29:41 +0600
Subject: [PATCH 174/229] Create test (#4505)

* create non working test depend on Globals

* pass preferences via constructor

* create testcase

* refactor test

* refactor code

* add test case

* move to exporter package

* fix code style

* fix test name

* fix test code style

* add SaveDatabaseActionTest in TestArchitectureTest exception
---
 src/main/java/org/jabref/gui/BasePanel.java   |   2 +-
 src/main/java/org/jabref/gui/JabRefFrame.java |   2 +-
 .../jabref/gui/dialogs/AutosaveUIManager.java |   3 +-
 .../gui/exporter/SaveDatabaseAction.java      |  17 +--
 .../SharedDatabaseLoginDialogViewModel.java   |   2 +-
 .../architecture/TestArchitectureTests.java   |   3 +
 .../gui/exporter/SaveDatabaseActionTest.java  | 103 ++++++++++++++++++
 7 files changed, 120 insertions(+), 12 deletions(-)
 create mode 100644 src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index f57f69d6134..6291f893d02 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -272,7 +272,7 @@ public void output(String s) {
     }
 
     private void setupActions() {
-        SaveDatabaseAction saveAction = new SaveDatabaseAction(this);
+        SaveDatabaseAction saveAction = new SaveDatabaseAction(this, Globals.prefs);
         CleanupAction cleanUpAction = new CleanupAction(this, Globals.prefs);
 
         actions.put(Actions.UNDO, undoAction);
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index a7f2586d7e0..e6ef5d3128f 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -1335,7 +1335,7 @@ private boolean confirmClose(BasePanel panel) {
         if (response.isPresent() && response.get().equals(saveChanges)) {
             // The user wants to save.
             try {
-                SaveDatabaseAction saveAction = new SaveDatabaseAction(panel);
+                SaveDatabaseAction saveAction = new SaveDatabaseAction(panel, Globals.prefs);
                 if (!saveAction.save()) {
                     // The action was either canceled or unsuccessful.
                     output(Localization.lang("Unable to save library"));
diff --git a/src/main/java/org/jabref/gui/dialogs/AutosaveUIManager.java b/src/main/java/org/jabref/gui/dialogs/AutosaveUIManager.java
index 1fb08fbb184..2ce31738e54 100644
--- a/src/main/java/org/jabref/gui/dialogs/AutosaveUIManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/AutosaveUIManager.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.dialogs;
 
+import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.exporter.SaveDatabaseAction;
 import org.jabref.model.database.event.AutosaveEvent;
@@ -25,7 +26,7 @@ public AutosaveUIManager(BasePanel panel) {
     @Subscribe
     public void listen(@SuppressWarnings("unused") AutosaveEvent event) {
         try {
-            new SaveDatabaseAction(panel).save();
+            new SaveDatabaseAction(panel, Globals.prefs).save();
         } catch (Throwable e) {
             LOGGER.error("Problem occured while saving.", e);
         }
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index ecd1d7e6a2f..3a4fc68ffd2 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -14,7 +14,6 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 
-import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
@@ -53,16 +52,18 @@ public class SaveDatabaseAction {
     private final BasePanel panel;
     private final JabRefFrame frame;
     private final DialogService dialogService;
+    private final JabRefPreferences prefs;
 
-    public SaveDatabaseAction(BasePanel panel) {
+    public SaveDatabaseAction(BasePanel panel, JabRefPreferences prefs) {
         this.panel = panel;
         this.frame = panel.frame();
         this.dialogService = frame.getDialogService();
+        this.prefs = prefs;
     }
 
     private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding, SavePreferences.DatabaseSaveType saveType) throws SaveException {
         try {
-            SavePreferences preferences = Globals.prefs.loadForSaveFromPreferences()
+            SavePreferences preferences = prefs.loadForSaveFromPreferences()
                                                        .withEncoding(encoding)
                                                        .withSaveType(saveType);
 
@@ -124,7 +125,7 @@ private boolean doSave() {
                     panel.getBibDatabaseContext()
                          .getMetaData()
                          .getEncoding()
-                         .orElse(Globals.prefs.getDefaultEncoding()),
+                         .orElse(prefs.getDefaultEncoding()),
                     SavePreferences.DatabaseSaveType.ALL);
 
             if (success) {
@@ -182,10 +183,10 @@ private Optional<Path> getSavePath() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.BIBTEX_DB)
                 .withDefaultExtension(StandardFileType.BIBTEX_DB)
-                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                .withInitialDirectory(prefs.get(JabRefPreferences.WORKING_DIRECTORY))
                 .build();
         Optional<Path> selectedPath = dialogService.showFileSaveDialog(fileDialogConfiguration);
-        selectedPath.ifPresent(path -> Globals.prefs.setWorkingDir(path.getParent()));
+        selectedPath.ifPresent(path -> prefs.setWorkingDir(path.getParent()));
         return selectedPath;
     }
 
@@ -228,7 +229,7 @@ public void saveAs(Path file) {
     private boolean readyForAutosave(BibDatabaseContext context) {
         return ((context.getLocation() == DatabaseLocation.SHARED) ||
                 ((context.getLocation() == DatabaseLocation.LOCAL)
-                        && Globals.prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)))
+                        && prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)))
                 &&
                 context.getDatabasePath().isPresent();
     }
@@ -240,7 +241,7 @@ private boolean readyForBackup(BibDatabaseContext context) {
     public void saveSelectedAsPlain() {
         getSavePath().ifPresent(path -> {
             try {
-                saveDatabase(path, true, Globals.prefs.getDefaultEncoding(), SavePreferences.DatabaseSaveType.PLAIN_BIBTEX);
+                saveDatabase(path, true, prefs.getDefaultEncoding(), SavePreferences.DatabaseSaveType.PLAIN_BIBTEX);
                 frame.getFileHistory().newFile(path);
                 frame.output(Localization.lang("Saved selected to '%0'.", path.toString()));
             } catch (SaveException ex) {
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index dddbce8101a..2f1f0803b8d 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -163,7 +163,7 @@ private void openSharedDatabase(DBMSConnectionProperties connectionProperties) {
 
             if (!folder.getValue().isEmpty()) {
                 try {
-                    new SaveDatabaseAction(panel).saveAs(Paths.get(folder.getValue()));
+                    new SaveDatabaseAction(panel, Globals.prefs).saveAs(Paths.get(folder.getValue()));
                 } catch (Throwable e) {
                     LOGGER.error("Error while saving the database", e);
                 }
diff --git a/src/test/java/org/jabref/architecture/TestArchitectureTests.java b/src/test/java/org/jabref/architecture/TestArchitectureTests.java
index c37c450d8a0..da908308d9d 100644
--- a/src/test/java/org/jabref/architecture/TestArchitectureTests.java
+++ b/src/test/java/org/jabref/architecture/TestArchitectureTests.java
@@ -23,6 +23,7 @@ public class TestArchitectureTests {
     private static final String CLASS_ORG_JABREF_PREFERENCES = "org.jabref.preferences.JabRefPreferences";
     private static final String CLASS_ORG_JABREF_PREFERENCES_TEST = "JabRefPreferencesTest";
     private static final String CLASS_ORG_JABREF_PREFERENCES_MIGRATIONS_TEST = "PreferencesMigrationsTest";
+    private static final String CLASS_ORG_JABREF_SAVE_DATABASE_ACTION_TEST = "SaveDatabaseActionTest";
     private static final String CLASS_ORG_JABREF_UPDATE_TIMESTAMP_LISTENER_TEST = "UpdateTimestampListenerTest";
     private static final String CLASS_ORG_JABREF_ENTRY_EDITOR_TEST = "EntryEditorTest";
     private static final String CLASS_ORG_JABREF_LINKED_FILE_VIEW_MODEL_TEST = "LinkedFileViewModelTest";
@@ -36,9 +37,11 @@ public TestArchitectureTests() {
         exceptions = new ArrayList<>();
         exceptions.add(CLASS_ORG_JABREF_PREFERENCES_TEST);
         exceptions.add(CLASS_ORG_JABREF_PREFERENCES_MIGRATIONS_TEST);
+        exceptions.add(CLASS_ORG_JABREF_SAVE_DATABASE_ACTION_TEST);
         exceptions.add(CLASS_ORG_JABREF_UPDATE_TIMESTAMP_LISTENER_TEST);
         exceptions.add(CLASS_ORG_JABREF_ENTRY_EDITOR_TEST);
         exceptions.add(CLASS_ORG_JABREF_LINKED_FILE_VIEW_MODEL_TEST);
+
     }
 
     public static Stream<String[]> data() {
diff --git a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
new file mode 100644
index 00000000000..a0bce778175
--- /dev/null
+++ b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
@@ -0,0 +1,103 @@
+package org.jabref.gui.exporter;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.shared.DatabaseLocation;
+import org.jabref.preferences.JabRefPreferences;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class SaveDatabaseActionTest {
+
+    private static final String TEST_FILE_PATH = "C:\\Users\\John_Doe\\Jabref";
+    private final File file = new File(TEST_FILE_PATH);
+    private Optional<Path> path = Optional.of(file.toPath());
+
+    private DialogService dialogService = mock(DialogService.class);
+    private JabRefPreferences preferences = mock(JabRefPreferences.class);
+    private BasePanel basePanel = mock(BasePanel.class);
+    private JabRefFrame jabRefFrame = mock(JabRefFrame.class);
+    private BibDatabaseContext dbContext = spy(BibDatabaseContext.class);
+    private SaveDatabaseAction saveDatabaseAction;
+
+    @Before
+    public void setUp() {
+        when(basePanel.frame()).thenReturn(jabRefFrame);
+        when(basePanel.getBibDatabaseContext()).thenReturn(dbContext);
+        when(jabRefFrame.getDialogService()).thenReturn(dialogService);
+
+        saveDatabaseAction = spy(new SaveDatabaseAction(basePanel, preferences));
+    }
+
+    @Test
+    public void saveAsShouldSetWorkingDirectory() {
+        when(preferences.get(JabRefPreferences.WORKING_DIRECTORY)).thenReturn(TEST_FILE_PATH);
+        when(dialogService.showFileSaveDialog(any(FileDialogConfiguration.class))).thenReturn(path);
+        doNothing().when(saveDatabaseAction).saveAs(any());
+
+        saveDatabaseAction.saveAs();
+
+        verify(preferences, times(1)).setWorkingDir(path.get().getParent());
+    }
+
+    @Test
+    public void saveAsShouldNotSetWorkingDirectoryIfNotSelected() {
+        when(preferences.get(JabRefPreferences.WORKING_DIRECTORY)).thenReturn(TEST_FILE_PATH);
+        when(dialogService.showFileSaveDialog(any(FileDialogConfiguration.class))).thenReturn(Optional.empty());
+        doNothing().when(saveDatabaseAction).saveAs(any());
+
+        saveDatabaseAction.saveAs();
+
+        verify(preferences, times(0)).setWorkingDir(path.get().getParent());
+    }
+
+    @Test
+    public void saveAsShouldSetNewDatabasePathIntoContext() {
+        when(dbContext.getDatabasePath()).thenReturn(Optional.empty());
+        when(dbContext.getLocation()).thenReturn(DatabaseLocation.LOCAL);
+        when(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)).thenReturn(false);
+
+        saveDatabaseAction.saveAs(file.toPath());
+
+        verify(dbContext, times(1)).setDatabaseFile(file.toPath());
+    }
+
+    @Test
+    public void saveShouldShowSaveAsIfDatabaseNotSelected() {
+        when(dbContext.getDatabasePath()).thenReturn(Optional.empty());
+        when(dbContext.getLocation()).thenReturn(DatabaseLocation.LOCAL);
+        when(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)).thenReturn(false);
+        when(dialogService.showFileSaveDialog(any())).thenReturn(path);
+        doNothing().when(saveDatabaseAction).saveAs(file.toPath());
+
+        saveDatabaseAction.save();
+
+        verify(saveDatabaseAction, times(1)).saveAs(file.toPath());
+    }
+
+    @Test
+    public void saveShouldNotSaveDatabaseIfPathNotSet() {
+        when(dbContext.getDatabasePath()).thenReturn(Optional.empty());
+
+        boolean result = saveDatabaseAction.save();
+
+        assertFalse(result);
+    }
+}

From 944d3c97f62eb3ad7c4921ef47c8afcdf0baa07a Mon Sep 17 00:00:00 2001
From: Ali <alijakparov.kz@gmail.com>
Date: Fri, 23 Nov 2018 21:31:11 +0600
Subject: [PATCH 175/229] 3189 fix group renaming (#4470)

* change row name if group name changed

* fix group renaming via property

* set formatting when set group name

* delete comments

* fix to string method

* Fix move to group always moves first entry (#4457)

* Fix move to group always moves first entry

* clarify comment a bit better

* Update archunit from 0.9.1 -> 0.9.2

* change row name if group name changed

* fix group renaming via property

* set formatting when set group name

* delete comments

* fix to string method

* fix group renaming

* revert GroupTreeView

* revert GroupTreeViewModel

* revert Group Dialog

* make binding with group name via formatting

* fix textGroupParsing

* revert group tree view model

* revert groupNodeViewModel

* fix code style
---
 .../org/jabref/model/groups/AbstractGroup.java   | 16 +++++++++++-----
 .../model/groups/AutomaticKeywordGroup.java      |  2 +-
 .../model/groups/AutomaticPersonsGroup.java      |  2 +-
 .../org/jabref/model/groups/ExplicitGroup.java   |  2 +-
 .../java/org/jabref/model/groups/TexGroup.java   |  2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/jabref/model/groups/AbstractGroup.java b/src/main/java/org/jabref/model/groups/AbstractGroup.java
index aafbe366f11..e61d3b30e52 100644
--- a/src/main/java/org/jabref/model/groups/AbstractGroup.java
+++ b/src/main/java/org/jabref/model/groups/AbstractGroup.java
@@ -4,6 +4,8 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.scene.paint.Color;
 
 import org.jabref.model.entry.BibEntry;
@@ -18,7 +20,7 @@ public abstract class AbstractGroup implements SearchMatcher {
     /**
      * The group's name.
      */
-    protected final String name;
+    protected final StringProperty name = new SimpleStringProperty();
     /**
      * The hierarchical context of the group.
      */
@@ -29,14 +31,14 @@ public abstract class AbstractGroup implements SearchMatcher {
     protected Optional<String> iconName = Optional.empty();
 
     protected AbstractGroup(String name, GroupHierarchyType context) {
-        this.name = name;
+        this.name.setValue(name);
         this.context = Objects.requireNonNull(context);
     }
 
     @Override
     public String toString() {
         return "AbstractGroup{" +
-                "name='" + name + '\'' +
+                "name='" + name.getValue() + '\'' +
                 ", context=" + context +
                 ", color=" + color +
                 ", isExpanded=" + isExpanded +
@@ -54,13 +56,13 @@ public boolean equals(Object other) {
             return false;
         }
         AbstractGroup that = (AbstractGroup) other;
-        return Objects.equals(this.name, that.name) && Objects.equals(this.description, that.description)
+        return Objects.equals(this.name.getValue(), that.name.getValue()) && Objects.equals(this.description, that.description)
                 && Objects.equals(this.context, that.context);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, description, context);
+        return Objects.hash(name.getValue(), description, context);
     }
 
     public Optional<Color> getColor() {
@@ -122,6 +124,10 @@ public GroupHierarchyType getHierarchicalContext() {
      * Returns this group's name, e.g. for display in a list/tree.
      */
     public final String getName() {
+        return name.getValue();
+    }
+
+    public StringProperty nameProperty() {
         return name;
     }
 
diff --git a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java b/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
index f4952a4f751..3549d35acc9 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
@@ -37,7 +37,7 @@ public String getField() {
 
     @Override
     public AbstractGroup deepCopy() {
-        return new AutomaticKeywordGroup(this.name, this.context, field, this.keywordDelimiter, keywordHierarchicalDelimiter);
+        return new AutomaticKeywordGroup(this.name.getValue(), this.context, field, this.keywordDelimiter, keywordHierarchicalDelimiter);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java b/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
index 58f11af3b4c..04cd3a2b1e6 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
@@ -38,7 +38,7 @@ public int hashCode() {
 
     @Override
     public AbstractGroup deepCopy() {
-        return new AutomaticPersonsGroup(this.name, this.context, this.field);
+        return new AutomaticPersonsGroup(this.name.getValue(), this.context, this.field);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/groups/ExplicitGroup.java b/src/main/java/org/jabref/model/groups/ExplicitGroup.java
index ae58004df5d..423da74b3e5 100644
--- a/src/main/java/org/jabref/model/groups/ExplicitGroup.java
+++ b/src/main/java/org/jabref/model/groups/ExplicitGroup.java
@@ -64,7 +64,7 @@ public List<String> getLegacyEntryKeys() {
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, context, legacyEntryKeys, iconName, color, description, isExpanded);
+        return Objects.hash(name.getValue(), context, legacyEntryKeys, iconName, color, description, isExpanded);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/groups/TexGroup.java b/src/main/java/org/jabref/model/groups/TexGroup.java
index a9e7f82e006..92a47028eae 100644
--- a/src/main/java/org/jabref/model/groups/TexGroup.java
+++ b/src/main/java/org/jabref/model/groups/TexGroup.java
@@ -49,7 +49,7 @@ public boolean isDynamic() {
     @Override
     public AbstractGroup deepCopy() {
         try {
-            return new TexGroup(name, context, filePath, auxParser, fileMonitor);
+            return new TexGroup(name.getValue(), context, filePath, auxParser, fileMonitor);
         } catch (IOException ex) {
             // This should never happen because we were able to monitor the file just fine until now
             LOGGER.error("Problem creating copy of group", ex);

From 742cfce7ed79eb8ea3b79fe31defebdaac6cce19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Nov 2018 18:19:38 +0100
Subject: [PATCH 176/229] Bump java-diff-utils from 2.2.0 to 4.0 (#4507)

Co-Authored-By: Tobias Diez <TobiasDiez@gmx.de>

* Bump java-diff-utils from 2.2.0 to 4.0

Bumps [java-diff-utils](https://github.com/java-diff-utils/java-diff-utils) from 2.2.0 to 4.0.
- [Release notes](https://github.com/java-diff-utils/java-diff-utils/releases)
- [Commits](https://github.com/java-diff-utils/java-diff-utils/commits/java-diff-utils-4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Fix build
---
 build.gradle                                  |  2 +-
 .../gui/mergeentries/DiffHighlighting.java    | 58 ++++++++++++-------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/build.gradle b/build.gradle
index f9eab028473..6913fab8cc0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -110,7 +110,7 @@ dependencies {
     compile "org.libreoffice:ridl:5.4.2"
     compile "org.libreoffice:unoil:5.4.2"
 
-    compile 'io.github.java-diff-utils:java-diff-utils:2.2.0'
+    compile 'io.github.java-diff-utils:java-diff-utils:4.0'
     compile 'info.debatty:java-string-similarity:1.1.0'
 
     antlr3 'org.antlr:antlr:3.5.2'
diff --git a/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java b/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
index f4812fbc4ad..acffbc7acc0 100644
--- a/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
+++ b/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
@@ -7,31 +7,42 @@
 
 import javafx.scene.text.Text;
 
-import difflib.Delta;
-import difflib.DiffUtils;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.patch.AbstractDelta;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DiffHighlighting {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(DiffHighlighting.class);
+
     private DiffHighlighting() {
     }
 
     public static List<Text> generateDiffHighlighting(String baseString, String modifiedString, String separator) {
         List<String> stringList = Arrays.asList(baseString.split(separator));
         List<Text> result = stringList.stream().map(DiffHighlighting::forUnchanged).collect(Collectors.toList());
-        List<Delta<String>> deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
-            Collections.reverse(deltaList);
-            for (Delta<String> delta : deltaList) {
-                int startPos = delta.getOriginal().getPosition();
-                List<String> lines = delta.getOriginal().getLines();
-                int offset = 0;
-                switch (delta.getType()) {
+        List<AbstractDelta<String>> deltaList;
+        try {
+            deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
+        } catch (DiffException e) {
+            LOGGER.error("Error while generating diff of " + baseString + " and " + modifiedString);
+            return Collections.emptyList();
+        }
+        Collections.reverse(deltaList);
+        for (AbstractDelta<String> delta : deltaList) {
+            int startPos = delta.getSource().getPosition();
+            List<String> lines = delta.getSource().getLines();
+            int offset = 0;
+            switch (delta.getType()) {
                 case CHANGE:
                     for (String line : lines) {
                         result.set(startPos + offset, forRemoved(line + separator));
                         offset++;
                     }
                     result.set(startPos + offset - 1, forRemoved(stringList.get((startPos + offset) - 1) + separator));
-                    result.add(startPos + offset, forAdded(String.join(separator, delta.getRevised().getLines())));
+                    result.add(startPos + offset, forAdded(String.join(separator, delta.getTarget().getLines())));
                     break;
                 case DELETE:
                     for (String line : lines) {
@@ -40,12 +51,12 @@ public static List<Text> generateDiffHighlighting(String baseString, String modi
                     }
                     break;
                 case INSERT:
-                    result.add(delta.getOriginal().getPosition(), forAdded(String.join(separator, delta.getRevised().getLines())));
+                    result.add(delta.getSource().getPosition(), forAdded(String.join(separator, delta.getTarget().getLines())));
                     break;
                 default:
                     break;
-                }
             }
+        }
         return result;
     }
 
@@ -76,13 +87,19 @@ public static Text forRemoved(String text) {
     public static List<Text> generateSymmetricHighlighting(String baseString, String modifiedString, String separator) {
         List<String> stringList = Arrays.asList(baseString.split(separator));
         List<Text> result = stringList.stream().map(text -> DiffHighlighting.forUnchanged(text + separator)).collect(Collectors.toList());
-        List<Delta<String>> deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
-            Collections.reverse(deltaList);
-            for (Delta<String> delta : deltaList) {
-                int startPos = delta.getOriginal().getPosition();
-                List<String> lines = delta.getOriginal().getLines();
-                int offset = 0;
-                switch (delta.getType()) {
+        List<AbstractDelta<String>> deltaList;
+        try {
+            deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
+        } catch (DiffException e) {
+            LOGGER.error("Error while generating diff of " + baseString + " and " + modifiedString);
+            return Collections.emptyList();
+        }
+        Collections.reverse(deltaList);
+        for (AbstractDelta<String> delta : deltaList) {
+            int startPos = delta.getSource().getPosition();
+            List<String> lines = delta.getSource().getLines();
+            int offset = 0;
+            switch (delta.getType()) {
                 case CHANGE:
                     for (String line : lines) {
                         result.set(startPos + offset, forChanged(line + separator));
@@ -99,10 +116,9 @@ public static List<Text> generateSymmetricHighlighting(String baseString, String
                     break;
                 default:
                     break;
-                }
             }
+        }
 
         return result;
     }
-
 }

From 9213e3c2db76ab2839c36644dc241af60e9d3322 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sun, 25 Nov 2018 16:32:29 +0100
Subject: [PATCH 177/229] Add docbook 5 support (#4319)

* Add docbook 5 support
Renamed to docbook 5 export
removed old layout files

* rename old docbook to docbook 4
use lastName only in docbook5
use new docbook template
favor composition over inheritance
add docbook version enum

* fix wrong method name in masterthesis for docbook4

* add test for docbook5

* split format in separate files

* remove submodule accidentaly commited

* fix variable ordr

* fix tests

* fix checkstyle

* Update docbook5 layout fiels

* fix tests

* Use FullName instead of NoInitials
User lower case formatter for \entrytype

* lastname instead of fullname

* update to latest version of docbook layout files provided
convert tab character to spaces

* fix test
---
 .../logic/exporter/ExporterFactory.java       |  3 +-
 .../org/jabref/logic/layout/LayoutEntry.java  | 18 ++--
 .../layout/format/CreateDocBook4Authors.java  | 22 +++++
 ...ditors.java => CreateDocBook4Editors.java} |  8 +-
 .../layout/format/CreateDocBook5Authors.java  | 24 ++++++
 .../layout/format/CreateDocBook5Editors.java  | 23 +++++
 ...thors.java => DocBookAuthorFormatter.java} | 45 +++++-----
 .../logic/layout/format/DocBookVersion.java   |  6 ++
 ...ook.begin.layout => docbook4.begin.layout} |  0
 ...docbook.end.layout => docbook4.end.layout} |  0
 .../{docbook.layout => docbook4.layout}       |  4 +-
 ...s.layout => docbook4.mastersthesis.layout} |  2 +-
 .../resource/layout/docbook5.article.layout   | 36 ++++++++
 .../resource/layout/docbook5.begin.layout     |  7 ++
 .../resource/layout/docbook5.book.layout      | 40 +++++++++
 .../resource/layout/docbook5.booklet.layout   | 26 ++++++
 .../layout/docbook5.collection.layout         | 30 +++++++
 .../resource/layout/docbook5.end.layout       |  1 +
 .../resource/layout/docbook5.inbook.layout    | 30 +++++++
 .../layout/docbook5.incollection.layout       | 30 +++++++
 .../resources/resource/layout/docbook5.layout | 27 ++++++
 .../resource/layout/docbook5.phdthesis.layout | 30 +++++++
 .../resource/layout/docbook5.www.layout       | 23 +++++
 .../logic/exporter/DocBook5ExporterTest.java  | 85 +++++++++++++++++++
 .../logic/exporter/Docbook5ExportFormat.xml   | 40 +++++++++
 25 files changed, 524 insertions(+), 36 deletions(-)
 create mode 100644 src/main/java/org/jabref/logic/layout/format/CreateDocBook4Authors.java
 rename src/main/java/org/jabref/logic/layout/format/{CreateDocBookEditors.java => CreateDocBook4Editors.java} (57%)
 create mode 100644 src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
 create mode 100644 src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java
 rename src/main/java/org/jabref/logic/layout/format/{CreateDocBookAuthors.java => DocBookAuthorFormatter.java} (54%)
 create mode 100644 src/main/java/org/jabref/logic/layout/format/DocBookVersion.java
 rename src/main/resources/resource/layout/{docbook.begin.layout => docbook4.begin.layout} (100%)
 rename src/main/resources/resource/layout/{docbook.end.layout => docbook4.end.layout} (100%)
 rename src/main/resources/resource/layout/{docbook.layout => docbook4.layout} (86%)
 rename src/main/resources/resource/layout/{docbook.mastersthesis.layout => docbook4.mastersthesis.layout} (86%)
 create mode 100644 src/main/resources/resource/layout/docbook5.article.layout
 create mode 100644 src/main/resources/resource/layout/docbook5.begin.layout
 create mode 100644 src/main/resources/resource/layout/docbook5.book.layout
 create mode 100644 src/main/resources/resource/layout/docbook5.booklet.layout
 create mode 100644 src/main/resources/resource/layout/docbook5.collection.layout
 create mode 100644 src/main/resources/resource/layout/docbook5.end.layout
 create mode 100644 src/main/resources/resource/layout/docbook5.inbook.layout
 create mode 100644 src/main/resources/resource/layout/docbook5.incollection.layout
 create mode 100644 src/main/resources/resource/layout/docbook5.layout
 create mode 100644 src/main/resources/resource/layout/docbook5.phdthesis.layout
 create mode 100644 src/main/resources/resource/layout/docbook5.www.layout
 create mode 100644 src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
 create mode 100644 src/test/resources/org/jabref/logic/exporter/Docbook5ExportFormat.xml

diff --git a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
index 75c71e77d4d..be7b62252f3 100644
--- a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
+++ b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
@@ -38,7 +38,8 @@ public static ExporterFactory create(Map<String, TemplateExporter> customFormats
         // Initialize build-in exporters
         exporters.add(new TemplateExporter("HTML", "html", "html", null, StandardFileType.HTML, layoutPreferences, savePreferences));
         exporters.add(new TemplateExporter(Localization.lang("Simple HTML"), "simplehtml", "simplehtml", null, StandardFileType.HTML, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter("DocBook 4.4", "docbook", "docbook", null, StandardFileType.XML, layoutPreferences, savePreferences));
+        exporters.add(new TemplateExporter("DocBook 5.1", "docbook5", "docbook5", null, StandardFileType.XML, layoutPreferences, savePreferences));
+        exporters.add(new TemplateExporter("DocBook 4", "docbook4", "docbook4", null, StandardFileType.XML, layoutPreferences, savePreferences));
         exporters.add(new TemplateExporter("DIN 1505", "din1505", "din1505winword", "din1505", StandardFileType.RTF, layoutPreferences, savePreferences));
         exporters.add(new TemplateExporter("BibO RDF", "bibordf", "bibordf", null, StandardFileType.RDF, layoutPreferences, savePreferences));
         exporters.add(new TemplateExporter(Localization.lang("HTML table"), "tablerefs", "tablerefs", "tablerefs", StandardFileType.HTML, layoutPreferences, savePreferences));
diff --git a/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
index 21ef1b49abb..18927ef8cf5 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutEntry.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
@@ -34,8 +34,10 @@
 import org.jabref.logic.layout.format.Authors;
 import org.jabref.logic.layout.format.CompositeFormat;
 import org.jabref.logic.layout.format.CreateBibORDFAuthors;
-import org.jabref.logic.layout.format.CreateDocBookAuthors;
-import org.jabref.logic.layout.format.CreateDocBookEditors;
+import org.jabref.logic.layout.format.CreateDocBook4Authors;
+import org.jabref.logic.layout.format.CreateDocBook4Editors;
+import org.jabref.logic.layout.format.CreateDocBook5Authors;
+import org.jabref.logic.layout.format.CreateDocBook5Editors;
 import org.jabref.logic.layout.format.CurrentDate;
 import org.jabref.logic.layout.format.DOICheck;
 import org.jabref.logic.layout.format.DOIStrip;
@@ -444,10 +446,14 @@ private LayoutFormatter getLayoutFormatterByName(String name) throws Exception {
                 return new CompositeFormat();
             case "CreateBibORDFAuthors":
                 return new CreateBibORDFAuthors();
-            case "CreateDocBookAuthors":
-                return new CreateDocBookAuthors();
-            case "CreateDocBookEditors":
-                return new CreateDocBookEditors();
+            case "CreateDocBook4Authors":
+                return new CreateDocBook4Authors();
+            case "CreateDocBook4Editors":
+                return new CreateDocBook4Editors();
+            case "CreateDocBook5Authors":
+                return new CreateDocBook5Authors();
+            case "CreateDocBook5Editors":
+                return new CreateDocBook5Editors();
             case "CurrentDate":
                 return new CurrentDate();
             case "DateFormatter":
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Authors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Authors.java
new file mode 100644
index 00000000000..3e04ae04eae
--- /dev/null
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Authors.java
@@ -0,0 +1,22 @@
+package org.jabref.logic.layout.format;
+
+import org.jabref.logic.layout.LayoutFormatter;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.FieldName;
+
+/**
+ * Create DocBook authors formatter.
+ */
+public class CreateDocBook4Authors implements LayoutFormatter {
+
+    @Override
+    public String format(String fieldText) {
+        StringBuilder sb = new StringBuilder(100);
+        AuthorList al = AuthorList.parse(fieldText);
+        DocBookAuthorFormatter formatter = new DocBookAuthorFormatter();
+        formatter.addBody(sb, al, FieldName.AUTHOR, DocBookVersion.DOCBOOK_4);
+        return sb.toString();
+
+    }
+
+}
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Editors.java
similarity index 57%
rename from src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java
rename to src/main/java/org/jabref/logic/layout/format/CreateDocBook4Editors.java
index 5f199c7bad5..0a8950742b9 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateDocBookEditors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Editors.java
@@ -1,19 +1,21 @@
 package org.jabref.logic.layout.format;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.FieldName;
 
 /**
- * Create DocBook editors formatter.
+ * Create DocBook4 editors formatter.
  */
-public class CreateDocBookEditors extends CreateDocBookAuthors {
+public class CreateDocBook4Editors implements LayoutFormatter {
 
     @Override
     public String format(String fieldText) {
         //		<editor><firstname>L.</firstname><surname>Xue</surname></editor>
         StringBuilder sb = new StringBuilder(100);
         AuthorList al = AuthorList.parse(fieldText);
-        addBody(sb, al, FieldName.EDITOR);
+        DocBookAuthorFormatter formatter = new DocBookAuthorFormatter();
+        formatter.addBody(sb, al, FieldName.EDITOR, DocBookVersion.DOCBOOK_4);
         return sb.toString();
 
     }
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
new file mode 100644
index 00000000000..53cc52c14d7
--- /dev/null
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
@@ -0,0 +1,24 @@
+package org.jabref.logic.layout.format;
+
+import org.jabref.logic.layout.LayoutFormatter;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.FieldName;
+
+/**
+ * Create DocBook5 authors formatter
+ */
+public class CreateDocBook5Authors implements LayoutFormatter {
+
+    @Override
+    public String format(String fieldText) {
+
+        StringBuilder sb = new StringBuilder(100);
+        AuthorList al = AuthorList.parse(fieldText);
+
+        DocBookAuthorFormatter authorFormatter = new DocBookAuthorFormatter();
+        authorFormatter.addBody(sb, al, FieldName.AUTHOR, DocBookVersion.DOCBOOK_5);
+        return sb.toString();
+
+    }
+
+}
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java
new file mode 100644
index 00000000000..55892a37521
--- /dev/null
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java
@@ -0,0 +1,23 @@
+package org.jabref.logic.layout.format;
+
+import org.jabref.logic.layout.LayoutFormatter;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.FieldName;
+
+/**
+ * Create DocBook editors formatter.
+ */
+public class CreateDocBook5Editors implements LayoutFormatter {
+
+    @Override
+    public String format(String fieldText) {
+        //		<editor><personname><firstname>L.</firstname><surname>Xue</surname></personname></editor>
+        StringBuilder sb = new StringBuilder(100);
+        AuthorList al = AuthorList.parse(fieldText);
+        DocBookAuthorFormatter formatter = new DocBookAuthorFormatter();
+        formatter.addBody(sb, al, FieldName.EDITOR, DocBookVersion.DOCBOOK_5);
+        return sb.toString();
+
+    }
+
+}
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java b/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
similarity index 54%
rename from src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java
rename to src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
index d2ffb6d250c..8bcf75058d3 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateDocBookAuthors.java
+++ b/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
@@ -1,42 +1,42 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
-import org.jabref.model.entry.FieldName;
 
 /**
- * Create DocBook authors formatter.
+ * DocBook author formatter for both version 4 and 5
+ *
  */
-public class CreateDocBookAuthors implements LayoutFormatter {
+public class DocBookAuthorFormatter {
 
     private static final XMLChars XML_CHARS = new XMLChars();
 
-    @Override
-    public String format(String fieldText) {
-
-        StringBuilder sb = new StringBuilder(100);
-
-        AuthorList al = AuthorList.parse(fieldText);
-
-        addBody(sb, al, FieldName.AUTHOR);
-        return sb.toString();
-
-    }
-
-    public void addBody(StringBuilder sb, AuthorList al, String tagName) {
+    /**
+     *
+     * @param sb {@link StringBuilder}
+     * @param al {@link AuthorList}
+     * @param tagName Editor or author field/tag
+     * @param version @link {@link DocBookVersion}
+     */
+    public void addBody(StringBuilder sb, AuthorList al, String tagName, DocBookVersion version) {
         for (int i = 0; i < al.getNumberOfAuthors(); i++) {
             sb.append('<').append(tagName).append('>');
+            if (version == DocBookVersion.DOCBOOK_5) {
+                sb.append("<personname>");
+            }
             Author a = al.getAuthor(i);
             a.getFirst().filter(first -> !first.isEmpty()).ifPresent(first -> sb.append("<firstname>")
-                    .append(CreateDocBookAuthors.XML_CHARS.format(first)).append("</firstname>"));
+                    .append(XML_CHARS.format(first)).append("</firstname>"));
             a.getVon().filter(von -> !von.isEmpty()).ifPresent(von -> sb.append("<othername>")
-                    .append(CreateDocBookAuthors.XML_CHARS.format(von)).append("</othername>"));
+                    .append(XML_CHARS.format(von)).append("</othername>"));
             a.getLast().filter(last -> !last.isEmpty()).ifPresent(last -> {
-                sb.append("<surname>").append(CreateDocBookAuthors.XML_CHARS.format(last));
+                sb.append("<surname>").append(XML_CHARS.format(last));
                 a.getJr().filter(jr -> !jr.isEmpty())
-                        .ifPresent(jr -> sb.append(' ').append(CreateDocBookAuthors.XML_CHARS.format(jr)));
+                        .ifPresent(jr -> sb.append(' ').append(XML_CHARS.format(jr)));
                 sb.append("</surname>");
+                if (version == DocBookVersion.DOCBOOK_5) {
+                    sb.append("</personname>");
+                }
             });
 
             if (i < (al.getNumberOfAuthors() - 1)) {
@@ -46,5 +46,4 @@ public void addBody(StringBuilder sb, AuthorList al, String tagName) {
             }
         }
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/jabref/logic/layout/format/DocBookVersion.java b/src/main/java/org/jabref/logic/layout/format/DocBookVersion.java
new file mode 100644
index 00000000000..9b435717f07
--- /dev/null
+++ b/src/main/java/org/jabref/logic/layout/format/DocBookVersion.java
@@ -0,0 +1,6 @@
+package org.jabref.logic.layout.format;
+
+public enum DocBookVersion {
+    DOCBOOK_4,
+    DOCBOOK_5
+}
diff --git a/src/main/resources/resource/layout/docbook.begin.layout b/src/main/resources/resource/layout/docbook4.begin.layout
similarity index 100%
rename from src/main/resources/resource/layout/docbook.begin.layout
rename to src/main/resources/resource/layout/docbook4.begin.layout
diff --git a/src/main/resources/resource/layout/docbook.end.layout b/src/main/resources/resource/layout/docbook4.end.layout
similarity index 100%
rename from src/main/resources/resource/layout/docbook.end.layout
rename to src/main/resources/resource/layout/docbook4.end.layout
diff --git a/src/main/resources/resource/layout/docbook.layout b/src/main/resources/resource/layout/docbook4.layout
similarity index 86%
rename from src/main/resources/resource/layout/docbook.layout
rename to src/main/resources/resource/layout/docbook4.layout
index 07ea7765597..c74993e66ce 100644
--- a/src/main/resources/resource/layout/docbook.layout
+++ b/src/main/resources/resource/layout/docbook4.layout
@@ -1,7 +1,7 @@
 <biblioentry xreflabel="\bibtexkey" id="\bibtexkey">
    <authorgroup>
-\begin{author}       \format[CreateDocBookAuthors]{\author} \end{author}
-\begin{editor}       \format[CreateDocBookEditors]{\editor} \end{editor}
+\begin{author}       \format[CreateDocBook4Authors]{\author} \end{author}
+\begin{editor}       \format[CreateDocBook4Editors]{\editor} \end{editor}
    </authorgroup>
    <citetitle pubwork="article">\format[XMLChars,RemoveLatexCommands]{\title}</citetitle>
 \begin{journal}   <citetitle pubwork="journal">\format[XMLChars]{\journal}</citetitle>\end{journal}
diff --git a/src/main/resources/resource/layout/docbook.mastersthesis.layout b/src/main/resources/resource/layout/docbook4.mastersthesis.layout
similarity index 86%
rename from src/main/resources/resource/layout/docbook.mastersthesis.layout
rename to src/main/resources/resource/layout/docbook4.mastersthesis.layout
index 8523421ac8c..b5baaa15a64 100644
--- a/src/main/resources/resource/layout/docbook.mastersthesis.layout
+++ b/src/main/resources/resource/layout/docbook4.mastersthesis.layout
@@ -1,6 +1,6 @@
 <biblioentry xreflabel="\bibtexkey" id="\bibtexkey">
    <authorgroup>
-\begin{author}       \format[CreateDocBookAuthors]{\author} \end{author}
+\begin{author}       \format[CreateDocBook4Authors]{\author} \end{author}
    </authorgroup>
    <citetitle pubwork="manuscript">\format[XMLChars,RemoveLatexCommands]{\title}</citetitle>
 \begin{school}   <publisher>
diff --git a/src/main/resources/resource/layout/docbook5.article.layout b/src/main/resources/resource/layout/docbook5.article.layout
new file mode 100644
index 00000000000..b79d36f7e71
--- /dev/null
+++ b/src/main/resources/resource/layout/docbook5.article.layout
@@ -0,0 +1,36 @@
+<biblioentry xreflabel="\format[Authors(3,LastName,EtAl= et al.)]{\author} (\year)" xml:id="\bibtexkey">
+   <authorgroup>
+<!--AUTHORS-->
+\begin{author}       \format[CreateDocBook5Authors]{\author} \end{author}
+<!--EDITORS-->
+\begin{editor}       \format[CreateDocBook5Editors]{\editor} \end{editor}
+   </authorgroup>
+   <!--TITLE-->
+    \begin{title}       <citetitle pubwork="article">\format[XMLChars,RemoveLatexCommands]{\title}</citetitle> \end{title}
+
+<!--JOURNAL, Vol, Pages, Year-->
+    \begin{journal}
+        <biblioset relation="journal">\n
+        \begin{volume}   <volumenum>\volume</volumenum> \end{volume}
+        \begin{pages}   <artpagenums>\format[FormatPagesForXML]{\pages}</artpagenums> \end{pages}
+        \begin{year}   <pubdate>\year</pubdate>  \end{year}
+    \end{journal}
+
+<!-- IDENTIFIERS-->
+    \begin{url}
+        <bibliomisc><link xlink:href="\format[XMLChars]{\url}">\format[XMLChars]{\url}</link></bibliomisc>
+    \end{url}
+    \begin{doi}
+        <biblioid class="doi">\format[XMLChars]{\doi}</biblioid>
+    \end{doi}
+    \begin{isbn}
+        <biblioid class="isbn">\format[XMLChars]{\isbn}</biblioid>
+    \end{isbn}
+
+<!--ABSTRACT-->
+    \begin{abstract}
+        <abstract>
+            <para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para>
+        </abstract>
+    \end{abstract}
+</biblioentry>
diff --git a/src/main/resources/resource/layout/docbook5.begin.layout b/src/main/resources/resource/layout/docbook5.begin.layout
new file mode 100644
index 00000000000..0ab61fa7f2c
--- /dev/null
+++ b/src/main/resources/resource/layout/docbook5.begin.layout
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?xml-model href="http://docbook.org/xml/5.1/rng/docbook.rng" schematypens="http://relaxng.org/ns/structure/1.0"?>
+<?xml-model href="http://docbook.org/xml/5.1/sch/docbook.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<bibliography version="5.1" xml:lang="en"
+    xmlns="http://docbook.org/ns/docbook"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:ns="http://docbook.org/ns/docbook">
diff --git a/src/main/resources/resource/layout/docbook5.book.layout b/src/main/resources/resource/layout/docbook5.book.layout
new file mode 100644
index 00000000000..de92664abfa
--- /dev/null
+++ b/src/main/resources/resource/layout/docbook5.book.layout
@@ -0,0 +1,40 @@
+<biblioentry xreflabel="\format[Authors(3,LastName,EtAl= et al.)]{\author} (\year)" xml:id="\bibtexkey">
+   <authorgroup>
+<!--AUTHORS-->
+\begin{author}       \format[CreateDocBook5Authors]{\author} \end{author}
+<!--EDITORS-->
+\begin{editor}       \format[CreateDocBook5Editors]{\editor} \end{editor}
+   </authorgroup>
+   <!--TITLE-->
+    \begin{title}       <citetitle pubwork="book">\format[XMLChars,RemoveLatexCommands]{\title}</citetitle> \end{title}
+    
+<!--BOOK booktitle, edition, (pages), publisher-->
+    <biblioset relation="book">\n
+        \begin{booktitle}<booktitle>\format[XMLChars,RemoveLatexCommands]{\booktitle}</booktitle>\end{booktitle}
+		\begin{edition}<edition>\format[XMLChars,RemoveLatexCommands]{\edition}</edition>\end{edition}
+        \begin{year}<pubdate>\year</pubdate>\end{year}
+        \begin{pages}<artpagenums>\format[FormatPagesForXML]{\pages}</artpagenums> \end{pages}
+        \begin{publisher}<publisher>\end{publisher}
+		<publishername>\publisher</publishername>
+        <address>\address</address>
+        \begin{publisher}</publisher>\end{publisher}
+	</biblioset>
+    
+    
+<!-- IDENTIFIERS-->
+    \begin{url}
+        <bibliomisc><link xlink:href="\format[XMLChars]{\url}">\format[XMLChars]{\url}</link></bibliomisc>
+    \end{url}
+    \begin{doi}
+        <biblioid class="doi">\format[XMLChars]{\doi}</biblioid>
+    \end{doi}
+    \begin{isbn}
+        <biblioid class="isbn">\format[XMLChars]{\isbn}</biblioid>
+    \end{isbn}
+<!--ABSTRACT-->
+    \begin{abstract}
+        <abstract>
+            <para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para>
+        </abstract>
+    \end{abstract}
+</biblioentry>
\ No newline at end of file
diff --git a/src/main/resources/resource/layout/docbook5.booklet.layout b/src/main/resources/resource/layout/docbook5.booklet.layout
new file mode 100644
index 00000000000..d3e0eadc65d
--- /dev/null
+++ b/src/main/resources/resource/layout/docbook5.booklet.layout
@@ -0,0 +1,26 @@
+<biblioentry xreflabel="\format[Authors(3,LastName,EtAl= et al.)]{\author} (\year)" xml:id="\bibtexkey">
+   <authorgroup>
+<!--AUTHORS-->
+\begin{author}\format[CreateDocBook5Authors]{\author}\end{author}
+<!--EDITORS-->
+\begin{editor}\format[CreateDocBook5Editors]{\editor}\end{editor}
+   </authorgroup>
+   <!--TITLE-->
+    \begin{title}<citetitle pubwork="book">\format[XMLChars,RemoveLatexCommands]{\title}</citetitle> \end{title}
+<!--Booklet booktitle, year, howpublished, publisher -->
+     <biblioset relation="book">\n
+     \begin{booktitle}<title>\format[XMLChars,RemoveLatexCommands]{\booktitle}</title>\end{booktitle}
+        \begin{year}<pubdate>\year</pubdate>\end{year}
+        \begin{howpublished}<bibliomisc role="howpublished">\howpublished</bibliomisc>\end{howpublished}
+        \begin{publisher}<publisher>\end{publisher}
+        \begin{publisher}<publishername>\format[XMLChars]{\publisher}</publishername> \end{publisher}
+        \begin{location}\begin{address}<address>\location</address>\end{address}\end{location}
+        \begin{publisher}</publisher>\end{publisher}
+    </biblioset>
+<!-- IDENTIFIERS-->
+    \begin{url}<bibliomisc><link xlink:href="\format[XMLChars]{\url}">\format[XMLChars]{\url}</link></bibliomisc>\end{url}
+    \begin{doi}<biblioid class="doi">\format[XMLChars]{\doi}</biblioid>\end{doi}
+    \begin{isbn}<biblioid class="isbn">\format[XMLChars]{\isbn}</biblioid>\end{isbn}
+<!--ABSTRACT-->
+    \begin{abstract}<abstract><para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para></abstract>\end{abstract}
+</biblioentry>
diff --git a/src/main/resources/resource/layout/docbook5.collection.layout b/src/main/resources/resource/layout/docbook5.collection.layout
new file mode 100644
index 00000000000..f3846b1a40b
--- /dev/null
+++ b/src/main/resources/resource/layout/docbook5.collection.layout
@@ -0,0 +1,30 @@
+<biblioentry xreflabel="\format[Authors(3,LastName,EtAl= et al.)]{\editor} (\year)" xml:id="\bibtexkey">
+   <authorgroup>
+<!--EDITORS-->
+\begin{editor}\format[CreateDocBook5Editors]{\editor}\end{editor}
+   </authorgroup>
+   <!--TITLE-->
+    \begin{title}<citetitle pubwork="book">\format[XMLChars,RemoveLatexCommands]{\title}</citetitle> \end{title}
+<!--Collection booktitle, edition, series, (pages), publisher-->
+    <biblioset relation="book">\n
+        \begin{booktitle}<title>\format[XMLChars,RemoveLatexCommands]{\booktitle}</title>\end{booktitle}
+        \begin{edition}<edition>\format[XMLChars,RemoveLatexCommands]{\edition}</edition>\end{edition}
+        \begin{year}<pubdate>\year</pubdate>\end{year}
+        \begin{volume}<volumenum>\volume</volumenum> \end{volume}
+        \begin{chapter}<bibliomisc role="secnum">\chapter</bibliomisc> \end{chapter}
+        \begin{pages}<artpagenums>\format[FormatPagesForXML]{\pages}</artpagenums> \end{pages}
+        \begin{publisher}<publisher>\end{publisher}
+        \begin{publisher}<publishername>\format[XMLChars]{\publisher}</publishername> \end{publisher}
+        \begin{location}\begin{address}<address>\location</address>\end{address}\end{location}
+        \begin{publisher}</publisher>\end{publisher}
+    </biblioset>
+    \begin{series}<bibliomisc role="seriestitle">\format[XMLChars,RemoveLatexCommands]{\series}</bibliomisc>\end{series}
+    \begin{series}\begin{editora}<bibliomisc role="serieseditor">\format[XMLChars,RemoveLatexCommands]{\editora}</bibliomisc>\end{editora}\end{series}
+
+<!-- IDENTIFIERS-->
+    \begin{url}<bibliomisc><link xlink:href="\format[XMLChars]{\url}">\format[XMLChars]{\url}</link></bibliomisc>\end{url}
+    \begin{doi}<biblioid class="doi">\format[XMLChars]{\doi}</biblioid>\end{doi}
+    \begin{isbn}<biblioid class="isbn">\format[XMLChars]{\isbn}</biblioid>\end{isbn}
+<!--ABSTRACT-->
+    \begin{abstract}<abstract><para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para></abstract>\end{abstract}
+</biblioentry>
diff --git a/src/main/resources/resource/layout/docbook5.end.layout b/src/main/resources/resource/layout/docbook5.end.layout
new file mode 100644
index 00000000000..0ef7a6a17b2
--- /dev/null
+++ b/src/main/resources/resource/layout/docbook5.end.layout
@@ -0,0 +1 @@
+</bibliography>
\ No newline at end of file
diff --git a/src/main/resources/resource/layout/docbook5.inbook.layout b/src/main/resources/resource/layout/docbook5.inbook.layout
new file mode 100644
index 00000000000..fef76871a2f
--- /dev/null
+++ b/src/main/resources/resource/layout/docbook5.inbook.layout
@@ -0,0 +1,30 @@
+<biblioentry xreflabel="\format[Authors(3,LastName,EtAl= et al.)]{\author} (\year)" xml:id="\bibtexkey">
+   <authorgroup>
+<!--AUTHORS-->
+\begin{author}\format[CreateDocBook5Authors]{\author}\end{author}
+<!--EDITORS-->
+\begin{editor}\format[CreateDocBook5Editors]{\editor}\end{editor}
+   </authorgroup>
+   <!--TITLE-->
+    \begin{title}<citetitle pubwork="book">\format[XMLChars,RemoveLatexCommands]{\title}</citetitle> \end{title}
+<!--InBook booktitle, edition, series, (pages), publisher-->
+    <biblioset relation="book">\n
+        \begin{booktitle}<title>\format[XMLChars,RemoveLatexCommands]{\booktitle}</title>\end{booktitle}
+        \begin{edition}<edition>\format[XMLChars,RemoveLatexCommands]{\edition}</edition>\end{edition}
+        \begin{year}<pubdate>\year</pubdate>\end{year}
+        \begin{series}<bibliomisc role="seriestitle">\format[XMLChars,RemoveLatexCommands]{\series}</bibliomisc>\end{series}
+        \begin{volume}<volumenum>\volume</volumenum> \end{volume}
+        \begin{chapter}<bibliomisc role="secnum">\chapter</bibliomisc> \end{chapter}
+        \begin{pages}<artpagenums>\format[FormatPagesForXML]{\pages}</artpagenums> \end{pages}
+        \begin{publisher}<publisher>\end{publisher}
+        \begin{publisher}<publishername>\format[XMLChars]{\publisher}</publishername> \end{publisher}
+        \begin{location}\begin{address}<address>{\location}</address>\end{address}\end{location}
+        \begin{publisher}</publisher>\end{publisher}
+    </biblioset>
+<!-- IDENTIFIERS-->
+    \begin{url}<bibliomisc><link xlink:href="\format[XMLChars]{\url}">\format[XMLChars]{\url}</link></bibliomisc>\end{url}
+    \begin{doi}<biblioid class="doi">\format[XMLChars]{\doi}</biblioid>\end{doi}
+    \begin{isbn}<biblioid class="isbn">\format[XMLChars]{\isbn}</biblioid>\end{isbn}
+<!--ABSTRACT-->
+    \begin{abstract}<abstract><para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para></abstract>\end{abstract}
+</biblioentry>
diff --git a/src/main/resources/resource/layout/docbook5.incollection.layout b/src/main/resources/resource/layout/docbook5.incollection.layout
new file mode 100644
index 00000000000..e14ed2fdb83
--- /dev/null
+++ b/src/main/resources/resource/layout/docbook5.incollection.layout
@@ -0,0 +1,30 @@
+<biblioentry xreflabel="\format[Authors(3,LastName,EtAl= et al.)]{\author} (\year)" xml:id="\bibtexkey">
+   <authorgroup>
+<!--AUTHORS-->
+\begin{author}\format[CreateDocBook5Authors]{\author}\end{author}
+<!--EDITORS-->
+\begin{editor}\format[CreateDocBook5Editors]{\editor}\end{editor}
+   </authorgroup>
+   <!--TITLE-->
+    \begin{title}<citetitle pubwork="book">\format[XMLChars,RemoveLatexCommands]{\title}</citetitle> \end{title}
+<!--INCOLLECTION booktitle, edition, year, series, volume, chapter, (pages), publisher -->
+     <biblioset relation="book">\n
+     \begin{booktitle}<title>\format[XMLChars,RemoveLatexCommands]{\booktitle}</title>\end{booktitle}
+        \begin{edition}<edition>\format[XMLChars,RemoveLatexCommands]{\edition}</edition>\end{edition}
+        \begin{year}<pubdate>\year</pubdate>\end{year}
+        \begin{series}<series>\format[XMLChars,RemoveLatexCommands]{\series}</series>\end{series}
+        \begin{volume}<volumenum>\volume</volumenum> \end{volume}
+        \begin{chapter}<bibliomisc role="secnum">\chapter</bibliomisc> \end{chapter}
+        \begin{pages}<artpagenums>\format[FormatPagesForXML]{\pages}</artpagenums> \end{pages}
+        \begin{publisher}<publisher>\end{publisher}
+        \begin{publisher}<publishername>\format[XMLChars]{\publisher}</publishername> \end{publisher}
+        \begin{location}\begin{address}<address>\location</address>\end{address}\end{location}
+        \begin{publisher}</publisher>\end{publisher}
+    </biblioset>
+<!-- IDENTIFIERS-->
+    \begin{url}<bibliomisc><link xlink:href="\format[XMLChars]{\url}">\format[XMLChars]{\url}</link></bibliomisc>\end{url}
+    \begin{doi}<biblioid class="doi">\format[XMLChars]{\doi}</biblioid>\end{doi}
+    \begin{isbn}<biblioid class="isbn">\format[XMLChars]{\isbn}</biblioid>\end{isbn}
+<!--ABSTRACT-->
+    \begin{abstract}<abstract><para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para></abstract>\end{abstract}
+</biblioentry>
diff --git a/src/main/resources/resource/layout/docbook5.layout b/src/main/resources/resource/layout/docbook5.layout
new file mode 100644
index 00000000000..b5e4c7b3770
--- /dev/null
+++ b/src/main/resources/resource/layout/docbook5.layout
@@ -0,0 +1,27 @@
+<!--Default fallback for unkown entry types -->
+<biblioentry xreflabel="\format[Authors(3,LastName,EtAl= et al.)]{\author} (\year)" xml:id="\bibtexkey">
+   <authorgroup>
+<!--AUTHORS-->
+\begin{author}       \format[CreateDocBook5Authors]{\author} \end{author}
+<!--EDITORS-->
+\begin{editor}       \format[CreateDocBook5Editors]{\editor} \end{editor}
+   </authorgroup>
+<!--TITLE-->
+    \begin{title}   <citetitle  pubwork="\format[ToLowerCase]{\entrytype}">\format[XMLChars,RemoveLatexCommands]{\title}</citetitle> \end{title}
+<!-- IDENTIFIERS-->
+    \begin{url}
+        <bibliomisc><link xlink:href="\format[XMLChars]{\url}">\format[XMLChars]{\url}</link></bibliomisc>
+    \end{url}
+    \begin{doi}  
+        <biblioid class="doi">\format[XMLChars]{\doi}</biblioid>
+    \end{doi}
+    \begin{isbn}
+        <biblioid class="isbn">\format[XMLChars]{\isbn}</biblioid>
+    \end{isbn}
+<!--ABSTRACT-->
+    \begin{abstract}   
+        <abstract>
+            <para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para>
+        </abstract>
+    \end{abstract}
+</biblioentry>
diff --git a/src/main/resources/resource/layout/docbook5.phdthesis.layout b/src/main/resources/resource/layout/docbook5.phdthesis.layout
new file mode 100644
index 00000000000..e64ad00ced4
--- /dev/null
+++ b/src/main/resources/resource/layout/docbook5.phdthesis.layout
@@ -0,0 +1,30 @@
+<biblioentry xreflabel="\format[Authors(3,LastName,EtAl= et al.)]{\author} (\year)" xml:id="\bibtexkey">
+   <authorgroup>
+<!--AUTHORS-->
+		\begin{author}\format[CreateDocBook5Authors]{\author} \end{author}
+   </authorgroup>
+<!--TITLE-->
+    \begin{title}<citetitle pubwork="\format[ToLowerCase]{\entrytype}">\format[XMLChars,RemoveLatexCommands]{\title}</citetitle> \end{title}
+    
+<!--MASTERTHESIS -->
+    <biblioset relation="phdthesis">\n
+		\begin{institution}<publisher><publishername>\format[XMLChars]{\institution}</publishername></publisher>\end{institution}
+		\begin{year}<pubdate>\year</pubdate>\end{year}
+	</biblioset>
+<!-- IDENTIFIERS-->
+    \begin{url}
+ <bibliomisc><link xlink:href="\format[XMLChars]{\url}">\format[XMLChars]{\url}</link></bibliomisc>
+    \end{url}
+    \begin{doi}
+ <biblioid class="doi">\format[XMLChars]{\doi}</biblioid>
+    \end{doi}
+    \begin{isbn}
+ <biblioid class="isbn">\format[XMLChars]{\isbn}</biblioid>
+    \end{isbn}
+<!--ABSTRACT-->
+    \begin{abstract}
+ <abstract>
+     <para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para>
+ </abstract>
+    \end{abstract}
+</biblioentry>
diff --git a/src/main/resources/resource/layout/docbook5.www.layout b/src/main/resources/resource/layout/docbook5.www.layout
new file mode 100644
index 00000000000..a3032e88efa
--- /dev/null
+++ b/src/main/resources/resource/layout/docbook5.www.layout
@@ -0,0 +1,23 @@
+<biblioentry xreflabel="\format[Authors(3,LastName,EtAl= et al.)]{\author} (\year)" xml:id="\bibtexkey">
+   <authorgroup>
+<!--AUTHORS-->
+\begin{author}\format[CreateDocBook5Authors]{\author} \end{author}
+<!--EDITORS-->
+\begin{editor}\format[CreateDocBook5Editors]{\editor} \end{editor}
+   </authorgroup>
+<!--WWW author, year, title, editor, url, orgnisation, publisher-->
+    <biblioset relation="webpage">\n
+    \begin{title}<citetitle pubwork="webpage">\format[XMLChars,RemoveLatexCommands]{\title}</citetitle> \end{title}
+    \begin{year}<pubdate>\year</pubdate>\end{year}
+    </biblioset>
+    <!-- IDENTIFIERS-->
+    \begin{url}
+    <bibliomisc><link xlink:href="\format[XMLChars]{\url}">\format[XMLChars]{\url}</link></bibliomisc>
+    \end{url}
+<!--ABSTRACT-->
+    \begin{abstract}   
+    <abstract>
+      <para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para>
+    </abstract>
+    \end{abstract}
+</biblioentry>
diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
new file mode 100644
index 00000000000..948d47facf7
--- /dev/null
+++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -0,0 +1,85 @@
+package org.jabref.logic.exporter;
+
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jabref.logic.layout.LayoutFormatterPreferences;
+import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
+import org.jabref.model.entry.FieldName;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.TempDirectory;
+import org.mockito.Answers;
+import org.xmlunit.builder.Input;
+import org.xmlunit.builder.Input.Builder;
+import org.xmlunit.diff.DefaultNodeMatcher;
+import org.xmlunit.diff.ElementSelectors;
+import org.xmlunit.matchers.CompareMatcher;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+
+@ExtendWith(TempDirectory.class)
+public class DocBook5ExporterTest {
+
+    public BibDatabaseContext databaseContext;
+    public Charset charset;
+    public List<BibEntry> entries;
+
+    private Path xmlFile;
+    private Exporter exportFormat;
+
+    @BeforeEach
+    public void setUp() throws URISyntaxException {
+        xmlFile = Paths.get(DocBook5ExporterTest.class.getResource("Docbook5ExportFormat.xml").toURI());
+
+        Map<String, TemplateExporter> customFormats = new HashMap<>();
+        LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        SavePreferences savePreferences = mock(SavePreferences.class);
+        XmpPreferences xmpPreferences = mock(XmpPreferences.class);
+        ExporterFactory exporterFactory = ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences);
+
+        exportFormat = exporterFactory.getExporterByName("docbook5").get();
+
+        LocalDate myDate = LocalDate.of(2018, 1, 1);
+
+        databaseContext = new BibDatabaseContext();
+        charset = StandardCharsets.UTF_8;
+        BibEntry entry = new BibEntry(BibtexEntryTypes.BOOK);
+        entry.setField(FieldName.TITLE, "my paper title");
+        entry.setField(FieldName.AUTHOR, "Stefan Kolb and Tobias Diez");
+        entry.setField(FieldName.ISBN, "1-2-34");
+        entry.setCiteKey("mykey");
+        entry.setDate(new org.jabref.model.entry.Date(myDate));
+        entries = Arrays.asList(entry);
+    }
+
+    @Test
+    public void testPerformExportForSingleEntry(@TempDirectory.TempDir Path testFolder) throws Exception {
+
+        Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
+
+        exportFormat.export(databaseContext, path, charset, entries);
+
+        Builder control = Input.from(Files.newInputStream(xmlFile));
+        Builder test = Input.from(Files.newInputStream(path));
+
+        assertThat(test, CompareMatcher.isSimilarTo(control)
+                                       .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
+    }
+
+}
diff --git a/src/test/resources/org/jabref/logic/exporter/Docbook5ExportFormat.xml b/src/test/resources/org/jabref/logic/exporter/Docbook5ExportFormat.xml
new file mode 100644
index 00000000000..ddb29f48635
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/exporter/Docbook5ExportFormat.xml
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?xml-model href="http://docbook.org/xml/5.1/rng/docbook.rng" schematypens="http://relaxng.org/ns/structure/1.0"?>
+<?xml-model href="http://docbook.org/xml/5.1/sch/docbook.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<bibliography version="5.1" xml:lang="en"
+    xmlns="http://docbook.org/ns/docbook"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:ns="http://docbook.org/ns/docbook">
+<biblioentry xreflabel="Kolb and Diez (2018)" xml:id="mykey">
+   <authorgroup>
+<!--AUTHORS-->
+       <author><personname><firstname>Stefan</firstname><surname>Kolb</surname></personname></author>
+       <author><personname><firstname>Tobias</firstname><surname>Diez</surname></personname></author> 
+<!--EDITORS-->
+
+   </authorgroup>
+   <!--TITLE-->
+           <citetitle pubwork="book">my paper title</citetitle> 
+    
+<!--BOOK booktitle, edition, (pages), publisher-->
+    <biblioset relation="book">
+        
+		
+        <pubdate>2018</pubdate>
+        
+        
+		<publishername></publishername>
+        <address></address>
+        
+	</biblioset>
+    
+    
+<!-- IDENTIFIERS-->
+    
+    
+    
+        <biblioid class="isbn">1&#45;2&#45;34</biblioid>
+    
+<!--ABSTRACT-->
+    
+</biblioentry></bibliography>
\ No newline at end of file

From df7aa34fe7309d8b70990d291a9307e3ade8a696 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Nov 2018 07:26:54 +0100
Subject: [PATCH 178/229] Bump junit-platform-launcher from 1.3.1 to 1.3.2
 (#4515)

Bumps [junit-platform-launcher](https://github.com/junit-team/junit5) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6913fab8cc0..0e12af5d982 100644
--- a/build.gradle
+++ b/build.gradle
@@ -164,7 +164,7 @@ dependencies {
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1'
-    testCompile 'org.junit.platform:junit-platform-launcher:1.3.1'
+    testCompile 'org.junit.platform:junit-platform-launcher:1.3.2'
     testCompile 'org.junit-pioneer:junit-pioneer:0.3.0'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'

From 72adcdd9569057d015340c45b9ddf954e352abd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Nov 2018 07:27:04 +0100
Subject: [PATCH 179/229] Bump junit-jupiter-api from 5.3.1 to 5.3.2 (#4510)

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.3.1 to 5.3.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.3.1...r5.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0e12af5d982..70405f0931d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -160,7 +160,7 @@ dependencies {
     compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.2.1'
     compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.1'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1'

From 4048cb3aa4fe3fc8483e3a07e182143a3b537c89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Nov 2018 07:28:31 +0100
Subject: [PATCH 180/229] Bump richtextfx from 0.9.1 to 0.9.2 (#4512)

Bumps [richtextfx](https://github.com/FXMisc/RichTextFX) from 0.9.1 to 0.9.2.
- [Release notes](https://github.com/FXMisc/RichTextFX/releases)
- [Changelog](https://github.com/FXMisc/RichTextFX/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FXMisc/RichTextFX/compare/v0.9.1...v0.9.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 70405f0931d..16454f8b502 100644
--- a/build.gradle
+++ b/build.gradle
@@ -133,7 +133,7 @@ dependencies {
     compile 'de.saxsys:mvvmfx:1.7.0'
     compile 'org.fxmisc.easybind:easybind:1.0.3'
     compile 'org.fxmisc.flowless:flowless:0.6.1'
-    compile 'org.fxmisc.richtext:richtextfx:0.9.1'
+    compile 'org.fxmisc.richtext:richtextfx:0.9.2'
     compile 'com.sibvisions.external.jvxfx:dndtabpane:0.1'
     compile 'javax.inject:javax.inject:1'
     compile 'com.jfoenix:jfoenix:8.0.7'

From 3feaf7bd8e8d045293f34e0057b101bf4b55720e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Nov 2018 07:29:16 +0100
Subject: [PATCH 181/229] Bump junit-jupiter-engine from 5.3.1 to 5.3.2 (#4513)

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.3.1 to 5.3.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.3.1...r5.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 16454f8b502..e0ca3da86d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -162,7 +162,7 @@ dependencies {
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1'
     testCompile 'org.junit.platform:junit-platform-launcher:1.3.2'
     testCompile 'org.junit-pioneer:junit-pioneer:0.3.0'

From 0cb4907f77e06d992d332203322ba3bf4ad38bc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Nov 2018 07:30:41 +0100
Subject: [PATCH 182/229] Bump junit-vintage-engine from 5.3.1 to 5.3.2 (#4511)

Bumps [junit-vintage-engine](https://github.com/junit-team/junit5) from 5.3.1 to 5.3.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.3.1...r5.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index e0ca3da86d2..2da6e7d1afd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -161,10 +161,11 @@ dependencies {
     compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.1'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
-    testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1'
+    testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
-    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.2'
     testCompile 'org.junit.platform:junit-platform-launcher:1.3.2'
+
     testCompile 'org.junit-pioneer:junit-pioneer:0.3.0'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'

From 89d4d745ca73543b22e0ac9347b243f1fa0b7a23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Nov 2018 07:31:48 +0100
Subject: [PATCH 183/229] Bump junit-jupiter-params from 5.3.1 to 5.3.2 (#4514)

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.3.1 to 5.3.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.3.1...r5.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>

From 37be33450b56d72750e1e9957ccc19b5efb696c6 Mon Sep 17 00:00:00 2001
From: Ali <alijakparov.kz@gmail.com>
Date: Thu, 29 Nov 2018 13:35:50 +0600
Subject: [PATCH 184/229] Create test (#4518)

* refactor and create test for SaveAllAction

* refactor code

* refactor code SaveAllAction

* change test name

* use Paths.get instead of new File
---
 .../jabref/gui/exporter/SaveAllAction.java    | 19 +++--
 .../gui/exporter/SaveAllActionTest.java       | 77 +++++++++++++++++++
 2 files changed, 89 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/org/jabref/gui/exporter/SaveAllActionTest.java

diff --git a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
index 7a58e2895b4..4ac5618f991 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.exporter;
 
 import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.actions.Actions;
 import org.jabref.gui.actions.SimpleCommand;
@@ -9,23 +10,27 @@
 public class SaveAllAction extends SimpleCommand {
 
     private final JabRefFrame frame;
+    private final DialogService dialogService;
 
     public SaveAllAction(JabRefFrame frame) {
         this.frame = frame;
+        this.dialogService = frame.getDialogService();
     }
 
     @Override
     public void execute() {
-        frame.output(Localization.lang("Saving all libraries..."));
+        dialogService.notify(Localization.lang("Saving all libraries..."));
+
         for (BasePanel panel : frame.getBasePanelList()) {
             if (!panel.getBibDatabaseContext().getDatabasePath().isPresent()) {
-                frame.showBasePanel(panel);
-
-                // TODO: Ask for path
+                //It will ask a path before saving.
+                panel.runCommand(Actions.SAVE_AS);
+            } else {
+                panel.runCommand(Actions.SAVE);
+                // TODO: can we find out whether the save was actually done or not?
             }
-            panel.runCommand(Actions.SAVE);
-            // TODO: can we find out whether the save was actually done or not?
         }
-        frame.output(Localization.lang("Save all finished."));
+
+        dialogService.notify(Localization.lang("Save all finished."));
     }
 }
diff --git a/src/test/java/org/jabref/gui/exporter/SaveAllActionTest.java b/src/test/java/org/jabref/gui/exporter/SaveAllActionTest.java
new file mode 100644
index 00000000000..1233d14a72f
--- /dev/null
+++ b/src/test/java/org/jabref/gui/exporter/SaveAllActionTest.java
@@ -0,0 +1,77 @@
+package org.jabref.gui.exporter;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Optional;
+
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.actions.Actions;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class SaveAllActionTest {
+
+    private BasePanel firstPanel = mock(BasePanel.class);
+    private BasePanel secondPanel = mock(BasePanel.class);
+    private JabRefFrame jabRefFrame = mock(JabRefFrame.class);
+    private DialogService dialogService = mock(DialogService.class);
+    private BibDatabaseContext bibDatabaseContext = mock(BibDatabaseContext.class);
+    private Optional<Path> databasePath = Optional.of(Paths.get("C:\\Users\\John_Doe\\Jabref"));
+    private SaveAllAction saveAllAction;
+
+    @Before
+    public void setUp() {
+        when(firstPanel.getBibDatabaseContext()).thenReturn(bibDatabaseContext);
+        when(secondPanel.getBibDatabaseContext()).thenReturn(bibDatabaseContext);
+        when(bibDatabaseContext.getDatabasePath()).thenReturn(databasePath);
+
+        when(jabRefFrame.getBasePanelList()).thenReturn(Arrays.asList(firstPanel, secondPanel));
+        when(jabRefFrame.getDialogService()).thenReturn(dialogService);
+
+        saveAllAction = new SaveAllAction(jabRefFrame);
+    }
+
+    @Test
+    public void executeShouldRunSaveCommandInEveryPanel() {
+        doNothing().when(dialogService).notify(anyString());
+
+        saveAllAction.execute();
+
+        verify(firstPanel, times(1)).runCommand(Actions.SAVE);
+        verify(secondPanel, times(1)).runCommand(Actions.SAVE);
+    }
+
+    @Test
+    public void executeShouldNotifyAboutSavingProcess() {
+        when(bibDatabaseContext.getDatabasePath()).thenReturn(databasePath);
+
+        saveAllAction.execute();
+
+        verify(dialogService, times(1)).notify(Localization.lang("Saving all libraries..."));
+        verify(dialogService, times(1)).notify(Localization.lang("Save all finished."));
+    }
+
+    @Test
+    public void executeShouldShowSaveAsWindowIfDatabaseNotSelected() {
+        when(bibDatabaseContext.getDatabasePath()).thenReturn(Optional.empty());
+        doNothing().when(dialogService).notify(anyString());
+
+        saveAllAction.execute();
+
+        verify(firstPanel, times(1)).runCommand(Actions.SAVE_AS);
+        verify(secondPanel, times(1)).runCommand(Actions.SAVE_AS);
+    }
+}

From 65a1a03b93a5d9c7d27018adfae431a1d5988d3f Mon Sep 17 00:00:00 2001
From: Dominik Schrempf <dominik.schrempf@gmail.com>
Date: Fri, 30 Nov 2018 21:40:43 +0100
Subject: [PATCH 185/229] Correct PNAS abbrev. (#4524)

* Correct PNAS abbrev.

* Use long name, PNAS seems non-standard.
---
 src/main/resources/journals/journalList.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/journals/journalList.txt b/src/main/resources/journals/journalList.txt
index cdb5e36ab78..167a87d8290 100644
--- a/src/main/resources/journals/journalList.txt
+++ b/src/main/resources/journals/journalList.txt
@@ -12215,7 +12215,7 @@ Proceedings of the Koninklijke Nederlandse Akademie Van Wetenschappen. Series C:
 Proceedings of the Latvian Academy of Sciences, Section B: Natural, Exact and Applied Sciences = Proc. Latv. Acad. Sci. Sect. B
 Proceedings of the Mine Medical Officers Association = Proc. Mine Med. Off. Assoc.
 Proceedings of the Mine Medical Officers Association of SA = Proc. Mine Med. Off. Assoc. SA
-Proceedings of the National academy of Sciences of the United States of America = Proc. Natl. Acad. Sci. U.S.A.
+Proceedings of the National Academy of Sciences of the United States of America = Proc. Natl. Acad. Sci. U.S.A.
 Proceedings of the National Cancer Conference = Proc. Natl. Cancer Conf.
 Proceedings of the National Science Council, Republic of China. Part B, Life Sciences = Proc. Natl. Sci. Counc. Repub. China B
 Proceedings of the Nutrition Society = Proc. Nutr. Soc.

From c94398f4e93be1fd78ce864445175ad6d98f9453 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Dec 2018 13:29:33 +0100
Subject: [PATCH 186/229] Bump checkstyle from 8.14 to 8.15 (#4528)

Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.14 to 8.15.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.14...checkstyle-8.15)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2da6e7d1afd..ef08e415386 100644
--- a/build.gradle
+++ b/build.gradle
@@ -180,7 +180,7 @@ dependencies {
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:8.14'
+    checkstyle 'com.puppycrawl.tools:checkstyle:8.15'
 }
 
 jacoco {

From 55c41c777d57e8861cadfb77324c41d391eeca80 Mon Sep 17 00:00:00 2001
From: Morgan Lovato <33430757+morganlovato@users.noreply.github.com>
Date: Thu, 6 Dec 2018 12:53:20 -0700
Subject: [PATCH 187/229] Fixes #4437 (#4531)

Changed the sizes of buttons "Update to current column widths" and "Update to current column order"

There is still more to fix in this issue:
The Field name is not editable
The value in Field name is not identical with table header
---
 src/main/java/org/jabref/gui/preferences/TableColumnsTab.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
index 40ae74463ed..a441ec74992 100644
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
@@ -314,10 +314,10 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
         builder.add(tabPanel, 1, 5);
 
         Button buttonWidth = new Button("Update to current column widths");
-        buttonWidth.setPrefSize(200, 30);
+        buttonWidth.setPrefSize(300, 30);
         buttonWidth.setOnAction(e->new UpdateWidthsAction());
         Button buttonOrder = new Button("Update to current column order");
-        buttonOrder.setPrefSize(200, 30);
+        buttonOrder.setPrefSize(300, 30);
         buttonOrder.setOnAction(e->new UpdateOrderAction());
         builder.add(buttonWidth, 1, 6);
         builder.add(buttonOrder, 1, 7);

From 41f2d613e72adb2abf6fb553a0a06372258e8d1d Mon Sep 17 00:00:00 2001
From: Abraham Polk <abepolk@gmail.com>
Date: Sun, 9 Dec 2018 03:49:51 -0500
Subject: [PATCH 188/229] [WIP] Convert Exporter Customization Dialog to javafx
 (#4394)

* Exporter to JavaFX commit 1

* Work on Export Customization Dialog VM

* Work on VM

* Combine methods in CustomExporterList and move to preferences

* work on VM

* Add methods to VM

* Fix typos

* started work on exporter subdialog

* Continue work on exporter subdialog

* Implement save exporter from add/modify exporter dialog

* Add two comments

* More work on VMs and prefs

* Fix browse method in export customization subdialog

* Remove int reference in VM

* Create FXML for main exporter customization dialog

* Work on View, not complete

* Work on using EasyBind

* fix some binding issues add stubs

* More work on Export Customization Dialog

* FXML changes among other things

* Work on View for subdialog

* Changes to View and logic

* Deal with stubs, convert some EVMs to Optionals

* Change Optional in subdialog

* Add FXML and View

* Remove typos and syntax error

* Move various code to logic

* Fix modify exporter

* Fix remove and close bugs

* Fix customExports references

* Fix get custom prefs

* Remove prefs.customExports object from JabRef

* Small FXML changes

* Remove unused old Swing dialogs

* Fix indentation

* Make clear comments and Javadoc

* Remove CustomExportList

* Use new TemplateExporter constructor

* Fix spacing and a var name

* Add constant vars to prefs

* Remove comments

* Change log message

* Fix tests

* Add spacing between imports

* Update localization

* Replace Optional parameter with null

* Replace Optional return with null

* Remove AnchorPane

* Localize FXML labels

* Add subdialog injections

* Set browse action in FXML

* Add to l10n

* Add cancel button to subdialog

* Correction to VM try-catch

* Inline setTextFields

* Remove SortedList TODO

* Inline closeDialog

* loadExporters to private

* forEach to Stream and other fixes

* inline init

* Fixes to ExporterViewModel

* Remove Optional

* Add constants to TemplateExporter

* Simplify getExtensions without dot

* Change try-catch to empty list check

* Remove unnecessary method

* Fix property getters

* Fix property getters again

* Fix typo

* Update references to customFormats

* Add import

* Travis CI fixes

* Further Travis CI fixes

* Remove extra comments

* Remove extra newlines
---
 .../org/jabref/cli/ArgumentProcessor.java     |   4 +-
 src/main/java/org/jabref/gui/JabRefFrame.java |   5 +-
 .../actions/ManageCustomExportsAction.java    |  12 +-
 .../exporter/CreateModifyExporterDialog.fxml  |  52 +++++
 .../CreateModifyExporterDialogView.java       |  67 ++++++
 .../CreateModifyExporterDialogViewModel.java  | 107 +++++++++
 .../gui/exporter/CustomExportDialog.java      | 205 ------------------
 .../jabref/gui/exporter/ExportCommand.java    |   3 +-
 .../exporter/ExportCustomizationDialog.fxml   |  29 +++
 .../exporter/ExportCustomizationDialog.java   | 175 ---------------
 .../ExportCustomizationDialogView.java        |  77 +++++++
 .../ExportCustomizationDialogViewModel.java   |  81 +++++++
 .../gui/exporter/ExporterViewModel.java       |  47 ++++
 .../gui/preferences/PreferencesDialog.java    |   4 +-
 .../logic/exporter/ExporterFactory.java       |   5 +-
 .../logic/exporter/TemplateExporter.java      |  44 +++-
 .../jabref/logic/util/StandardFileType.java   |   5 +
 .../jabref/preferences/CustomExportList.java  | 142 ------------
 .../jabref/preferences/JabRefPreferences.java |  73 ++++++-
 .../preferences/PreferencesService.java       |  15 ++
 src/main/resources/l10n/JabRef_en.properties  |  16 +-
 .../logic/exporter/CsvExportFormatTest.java   |   5 +-
 .../logic/exporter/DocBook5ExporterTest.java  |   5 +-
 .../jabref/logic/exporter/ExporterTest.java   |   4 +-
 .../logic/exporter/HtmlExportFormatTest.java  |   5 +-
 .../logic/exporter/XmpExporterTest.java       |   5 +-
 26 files changed, 610 insertions(+), 582 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
 delete mode 100644 src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
 create mode 100644 src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.fxml
 delete mode 100644 src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java
 create mode 100644 src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java
 create mode 100644 src/main/java/org/jabref/gui/exporter/ExporterViewModel.java
 delete mode 100644 src/main/java/org/jabref/preferences/CustomExportList.java

diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index a487e1cb348..f97a582daab 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -8,7 +8,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Optional;
 import java.util.prefs.BackingStoreException;
 
@@ -459,8 +458,7 @@ private void importPreferences() {
             Globals.prefs.importPreferences(cli.getPreferencesImport());
             EntryTypes.loadCustomEntryTypes(Globals.prefs.loadCustomEntryTypes(BibDatabaseMode.BIBTEX),
                     Globals.prefs.loadCustomEntryTypes(BibDatabaseMode.BIBLATEX));
-            Map<String, TemplateExporter> customExporters = Globals.prefs.customExports.getCustomExportFormats(Globals.prefs,
-                    Globals.journalAbbreviationLoader);
+            List<TemplateExporter> customExporters = Globals.prefs.getCustomExportFormats(Globals.journalAbbreviationLoader);
             LayoutFormatterPreferences layoutPreferences = Globals.prefs
                     .getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
             SavePreferences savePreferences = Globals.prefs.loadForExportFromPreferences();
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index e6ef5d3128f..bc3a4e8a722 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -454,9 +454,6 @@ private void tearDownJabRef(List<String> filenames) {
         }
 
         fileHistory.storeHistory();
-        prefs.customExports.store(Globals.prefs);
-        prefs.customImports.store();
-
         prefs.flush();
 
         // dispose all windows, even if they are not displayed anymore
@@ -928,7 +925,7 @@ private MenuBar createMenu() {
 
                 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()),
diff --git a/src/main/java/org/jabref/gui/actions/ManageCustomExportsAction.java b/src/main/java/org/jabref/gui/actions/ManageCustomExportsAction.java
index 90567f5f820..60298e05555 100644
--- a/src/main/java/org/jabref/gui/actions/ManageCustomExportsAction.java
+++ b/src/main/java/org/jabref/gui/actions/ManageCustomExportsAction.java
@@ -1,20 +1,12 @@
 package org.jabref.gui.actions;
 
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.exporter.ExportCustomizationDialog;
+import org.jabref.gui.exporter.ExportCustomizationDialogView;
 
 public class ManageCustomExportsAction extends SimpleCommand {
 
-    private final JabRefFrame jabRefFrame;
-
-    public ManageCustomExportsAction(JabRefFrame jabRefFrame) {
-        this.jabRefFrame = jabRefFrame;
-    }
-
     @Override
     public void execute() {
-        ExportCustomizationDialog ecd = new ExportCustomizationDialog(jabRefFrame);
-        ecd.setVisible(true);
+        new ExportCustomizationDialogView().show();
     }
 
 }
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialog.fxml b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialog.fxml
new file mode 100644
index 00000000000..1c63d7e8008
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialog.fxml
@@ -0,0 +1,52 @@
+<?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.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<DialogPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="480.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.exporter.CreateModifyExporterDialogView">
+    <content>
+      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="320.0">
+         <children>
+            <GridPane prefWidth="480.0" scaleShape="false">
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+              </columnConstraints>
+              <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <TextField fx:id="name" GridPane.rowIndex="1" />
+                  <Label text="%Main layout file:" GridPane.rowIndex="2" />
+                  <TextField fx:id="fileName" GridPane.rowIndex="3" />
+                  <TextField fx:id="extension" GridPane.rowIndex="6" />
+                  <Label alignment="TOP_LEFT" text="%Export format name:">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <Label text="%File extension:" GridPane.rowIndex="5" />
+                  <Button fx:id="browseButton" text="%Browse" onAction="#browse" GridPane.rowIndex="4" />
+               </children>
+               <padding>
+                  <Insets bottom="30.0" left="30.0" right="30.0" top="30.0" />
+               </padding>
+            </GridPane>
+         </children></AnchorPane>
+    </content>
+    <ButtonType fx:id="saveExporter" text="%Save exporter" />
+    <ButtonType fx:constant="CANCEL" />
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
new file mode 100644
index 00000000000..c3464567625
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
@@ -0,0 +1,67 @@
+package org.jabref.gui.exporter;
+
+import javax.inject.Inject;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.TextField;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class CreateModifyExporterDialogView extends BaseDialog<ExporterViewModel> {
+
+    @FXML private Button browseButton;
+    @FXML private TextField name;
+    @FXML private TextField fileName;
+    @FXML private TextField extension;
+    @FXML private ButtonType saveExporter;
+
+    @Inject private DialogService dialogService;
+    @Inject private PreferencesService preferences;
+    @Inject private final JournalAbbreviationLoader loader;
+    private CreateModifyExporterDialogViewModel viewModel;
+
+    private final ExporterViewModel exporter;
+
+    public CreateModifyExporterDialogView(ExporterViewModel exporter, DialogService dialogService,
+                                          PreferencesService preferences, JournalAbbreviationLoader loader) {
+        this.setTitle(Localization.lang("Customize Export Formats"));
+        this.exporter = exporter;
+        this.loader = loader;
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        this.setResultConverter(button -> {
+            if (button == saveExporter) {
+                return viewModel.saveExporter();
+            } else {
+                return null;
+            }
+        });
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new CreateModifyExporterDialogViewModel(exporter, dialogService, preferences, loader);
+        name.textProperty().bindBidirectional(viewModel.getName());
+        fileName.textProperty().bindBidirectional(viewModel.getLayoutFileName());
+        extension.textProperty().bindBidirectional(viewModel.getExtension());
+    }
+
+    @FXML
+    private void browse(ActionEvent event) {
+        viewModel.browse();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
new file mode 100644
index 00000000000..96331a29842
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
@@ -0,0 +1,107 @@
+package org.jabref.gui.exporter;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.layout.LayoutFormatterPreferences;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.preferences.PreferencesService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * This view model can be used both for "add exporter" and "modify exporter" functionalities.
+ * It takes an optional exporter which is empty for "add exporter," and takes the selected exporter
+ * for "modify exporter."  It returns an optional exporter which empty if an invalid or no exporter is
+ * created, and otherwise contains the exporter to be added or that is modified.
+ *
+ */
+
+public class CreateModifyExporterDialogViewModel extends AbstractViewModel {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateModifyExporterDialogViewModel.class);
+
+    private final DialogService dialogService;
+    private final PreferencesService preferences;
+
+    private final StringProperty name = new SimpleStringProperty("");
+    private final StringProperty layoutFile = new SimpleStringProperty("");
+    private final StringProperty extension = new SimpleStringProperty("");
+
+    private final JournalAbbreviationLoader loader;
+
+    public CreateModifyExporterDialogViewModel(ExporterViewModel exporter, DialogService dialogService, PreferencesService preferences,
+                                               JournalAbbreviationLoader loader) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        this.loader = loader;
+
+        //Set text of each of the boxes
+        if (exporter != null) {
+            name.setValue(exporter.name().get());
+            layoutFile.setValue(exporter.layoutFileName().get());
+            extension.setValue(exporter.extension().get());
+        }
+    }
+
+    public ExporterViewModel saveExporter() {
+        Path layoutFileDir = Paths.get(layoutFile.get()).getParent();
+        if (layoutFileDir != null) {
+            String layoutFileDirString = layoutFileDir.toString();
+            preferences.setExportWorkingDirectory(layoutFileDirString);
+        }
+
+        // Check that there are no empty strings.
+        if (layoutFile.get().isEmpty() || name.get().isEmpty() || extension.get().isEmpty()
+            || !layoutFile.get().endsWith(".layout")) {
+
+            LOGGER.info("One of the fields is empty or invalid!");
+            return null;
+        }
+
+        // Create a new exporter to be returned to ExportCustomizationDialogViewModel, which requested it
+        LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences(loader);
+        SavePreferences savePreferences = preferences.loadForExportFromPreferences();
+        TemplateExporter format = new TemplateExporter(name.get(), layoutFile.get(), extension.get(),
+                                                       layoutPreferences, savePreferences);
+        format.setCustomExport(true);
+        return new ExporterViewModel(format);
+    }
+
+    public String getExportWorkingDirectory() {
+        return preferences.getExportWorkingDirectory();
+    }
+
+    public void browse() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
+            .withDefaultExtension(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
+            .withInitialDirectory(getExportWorkingDirectory()).build();
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(f -> layoutFile.set(f.toAbsolutePath().toString()));
+    }
+
+    public StringProperty getName() {
+        return name;
+    }
+
+    public StringProperty getLayoutFileName() {
+        return layoutFile;
+    }
+
+    public StringProperty getExtension() {
+        return extension;
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java b/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
deleted file mode 100644
index 21552963b45..00000000000
--- a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.jabref.gui.exporter;
-
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.jabref.Globals;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.preferences.JabRefPreferences;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Dialog for creating or modifying custom exports.
- */
-class CustomExportDialog extends JabRefDialog {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CustomExportDialog.class);
-
-    private final JTextField name = new JTextField(60);
-    private final JTextField layoutFile = new JTextField(60);
-    private final JTextField extension = new JTextField(60);
-    private JabRefFrame frame;
-    private boolean okPressed;
-
-    public CustomExportDialog(final JabRefFrame parent, final String exporterName, final String layoutFileName,
-            final String extensionName) {
-        this(parent);
-        frame = parent;
-        name.setText(exporterName);
-        layoutFile.setText(layoutFileName);
-        extension.setText(extensionName);
-    }
-
-    public CustomExportDialog(final JabRefFrame parent) {
-        super(Localization.lang("Edit custom export"), true, CustomExportDialog.class);
-        frame = parent;
-        ActionListener okListener = e -> {
-            Path layoutFileDir = Paths.get(layoutFile.getText()).getParent();
-            if (layoutFileDir != null) {
-                Globals.prefs.put(JabRefPreferences.EXPORT_WORKING_DIRECTORY, layoutFileDir.toString());
-
-            }
-
-            // Check that there are no empty strings.
-            if (layoutFile.getText().isEmpty() || name.getText().isEmpty() || extension.getText().isEmpty()
-                    || !layoutFile.getText().endsWith(".layout")) {
-
-                LOGGER.info("One field is empty!"); //TODO: Better error message
-                return;
-            }
-
-            // Handling of : and ; must also be done.
-
-            okPressed = true;
-            dispose();
-        };
-
-        layoutFile.setText(Globals.prefs.get(JabRefPreferences.EXPORT_WORKING_DIRECTORY));
-
-        JButton ok = new JButton(Localization.lang("OK"));
-        ok.addActionListener(okListener);
-        name.addActionListener(okListener);
-        layoutFile.addActionListener(okListener);
-        extension.addActionListener(okListener);
-
-        JButton cancel = new JButton(Localization.lang("Cancel"));
-        cancel.addActionListener(e -> dispose());
-
-        JButton browse = new JButton(Localization.lang("Browse"));
-
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
-                .withDefaultExtension(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
-                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.EXPORT_WORKING_DIRECTORY)).build();
-        browse.addActionListener(
-                e -> DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showFileOpenDialog(fileDialogConfiguration))
-                                        .ifPresent(f -> layoutFile.setText(f.toAbsolutePath().toString())));
-
-        AbstractAction cancelAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        };
-        // Key bindings:
-        JPanel main = new JPanel();
-        ActionMap am = main.getActionMap();
-        InputMap im = main.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", cancelAction);
-
-        // Layout starts here.
-        GridBagLayout gbl = new GridBagLayout();
-        main.setLayout(gbl);
-        main.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
-                Localization.lang("Export properties")));
-
-        // Main panel:
-        GridBagConstraints con = new GridBagConstraints();
-        con.weightx = 0;
-        con.gridwidth = 1;
-        con.insets = new Insets(3, 5, 3, 5);
-        con.anchor = GridBagConstraints.EAST;
-        con.fill = GridBagConstraints.NONE;
-        con.gridx = 0;
-        con.gridy = 0;
-        JLabel nl = new JLabel(Localization.lang("Export name") + ':');
-        gbl.setConstraints(nl, con);
-        main.add(nl);
-        con.gridy = 1;
-        JLabel nr = new JLabel(Localization.lang("Main layout file") + ':');
-        gbl.setConstraints(nr, con);
-        main.add(nr);
-        con.gridy = 2;
-        JLabel nf = new JLabel(Localization.lang("Extension") + ':');
-        gbl.setConstraints(nf, con);
-        main.add(nf);
-
-        con.gridwidth = 2;
-        con.weightx = 1;
-        con.anchor = GridBagConstraints.WEST;
-        con.fill = GridBagConstraints.HORIZONTAL;
-        con.gridy = 0;
-        con.gridx = 1;
-        gbl.setConstraints(name, con);
-        main.add(name);
-        con.gridy = 1;
-        con.gridwidth = 1;
-        gbl.setConstraints(layoutFile, con);
-        main.add(layoutFile);
-        con.gridx = 2;
-        con.weightx = 0;
-        gbl.setConstraints(browse, con);
-        main.add(browse);
-        con.weightx = 1;
-        con.gridwidth = 2;
-        con.gridx = 1;
-        con.gridy = 2;
-        gbl.setConstraints(extension, con);
-        main.add(extension);
-
-        JPanel buttons = new JPanel();
-        ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-        buttons.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-        bb.addGlue();
-        bb.addButton(ok);
-        bb.addButton(cancel);
-        bb.addGlue();
-
-        getContentPane().add(main, BorderLayout.CENTER);
-        getContentPane().add(buttons, BorderLayout.SOUTH);
-
-        setSize(700, 200);
-
-    }
-
-    public boolean okPressed() {
-        return okPressed;
-    }
-
-    public String layoutFile() {
-        return layoutFile.getText();
-    }
-
-    public String name() {
-        return name.getText();
-    }
-
-    public String extension() {
-        String ext = extension.getText();
-        if (ext.startsWith(".")) {
-            return ext;
-        } else if (ext.startsWith("*.")) {
-            return ext.substring(1);
-        } else {
-            return '.' + ext;
-        }
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCommand.java b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
index 102d36d9e24..5277d271c19 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -2,7 +2,6 @@
 
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Map;
 
 import javafx.stage.FileChooser;
 
@@ -50,7 +49,7 @@ public ExportCommand(JabRefFrame frame, boolean selectedOnly, JabRefPreferences
 
     @Override
     public void execute() {
-        Map<String, TemplateExporter> customExporters = preferences.customExports.getCustomExportFormats(preferences, Globals.journalAbbreviationLoader);
+        List<TemplateExporter> customExporters = preferences.getCustomExportFormats(Globals.journalAbbreviationLoader);
         LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
         SavePreferences savePreferences = preferences.loadForExportFromPreferences();
         XmpPreferences xmpPreferences = preferences.getXMPPreferences();
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.fxml b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.fxml
new file mode 100644
index 00000000000..d25e272ed38
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.fxml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.VBox?>
+
+<DialogPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="org.jabref.gui.exporter.ExportCustomizationDialogView">
+   <content>
+      <VBox prefHeight="200.0" prefWidth="500.0">
+         <children>
+            <TableView fx:id="exporterTable" prefHeight="150.0" prefWidth="500.0">
+              <columns>
+                <TableColumn fx:id="nameColumn" prefWidth="150.0" text="%Export name" />
+                <TableColumn fx:id="layoutColumn" prefWidth="250.0" text="%Main layout file" />
+                <TableColumn fx:id="extensionColumn" prefWidth="100.0" text="%Extension" />
+              </columns>
+            </TableView>
+         </children>
+      </VBox>
+   </content>
+   <ButtonType fx:id="addButton" text="%Add" />
+   <ButtonType fx:id="modifyButton" text="%Modify" />
+   <ButtonType fx:id="removeButton" text="%Remove" />
+   <ButtonType fx:id="closeButton" fx:constant="OK" />
+   <ButtonType fx:constant="CANCEL" />
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java
deleted file mode 100644
index 4348c4c1956..00000000000
--- a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.jabref.gui.exporter;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.table.TableColumnModel;
-
-import org.jabref.Globals;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.layout.LayoutFormatterPreferences;
-
-import ca.odell.glazedlists.gui.TableFormat;
-import ca.odell.glazedlists.swing.DefaultEventTableModel;
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-
-public class ExportCustomizationDialog extends JabRefDialog {
-
-    // Column widths for export customization dialog table:
-    private static final int COL_0_WIDTH = 50;
-    private static final int COL_1_WIDTH = 200;
-    private static final int COL_2_WIDTH = 30;
-
-    public ExportCustomizationDialog(final JabRefFrame frame) {
-
-        super(Localization.lang("Manage custom exports"), false, ExportCustomizationDialog.class);
-        DefaultEventTableModel<List<String>> tableModel = new DefaultEventTableModel<>(
-                Globals.prefs.customExports.getSortedList(), new ExportTableFormat());
-        JTable table = new JTable(tableModel);
-        TableColumnModel cm = table.getColumnModel();
-        cm.getColumn(0).setPreferredWidth(COL_0_WIDTH);
-        cm.getColumn(1).setPreferredWidth(COL_1_WIDTH);
-        cm.getColumn(2).setPreferredWidth(COL_2_WIDTH);
-        JScrollPane sp = new JScrollPane(table, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        table.setPreferredScrollableViewportSize(new Dimension(500, 150));
-        if (table.getRowCount() > 0) {
-            table.setRowSelectionInterval(0, 0);
-        }
-
-        JButton addExport = new JButton(Localization.lang("Add new"));
-        addExport.addActionListener(e -> {
-            CustomExportDialog ecd = new CustomExportDialog(frame);
-            ecd.setVisible(true);
-            if (ecd.okPressed()) {
-                Globals.prefs.customExports.addFormat(ecd.name(), ecd.layoutFile(), ecd.extension(),
-                        Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader),
-                        Globals.prefs.loadForExportFromPreferences());
-                Globals.prefs.customExports.store(Globals.prefs);
-            }
-        });
-
-        JButton modify = new JButton(Localization.lang("Modify"));
-        modify.addActionListener(e -> {
-            int row = table.getSelectedRow();
-            if (row == -1) {
-                return;
-            }
-            List<String> old = Globals.prefs.customExports.getSortedList().get(row);
-            CustomExportDialog ecd = new CustomExportDialog(frame, old.get(0), old.get(1), old.get(2));
-            ecd.setVisible(true); // ecd.show(); -> deprecated since 1.5
-            if (ecd.okPressed()) {
-                old.set(0, ecd.name());
-                old.set(1, ecd.layoutFile());
-                old.set(2, ecd.extension());
-                table.revalidate();
-                table.repaint();
-                Globals.prefs.customExports.store(Globals.prefs);
-            }
-        });
-
-        JButton remove = new JButton(Localization.lang("Remove"));
-        remove.addActionListener(e -> {
-            int[] rows = table.getSelectedRows();
-            if (rows.length == 0) {
-                return;
-            }
-            List<List<String>> entries = new ArrayList<>();
-            for (int i = 0; i < rows.length; i++) {
-                entries.add(Globals.prefs.customExports.getSortedList().get(rows[i]));
-            }
-            LayoutFormatterPreferences layoutPreferences = Globals.prefs
-                    .getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
-            SavePreferences savePreferences = Globals.prefs.loadForExportFromPreferences();
-            for (List<String> list : entries) {
-                Globals.prefs.customExports.remove(list, layoutPreferences, savePreferences);
-            }
-            Globals.prefs.customExports.store(Globals.prefs);
-        });
-
-        Action closeAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        };
-
-        JButton close = new JButton(Localization.lang("Close"));
-        close.addActionListener(closeAction);
-
-        JButton help = new HelpAction(HelpFile.CUSTOM_EXPORTS).getHelpButton();
-
-        // Key bindings:
-        JPanel main = new JPanel();
-        ActionMap am = main.getActionMap();
-        InputMap im = main.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", closeAction);
-        main.setLayout(new BorderLayout());
-        main.add(sp, BorderLayout.CENTER);
-        JPanel buttons = new JPanel();
-        ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-        buttons.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-        bb.addGlue();
-        bb.addButton(addExport);
-        bb.addButton(modify);
-        bb.addButton(remove);
-        bb.addButton(close);
-        bb.addUnrelatedGap();
-        bb.addButton(help);
-        bb.addGlue();
-
-        getContentPane().add(main, BorderLayout.CENTER);
-        getContentPane().add(buttons, BorderLayout.SOUTH);
-        pack();
-        table.requestFocus();
-    }
-
-    private static class ExportTableFormat implements TableFormat<List<String>> {
-
-        @Override
-        public Object getColumnValue(List<String> strings, int i) {
-            return strings.get(i);
-        }
-
-        @Override
-        public int getColumnCount() {
-            return 3;
-        }
-
-        @Override
-        public String getColumnName(int col) {
-            switch (col) {
-            case 0:
-                return Localization.lang("Export name");
-            case 1:
-                return Localization.lang("Main layout file");
-            default:
-                return Localization.lang("Extension");
-            }
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java
new file mode 100644
index 00000000000..0ca7d26c5ee
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java
@@ -0,0 +1,77 @@
+package org.jabref.gui.exporter;
+
+import javax.inject.Inject;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import org.fxmisc.easybind.EasyBind;
+
+public class ExportCustomizationDialogView extends BaseDialog<Void> {
+
+    @FXML private ButtonType addButton;
+    @FXML private ButtonType modifyButton;
+    @FXML private ButtonType removeButton;
+    @FXML private ButtonType closeButton;
+    @FXML private TableView<ExporterViewModel> exporterTable;
+    @FXML private TableColumn<ExporterViewModel, String> nameColumn;
+    @FXML private TableColumn<ExporterViewModel, String> layoutColumn;
+    @FXML private TableColumn<ExporterViewModel, String> extensionColumn;
+
+    @Inject private DialogService dialogService;
+    @Inject private PreferencesService preferences;
+    @Inject private JournalAbbreviationLoader loader;
+    private ExportCustomizationDialogViewModel viewModel;
+
+    public ExportCustomizationDialogView() {
+        this.setTitle(Localization.lang("Customize Export Formats"));
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        ControlHelper.setAction(addButton, getDialogPane(), event -> addExporter());
+        ControlHelper.setAction(modifyButton, getDialogPane(), event -> modifyExporter());
+        ControlHelper.setAction(removeButton, getDialogPane(), event -> removeExporter());
+        ControlHelper.setAction(closeButton, getDialogPane(), event -> saveAndClose());
+    }
+
+    private void addExporter() {
+        viewModel.addExporter();
+    }
+
+    private void modifyExporter() {
+        viewModel.modifyExporter();
+    }
+
+    private void removeExporter() {
+        viewModel.removeExporters();
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new ExportCustomizationDialogViewModel(preferences, dialogService, loader);
+        exporterTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+        exporterTable.itemsProperty().bind(viewModel.exportersProperty());
+        EasyBind.listBind(viewModel.selectedExportersProperty(), exporterTable.getSelectionModel().getSelectedItems());
+        nameColumn.setCellValueFactory(cellData -> cellData.getValue().name());
+        layoutColumn.setCellValueFactory(cellData -> cellData.getValue().layoutFileName());
+        extensionColumn.setCellValueFactory(cellData -> cellData.getValue().extension());
+    }
+
+    private void saveAndClose() {
+        viewModel.saveToPrefs();
+        close();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java
new file mode 100644
index 00000000000..76bbecce5dc
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java
@@ -0,0 +1,81 @@
+package org.jabref.gui.exporter;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
+import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.preferences.PreferencesService;
+
+public class ExportCustomizationDialogViewModel extends AbstractViewModel {
+
+    private final ListProperty<ExporterViewModel> exporters = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<ExporterViewModel> selectedExporters = new SimpleListProperty<>(FXCollections.observableArrayList());
+
+    private final PreferencesService preferences;
+    private final DialogService dialogService;
+    private final JournalAbbreviationLoader loader;
+
+    public ExportCustomizationDialogViewModel(PreferencesService preferences, DialogService dialogService, JournalAbbreviationLoader loader) {
+        this.preferences = preferences;
+        this.dialogService = dialogService;
+        this.loader = loader;
+        loadExporters();
+    }
+
+    private void loadExporters() {
+        List<TemplateExporter> exportersLogic = preferences.getCustomExportFormats(loader);
+        for (TemplateExporter exporter : exportersLogic) {
+            exporters.add(new ExporterViewModel(exporter));
+        }
+    }
+
+    public void addExporter() {
+        CreateModifyExporterDialogView dialog = new CreateModifyExporterDialogView(null, dialogService, preferences,
+                                                                                   loader);
+        Optional<ExporterViewModel> exporter = dialogService.showCustomDialogAndWait(dialog);
+        if ((exporter != null) && exporter.isPresent()) {
+            exporters.add(exporter.get());
+        }
+    }
+
+    public void modifyExporter() {
+        CreateModifyExporterDialogView dialog;
+        ExporterViewModel exporterToModify = null;
+        if (selectedExporters.isEmpty()) {
+            return;
+        }
+        exporterToModify = selectedExporters.get(0);
+        dialog = new CreateModifyExporterDialogView(exporterToModify, dialogService, preferences, loader);
+        Optional<ExporterViewModel> exporter = dialogService.showCustomDialogAndWait(dialog);
+        if ((exporter != null) && exporter.isPresent()) {
+            exporters.remove(exporterToModify);
+            exporters.add(exporter.get());
+        }
+    }
+
+    public void removeExporters() {
+        exporters.removeAll(selectedExporters);
+    }
+
+    public void saveToPrefs() {
+        List<TemplateExporter> exportersLogic = exporters.stream().map(ExporterViewModel::getLogic).collect(Collectors.toList());
+        preferences.storeCustomExportFormats(exportersLogic);
+
+    }
+
+    public ListProperty<ExporterViewModel> selectedExportersProperty() {
+        return selectedExporters;
+    }
+
+    public ListProperty<ExporterViewModel> exportersProperty() {
+        return exporters;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java b/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java
new file mode 100644
index 00000000000..1b4b838ea69
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java
@@ -0,0 +1,47 @@
+package org.jabref.gui.exporter;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.logic.exporter.TemplateExporter;
+
+/**
+ * ExporterViewModel wraps a TemplateExporter from logic and is used in the exporter customization dialog view
+ * and ViewModel.
+ *
+ *
+ */
+
+public class ExporterViewModel {
+
+    private final TemplateExporter exporter;
+    private final StringProperty name = new SimpleStringProperty();
+    private final StringProperty layoutFileName = new SimpleStringProperty();
+    private final StringProperty extension = new SimpleStringProperty();
+
+    public ExporterViewModel(TemplateExporter exporter) {
+        this.exporter = exporter;
+        this.name.setValue(exporter.getName());
+        this.layoutFileName.setValue(exporter.getLayoutFileNameWithExtension());
+        // Only the first of the extensions gotten from FileType is saved into the class using get(0)
+        String extensionString = exporter.getFileType().getExtensions().get(0);
+        this.extension.setValue(extensionString);
+    }
+
+    public TemplateExporter getLogic() {
+        return this.exporter;
+    }
+
+    public StringProperty name() {
+        return this.name;
+
+    }
+
+    public StringProperty layoutFileName() {
+        return this.layoutFileName;
+    }
+
+    public StringProperty extension() {
+        return this.extension;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 0fe12a13eaf..53a8d561a11 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.preferences;
 
-import java.util.Map;
+import java.util.List;
 import java.util.prefs.BackingStoreException;
 
 import javafx.collections.FXCollections;
@@ -193,7 +193,7 @@ private void importPreferences() {
 
     private void updateAfterPreferenceChanges() {
         setValues();
-        Map<String, TemplateExporter> customExporters = prefs.customExports.getCustomExportFormats(prefs, Globals.journalAbbreviationLoader);
+        List<TemplateExporter> customExporters = prefs.getCustomExportFormats(Globals.journalAbbreviationLoader);
         LayoutFormatterPreferences layoutPreferences = prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
         SavePreferences savePreferences = prefs.loadForExportFromPreferences();
         XmpPreferences xmpPreferences = prefs.getXMPPreferences();
diff --git a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
index be7b62252f3..52e88dacc73 100644
--- a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
+++ b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
@@ -4,7 +4,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -28,7 +27,7 @@ private ExporterFactory(List<Exporter> exporters) {
         this.exporters = Objects.requireNonNull(exporters);
     }
 
-    public static ExporterFactory create(Map<String, TemplateExporter> customFormats,
+    public static ExporterFactory create(List<TemplateExporter> customFormats,
             LayoutFormatterPreferences layoutPreferences, SavePreferences savePreferences, XmpPreferences xmpPreferences) {
 
         List<Exporter> exporters = new ArrayList<>();
@@ -61,7 +60,7 @@ public static ExporterFactory create(Map<String, TemplateExporter> customFormats
         exporters.add(new XmpPdfExporter(xmpPreferences));
 
         // Now add custom export formats
-        exporters.addAll(customFormats.values());
+        exporters.addAll(customFormats);
 
         return new ExporterFactory(exporters);
     }
diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
index de3a7ab022c..4694e1b9f7e 100644
--- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
@@ -41,6 +41,10 @@ public class TemplateExporter extends Exporter {
      * \\s simply marks any whitespace character
      */
     private static final Pattern BLANK_LINE_MATCHER = Pattern.compile("(?m)^\\s");
+    private static final String LAYOUT_EXTENSION = ".layout";
+    private static final String FORMATTERS_EXTENSION = ".formatters";
+    private static final String BEGIN_INFIX = ".begin";
+    private static final String END_INFIX = ".end";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TemplateExporter.class);
 
@@ -66,6 +70,22 @@ public TemplateExporter(String displayName, String consoleName, String lfFileNam
         this(displayName, consoleName, lfFileName, directory, extension, null, null);
     }
 
+    /**
+     * Initialize another export format based on templates stored in dir with
+     * layoutFile lfFilename.
+     *
+     * @param name to display to the user and to call this format in the console.
+     * @param lfFileName  Name of the main layout file.
+     * @param directory   Directory in which to find the layout file.
+     * @param extension   May or may not contain the . (for instance .txt).
+     * @param layoutPreferences Preferences for the layout
+     * @param savePreferences Preferences for saving
+     */
+    public TemplateExporter(String name, String lfFileName, String extension, LayoutFormatterPreferences layoutPreferences,
+                            SavePreferences savePreferences) {
+        this(name, name, lfFileName, null, StandardFileType.newFileType(extension), layoutPreferences, savePreferences);
+    }
+
     /**
      * Initialize another export format based on templates stored in dir with
      * layoutFile lfFilename.
@@ -81,7 +101,11 @@ public TemplateExporter(String displayName, String consoleName, String lfFileNam
     public TemplateExporter(String displayName, String consoleName, String lfFileName, String directory, FileType extension,
             LayoutFormatterPreferences layoutPreferences, SavePreferences savePreferences) {
         super(consoleName, displayName, extension);
-        this.lfFileName = Objects.requireNonNull(lfFileName);
+        if (Objects.requireNonNull(lfFileName).endsWith(LAYOUT_EXTENSION)) {
+            this.lfFileName = lfFileName.substring(0, lfFileName.length() - LAYOUT_EXTENSION.length());
+        } else {
+            this.lfFileName = lfFileName;
+        }
         this.directory = directory;
         this.layoutPreferences = layoutPreferences;
         this.savePreferences = savePreferences;
@@ -191,7 +215,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
             List<String> missingFormatters = new ArrayList<>(1);
 
             // Print header
-            try (Reader reader = getReader(lfFileName + ".begin.layout")) {
+            try (Reader reader = getReader(lfFileName + BEGIN_INFIX + LAYOUT_EXTENSION)) {
                 LayoutHelper layoutHelper = new LayoutHelper(reader, layoutPreferences);
                 beginLayout = layoutHelper.getLayoutFromText();
             } catch (IOException ex) {
@@ -216,7 +240,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
             // Load default layout
             Layout defLayout;
             LayoutHelper layoutHelper;
-            try (Reader reader = getReader(lfFileName + ".layout")) {
+            try (Reader reader = getReader(lfFileName + LAYOUT_EXTENSION)) {
                 layoutHelper = new LayoutHelper(reader, layoutPreferences);
                 defLayout = layoutHelper.getLayoutFromText();
             }
@@ -237,7 +261,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
                 if (layouts.containsKey(type)) {
                     layout = layouts.get(type);
                 } else {
-                    try (Reader reader = getReader(lfFileName + '.' + type + ".layout")) {
+                    try (Reader reader = getReader(lfFileName + '.' + type + LAYOUT_EXTENSION)) {
                         // We try to get a type-specific layout for this entry.
                         layoutHelper = new LayoutHelper(reader, layoutPreferences);
                         layout = layoutHelper.getLayoutFromText();
@@ -269,7 +293,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
 
             // changed section - begin (arudert)
             Layout endLayout = null;
-            try (Reader reader = getReader(lfFileName + ".end.layout")) {
+            try (Reader reader = getReader(lfFileName + END_INFIX + LAYOUT_EXTENSION)) {
                 layoutHelper = new LayoutHelper(reader, layoutPreferences);
                 endLayout = layoutHelper.getLayoutFromText();
             } catch (IOException ex) {
@@ -300,7 +324,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
      *
      */
     private void readFormatterFile() {
-        File formatterFile = new File(lfFileName + ".formatters");
+        File formatterFile = new File(lfFileName + FORMATTERS_EXTENSION);
         if (formatterFile.exists()) {
             try (Reader in = new FileReader(formatterFile)) {
                 // Ok, we found and opened the file. Read all contents:
@@ -331,4 +355,12 @@ private void readFormatterFile() {
             }
         }
     }
+
+    public String getLayoutFileName() {
+        return lfFileName;
+    }
+
+    public String getLayoutFileNameWithExtension() {
+        return lfFileName + LAYOUT_EXTENSION;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index db7766e9811..0d62f73ef65 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -52,6 +52,11 @@ public List<String> getExtensions() {
     }
 
     public static FileType newFileType(String... extensions) {
+        for (int i = 0; i < extensions.length; i++) {
+            if (extensions[i].contains(".")) {
+                extensions[i] = extensions[i].substring(extensions[i].indexOf('.') + 1);
+            }
+        }
         return () -> Arrays.asList(extensions);
     }
 }
diff --git a/src/main/java/org/jabref/preferences/CustomExportList.java b/src/main/java/org/jabref/preferences/CustomExportList.java
deleted file mode 100644
index 81efca437a6..00000000000
--- a/src/main/java/org/jabref/preferences/CustomExportList.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.jabref.preferences;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.TreeMap;
-
-import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.exporter.TemplateExporter;
-import org.jabref.logic.journals.JournalAbbreviationLoader;
-import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.util.FileType;
-import org.jabref.logic.util.StandardFileType;
-
-import ca.odell.glazedlists.BasicEventList;
-import ca.odell.glazedlists.EventList;
-import ca.odell.glazedlists.SortedList;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class handles user defined custom export formats. They are initially
- * read from Preferences, and kept alphabetically (sorted by name). Formats can
- * be added or removed. When modified, the sort() method must be called to make
- * sure the formats stay properly sorted. When the method store() is called,
- * export formats are written to Preferences.
- */
-
-public class CustomExportList {
-
-    private static final int EXPORTER_NAME_INDEX = 0;
-    private static final int EXPORTER_FILENAME_INDEX = 1;
-    private static final int EXPORTER_EXTENSION_INDEX = 2;
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CustomExportList.class);
-    private final EventList<List<String>> list;
-    private final SortedList<List<String>> sorted;
-
-    private final Map<String, TemplateExporter> formats = new TreeMap<>();
-
-    public CustomExportList(Comparator<List<String>> comp) {
-        list = new BasicEventList<>();
-        sorted = new SortedList<>(list, comp);
-    }
-
-    public int size() {
-        return list.size();
-    }
-
-    public EventList<List<String>> getSortedList() {
-        return sorted;
-    }
-
-    public Map<String, TemplateExporter> getCustomExportFormats(JabRefPreferences prefs,
-            JournalAbbreviationLoader loader) {
-        Objects.requireNonNull(prefs);
-        Objects.requireNonNull(loader);
-        formats.clear();
-        readPrefs(prefs, loader);
-        return formats;
-    }
-
-    private void readPrefs(JabRefPreferences prefs, JournalAbbreviationLoader loader) {
-        Objects.requireNonNull(prefs);
-        Objects.requireNonNull(loader);
-        formats.clear();
-        list.clear();
-        int i = 0;
-        List<String> s;
-        LayoutFormatterPreferences layoutPreferences = prefs.getLayoutFormatterPreferences(loader);
-        SavePreferences savePreferences = prefs.loadForExportFromPreferences();
-        while (!((s = prefs.getStringList(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i)).isEmpty())) {
-            Optional<TemplateExporter> format = createFormat(s.get(EXPORTER_NAME_INDEX), s.get(EXPORTER_FILENAME_INDEX), s.get(EXPORTER_EXTENSION_INDEX), layoutPreferences, savePreferences);
-            if (format.isPresent()) {
-                formats.put(format.get().getId(), format.get());
-                list.add(s);
-            } else {
-                String customExportFormat = prefs.get(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i);
-                LOGGER.error("Error initializing custom export format from string " + customExportFormat);
-            }
-            i++;
-        }
-    }
-
-    private Optional<TemplateExporter> createFormat(String exporterName, String filename, String extension, LayoutFormatterPreferences layoutPreferences,
-            SavePreferences savePreferences) {
-
-        String lfFileName;
-        if (filename.endsWith(".layout")) {
-            lfFileName = filename.substring(0, filename.length() - ".layout".length());
-        } else {
-            lfFileName = filename;
-        }
-        if (extension.contains(".")) {
-            extension = extension.substring(extension.indexOf('.') + 1, extension.length());
-        }
-        FileType fileType = StandardFileType.newFileType(extension);
-        TemplateExporter format = new TemplateExporter(exporterName, exporterName, lfFileName, null, fileType, layoutPreferences,
-                savePreferences);
-        format.setCustomExport(true);
-        return Optional.of(format);
-    }
-
-    public void store(JabRefPreferences prefs) {
-
-        if (list.isEmpty()) {
-            purge(0, prefs);
-        } else {
-            for (int i = 0; i < list.size(); i++) {
-                prefs.putStringList(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i, list.get(i));
-            }
-            purge(list.size(), prefs);
-        }
-    }
-
-    private void purge(int from, JabRefPreferences prefs) {
-        int i = from;
-        while (!prefs.getStringList(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i).isEmpty()) {
-            prefs.remove(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i);
-            i++;
-        }
-    }
-
-    public void remove(List<String> toRemove, LayoutFormatterPreferences layoutPreferences,
-            SavePreferences savePreferences) {
-        createFormat(toRemove.get(EXPORTER_NAME_INDEX), toRemove.get(EXPORTER_FILENAME_INDEX), toRemove.get(EXPORTER_EXTENSION_INDEX), layoutPreferences, savePreferences).ifPresent(format -> {
-            formats.remove(format.getId());
-            list.remove(toRemove);
-        });
-    }
-
-    public void addFormat(String name, String layoutFile, String extension, LayoutFormatterPreferences layoutPreferences, SavePreferences savePreferences) {
-        createFormat(name, layoutFile, extension, layoutPreferences, savePreferences).ifPresent(format -> {
-            formats.put(format.getId(), format);
-            list.add(Arrays.asList(name, layoutFile, extension));
-        });
-
-    }
-}
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index cd69952856f..692df3eec82 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -408,14 +408,17 @@ public class JabRefPreferences implements PreferencesService {
     // Helper string
     private static final String USER_HOME = System.getProperty("user.home");
 
+    // Indexes for Strings within stored custom export entries
+    private static final int EXPORTER_NAME_INDEX = 0;
+    private static final int EXPORTER_FILENAME_INDEX = 1;
+    private static final int EXPORTER_EXTENSION_INDEX = 2;
+
     // The only instance of this class:
     private static JabRefPreferences singleton;
     /**
      * HashMap that contains all preferences which are set by default
      */
     public final Map<String, Object> defaults = new HashMap<>();
-    // Object containing custom export formats:
-    public final CustomExportList customExports;
     /**
      * Set with all custom {@link org.jabref.logic.importer.Importer}s
      */
@@ -729,7 +732,6 @@ private JabRefPreferences() {
         //Default empty String to be backwards compatible
         defaults.put(IMPORT_FILEDIRPATTERN, "");
 
-        customExports = new CustomExportList(new ExportComparator());
         customImports = new CustomImportList(this);
 
         String defaultExpression = "**/.*[bibtexkey].*\\\\.[extension]";
@@ -1463,6 +1465,7 @@ public ImportFormatPreferences getImportFormatPreferences() {
                                            isKeywordSyncEnabled());
     }
 
+    @Override
     public SavePreferences loadForExportFromPreferences() {
         Boolean saveInOriginalOrder = this.getBoolean(JabRefPreferences.EXPORT_IN_ORIGINAL_ORDER);
         SaveOrderConfig saveOrder = null;
@@ -1503,7 +1506,7 @@ public SavePreferences loadForSaveFromPreferences() {
     }
 
     public ExporterFactory getExporterFactory(JournalAbbreviationLoader abbreviationLoader) {
-        Map<String, TemplateExporter> customFormats = this.customExports.getCustomExportFormats(this, abbreviationLoader);
+        List<TemplateExporter> customFormats = getCustomExportFormats(abbreviationLoader);
         LayoutFormatterPreferences layoutPreferences = this.getLayoutFormatterPreferences(abbreviationLoader);
         SavePreferences savePreferences = this.loadForExportFromPreferences();
         XmpPreferences xmpPreferences = this.getXMPPreferences();
@@ -1525,8 +1528,8 @@ public TimestampPreferences getTimestampPreferences() {
         return new TimestampPreferences(getBoolean(USE_TIME_STAMP), getBoolean(UPDATE_TIMESTAMP), get(TIME_STAMP_FIELD), get(TIME_STAMP_FORMAT), getBoolean(OVERWRITE_TIME_STAMP));
     }
 
-    public LayoutFormatterPreferences getLayoutFormatterPreferences(
-                                                                    JournalAbbreviationLoader journalAbbreviationLoader) {
+    @Override
+    public LayoutFormatterPreferences getLayoutFormatterPreferences(JournalAbbreviationLoader journalAbbreviationLoader) {
         Objects.requireNonNull(journalAbbreviationLoader);
         return new LayoutFormatterPreferences(getNameFormatterPreferences(), getJournalAbbreviationPreferences(),
                                               getFileLinkPreferences(), journalAbbreviationLoader);
@@ -1983,4 +1986,62 @@ public FileDragDropPreferenceType getEntryEditorFileLinkPreference() {
     public void storeEntryEditorFileLinkPreference(FileDragDropPreferenceType type) {
         put(ENTRY_EDITOR_DRAG_DROP_PREFERENCE_TYPE, type.name());
     }
+
+    @Override
+    public List<TemplateExporter> getCustomExportFormats(JournalAbbreviationLoader loader) {
+        int i = 0;
+        List<TemplateExporter> formats = new ArrayList<>();
+        String exporterName;
+        String filename;
+        String extension;
+        LayoutFormatterPreferences layoutPreferences = getLayoutFormatterPreferences(loader);
+        SavePreferences savePreferences = loadForExportFromPreferences();
+        List<String> formatData;
+        while (!((formatData = getStringList(CUSTOM_EXPORT_FORMAT + i)).isEmpty())) {
+            exporterName = formatData.get(EXPORTER_NAME_INDEX);
+            filename = formatData.get(EXPORTER_FILENAME_INDEX);
+            extension = formatData.get(EXPORTER_EXTENSION_INDEX);
+            TemplateExporter format = new TemplateExporter(exporterName, filename, extension,
+                                                           layoutPreferences, savePreferences);
+            format.setCustomExport(true);
+            formats.add(format);
+            i++;
+        }
+        return formats;
+    }
+
+    @Override
+    public void storeCustomExportFormats(List<TemplateExporter> exporters) {
+        if (exporters.isEmpty()) {
+            purgeCustomExportFormats(0);
+        } else {
+            for (int i = 0; i < exporters.size(); i++) {
+                List<String> exporterData = new ArrayList<>();
+                exporterData.add(EXPORTER_NAME_INDEX, exporters.get(i).getName());
+                exporterData.add(EXPORTER_FILENAME_INDEX, exporters.get(i).getLayoutFileName());
+                // Only stores the first extension associated with FileType
+                exporterData.add(EXPORTER_EXTENSION_INDEX, exporters.get(i).getFileType().getExtensions().get(0));
+                putStringList(CUSTOM_EXPORT_FORMAT + i, exporterData);
+            }
+            purgeCustomExportFormats(exporters.size());
+        }
+    }
+
+    private void purgeCustomExportFormats(int from) {
+        int i = from;
+        while (!getStringList(CUSTOM_EXPORT_FORMAT + i).isEmpty()) {
+            remove(CUSTOM_EXPORT_FORMAT + i);
+            i++;
+        }
+    }
+
+    @Override
+    public void setExportWorkingDirectory(String layoutFileDirString) {
+        put(EXPORT_WORKING_DIRECTORY, layoutFileDirString);
+    }
+
+    @Override
+    public String getExportWorkingDirectory() {
+        return get(EXPORT_WORKING_DIRECTORY);
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 0458c688759..00da6820019 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -5,7 +5,11 @@
 import java.util.Map;
 
 import org.jabref.gui.keyboard.KeyBindingRepository;
+import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
+import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.model.metadata.FilePreferences;
 
 public interface PreferencesService {
@@ -35,4 +39,15 @@ public interface PreferencesService {
 
     public void updateEntryEditorTabList();
 
+    List<TemplateExporter> getCustomExportFormats(JournalAbbreviationLoader loader);
+
+    void storeCustomExportFormats(List<TemplateExporter> exporters);
+
+    LayoutFormatterPreferences getLayoutFormatterPreferences(JournalAbbreviationLoader loader);
+
+    SavePreferences loadForExportFromPreferences();
+
+    void setExportWorkingDirectory(String layoutFileDirString);
+
+    String getExportWorkingDirectory();
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index a79cfd436cb..8a86a4706cc 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -37,8 +37,6 @@ Action=Action
 
 Add=Add
 
-Add\ new=Add new
-
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Add a (compiled) custom Importer class from a class path.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=The path need not be on the classpath of JabRef.
 
@@ -331,7 +329,6 @@ Each\ line\ must\ be\ of\ the\ following\ form=Each line must be of the followin
 
 Edit=Edit
 
-Edit\ custom\ export=Edit custom export
 Edit\ entry=Edit entry
 Save\ file=Save file
 Edit\ file\ type=Edit file type
@@ -388,14 +385,10 @@ Overwrite\ file?=Overwrite file?
 
 Export=Export
 
-Export\ name=Export name
-
 Export\ preferences=Export preferences
 
 Export\ preferences\ to\ file=Export preferences to file
 
-Export\ properties=Export properties
-
 Export\ to\ clipboard=Export to clipboard
 
 Export\ to\ text\ file.=Export to text file.
@@ -624,8 +617,6 @@ Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\
 
 Main\ file\ directory=Main file directory
 
-Main\ layout\ file=Main layout file
-
 Manage\ custom\ exports=Manage custom exports
 
 Manage\ custom\ imports=Manage custom imports
@@ -2236,3 +2227,10 @@ Copy\ file\ to\ default\ file\ folder=Copy file to default file folder
 Link\ file\ (without\ copying)=Link file (without copying)
 Copy,\ rename\ and\ link\ file=Copy, rename and link file
 Type=Type
+Customize\ Export\ Formats=Customize Export Formats
+Export\ name=Export name
+Main\ layout\ file\:=Main layout file\:
+Main\ layout\ file=Main layout file
+Save\ exporter=Save exporter
+File\ extension\:=File extension\:
+Export\ format\ name\:=Export format name\:
diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
index a2e7cd9ccfa..a408b035221 100644
--- a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
@@ -5,10 +5,9 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
@@ -34,7 +33,7 @@ public class CsvExportFormatTest {
 
     @BeforeEach
     public void setUp() {
-        Map<String, TemplateExporter> customFormats = new HashMap<>();
+        List<TemplateExporter> customFormats = new ArrayList<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         SavePreferences savePreferences = mock(SavePreferences.class);
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
index 948d47facf7..a97c72ef463 100644
--- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -7,10 +7,9 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
@@ -47,7 +46,7 @@ public class DocBook5ExporterTest {
     public void setUp() throws URISyntaxException {
         xmlFile = Paths.get(DocBook5ExporterTest.class.getResource("Docbook5ExportFormat.xml").toURI());
 
-        Map<String, TemplateExporter> customFormats = new HashMap<>();
+        List<TemplateExporter> customFormats = new ArrayList<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         SavePreferences savePreferences = mock(SavePreferences.class);
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
diff --git a/src/test/java/org/jabref/logic/exporter/ExporterTest.java b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
index 842319f2bb3..67c7087f8da 100644
--- a/src/test/java/org/jabref/logic/exporter/ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
@@ -7,9 +7,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Stream;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
@@ -44,7 +42,7 @@ public void setUp() {
     private static Stream<Object[]> exportFormats() {
         Collection<Object[]> result = new ArrayList<>();
 
-        Map<String, TemplateExporter> customFormats = new HashMap<>();
+        List<TemplateExporter> customFormats = new ArrayList<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class);
         SavePreferences savePreferences = mock(SavePreferences.class);
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
index 7fe930f9fd5..28067d99bde 100644
--- a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
@@ -4,10 +4,9 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
@@ -33,7 +32,7 @@ public class HtmlExportFormatTest {
 
     @BeforeEach
     public void setUp() {
-        Map<String, TemplateExporter> customFormats = new HashMap<>();
+        List<TemplateExporter> customFormats = new ArrayList<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         SavePreferences savePreferences = mock(SavePreferences.class);
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
diff --git a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
index 7038e8f436e..d06fc91e374 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
@@ -5,11 +5,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
@@ -37,7 +36,7 @@ public class XmpExporterTest {
 
     @BeforeEach
     public void setUp() {
-        Map<String, TemplateExporter> customFormats = new HashMap<>();
+        List<TemplateExporter> customFormats = new ArrayList<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         SavePreferences savePreferences = mock(SavePreferences.class);
         ExporterFactory exporterFactory = ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences);

From b52c972398438338e79285312275063472cbab75 Mon Sep 17 00:00:00 2001
From: Ali <alijakparov.kz@gmail.com>
Date: Sun, 9 Dec 2018 14:51:33 +0600
Subject: [PATCH 189/229] fixed 4365 put html in clipboard (#4519)

* fixed 4365 put html in clipboard

* put into clipboard an clipboard content
---
 .../java/org/jabref/gui/PreviewPanel.java     | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
index 58fe5a684b2..9c92f9e6ce4 100644
--- a/src/main/java/org/jabref/gui/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -46,6 +46,9 @@
 import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 
 /**
  * Displays an BibEntry using the given layout format.
@@ -351,7 +354,19 @@ public void close() {
     }
 
     private void copyPreviewToClipBoard() {
-        String previewContent = (String) previewView.getEngine().executeScript("document.documentElement.outerHTML");
-        clipBoardManager.setContent(previewContent);
+        StringBuilder previewStringContent = new StringBuilder();
+        Document document = previewView.getEngine().getDocument();
+        NodeList nodeList = document.getElementsByTagName("*");
+
+        for (int i = 0; i < nodeList.getLength(); i++) {
+            Element element = (Element) nodeList.item(i);
+            previewStringContent.append(element.getNodeValue()).append("\n");
+        }
+
+        ClipboardContent content = new ClipboardContent();
+        content.putString(previewStringContent.toString());
+        content.putHtml((String) previewView.getEngine().executeScript("document.documentElement.outerHTML"));
+
+        clipBoardManager.setContent(content);
     }
 }

From 57d60fa2abb187d15d2f6f6cb0d00054eba05ea1 Mon Sep 17 00:00:00 2001
From: Nick Mancuso <31252532+nmancus1@users.noreply.github.com>
Date: Fri, 14 Dec 2018 02:38:56 -0500
Subject: [PATCH 190/229] Add preselect last used export format in export to
 clipboard dialog (#4533)

* Add preselect last used export format in export dialog

* Add preselect last used export format in export dialog

* Add and implement new global pref (LAST_USED_CLIPBOARD_EXPORT)

* Implemented lambda instead of looping to find default choice

* Corrected formatting

* Remove global pref (LAST_USED_CLIPBOARD_EXPORT) and revert references

* Added alphabetize exports in export/ export all dialog in file menu

* Added use sorted exporters list to dialogService call
---
 CHANGELOG.md                                     |  2 +-
 .../org/jabref/gui/exporter/ExportCommand.java   | 11 +++++++++--
 .../gui/exporter/ExportToClipboardAction.java    | 16 +++++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09ee0dd7875..0dc7c9fa851 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We added an option in the preference dialog box, that allows user to pick the dark or light theme option. [#4130] (https://github.com/JabRef/jabref/issues/4130)
 - We updated updated the Related Articles tab to accept JSON from the new version of the Mr. DLib service
 - We added an option in the preference dialog box that allows user to choose behavior after dragging and dropping files in Entry Editor. [#4356](https://github.com/JabRef/jabref/issues/4356)
+- We added the ability to have an export preference where previously "File"-->"Export"/"Export selected entries" would not save the user's preference[#4495](https://github.com/JabRef/jabref/issues/4495)
 
 
 
@@ -94,7 +95,6 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 
 
 
-
 ### Removed
 - The feature to "mark entries" was removed and merged with the groups functionality.  For migration, a group is created for every value of the `__markedentry` field and the entry is added to this group.
 - The number column was removed.
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCommand.java b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
index 5277d271c19..004c7597b5b 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -1,7 +1,9 @@
 package org.jabref.gui.exporter;
 
 import java.nio.file.Path;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javafx.stage.FileChooser;
 
@@ -54,14 +56,19 @@ public void execute() {
         SavePreferences savePreferences = preferences.loadForExportFromPreferences();
         XmpPreferences xmpPreferences = preferences.getXMPPreferences();
 
+        //Get list of exporters and sort before adding to file dialog
+        List<Exporter> exporters = Globals.exportFactory.getExporters().stream()
+                .sorted(Comparator.comparing(Exporter::getName))
+                .collect(Collectors.toList());
+
         Globals.exportFactory = ExporterFactory.create(customExporters, layoutPreferences, savePreferences, xmpPreferences);
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(FileFilterConverter.exporterToExtensionFilter(Globals.exportFactory.getExporters()))
+                .addExtensionFilter(FileFilterConverter.exporterToExtensionFilter(exporters))
                 .withDefaultExtension(Globals.prefs.get(JabRefPreferences.LAST_USED_EXPORT))
                 .withInitialDirectory(Globals.prefs.get(JabRefPreferences.EXPORT_WORKING_DIRECTORY))
                 .build();
         dialogService.showFileSaveDialog(fileDialogConfiguration)
-                     .ifPresent(path -> export(path, fileDialogConfiguration.getSelectedExtensionFilter(), Globals.exportFactory.getExporters()));
+                     .ifPresent(path -> export(path, fileDialogConfiguration.getSelectedExtensionFilter(), exporters));
     }
 
     private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilter, List<Exporter> exporters) {
diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
index 626fb96723a..ce48b9bfebe 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
@@ -22,6 +22,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.preferences.JabRefPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,12 +61,18 @@ public void execute() {
                                                         .sorted(Comparator.comparing(Exporter::getName))
                                                         .collect(Collectors.toList());
 
+        //Find default choice, if any
+        Exporter defaultChoice = exporters.stream()
+                .filter(exporter -> exporter.getName().equals(Globals.prefs.get(JabRefPreferences.LAST_USED_EXPORT)))
+                .findAny()
+                .orElse(null);
+
         Optional<Exporter> selectedExporter = dialogService.showChoiceDialogAndWait(Localization.lang("Export"), Localization.lang("Select export format"),
-                                                                                    Localization.lang("Export"), exporters);
+                    Localization.lang("Export"), defaultChoice, exporters);
 
         selectedExporter.ifPresent(exporter -> BackgroundTask.wrap(() -> exportToClipboard(exporter))
-                                                             .onSuccess(this::setContentToClipboard)
-                                                             .executeWith(Globals.TASK_EXECUTOR));
+                     .onSuccess(this::setContentToClipboard)
+                     .executeWith(Globals.TASK_EXECUTOR));
 
     }
 
@@ -75,6 +82,9 @@ private String exportToClipboard(Exporter exporter) {
         // (This is an ugly hack!)
         Globals.prefs.fileDirForDatabase = panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFilePreferences()).stream().map(Path::toString).collect(Collectors.toList());
 
+        //Add chosen export type to last used pref, to become default
+        Globals.prefs.put(JabRefPreferences.LAST_USED_EXPORT, exporter.getName());
+
         Path tmp = null;
         try {
             // To simplify the exporter API we simply do a normal export to a temporary

From 49c3ef396270fa5a3bf6c43abbbaf004d6c543a4 Mon Sep 17 00:00:00 2001
From: aman-coolinc1 <aman-coolinc1@users.noreply.github.com>
Date: Fri, 14 Dec 2018 15:58:03 +0530
Subject: [PATCH 191/229] Sorting of read-status isn't working as expected
 #4521 (#4536)

* Sorting of read-status isn't working as expected #4521

*Created Comparator for Read Status by adding new class
*Added above comparator to read status column

Signed-off-by: Aman Jain <aman.jain01@sap.com>

* Update CHANGELOG.md
Remove redundant code in ReadStatusFieldComparator.java as suggested

Signed-off-by: Aman Jain <aman.jain01@sap.com>

* Update CHANGELOG.md
---
 .../gui/maintable/MainTableColumnFactory.java |  6 +++++
 .../comparator/ReadStatusFieldComparator.java | 27 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 src/main/java/org/jabref/gui/util/comparator/ReadStatusFieldComparator.java

diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
index ff343bc16c4..6133fc9c5e3 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -35,6 +35,7 @@
 import org.jabref.gui.util.OptionalValueTableCellFactory;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.gui.util.comparator.RankingFieldComparator;
+import org.jabref.gui.util.comparator.ReadStatusFieldComparator;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -201,6 +202,11 @@ private TableColumn<BibEntryTableViewModel, Optional<SpecialFieldValueViewModel>
             column.setComparator(new RankingFieldComparator());
         }
 
+        // Added comparator for Read Status
+        if (specialField == SpecialField.READ_STATUS) {
+            column.setComparator(new ReadStatusFieldComparator());
+        }
+
         column.setSortable(true);
         return column;
     }
diff --git a/src/main/java/org/jabref/gui/util/comparator/ReadStatusFieldComparator.java b/src/main/java/org/jabref/gui/util/comparator/ReadStatusFieldComparator.java
new file mode 100644
index 00000000000..d4317cd7464
--- /dev/null
+++ b/src/main/java/org/jabref/gui/util/comparator/ReadStatusFieldComparator.java
@@ -0,0 +1,27 @@
+package org.jabref.gui.util.comparator;
+
+import java.util.Comparator;
+import java.util.Optional;
+
+import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
+
+public class ReadStatusFieldComparator implements Comparator<Optional<SpecialFieldValueViewModel>> {
+
+    @Override
+    public int compare(Optional<SpecialFieldValueViewModel> val1, Optional<SpecialFieldValueViewModel> val2) {
+        if (val1.isPresent()) {
+            if (val2.isPresent()) {
+                return val1.get().getValue().compareTo(val2.get().getValue());
+            } else {
+                return -1;
+            }
+        } else {
+            if (val2.isPresent()) {
+                return 1;
+            } else {
+                return 0;
+            }
+        }
+    }
+
+}

From 3c8749160efe88c68f73fefbc52f9fb2fe768943 Mon Sep 17 00:00:00 2001
From: Nick Mancuso <31252532+nmancus1@users.noreply.github.com>
Date: Mon, 17 Dec 2018 08:49:10 -0500
Subject: [PATCH 192/229] fix-for-issue-4489 (#4538)

* Removed DownloadExternalFile call, replaced with LinkedFileViewModel
fuctionality

* Added some notes

* Added addLinkedFileFromURL method to handle linking and display dialogs

* Fixed issues per codacity review

* Fixed issues per gradlew check, added new Localization.lang entry,
removed unused Localization.lang entry

* Added extends SimpleCommand to FindFullTextAction

* Added entry to changelog
---
 CHANGELOG.md                                  |  1 +
 src/main/java/org/jabref/gui/BasePanel.java   |  2 +-
 .../gui/externalfiles/FindFullTextAction.java | 90 ++++++++++---------
 src/main/resources/l10n/JabRef_en.properties  |  2 +-
 4 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dc7c9fa851..1d3e7c71f2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,6 +89,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where the ArXiv Fetcher did not support HTTP URLs [koppor#328](https://github.com/koppor/jabref/issues/328)
 - We fixed an issue where only one PDF file could be imported [#4422](https://github.com/JabRef/jabref/issues/4422)
 - We fixed an issue where "Move to group" would always move the first entry in the library and not the selected [#4414](https://github.com/JabRef/jabref/issues/4414)
+- We fixed an issue where an older dialog appears when downloading full texts from the quality menu. [#4489](https://github.com/JabRef/jabref/issues/4489)
 
 
 
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 6291f893d02..9155e2fc3e9 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -429,7 +429,7 @@ private void setupActions() {
         actions.put(Actions.REMOVE_FROM_GROUP, new GroupAddRemoveDialog(this, false, false));
         actions.put(Actions.MOVE_TO_GROUP, new GroupAddRemoveDialog(this, true, true));
 
-        actions.put(Actions.DOWNLOAD_FULL_TEXT, new FindFullTextAction(frame.getDialogService(), this));
+        actions.put(Actions.DOWNLOAD_FULL_TEXT, new FindFullTextAction(this)::execute);
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
index bb72fa8ff3f..f706e4b692e 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.externalfiles;
 
-import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -9,20 +8,17 @@
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.swing.SwingUtilities;
-
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.actions.BaseAction;
-import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.fieldeditors.LinkedFileViewModel;
 import org.jabref.gui.util.BackgroundTask;
-import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.importer.FulltextFetchers;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.FieldName;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.preferences.JabRefPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,7 +26,7 @@
 /**
  * Try to download fulltext PDF for selected entry(ies) by following URL or DOI link.
  */
-public class FindFullTextAction implements BaseAction {
+public class FindFullTextAction extends SimpleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FindFullTextAction.class);
     // The minimum number of selected entries to ask the user for confirmation
@@ -39,16 +35,16 @@ public class FindFullTextAction implements BaseAction {
     private final BasePanel basePanel;
     private final DialogService dialogService;
 
-    public FindFullTextAction(DialogService dialogService, BasePanel basePanel) {
+    public FindFullTextAction(BasePanel basePanel) {
         this.basePanel = basePanel;
-        this.dialogService = dialogService;
+        this.dialogService = basePanel.frame().getDialogService();
     }
 
     @Override
-    public void action() {
+    public void execute() {
         BackgroundTask.wrap(this::findFullTexts)
-                      .onSuccess(downloads -> SwingUtilities.invokeLater(() -> downloadFullTexts(downloads)))
-                      .executeWith(Globals.TASK_EXECUTOR);
+                .onSuccess(this::downloadFullTexts)
+                .executeWith(Globals.TASK_EXECUTOR);
     }
 
     private Map<Optional<URL>, BibEntry> findFullTexts() {
@@ -101,35 +97,13 @@ private void downloadFullTexts(Map<Optional<URL>, BibEntry> downloads) {
 
                     return;
                 }
-                DownloadExternalFile fileDownload = new DownloadExternalFile(dialogService,
-                        basePanel.getBibDatabaseContext(), entry);
-                try {
-                    fileDownload.download(result.get(), "application/pdf", file -> {
-                        DefaultTaskExecutor.runInJavaFXThread(() -> {
-                            Optional<FieldChange> fieldChange = entry.addFile(file);
-                            if (fieldChange.isPresent()) {
-                                UndoableFieldChange edit = new UndoableFieldChange(entry, FieldName.FILE,
-                                        entry.getField(FieldName.FILE).orElse(null), fieldChange.get().getNewValue());
-                                basePanel.getUndoManager().addEdit(edit);
-                                basePanel.markBaseChanged();
-                            }
-                        });
-
-                    });
-                } catch (IOException e) {
-                    LOGGER.warn("Problem downloading file", e);
-                    basePanel.output(Localization.lang("Full text document download failed for entry %0",
-                            entry.getCiteKeyOptional().orElse(Localization.lang("undefined"))));
-                }
-                basePanel.output(Localization.lang("Finished downloading full text document for entry %0.",
-                        entry.getCiteKeyOptional().orElse(Localization.lang("undefined"))));
-            } else {
-                String title = Localization.lang("No full text document found");
-                String message = Localization.lang("No full text document found for entry %0.",
-                        entry.getCiteKeyOptional().orElse(Localization.lang("undefined")));
 
-                basePanel.output(message);
-                DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(title, message));
+                //Download full text
+                addLinkedFileFromURL(result.get(), entry);
+
+           } else {
+                dialogService.notify(Localization.lang("No full text document found for entry %0.",
+                        entry.getCiteKeyOptional().orElse(Localization.lang("undefined"))));
             }
             finishedTasks.add(result);
         }
@@ -137,4 +111,36 @@ private void downloadFullTexts(Map<Optional<URL>, BibEntry> downloads) {
             downloads.remove(result);
         }
     }
+
+    /**
+     * This method attaches a linked file from a URL (if not already linked) to an entry using the key and value pair
+     * from the findFullTexts map
+     * @param url the url "key"
+     * @param entry the entry "value"
+     */
+    private void addLinkedFileFromURL(URL url, BibEntry entry) {
+
+        LinkedFile newLinkedFile = new LinkedFile(url, "");
+
+        if (!entry.getFiles().contains(newLinkedFile)) {
+
+            LinkedFileViewModel onlineFile = new LinkedFileViewModel(
+                    newLinkedFile,
+                    entry,
+                    basePanel.getBibDatabaseContext(),
+                    Globals.TASK_EXECUTOR,
+                    dialogService,
+                    JabRefPreferences.getInstance());
+
+            onlineFile.download();
+
+            entry.addFile(onlineFile.getFile());
+
+            dialogService.notify(Localization.lang("Finished downloading full text document for entry %0.",
+                    entry.getCiteKeyOptional().orElse(Localization.lang("undefined"))));
+        } else {
+            dialogService.notify(Localization.lang("Full text document for entry %0 already linked.",
+                    entry.getCiteKeyOptional().orElse(Localization.lang("undefined"))));
+        }
+    }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 8a86a4706cc..1af3cc0c045 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1991,6 +1991,7 @@ However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=However,
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Opens a link where the current development version can be downloaded
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=See what has been changed in the JabRef versions
 Referenced\ BibTeX\ key\ does\ not\ exist=Referenced BibTeX key does not exist
+Full\ text\ document\ for\ entry\ %0\ already\ linked.=Full text document for entry %0 already linked.
 Finished\ downloading\ full\ text\ document\ for\ entry\ %0.=Finished downloading full text document for entry %0.
 Look\ up\ full\ text\ documents=Look up full text documents
 You\ are\ about\ to\ look\ up\ full\ text\ documents\ for\ %0\ entries.=You are about to look up full text documents for %0 entries.
@@ -2132,7 +2133,6 @@ Any\ file=Any file
 
 No\ linked\ files\ found\ for\ export.=No linked files found for export.
 
-Full\ text\ document\ download\ failed\ for\ entry\ %0=Full text document download failed for entry %0
 No\ full\ text\ document\ found\ for\ entry\ %0.=No full text document found for entry %0.
 
 Delete\ Entry=Delete Entry

From 2754c28914f3a69f3ba2d83ac376634a9f29bbce Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 17 Dec 2018 15:20:52 +0100
Subject: [PATCH 193/229] Fix journal name "Astronomy Journal" to "Astronomical
 Journal"

Fixes #4529.
---
 src/main/resources/journals/journalList.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/journals/journalList.txt b/src/main/resources/journals/journalList.txt
index 167a87d8290..bf62acd58e9 100644
--- a/src/main/resources/journals/journalList.txt
+++ b/src/main/resources/journals/journalList.txt
@@ -1741,13 +1741,13 @@ ASTM Special Technical Publication = ASTM Spec. Tech. Publ.
 ASTM Standardization News = ASTM Stand. News
 ASTRA Proceedings = ASTRA Proc.
 Astrobiology = Astrobiology
+Astronomical Journal = Astron. J.
 Astronomische Nachrichten = Astron. Nachr.
 Astronomy & Geophysics = Astron. Geophys.
 Astronomy and Astrophysics = Astron. Astrophys.
 Astronomy and Astrophysics Review = Astron. Astrophys. Rev.
 Astronomy and Computing = Astron. Comput.
 Astronomy Education Review = Astron. Educ. Rev.
-Astronomy Journal = Astron. J.
 Astronomy Letters = Astron. Lett.
 Astronomy Reports = Astron. Rep.
 Astroparticle Physics = Astropart. Phys.

From 7a7282cfcd884a27e6a4d899e3e0887bc0f6bb59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Dec 2018 12:31:05 +0100
Subject: [PATCH 194/229] Bump antlr4 from 4.7.1 to 4.7.2 (#4543)

Bumps [antlr4](https://github.com/antlr/antlr4) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/antlr/antlr4/releases)
- [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt)
- [Commits](https://github.com/antlr/antlr4/compare/4.7.1...4.7.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ef08e415386..7f6484cd842 100644
--- a/build.gradle
+++ b/build.gradle
@@ -116,7 +116,7 @@ dependencies {
     antlr3 'org.antlr:antlr:3.5.2'
     compile 'org.antlr:antlr-runtime:3.5.2'
 
-    antlr4 'org.antlr:antlr4:4.7.1'
+    antlr4 'org.antlr:antlr4:4.7.2'
     compile 'org.antlr:antlr4-runtime:4.7.1'
 
     compile 'mysql:mysql-connector-java:8.0.13'

From d0d5e67b6cd274e539ba4ee8949aca60a5b1ba3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Dec 2018 12:32:11 +0100
Subject: [PATCH 195/229] Bump applicationinsights-core from 2.2.1 to 2.3.0
 (#4541)

Bumps [applicationinsights-core](https://github.com/Microsoft/ApplicationInsights-Java) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/Microsoft/ApplicationInsights-Java/releases)
- [Changelog](https://github.com/Microsoft/ApplicationInsights-Java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/ApplicationInsights-Java/compare/2.2.1...2.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7f6484cd842..a2996ddc399 100644
--- a/build.gradle
+++ b/build.gradle
@@ -157,7 +157,7 @@ dependencies {
 
     errorproneJavac 'com.google.errorprone:javac:1.8.0-u20'
 
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.2.1'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.3.0'
     compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.1'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'

From ba53e3157340f14786008549d6c85a00722817e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Dec 2018 12:42:14 +0100
Subject: [PATCH 196/229] Bump antlr4-runtime from 4.7.1 to 4.7.2 (#4542)

Bumps [antlr4-runtime](https://github.com/antlr/antlr4) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/antlr/antlr4/releases)
- [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt)
- [Commits](https://github.com/antlr/antlr4/compare/4.7.1...4.7.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a2996ddc399..3f13816e0db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -117,7 +117,7 @@ dependencies {
     compile 'org.antlr:antlr-runtime:3.5.2'
 
     antlr4 'org.antlr:antlr4:4.7.2'
-    compile 'org.antlr:antlr4-runtime:4.7.1'
+    compile 'org.antlr:antlr4-runtime:4.7.2'
 
     compile 'mysql:mysql-connector-java:8.0.13'
 

From 949d2049615bd5aaceb1eddf535cc9bde8597162 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Dec 2018 12:51:49 +0100
Subject: [PATCH 197/229] Bump applicationinsights-logging-log4j2 from 2.2.1 to
 2.3.0 (#4540)

Bumps [applicationinsights-logging-log4j2](https://github.com/Microsoft/ApplicationInsights-Java) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/Microsoft/ApplicationInsights-Java/releases)
- [Changelog](https://github.com/Microsoft/ApplicationInsights-Java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/ApplicationInsights-Java/compare/2.2.1...2.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3f13816e0db..a3a4dab3ca8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -158,7 +158,7 @@ dependencies {
     errorproneJavac 'com.google.errorprone:javac:1.8.0-u20'
 
     compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.3.0'
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.1'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.3.0'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.2'

From 2606f9ad3df7143f03bb7872724123a24e87ecf2 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Mon, 24 Dec 2018 10:32:04 +0100
Subject: [PATCH 198/229] Fixes that renaming a group did not change the group
 name in the interface (#4549)

Fixes #3189.
---
 CHANGELOG.md                                     |  1 +
 .../jabref/gui/groups/GroupNodeViewModel.java    | 12 ++++++------
 .../org/jabref/gui/groups/GroupTreeView.java     | 16 ++++++++++------
 .../jabref/gui/groups/GroupTreeViewModel.java    | 14 ++++++++++----
 .../gui/util/ViewModelTreeTableCellFactory.java  |  4 ++++
 .../org/jabref/model/groups/GroupTreeNode.java   | 14 +++++---------
 6 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d3e7c71f2f..b1c3fd7d4be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where the menu on Mac OS was not displayed in the usual Mac-specific way. https://github.com/JabRef/jabref/issues/3146
 - We improved the integrity check for page numbers. [#4113](https://github.com/JabRef/jabref/issues/4113) and [feature request in the forum](http://discourse.jabref.org/t/pages-field-allow-use-of-en-dash/1199)
 - We fixed an issue where the order of fields in customized entry types was not saved correctly. [#4033](http://github.com/JabRef/jabref/issues/4033)
+- We fixed an issue where renaming a group did not change the group name in the interface. [#3189](https://github.com/JabRef/jabref/issues/3189)
 - We fixed an issue where the groups tree of the last database was still shown even after the database was already closed.
 - We fixed an issue where the "Open file dialog" may disappear behind other windows. https://github.com/JabRef/jabref/issues/3410
 - We fixed an issue where the number of entries matched was not updated correctly upon adding or removing an entry. [#3537](https://github.com/JabRef/jabref/issues/3537)
diff --git a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
index 12abad57d6c..c31c9ce6dd9 100644
--- a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
@@ -63,16 +63,16 @@ public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager state
         this.groupNode = Objects.requireNonNull(groupNode);
         this.localDragBoard = Objects.requireNonNull(localDragBoard);
 
-        LatexToUnicodeFormatter formatter = new LatexToUnicodeFormatter();
-        displayName = formatter.format(groupNode.getName());
+        displayName = new LatexToUnicodeFormatter().format(groupNode.getName());
         isRoot = groupNode.isRoot();
         if (groupNode.getGroup() instanceof AutomaticGroup) {
             AutomaticGroup automaticGroup = (AutomaticGroup) groupNode.getGroup();
 
-            children = automaticGroup.createSubgroups(databaseContext.getDatabase().getEntries()).stream()
-                    .map(this::toViewModel)
-                    .sorted((group1, group2) -> group1.getDisplayName().compareToIgnoreCase(group2.getDisplayName()))
-                    .collect(Collectors.toCollection(FXCollections::observableArrayList));
+            children = automaticGroup.createSubgroups(this.databaseContext.getDatabase().getEntries())
+                                     .stream()
+                                     .map(this::toViewModel)
+                                     .sorted((group1, group2) -> group1.getDisplayName().compareToIgnoreCase(group2.getDisplayName()))
+                                     .collect(Collectors.toCollection(FXCollections::observableArrayList));
         } else {
             children = BindingsHelper.mapBacked(groupNode.getChildren(), this::toViewModel);
         }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
index 6cdcae3c8ee..4dbbf152859 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -114,15 +114,16 @@ public void initialize() {
 
         // Icon and group name
         mainColumn.setCellValueFactory(cellData -> cellData.getValue().valueProperty());
-        mainColumn.setCellFactory(new ViewModelTreeTableCellFactory<GroupNodeViewModel, GroupNodeViewModel>()
+        new ViewModelTreeTableCellFactory<GroupNodeViewModel, GroupNodeViewModel>()
                 .withText(GroupNodeViewModel::getDisplayName)
                 .withIcon(GroupNodeViewModel::getIcon)
-                .withTooltip(GroupNodeViewModel::getDescription));
+                .withTooltip(GroupNodeViewModel::getDescription)
+                .install(mainColumn);
 
         // Number of hits
         PseudoClass anySelected = PseudoClass.getPseudoClass("any-selected");
         PseudoClass allSelected = PseudoClass.getPseudoClass("all-selected");
-        numberColumn.setCellFactory(new ViewModelTreeTableCellFactory<GroupNodeViewModel, GroupNodeViewModel>()
+        new ViewModelTreeTableCellFactory<GroupNodeViewModel, GroupNodeViewModel>()
                 .withGraphic(group -> {
                     final StackPane node = new StackPane();
                     node.getStyleClass().setAll("hits");
@@ -138,11 +139,12 @@ public void initialize() {
                     node.getChildren().add(text);
                     node.setMaxWidth(Control.USE_PREF_SIZE);
                     return node;
-                }));
+                })
+                .install(numberColumn);
 
         // Arrow indicating expanded status
         disclosureNodeColumn.setCellValueFactory(cellData -> cellData.getValue().valueProperty());
-        disclosureNodeColumn.setCellFactory(new ViewModelTreeTableCellFactory<GroupNodeViewModel, GroupNodeViewModel>()
+        new ViewModelTreeTableCellFactory<GroupNodeViewModel, GroupNodeViewModel>()
                 .withGraphic(viewModel -> {
                     final StackPane disclosureNode = new StackPane();
                     disclosureNode.visibleProperty().bind(viewModel.hasChildrenProperty());
@@ -156,7 +158,8 @@ public void initialize() {
                 .withOnMouseClickedEvent(group -> event -> {
                     group.toggleExpansion();
                     event.consume();
-                }));
+                })
+                .install(disclosureNodeColumn);
 
         // Set pseudo-classes to indicate if row is root or sub-item ( > 1 deep)
         PseudoClass rootPseudoClass = PseudoClass.getPseudoClass("root");
@@ -316,6 +319,7 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
         editGroup.setOnAction(event -> {
             menu.hide();
             viewModel.editGroup(group);
+            groupTree.refresh();
         });
 
         MenuItem addSubgroup = new MenuItem(Localization.lang("Add subgroup"));
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
index 356a6989995..ab1cb4449e6 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -57,10 +57,13 @@ public GroupTreeViewModel(StateManager stateManager, DialogService dialogService
         EasyBind.subscribe(selectedGroups, this::onSelectedGroupChanged);
 
         // Set-up bindings
-        filterPredicate
-                .bind(Bindings.createObjectBinding(() -> group -> group.isMatchedBy(filterText.get()), filterText));
+        filterPredicate.bind(Bindings.createObjectBinding(() -> group -> group.isMatchedBy(filterText.get()), filterText));
 
         // Init
+        refresh();
+    }
+
+    private void refresh() {
         onActiveDatabaseChanged(stateManager.activeDatabaseProperty().getValue());
     }
 
@@ -166,13 +169,13 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                     Localization.lang("Change of Grouping Method"),
                     Localization.lang("Assign the original group's entries to this group?"));
             //        WarnAssignmentSideEffects.warnAssignmentSideEffects(newGroup, panel.frame());
-            boolean removePreviousAssignents = (oldGroup.getGroupNode().getGroup() instanceof ExplicitGroup)
+            boolean removePreviousAssignments = (oldGroup.getGroupNode().getGroup() instanceof ExplicitGroup)
                     && (group instanceof ExplicitGroup);
 
             oldGroup.getGroupNode().setGroup(
                     group,
                     keepPreviousAssignments,
-                    removePreviousAssignents,
+                    removePreviousAssignments,
                     stateManager.getEntriesInCurrentDatabase());
 
             // TODO: Add undo
@@ -194,6 +197,9 @@ public void editGroup(GroupNodeViewModel oldGroup) {
 
             dialogService.notify(Localization.lang("Modified group \"%0\".", group.getName()));
             writeGroupChangesToMetaData();
+
+            // This is ugly but we have no proper update mechanism in place to propagate the changes, so redraw everything
+            refresh();
         });
     }
 
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
index 80e7b071aba..233178e17fd 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
@@ -84,4 +84,8 @@ protected void updateItem(T item, boolean empty) {
             }
         };
     }
+
+    public void install(TreeTableColumn<S, T> column) {
+        column.setCellFactory(this);
+    }
 }
diff --git a/src/main/java/org/jabref/model/groups/GroupTreeNode.java b/src/main/java/org/jabref/model/groups/GroupTreeNode.java
index 367b2ac1184..f0f0b9d4745 100644
--- a/src/main/java/org/jabref/model/groups/GroupTreeNode.java
+++ b/src/main/java/org/jabref/model/groups/GroupTreeNode.java
@@ -222,15 +222,11 @@ public GroupTreeNode copyNode() {
      * @param entries list of entries to be searched
      * @return number of hits
      */
-    public int calculateNumberOfMatches(List<BibEntry> entries) {
-        int hits = 0;
+    public long calculateNumberOfMatches(List<BibEntry> entries) {
         SearchMatcher matcher = getSearchMatcher();
-        for (BibEntry entry : entries) {
-            if (matcher.isMatch(entry)) {
-                hits++;
-            }
-        }
-        return hits;
+        return entries.stream()
+                      .filter(matcher::isMatch)
+                      .count();
     }
 
     /**
@@ -238,7 +234,7 @@ public int calculateNumberOfMatches(List<BibEntry> entries) {
      * @param database database to be searched
      * @return number of hits
      */
-    public int calculateNumberOfMatches(BibDatabase database) {
+    public long calculateNumberOfMatches(BibDatabase database) {
         return calculateNumberOfMatches(database.getEntries());
     }
 

From 83f6c618bb9886c8ac95e9503bec3a5a44dea3c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Dec 2018 10:33:09 +0100
Subject: [PATCH 199/229] Bump wiremock from 2.19.0 to 2.20.0 (#4550)

Bumps [wiremock](https://github.com/tomakehurst/wiremock) from 2.19.0 to 2.20.0.
- [Release notes](https://github.com/tomakehurst/wiremock/releases)
- [Commits](https://github.com/tomakehurst/wiremock/compare/2.19.0...2.20.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a3a4dab3ca8..316926a5777 100644
--- a/build.gradle
+++ b/build.gradle
@@ -170,7 +170,7 @@ dependencies {
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'
     testCompile 'org.mockito:mockito-core:2.23.4'
-    testCompile 'com.github.tomakehurst:wiremock:2.19.0'
+    testCompile 'com.github.tomakehurst:wiremock:2.20.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.6.2'

From 05f3932b6b7c6c7f1ef8a54778ceb43f8998d839 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Dec 2018 10:33:44 +0100
Subject: [PATCH 200/229] Bump pdfbox from 2.0.12 to 2.0.13 (#4551)

Bumps pdfbox from 2.0.12 to 2.0.13.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 316926a5777..ec030bd2b24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,7 +96,7 @@ dependencies {
     compile 'com.jgoodies:jgoodies-common:1.8.1'
     compile 'com.jgoodies:jgoodies-forms:1.9.0'
 
-    compile 'org.apache.pdfbox:pdfbox:2.0.12'
+    compile 'org.apache.pdfbox:pdfbox:2.0.13'
     compile 'org.apache.pdfbox:fontbox:2.0.12'
     compile 'org.apache.pdfbox:xmpbox:2.0.12'
 

From 75b147e4baa4153ad986d60dda0b9542f272f875 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Dec 2018 11:06:56 +0100
Subject: [PATCH 201/229] Bump fontbox from 2.0.12 to 2.0.13 (#4552)

Bumps fontbox from 2.0.12 to 2.0.13.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ec030bd2b24..debb0d0b4a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -97,7 +97,7 @@ dependencies {
     compile 'com.jgoodies:jgoodies-forms:1.9.0'
 
     compile 'org.apache.pdfbox:pdfbox:2.0.13'
-    compile 'org.apache.pdfbox:fontbox:2.0.12'
+    compile 'org.apache.pdfbox:fontbox:2.0.13'
     compile 'org.apache.pdfbox:xmpbox:2.0.12'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635

From 26cd572d4e0587ddf763edc3f9be4caafb1844e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bitor=20Tonixa=20Biriato=20Balen=C3=A7a?= <balhau@gmail.com>
Date: Thu, 27 Dec 2018 11:20:29 +0000
Subject: [PATCH 202/229] Cleanup interfaces (#4553)

---
 .../org/jabref/gui/autocompleter/AutoCompletionStrategy.java  | 3 +--
 src/main/java/org/jabref/preferences/PreferencesService.java  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionStrategy.java b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionStrategy.java
index 50e835a3a9f..efde39c6561 100644
--- a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionStrategy.java
+++ b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionStrategy.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.autocompleter;
 
 public interface AutoCompletionStrategy {
-
-    public AutoCompletionInput analyze(String input);
+    AutoCompletionInput analyze(String input);
 }
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 00da6820019..97931addffa 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -35,9 +35,9 @@ public interface PreferencesService {
 
     void setCustomTabsNameAndFields(String name, String fields, int defNumber);
 
-    public void purgeSeries(String prefix, int number);
+    void purgeSeries(String prefix, int number);
 
-    public void updateEntryEditorTabList();
+    void updateEntryEditorTabList();
 
     List<TemplateExporter> getCustomExportFormats(JournalAbbreviationLoader loader);
 

From b936ba9c775efb9569f5aac142d19c50e460dcde Mon Sep 17 00:00:00 2001
From: Matthias Geiger <matthias.geiger@uni-bamberg.de>
Date: Fri, 28 Dec 2018 16:31:13 +0100
Subject: [PATCH 203/229] improve styling of preferences side menu (#4556)

---
 .../org/jabref/gui/preferences/PreferencesDialog.css   |  2 ++
 .../org/jabref/gui/preferences/PreferencesDialog.java  | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
index 21717a7709c..2b2d8c34859 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
@@ -1,5 +1,7 @@
 #sideMenu {
     -fx-background-color: -jr-white;
+    -fx-border-color: -fx-outer-border;
+    -fx-border-width: 1;
 }
 
 #sideMenu > .virtual-flow > .clipped-container > .sheet > .list-cell {
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 53a8d561a11..72da827e2e2 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -116,20 +116,21 @@ private void construct() {
 
         VBox buttonContainer = new VBox();
         buttonContainer.setAlignment(Pos.BOTTOM_LEFT);
+        buttonContainer.setSpacing(3.0);
         Button importPreferences = new Button(Localization.lang("Import preferences"));
         importPreferences.setTooltip(new Tooltip(Localization.lang("Import preferences from file")));
         importPreferences.setOnAction(e -> importPreferences());
-        importPreferences.getStyleClass().add("text-button");
+        importPreferences.setMaxWidth(Double.MAX_VALUE);
         Button exportPreferences = new Button(Localization.lang("Export preferences"));
         exportPreferences.setTooltip(new Tooltip(Localization.lang("Export preferences to file")));
         exportPreferences.setOnAction(e -> exportPreferences());
-        exportPreferences.getStyleClass().add("text-button");
+        exportPreferences.setMaxWidth(Double.MAX_VALUE);
         Button showPreferences = new Button(Localization.lang("Show preferences"));
         showPreferences.setOnAction(e -> new PreferencesFilterDialog(new JabRefPreferencesFilter(prefs)).setVisible(true));
-        showPreferences.getStyleClass().add("text-button");
+        showPreferences.setMaxWidth(Double.MAX_VALUE);
         Button resetPreferences = new Button(Localization.lang("Reset preferences"));
         resetPreferences.setOnAction(e -> resetPreferences());
-        resetPreferences.getStyleClass().add("text-button");
+        resetPreferences.setMaxWidth(Double.MAX_VALUE);
         buttonContainer.getChildren().addAll(
                 importPreferences,
                 exportPreferences,
@@ -138,6 +139,7 @@ private void construct() {
         );
 
         VBox spacer = new VBox();
+        spacer.setPrefHeight(10.0);
         VBox.setVgrow(tabsList, Priority.ALWAYS);
         VBox.setVgrow(spacer, Priority.SOMETIMES);
         vBox.getChildren().addAll(

From 3a09fa2e7ca8236670b45c5c4508a05ddae111fc Mon Sep 17 00:00:00 2001
From: conorfos <40298107+conorfos@users.noreply.github.com>
Date: Fri, 28 Dec 2018 18:47:17 +0000
Subject: [PATCH 204/229] Added extra stats to be sent with MrDLib
 recommendations (#4452)

---
 .../gui/entryeditor/RelatedArticlesTab.java   | 24 ++++++++++++++++---
 .../logic/importer/fetcher/MrDLibFetcher.java | 22 +++++++++++++----
 .../importer/fileformat/MrDLibImporter.java   |  4 ++--
 .../jabref/preferences/JabRefPreferences.java |  6 +++++
 src/main/resources/l10n/JabRef_en.properties  | 17 ++++++++++---
 .../fileformat/MrDLibImporterTest.java        |  2 +-
 6 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
index dbbe9ff096a..4bd30b7c614 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
@@ -4,6 +4,7 @@
 import java.util.List;
 
 import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.ScrollPane;
@@ -125,10 +126,12 @@ private ScrollPane getPrivacyDialog(BibEntry entry) {
 
         Button button = new Button(Localization.lang("I Agree"));
         button.setDefaultButton(true);
-        Text line1 = new Text(Localization.lang("Mr. DLib is an external service which provides article recommendations based on the currently selected entry. Data about the selected entry must be sent to Mr. DLib in order to provide these recommendations. Do you agree that this data may be sent?"));
 
+        Text line1 = new Text(Localization.lang("JabRef requests recommendations from Mr. DLib, which is an external service. To enable Mr. DLib to calculate recommendations, some of your data must be shared with Mr. DLib. Generally, the more data is shared the better recommendations can be calculated. However, we understand that some of your data in JabRef is sensitive, and you may not want to share it. Therefore, Mr. DLib offers a choice of which data you would like to share."));
         line1.setWrappingWidth(1300.0);
-        Text line2 = new Text(Localization.lang("This setting may be changed in preferences at any time."));
+        Text line2 = new Text(Localization.lang("Whatever option you choose, Mr. DLib may share its data with research partners to further improve recommendation quality as part of a 'living lab'. Mr. DLib may also release public datasets that may contain anonymized information about you and the recommendations (sensitive information such as metadata of your articles will be anonymised through e.g. hashing). Research partners are obliged to adhere to the same strict data protection policy as Mr. DLib."));
+        line2.setWrappingWidth(1300.0);
+        Text line3 = new Text(Localization.lang("This setting may be changed in preferences at any time."));
         Hyperlink mdlLink = new Hyperlink(Localization.lang("Further information about Mr DLib. for JabRef users."));
         mdlLink.setOnAction(event -> {
             try {
@@ -138,15 +141,30 @@ private ScrollPane getPrivacyDialog(BibEntry entry) {
                 dialogService.showErrorDialogAndWait(e);
             }
         });
+        VBox vb = new VBox();
+        CheckBox cbTitle = new CheckBox(Localization.lang("Entry Title (Required to deliver recommendations.)"));
+        cbTitle.setSelected(true);
+        cbTitle.setDisable(true);
+        CheckBox cbVersion = new CheckBox(Localization.lang("JabRef Version (Required to ensure backwards compatibility with Mr. DLib's Web Service)"));
+        cbVersion.setSelected(true);
+        cbVersion.setDisable(true);
+        CheckBox cbLanguage = new CheckBox(Localization.lang("JabRef Language (Provides for better recommendations by giving an indication of user's preferred language.)"));
+        CheckBox cbOS = new CheckBox(Localization.lang("Operating System (Provides for better recommendations by giving an indication of user's system set-up.)"));
+        CheckBox cbTimezone = new CheckBox(Localization.lang("Timezone (Provides for better recommendations by indicating the time of day the request is being made.)"));
+        vb.getChildren().addAll(cbTitle, cbVersion, cbLanguage, cbOS, cbTimezone);
+        vb.setSpacing(10);
 
         button.setOnAction(event -> {
             JabRefPreferences prefs = JabRefPreferences.getInstance();
             prefs.putBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS, true);
+            prefs.putBoolean(JabRefPreferences.SEND_LANGUAGE_DATA, cbLanguage.isSelected());
+            prefs.putBoolean(JabRefPreferences.SEND_OS_DATA, cbOS.isSelected());
+            prefs.putBoolean(JabRefPreferences.SEND_TIMEZONE_DATA, cbTimezone.isSelected());
             dialogService.showWarningDialogAndWait(Localization.lang("Restart"), Localization.lang("Please restart JabRef for preferences to take effect."));
             setContent(getRelatedArticlesPane(entry));
         });
 
-        vbox.getChildren().addAll(line1, mdlLink, line2, button);
+        vbox.getChildren().addAll(line1, line2, mdlLink, line3, vb, button);
         root.setContent(vbox);
 
         return root;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
index 2ae7db36e35..0e3e30898bd 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
@@ -4,6 +4,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Optional;
 
@@ -16,6 +17,7 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
+import org.jabref.preferences.JabRefPreferences;
 
 import org.apache.http.client.utils.URIBuilder;
 import org.slf4j.Logger;
@@ -27,6 +29,7 @@
 public class MrDLibFetcher implements EntryBasedFetcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(MrDLibFetcher.class);
     private static final String NAME = "MDL_FETCHER";
+    private static final String MDL_JABREF_PARTNER_ID = "1";
     private final String LANGUAGE;
     private final Version VERSION;
 
@@ -104,11 +107,22 @@ private String constructQuery(String queryWithTitle) {
         URIBuilder builder = new URIBuilder();
         builder.setScheme("http");
         builder.setHost(getMdlUrl());
-        builder.setPath("/v2/items/" + queryWithTitle + "/related_items");
-        builder.addParameter("partner_id", "jabref");
+        builder.setPath("/v2/documents/" + queryWithTitle + "/related_documents");
+        builder.addParameter("partner_id", MDL_JABREF_PARTNER_ID);
         builder.addParameter("app_id", "jabref_desktop");
         builder.addParameter("app_version", VERSION.getFullVersion());
-        builder.addParameter("app_lang", LANGUAGE);
+
+        JabRefPreferences prefs = JabRefPreferences.getInstance();
+        if (prefs.getBoolean(JabRefPreferences.SEND_LANGUAGE_DATA)) {
+            builder.addParameter("app_lang", LANGUAGE);
+        }
+        if (prefs.getBoolean(JabRefPreferences.SEND_OS_DATA)) {
+            builder.addParameter("os", System.getProperty("os.name"));
+        }
+        if (prefs.getBoolean(JabRefPreferences.SEND_TIMEZONE_DATA)) {
+            builder.addParameter("timezone", Calendar.getInstance().getTimeZone().getID());
+        }
+
         try {
             URI uri = builder.build();
             LOGGER.trace("Request: " + uri.toString());
@@ -120,6 +134,6 @@ private String constructQuery(String queryWithTitle) {
     }
 
     private String getMdlUrl() {
-        return VERSION.isDevelopmentVersion() ? "api-dev.darwingoliath.com" : "api.darwingoliath.com";
+        return VERSION.isDevelopmentVersion() ? "api-dev.darwingoliath.com" : "api.mr-dlib.org";
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
index 6320b8d7483..5bc8af04b8c 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
@@ -146,10 +146,10 @@ private RankedBibEntry populateBibEntry(JSONObject recommendation) {
         // parse each of the relevant fields into variables
         String authors = isRecommendationFieldPresent(recommendation, "authors") ? getAuthorsString(recommendation) : "";
         String title = isRecommendationFieldPresent(recommendation, "title") ? recommendation.getString("title") : "";
-        String year = isRecommendationFieldPresent(recommendation, "year_published") ? Integer.toString(recommendation.getInt("year_published")) : "";
+        String year = isRecommendationFieldPresent(recommendation, "published_year") ? Integer.toString(recommendation.getInt("published_year")) : "";
         String journal = isRecommendationFieldPresent(recommendation, "published_in") ? recommendation.getString("published_in") : "";
         String url = isRecommendationFieldPresent(recommendation, "url") ? recommendation.getString("url") : "";
-        Integer rank = isRecommendationFieldPresent(recommendation, "url") ? recommendation.getInt("recommendation_id") : 100;
+        Integer rank = isRecommendationFieldPresent(recommendation, "recommendation_id") ? recommendation.getInt("recommendation_id") : 100;
 
         // Populate bib entry with relevant data
         current.setField(FieldName.AUTHOR, authors);
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 692df3eec82..5d3d38d061e 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -297,6 +297,9 @@ public class JabRefPreferences implements PreferencesService {
     public static final String PUSH_TO_APPLICATION = "pushToApplication";
     public static final String SHOW_RECOMMENDATIONS = "showRecommendations";
     public static final String ACCEPT_RECOMMENDATIONS = "acceptRecommendations";
+    public static final String SEND_LANGUAGE_DATA = "sendLanguageData";
+    public static final String SEND_OS_DATA = "sendOSData";
+    public static final String SEND_TIMEZONE_DATA = "sendTimezoneData";
     public static final String VALIDATE_IN_ENTRY_EDITOR = "validateInEntryEditor";
     // Dropped file handler
     public static final String DROPPEDFILEHANDLER_RENAME = "DroppedFileHandler_RenameFile";
@@ -574,6 +577,9 @@ private JabRefPreferences() {
 
         defaults.put(SHOW_RECOMMENDATIONS, Boolean.TRUE);
         defaults.put(ACCEPT_RECOMMENDATIONS, Boolean.FALSE);
+        defaults.put(SEND_LANGUAGE_DATA, Boolean.FALSE);
+        defaults.put(SEND_OS_DATA, Boolean.FALSE);
+        defaults.put(SEND_TIMEZONE_DATA, Boolean.FALSE);
         defaults.put(VALIDATE_IN_ENTRY_EDITOR, Boolean.TRUE);
         defaults.put(EDITOR_EMACS_KEYBINDINGS, Boolean.FALSE);
         defaults.put(EDITOR_EMACS_KEYBINDINGS_REBIND_CA, Boolean.TRUE);
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 1af3cc0c045..b22353562b3 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -364,6 +364,8 @@ Entry\ table=Entry table
 
 Entry\ table\ columns=Entry table columns
 
+Entry\ Title\ (Required\ to\ deliver\ recommendations.)=Entry Title (Required to deliver recommendations.)
+
 Entry\ type=Entry type
 
 Entry\ type\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Entry type names are not allowed to contain white space or the following characters
@@ -573,8 +575,14 @@ Invalid\ URL=Invalid URL
 
 Online\ help=Online help
 
+JabRef\ Language\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ preferred\ language.)=JabRef Language (Provides for better recommendations by giving an indication of user's preferred language.)
+
 JabRef\ preferences=JabRef preferences
 
+JabRef\ requests\ recommendations\ from\ Mr.\ DLib,\ which\ is\ an\ external\ service.\ To\ enable\ Mr.\ DLib\ to\ calculate\ recommendations,\ some\ of\ your\ data\ must\ be\ shared\ with\ Mr.\ DLib.\ Generally,\ the\ more\ data\ is\ shared\ the\ better\ recommendations\ can\ be\ calculated.\ However,\ we\ understand\ that\ some\ of\ your\ data\ in\ JabRef\ is\ sensitive,\ and\ you\ may\ not\ want\ to\ share\ it.\ Therefore,\ Mr.\ DLib\ offers\ a\ choice\ of\ which\ data\ you\ would\ like\ to\ share.=JabRef requests recommendations from Mr. DLib, which is an external service. To enable Mr. DLib to calculate recommendations, some of your data must be shared with Mr. DLib. Generally, the more data is shared the better recommendations can be calculated. However, we understand that some of your data in JabRef is sensitive, and you may not want to share it. Therefore, Mr. DLib offers a choice of which data you would like to share.
+
+JabRef\ Version\ (Required\ to\ ensure\ backwards\ compatibility\ with\ Mr.\ DLib's\ Web\ Service)=JabRef Version (Required to ensure backwards compatibility with Mr. DLib's Web Service)
+
 Join=Join
 
 Joins\ selected\ keywords\ and\ deletes\ selected\ keywords.=Joins selected keywords and deletes selected keywords.
@@ -653,9 +661,6 @@ Move\ up=Move up
 
 Moved\ group\ "%0".=Moved group "%0".
 
-Mr.\ DLib\ is\ an\ external\ service\ which\ provides\ article\ recommendations\ based\ on\ the\ currently\ selected\ entry.\ Data\ about\ the\ selected\ entry\ must\ be\ sent\ to\ Mr.\ DLib\ in\ order\ to\ provide\ these\ recommendations.\ Do\ you\ agree\ that\ this\ data\ may\ be\ sent?=Mr. DLib is an external service which provides article recommendations based on the currently selected entry. Data about the selected entry must be sent to Mr. DLib in order to provide these recommendations. Do you agree that this data may be sent?
-
-
 Name=Name
 Name\ formatter=Name formatter
 
@@ -735,6 +740,8 @@ Opening=Opening
 
 Operation\ canceled.=Operation canceled.
 
+Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ system\ set-up.)=Operating System (Provides for better recommendations by giving an indication of user's system set-up.)
+
 Optional\ fields=Optional fields
 
 Options=Options
@@ -1070,6 +1077,8 @@ This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=This operat
 
 This\ setting\ may\ be\ changed\ in\ preferences\ at\ any\ time.=This setting may be changed in preferences at any time.
 
+Timezone\ (Provides\ for\ better\ recommendations\ by\ indicating\ the\ time\ of\ day\ the\ request\ is\ being\ made.)=Timezone (Provides for better recommendations by indicating the time of day the request is being made.)
+
 Toggle\ entry\ preview=Toggle entry preview
 Toggle\ groups\ interface=Toggle groups interface
 
@@ -1135,6 +1144,8 @@ web\ link=web link
 
 What\ do\ you\ want\ to\ do?=What do you want to do?
 
+Whatever\ option\ you\ choose,\ Mr.\ DLib\ may\ share\ its\ data\ with\ research\ partners\ to\ further\ improve\ recommendation\ quality\ as\ part\ of\ a\ 'living\ lab'.\ Mr.\ DLib\ may\ also\ release\ public\ datasets\ that\ may\ contain\ anonymized\ information\ about\ you\ and\ the\ recommendations\ (sensitive\ information\ such\ as\ metadata\ of\ your\ articles\ will\ be\ anonymised\ through\ e.g.\ hashing).\ Research\ partners\ are\ obliged\ to\ adhere\ to\ the\ same\ strict\ data\ protection\ policy\ as\ Mr.\ DLib.=Whatever option you choose, Mr. DLib may share its data with research partners to further improve recommendation quality as part of a 'living lab'. Mr. DLib may also release public datasets that may contain anonymized information about you and the recommendations (sensitive information such as metadata of your articles will be anonymised through e.g. hashing). Research partners are obliged to adhere to the same strict data protection policy as Mr. DLib.
+
 When\ adding/removing\ keywords,\ separate\ them\ by=When adding/removing keywords, separate them by
 Will\ write\ XMP-metadata\ to\ the\ PDFs\ linked\ from\ selected\ entries.=Will write XMP-metadata to the PDFs linked from selected entries.
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
index 5af07b4dfa3..723afd1b6fc 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
@@ -24,7 +24,7 @@ public class MrDLibImporterTest {
     @BeforeEach
     public void setUp() {
         importer = new MrDLibImporter();
-        String testInput = "{    \"label\": {        \"label-language\": \"en\",        \"label-text\": \"Related Items\"    },    \"recommendation-set-id\": \"1\",    \"recommendations\": {        \"74021358\": {            \"abstract\": \"abstract\",            \"authors\": [                \"Sajovic, Marija\"         ],            \"year_published\": \"2006\",            \"item_id_original\": \"12088644\",            \"keywords\": [                \"visoko\\u0161olski program Geodezija - smer Prostorska informatika\"            ],            \"language_provided\": \"sl\",            \"recommendation_id\": \"1\",            \"title\": \"The protection of rural lands with the spatial development strategy on the case of Hrastnik commune\",            \"url\": \"http://drugg.fgg.uni-lj.si/701/1/GEV_0199_Sajovic.pdf\"        },        \"82005804\": {            \"abstract\": \"abstract\",            \"year_published\": null,            \"item_id_original\": \"30145702\",            \"language_provided\": null,            \"recommendation_id\": \"2\",            \"title\": \"Engagement of the volunteers in the solution to the accidents in the South-Moravia region\"        },        \"82149599\": {            \"abstract\": \"abstract\",            \"year_published\": null,            \"item_id_original\": \"97690763\",            \"language_provided\": null,            \"recommendation_id\": \"3\",            \"title\": \"\\\"The only Father's word\\\". The relationship of the Father and the Son in the documents of saint John of the Cross\",            \"url\": \"http://www.nusl.cz/ntk/nusl-285711\"        },        \"84863921\": {            \"abstract\": \"abstract\",            \"authors\": [                \"Kaffa, Elena\"            ],            \"year_published\": null,            \"item_id_original\": \"19397104\",            \"keywords\": [                \"BX\",                \"D111\"            ],            \"language_provided\": \"en\",            \"recommendation_id\": \"4\",            \"title\": \"Greek Church of Cyprus, the Morea and Constantinople during the Frankish Era (1196-1303)\"        },        \"88950992\": {            \"abstract\": \"abstract\",            \"authors\": [                \"Yasui, Kono\"            ],            \"year_published\": null,            \"item_id_original\": \"38763657\",            \"language_provided\": null,            \"recommendation_id\": \"5\",            \"title\": \"A Phylogenetic Consideration on the Vascular Plants, Cotyledonary Node Including Hypocotyl Being Taken as the Ancestral Form : A Preliminary Note\"        }    }}";
+        String testInput = "{    \"label\": {        \"label-language\": \"en\",        \"label-text\": \"Related Items\"    },    \"recommendation-set-id\": \"1\",    \"recommendations\": {        \"74021358\": {            \"abstract\": \"abstract\",            \"authors\": [                \"Sajovic, Marija\"         ],            \"published_year\": \"2006\",            \"item_id_original\": \"12088644\",            \"keywords\": [                \"visoko\\u0161olski program Geodezija - smer Prostorska informatika\"            ],            \"language_provided\": \"sl\",            \"recommendation_id\": \"1\",            \"title\": \"The protection of rural lands with the spatial development strategy on the case of Hrastnik commune\",            \"url\": \"http://drugg.fgg.uni-lj.si/701/1/GEV_0199_Sajovic.pdf\"        },        \"82005804\": {            \"abstract\": \"abstract\",            \"year_published\": null,            \"item_id_original\": \"30145702\",            \"language_provided\": null,            \"recommendation_id\": \"2\",            \"title\": \"Engagement of the volunteers in the solution to the accidents in the South-Moravia region\"        },        \"82149599\": {            \"abstract\": \"abstract\",            \"year_published\": null,            \"item_id_original\": \"97690763\",            \"language_provided\": null,            \"recommendation_id\": \"3\",            \"title\": \"\\\"The only Father's word\\\". The relationship of the Father and the Son in the documents of saint John of the Cross\",            \"url\": \"http://www.nusl.cz/ntk/nusl-285711\"        },        \"84863921\": {            \"abstract\": \"abstract\",            \"authors\": [                \"Kaffa, Elena\"            ],            \"year_published\": null,            \"item_id_original\": \"19397104\",            \"keywords\": [                \"BX\",                \"D111\"            ],            \"language_provided\": \"en\",            \"recommendation_id\": \"4\",            \"title\": \"Greek Church of Cyprus, the Morea and Constantinople during the Frankish Era (1196-1303)\"        },        \"88950992\": {            \"abstract\": \"abstract\",            \"authors\": [                \"Yasui, Kono\"            ],            \"year_published\": null,            \"item_id_original\": \"38763657\",            \"language_provided\": null,            \"recommendation_id\": \"5\",            \"title\": \"A Phylogenetic Consideration on the Vascular Plants, Cotyledonary Node Including Hypocotyl Being Taken as the Ancestral Form : A Preliminary Note\"        }    }}";
         input = new BufferedReader(new StringReader(testInput));
     }
 

From cd1e795e91a0f36ea33386c47f06e31e7f812481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bitor=20Tonixa=20Biriato=20Balen=C3=A7a?= <balhau@gmail.com>
Date: Fri, 28 Dec 2018 22:39:28 +0000
Subject: [PATCH 205/229] Refactor BibEntry deprecated method (#4554)

* Refactor BibEntry deprecated method

* Fixed error

* More on checkstyle fixing

* Fixed checkstyle issues

* Added custom entrytype for types not registered in the enumerator.

* Added getTypeOrDefault method refactor code to use it and fix NPE problem

* Fixing checkstyle rules

* More on checkstyle

* More on getType getTypeOrDefault replacement

* Revert Article EntryType into Electronic

* Added break line between different packages

* Refactor BibtextEntryTypes.getTypeOrDefault method

* Removed unused import

* Removed extra new line, checkstyle error fixing
---
 .../fileformat/BiblioscapeImporter.java       |  3 +-
 .../importer/fileformat/BibtexParser.java     |  4 ++-
 .../importer/fileformat/CopacImporter.java    |  3 +-
 .../importer/fileformat/EndnoteImporter.java  |  3 +-
 .../logic/importer/fileformat/GvkParser.java  |  3 +-
 .../importer/fileformat/InspecImporter.java   |  3 +-
 .../importer/fileformat/IsiImporter.java      |  3 +-
 .../importer/fileformat/MedlineImporter.java  |  5 ++--
 .../fileformat/MedlinePlainImporter.java      |  3 +-
 .../importer/fileformat/OvidImporter.java     |  3 +-
 .../importer/fileformat/RisImporter.java      |  3 +-
 .../fileformat/SilverPlatterImporter.java     |  3 +-
 .../jabref/logic/msbib/BibTeXConverter.java   |  3 +-
 .../java/org/jabref/logic/util/TestEntry.java |  3 +-
 .../java/org/jabref/model/entry/BibEntry.java |  4 +--
 .../jabref/model/entry/BibtexEntryTypes.java  |  4 +++
 .../AutoSetFileLinksUtilTest.java             |  3 +-
 .../org/jabref/logic/TypedBibEntryTest.java   | 11 ++++----
 .../logic/bibtex/BibEntryWriterTest.java      |  9 +++---
 .../logic/bibtex/DuplicateCheckTest.java      | 28 +++++++++----------
 .../comparator/FieldComparatorTest.java       | 15 +++++-----
 .../cleanup/BibtexBiblatexRoundtripTest.java  |  5 ++--
 .../fetcher/ACMPortalFetcherTest.java         |  2 +-
 .../importer/fetcher/INSPIREFetcherTest.java  |  2 +-
 .../importer/fileformat/BibtexParserTest.java |  5 ++--
 .../org/jabref/logic/layout/LayoutTest.java   |  3 +-
 .../pdf/EntryAnnotationImporterTest.java      |  3 +-
 .../jabref/logic/search/SearchQueryTest.java  | 12 ++++----
 .../util/io/CiteKeyBasedFileFinderTest.java   |  2 +-
 .../util/io/RegExpBasedFileFinderTests.java   |  8 +++---
 .../jabref/model/BibDatabaseContextTest.java  |  3 +-
 .../BibDatabaseModeDetectionTest.java         | 22 +++++++--------
 .../model/database/BibDatabaseTest.java       |  9 ++++--
 .../org/jabref/model/entry/BibEntryTests.java |  8 +++---
 .../model/entry/CanonicalBibEntryTest.java    |  4 +--
 .../rules/ContainBasedSearchRuleTest.java     |  2 +-
 36 files changed, 120 insertions(+), 89 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java
index 99e0e0a6ab1..f1a847bf5a0 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java
@@ -13,6 +13,7 @@
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 
 /**
@@ -255,7 +256,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 if (!comments.isEmpty()) { // set comment if present
                     hm.put(FieldName.COMMENT, String.join(";", comments));
                 }
-                BibEntry b = new BibEntry(bibtexType);
+                BibEntry b = new BibEntry(BibtexEntryTypes.getTypeOrDefault(bibtexType));
                 b.setField(hm);
                 bibItems.add(b);
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
index 16093dca0b3..06accaed956 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -29,6 +29,7 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.KeyCollisionException;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.entry.CustomEntryType;
 import org.jabref.model.entry.EntryType;
@@ -504,7 +505,8 @@ private String parsePreamble() throws IOException {
     }
 
     private BibEntry parseEntry(String entryType) throws IOException {
-        BibEntry result = new BibEntry(entryType);
+        BibEntry result = new BibEntry(BibtexEntryTypes.getTypeOrDefault(entryType));
+
         skipWhitespace();
         consume('{', '(');
         int character = peek();
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
index 5ed722b8bb2..a3c09f6ae2f 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
@@ -11,6 +11,7 @@
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 
 /**
@@ -98,7 +99,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
 
             // Copac does not contain enough information on the type of the
             // document. A book is assumed.
-            BibEntry b = new BibEntry("book");
+            BibEntry b = new BibEntry(BibtexEntryTypes.BOOK);
 
             String[] lines = entry.split("\n");
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
index 2f51300d43d..119f947d3ec 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
@@ -15,6 +15,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 
 /**
@@ -253,7 +254,7 @@ else if ("P".equals(prefix)) {
                 hm.put(FieldName.PAGES, artnum);
             }
 
-            BibEntry b = new BibEntry(type);
+            BibEntry b = new BibEntry(BibtexEntryTypes.getTypeOrDefault(type));
             b.setField(hm);
             if (!b.getFieldNames().isEmpty()) {
                 bibitems.add(b);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java b/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java
index a13fed8d53d..99b01ba20e7 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java
@@ -12,6 +12,7 @@
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 
 import com.google.common.base.Strings;
@@ -360,7 +361,7 @@ private BibEntry parseEntry(Element e) {
          * dann @incollection annehmen, wenn weder ISBN noch
          * ZDB-ID vorhanden sind.
          */
-        BibEntry result = new BibEntry(entryType);
+        BibEntry result = new BibEntry(BibtexEntryTypes.getTypeOrDefault(entryType));
 
         // Zuordnung der Felder in Abhängigkeit vom Dokumenttyp
         if (author != null) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java
index 1b47f8bde40..36009366535 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java
@@ -13,6 +13,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 
 /**
@@ -120,7 +121,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     }
                 }
             }
-            BibEntry b = new BibEntry(type);
+            BibEntry b = new BibEntry(BibtexEntryTypes.getTypeOrDefault(type));
             b.setField(h);
 
             bibitems.add(b);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
index db686fcd1a3..1db5b39feeb 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
@@ -17,6 +17,7 @@
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.Month;
 
@@ -301,7 +302,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 continue;
             }
 
-            BibEntry b = new BibEntry(Type);
+            BibEntry b = new BibEntry(BibtexEntryTypes.getTypeOrDefault(Type));
             // id assumes an existing database so don't
 
             // Remove empty fields:
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
index 8adf2a0a142..934219824cd 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
@@ -74,6 +74,7 @@
 import org.jabref.logic.importer.fileformat.medline.Text;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.strings.StringUtil;
 
@@ -262,7 +263,7 @@ private void parseBookArticle(PubmedBookArticle currentArticle, List<BibEntry> b
             putIfValueNotNull(fields, "pubstatus", bookData.getPublicationStatus());
         }
 
-        BibEntry entry = new BibEntry("article");
+        BibEntry entry = new BibEntry(BibtexEntryTypes.ARTICLE);
         entry.setField(fields);
 
         bibItems.add(entry);
@@ -410,7 +411,7 @@ private void parseArticle(PubmedArticle article, List<BibEntry> bibItems) {
             }
         }
 
-        BibEntry entry = new BibEntry("article");
+        BibEntry entry = new BibEntry(BibtexEntryTypes.ARTICLE);
         entry.setField(fields);
 
         bibItems.add(entry);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
index dcaf590cbfe..1389c15d40e 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
@@ -16,6 +16,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 
 /**
@@ -208,7 +209,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 fields.put(FieldName.COMMENT, comment);
             }
 
-            BibEntry b = new BibEntry(type);
+            BibEntry b = new BibEntry(BibtexEntryTypes.getTypeOrDefault(type));
 
             // Remove empty fields:
             fields.entrySet().stream().filter(n -> n.getValue().trim().isEmpty()).forEach(fields::remove);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
index 26ec3309987..23107e695cf 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
@@ -14,6 +14,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 
 /**
@@ -207,7 +208,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 // Move the "chaptertitle" to just "title":
                 h.put(FieldName.TITLE, h.remove("chaptertitle"));
             }
-            BibEntry b = new BibEntry(entryType);
+            BibEntry b = new BibEntry(BibtexEntryTypes.getTypeOrDefault(entryType));
             b.setField(h);
 
             bibitems.add(b);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
index 116e08e5539..d778dd3d357 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
@@ -16,6 +16,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.Month;
 
@@ -265,7 +266,7 @@ else if ("AV".equals(tag)) {
 
             // create one here
             // type is set in the loop above
-            BibEntry entry = new BibEntry(type);
+            BibEntry entry = new BibEntry(BibtexEntryTypes.getTypeOrDefault(type));
             entry.setField(fields);
             // month has a special treatment as we use the separate method "setMonth" of BibEntry instead of directly setting the value
             month.ifPresent(entry::setMonth);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
index e3cea08b106..1b1d0f96559 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
@@ -14,6 +14,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 
 /**
@@ -180,7 +181,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
 
             }
 
-            BibEntry b = new BibEntry(type);
+            BibEntry b = new BibEntry(BibtexEntryTypes.getTypeOrDefault(type));
             // create one here
             b.setField(h);
 
diff --git a/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java b/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java
index 42b36413a82..a95721fedd7 100644
--- a/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java
+++ b/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java
@@ -9,6 +9,7 @@
 import java.util.stream.Collectors;
 
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.Month;
 
@@ -29,7 +30,7 @@ public static BibEntry convert(MSBibEntry entry) {
         Map<String, String> fieldValues = new HashMap<>();
 
         String bibTexEntryType = MSBibMapping.getBiblatexEntryType(entry.getType());
-        result = new BibEntry(bibTexEntryType);
+        result = new BibEntry(BibtexEntryTypes.getTypeOrDefault(bibTexEntryType));
 
         // add String fields
         for (Map.Entry<String, String> field : entry.fields.entrySet()) {
diff --git a/src/main/java/org/jabref/logic/util/TestEntry.java b/src/main/java/org/jabref/logic/util/TestEntry.java
index 8d2b3920b87..6c98136c848 100644
--- a/src/main/java/org/jabref/logic/util/TestEntry.java
+++ b/src/main/java/org/jabref/logic/util/TestEntry.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.util;
 
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
 
 public class TestEntry {
@@ -10,7 +11,7 @@ private TestEntry() {
 
     public static BibEntry getTestEntry() {
 
-        BibEntry entry = new BibEntry("article");
+        BibEntry entry = new BibEntry(BibtexEntryTypes.ARTICLE);
         entry.setCiteKey("Smith2016");
         entry.setField(FieldName.AUTHOR, "Smith, Bill and Jones, Bob and Williams, Jeff");
         entry.setField(FieldName.EDITOR, "Taylor, Phil");
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index 370b3d655df..5a59a45fc6c 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -111,7 +111,7 @@ private BibEntry(String id, String type) {
      * Constructs a new BibEntry. The internal ID is set to IdGenerator.next()
      */
     public BibEntry(EntryType type) {
-        this(type.getName());
+        this(IdGenerator.next(),type.getName());
     }
 
     public Optional<FieldChange> setMonth(Month parsedMonth) {
@@ -544,7 +544,7 @@ private boolean atLeastOnePresent(String[] fieldsToCheck, BibDatabase database)
      */
     @Override
     public Object clone() {
-        BibEntry clone = new BibEntry(type.getValue());
+        BibEntry clone = new BibEntry(IdGenerator.next(),type.getValue());
         clone.fields = FXCollections.observableMap(new ConcurrentHashMap<>(fields));
         return clone;
     }
diff --git a/src/main/java/org/jabref/model/entry/BibtexEntryTypes.java b/src/main/java/org/jabref/model/entry/BibtexEntryTypes.java
index 352411976e5..04909d1b954 100644
--- a/src/main/java/org/jabref/model/entry/BibtexEntryTypes.java
+++ b/src/main/java/org/jabref/model/entry/BibtexEntryTypes.java
@@ -287,4 +287,8 @@ private BibtexEntryTypes() {
     public static Optional<EntryType> getType(String name) {
         return ALL.stream().filter(e -> e.getName().equalsIgnoreCase(name)).findFirst();
     }
+
+    public static EntryType getTypeOrDefault(String name) {
+        return getType(name).orElseGet(() -> new CustomEntryType(name, "required", "optional"));
+    }
 }
diff --git a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
index e25495e99f2..ae1b46fe557 100644
--- a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
@@ -10,6 +10,7 @@
 import org.jabref.logic.util.io.AutoLinkPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.metadata.FilePreferences;
 
@@ -30,7 +31,7 @@ public class AutoSetFileLinksUtilTest {
     private final AutoLinkPreferences autoLinkPrefs = new AutoLinkPreferences(false, "", true, ';');
     private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
     private final ExternalFileTypes externalFileTypes = mock(ExternalFileTypes.class);
-    private final BibEntry entry = new BibEntry("article");
+    private final BibEntry entry = new BibEntry(BibtexEntryTypes.ARTICLE);
 
     @BeforeEach
     public void setUp(@TempDirectory.TempDir Path folder) throws Exception {
diff --git a/src/test/java/org/jabref/logic/TypedBibEntryTest.java b/src/test/java/org/jabref/logic/TypedBibEntryTest.java
index 8b72810ecc9..9415bdcd28c 100644
--- a/src/test/java/org/jabref/logic/TypedBibEntryTest.java
+++ b/src/test/java/org/jabref/logic/TypedBibEntryTest.java
@@ -3,6 +3,7 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibtexEntryTypes;
+import org.jabref.model.entry.CustomEntryType;
 
 import org.junit.jupiter.api.Test;
 
@@ -14,7 +15,7 @@ public class TypedBibEntryTest {
 
     @Test
     public void hasAllRequiredFieldsFail() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE);
         e.setField("author", "abc");
         e.setField("title", "abc");
         e.setField("journal", "abc");
@@ -25,7 +26,7 @@ public void hasAllRequiredFieldsFail() {
 
     @Test
     public void hasAllRequiredFields() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE);
         e.setField("author", "abc");
         e.setField("title", "abc");
         e.setField("journal", "abc");
@@ -37,7 +38,7 @@ public void hasAllRequiredFields() {
 
     @Test
     public void hasAllRequiredFieldsForUnknownTypeReturnsTrue() {
-        BibEntry e = new BibEntry("articlllleeeee");
+        BibEntry e = new BibEntry(new CustomEntryType("articlllleeeee","required","optional"));
 
         TypedBibEntry typedEntry = new TypedBibEntry(e, BibDatabaseMode.BIBTEX);
         assertTrue(typedEntry.hasAllRequiredFields());
@@ -45,7 +46,7 @@ public void hasAllRequiredFieldsForUnknownTypeReturnsTrue() {
 
     @Test
     public void getTypeForDisplayReturnsTypeName() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS);
 
         TypedBibEntry typedEntry = new TypedBibEntry(e, BibDatabaseMode.BIBTEX);
         assertEquals("InProceedings", typedEntry.getTypeForDisplay());
@@ -53,7 +54,7 @@ public void getTypeForDisplayReturnsTypeName() {
 
     @Test
     public void getTypeForDisplayForUnknownTypeCapitalizeFirstLetter() {
-        BibEntry e = new BibEntry("articlllleeeee");
+        BibEntry e = new BibEntry(new CustomEntryType("articlllleeeee","required","optional"));
 
         TypedBibEntry typedEntry = new TypedBibEntry(e, BibDatabaseMode.BIBTEX);
         assertEquals("Articlllleeeee", typedEntry.getTypeForDisplay());
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
index a340fdc7b59..e7e9808bc8a 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
@@ -13,6 +13,7 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BiblatexEntryTypes;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -43,7 +44,7 @@ public void setUpWriter() {
     public void testSerialization() throws IOException {
         StringWriter stringWriter = new StringWriter();
 
-        BibEntry entry = new BibEntry("article");
+        BibEntry entry = new BibEntry(BibtexEntryTypes.ARTICLE);
         //set a required field
         entry.setField("author", "Foo Bar");
         entry.setField("journal", "International Journal of Something");
@@ -405,7 +406,7 @@ public void addFieldWithLongerLength() throws IOException {
     public void doNotWriteEmptyFields() throws IOException {
         StringWriter stringWriter = new StringWriter();
 
-        BibEntry entry = new BibEntry("article");
+        BibEntry entry = new BibEntry(BibtexEntryTypes.ARTICLE);
         entry.setField("author", "  ");
         entry.setField("note", "some note");
 
@@ -424,7 +425,7 @@ public void doNotWriteEmptyFields() throws IOException {
     public void trimFieldContents() throws IOException {
         StringWriter stringWriter = new StringWriter();
 
-        BibEntry entry = new BibEntry("article");
+        BibEntry entry = new BibEntry(BibtexEntryTypes.ARTICLE);
         entry.setField("note", "        some note    \t");
 
         writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX);
@@ -442,7 +443,7 @@ public void trimFieldContents() throws IOException {
     public void writeThrowsErrorIfFieldContainsUnbalancedBraces() {
         StringWriter stringWriter = new StringWriter();
 
-        BibEntry entry = new BibEntry("article");
+        BibEntry entry = new BibEntry(BibtexEntryTypes.ARTICLE);
         entry.setField("note", "some text with unbalanced { braces");
 
         assertThrows(IOException.class, () -> writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX));
diff --git a/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java b/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java
index ace796173fe..7f3dbfcdd55 100644
--- a/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java
@@ -21,22 +21,22 @@ public class DuplicateCheckTest {
 
     @BeforeEach
     public void setUp() {
-        simpleArticle = new BibEntry(BibtexEntryTypes.ARTICLE.getName())
+        simpleArticle = new BibEntry(BibtexEntryTypes.ARTICLE)
                 .withField(FieldName.AUTHOR, "Single Author")
                 .withField(FieldName.TITLE, "A serious paper about something")
                 .withField(FieldName.YEAR, "2017");
-        unrelatedArticle = new BibEntry(BibtexEntryTypes.ARTICLE.getName())
+        unrelatedArticle = new BibEntry(BibtexEntryTypes.ARTICLE)
                 .withField(FieldName.AUTHOR, "Completely Different")
                 .withField(FieldName.TITLE, "Holy Moly Uffdada und Trallalla")
                 .withField(FieldName.YEAR, "1992");
-        simpleInbook = new BibEntry(BibtexEntryTypes.INBOOK.getName())
+        simpleInbook = new BibEntry(BibtexEntryTypes.INBOOK)
                 .withField(FieldName.TITLE, "Alice in Wonderland")
                 .withField(FieldName.AUTHOR, "Charles Lutwidge Dodgson")
                 .withField(FieldName.CHAPTER, "Chapter One – Down the Rabbit Hole")
                 .withField(FieldName.LANGUAGE, "English")
                 .withField(FieldName.PUBLISHER, "Macmillan")
                 .withField(FieldName.YEAR, "1865");
-        simpleIncollection = new BibEntry(BibtexEntryTypes.INCOLLECTION.getName())
+        simpleIncollection = new BibEntry(BibtexEntryTypes.INCOLLECTION)
                 .withField(FieldName.TITLE, "Innovation and Intellectual Property Rights")
                 .withField(FieldName.AUTHOR, "Ove Grandstrand")
                 .withField(FieldName.BOOKTITLE, "The Oxford Handbook of Innovation")
@@ -46,9 +46,9 @@ public void setUp() {
 
     @Test
     public void testDuplicateDetection() {
-        BibEntry one = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry one = new BibEntry(BibtexEntryTypes.ARTICLE);
 
-        BibEntry two = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry two = new BibEntry(BibtexEntryTypes.ARTICLE);
 
         one.setField("author", "Billy Bob");
         two.setField("author", "Billy Bob");
@@ -204,14 +204,14 @@ public void inbookWithoutChapterCouldBeDuplicateOfInbookWithChapter() {
 
     @Test
     public void twoBooksWithDifferentEditionsAreNotDuplicates() {
-        BibEntry editionOne = new BibEntry(BibtexEntryTypes.BOOK.getName());
+        BibEntry editionOne = new BibEntry(BibtexEntryTypes.BOOK);
         editionOne.setField(FieldName.TITLE, "Effective Java");
         editionOne.setField(FieldName.AUTHOR, "Bloch, Joshua");
         editionOne.setField(FieldName.PUBLISHER, "Prentice Hall");
         editionOne.setField(FieldName.DATE, "2001");
         editionOne.setField(FieldName.EDITION, "1");
 
-        BibEntry editionTwo = new BibEntry(BibtexEntryTypes.BOOK.getName());
+        BibEntry editionTwo = new BibEntry(BibtexEntryTypes.BOOK);
         editionTwo.setField(FieldName.TITLE, "Effective Java");
         editionTwo.setField(FieldName.AUTHOR, "Bloch, Joshua");
         editionTwo.setField(FieldName.PUBLISHER, "Prentice Hall");
@@ -223,13 +223,13 @@ public void twoBooksWithDifferentEditionsAreNotDuplicates() {
 
     @Test
     public void sameBooksWithMissingEditionAreDuplicates() {
-        BibEntry editionOne = new BibEntry(BibtexEntryTypes.BOOK.getName());
+        BibEntry editionOne = new BibEntry(BibtexEntryTypes.BOOK);
         editionOne.setField(FieldName.TITLE, "Effective Java");
         editionOne.setField(FieldName.AUTHOR, "Bloch, Joshua");
         editionOne.setField(FieldName.PUBLISHER, "Prentice Hall");
         editionOne.setField(FieldName.DATE, "2001");
 
-        BibEntry editionTwo = new BibEntry(BibtexEntryTypes.BOOK.getName());
+        BibEntry editionTwo = new BibEntry(BibtexEntryTypes.BOOK);
         editionTwo.setField(FieldName.TITLE, "Effective Java");
         editionTwo.setField(FieldName.AUTHOR, "Bloch, Joshua");
         editionTwo.setField(FieldName.PUBLISHER, "Prentice Hall");
@@ -240,13 +240,13 @@ public void sameBooksWithMissingEditionAreDuplicates() {
 
     @Test
     public void sameBooksWithPartiallyMissingEditionAreDuplicates() {
-        BibEntry editionOne = new BibEntry(BibtexEntryTypes.BOOK.getName());
+        BibEntry editionOne = new BibEntry(BibtexEntryTypes.BOOK);
         editionOne.setField(FieldName.TITLE, "Effective Java");
         editionOne.setField(FieldName.AUTHOR, "Bloch, Joshua");
         editionOne.setField(FieldName.PUBLISHER, "Prentice Hall");
         editionOne.setField(FieldName.DATE, "2001");
 
-        BibEntry editionTwo = new BibEntry(BibtexEntryTypes.BOOK.getName());
+        BibEntry editionTwo = new BibEntry(BibtexEntryTypes.BOOK);
         editionTwo.setField(FieldName.TITLE, "Effective Java");
         editionTwo.setField(FieldName.AUTHOR, "Bloch, Joshua");
         editionTwo.setField(FieldName.PUBLISHER, "Prentice Hall");
@@ -258,7 +258,7 @@ public void sameBooksWithPartiallyMissingEditionAreDuplicates() {
 
     @Test
     public void sameBooksWithDifferentEditionsAreNotDuplicates() {
-        BibEntry editionTwo = new BibEntry(BibtexEntryTypes.BOOK.getName());
+        BibEntry editionTwo = new BibEntry(BibtexEntryTypes.BOOK);
         editionTwo.setCiteKey("Sutton17reinfLrnIntroBook");
         editionTwo.setField(FieldName.TITLE, "Reinforcement learning:An introduction");
         editionTwo.setField(FieldName.PUBLISHER, "MIT Press");
@@ -269,7 +269,7 @@ public void sameBooksWithDifferentEditionsAreNotDuplicates() {
         editionTwo.setField(FieldName.JOURNAL, "MIT Press");
         editionTwo.setField(FieldName.URL, "https://webdocs.cs.ualberta.ca/~sutton/book/the-book-2nd.html");
 
-        BibEntry editionOne = new BibEntry(BibtexEntryTypes.BOOK.getName());
+        BibEntry editionOne = new BibEntry(BibtexEntryTypes.BOOK);
         editionOne.setCiteKey("Sutton98reinfLrnIntroBook");
         editionOne.setField(FieldName.TITLE, "Reinforcement learning: An introduction");
         editionOne.setField(FieldName.PUBLISHER, "MIT press Cambridge");
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java
index 80742aff2ab..02ee8ea0907 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.bibtex.comparator;
 
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 
 import org.junit.jupiter.api.Test;
 
@@ -94,7 +95,7 @@ public void compareYearFieldBiggerDescending() throws Exception {
     @Test
     public void compareTypeFieldIdentity() throws Exception {
         FieldComparator comparator = new FieldComparator("entrytype");
-        BibEntry equal = new BibEntry("article");
+        BibEntry equal = new BibEntry(BibtexEntryTypes.ARTICLE);
 
         assertEquals(0, comparator.compare(equal, equal));
     }
@@ -102,9 +103,9 @@ public void compareTypeFieldIdentity() throws Exception {
     @Test
     public void compareTypeFieldEquality() throws Exception {
         FieldComparator comparator = new FieldComparator("entrytype");
-        BibEntry equal = new BibEntry("article");
+        BibEntry equal = new BibEntry(BibtexEntryTypes.ARTICLE);
         equal.setId("1");
-        BibEntry equal2 = new BibEntry("article");
+        BibEntry equal2 = new BibEntry(BibtexEntryTypes.ARTICLE);
         equal2.setId("1");
 
         assertEquals(0, comparator.compare(equal, equal2));
@@ -113,8 +114,8 @@ public void compareTypeFieldEquality() throws Exception {
     @Test
     public void compareTypeFieldBiggerAscending() throws Exception {
         FieldComparator comparator = new FieldComparator("entrytype");
-        BibEntry smaller = new BibEntry("article");
-        BibEntry bigger = new BibEntry("book");
+        BibEntry smaller = new BibEntry(BibtexEntryTypes.ARTICLE);
+        BibEntry bigger = new BibEntry(BibtexEntryTypes.BOOK);
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
@@ -122,8 +123,8 @@ public void compareTypeFieldBiggerAscending() throws Exception {
     @Test
     public void compareTypeFieldBiggerDescending() throws Exception {
         FieldComparator comparator = new FieldComparator("entrytype", true);
-        BibEntry bigger = new BibEntry("article");
-        BibEntry smaller = new BibEntry("book");
+        BibEntry bigger = new BibEntry(BibtexEntryTypes.ARTICLE);
+        BibEntry smaller = new BibEntry(BibtexEntryTypes.BOOK);
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
diff --git a/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java b/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java
index 1a2e903673f..01da069febd 100644
--- a/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.cleanup;
 
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -13,7 +14,7 @@ class BibtexBiblatexRoundtripTest {
 
     @BeforeEach
     void setUp() {
-        bibtex = new BibEntry("article");
+        bibtex = new BibEntry(BibtexEntryTypes.ARTICLE);
         bibtex.setField("author", "Frame, J. S. and Robinson, G. de B. and Thrall, R. M.");
         bibtex.setField("title", "The hook graphs of the symmetric groups");
         bibtex.setField("journal", "Canadian J. Math.");
@@ -26,7 +27,7 @@ void setUp() {
         bibtex.setField("mrnumber", "0062127");
         bibtex.setField("mrreviewer", "D. E. Littlewood");
 
-        biblatex = new BibEntry("article");
+        biblatex = new BibEntry(BibtexEntryTypes.ARTICLE);
         biblatex.setField("author", "Frame, J. S. and Robinson, G. de B. and Thrall, R. M.");
         biblatex.setField("title", "The hook graphs of the symmetric groups");
         biblatex.setField("journaltitle", "Canadian J. Math.");
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
index df85c30857f..8ab746da3d2 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
@@ -29,7 +29,7 @@ void setUp() {
 
     @Test
     void searchByQueryFindsEntry() throws Exception {
-        BibEntry expected = new BibEntry(BibtexEntryTypes.INPROCEEDINGS.getName());
+        BibEntry expected = new BibEntry(BibtexEntryTypes.INPROCEEDINGS);
         expected.setCiteKey("Olsson:2017:RCC:3129790.3129810");
         expected.setField("acmid", "3129810");
         expected.setField("address", "New York, NY, USA");
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java
index d919f96ce1d..fba34218798 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java
@@ -29,7 +29,7 @@ void setUp() {
 
     @Test
     void searchByQueryFindsEntry() throws Exception {
-        BibEntry expected = new BibEntry(BibtexEntryTypes.MASTERSTHESIS.getName());
+        BibEntry expected = new BibEntry(BibtexEntryTypes.MASTERSTHESIS);
         expected.setCiteKey("Diez:2014ppa");
         expected.setField("author", "Diez, Tobias");
         expected.setField("title", "Slice theorem for Fr\\'echet group actions and covariant symplectic field theory");
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index 866a5a39e57..98c3a8cc2f8 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -25,6 +25,7 @@
 import org.jabref.model.cleanup.FieldFormatterCleanups;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.entry.Date;
 import org.jabref.model.entry.EntryType;
@@ -325,7 +326,7 @@ void parseRecognizesEntryWithAtInField() throws IOException {
 
         List<BibEntry> parsed = result.getDatabase().getEntries();
 
-        BibEntry expected = new BibEntry("article").withField(BibEntry.KEY_FIELD, "test")
+        BibEntry expected = new BibEntry(BibtexEntryTypes.ARTICLE).withField(BibEntry.KEY_FIELD, "test")
                                                    .withField("author", "Ed von T@st");
 
         assertEquals(Collections.singletonList(expected), parsed);
@@ -336,7 +337,7 @@ void parseRecognizesEntryPrecedingComment() throws IOException {
         String comment = "@Comment{@article{myarticle,}" + OS.NEWLINE
                 + "@inproceedings{blabla, title={the proceedings of bl@bl@}; }" + OS.NEWLINE + "}";
         String entryWithComment = comment + OS.NEWLINE + "@article{test,author={Ed von T@st}}";
-        BibEntry expected = new BibEntry("article")
+        BibEntry expected = new BibEntry(BibtexEntryTypes.ARTICLE)
                 .withField(BibEntry.KEY_FIELD, "test")
                 .withField("author", "Ed von T@st");
         expected.setCommentsBeforeEntry(comment);
diff --git a/src/test/java/org/jabref/logic/layout/LayoutTest.java b/src/test/java/org/jabref/logic/layout/LayoutTest.java
index 34c8ae2418f..1e737784520 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutTest.java
@@ -8,6 +8,7 @@
 import org.jabref.logic.layout.format.FileLinkPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibtexEntryTypes;
+import org.jabref.model.entry.CustomEntryType;
 import org.jabref.model.entry.LinkedFile;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -37,7 +38,7 @@ private String layout(String layout, BibEntry entry) throws IOException {
 
     @Test
     void entryTypeForUnknown() throws IOException {
-        BibEntry entry = new BibEntry("unknown").withField("author", "test");
+        BibEntry entry = new BibEntry(new CustomEntryType("unknown","required","optional")).withField("author", "test");
 
         assertEquals("Unknown", layout("\\bibtextype", entry));
     }
diff --git a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
index 1a94f42a49a..0ad5b9bca30 100644
--- a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
+++ b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
@@ -8,6 +8,7 @@
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.CustomEntryType;
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.pdf.FileAnnotation;
@@ -23,7 +24,7 @@
 public class EntryAnnotationImporterTest {
 
     private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
-    private final BibEntry entry = new BibEntry("EntryKey");
+    private final BibEntry entry = new BibEntry(new CustomEntryType("EntryKey","required","optional"));
 
     @BeforeEach
     public void setUp() {
diff --git a/src/test/java/org/jabref/logic/search/SearchQueryTest.java b/src/test/java/org/jabref/logic/search/SearchQueryTest.java
index 2718943d6a6..e4463f75155 100644
--- a/src/test/java/org/jabref/logic/search/SearchQueryTest.java
+++ b/src/test/java/org/jabref/logic/search/SearchQueryTest.java
@@ -58,7 +58,7 @@ public void testGrammarSearchFullEntry() {
 
     @Test
     public void testSearchingForOpenBraketInBooktitle() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS);
         e.setField(FieldName.BOOKTITLE, "Super Conference (SC)");
 
         SearchQuery searchQuery = new SearchQuery("booktitle=\"(\"", false, false);
@@ -67,7 +67,7 @@ public void testSearchingForOpenBraketInBooktitle() {
 
     @Test
     public void testSearchMatchesSingleKeywordNotPart() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS);
         e.setField("keywords", "banana, pineapple, orange");
 
         SearchQuery searchQuery = new SearchQuery("anykeyword==apple", false, false);
@@ -76,7 +76,7 @@ public void testSearchMatchesSingleKeywordNotPart() {
 
     @Test
     public void testSearchMatchesSingleKeyword() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS);
         e.setField("keywords", "banana, pineapple, orange");
 
         SearchQuery searchQuery = new SearchQuery("anykeyword==pineapple", false, false);
@@ -85,7 +85,7 @@ public void testSearchMatchesSingleKeyword() {
 
     @Test
     public void testSearchAllFields() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS);
         e.setField("title", "Fruity features");
         e.setField("keywords", "banana, pineapple, orange");
 
@@ -95,7 +95,7 @@ public void testSearchAllFields() {
 
     @Test
     public void testSearchAllFieldsNotForSpecificField() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS);
         e.setField("title", "Fruity features");
         e.setField("keywords", "banana, pineapple, orange");
 
@@ -105,7 +105,7 @@ public void testSearchAllFieldsNotForSpecificField() {
 
     @Test
     public void testSearchAllFieldsAndSpecificField() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.INPROCEEDINGS);
         e.setField("title", "Fruity features");
         e.setField("keywords", "banana, pineapple, orange");
 
diff --git a/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java b/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java
index 0629afe3a97..70c8ea51941 100644
--- a/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java
+++ b/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java
@@ -29,7 +29,7 @@ class CiteKeyBasedFileFinderTest {
 
     @BeforeEach
     void setUp(@TempDirectory.TempDir Path temporaryFolder) throws IOException {
-        entry = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        entry = new BibEntry(BibtexEntryTypes.ARTICLE);
         entry.setCiteKey("HipKro03");
 
         rootDir = temporaryFolder;
diff --git a/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java b/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java
index d024017ff34..4e5edbc0322 100644
--- a/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java
+++ b/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java
@@ -46,7 +46,7 @@ public void setUp() {
     @Test
     public void testFindFiles() throws Exception {
         //given
-        BibEntry localEntry = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry localEntry = new BibEntry(BibtexEntryTypes.ARTICLE);
         localEntry.setCiteKey("pdfInDatabase");
         localEntry.setField("year", "2001");
 
@@ -82,7 +82,7 @@ public void testYearAuthFirspageFindFiles() throws Exception {
     @Test
     public void testAuthorWithDiacritics() throws Exception {
         //given
-        BibEntry localEntry = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry localEntry = new BibEntry(BibtexEntryTypes.ARTICLE);
         localEntry.setCiteKey("Grazulis2017");
         localEntry.setField("year", "2017");
         localEntry.setField("author", "Gražulis, Saulius and O. Kitsune");
@@ -104,7 +104,7 @@ public void testAuthorWithDiacritics() throws Exception {
     @Test
     public void testFindFileInSubdirectory() throws Exception {
         //given
-        BibEntry localEntry = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry localEntry = new BibEntry(BibtexEntryTypes.ARTICLE);
         localEntry.setCiteKey("pdfInSubdirectory");
         localEntry.setField("year", "2017");
 
@@ -124,7 +124,7 @@ public void testFindFileInSubdirectory() throws Exception {
     @Test
     public void testFindFileNonRecursive() throws Exception {
         //given
-        BibEntry localEntry = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry localEntry = new BibEntry(BibtexEntryTypes.ARTICLE);
         localEntry.setCiteKey("pdfInSubdirectory");
         localEntry.setField("year", "2017");
 
diff --git a/src/test/java/org/jabref/model/BibDatabaseContextTest.java b/src/test/java/org/jabref/model/BibDatabaseContextTest.java
index 701833e223d..42fc88abab6 100644
--- a/src/test/java/org/jabref/model/BibDatabaseContextTest.java
+++ b/src/test/java/org/jabref/model/BibDatabaseContextTest.java
@@ -4,6 +4,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.IEEETranEntryTypes;
 import org.jabref.model.metadata.MetaData;
 
 import org.junit.jupiter.api.Test;
@@ -42,7 +43,7 @@ public void testTypeBasedOnInferredModeBibTeX() {
     @Test
     public void testTypeBasedOnInferredModeBiblatex() {
         BibDatabase db = new BibDatabase();
-        BibEntry e1 = new BibEntry("electronic");
+        BibEntry e1 = new BibEntry(IEEETranEntryTypes.ELECTRONIC);
         db.insertEntry(e1);
 
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(db);
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
index 3902da07a58..5a82943b0e0 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
@@ -16,14 +16,14 @@
 public class BibDatabaseModeDetectionTest {
     @Test
     public void detectBiblatex() {
-        Collection<BibEntry> entries = Arrays.asList(new BibEntry(BiblatexEntryTypes.MVBOOK.getName()));
+        Collection<BibEntry> entries = Arrays.asList(new BibEntry(BiblatexEntryTypes.MVBOOK));
 
         assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries)));
     }
 
     @Test
     public void detectUndistinguishableAsBibtex() {
-        BibEntry entry = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry entry = new BibEntry(BibtexEntryTypes.ARTICLE);
         entry.setField("title", "My cool paper");
         Collection<BibEntry> entries = Arrays.asList(entry);
 
@@ -32,9 +32,9 @@ public void detectUndistinguishableAsBibtex() {
 
     @Test
     public void detectMixedModeAsBiblatex() {
-        BibEntry bibtex = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry bibtex = new BibEntry(BibtexEntryTypes.ARTICLE);
         bibtex.setField("journal", "IEEE Trans. Services Computing");
-        BibEntry biblatex = new BibEntry(BiblatexEntryTypes.ARTICLE.getName());
+        BibEntry biblatex = new BibEntry(BiblatexEntryTypes.ARTICLE);
         biblatex.setField("translator", "Stefan Kolb");
         Collection<BibEntry> entries = Arrays.asList(bibtex, biblatex);
 
@@ -43,7 +43,7 @@ public void detectMixedModeAsBiblatex() {
 
     @Test
     public void detectUnknownTypeAsBibtex() {
-        BibEntry entry = new BibEntry(new CustomEntryType("unknowntype", new ArrayList<>(0), new ArrayList<>(0)).getName());
+        BibEntry entry = new BibEntry(new CustomEntryType("unknowntype", new ArrayList<>(0), new ArrayList<>(0)));
         Collection<BibEntry> entries = Arrays.asList(entry);
 
         assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries)));
@@ -51,9 +51,9 @@ public void detectUnknownTypeAsBibtex() {
 
     @Test
     public void ignoreUnknownTypesForBibtexDecision() {
-        BibEntry custom = new BibEntry(new CustomEntryType("unknowntype", new ArrayList<>(0), new ArrayList<>(0)).getName());
-        BibEntry bibtex = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
-        BibEntry biblatex = new BibEntry(BiblatexEntryTypes.ARTICLE.getName());
+        BibEntry custom = new BibEntry(new CustomEntryType("unknowntype", new ArrayList<>(0), new ArrayList<>(0)));
+        BibEntry bibtex = new BibEntry(BibtexEntryTypes.ARTICLE);
+        BibEntry biblatex = new BibEntry(BiblatexEntryTypes.ARTICLE);
         Collection<BibEntry> entries = Arrays.asList(custom, bibtex, biblatex);
 
         assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries)));
@@ -61,9 +61,9 @@ public void ignoreUnknownTypesForBibtexDecision() {
 
     @Test
     public void ignoreUnknownTypesForBiblatexDecision() {
-        BibEntry custom = new BibEntry(new CustomEntryType("unknowntype", new ArrayList<>(0), new ArrayList<>(0)).getName());
-        BibEntry bibtex = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
-        BibEntry biblatex = new BibEntry(BiblatexEntryTypes.MVBOOK.getName());
+        BibEntry custom = new BibEntry(new CustomEntryType("unknowntype", new ArrayList<>(0), new ArrayList<>(0)));
+        BibEntry bibtex = new BibEntry(BibtexEntryTypes.ARTICLE);
+        BibEntry biblatex = new BibEntry(BiblatexEntryTypes.MVBOOK);
         Collection<BibEntry> entries = Arrays.asList(custom, bibtex, biblatex);
 
         assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries)));
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseTest.java b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
index 84fcbb426e7..8e3f3b89194 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
@@ -11,7 +11,10 @@
 import java.util.Set;
 
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BiblatexEntryTypes;
+import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.BibtexString;
+import org.jabref.model.entry.CustomEntryType;
 import org.jabref.model.entry.IdGenerator;
 import org.jabref.model.event.TestEventListener;
 
@@ -250,7 +253,7 @@ public void resolveForStringsOddHashMarkAtTheEnd() {
 
     @Test
     public void getUsedStrings() {
-        BibEntry entry = new BibEntry(IdGenerator.next());
+        BibEntry entry = new BibEntry(new CustomEntryType(IdGenerator.next(),"required","optional"));
         entry.setField("author", "#AAA#");
         BibtexString tripleA = new BibtexString("AAA", "Some other #BBB#");
         BibtexString tripleB = new BibtexString("BBB", "Some more text");
@@ -298,9 +301,9 @@ public void getUsedStringsNoString() {
 
     @Test
     public void getEntriesSortedWithTwoEntries() {
-        BibEntry entryB = new BibEntry("article");
+        BibEntry entryB = new BibEntry(BibtexEntryTypes.ARTICLE);
         entryB.setId("2");
-        BibEntry entryA = new BibEntry("article");
+        BibEntry entryA = new BibEntry(BiblatexEntryTypes.ARTICLE);
         entryB.setId("1");
         database.insertEntries(entryB, entryA);
         assertEquals(Arrays.asList(entryA, entryB), database.getEntriesSorted(Comparator.comparing(BibEntry::getId)));
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTests.java b/src/test/java/org/jabref/model/entry/BibEntryTests.java
index 2f39ddb131c..872ba189f65 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTests.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTests.java
@@ -49,7 +49,7 @@ public void testDefaultConstructor() {
 
     @Test
     public void allFieldsPresentDefault() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE);
         e.setField("author", "abc");
         e.setField("title", "abc");
         e.setField("journal", "abc");
@@ -65,7 +65,7 @@ public void allFieldsPresentDefault() {
 
     @Test
     public void allFieldsPresentOr() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE);
         e.setField("author", "abc");
         e.setField("title", "abc");
         e.setField("journal", "abc");
@@ -81,13 +81,13 @@ public void allFieldsPresentOr() {
 
     @Test
     public void isNullCiteKeyThrowsNPE() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE);
         assertThrows(NullPointerException.class, () -> e.setCiteKey(null));
     }
 
     @Test
     public void isEmptyCiteKey() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE);
         assertFalse(e.hasCiteKey());
 
         e.setCiteKey("");
diff --git a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
index 8a3eb16d7c9..88fa45d2224 100644
--- a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
@@ -8,7 +8,7 @@ public class CanonicalBibEntryTest {
 
     @Test
     public void simpleCanonicalRepresentation() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE);
         e.setCiteKey("key");
         e.setField("author", "abc");
         e.setField("title", "def");
@@ -20,7 +20,7 @@ public void simpleCanonicalRepresentation() {
 
     @Test
     public void canonicalRepresentationWithNewlines() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.ARTICLE);
         e.setCiteKey("key");
         e.setField("abstract", "line 1\nline 2");
         String canonicalRepresentation = CanonicalBibtexEntry.getCanonicalRepresentation(e);
diff --git a/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java b/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java
index b60ec5ebc83..20948435422 100644
--- a/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java
+++ b/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java
@@ -43,7 +43,7 @@ public void testBasicSearchParsing() {
     }
 
     public BibEntry makeBibtexEntry() {
-        BibEntry e = new BibEntry(BibtexEntryTypes.INCOLLECTION.getName());
+        BibEntry e = new BibEntry(BibtexEntryTypes.INCOLLECTION);
         e.setField("title", "Marine finfish larviculture in Europe");
         e.setField("bibtexkey", "shields01");
         e.setField("year", "2001");

From 4409533e53f58d0784b446309c69e5896b3ed294 Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus@lynyus.de>
Date: Sat, 29 Dec 2018 14:10:42 +0100
Subject: [PATCH 206/229] Delete the deprecated BibEntry Constructor (#4560)

---
 src/main/java/org/jabref/model/entry/BibEntry.java | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index 5a59a45fc6c..bfd5182bd11 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -82,17 +82,6 @@ public BibEntry() {
 
     }
 
-    /**
-     * Constructs a new BibEntry with the given type
-     *
-     * @param type The type to set. May be null or empty. In that case, DEFAULT_TYPE is used.
-     * @deprecated use {{@link #BibEntry(EntryType)}} instead
-     */
-    @Deprecated
-    public BibEntry(String type) {
-        this(IdGenerator.next(), type);
-    }
-
     /**
      * Constructs a new BibEntry with the given ID and given type
      *

From 9328940098e7b3b29af0bbb3cbede86340ef8219 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Dec 2018 12:38:30 +0100
Subject: [PATCH 207/229] Bump xmpbox from 2.0.12 to 2.0.13 (#4561)

Bumps xmpbox from 2.0.12 to 2.0.13.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index debb0d0b4a2..1dbeb3cdd7b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,7 +98,7 @@ dependencies {
 
     compile 'org.apache.pdfbox:pdfbox:2.0.13'
     compile 'org.apache.pdfbox:fontbox:2.0.13'
-    compile 'org.apache.pdfbox:xmpbox:2.0.12'
+    compile 'org.apache.pdfbox:xmpbox:2.0.13'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
     compile 'org.bouncycastle:bcprov-jdk15on:1.60'

From a4e735b3870a329c8d5d8de443a576a4b0ad586c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Dec 2018 12:42:56 +0100
Subject: [PATCH 208/229] Bump checkstyle from 8.15 to 8.16 (#4562)

Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.15 to 8.16.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.15...checkstyle-8.16)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1dbeb3cdd7b..c33ab938a84 100644
--- a/build.gradle
+++ b/build.gradle
@@ -180,7 +180,7 @@ dependencies {
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:8.15'
+    checkstyle 'com.puppycrawl.tools:checkstyle:8.16'
 }
 
 jacoco {

From 3143190e51ccf4a2abdc0bf0799e9bef1d688f19 Mon Sep 17 00:00:00 2001
From: Stefan Kolb <stefan-kolb@users.noreply.github.com>
Date: Sat, 5 Jan 2019 13:39:11 +0100
Subject: [PATCH 209/229] Do not extract file ending from Urls (#4547)

* Fixes #4544 Do not extract file ending from Urls

* Add tests

* file type for any resource type

* Keep simple file name extraction for files

* checkstyle
---
 build.gradle                                  |   2 +
 .../org/jabref/model/util/FileHelper.java     |  48 +++++++++++++++++-
 .../org/jabref/model/util/FileHelperTest.java |  21 ++++++++
 .../org/jabref/model/util/pdffile.pdf         | Bin 0 -> 11112 bytes
 4 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/jabref/model/util/FileHelperTest.java
 create mode 100644 src/test/resources/org/jabref/model/util/pdffile.pdf

diff --git a/build.gradle b/build.gradle
index c33ab938a84..c2294a1ae4d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,6 +100,8 @@ dependencies {
     compile 'org.apache.pdfbox:fontbox:2.0.13'
     compile 'org.apache.pdfbox:xmpbox:2.0.13'
 
+    compile group: 'org.apache.tika', name: 'tika-core', version: '1.20'
+
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
     compile 'org.bouncycastle:bcprov-jdk15on:1.60'
 
diff --git a/src/main/java/org/jabref/model/util/FileHelper.java b/src/main/java/org/jabref/model/util/FileHelper.java
index f972d42cc46..0ed4e5cb293 100644
--- a/src/main/java/org/jabref/model/util/FileHelper.java
+++ b/src/main/java/org/jabref/model/util/FileHelper.java
@@ -1,5 +1,9 @@
 package org.jabref.model.util;
 
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -12,6 +16,14 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.metadata.FilePreferences;
 
+import org.apache.tika.config.TikaConfig;
+import org.apache.tika.detect.Detector;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.mime.MediaType;
+import org.apache.tika.mime.MimeType;
+import org.apache.tika.mime.MimeTypeException;
+import org.apache.tika.parser.AutoDetectParser;
+
 public class FileHelper {
 
     /**
@@ -31,12 +43,37 @@ public static Optional<String> getFileExtension(Path file) {
      * @return The extension (without leading dot), trimmed and in lowercase.
      */
     public static Optional<String> getFileExtension(String fileName) {
+        Metadata metadata = new Metadata();
+        metadata.add(Metadata.RESOURCE_NAME_KEY, fileName);
+
+        if (isUrl(fileName)) {
+            try (InputStream is = new URL(fileName).openStream()) {
+                return detectExtension(is, metadata);
+            } catch (IOException | MimeTypeException e) {
+                return Optional.empty();
+            }
+        }
+
         int dotPosition = fileName.lastIndexOf('.');
         if ((dotPosition > 0) && (dotPosition < (fileName.length() - 1))) {
             return Optional.of(fileName.substring(dotPosition + 1).trim().toLowerCase(Locale.ROOT));
-        } else {
+        }
+        return Optional.empty();
+    }
+
+    private static Optional<String> detectExtension(InputStream is, Metadata metaData) throws IOException, MimeTypeException {
+        BufferedInputStream bis = new BufferedInputStream(is);
+        AutoDetectParser parser = new AutoDetectParser();
+        Detector detector = parser.getDetector();
+        MediaType mediaType = detector.detect(bis, metaData);
+        MimeType mimeType = TikaConfig.getDefaultConfig().getMimeRepository().forName(mediaType.toString());
+        String extension = mimeType.getExtension();
+
+        if (extension.isEmpty()) {
             return Optional.empty();
         }
+
+        return Optional.of(extension.substring(1, extension.length()));
     }
 
     /**
@@ -129,4 +166,13 @@ private static Optional<Path> expandFilename(String filename, Path directory) {
             return Optional.empty();
         }
     }
+
+    private static boolean isUrl(String url) {
+        try {
+            new URL(url);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }
diff --git a/src/test/java/org/jabref/model/util/FileHelperTest.java b/src/test/java/org/jabref/model/util/FileHelperTest.java
new file mode 100644
index 00000000000..27096d3b4ff
--- /dev/null
+++ b/src/test/java/org/jabref/model/util/FileHelperTest.java
@@ -0,0 +1,21 @@
+package org.jabref.model.util;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class FileHelperTest {
+    @Test
+    public void extractFileExtension() {
+        final String filePath = FileHelperTest.class.getResource("pdffile.pdf").getPath();
+        assertEquals(Optional.of("pdf"), FileHelper.getFileExtension(filePath));
+    }
+
+    @Test
+    public void fileExtensionFromUrl() {
+        final String filePath = "https://link.springer.com/content/pdf/10.1007%2Fs40955-018-0121-9.pdf";
+        assertEquals(Optional.of("pdf"), FileHelper.getFileExtension(filePath));
+    }
+}
diff --git a/src/test/resources/org/jabref/model/util/pdffile.pdf b/src/test/resources/org/jabref/model/util/pdffile.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..cdacbbebbbf8c1f6b4c41e9d9b36755d46e92fa4
GIT binary patch
literal 11112
zcmeHN2UJtZ*GDV}7<F~6i~3M$YIu3+K@todDJrlcB1*~&L{cz$k>c9cf(ou3Q9%(!
zY!p{O1O-tP#D)zOQNe<U1sh`bo0kR(ZaMq^{@?k|*?2h4o4NPS%)NK!+~2)pG11wT
zh}cpI7I*JmxJ)piLnKJfpJ{Ioy9dz_I)qS>VAxA6LwO2u3@U^W*af1}C{)-BVp3=f
z*a!4XfLO3U#6(yKheJSRLcmXezWXDXL@7`aJ`;ivOi0=vm`dG(WcofjjnS?TU(&a9
z3<{-PACpdM*T-VC>q98yc5@&!D)U=jgvKO)+eanSkam4kS{q(W!4peR1;GSp(+_A5
zLKyHw1v(q3iiyC!aybTp*&$!pLne|#G)>bv$X>{2Fc>s}040+dB08T!5>Tlmp@>Q*
zBSHa%MdH}=Nqh>O!W5!B8lB0c(wQs<l}-}!X(SPaL_?XJU|<OoCB{==8fB9RCKeVh
z6I=-<?d(D@0ZZ1}+zXY3Vqp-S3cHFW7^;9>B|HpuMg?*q3M|f`!F~{h$>At51<I2G
zOIGtkLTW=oLQFyo42!n(*uB7bS>QnC;DKvOnJI}2xyu*EHvhV6S&6Khtvu6oDrBDG
z$o1asYP!Inv%#ITuAc}dz+JS$w2p&oMB{)Hd7-Eh0=5Mj@{f){VJ9BOlgLA1e87vx
zM<q%KSOAQAqZm&J1|cf`+3JKWy(}lW3`1oYU;uX1$;0IUVG1yyoyJ#=f&D@xAW<mh
zIm)AgfXhI1z{FsYgJCCyJfdBvFRGNQ6auhR1Sf7Yz4}|T7bm$yuJDWC2~gk*PD<eW
z>V0uIuq#*@==1j{gY%%_2Tmdv_@P)33=Svkk49m^uuBx?=7%p1(7O2{5PlBuxmq`?
z=GM%n))p=pc98+oiDjX1fLO+rDaHD4N1hT@Q*aexo&=a%p~RfRcnXL@hP`;&HbO>V
zKNTOtmG7@mp?bN_s8XO1M__UVglPOWKrF<<ltE+$?o8kN_s65(<N97dUA^OuM`<)V
zg#Y2An*Vh@WHRmnG!hBYwzQObYJ8;4E&wHdn6%!hb{~zBwPyvPkvljntw+RtxqlpD
zYKZh$((-Xd{J98eOf0)_)bRYx-exmd6DIAe?EK<RP}aIGYg>wrgyzkO6D-}Z;0N)=
z)TENUa<t+_JR8o9wC+WE{Df5ht}IbtSamjdk8{|(wd{(YdXC>ct9q|#zv_LXiC8*W
z)wOPP{QbBg&wB-|o5>q|$-jiM<inW8&#RL!r_XdM5bxaaBxJ<%ejx_iLu?IAIyic2
zp9Gr=f<2s^a0da`z4}B2>$i`8ezkov4O|KxToyhM1?J*chz$5F?2OJ93s7G-$F_P&
zN{IINi|k)EUw(S)>J8Z^1caak+1*ytB)m04x=iZs(Y;e2NB8Spxz1gGba7t1cLTXf
zin&g3Nw&=tWb~|>+jyySGpVtGnbZH;Z^;9gZpl8OyDm2kYieP&L^d_ux^uK8`ISM6
zRodR%t0Yr{l~pMh#>b!R-|t8MPGf`4CXnF|2IS}rTjE%AquRBnJhP|P7=Mi0I^Afs
z_~>x2iesebUzQWEJt7#48^koSUZ1N-8apd<FQdWh&7h>{v<;R^C-r^&qRXs2>VcVC
zk3RgRo>g6HvU2jmgEpbbjyp&%#7P0y25n%D*u#vxx@SW(bH>RVX%)LC-TPSc<Gx81
zGdqoYWLe0yfy-|63N7GRdH(v!(4ZW<I(FLoo<FT8bi153@@j$W(WyVnj@3LEnrKb+
zkGHUSyl;KCMI<N7to4ujCGMQMW1aY?PKm{@l9;=y`B7^Yxoj^fahyNw;@Bncv$hmZ
z+;#i><#lHdZ{>b8l}jBS2Cz*QMD@=)_x@1cC89xmR+nQh>w~tO`CveLQ8c9J?fJQH
zcSYMU24cLTqUPpi&dju$GXF}(`)xgo$2A?fP=?iPc^NXRg1qTK#ez+ZmRXs5>5T`b
zCVOR;E_N7lcgB#nucD(uZO*KZN$bC={6xA}#?N(6t43YvrpoQ_7yiYs?|k(71ggWe
z{Cq)Hr>yHn*|skYULG<vcyP(UH-~U%;qBMN4Qq|a&uMq+Zhx$~VEn$tua0wh$K;I7
zaqEN+LKHiSWb-b(4m31OF|@4hG&-bL(!#O54d?eZJkF&qGdc|oxxc_L`^R!FtI~kI
z+lZJl1Y0;Xd#J?lM9A2IoeN9mMf8qew5r7Txm(20UyL&s28HzTS`-`7&Aw|E)O|R&
z$1>AEZqL=D?{|IY#JBFVBGz~NnB4}W7W%L5Pj)0$n(Q`ej9t2YNTsZyrE*e37p!MN
zm$_ZNxxG@FQZ|wdFY|^<j0#JNvIqXQ(681k%6R{;;kB0eeWx4sD%tUz^Op3BA*a`j
zMOJmO&&L?{9(>%*><9DVt|Q&;e3z{^kJ;Jpk!!a#lY|b69;~=&T+20X<)-VGDJJ#k
zms%IrXLDS|#lboKp1Q<d3~u1Prp9zlb_}h&)}>oXLaj^p5$?uu-A6gHx5ts(uY0^*
z7O^y9CCNK#{K!7<oI4?l6P?FElY4JjezY{Bv~%gbQqR)D(!f5;g)T3LyR5$CL0-G?
zic7U)wcGo6Y!lTx#%I@>A?2U%cTt!JdOm}Ct!-KDU@^n;&WPgFZ0pSRr15qxT=CA=
zlTKNeSr4$eygtC6{`0t%DfJUa?|yp4ym4ORphjt9-@z;EolVowOILCp<d|1Cg>AdM
zD-3QhE3gW7gj0Wd^tfTzrB#=UQyqAufwK58SMw9crj%Vj$2|FV^NX7J@OptI%`Y)`
z)5^pl^g_v-L=Rp8S&-<t$@?s~-n`zWenkHz4^FMk7Ve*1)%~&c<8I*z=g_$8k0gY`
zjYnhW{x)};)7|`8cUdMrRu4O$w>ckddt6mNK40<7<k`TM9+8{f?i)w>PVbr(+Y)rU
zi~LlQU})IZ(Ayy#{^#ZIMh>ehe3ABX)VyI|pf7e`(v~E<#4owTUwLv~+?oCt#z@EP
zAZ|#wm0&a`E3hc%`2M>YqcZ4IRtDWV;F`hCpkzGGI25?;z&zoJgT{x}+{A90<s259
z-i)ah-Jsu`7c!@0cGdaYwikUu51o9r{?>>&MRRlJF8Q?JQ~H};X8AqW^qd*nDfWWd
z=M|d-$drEc#mT2cX3`<+%vSz3*38Om2Fo}}k!+XLlX+{_F1xtoGf75C6YMVJGxK*I
z&dGnGI{aw-tbT<Fg|gY~$M4U2*CsUORY+@|79I12`caMFn8*q#H9Km;Yus*S#q?&E
z4&5*`h+Xu0F?*5y8Md1}98)sAWctjkjOiPX7~kH0dur39rk@-ONUl??YDOo$toyL@
zJ@z*KgZ&%T3*zfrwR5Uka%ZfbvEfeQ9pVpe>&G<q9@2O2!=^`Y%di*4gO7E0?;d8#
z?DJfj5|BcU2&&z-D4#3l?)%lJ+ouuCkyC~pad^vJ=IQQHKF6F<YCmgfe!$0QYjY|+
zhxqzl<p5p@Z)x@--uzwzmIf?sGA=G2mp$%qh@|9J_w??8rN1pZ?LOxBkuN`$p9Ve{
zcqQx#<Kp>?D;kn7w(#xwqxf%5+W*!ZceQNZj~~4HSO!|MhQ^j!oKlr}mn!cn@5SCL
z_K6rj(c+1BqDPPM5+D1m&hFzqs#jx9Gp#mwMtX*>by~a8Vw=zQbYXgr^k3FBZrVG6
zozN}aB3<fLc(hWreRf@xo%_aJa<Afb=H<Ijzjd-iC?k|3U%`Q?`xEvbyixPy?i2Qn
z2}-{5y+Zb&;Nf89gnH!FikGt=vd^qK({y3mwEKl&H&S19t?JtN>xd;gj~_XnyyRfq
zy#ey6_Q5~;U-=oEyFA3>#9F0i#>UCSPdgI>$BgFqJ6fNHZ}`1jG$xonY720|q5!)Q
z8_OAIhK)+?*Lj6eMR&CL<@7-3!1*`k{=9hRjz(^@|GSWPBXXVD`#<Lm-@~7C@?gd5
zie97V@2|+ROEC{0Pj$;Rlcv4Fa_6d?nk|wyW_mIL`%XT%N94LK^-iGaRogvmer=tD
z-+=gMr#770Q&3*8rr=?7baU+B>xAm1rYpCu3?JM?v!H(3HAtGk*e01J5z9AC?SD|>
zHu}oc>X_fp9nLr?jfuYdGWhA0Hx+LjRBu(UBY!C#KL6wapThGGk|P5wGiz?5RcTEH
z2S)vJ_083Wnaz#MX`RCJ_DA2!X!x93mKB=)Fm`%$(|~Z7@Yt%)`I(Yi&NCwJ<TaNz
zS2tf{I7_czz3@!lSX_um@6~mZq|B-P;C*t-c|y0IvO8Y4BsKP|_3tMb?CccuIWd3J
z$W5y^ecT+j`RW$OEm=usNz0R3l7-2awvOAHxoya{xNYxK#3|ReyKT=)wM<Re(QU`<
z9rZgW?<`AWrtR4^cvsx6PwBGs+TFgpOZPDL?AdF!chx?_eX4zr_D|binc<v~pGnNz
zp4C4qF54hmmECwC<UrN$p1&VI$UK;tW08}T+c$SbUZ=e1yyu6)4%Oxd=3hKK{_ydF
zu?4w>wuR|O%#Un2+VAM9B9o%UMPG_zikpu`9D7m{T5|9BjN>;?OgV9-bW-X0lb$Eb
zPr05tQN}GRE@zh?Ic<0Pa0RpC&>8xfytA~kx#wu-a?jJx=Urf2$ggBo7F@KySaiwZ
zQpsiK%crh*Tsd>q=jz3(pR2B4n|7`Cy6}3#4atoc)w8QV++0x8wPwYw-nSBNo83;m
zV{<2~mR@_b&bjXFUBA0G?+NZbzOTIh@xkJHLVd!+VGs8-kQ<IXa(z_U7}WUSam3>f
zPnJIY;c3z{>t{Jl<C@MspYr^{3&o2sFXLYgdX@f~`uceD#OB*?q;Ed7tav-<?e2HX
zcV+Jb-aq^h`O)ZO;wPI=1)n`X*L;zF`C{0^pk?u^4;_Z1II{Q#(6j;%HE?po(HN0V
zr$IytnFf(bWF|mi6h^Rm)Q2ZUVJ*Iq@InEWB*T6fDxC~5nE*^ixTE6GFo3}kCd^d|
za1_WQ(Lk)KX%oo^0($_&DHd>Lp%NSw;(*DOClyPgt<_>})IELx3}b>Y*hj9A;!p|@
z1!yEwNu)N=0Y@WkwxdUMupbu^@gzzVo-k3{@biX9wj?qvkI;{JLv6AvI8fAx@=-~Z
z0Hmr>Z5y0|e`^T*VCU8~;Gk2}?Ic%${UWfZSf~ubak6i)24t&IcPmG`fS*F9BN|E_
z>efTVDc)YK@x8r66o9+oC<gJ-P_c|{)l^t)1&M`hs{ooe$veUc4HLV^C{Vu`AAdni
zxPT?Ja^RTQJMcjI2qi}GB8Vb&3PK41d$5N)`FgnycK}HZ`zX68X@nFYeke*Rktyw>
z*j8#DJJ80vVJk>Yf`zlKrg%?;Fu7b3F2*3TEz1@mB9t+ZNC6xpQmzPx5L>zxE>j^C
z+4(xVY9)d%wpAF0McBb`WMrgmB*j*)2!#<Aiv<ItkjX?qK~zS|FkTc<rW^q#RIfxl
zMb9Qv+Nu|2E09ZJ@e~-bCBgccbWSXm%OHGa9$&7)*j6f)SZGHR@MtU+jYSkO1t^g!
zqLGPAA&*2vm<%3;g$QVTgr%D=qRl$Lnh*?t87V*$pk)WL2||?sRj{qN0)?E<!ysp|
z5)(^6Y6_y;k|1l48xYDPl{Qu!dl+9&oAv3G)28bmEg9IgV;zA3jglbHvU39IC6IRl
ze{3r<i9{!oC`1z7AEDWi=ynv)1`QHWgN{_L@CQ}~8^oPwq94sxD3L&uQH2s$G0m22
zOV$v3gJg&(`p@M4SJdF`{l|)sN^wW#MR<GLIm-nqDY%|IoV89O5>bQ#kq{x0DIy+`
z%AkvgObUxfq@cikP_mFmM)_9of7*6JfqumiDuqOSCWHbQm7w_Il)!ulSh7%HC&Dj6
z;LyB?2yl7wFkl22I3jQ_Fo=mU3CdBQIFKLEG$dmD1ldV=vQV~F6j6wZcq$2I#qkyc
zhgHf&7!)8^2q7Y*(*#-Ls1mW(RBB0ZtMrcCSltH>Ij$C1e~Eyvb{WzCg^qtG`CCf;
zS6%<A>u+h`ZxR3NUH_`<Z)xCf5&!F5|G(4)FozDQfFcjuDiYw34vHhKU=#$Acm!$f
zY=?)YBnpX+&`5N3RB8pHQX5bv1ko!9dj6Qo9}k4AzaQdg<;WG*-;Zi-@KT{VxVP>&
zwx6a8?x)$<w1PTqO&Fr<Ywe(>4$)~e3Jn64c}+<kukyF6Z`0`Q>g7}#3sl+gUu*52
zN~gB#W3U))c-z&+>0o(nE7k}CR;R65Yjsbsw}%L@R{hXd`bWsE`X_v4fUoJ=+KB+G
zO#oRtg1|Ez0<~6sd}*VV0qUE7q<w;3{eY}PY}Ho(1emMB!f=t!XauOt<54pt7eV7y
z0F4PyXqvT46e>_*;@K!PK_tSvz^I2*Dh^es{R#2~Wi&Jrn3BNZK)RZowqUMNjvBpd
zirGL_c)b?VmCeC7KH9c$j%!m_I!AChzEE4q>MoEjz(s3i>B)7VAA$kuhhS|nluQC|
zG4QqN9tgCaEo~OyPf`F7KN>@oIOwBL@O;2OhUO-J6`PxwKx$CZ7U}+NU=Hqnbt*s)
zlsbmxIx@RINAMg#Yu^^db2@f3-8r|h$Dx)U^Xu8$-btMALTU~3SG2nMwa4xoUWBZN
z;~HKanT}0;#5nCwn1)(2s-soUD_3y7f8VuPAE49mX^s`A<5Tq)50zGLT2a6k+Cj+w
zf`jOjAYf<O<kp|&OVnD>CqmRYlW%O)CS?MEuP$Yxp~O|F@6u#Z{!snj((3qu*|mw4
zZzliBL2&LilsaZtb-sY}O}ap{R_&OMRPQjF!;0g6Fa$P%=dHe%M(D`<H1uj_jj6Sw
zG_&fbQ7h*^<X`yi_5P(%yY4#0BZWUzoc5+x)BYbjD4v`Gde{5tUrA=^9QCV&7Dt`*
z{44n^wPC*I{qHH^`}r=t7XDIpOsxZbhOE8Ew+`VBug_<7<iPqtEu{btI>Dv*Pj5jW
zS0}1t{c4U2o=E#Pa#rAxGl-$Te$b~5Hc8;69zhdVsv|{xtVwGfz~7U$29k_619U2=
zXQ=tW>rfDt=w&e(lr|%}n9|;!pnY%2B(!;338J0WH<x%cgg?auVJ2vL{H0fyR34d6
uX9`3D1`k0+A{t$U3K=w>h$bX6`9hw66AYp!5c=p|T_PkVjYQDIu>S+ynbuSQ

literal 0
HcmV?d00001


From e1cfec9c59481ba26f6cbab1da88b98a5437c745 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sat, 5 Jan 2019 17:18:52 +0100
Subject: [PATCH 210/229] Converts integrity check dialog to JavaFX (#4559)

* Converts integrity check dialog to JavaFX

Moreover:
- Show entry by reference and not by id. Fixes #2181.
- Fixes a few issues that occurred when opening the entry editor by code from the integrity dialog
- Reuse gridpane in entry editor (should have a slightly superior performance)
- Improve display of progress dialog
- Invoke copy files task using central task executor

* fix l10n
fix aborting of copy files task and showing of integrity check dialog

* fix l10n
---
 src/main/java/org/jabref/gui/BasePanel.java   |  10 +-
 .../java/org/jabref/gui/DialogService.java    |   4 +-
 .../java/org/jabref/gui/FXDialogService.java  |   9 +-
 src/main/java/org/jabref/gui/JabRefFrame.java |   2 +-
 .../jabref/gui/actions/CopyFilesAction.java   |  17 +-
 .../gui/actions/IntegrityCheckAction.java     | 202 ------------------
 .../jabref/gui/copyfiles/CopyFilesTask.java   |  23 +-
 .../gui/entryeditor/FieldsEditorTab.java      |  45 ++--
 .../gui/integrity/IntegrityCheckAction.java   |  79 +++++++
 .../gui/integrity/IntegrityCheckDialog.fxml   |  26 +++
 .../gui/integrity/IntegrityCheckDialog.java   |  65 ++++++
 .../IntegrityCheckDialogViewModel.java        |  22 ++
 .../gui/util/CurrentThreadTaskExecutor.java   |  11 +-
 .../jabref/gui/util/DefaultTaskExecutor.java  |  10 +-
 .../org/jabref/gui/util/TaskExecutor.java     |  11 +-
 .../logic/integrity/IntegrityCheck.java       |   2 +-
 src/main/resources/l10n/JabRef_en.properties  |   5 -
 17 files changed, 290 insertions(+), 253 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java
 create mode 100644 src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
 create mode 100644 src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
 create mode 100644 src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 9155e2fc3e9..a2e7e5734b6 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -19,6 +19,7 @@
 import javax.swing.undo.CannotRedoException;
 import javax.swing.undo.CannotUndoException;
 
+import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.geometry.Orientation;
 import javafx.scene.Node;
@@ -693,11 +694,12 @@ public void insertEntry(final BibEntry bibEntry) {
         }
     }
 
-    public void editEntryByIdAndFocusField(final String entryId, final String fieldName) {
-        bibDatabaseContext.getDatabase().getEntryById(entryId).ifPresent(entry -> {
-            clearAndSelect(entry);
-            showAndEdit(entry);
+    public void editEntryAndFocusField(BibEntry entry, String fieldName) {
+        showAndEdit(entry);
+        Platform.runLater(() -> {
+            // Focus field and entry in main table (async to give entry editor time to load)
             entryEditor.setFocusToField(fieldName);
+            clearAndSelect(entry);
         });
     }
 
diff --git a/src/main/java/org/jabref/gui/DialogService.java b/src/main/java/org/jabref/gui/DialogService.java
index 304efe82289..f776d192671 100644
--- a/src/main/java/org/jabref/gui/DialogService.java
+++ b/src/main/java/org/jabref/gui/DialogService.java
@@ -183,9 +183,11 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
     /**
      * Constructs and shows a canceable {@link ProgressDialog}. Clicking cancel will cancel the underlying service and close the dialog
      *
+     * @param title title of the dialog
+     * @param content message to show above the progress bar
      * @param task The {@link Task} which executes the work and for which to show the dialog
      */
-    <V> void showCanceableProgressDialogAndWait(Task<V> task);
+    <V> void showProgressDialogAndWait(String title, String content, Task<V> task);
 
     /**
      * Notify the user in an non-blocking way (i.e., in form of toast in a snackbar).
diff --git a/src/main/java/org/jabref/gui/FXDialogService.java b/src/main/java/org/jabref/gui/FXDialogService.java
index 0b25b524cd6..60593d1edf9 100644
--- a/src/main/java/org/jabref/gui/FXDialogService.java
+++ b/src/main/java/org/jabref/gui/FXDialogService.java
@@ -24,9 +24,11 @@
 import javafx.scene.layout.Region;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import javafx.stage.Window;
 
 import org.jabref.JabRefGUI;
+import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
@@ -226,8 +228,13 @@ public <R> Optional<R> showCustomDialogAndWait(Dialog<R> dialog) {
     }
 
     @Override
-    public <V> void showCanceableProgressDialogAndWait(Task<V> task) {
+    public <V> void showProgressDialogAndWait(String title, String content, Task<V> task) {
         ProgressDialog progressDialog = new ProgressDialog(task);
+        progressDialog.setHeaderText(null);
+        progressDialog.setTitle(title);
+        progressDialog.setContentText(content);
+        progressDialog.setGraphic(null);
+        ((Stage) progressDialog.getDialogPane().getScene().getWindow()).getIcons().add(IconTheme.getJabRefImageFX());
         progressDialog.setOnCloseRequest(evt -> task.cancel());
         DialogPane dialogPane = progressDialog.getDialogPane();
         dialogPane.getButtonTypes().add(ButtonType.CANCEL);
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index bc3a4e8a722..86c9f7ec54a 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -62,7 +62,6 @@
 import org.jabref.gui.actions.DatabasePropertiesAction;
 import org.jabref.gui.actions.EditExternalFileTypesAction;
 import org.jabref.gui.actions.ErrorConsoleAction;
-import org.jabref.gui.actions.IntegrityCheckAction;
 import org.jabref.gui.actions.LookupIdentifierAction;
 import org.jabref.gui.actions.ManageCustomExportsAction;
 import org.jabref.gui.actions.ManageCustomImportsAction;
@@ -94,6 +93,7 @@
 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;
diff --git a/src/main/java/org/jabref/gui/actions/CopyFilesAction.java b/src/main/java/org/jabref/gui/actions/CopyFilesAction.java
index 5efa6415506..d45a78eb803 100644
--- a/src/main/java/org/jabref/gui/actions/CopyFilesAction.java
+++ b/src/main/java/org/jabref/gui/actions/CopyFilesAction.java
@@ -32,16 +32,6 @@ public CopyFilesAction(JabRefFrame frame) {
         this.dialogService = frame.getDialogService();
     }
 
-    private void startServiceAndshowProgessDialog(Task<List<CopyFilesResultItemViewModel>> exportService) {
-
-        dialogService.showCanceableProgressDialogAndWait(exportService);
-
-        exportService.run();
-        exportService.setOnSucceeded((e) -> {
-            showDialog(exportService.getValue());
-        });
-    }
-
     private void showDialog(List<CopyFilesResultItemViewModel> data) {
         if (data.isEmpty()) {
             dialogService.showInformationDialogAndWait(Localization.lang("Copy linked files to folder..."), Localization.lang("No linked files found for export."));
@@ -64,7 +54,12 @@ public void execute() {
             databaseContext = frame.getCurrentBasePanel().getBibDatabaseContext();
 
             Task<List<CopyFilesResultItemViewModel>> exportTask = new CopyFilesTask(databaseContext, entries, path);
-            startServiceAndshowProgessDialog(exportTask);
+            dialogService.showProgressDialogAndWait(
+                    Localization.lang("Copy linked files to folder..."),
+                    Localization.lang("Copy linked files to folder..."),
+                    exportTask);
+            Globals.TASK_EXECUTOR.execute(exportTask);
+            exportTask.setOnSucceeded((e) -> showDialog(exportTask.getValue()));
         });
 
     }
diff --git a/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java
deleted file mode 100644
index ad07a4dde80..00000000000
--- a/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.jabref.gui.actions;
-
-import java.awt.Component;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-import javax.swing.JProgressBar;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.RowFilter;
-import javax.swing.SwingWorker;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableColumnModel;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
-
-import org.jabref.Globals;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.logic.integrity.IntegrityCheck;
-import org.jabref.logic.integrity.IntegrityMessage;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.JabRefPreferences;
-
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class IntegrityCheckAction extends SimpleCommand {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(IntegrityCheckAction.class);
-    private static final String ELLIPSES = "...";
-
-    private final JabRefFrame frame;
-
-    public IntegrityCheckAction(JabRefFrame frame) {
-        this.frame = frame;
-    }
-
-    @Override
-    public void execute() {
-        IntegrityCheck check = new IntegrityCheck(frame.getCurrentBasePanel().getBibDatabaseContext(),
-                Globals.prefs.getFilePreferences(),
-                Globals.prefs.getBibtexKeyPatternPreferences(),
-                Globals.journalAbbreviationLoader.getRepository(Globals.prefs.getJournalAbbreviationPreferences()),
-                Globals.prefs.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
-
-        final JDialog integrityDialog = new JDialog((JFrame) null, true);
-        integrityDialog.setUndecorated(true);
-        JProgressBar integrityProgressBar = new JProgressBar();
-        integrityProgressBar.setIndeterminate(true);
-        integrityProgressBar.setStringPainted(true);
-        integrityProgressBar.setString(Localization.lang("Checking integrity..."));
-        integrityDialog.add(integrityProgressBar);
-        integrityDialog.pack();
-        SwingWorker<List<IntegrityMessage>, Void> worker = new SwingWorker<List<IntegrityMessage>, Void>() {
-            @Override
-            protected List<IntegrityMessage> doInBackground() {
-                List<IntegrityMessage> messages = check.checkBibtexDatabase();
-                return messages;
-            }
-
-            @Override
-            protected void done() {
-                integrityDialog.dispose();
-            }
-        };
-        worker.execute();
-        integrityDialog.setVisible(true);
-        List<IntegrityMessage> messages = null;
-        try {
-            messages = worker.get();
-        } catch (Exception ex) {
-            LOGGER.error("Integrity check failed.", ex);
-        }
-
-        if (messages.isEmpty()) {
-            JOptionPane.showMessageDialog(null, Localization.lang("No problems found."));
-        } else {
-            Map<String, Boolean> showMessage = new HashMap<>();
-            // prepare data model
-            Object[][] model = new Object[messages.size()][4];
-            int i = 0;
-            for (IntegrityMessage message : messages) {
-                model[i][0] = message.getEntry().getId();
-                model[i][1] = message.getEntry().getCiteKeyOptional().orElse("");
-                model[i][2] = message.getFieldName();
-                model[i][3] = message.getMessage();
-                showMessage.put(message.getMessage(), true);
-                i++;
-            }
-
-            // construct view
-            JTable table = new JTable(model,
-                    new Object[] {"ID", Localization.lang("BibTeX key"), Localization.lang("Field"),
-                            Localization.lang("Message")});
-
-            // hide IDs
-            TableColumnModel columnModel = table.getColumnModel();
-            columnModel.removeColumn(columnModel.getColumn(0));
-
-            RowFilter<Object, Object> filter = new RowFilter<Object, Object>() {
-
-                @Override
-                public boolean include(Entry<?, ?> entry) {
-                    return showMessage.get(entry.getStringValue(3));
-                }
-            };
-
-            TableRowSorter<TableModel> sorter = new TableRowSorter<>(table.getModel());
-            sorter.setRowFilter(filter);
-            table.setRowSorter(sorter);
-            table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-            table.setDefaultEditor(Object.class, null);
-            ListSelectionModel selectionModel = table.getSelectionModel();
-
-            selectionModel.addListSelectionListener(event -> {
-                if (!event.getValueIsAdjusting()) {
-                    try {
-                        String entryId = (String) model[table.convertRowIndexToModel(table.getSelectedRow())][0];
-                        String fieldName = (String) model[table.convertRowIndexToModel(table.getSelectedRow())][2];
-                        frame.getCurrentBasePanel().editEntryByIdAndFocusField(entryId, fieldName);
-                    } catch (ArrayIndexOutOfBoundsException exception) {
-                        // Ignore -- most likely caused by filtering out the earlier selected row
-                    }
-                }
-            });
-
-            // BibTeX key
-            table.getColumnModel().getColumn(0).setPreferredWidth(100);
-            // field name
-            table.getColumnModel().getColumn(1).setPreferredWidth(60);
-            // message
-            table.getColumnModel().getColumn(2).setPreferredWidth(400);
-            table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
-            JScrollPane scrollPane = new JScrollPane(table);
-            String title = Localization.lang("%0 problem(s) found", String.valueOf(messages.size()));
-            JDialog dialog = new JDialog((JFrame) null, title, false);
-
-            JPopupMenu menu = new JPopupMenu();
-            for (String messageString : showMessage.keySet()) {
-                JCheckBoxMenuItem menuItem = new JCheckBoxMenuItem(messageString, true);
-                menuItem.addActionListener(event -> {
-                    showMessage.put(messageString, menuItem.isSelected());
-                    ((AbstractTableModel) table.getModel()).fireTableDataChanged();
-                });
-                menu.add(menuItem);
-            }
-
-            JButton menuButton = new JButton(Localization.lang("Filter"));
-            menuButton.addActionListener(entry -> menu.show(menuButton, 0, menuButton.getHeight()));
-            FormBuilder builder = FormBuilder.create()
-                    .layout(new FormLayout("fill:pref:grow", "fill:pref:grow, 2dlu, pref"));
-
-            JButton filterNoneButton = new JButton(Localization.lang("Filter None"));
-            filterNoneButton.addActionListener(event -> {
-                for (Component component : menu.getComponents()) {
-                    if (component instanceof JCheckBoxMenuItem) {
-                        JCheckBoxMenuItem checkBox = (JCheckBoxMenuItem) component;
-                        if (checkBox.isSelected()) {
-                            checkBox.setSelected(false);
-                            showMessage.put(checkBox.getText(), checkBox.isSelected());
-                        }
-                    }
-                    ((AbstractTableModel) table.getModel()).fireTableDataChanged();
-                }
-            });
-
-            JButton filterAllButton = new JButton(Localization.lang("Filter All"));
-            filterAllButton.addActionListener(event -> {
-                for (Component component : menu.getComponents()) {
-                    if (component instanceof JCheckBoxMenuItem) {
-                        JCheckBoxMenuItem checkBox = (JCheckBoxMenuItem) component;
-                        if (!checkBox.isSelected()) {
-                            checkBox.setSelected(true);
-                            showMessage.put(checkBox.getText(), checkBox.isSelected());
-                        }
-                    }
-                    ((AbstractTableModel) table.getModel()).fireTableDataChanged();
-                }
-            });
-
-            builder.add(filterNoneButton).xy(1, 3, "left, b");
-            builder.add(filterAllButton).xy(1, 3, "right, b");
-            builder.add(scrollPane).xy(1, 1);
-            builder.add(menuButton).xy(1, 3, "c, b");
-            dialog.add(builder.getPanel());
-            dialog.setSize(600, 600);
-
-            // show view
-            dialog.setVisible(true);
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
index aec95051171..ee562c53401 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
@@ -67,9 +67,18 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
 
             for (int i = 0; i < entries.size(); i++) {
 
+                if (isCancelled()) {
+                    break;
+                }
+
                 List<LinkedFile> files = entries.get(i).getFiles();
 
                 for (int j = 0; j < files.size(); j++) {
+
+                    if (isCancelled()) {
+                        break;
+                    }
+
                     updateMessage(Localization.lang("Copying file %0 of entry %1", Integer.toString(j + 1), Integer.toString(i + 1)));
 
                     LinkedFile fileName = files.get(j);
@@ -78,14 +87,18 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
 
                     newPath = OptionalUtil.combine(Optional.of(exportPath), fileToExport, resolvePathFilename);
 
-                    newPath.ifPresent(newFile -> {
+                    if (newPath.isPresent()) {
+
+                        Path newFile = newPath.get();
                         boolean success = FileUtil.copyFile(fileToExport.get(), newFile, false);
                         updateProgress(totalFilesCounter++, totalFilesCount);
                         try {
                             Thread.sleep(300);
                         } catch (InterruptedException e) {
-                            // TODO Auto-generated catch block
-                            e.printStackTrace();
+                            if (isCancelled()) {
+                                updateMessage("Cancelled");
+                                break;
+                            }
                         }
                         if (success) {
                             updateMessage(localizedSucessMessage);
@@ -99,7 +112,9 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
                             writeLogMessage(newFile, bw, localizedErrorMessage);
                             addResultToList(newFile, success, localizedErrorMessage);
                         }
-                    });
+
+                    }
+
                 }
             }
             updateMessage(Localization.lang("Finished copying"));
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index cdaebfda242..bbd23b29d97 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -50,8 +50,9 @@ abstract class FieldsEditorTab extends EntryEditorTab {
     private FieldEditorFX activeField;
     private final BibDatabaseContext databaseContext;
     private UndoManager undoManager;
-    private Collection<String> fields;
+    private Collection<String> fields = new ArrayList<>();
     private final DialogService dialogService;
+    private GridPane gridPane;
 
     public FieldsEditorTab(boolean compressed, BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, DialogService dialogService) {
         this.isCompressed = compressed;
@@ -69,14 +70,17 @@ private static void addColumn(GridPane gridPane, int columnIndex, Stream<Parent>
         gridPane.addColumn(columnIndex, nodes.toArray(Node[]::new));
     }
 
-    private Region setupPanel(BibEntry entry, boolean compressed, SuggestionProviders suggestionProviders, UndoManager undoManager) {
-        // The preferences might be not initialized in tests -> return empty node
+    private void setupPanel(BibEntry entry, boolean compressed, SuggestionProviders suggestionProviders, UndoManager undoManager) {
+        // The preferences might be not initialized in tests -> return immediately
         // TODO: Replace this ugly workaround by proper injection propagation
         if (Globals.prefs == null) {
-            return new Region();
+            return;
         }
 
         editors.clear();
+        gridPane.getChildren().clear();
+        gridPane.getColumnConstraints().clear();
+        gridPane.getRowConstraints().clear();
 
         EntryType entryType = EntryTypes.getTypeOrDefault(entry.getType(), databaseContext.getMode());
         fields = determineFieldsToShow(entry, entryType);
@@ -98,9 +102,6 @@ private Region setupPanel(BibEntry entry, boolean compressed, SuggestionProvider
             labels.add(new FieldNameLabel(fieldName));
         }
 
-        GridPane gridPane = new GridPane();
-        gridPane.getStyleClass().add("editorPane");
-
         ColumnConstraints columnExpand = new ColumnConstraints();
         columnExpand.setHgrow(Priority.ALWAYS);
 
@@ -127,15 +128,6 @@ private Region setupPanel(BibEntry entry, boolean compressed, SuggestionProvider
 
             setRegularRowLayout(gridPane);
         }
-
-        // Warp everything in a scroll-pane
-        ScrollPane scrollPane = new ScrollPane();
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-        scrollPane.setContent(gridPane);
-        scrollPane.setFitToWidth(true);
-        scrollPane.setFitToHeight(true);
-        return scrollPane;
     }
 
     private void setRegularRowLayout(GridPane gridPane) {
@@ -222,8 +214,8 @@ protected void bindToEntry(BibEntry entry) {
                                                     .map(Map.Entry::getKey)
                                                     .findFirst();
 
-        Region panel = setupPanel(entry, isCompressed, suggestionProviders, undoManager);
-        setContent(panel);
+        initPanel();
+        setupPanel(entry, isCompressed, suggestionProviders, undoManager);
 
         Platform.runLater(() -> {
             // Restore focus to field (run this async so that editor is already initialized correctly)
@@ -236,4 +228,21 @@ protected void bindToEntry(BibEntry entry) {
     public Collection<String> getShownFields() {
         return fields;
     }
+
+    private void initPanel() {
+        if (gridPane == null) {
+            gridPane = new GridPane();
+            gridPane.getStyleClass().add("editorPane");
+
+            // Warp everything in a scroll-pane
+            ScrollPane scrollPane = new ScrollPane();
+            scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+            scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+            scrollPane.setContent(gridPane);
+            scrollPane.setFitToWidth(true);
+            scrollPane.setFitToHeight(true);
+
+            setContent(scrollPane);
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
new file mode 100644
index 00000000000..0bf4c182db8
--- /dev/null
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -0,0 +1,79 @@
+package org.jabref.gui.integrity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.collections.ObservableList;
+import javafx.concurrent.Task;
+
+import org.jabref.Globals;
+import org.jabref.gui.Dialog;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.integrity.IntegrityCheck;
+import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.preferences.JabRefPreferences;
+
+public class IntegrityCheckAction extends SimpleCommand {
+
+    private final JabRefFrame frame;
+    private final TaskExecutor taskExecutor;
+    private final DialogService dialogService;
+
+    public IntegrityCheckAction(JabRefFrame frame) {
+        this.frame = frame;
+        this.taskExecutor = Globals.TASK_EXECUTOR;
+        this.dialogService = frame.getDialogService();
+    }
+
+    @Override
+    public void execute() {
+        BibDatabaseContext databaseContext = frame.getCurrentBasePanel().getBibDatabaseContext();
+        IntegrityCheck check = new IntegrityCheck(databaseContext,
+                Globals.prefs.getFilePreferences(),
+                Globals.prefs.getBibtexKeyPatternPreferences(),
+                Globals.journalAbbreviationLoader.getRepository(Globals.prefs.getJournalAbbreviationPreferences()),
+                Globals.prefs.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
+
+        Task<List<IntegrityMessage>> task = new Task<List<IntegrityMessage>>() {
+            @Override
+            protected List<IntegrityMessage> call() {
+                List<IntegrityMessage> result = new ArrayList<>();
+
+                ObservableList<BibEntry> entries = databaseContext.getDatabase().getEntries();
+                for (int i = 0; i < entries.size(); i++) {
+                    if (isCancelled()) {
+                        break;
+                    }
+
+                    BibEntry entry = entries.get(i);
+                    result.addAll(check.checkBibtexEntry(entry));
+                    updateProgress(i, entries.size());
+                }
+
+                return result;
+            }
+        };
+        task.setOnSucceeded(value -> {
+            List<IntegrityMessage> messages = task.getValue();
+            if (messages.isEmpty()) {
+                dialogService.notify(Localization.lang("No problems found."));
+            } else {
+                Dialog<Void> dialog = new IntegrityCheckDialog(messages, frame.getCurrentBasePanel());
+                dialog.showAndWait();
+            }
+        });
+        task.setOnFailed(event -> dialogService.showErrorDialogAndWait("Integrity check failed."));
+
+        dialogService.showProgressDialogAndWait(
+                Localization.lang("Checking integrity..."),
+                Localization.lang("Checking integrity..."),
+                task);
+        taskExecutor.execute(task);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
new file mode 100644
index 00000000000..e3eb9580ce0
--- /dev/null
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.AnchorPane?>
+<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="600.0" prefWidth="700.0"
+            xmlns="http://javafx.com/javafx/8.0.121" fx:controller="org.jabref.gui.integrity.IntegrityCheckDialog">
+    <content>
+        <AnchorPane>
+            <ScrollPane fitToHeight="true" fitToWidth="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                        AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                <TableView fx:id="messagesTable">
+                    <columns>
+                        <TableColumn fx:id="keyColumn" prefWidth="150.0" text="%BibTeX key"/>
+                        <TableColumn fx:id="fieldColumn" prefWidth="110.0" text="%Field"/>
+                        <TableColumn fx:id="messageColumn" prefWidth="400" text="%Message"/>
+                    </columns>
+                </TableView>
+            </ScrollPane>
+        </AnchorPane>
+    </content>
+    <ButtonType fx:constant="CLOSE"/>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
new file mode 100644
index 00000000000..cd6277bf322
--- /dev/null
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -0,0 +1,65 @@
+package org.jabref.gui.integrity;
+
+import java.util.List;
+
+import javafx.beans.property.ReadOnlyStringWrapper;
+import javafx.collections.ListChangeListener;
+import javafx.fxml.FXML;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.stage.Modality;
+
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.logic.l10n.Localization;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import org.controlsfx.control.table.TableFilter;
+
+public class IntegrityCheckDialog extends BaseDialog<Void> {
+
+    private final List<IntegrityMessage> messages;
+    private final BasePanel basePanel;
+    @FXML private TableView<IntegrityMessage> messagesTable;
+    @FXML private TableColumn<IntegrityMessage, String> keyColumn;
+    @FXML private TableColumn<IntegrityMessage, String> fieldColumn;
+    @FXML private TableColumn<IntegrityMessage, String> messageColumn;
+    private IntegrityCheckDialogViewModel viewModel;
+
+    public IntegrityCheckDialog(List<IntegrityMessage> messages, BasePanel basePanel) {
+        this.messages = messages;
+        this.basePanel = basePanel;
+        this.setTitle(Localization.lang("Check integrity"));
+        this.initModality(Modality.NONE);
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+    }
+
+    private void onSelectionChanged(ListChangeListener.Change<? extends IntegrityMessage> change) {
+        if (change.next()) {
+            change.getAddedSubList().stream().findFirst().ifPresent(message ->
+                    basePanel.editEntryAndFocusField(message.getEntry(), message.getFieldName()));
+        }
+    }
+
+    public IntegrityCheckDialogViewModel getViewModel() {
+        return viewModel;
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new IntegrityCheckDialogViewModel(messages);
+
+        messagesTable.getSelectionModel().getSelectedItems().addListener(this::onSelectionChanged);
+        messagesTable.setItems(viewModel.getMessages());
+        keyColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().getEntry().getCiteKeyOptional().orElse("")));
+        fieldColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().getFieldName()));
+        messageColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().getMessage()));
+
+        TableFilter.forTableView(messagesTable)
+                   .apply();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
new file mode 100644
index 00000000000..1313417642e
--- /dev/null
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -0,0 +1,22 @@
+package org.jabref.gui.integrity;
+
+import java.util.List;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.logic.integrity.IntegrityMessage;
+
+public class IntegrityCheckDialogViewModel extends AbstractViewModel {
+
+    private final ObservableList<IntegrityMessage> messages;
+
+    public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages) {
+        this.messages = FXCollections.observableArrayList(messages);
+    }
+
+    public ObservableList<IntegrityMessage> getMessages() {
+        return messages;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java b/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
index 31da770b4e6..a18bf6fc5aa 100644
--- a/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
@@ -6,6 +6,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
+import javafx.concurrent.Task;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,7 +25,7 @@ public class CurrentThreadTaskExecutor implements TaskExecutor {
      * javafx.concurrent.Task.TaskCallable#call()}, but adapted to run sequentially.
      */
     @Override
-    public <V> Future<?> execute(BackgroundTask<V> task) {
+    public <V> Future<V> execute(BackgroundTask<V> task) {
         Runnable onRunning = task.getOnRunning();
         if (onRunning != null) {
             onRunning.run();
@@ -42,10 +44,15 @@ public <V> Future<?> execute(BackgroundTask<V> task) {
             } else {
                 LOGGER.error("Unhandled exception", exception);
             }
-            return new FailedFuture(exception);
+            return new FailedFuture<>(exception);
         }
     }
 
+    @Override
+    public <V> Future<V> execute(Task<V> task) {
+        return task;
+    }
+
     @Override
     public void shutdown() {
         // Nothing to do here
diff --git a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
index fe7f2f64611..b1cde500093 100644
--- a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
@@ -89,8 +89,14 @@ public static void runInJavaFXThread(Runnable runnable) {
     }
 
     @Override
-    public <V> Future<?> execute(BackgroundTask<V> task) {
-        return EXECUTOR.submit(getJavaFXTask(task));
+    public <V> Future<V> execute(BackgroundTask<V> task) {
+        return execute(getJavaFXTask(task));
+    }
+
+    @Override
+    public <V> Future<V> execute(Task<V> task) {
+        EXECUTOR.submit(task);
+        return task;
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/util/TaskExecutor.java b/src/main/java/org/jabref/gui/util/TaskExecutor.java
index 5fba6535f16..0d5f2f8c8f3 100644
--- a/src/main/java/org/jabref/gui/util/TaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/TaskExecutor.java
@@ -18,7 +18,16 @@ public interface TaskExecutor {
      * @param <V>  type of return value of the task
      * @param task the task to run
      */
-    <V> Future<?> execute(BackgroundTask<V> task);
+    <V> Future<V> execute(BackgroundTask<V> task);
+
+    /**
+     * Runs the given task and returns a Future representing that task. Usually, you want to use the other method {@link
+     * #execute(BackgroundTask)}.
+     *
+     * @param <V>  type of return value of the task
+     * @param task the task to run
+     */
+    <V> Future<V> execute(Task<V> task);
 
     /**
      * Shutdown the task executor.
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
index 7932c842ae1..9e534756bce 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
@@ -41,7 +41,7 @@ public List<IntegrityMessage> checkBibtexDatabase() {
         return result;
     }
 
-    private List<IntegrityMessage> checkBibtexEntry(BibEntry entry) {
+    public List<IntegrityMessage> checkBibtexEntry(BibEntry entry) {
         List<IntegrityMessage> result = new ArrayList<>();
 
         if (entry == null) {
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index b22353562b3..87b3ffe2dca 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -435,10 +435,6 @@ Files\ opened=Files opened
 
 Filter=Filter
 
-Filter\ All=Filter All
-
-Filter\ None=Filter None
-
 Finished\ automatically\ setting\ external\ links.=Finished automatically setting external links.
 
 Finished\ writing\ XMP\ for\ %0\ file\ (%1\ skipped,\ %2\ errors).=Finished writing XMP for %0 file (%1 skipped, %2 errors).
@@ -1605,7 +1601,6 @@ Keep\ right=Keep right
 Old\ entry=Old entry
 From\ import=From import
 No\ problems\ found.=No problems found.
-%0\ problem(s)\ found=%0 problem(s) found
 Save\ changes=Save changes
 Discard\ changes=Discard changes
 Library\ '%0'\ has\ changed.=Library '%0' has changed.

From d281ece4b5a96d6101cbea5f3475d0d8e19f75c8 Mon Sep 17 00:00:00 2001
From: Le-wi <46237458+Le-wi@users.noreply.github.com>
Date: Sat, 5 Jan 2019 23:04:51 +0100
Subject: [PATCH 211/229] Add uncaught exception message (#4565)

* Add error message for uncaught exceptions

Added a new view to the project. It's shown after the uncaught exception is logged.

* Add simple text to fallback error view

Added a label asking the user to look into the logfiles for more details.

* Add error message to language files

Added the error message to the german and english language files.

* Add ErrorDialogAndWait

Removed the FallbackErrorView. Added the showErrorDialogAndWait call instead.
---
 CHANGELOG.md                                           | 2 +-
 src/main/java/org/jabref/FallbackExceptionHandler.java | 4 ++++
 src/main/resources/l10n/JabRef_de.properties           | 3 ---
 src/main/resources/l10n/JabRef_en.properties           | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1c3fd7d4be..eea21c1be72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -91,7 +91,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where only one PDF file could be imported [#4422](https://github.com/JabRef/jabref/issues/4422)
 - We fixed an issue where "Move to group" would always move the first entry in the library and not the selected [#4414](https://github.com/JabRef/jabref/issues/4414)
 - We fixed an issue where an older dialog appears when downloading full texts from the quality menu. [#4489](https://github.com/JabRef/jabref/issues/4489)
-
+- We fixed an issue where uncaught exceptions were logged but the user wasn't informed about their occurance. [#2288] (https://github.com/JabRef/jabref/issues/2288)
 
 
 
diff --git a/src/main/java/org/jabref/FallbackExceptionHandler.java b/src/main/java/org/jabref/FallbackExceptionHandler.java
index ef65037ee54..cdba8486c2c 100644
--- a/src/main/java/org/jabref/FallbackExceptionHandler.java
+++ b/src/main/java/org/jabref/FallbackExceptionHandler.java
@@ -17,5 +17,9 @@ public static void installExceptionHandler() {
     @Override
     public void uncaughtException(Thread thread, Throwable exception) {
         LOGGER.error("Uncaught exception occurred in " + thread, exception);
+        JabRefGUI.getMainFrame()
+                 .getDialogService()
+                 .showErrorDialogAndWait(
+                                         exception.getLocalizedMessage(), exception);
     }
 }
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index 74cc9c60665..6514a661985 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -2200,6 +2200,3 @@ Website=Webseite
 Write\ XMP-metadata\ to\ PDFs=&XMP-Metadaten in PDFs schreiben
 
 Override\ default\ font\ settings=Standardschrifteinstellungen überschreiben
-
-
-
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 87b3ffe2dca..50f3ee249f4 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2239,4 +2239,4 @@ Main\ layout\ file\:=Main layout file\:
 Main\ layout\ file=Main layout file
 Save\ exporter=Save exporter
 File\ extension\:=File extension\:
-Export\ format\ name\:=Export format name\:
+Export\ format\ name\:=Export format name\:
\ No newline at end of file

From 84573cc3829aeff7c3cf8e5cb44f15a911c4fa02 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Thu, 10 Jan 2019 18:21:07 +0100
Subject: [PATCH 212/229] Don't set column sort type at startup (#4577)

fix performance issues
---
 src/main/java/org/jabref/gui/maintable/MainTable.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 62167d44da8..156370ec1c3 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -14,8 +13,6 @@
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.SelectionMode;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableColumn.SortType;
 import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
 import javafx.scene.input.ClipboardContent;
@@ -97,13 +94,13 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
                                                               .setOnMouseDragEntered(this::handleOnDragEntered)
                                                               .install(this);
 
-        for (Entry<String, SortType> entries : preferences.getColumnPreferences().getSortTypesForColumns().entrySet()) {
+        /*for (Entry<String, SortType> entries : preferences.getColumnPreferences().getSortTypesForColumns().entrySet()) {
             Optional<TableColumn<BibEntryTableViewModel, ?>> column = this.getColumns().stream().filter(col -> entries.getKey().equals(col.getText())).findFirst();
             column.ifPresent(col -> {
                 col.setSortType(entries.getValue());
                 this.getSortOrder().add(col);
             });
-        }
+        }*/
 
         if (preferences.resizeColumnsToFit()) {
             this.setColumnResizePolicy(new SmartConstrainedResizePolicy());

From f3d03a87ff48c1b1ae51569beda07a2b3b114fb4 Mon Sep 17 00:00:00 2001
From: Rachel <46014322+rachelwu21@users.noreply.github.com>
Date: Sat, 12 Jan 2019 23:06:49 +1100
Subject: [PATCH 213/229] Fix for Issue #4437 - Some bugs in preference->Entry
 table columns (#4546)

* Changed gui.preference.TableColumnTab.java. But some files I haven't touched are showing errors.

* made preferences->Entry table columns editable

* style changes

* removed obsolete localization key

* adding rows also adds widths

* check consistent endstate if change columns from GUI

* changing columns from GUI

* check consistent endstate if change columns from GUI

* removed redundant tableRows

* removed unnecessary updates to colsetup

* CHANGELOG updated

* removed UpdateWidthsAction and associated stuff
---
 CHANGELOG.md                                  |   6 +-
 .../PersistenceVisualStateTable.java          |  12 +-
 .../gui/preferences/TableColumnsTab.java      | 198 ++++++------------
 src/main/resources/l10n/JabRef_da.properties  |   4 -
 src/main/resources/l10n/JabRef_de.properties  |   4 -
 src/main/resources/l10n/JabRef_el.properties  |   4 -
 src/main/resources/l10n/JabRef_en.properties  |   6 +-
 src/main/resources/l10n/JabRef_es.properties  |   4 -
 src/main/resources/l10n/JabRef_fr.properties  |   4 -
 src/main/resources/l10n/JabRef_in.properties  |   4 -
 src/main/resources/l10n/JabRef_it.properties  |   4 -
 src/main/resources/l10n/JabRef_ja.properties  |   4 -
 src/main/resources/l10n/JabRef_nl.properties  |   4 -
 src/main/resources/l10n/JabRef_no.properties  |   4 -
 .../resources/l10n/JabRef_pt_BR.properties    |   4 -
 src/main/resources/l10n/JabRef_ru.properties  |   4 -
 src/main/resources/l10n/JabRef_sv.properties  |   4 -
 src/main/resources/l10n/JabRef_tl.properties  |   4 -
 src/main/resources/l10n/JabRef_tr.properties  |   4 -
 src/main/resources/l10n/JabRef_vi.properties  |   4 -
 src/main/resources/l10n/JabRef_zh.properties  |   4 -
 21 files changed, 77 insertions(+), 213 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eea21c1be72..ce2410787c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,7 +48,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We updated updated the Related Articles tab to accept JSON from the new version of the Mr. DLib service
 - We added an option in the preference dialog box that allows user to choose behavior after dragging and dropping files in Entry Editor. [#4356](https://github.com/JabRef/jabref/issues/4356)
 - We added the ability to have an export preference where previously "File"-->"Export"/"Export selected entries" would not save the user's preference[#4495](https://github.com/JabRef/jabref/issues/4495)
-
+- We added the ability to add field names from the Preferences Dialog [#4546](https://github.com/JabRef/jabref/issues/4546)
+- We added the ability change the column widths directly in the main table. [#4546](https://github.com/JabRef/jabref/issues/4546)
 
 
 
@@ -91,7 +92,6 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where only one PDF file could be imported [#4422](https://github.com/JabRef/jabref/issues/4422)
 - We fixed an issue where "Move to group" would always move the first entry in the library and not the selected [#4414](https://github.com/JabRef/jabref/issues/4414)
 - We fixed an issue where an older dialog appears when downloading full texts from the quality menu. [#4489](https://github.com/JabRef/jabref/issues/4489)
-- We fixed an issue where uncaught exceptions were logged but the user wasn't informed about their occurance. [#2288] (https://github.com/JabRef/jabref/issues/2288)
 
 
 
@@ -107,7 +107,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
   - Set/clear/append/rename fields: available through Edit menu
   - Manage keywords: available through Edit menu
   - Copy linked files to folder: available through File menu
-
+- We removed the option to change the column widths in the preferences dialog. [#4546](https://github.com/JabRef/jabref/issues/4546)
 
 
 
diff --git a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
index 131e8b05c2e..eb25588f568 100644
--- a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
+++ b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
@@ -26,7 +26,9 @@ public PersistenceVisualStateTable(final MainTable mainTable, JabRefPreferences
         this.preferences = preferences;
 
         mainTable.getColumns().addListener(this::onColumnsChanged);
-        mainTable.getColumns().forEach(col -> col.sortTypeProperty().addListener(obs -> updateColumnSortType(col.getText(), col.getSortType())));
+        mainTable.getColumns().forEach(col -> col.sortTypeProperty().addListener(obs ->
+                updateColumnSortType(col.getText(), col.getSortType())));
+        mainTable.getColumns().forEach(col -> col.widthProperty().addListener(obs -> updateColumnPreferences()));
 
     }
 
@@ -63,8 +65,10 @@ private void updateColumnPreferences() {
             }
         }
 
-        // Finally, we store the new preferences.
-        preferences.putStringList(JabRefPreferences.COLUMN_NAMES, columnNames);
-        preferences.putStringList(JabRefPreferences.COLUMN_WIDTHS, columnsWidths);
+        if (columnNames.size() == columnsWidths.size() &&
+                columnNames.size() == preferences.getStringList(preferences.COLUMN_NAMES).size()) {
+            preferences.putStringList(JabRefPreferences.COLUMN_NAMES, columnNames);
+            preferences.putStringList(JabRefPreferences.COLUMN_WIDTHS, columnsWidths);
+        }
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
index a441ec74992..e5d1ff88664 100644
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
@@ -44,17 +44,11 @@
 import org.jabref.model.entry.BibtexSingleField;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 class TableColumnsTab extends Pane implements PrefsTab {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(TableColumnsTab.class);
-
     private final JabRefPreferences prefs;
     private boolean tableChanged;
     private final TableView colSetup;
-    private final List<TableRow> tableRows = new ArrayList<>(10);
     private final JabRefFrame frame;
 
     private final CheckBox urlColumn;
@@ -67,6 +61,10 @@ class TableColumnsTab extends Pane implements PrefsTab {
     private final RadioButton preferUrl;
     private final RadioButton preferDoi;
     /*** begin: special fields ***/
+    private final Button addRow;
+    private final Button deleteRow;
+    private final Button down;
+    private final Button up;
     private final CheckBox specialFieldsEnabled;
     private final CheckBox rankingColumn;
     private final CheckBox qualityColumn;
@@ -88,6 +86,7 @@ class TableColumnsTab extends Pane implements PrefsTab {
     private final VBox listOfFileColumnsVBox;
     private final ObservableList<TableRow> data;
     private final GridPane builder = new GridPane();
+
     /**
      * Customization of external program paths.
      *
@@ -96,81 +95,71 @@ class TableColumnsTab extends Pane implements PrefsTab {
     public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
         this.prefs = prefs;
         this.frame = frame;
-        this.data = FXCollections.observableArrayList(
-                new TableRow("entrytype",75),
-                new TableRow("author/editor",300),
-                new TableRow("title",470),
-                new TableRow("year",60),
-                new TableRow("journal",130),
-                new TableRow("bibtexkey",100));
 
+        /* Populate the data of Entry table columns */
+        List<String> prefColNames = this.prefs.getStringList(this.prefs.COLUMN_NAMES);
+        List<String> prefColWidths = this.prefs.getStringList(this.prefs.COLUMN_WIDTHS);
+        this.data = FXCollections.observableArrayList();
+        for (int i = 0; i < prefColNames.size(); i++) {
+            this.data.add(new TableRow(prefColNames.get(i), Double.parseDouble(prefColWidths.get(i))));
+        }
+
+        /* UI for Entry table columns */
         colSetup = new TableView<>();
-        TableColumn<TableRow,String> field = new TableColumn<>(Localization.lang("Field name"));
-        TableColumn<TableRow,Double> column = new TableColumn<>(Localization.lang("Column width"));
+        colSetup.setEditable(true);
+        TableColumn<TableRow, String> field = new TableColumn<>(Localization.lang("Field name"));
         field.setPrefWidth(400);
-        column.setPrefWidth(240);
         field.setCellValueFactory(new PropertyValueFactory<>("name"));
         field.setCellFactory(TextFieldTableCell.forTableColumn());
+        field.setEditable(true);
         field.setOnEditCommit(
                 (TableColumn.CellEditEvent<TableRow, String> t) -> {
                     t.getTableView().getItems().get(
                             t.getTablePosition().getRow()).setName(t.getNewValue());
-                });
-        column.setCellValueFactory(new PropertyValueFactory<>("length"));
-        column.setOnEditCommit(
-                (TableColumn.CellEditEvent<TableRow, Double> t) -> {
-                    t.getTableView().getItems().get(
-                            t.getTablePosition().getRow()).setLength(t.getNewValue());
+                    // Since data is an ObservableList, updating it updates the displayed field name.
+                    this.data.set(t.getTablePosition().getRow(), new TableRow(t.getNewValue()));
+                    // Update the User Preference of COLUMN_NAMES
+                    List<String> tempColumnNames = this.prefs.getStringList(this.prefs.COLUMN_NAMES);
+                    tempColumnNames.set(t.getTablePosition().getRow(), t.getNewValue());
+                    this.prefs.putStringList(this.prefs.COLUMN_NAMES,tempColumnNames);
                 });
 
         colSetup.setItems(data);
-        colSetup.getColumns().addAll(field,column);
+        colSetup.getColumns().add(field);
+
         final TextField addName = new TextField();
         addName.setPromptText("name");
         addName.setMaxWidth(field.getPrefWidth());
         addName.setPrefHeight(30);
-        final TextField addLast = new TextField();
-        addLast.setMaxWidth(column.getPrefWidth());
-        addLast.setPromptText("width");
-        addLast.setPrefHeight(30);
         BorderPane tabPanel = new BorderPane();
         ScrollPane sp = new ScrollPane();
         sp.setContent(colSetup);
         tabPanel.setCenter(sp);
 
         HBox toolBar = new HBox();
-        Button addRow = new Button("Add");
+        addRow = new Button("Add");
         addRow.setPrefSize(80, 20);
-        addRow.setOnAction( e -> {
-            if (!addLast.getText().isEmpty()) {
-                TableRow tableRow = addLast.getText().matches("[1-9][0-9]") ? new TableRow(addName.getText(), Integer.valueOf(addLast.getText())) : new TableRow(addName.getText());
-                addName.clear();
-                addLast.clear();
-                data.add(tableRow);
-                tableRows.clear();
-                tableRows.addAll(data);
-                colSetup.setItems(data);
-                tableChanged = true;
-                colSetup.refresh();
-            }
+        addRow.setOnAction(e -> {
+            TableRow tableRow = new TableRow(addName.getText());
+            addName.clear();
+            data.add(tableRow);
+            tableChanged = true;
+
         });
 
-        Button deleteRow = new Button("Delete");
+        deleteRow = new Button("Delete");
         deleteRow.setPrefSize(80, 20);
         deleteRow.setOnAction(e -> {
             if (colSetup.getFocusModel() != null && colSetup.getFocusModel().getFocusedIndex() != -1) {
-            tableChanged = true;
-            int row = colSetup.getFocusModel().getFocusedIndex();
-            TableRow tableRow = data.get(row);
-            data.remove(tableRow);
-            tableRows.clear();
-            tableRows.addAll(data);
-            colSetup.setItems(data);
-            colSetup.refresh();
-        }});
-        Button up = new Button("Up");
+                tableChanged = true;
+                int row = colSetup.getFocusModel().getFocusedIndex();
+                TableRow tableRow = data.get(row);
+                data.remove(tableRow);
+            }
+        });
+        up = new Button("Up");
         up.setPrefSize(80, 20);
-        up.setOnAction(e-> {
+        up.setOnAction(e -> {
             if (colSetup.getFocusModel() != null) {
                 int row = colSetup.getFocusModel().getFocusedIndex();
                 if (row > data.size() || row == 0) {
@@ -180,17 +169,13 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
                 TableRow tableRow2 = data.get(row - 1);
                 data.set(row - 1, tableRow1);
                 data.set(row, tableRow2);
-                tableRows.clear();
-                tableRows.addAll(data);
-                colSetup.setItems(data);
-                colSetup.refresh();
             } else {
                 return;
             }
         });
-        Button down = new Button("Down");
+        down = new Button("Down");
         down.setPrefSize(80, 20);
-        down.setOnAction(e-> {
+        down.setOnAction(e -> {
             if (colSetup.getFocusModel() != null) {
                 int row = colSetup.getFocusModel().getFocusedIndex();
                 if (row + 1 > data.size()) {
@@ -200,16 +185,13 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
                 TableRow tableRow2 = data.get(row + 1);
                 data.set(row + 1, tableRow1);
                 data.set(row, tableRow2);
-                tableRows.clear();
-                tableRows.addAll(data);
-                colSetup.setItems(data);
-                colSetup.refresh();
             } else {
                 return;
             }
         });
-        toolBar.getChildren().addAll(addName, addLast, addRow, deleteRow, up, down);
+        toolBar.getChildren().addAll(addName, addRow, deleteRow, up, down);
         tabPanel.setBottom(toolBar);
+        /* end UI for Entry table columns */
 
         fileColumn = new CheckBox(Localization.lang("Show file column"));
         urlColumn = new CheckBox(Localization.lang("Show URL/DOI column"));
@@ -244,7 +226,7 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
 
         Button helpButton = new Button("?");
         helpButton.setPrefSize(20, 20);
-        helpButton.setOnAction(e->new HelpAction(Localization.lang("Help on special fields"),
+        helpButton.setOnAction(e -> new HelpAction(Localization.lang("Help on special fields"),
                 HelpFile.SPECIAL_FIELDS).getHelpButton().doClick());
 
         rankingColumn = new CheckBox(Localization.lang("Show rank"));
@@ -280,7 +262,7 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
         GridPane specialTableColumnsBuilder = new GridPane();
         specialTableColumnsBuilder.add(specialFieldsEnabled, 1, 1);
         specialTableColumnsBuilder.add(rankingColumn, 1, 2);
-        specialTableColumnsBuilder.add(relevanceColumn,  1, 3);
+        specialTableColumnsBuilder.add(relevanceColumn, 1, 3);
         specialTableColumnsBuilder.add(qualityColumn, 1, 4);
         specialTableColumnsBuilder.add(priorityColumn, 1, 5);
         specialTableColumnsBuilder.add(printedColumn, 1, 6);
@@ -295,13 +277,13 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
         specialTableColumnsBuilder.add(fileColumn, 2, 1);
         specialTableColumnsBuilder.add(urlColumn, 2, 2);
         final ToggleGroup preferUrlOrDoi = new ToggleGroup();
-        specialTableColumnsBuilder.add(preferUrl, 2 ,3);
+        specialTableColumnsBuilder.add(preferUrl, 2, 3);
         specialTableColumnsBuilder.add(preferDoi, 2, 4);
         preferUrl.setToggleGroup(preferUrlOrDoi);
         preferDoi.setToggleGroup(preferUrlOrDoi);
         specialTableColumnsBuilder.add(arxivColumn, 2, 5);
 
-        specialTableColumnsBuilder.add(extraFileColumns,2, 6);
+        specialTableColumnsBuilder.add(extraFileColumns, 2, 6);
         specialTableColumnsBuilder.add(listOfFileColumnsScrollPane, 2, 10);
 
         builder.add(specialTableColumnsBuilder, 1, 2);
@@ -312,14 +294,9 @@ public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
         entryTableColumns.getStyleClass().add("sectionHeader");
         builder.add(entryTableColumns, 1, 4);
         builder.add(tabPanel, 1, 5);
-
-        Button buttonWidth = new Button("Update to current column widths");
-        buttonWidth.setPrefSize(300, 30);
-        buttonWidth.setOnAction(e->new UpdateWidthsAction());
         Button buttonOrder = new Button("Update to current column order");
         buttonOrder.setPrefSize(300, 30);
-        buttonOrder.setOnAction(e->new UpdateOrderAction());
-        builder.add(buttonWidth, 1, 6);
+        buttonOrder.setOnAction(e -> new UpdateOrderAction());
         builder.add(buttonOrder, 1, 7);
     }
 
@@ -354,7 +331,7 @@ public void setValues() {
                 listOfFileColumns.getSelectionModel().select(indicesToSelect[i]);
             }
         } else {
-            listOfFileColumns.getSelectionModel().select(new int[] {});
+            listOfFileColumns.getSelectionModel().select(new int[]{});
         }
 
         /*** begin: special fields ***/
@@ -390,15 +367,11 @@ public void setValues() {
 
         /*** end: special fields ***/
 
-        tableRows.clear();
-        List<String> names = prefs.getStringList(JabRefPreferences.COLUMN_NAMES);
-        List<String> lengths = prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS);
-        for (int i = 0; i < names.size(); i++) {
-            if (i < lengths.size()) {
-                tableRows.add(new TableRow(names.get(i), Double.parseDouble(lengths.get(i))));
-            } else {
-                tableRows.add(new TableRow(names.get(i)));
-            }
+        data.clear();
+        List<String> prefColNames = this.prefs.getStringList(this.prefs.COLUMN_NAMES);
+        List<String> prefColWidths = this.prefs.getStringList(this.prefs.COLUMN_WIDTHS);
+        for (int i = 0; i < prefColNames.size(); i++) {
+            this.data.add(new TableRow(prefColNames.get(i), Double.parseDouble(prefColWidths.get(i))));
         }
     }
 
@@ -457,7 +430,7 @@ public void actionPerformed(ActionEvent e) {
             // everything not inside hash/mainTable as it was
             final HashMap<String, Integer> map = new HashMap<>();
 
-            // first element (#) not inside tableRows
+            // first element (#) not inside data
             /*
             for (TableColumn<BibEntry, ?> column : panel.getMainTable().getColumns()) {
                 String name = column.getText();
@@ -466,7 +439,7 @@ public void actionPerformed(ActionEvent e) {
                 }
             }
             */
-            Collections.sort(tableRows, (o1, o2) -> {
+            Collections.sort(data, (o1, o2) -> {
                 Integer n1 = map.get(o1.getName());
                 Integer n2 = map.get(o2.getName());
                 if ((n1 == null) || (n2 == null)) {
@@ -475,58 +448,17 @@ public void actionPerformed(ActionEvent e) {
                 return n1.compareTo(n2);
             });
 
-            data.clear();
-            data.addAll(tableRows);
             colSetup.setItems(data);
             colSetup.refresh();
             tableChanged = true;
         }
     }
 
-    class UpdateWidthsAction extends AbstractAction {
 
-        public UpdateWidthsAction() {
-            super(Localization.lang("Update to current column widths"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            BasePanel panel = frame.getCurrentBasePanel();
-            if (panel == null) {
-                return;
-            }
-            /*
-            TableColumnModel colMod = panel.getMainTable().getColumnModel();
-            colSetup.setValueAt(String.valueOf(colMod.getColumn(0).getWidth()), 0, 1);
-            for (int i = 1; i < colMod.getColumnCount(); i++) {
-                try {
-                    String name = panel.getMainTable().getColumnName(i).toLowerCase(Locale.ROOT);
-                    int width = colMod.getColumn(i).getWidth();
-                    if ((i <= tableRows.size()) && ((String) colSetup.getValueAt(i, 0)).equalsIgnoreCase(name)) {
-                        colSetup.setValueAt(String.valueOf(width), i, 1);
-                    } else { // Doesn't match; search for a matching col in our table
-                        for (int j = 0; j < colSetup.getRowCount(); j++) {
-                            if ((j < tableRows.size()) && ((String) colSetup.getValueAt(j, 0)).equalsIgnoreCase(name)) {
-                                colSetup.setValueAt(String.valueOf(width), j, 1);
-                                break;
-                            }
-                        }
-                    }
-                } catch (Throwable ex) {
-                    LOGGER.warn("Problem with table columns", ex);
-                }
-                colSetup.revalidate();
-                colSetup.repaint();
-            }
-            */
-
-        }
-    }
 
     /**
      * Store changes to table preferences. This method is called when
      * the user clicks Ok.
-     *
      */
     @Override
     public void storeSettings() {
@@ -574,7 +506,7 @@ public void storeSettings() {
         }
 
         // restart required implies that the settings have been changed
-        // the seetings need to be stored
+        // the settings need to be stored
         if (restartRequired) {
             prefs.putBoolean(JabRefPreferences.SPECIALFIELDSENABLED, newSpecialFieldsEnabled);
             prefs.putBoolean(JabRefPreferences.SHOWCOLUMN_RANKING, newRankingColumn);
@@ -600,18 +532,18 @@ public void storeSettings() {
         if (tableChanged) {
             // First we remove all rows with empty names.
             int i = 0;
-            while (i < tableRows.size()) {
-                if (tableRows.get(i).getName().isEmpty()) {
-                    tableRows.remove(i);
+            while (i < data.size()) {
+                if (data.get(i).getName().isEmpty()) {
+                    data.remove(i);
                 } else {
                     i++;
                 }
             }
             // Then we make arrays
-            List<String> names = new ArrayList<>(tableRows.size());
-            List<String> widths = new ArrayList<>(tableRows.size());
+            List<String> names = new ArrayList<>(data.size());
+            List<String> widths = new ArrayList<>(data.size());
 
-            for (TableRow tr : tableRows) {
+            for (TableRow tr : data) {
                 names.add(tr.getName().toLowerCase(Locale.ROOT));
                 widths.add(String.valueOf(tr.getLength()));
             }
diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
index 32ad4beec00..6452483c2ac 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -164,8 +164,6 @@ Close\ window=Luk vindue
 
 Closed\ library=Lukkede library
 
-Column\ width=Kolonnebredde
-
 Command\ line\ id=Kommandolinje-id
 
 Contained\ in=Indeholdt i
@@ -1033,8 +1031,6 @@ untitled=uden navn
 
 Up=Op
 
-Update\ to\ current\ column\ widths=Brug nuværende kolonnebredder
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Opgrader eksterne PDF- og PS-links til at bruge '%0'-feltet.
 Upgrade\ file=Opgrader fil
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Opgrader gamle eksterne links for at bruge den nye funktion
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index 6514a661985..af35ed23e3e 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -170,8 +170,6 @@ Close\ window=Fenster schließen
 
 Closed\ library=Bibliothek geschlossen
 
-Column\ width=Spaltenbreite
-
 Command\ line\ id=Kommandozeilen ID
 Comments=Kommentare
 
@@ -1100,8 +1098,6 @@ untitled=ohne Titel
 
 Up=Hoch
 
-Update\ to\ current\ column\ widths=Aktuelle Spaltenbreiten verwenden
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Externe PDF/PS-Links aktualisieren, um das Feld '%0' zu benutzen.
 Upgrade\ file=Datei aktualisiert
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Alte Links zu externen Dateien aktualisieren, um die neue Funktion zu nutzen
diff --git a/src/main/resources/l10n/JabRef_el.properties b/src/main/resources/l10n/JabRef_el.properties
index 6e51a88ed2f..2993ab7b3ae 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -168,8 +168,6 @@ Close\ window=Κλείσιμο παραθύρου
 
 Closed\ library=Κλειστή βιβλιοθήκη
 
-Column\ width=Μήκος στήλης
-
 Command\ line\ id=id γραμμής εντολών
 Comments=Σχόλια
 
@@ -1086,8 +1084,6 @@ untitled=χωρίς τίτλο
 
 Up=Επάνω
 
-Update\ to\ current\ column\ widths=Ενημέρωση του τρέχοντος πλάτους στηλών
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Αναβαθμίστε τους εξωτερικούς συνδέσμους PDF/PS για να χρησιμοποιήσετε το πεδίο '%0'.
 Upgrade\ file=Αναβάθμιση αρχείου
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Αναβαθμίστε τους παλιούς συνδέσμους εξωτερικού αρχείου για να χρησιμοποιήσετε τη νέα λειτουργία
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 50f3ee249f4..7a6a4a740de 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -167,8 +167,6 @@ Close\ window=Close window
 
 Closed\ library=Closed library
 
-Column\ width=Column width
-
 Command\ line\ id=Command line id
 Comments=Comments
 
@@ -1105,8 +1103,6 @@ untitled=untitled
 
 Up=Up
 
-Update\ to\ current\ column\ widths=Update to current column widths
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Upgrade external PDF/PS links to use the '%0' field.
 Upgrade\ file=Upgrade file
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Upgrade old external file links to use the new feature
@@ -2239,4 +2235,4 @@ Main\ layout\ file\:=Main layout file\:
 Main\ layout\ file=Main layout file
 Save\ exporter=Save exporter
 File\ extension\:=File extension\:
-Export\ format\ name\:=Export format name\:
\ No newline at end of file
+Export\ format\ name\:=Export format name\:
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index 88c2818cffa..ecbe73528be 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -166,8 +166,6 @@ Close\ window=Cerrar ventana
 
 Closed\ library=Biblioteca cerrada
 
-Column\ width=Ancho de columna
-
 Command\ line\ id=Id de línea de comando
 Comments=Comentarios
 
@@ -1073,8 +1071,6 @@ untitled=sin título
 
 Up=Arriba
 
-Update\ to\ current\ column\ widths=Actualizar a anchos de columna actuales
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Actualizar enlaces a PDF/PS externos para usar el campo '%0'.
 Upgrade\ file=Actualizar archivo
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Actualizar enlaces a archivos externos para usar la nueva característica.
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index 7647e660e9f..e0c8f2d6aa1 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -168,8 +168,6 @@ Close\ window=Fermer la fenêtre
 
 Closed\ library=Fichier fermé
 
-Column\ width=Largeur de colonne
-
 Command\ line\ id=Identifiant de la ligne de commande
 Comments=Commentaires
 
@@ -1086,8 +1084,6 @@ untitled=sans titre
 
 Up=Haut
 
-Update\ to\ current\ column\ widths=Figer les largeurs actuelles des colonnes
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Mettre à jour les liens externes PDF/PS pour utiliser le champ « %0 ».
 Upgrade\ file=Mettre à jour le fichier
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Mettre à jour les anciens liens vers les fichiers externes pour utiliser cette nouvelle fonction
diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties
index f7002d3abec..8a213140083 100644
--- a/src/main/resources/l10n/JabRef_in.properties
+++ b/src/main/resources/l10n/JabRef_in.properties
@@ -167,8 +167,6 @@ Close\ window=Tutup jendela
 
 Closed\ library=Basisdata ditutup
 
-Column\ width=Lebar kolom
-
 Command\ line\ id=id perintah baris
 
 Contained\ in=Terkandung di
@@ -1075,8 +1073,6 @@ untitled=tanpa judul
 
 Up=Naik
 
-Update\ to\ current\ column\ widths=Perbarui sesuai lebar kolom sekarang
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Perbarui tautan eksternal PDF/PS untuk digunakan bidang '%0'.
 Upgrade\ file=Naiktaraf berkas
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Naiktaraf tautan berkas eksternal lama untuk digunakan di fitur baru
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index 1f88b742ea7..c33bbf252bb 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -168,8 +168,6 @@ Close\ window=Chiudi la finestra
 
 Closed\ library=Libreria chiusa
 
-Column\ width=Larghezza della colonna
-
 Command\ line\ id=Identificativo della riga di comando
 Comments=Commenti
 
@@ -1086,8 +1084,6 @@ untitled=senza titolo
 
 Up=Su
 
-Update\ to\ current\ column\ widths=Aggiorna la larghezza delle colonne ai valori correnti
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Aggiornare i collegamenti esterni PDF/PS per utilizzare il campo '%0'.
 Upgrade\ file=Aggiornamento del file
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Aggiornare i vecchi collegamenti ai file esterni per utilizzare la nuova funzione
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index 9825d7cd903..802612487bb 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -168,8 +168,6 @@ Close\ window=ウィンドウを閉じる
 
 Closed\ library=データベースを閉じました
 
-Column\ width=列幅
-
 Command\ line\ id=コマンドラインID
 Comments=コメント
 
@@ -1086,8 +1084,6 @@ untitled=タイトルなし
 
 Up=上
 
-Update\ to\ current\ column\ widths=現在の列幅に更新
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=外部PDF/PSリンクを「%0」フィールドを使用するように更新
 Upgrade\ file=ファイルを更新
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=古い外部ファイルリンクを新機能を利用するように更新
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index 96c5d572ece..33dac19033d 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -168,8 +168,6 @@ Close\ window=Sluit venster
 
 Closed\ library=Sluit library
 
-Column\ width=Kolombreedte
-
 Command\ line\ id=Commandoregel id
 Comments=Opmerkingen
 
@@ -1084,8 +1082,6 @@ untitled=naamloos
 
 Up=Omhoog
 
-Update\ to\ current\ column\ widths=Update naar huidige kolombreedtes
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Upgrade externe PDF/PS links om het veld '%0' te gebruiken.
 Upgrade\ file=Bestand upgraden
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Oude externe bestandslinks upgraden om de nieuwe functie te gebruiken
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index d0a4868e7e0..e0ab4a3dd24 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -163,8 +163,6 @@ Close\ window=Lukk vindu
 
 Closed\ library=Lukket library
 
-Column\ width=Kolonnebredde
-
 Command\ line\ id=Kommandolinje-id
 
 Contained\ in=Inneholdt i
@@ -1031,8 +1029,6 @@ untitled=uten navn
 
 Up=Opp
 
-Update\ to\ current\ column\ widths=Bruk nåværende kolonnebredder
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Oppgrader eksterne PDF- og PS-linker til å bruke '%0'-feltet.
 Upgrade\ file=Oppgrader fil
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Oppgrader gamle eksterne linker for å bruke den nye funksjonen
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index b683d07c9da..73ceefa17cc 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -164,8 +164,6 @@ Close\ window=Fechar Janela
 
 Closed\ library=Base de dados fechada
 
-Column\ width=Largura da coluna
-
 Command\ line\ id=ID da linha de comando
 
 Contained\ in=Contido em
@@ -1041,8 +1039,6 @@ untitled=Sem título
 
 Up=Acima
 
-Update\ to\ current\ column\ widths=Atualizar para a largura de coluna atual
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Atualizar links PDF/PS externos para utilizar o campo '%0'
 Upgrade\ file=Atualizar arquivo
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Atualize os links de arquivos externos para utilizar o novo recurso
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index 2e9c0184b7e..96146e43356 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -165,8 +165,6 @@ Close\ window=Закрыть окно
 
 Closed\ library=Закрытая БД
 
-Column\ width=Ширина столбца
-
 Command\ line\ id=Ид. командной строки
 
 Contained\ in=Содержится в
@@ -1046,8 +1044,6 @@ untitled=без заглавия
 
 Up=Вверх
 
-Update\ to\ current\ column\ widths=Сохранить текущую ширину столбца
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Обновить ссылки на внешние PDF/PS для использования в поле '%0'.
 Upgrade\ file=Обновить файл
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Обновить старые ссылки на внешние файлы для использования новых функций
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index 966e5477366..002fc571c35 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -160,8 +160,6 @@ Close\ window=Stäng fönster
 
 Closed\ library=Stängde libraryn
 
-Column\ width=Kolumnbredd
-
 Command\ line\ id=Kommandorads-id
 
 Contained\ in=Finns i
@@ -1002,8 +1000,6 @@ untitled=namnlös
 
 Up=Uppåt
 
-Update\ to\ current\ column\ widths=Uppdatera till aktuella kolumnbredder
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Uppgradera PDF/PS-länkar att använda '%0'-fältet.
 Upgrade\ file=Uppgradera fil
 
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index 99ae914743a..5d59594d3d3 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -168,8 +168,6 @@ Close\ window=Isara ang window
 
 Closed\ library=Nasara ang library
 
-Column\ width=Lapad ng haligi
-
 Command\ line\ id=Linya ng utos para sa id
 Comments=Komento
 
@@ -1076,8 +1074,6 @@ untitled=untitled
 
 Up=Up
 
-Update\ to\ current\ column\ widths=I-update ang kasalukuyang haligi ng lapad
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=I-upgrade ang eksternal na PDF/PS links na gagamitin sa '%0' patlang.
 Upgrade\ file=I-upgrade ang file
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=I-upgrade ang lumang eksternal na file links na gagamitin sa bagong tampok
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index 74a54e41bbf..dd1e00d9c30 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -168,8 +168,6 @@ Close\ window=Pencereyi kapat
 
 Closed\ library=Kapalı veritabanı
 
-Column\ width=Sütun genişliği
-
 Command\ line\ id=Komut satır no
 Comments=Yorumlar
 
@@ -1086,8 +1084,6 @@ untitled=başlıksız
 
 Up=Yukarı
 
-Update\ to\ current\ column\ widths=Mevcut sütun genişliklerine güncelle
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Harici PDF/PS linklerini '%0' alanını kullanmak üzere yeni sürüme yükselt.
 Upgrade\ file=Dosyayı yeni sürüme yükselt
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Eski harici dosya linklerini yeni özelliği kullanmak üzere yeni sürüme yükselt
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
index 42cef4dbd9b..0442bdfe726 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -168,8 +168,6 @@ Close\ window=Đóng cửa sổ
 
 Closed\ library=CSDL được đóng
 
-Column\ width=Chiều rộng cột
-
 Command\ line\ id=Chỉ số (id) của dòng lệnh
 Comments=Nhận xét
 
@@ -1058,8 +1056,6 @@ untitled=không tiêu đề
 
 Up=Lên
 
-Update\ to\ current\ column\ widths=Cập nhật chiều rộng cột hiện tại
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Nâng cấp các liên kết ngoài PDF/PS để sử dụng dữ liệu '%0'.
 Upgrade\ file=Nâng cấp tập tin
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=Nâng cấp các liên kết tập tin ngoài để sử dụng tính chất mới
diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
index dcae489f8aa..f9c9409df91 100644
--- a/src/main/resources/l10n/JabRef_zh.properties
+++ b/src/main/resources/l10n/JabRef_zh.properties
@@ -168,8 +168,6 @@ Close\ window=关闭窗口
 
 Closed\ library=关闭文献库
 
-Column\ width=列宽
-
 Command\ line\ id=命令行 id
 Comments=注释
 
@@ -1086,8 +1084,6 @@ untitled=未命名
 
 Up=上
 
-Update\ to\ current\ column\ widths=使用当前视图中的列宽
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=升级外部 PDF/PS 链接以使用 '%0' 域。
 Upgrade\ file=升级文件
 Upgrade\ old\ external\ file\ links\ to\ use\ the\ new\ feature=升级旧外部文件链接以使用新特性

From f1bbbb7c7a1f571861b79bfb21789829893c4991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
Date: Wed, 9 Jan 2019 13:08:07 +0100
Subject: [PATCH 214/229] Update journalList.txt

Update "Best Practice & Research" journal titles
---
 src/main/resources/journals/journalList.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/journals/journalList.txt b/src/main/resources/journals/journalList.txt
index bf62acd58e9..c2db98e8d68 100644
--- a/src/main/resources/journals/journalList.txt
+++ b/src/main/resources/journals/journalList.txt
@@ -1989,13 +1989,13 @@ Berliner Beitraege zur Archaeometrie = Berl. Beitr. Archaeom.
 Berliner Geowissenschaftliche Abhandlungen, Reihe A: Geologie und Palaeontologie = Berl. Geowiss. Abh., Reihe A
 Berliner und Munchener Tierarztliche Wochenschrift = Berl. Munch. Tierarztl. Wochenschr.
 Berufs-Dermatosen = Berufsdermatosen.
-Best Practice & Research, Clinical Haematology = Best Pract. Res. Clin. Haematol.
-Best Practice and Research. Clinical Anaesthesiology = Best Pract. Res. Clin. Anaesthesiol.
-Best Practice and Research. Clinical Endocrinology and Metabolism = Best Pract. Res. Clin. Endocrinol. Metab.
-Best Practice and Research. Clinical Gastroenterology = Best Pract. Res. Clin. Gastroenterol.
-Best Practice and Research. Clinical Haematology = Best Pract. Res. Clin. Haematol.
-Best Practice and Research. Clinical Obstetrics and Gynaecology = Best Pract. Res. Clin. Obstet. Gynaecol.
-Best Practice and Research. Clinical Rheumatology = Best Pract. Res. Clin. Rheumatol.
+Best Practice & Research: Clinical Haematology = Best Pract. Res. Clin. Haematol.
+Best Practice & Research: Clinical Anaesthesiology = Best Pract. Res. Clin. Anaesthesiol.
+Best Practice & Research: Clinical Endocrinology and Metabolism = Best Pract. Res. Clin. Endocrinol. Metab.
+Best Practice & Research: Clinical Gastroenterology = Best Pract. Res. Clin. Gastroenterol.
+Best Practice & Research: Clinical Haematology = Best Pract. Res. Clin. Haematol.
+Best Practice & Research: Clinical Obstetrics and Gynaecology = Best Pract. Res. Clin. Obstet. Gynaecol.
+Best Practice & Research: Clinical Rheumatology = Best Pract. Res. Clin. Rheumatol.
 Best Practices and Benchmarking in Healthcare = Best Pract. Benchmarking Healthc.
 Best's Review. Life/Health Insurance Edition = Bests Rev. Life. Health Insur. Ed.
 Beton- und Stahlbetonbau = Beton- Stahlbetonbau

From a051e1b08e45fbb6b79c83ce711e7b14f8c23fe8 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 13 Jan 2019 18:46:38 +0100
Subject: [PATCH 215/229] update jfoenix and gradle plugins Replace outdated
 transformer log4j2 with official new one

---
 build.gradle                                  | 12 ++++++------
 src/main/java/org/jabref/gui/JabRefFrame.java | 10 +++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index c2294a1ae4d..5f902290771 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,12 +16,11 @@ buildscript {
 
 plugins {
     id 'com.gradle.build-scan' version '1.16'
-    id 'com.install4j.gradle' version '7.0.8'
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
-    id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
+    id 'com.install4j.gradle' version '7.0.9'
+    id 'com.github.johnrengelman.shadow' version '4.0.2'
     id "com.simonharrer.modernizer" version '1.6.0-1'
-    id 'me.champeau.gradle.jmh' version '0.4.7'
-    id 'net.ltgt.errorprone' version '0.6'
+    id 'me.champeau.gradle.jmh' version '0.4.8'
+    id 'net.ltgt.errorprone' version '0.6.1'
     id 'com.github.ben-manes.versions' version '0.20.0'
 }
 
@@ -138,7 +137,7 @@ dependencies {
     compile 'org.fxmisc.richtext:richtextfx:0.9.2'
     compile 'com.sibvisions.external.jvxfx:dndtabpane:0.1'
     compile 'javax.inject:javax.inject:1'
-    compile 'com.jfoenix:jfoenix:8.0.7'
+    compile 'com.jfoenix:jfoenix:8.0.8'
 
     // Cannot be updated to 9.*.* until Jabref works with Java 9
     compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT'
@@ -419,6 +418,7 @@ modernizer {
 
 // Release tasks
 shadowJar {
+    transform(com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer)
     classifier 'fat'
 }
 
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 86c9f7ec54a..66e4643e1d2 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -48,6 +48,7 @@
 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;
@@ -131,6 +132,8 @@
 
 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;
@@ -147,6 +150,7 @@ 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;
@@ -1012,11 +1016,11 @@ public void addParserResult(ParserResult pr, boolean focusPanel) {
     /**
      * Displays the given message at the bottom of the main frame
      *
-     * @deprecated use {@link DialogService#notify(String)} instead
+     * @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 s) {
-        DefaultTaskExecutor.runInJavaFXThread(() -> statusLine.show(s, 3000));
+    public void output(final String message) {
+        DefaultTaskExecutor.runInJavaFXThread(() -> statusLine.fireEvent(new SnackbarEvent(new JFXSnackbarLayout(message), TOAST_MESSAGE_DISPLAY_TIME, null)));
     }
 
     private void initActions() {

From 40d049e081fa1fbd108cb25f319797ce756bb777 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Mon, 21 Jan 2019 16:19:26 +0100
Subject: [PATCH 216/229] Fix overlapping font in id entry type (#4595)

replace border pane with vbox
Fixes #4593
---
 src/main/java/org/jabref/gui/EntryType.fxml | 80 +++++++++------------
 1 file changed, 35 insertions(+), 45 deletions(-)

diff --git a/src/main/java/org/jabref/gui/EntryType.fxml b/src/main/java/org/jabref/gui/EntryType.fxml
index e08551310df..7fb864fdf78 100644
--- a/src/main/java/org/jabref/gui/EntryType.fxml
+++ b/src/main/java/org/jabref/gui/EntryType.fxml
@@ -7,49 +7,46 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.TitledPane?>
-<?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?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.EntryTypeView">
+<DialogPane prefWidth="476.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.EntryTypeView">
+      <buttonTypes>
+        <ButtonType fx:constant="CANCEL" />
+        <ButtonType fx:id="generateButton" buttonData="OK_DONE" text="%Generate" />
+      </buttonTypes>
    <content>
-      <BorderPane>
-         <top>
-            <VBox prefHeight="200.0" prefWidth="400.0" BorderPane.alignment="CENTER">
-               <children>
-                  <TitledPane fx:id="biblatexTitlePane" animated="false" collapsible="false" text="Biblatex">
-                     <content>
-                        <FlowPane fx:id="biblatexPane" prefHeight="200.0" prefWidth="200.0" />
-                     </content>
-                  </TitledPane>
-                  <TitledPane fx:id="bibTexTitlePane" animated="false" collapsible="false" text="BibTeX">
-                     <content>
-                        <FlowPane fx:id="bibTexPane" prefHeight="200.0" prefWidth="200.0" />
-                     </content>
-                  </TitledPane>
-                  <TitledPane fx:id="ieeeTranTitlePane" animated="false" collapsible="false" text="IEEETran">
-                     <content>
-                        <FlowPane fx:id="ieeetranPane" prefHeight="200.0" prefWidth="200.0" />
-                     </content>
-                  </TitledPane>
-                  <TitledPane fx:id="customTitlePane" animated="false" collapsible="false" text="%Custom">
-                     <content>
-                        <FlowPane fx:id="customPane" prefHeight="200.0" prefWidth="200.0" />
-                     </content>
-                  </TitledPane>
-               </children>
-            </VBox>
-         </top>
-         <bottom>
-            <GridPane alignment="CENTER" BorderPane.alignment="CENTER">
+      <VBox prefHeight="200.0" prefWidth="400.0">
+         <children>
+            <TitledPane fx:id="biblatexTitlePane" animated="false" collapsible="false" text="Biblatex">
+               <content>
+                  <FlowPane fx:id="biblatexPane" prefHeight="200.0" prefWidth="200.0" />
+               </content>
+            </TitledPane>
+            <TitledPane fx:id="bibTexTitlePane" animated="false" collapsible="false" text="BibTeX">
+               <content>
+                  <FlowPane fx:id="bibTexPane" prefHeight="200.0" prefWidth="200.0" />
+               </content>
+            </TitledPane>
+            <TitledPane fx:id="ieeeTranTitlePane" animated="false" collapsible="false" text="IEEETran">
+               <content>
+                  <FlowPane fx:id="ieeetranPane" prefHeight="200.0" prefWidth="200.0" />
+               </content>
+            </TitledPane>
+            <TitledPane fx:id="customTitlePane" animated="false" collapsible="false" text="%Custom">
+               <content>
+                  <FlowPane fx:id="customPane" prefHeight="200.0" prefWidth="200.0" />
+               </content>
+            </TitledPane>
+            <GridPane alignment="CENTER">
                <children>
-                  <Label text="%ID type" />
-                  <ComboBox fx:id="idBasedFetchers" prefHeight="30.0" prefWidth="300.0" GridPane.columnIndex="1" onAction="#focusTextField" />                  	
+                  <Label text="%ID type"/>
+                  <ComboBox fx:id="idBasedFetchers" onAction="#focusTextField" prefHeight="30.0" prefWidth="300.0" GridPane.columnIndex="1" />            
                   <Label text="%ID" GridPane.rowIndex="1" />
-                  <TextField fx:id="idTextField" prefHeight="30.0" prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="1" onAction="#runFetcherWorker"/>
+                  <TextField fx:id="idTextField" onAction="#runFetcherWorker" prefHeight="30.0" prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
                </children>
                <columnConstraints>
                   <ColumnConstraints hgrow="SOMETIMES" maxWidth="122.0" minWidth="10.0" prefWidth="100.0" />
@@ -59,18 +56,11 @@
                   <Insets bottom="4.0" left="4.0" right="4.0" top="4.0" />
                </opaqueInsets>
                <rowConstraints>
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES" />
                </rowConstraints>
-               <padding>
-                  <Insets bottom="4.0" left="4.0" right="4.0" top="4.0" />
-               </padding>
             </GridPane>
-         </bottom>
-      </BorderPane>
+         </children>
+      </VBox>
    </content>
-      <buttonTypes>
-        <ButtonType fx:constant="CANCEL" />
-        <ButtonType fx:id="generateButton" buttonData="OK_DONE" text="%Generate" />
-      </buttonTypes>
 </DialogPane>

From c7473e73b7c3ead034031128105fd72decd15544 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Jan 2019 08:24:58 +0100
Subject: [PATCH 217/229] Bump mysql-connector-java from 8.0.13 to 8.0.14
 (#4599)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.13 to 8.0.14.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.13...8.0.14)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5f902290771..94a5e380cab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -120,7 +120,7 @@ dependencies {
     antlr4 'org.antlr:antlr4:4.7.2'
     compile 'org.antlr:antlr4-runtime:4.7.2'
 
-    compile 'mysql:mysql-connector-java:8.0.13'
+    compile 'mysql:mysql-connector-java:8.0.14'
 
     compile 'org.postgresql:postgresql:42.2.5'
 

From 701e73d545e9879163438a95ba9ceb6a33eddb48 Mon Sep 17 00:00:00 2001
From: Aleksandrs Gusevs <gusevs.aleksandrs@gmail.com>
Date: Tue, 22 Jan 2019 13:28:24 +0200
Subject: [PATCH 218/229] Solution for submitting dialog with Ctrl + Enter
 (#4496) (#4592)

* Issue#4496 Added default action invocation in dialog when pressing ctrl+enter

* Issue#4496 Added changelog regarding changes made
---
 CHANGELOG.md                                    |  1 +
 .../org/jabref/gui/keyboard/KeyBinding.java     |  1 +
 .../java/org/jabref/gui/util/BaseDialog.java    | 17 +++++++++++++++++
 src/main/resources/l10n/JabRef_en.properties    |  2 ++
 4 files changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce2410787c6..9c29a663c2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We added the ability to have an export preference where previously "File"-->"Export"/"Export selected entries" would not save the user's preference[#4495](https://github.com/JabRef/jabref/issues/4495)
 - We added the ability to add field names from the Preferences Dialog [#4546](https://github.com/JabRef/jabref/issues/4546)
 - We added the ability change the column widths directly in the main table. [#4546](https://github.com/JabRef/jabref/issues/4546)
+- We added the ability to execute default action in dialog by using with <kbd>Ctrl</kbd> + <kbd>Enter</kbd> combination [#4496](https://github.com/JabRef/jabref/issues/4496)
 
 
 
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index cd6f1c67613..b73fbc6b0c3 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -25,6 +25,7 @@ public enum KeyBinding {
     ENTRY_EDITOR_PREVIOUS_PANEL_2("Entry editor, previous panel 2", Localization.lang("Entry editor, previous panel 2"), "ctrl+MINUS", KeyBindingCategory.VIEW),
     DECREASE_TABLE_FONT_SIZE("Decrease table font size", Localization.lang("Decrease table font size"), "ctrl+MINUS", KeyBindingCategory.VIEW),
     DELETE_ENTRY("Delete entry", Localization.lang("Delete entry"), "DELETE", KeyBindingCategory.BIBTEX),
+    DEFAULT_DIALOG_ACTION("Execute default action in dialog", Localization.lang("Execute default action in dialog"), "ctrl+ENTER", KeyBindingCategory.VIEW),
     DOWNLOAD_FULL_TEXT("Look up full text documents", Localization.lang("Look up full text documents"), "alt+F7", KeyBindingCategory.QUALITY),
     EDIT_ENTRY("Edit entry", Localization.lang("Edit entry"), "ctrl+E", KeyBindingCategory.BIBTEX),
     EDIT_STRINGS("Edit strings", Localization.lang("Edit strings"), "ctrl+T", KeyBindingCategory.BIBTEX),
diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index 59f6e034e3b..a05eb2862ce 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.util;
 
+import java.util.Optional;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
@@ -16,6 +20,8 @@ protected BaseDialog() {
             KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
             if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, event)) {
                 close();
+            } else if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.DEFAULT_DIALOG_ACTION, event)) {
+                getDefaultButton().ifPresent(Button::fire);
             }
         });
 
@@ -24,6 +30,17 @@ protected BaseDialog() {
         Globals.getThemeLoader().installCss(getDialogPane().getScene(), Globals.prefs);
     }
 
+    private Optional<Button> getDefaultButton() {
+        return Optional.ofNullable((Button) getDialogPane().lookupButton(getDefaultButtonType()));
+    }
+
+    private ButtonType getDefaultButtonType() {
+        return getDialogPane().getButtonTypes().stream()
+                .filter(buttonType -> buttonType.getButtonData().isDefaultButton())
+                .findFirst()
+                .orElse(ButtonType.OK);
+    }
+
     private void setDialogIcon(Image image) {
         Stage dialogWindow = (Stage) getDialogPane().getScene().getWindow();
         dialogWindow.getIcons().add(image);
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 7a6a4a740de..d451fa524d2 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -249,6 +249,8 @@ Default\ grouping\ field=Default grouping field
 
 Default\ pattern=Default pattern
 
+Execute\ default\ action\ in\ dialog=Execute default action in dialog
+
 Delete=Delete
 
 Delete\ custom\ format=Delete custom format

From 05f3350cc14f91fd4c7f2846d6bd355da772d7e0 Mon Sep 17 00:00:00 2001
From: Chelsey Ong <30564248+chelseyong@users.noreply.github.com>
Date: Tue, 22 Jan 2019 19:16:22 +0700
Subject: [PATCH 219/229] Add a variable to track the change in preview style
 (#4587)

---
 .../java/org/jabref/gui/PreviewPanel.java     | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
index 9c92f9e6ce4..bffcb4e2bd3 100644
--- a/src/main/java/org/jabref/gui/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -61,6 +61,8 @@ public class PreviewPanel extends ScrollPane implements SearchQueryHighlightList
     private final DialogService dialogService;
     private final KeyBindingRepository keyBindingRepository;
 
+    private String previewStyle;
+    private final String defaultPreviewStyle = "Preview";
     private Optional<BasePanel> basePanel = Optional.empty();
 
     private boolean fixedLayout;
@@ -220,21 +222,26 @@ private void updateLayout(PreviewPreferences previewPreferences, boolean init) {
         }
 
         String style = previewPreferences.getCurrentPreviewStyle();
-        if (CitationStyle.isCitationStyleFile(style)) {
-            if (basePanel.isPresent()) {
+        if (previewStyle == null) {
+            previewStyle = style;
+        }
+        if (basePanel.isPresent() && !previewStyle.equals(style)) {
+            if (CitationStyle.isCitationStyleFile(style)) {
                 layout = Optional.empty();
                 CitationStyle.createCitationStyleFromFile(style)
-                             .ifPresent(citationStyle -> {
-                                 basePanel.get().getCitationStyleCache().setCitationStyle(citationStyle);
-                                 if (!init) {
-                                     basePanel.get().output(Localization.lang("Preview style changed to: %0", citationStyle.getTitle()));
-                                 }
-                             });
-            }
-        } else {
-            updatePreviewLayout(previewPreferences.getPreviewStyle(), previewPreferences.getLayoutFormatterPreferences());
-            if (!init) {
-                basePanel.ifPresent(panel -> panel.output(Localization.lang("Preview style changed to: %0", Localization.lang("Preview"))));
+                        .ifPresent(citationStyle -> {
+                            basePanel.get().getCitationStyleCache().setCitationStyle(citationStyle);
+                            if (!init) {
+                                basePanel.get().output(Localization.lang("Preview style changed to: %0", citationStyle.getTitle()));
+                            }
+                        });
+                previewStyle = style;
+            } else {
+                previewStyle = defaultPreviewStyle;
+                updatePreviewLayout(previewPreferences.getPreviewStyle(), previewPreferences.getLayoutFormatterPreferences());
+                if (!init) {
+                    basePanel.get().output(Localization.lang("Preview style changed to: %0", Localization.lang("Preview")));
+                }
             }
         }
 

From c6f68e3239a767aeaa1f04d692c7f1157a0fbf43 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 23 Jan 2019 09:27:02 +0100
Subject: [PATCH 220/229] Convert new version dialog to JavaFX (#4602)

---
 .../org/jabref/gui/help/NewVersionDialog.java | 113 ++++++------------
 .../org/jabref/gui/help/VersionWorker.java    |   2 +-
 2 files changed, 37 insertions(+), 78 deletions(-)

diff --git a/src/main/java/org/jabref/gui/help/NewVersionDialog.java b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
index 51bff518ca6..a28a654b349 100644
--- a/src/main/java/org/jabref/gui/help/NewVersionDialog.java
+++ b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
@@ -1,92 +1,51 @@
 package org.jabref.gui.help;
 
-import java.awt.Cursor;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.MouseEvent;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.event.MouseInputAdapter;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
+import javafx.scene.layout.VBox;
 
 import org.jabref.Globals;
-import org.jabref.gui.JabRefDialog;
 import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.Version;
 import org.jabref.preferences.VersionPreferences;
 
-public class NewVersionDialog extends JabRefDialog {
+public class NewVersionDialog extends BaseDialog<Void> {
 
     public NewVersionDialog(Version currentVersion, Version latestVersion) {
-        super(NewVersionDialog.class);
-        setTitle(Localization.lang("New version available"));
-
-        JLabel lblTitle = new JLabel(Localization.lang("A new version of JabRef has been released."));
-        JLabel lblCurrentVersion = new JLabel(Localization.lang("Installed version") + ": " + currentVersion.getFullVersion());
-        JLabel lblLatestVersion = new JLabel(Localization.lang("Latest version") + ": " + latestVersion.getFullVersion());
-
-        String localization = Localization.lang("To see what is new view the changelog.");
-        JLabel lblMoreInformation = new JLabel("<HTML><a href=" + latestVersion.getChangelogUrl() + "'>" + localization + "</a></HTML>");
-        lblMoreInformation.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-        lblMoreInformation.addMouseListener(new MouseInputAdapter() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                JabRefDesktop.openBrowserShowPopup(latestVersion.getChangelogUrl());
+        this.setTitle(Localization.lang("New version available"));
+
+        ButtonType btnIgnoreUpdate = new ButtonType(Localization.lang("Ignore this update"), ButtonBar.ButtonData.CANCEL_CLOSE);
+        ButtonType btnDownloadUpdate = new ButtonType(Localization.lang("Download update"), ButtonBar.ButtonData.APPLY);
+        ButtonType btnRemindMeLater = new ButtonType(Localization.lang("Remind me later"), ButtonBar.ButtonData.CANCEL_CLOSE);
+        this.getDialogPane().getButtonTypes().addAll(btnIgnoreUpdate, btnDownloadUpdate, btnRemindMeLater);
+        this.setResultConverter(button -> {
+            if (button == btnIgnoreUpdate) {
+                Globals.prefs.storeVersionPreferences(new VersionPreferences(latestVersion));
+            } else if (button == btnDownloadUpdate) {
+                JabRefDesktop.openBrowserShowPopup(Version.JABREF_DOWNLOAD_URL);
             }
+            return null;
         });
-
-        JButton btnIgnoreUpdate = new JButton(Localization.lang("Ignore this update"));
-        btnIgnoreUpdate.addActionListener(e -> {
-            Globals.prefs.storeVersionPreferences(new VersionPreferences(latestVersion));
-            dispose();
-        });
-
-        JButton btnDownloadUpdate = new JButton(Localization.lang("Download update"));
-        btnDownloadUpdate.addActionListener(e -> {
-            JabRefDesktop.openBrowserShowPopup(Version.JABREF_DOWNLOAD_URL);
-            dispose();
-        });
-
-        JButton btnRemindMeLater = new JButton(Localization.lang("Remind me later"));
-        btnRemindMeLater.addActionListener(e -> dispose());
-
-        JPanel panel = new JPanel();
-        panel.setLayout(new GridBagLayout());
-        GridBagConstraints c = new GridBagConstraints();
-        c.gridheight = 1;
-        c.fill = GridBagConstraints.BOTH;
-        c.insets = new Insets(2, 5, 5, 2);
-
-        c.gridx = c.gridy = 0;
-        c.gridwidth = 3;
-        panel.add(lblTitle, c);
-
-        c.gridy = 1;
-        panel.add(lblCurrentVersion, c);
-
-        c.gridy = 2;
-        panel.add(lblLatestVersion, c);
-
-        c.gridy = 3;
-        panel.add(lblMoreInformation, c);
-
-        c.gridy = 4;
-        c.gridx = 0;
-        c.gridwidth = 1;
-        panel.add(btnDownloadUpdate, c);
-
-        c.gridx = 1;
-        panel.add(btnIgnoreUpdate, c);
-
-        c.gridx = 2;
-        panel.add(btnRemindMeLater, c);
-
-        add(panel);
-        pack();
-        setVisible(true);
+        Button defaultButton = (Button) this.getDialogPane().lookupButton(btnDownloadUpdate);
+        defaultButton.setDefaultButton(true);
+
+        Hyperlink lblMoreInformation = new Hyperlink(Localization.lang("To see what is new view the changelog."));
+        lblMoreInformation.setOnAction(event ->
+                JabRefDesktop.openBrowserShowPopup(latestVersion.getChangelogUrl())
+        );
+
+        VBox container = new VBox(
+                new Label(Localization.lang("A new version of JabRef has been released.")),
+                new Label(Localization.lang("Installed version") + ": " + currentVersion.getFullVersion()),
+                new Label(Localization.lang("Latest version") + ": " + latestVersion.getFullVersion()),
+                lblMoreInformation
+        );
+        getDialogPane().setContent(container);
+        getDialogPane().setPrefWidth(450);
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/help/VersionWorker.java b/src/main/java/org/jabref/gui/help/VersionWorker.java
index a77be5cc955..2250be98a8f 100644
--- a/src/main/java/org/jabref/gui/help/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/help/VersionWorker.java
@@ -88,7 +88,7 @@ private void showUpdateInfo(Optional<Version> newerVersion, boolean manualExecut
             }
         } else {
             // notify the user about a newer version
-            new NewVersionDialog(installedVersion, newerVersion.get());
+            new NewVersionDialog(installedVersion, newerVersion.get()).showAndWait();
         }
     }
 }

From 232c3459ca30fae4bc4ba90f794079ccda8cdaf9 Mon Sep 17 00:00:00 2001
From: Chelsey Ong <30564248+chelseyong@users.noreply.github.com>
Date: Wed, 23 Jan 2019 17:41:16 +0700
Subject: [PATCH 221/229] Force javafx to run thread (#4604)

---
 src/main/java/org/jabref/gui/EntryTypeView.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java
index 733eb80ef29..326c1aa855a 100644
--- a/src/main/java/org/jabref/gui/EntryTypeView.java
+++ b/src/main/java/org/jabref/gui/EntryTypeView.java
@@ -3,6 +3,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import javafx.application.Platform;
 import javafx.event.Event;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -143,6 +144,7 @@ public void initialize() {
             }
         }
 
+        Platform.runLater(() -> idTextField.requestFocus());
     }
 
     public EntryType getChoice() {

From c6a1fcbe3a2a1910e3af6987134dc89e2d954949 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Wed, 23 Jan 2019 13:00:40 +0100
Subject: [PATCH 222/229] Fix not on FX thread exception

---
 .../java/org/jabref/FallbackExceptionHandler.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/FallbackExceptionHandler.java b/src/main/java/org/jabref/FallbackExceptionHandler.java
index cdba8486c2c..0c0a4cb4391 100644
--- a/src/main/java/org/jabref/FallbackExceptionHandler.java
+++ b/src/main/java/org/jabref/FallbackExceptionHandler.java
@@ -1,5 +1,7 @@
 package org.jabref;
 
+import org.jabref.gui.util.DefaultTaskExecutor;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,9 +19,11 @@ public static void installExceptionHandler() {
     @Override
     public void uncaughtException(Thread thread, Throwable exception) {
         LOGGER.error("Uncaught exception occurred in " + thread, exception);
-        JabRefGUI.getMainFrame()
-                 .getDialogService()
-                 .showErrorDialogAndWait(
-                                         exception.getLocalizedMessage(), exception);
+
+        DefaultTaskExecutor.runInJavaFXThread(() ->
+                JabRefGUI.getMainFrame()
+                         .getDialogService()
+                         .showErrorDialogAndWait("Uncaught exception occurred in " + thread, exception)
+        );
     }
 }

From 5d2b765beaa5664f3db0da233f7c94f42621fddd Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Thu, 24 Jan 2019 20:03:24 +0100
Subject: [PATCH 223/229] Convert "Show preferences" dialog to JavaFX (#4605)

---
 .../gui/preferences/PreferencesDialog.java    |   2 +-
 .../preferences/PreferencesFilterDialog.fxml  |  41 ++++++
 .../preferences/PreferencesFilterDialog.java  | 137 +++++-------------
 3 files changed, 80 insertions(+), 100 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.fxml

diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 72da827e2e2..a2571e4e5fd 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -126,7 +126,7 @@ private void construct() {
         exportPreferences.setOnAction(e -> exportPreferences());
         exportPreferences.setMaxWidth(Double.MAX_VALUE);
         Button showPreferences = new Button(Localization.lang("Show preferences"));
-        showPreferences.setOnAction(e -> new PreferencesFilterDialog(new JabRefPreferencesFilter(prefs)).setVisible(true));
+        showPreferences.setOnAction(e -> new PreferencesFilterDialog(new JabRefPreferencesFilter(prefs)).showAndWait());
         showPreferences.setMaxWidth(Double.MAX_VALUE);
         Button resetPreferences = new Button(Localization.lang("Reset preferences"));
         resetPreferences.setOnAction(e -> resetPreferences());
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.fxml
new file mode 100644
index 00000000000..399e2c9fc27
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.fxml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="600.0" prefWidth="950.0"
+            xmlns="http://javafx.com/javafx/8.0.121" fx:controller="org.jabref.gui.preferences.PreferencesFilterDialog">
+
+    <content>
+        <BorderPane>
+            <bottom>
+                <HBox>
+                    <CheckBox fx:id="showOnlyDeviatingPreferenceOptions"
+                              text="%Show only preferences deviating from their default value"/>
+                    <HBox HBox.hgrow="ALWAYS"/>
+                    <Label fx:id="count"/>
+                </HBox>
+            </bottom>
+            <center>
+                <TableView fx:id="table">
+                    <columns>
+                        <TableColumn fx:id="columnType" text="%type"/>
+                        <TableColumn fx:id="columnKey" text="%key"/>
+                        <TableColumn fx:id="columnValue" text="%value"/>
+                        <TableColumn fx:id="columnDefaultValue" text="%default"/>
+                    </columns>
+                    <padding>
+                        <Insets bottom="30.0"/>
+                    </padding>
+                </TableView>
+            </center>
+        </BorderPane>
+    </content>
+    <ButtonType fx:constant="CLOSE"/>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
index de09b2cb100..09d01ec3510 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
@@ -1,125 +1,64 @@
 package org.jabref.gui.preferences;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.util.List;
 import java.util.Objects;
 
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.table.AbstractTableModel;
-
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.WrapLayout;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.beans.property.ReadOnlyStringWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+
+import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferencesFilter;
 
-class PreferencesFilterDialog extends JabRefDialog {
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class PreferencesFilterDialog extends BaseDialog<Void> {
 
     private final JabRefPreferencesFilter preferencesFilter;
+    private final ObservableList<JabRefPreferencesFilter.PreferenceOption> preferenceOptions;
 
-    private final JTable table;
-    private final JCheckBox showOnlyDeviatingPreferenceOptions;
-    private final JLabel count;
+    @FXML private TableView<JabRefPreferencesFilter.PreferenceOption> table;
+    @FXML private TableColumn<JabRefPreferencesFilter.PreferenceOption, JabRefPreferencesFilter.PreferenceType> columnType;
+    @FXML private TableColumn<JabRefPreferencesFilter.PreferenceOption, String> columnKey;
+    @FXML private TableColumn<JabRefPreferencesFilter.PreferenceOption, Object> columnValue;
+    @FXML private TableColumn<JabRefPreferencesFilter.PreferenceOption, Object> columnDefaultValue;
+    @FXML private CheckBox showOnlyDeviatingPreferenceOptions;
+    @FXML private Label count;
 
     public PreferencesFilterDialog(JabRefPreferencesFilter preferencesFilter) {
-        super(true, PreferencesFilterDialog.class);
-
         this.preferencesFilter = Objects.requireNonNull(preferencesFilter);
+        this.preferenceOptions = FXCollections.observableArrayList();
 
-        this.setTitle(Localization.lang("Preferences"));
-        this.setSize(new Dimension(800, 600));
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
 
-        JPanel panel = new JPanel();
-        panel.setLayout(new BorderLayout());
-
-        JPanel northPanel = new JPanel();
-        northPanel.setLayout(new WrapLayout(FlowLayout.LEFT));
-        showOnlyDeviatingPreferenceOptions = new JCheckBox(Localization.lang("Show only preferences deviating from their default value"), false);
-        showOnlyDeviatingPreferenceOptions.addChangeListener(x -> updateModel());
-        northPanel.add(showOnlyDeviatingPreferenceOptions);
-        count = new JLabel();
-        northPanel.add(count);
-        panel.add(northPanel, BorderLayout.NORTH);
-
-        table = new JTable();
-        table.setAutoCreateRowSorter(true);
+        this.setTitle(Localization.lang("Preferences"));
+    }
 
+    @FXML
+    private void initialize() {
+        showOnlyDeviatingPreferenceOptions.setOnAction(event -> updateModel());
+        columnType.setCellValueFactory(data -> new ReadOnlyObjectWrapper<>(data.getValue().getType()));
+        columnKey.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getKey()));
+        columnValue.setCellValueFactory(data -> new ReadOnlyObjectWrapper<>(data.getValue().getValue()));
+        columnDefaultValue.setCellValueFactory(data -> new ReadOnlyObjectWrapper<>(data.getValue().getDefaultValue().orElse("")));
+        table.setItems(preferenceOptions);
         updateModel();
-        panel.add(new JScrollPane(table), BorderLayout.CENTER);
-
-        this.getContentPane().add(panel);
     }
 
     private void updateModel() {
-        List<JabRefPreferencesFilter.PreferenceOption> preferenceOptions;
-
         if (showOnlyDeviatingPreferenceOptions.isSelected()) {
-            preferenceOptions = preferencesFilter.getDeviatingPreferences();
+            preferenceOptions.setAll(preferencesFilter.getDeviatingPreferences());
         } else {
-            preferenceOptions = preferencesFilter.getPreferenceOptions();
+            preferenceOptions.setAll(preferencesFilter.getPreferenceOptions());
         }
-
-        table.setModel(new PreferencesTableModel(preferenceOptions));
         count.setText(String.format("(%d)", preferenceOptions.size()));
     }
-
-    private static class PreferencesTableModel extends AbstractTableModel {
-
-        private final List<JabRefPreferencesFilter.PreferenceOption> preferences;
-
-        public PreferencesTableModel(List<JabRefPreferencesFilter.PreferenceOption> preferences) {
-            this.preferences = Objects.requireNonNull(preferences);
-        }
-
-        @Override
-        public String getColumnName(int column) {
-            if (column == 0) {
-                return Localization.lang("type");
-            } else if (column == 1) {
-                return Localization.lang("key");
-            } else if (column == 2) {
-                return Localization.lang("value");
-            } else if (column == 3) {
-                return Localization.lang("default");
-            } else {
-                return "n/a";
-            }
-        }
-
-        @Override
-        public int getRowCount() {
-            return preferences.size();
-        }
-
-        @Override
-        public int getColumnCount() {
-            return 4;
-        }
-
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            if ((rowIndex < 0) || ((rowIndex - 1) > preferences.size())) {
-                return "n/a";
-            }
-
-            JabRefPreferencesFilter.PreferenceOption preferenceOption = preferences.get(rowIndex);
-            if (columnIndex == 0) {
-                return preferenceOption.getType();
-            } else if (columnIndex == 1) {
-                return preferenceOption.getKey();
-            } else if (columnIndex == 2) {
-                return preferenceOption.getValue();
-            } else if (columnIndex == 3) {
-                return preferenceOption.getDefaultValue().orElse("NULL");
-            } else {
-                return "n/a";
-            }
-        }
-    }
-
 }

From b66fa4274b3359e389a86d666ba909b8cac07856 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Thu, 24 Jan 2019 20:05:52 +0100
Subject: [PATCH 224/229] Convert "From Aux file" dialog to JavaFX (#4607)

---
 .../gui/actions/NewSubLibraryAction.java      |  24 +-
 .../jabref/gui/actions/StandardActions.java   |   2 +-
 .../auximport/AuxParserResultViewModel.java   |  11 +-
 .../jabref/gui/auximport/FromAuxDialog.fxml   |  39 +++
 .../jabref/gui/auximport/FromAuxDialog.java   | 248 ++++--------------
 src/main/resources/l10n/JabRef_en.properties  |  11 +-
 6 files changed, 107 insertions(+), 228 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/auximport/FromAuxDialog.fxml

diff --git a/src/main/java/org/jabref/gui/actions/NewSubLibraryAction.java b/src/main/java/org/jabref/gui/actions/NewSubLibraryAction.java
index bf25ffea34a..a4f42eca838 100644
--- a/src/main/java/org/jabref/gui/actions/NewSubLibraryAction.java
+++ b/src/main/java/org/jabref/gui/actions/NewSubLibraryAction.java
@@ -1,16 +1,7 @@
 package org.jabref.gui.actions;
 
-import javax.swing.SwingUtilities;
-
-import org.jabref.Globals;
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.BasePanelPreferences;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.auximport.FromAuxDialog;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.Defaults;
-import org.jabref.model.database.BibDatabaseContext;
 
 /**
  * The action concerned with generate a new (sub-)database from latex AUX file.
@@ -25,18 +16,7 @@ public NewSubLibraryAction(JabRefFrame jabRefFrame) {
 
     @Override
     public void execute() {
-        SwingUtilities.invokeLater(() -> {
-            FromAuxDialog dialog = new FromAuxDialog(jabRefFrame, "", true, jabRefFrame.getTabbedPane());
-
-            dialog.setVisible(true);
-
-            if (dialog.generatePressed()) {
-                Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode());
-                BasePanel bp = new BasePanel(jabRefFrame, BasePanelPreferences.from(Globals.prefs), new BibDatabaseContext(dialog.getGenerateDB(), defaults), ExternalFileTypes.getInstance());
-                jabRefFrame.addTab(bp, true);
-                jabRefFrame.output(Localization.lang("New library created."));
-            }
-        });
+        FromAuxDialog dialog = new FromAuxDialog(jabRefFrame);
+        dialog.showAndWait();
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 1da2e482642..69321ed5766 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -86,7 +86,7 @@ public enum StandardActions implements Action {
     TOOGLE_OO(Localization.lang("OpenOffice/LibreOffice connection"), IconTheme.JabRefIcons.FILE_OPENOFFICE, KeyBinding.OPEN_OPEN_OFFICE_LIBRE_OFFICE_CONNECTION),
     TOGGLE_WEB_SEARCH(Localization.lang("Web search"), Localization.lang("Toggle web search interface"), IconTheme.JabRefIcons.WWW, KeyBinding.WEB_SEARCH),
 
-    NEW_SUB_LIBRARY_FROM_AUX(Localization.lang("New sublibrary based on AUX file") + "...", Localization.lang("New BibTeX sublibrary"), IconTheme.JabRefIcons.NEW),
+    NEW_SUB_LIBRARY_FROM_AUX(Localization.lang("New sublibrary based on AUX file") + "...", Localization.lang("New BibTeX sublibrary") + Localization.lang("This feature generates a new library based on which entries are needed in an existing LaTeX document."), IconTheme.JabRefIcons.NEW),
     WRITE_XMP(Localization.lang("Write XMP-metadata to PDFs"), Localization.lang("Will write XMP-metadata to the PDFs linked from selected entries."), KeyBinding.WRITE_XMP),
     OPEN_FOLDER(Localization.lang("Open folder"), Localization.lang("Open folder"), KeyBinding.OPEN_FOLDER),
     OPEN_FILE(Localization.lang("Open file"), Localization.lang("Open file"), IconTheme.JabRefIcons.FILE, KeyBinding.OPEN_FILE),
diff --git a/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java b/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
index 6a21d96b83e..e30753c8542 100644
--- a/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
+++ b/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
@@ -18,12 +18,11 @@ public String getInformation(boolean includeMissingEntries) {
         StringBuilder result = new StringBuilder();
 
         result.append(Localization.lang("keys in library")).append(' ').append(this.auxParserResult.getMasterDatabase().getEntryCount()).append('\n')
-                .append(Localization.lang("found in AUX file")).append(' ').append(this.auxParserResult.getFoundKeysInAux()).append('\n')
-                .append(Localization.lang("resolved")).append(' ').append(this.auxParserResult.getResolvedKeysCount()).append('\n')
-                .append(Localization.lang("not found")).append(' ').append(this.auxParserResult.getUnresolvedKeysCount()).append('\n')
-                .append(Localization.lang("crossreferenced entries included")).append(' ')
-                .append(this.auxParserResult.getCrossRefEntriesCount()).append(Localization.lang("strings included")).append(' ')
-                .append(this.auxParserResult.getInsertedStrings()).append('\n');
+              .append(Localization.lang("found in AUX file")).append(' ').append(this.auxParserResult.getFoundKeysInAux()).append('\n')
+              .append(Localization.lang("resolved")).append(' ').append(this.auxParserResult.getResolvedKeysCount()).append('\n')
+              .append(Localization.lang("not found")).append(' ').append(this.auxParserResult.getUnresolvedKeysCount()).append('\n')
+              .append(Localization.lang("crossreferenced entries included")).append(' ').append(this.auxParserResult.getCrossRefEntriesCount()).append('\n')
+              .append(Localization.lang("strings included")).append(' ').append(this.auxParserResult.getInsertedStrings()).append('\n');
 
         if (includeMissingEntries && (this.auxParserResult.getUnresolvedKeysCount() > 0)) {
             for (String entry : this.auxParserResult.getUnresolvedKeys()) {
diff --git a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.fxml b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.fxml
new file mode 100644
index 00000000000..7b509209f36
--- /dev/null
+++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.fxml
@@ -0,0 +1,39 @@
+<?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.ListView?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="650.0" prefWidth="500.0"
+            xmlns="http://javafx.com/javafx/8.0.121" fx:controller="org.jabref.gui.auximport.FromAuxDialog">
+    <content>
+        <VBox spacing="30">
+            <VBox spacing="5.0">
+                <Label text="%LaTeX AUX file:"/>
+                <HBox spacing="10">
+                    <TextField fx:id="auxFileField" HBox.hgrow="ALWAYS"/>
+                    <Button onAction="#browseButtonClicked" text="%Browse"/>
+                </HBox>
+                <Button defaultButton="true" onAction="#parseActionPerformed" text="%Parse"/>
+            </VBox>
+            <VBox spacing="5">
+                <Label text="%Result">
+                    <font>
+                        <Font name="System Bold"/>
+                    </font>
+                </Label>
+                <TextArea fx:id="statusInfos" editable="false" prefHeight="300.0"/>
+                <Label text="%Unknown BibTeX entries:"/>
+                <ListView fx:id="notFoundList" prefHeight="200"/>
+            </VBox>
+        </VBox>
+    </content>
+    <ButtonType fx:id="generateButtonType" buttonData="OK_DONE" text="%Generate"/>
+    <ButtonType fx:constant="CLOSE"/>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
index 8cc7b0e144e..027f2c8fc07 100644
--- a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
+++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
@@ -1,237 +1,105 @@
 package org.jabref.gui.auximport;
 
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Optional;
-
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
-import javafx.scene.control.TabPane;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
-import org.jabref.gui.JabRefDialog;
+import org.jabref.gui.BasePanelPreferences;
+import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.util.DefaultTaskExecutor;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.auxparser.DefaultAuxParser;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.Defaults;
 import org.jabref.model.auxparser.AuxParser;
 import org.jabref.model.auxparser.AuxParserResult;
 import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
+import com.airhacks.afterburner.views.ViewLoader;
 
 /**
  * A wizard dialog for generating a new sub database from existing TeX AUX file
  */
-public class FromAuxDialog extends JabRefDialog {
-
-    private final JPanel statusPanel = new JPanel();
-    private final JPanel buttons = new JPanel();
-    private final JButton generateButton = new JButton();
-    private final JButton cancelButton = new JButton();
-    private final JButton parseButton = new JButton();
-
-    private final JComboBox<String> dbChooser = new JComboBox<>();
-    private JTextField auxFileField;
-
-    private JList<String> notFoundList;
-    private JTextArea statusInfos;
-
-    // all open databases from JabRefFrame
-    private final TabPane parentTabbedPane;
+public class FromAuxDialog extends BaseDialog<Void> {
 
-    private boolean generatePressed;
+    private final DialogService dialogService;
+    private final BasePanel basePanel;
+    @FXML private ButtonType generateButtonType;
+    private Button generateButton;
+    @FXML private TextField auxFileField;
+    @FXML private ListView<String> notFoundList;
 
     private AuxParserResult auxParserResult;
+    @FXML private TextArea statusInfos;
 
-    private final JabRefFrame parentFrame;
-
-    public FromAuxDialog(JabRefFrame frame, String title, boolean modal, TabPane viewedDBs) {
-        super(title, modal, FromAuxDialog.class);
-
-        parentTabbedPane = viewedDBs;
-        parentFrame = frame;
-
-        jbInit();
-        pack();
-        setSize(600, 500);
-    }
+    public FromAuxDialog(JabRefFrame frame) {
+        basePanel = frame.getCurrentBasePanel();
+        dialogService = frame.getDialogService();
 
-    private void jbInit() {
-        JPanel panel1 = new JPanel();
-
-        panel1.setLayout(new BorderLayout());
-        generateButton.setText(Localization.lang("Generate"));
-        generateButton.setEnabled(false);
-        generateButton.addActionListener(e -> {
-            generatePressed = true;
-            dispose();
-        });
-        cancelButton.setText(Localization.lang("Cancel"));
-        cancelButton.addActionListener(e -> dispose());
-
-        parseButton.setText(Localization.lang("Parse"));
-        parseButton.addActionListener(e -> parseActionPerformed());
-
-        initPanels();
-
-        // insert the buttons
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        JPanel buttonPanel = bb.getPanel();
-        buttonPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-
-        bb.addGlue();
-        bb.addButton(parseButton);
-        bb.addRelatedGap();
-        bb.addButton(generateButton);
-        bb.addButton(cancelButton);
-        bb.addGlue();
-        this.setModal(true);
-        this.setResizable(true);
         this.setTitle(Localization.lang("AUX file import"));
-        JLabel desc = new JLabel("<html><h3>" + Localization.lang("AUX file import") + "</h3><p>"
-                + Localization.lang("This feature generates a new library based on which entries "
-                        + "are needed in an existing LaTeX document.")
-                + "</p>" + "<p>"
-                + Localization.lang("You need to select one of your open libraries from which to choose "
-                        + "entries, as well as the AUX file produced by LaTeX when compiling your document.")
-                + "</p></html>");
-        desc.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        panel1.add(desc, BorderLayout.NORTH);
-
-        JPanel centerPane = new JPanel(new BorderLayout());
-        centerPane.add(buttons, BorderLayout.NORTH);
-        centerPane.add(statusPanel, BorderLayout.CENTER);
-
-        getContentPane().add(panel1, BorderLayout.NORTH);
-        getContentPane().add(centerPane, BorderLayout.CENTER);
-        getContentPane().add(buttonPanel, BorderLayout.SOUTH);
-
-        // Key bindings:
-        ActionMap am = statusPanel.getActionMap();
-        InputMap im = statusPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        });
 
-    }
-
-    private void initPanels() {
-        // collect the names of all open databases
-        int len = parentTabbedPane.getTabs().size();
-        int toSelect = -1;
-        for (int i = 0; i < len; i++) {
-            dbChooser.addItem(parentTabbedPane.getTabs().get(i).getText());
-            if (parentFrame.getBasePanelAt(i) == parentFrame.getCurrentBasePanel()) {
-                toSelect = i;
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        generateButton = (Button) this.getDialogPane().lookupButton(generateButtonType);
+        generateButton.setDisable(true);
+        generateButton.defaultButtonProperty().bind(generateButton.disableProperty().not());
+        setResultConverter(button -> {
+            if (button == generateButtonType) {
+                Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode());
+                BasePanel bp = new BasePanel(frame, BasePanelPreferences.from(Globals.prefs), new BibDatabaseContext(auxParserResult.getGeneratedBibDatabase(), defaults), ExternalFileTypes.getInstance());
+                frame.addTab(bp, true);
+                dialogService.notify(Localization.lang("New library created."));
             }
-        }
-        if (toSelect >= 0) {
-            dbChooser.setSelectedIndex(toSelect);
-        }
-
-        auxFileField = new JTextField("", 25);
-        JButton browseAuxFileButton = new JButton(Localization.lang("Browse"));
-
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.AUX)
-                .withDefaultExtension(StandardFileType.AUX)
-                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
-
-        browseAuxFileButton.addActionListener(e -> {
-            Optional<Path> file = DefaultTaskExecutor
-                    .runInJavaFXThread(() -> parentFrame.getDialogService().showFileOpenDialog(fileDialogConfiguration));
-            file.ifPresent(f -> auxFileField.setText(f.toAbsolutePath().toString()));
+            return null;
         });
-
-        notFoundList = new JList<>();
-        JScrollPane listScrollPane = new JScrollPane(notFoundList);
-        statusInfos = new JTextArea("", 5, 20);
-        JScrollPane statusScrollPane = new JScrollPane(statusInfos);
-        statusInfos.setEditable(false);
-
-        DefaultFormBuilder b = new DefaultFormBuilder(
-                new FormLayout("left:pref, 4dlu, fill:pref:grow, 4dlu, left:pref", ""), buttons);
-        b.appendSeparator(Localization.lang("Options"));
-        b.append(Localization.lang("Reference library") + ":");
-        b.append(dbChooser, 3);
-        b.nextLine();
-        b.append(Localization.lang("LaTeX AUX file") + ":");
-        b.append(auxFileField);
-        b.append(browseAuxFileButton);
-        b.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-
-        b = new DefaultFormBuilder(new FormLayout("fill:pref:grow, 4dlu, fill:pref:grow", "pref, pref, fill:pref:grow"),
-                statusPanel);
-        b.appendSeparator(Localization.lang("Result"));
-        b.append(Localization.lang("Unknown BibTeX entries") + ":");
-        b.append(Localization.lang("Messages") + ":");
-        b.nextLine();
-        b.append(listScrollPane);
-        b.append(statusScrollPane);
-        b.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
     }
 
+    @FXML
     private void parseActionPerformed() {
-        parseButton.setEnabled(false);
-        BasePanel bp = (BasePanel) parentTabbedPane.getTabs().get(dbChooser.getSelectedIndex()).getContent();
-        notFoundList.removeAll();
-        statusInfos.setText(null);
-        BibDatabase refBase = bp.getDatabase();
+        notFoundList.getItems().clear();
+        statusInfos.setText("");
+        BibDatabase refBase = basePanel.getDatabase();
         String auxName = auxFileField.getText();
 
         if ((auxName != null) && (refBase != null) && !auxName.isEmpty()) {
             AuxParser auxParser = new DefaultAuxParser(refBase);
             auxParserResult = auxParser.parse(Paths.get(auxName));
-            notFoundList.setListData(auxParserResult.getUnresolvedKeys().toArray(new String[auxParserResult.getUnresolvedKeys().size()]));
-            statusInfos.append(new AuxParserResultViewModel(auxParserResult).getInformation(false));
+            notFoundList.getItems().setAll(auxParserResult.getUnresolvedKeys());
+            statusInfos.setText(new AuxParserResultViewModel(auxParserResult).getInformation(false));
 
-            generateButton.setEnabled(true);
-
-            // the generated database contains no entries -> no active generate-button
             if (!auxParserResult.getGeneratedBibDatabase().hasEntries()) {
-                statusInfos.append("\n" + Localization.lang("empty library"));
-                generateButton.setEnabled(false);
+                // The generated database contains no entries -> no active generate-button
+                statusInfos.setText(statusInfos.getText() + "\n" + Localization.lang("empty library"));
+                generateButton.setDisable(true);
+            } else {
+                generateButton.setDisable(false);
             }
         } else {
-            generateButton.setEnabled(false);
+            generateButton.setDisable(true);
         }
-
-        parseButton.setEnabled(true);
-    }
-
-    public boolean generatePressed() {
-        return generatePressed;
     }
 
-    public BibDatabase getGenerateDB() {
-        return auxParserResult.getGeneratedBibDatabase();
+    @FXML
+    private void browseButtonClicked() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(StandardFileType.AUX)
+                .withDefaultExtension(StandardFileType.AUX)
+                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> auxFileField.setText(file.toAbsolutePath().toString()));
     }
 
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index d451fa524d2..f3a0cae326a 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -606,8 +606,7 @@ Label=Label
 Language=Language
 
 Last\ modified=Last modified
-
-LaTeX\ AUX\ file=LaTeX AUX file
+LaTeX\ AUX\ file\:=LaTeX AUX file\:
 Leave\ file\ in\ its\ current\ directory=Leave file in its current directory
 
 Left=Left
@@ -635,8 +634,6 @@ Memory\ stick\ mode=Memory stick mode
 Merged\ external\ changes=Merged external changes
 Merge\ fields=Merge fields
 
-Messages=Messages
-
 Modification\ of\ field=Modification of field
 
 Modified\ group\ "%0".=Modified group "%0".
@@ -824,8 +821,6 @@ Raw\ source=Raw source
 
 Redo=Redo
 
-Reference\ library=Reference library
-
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Refine supergroup: When selected, view entries contained in both this group and its supergroup
 
 regular\ expression=regular expression
@@ -1094,8 +1089,7 @@ unable\ to\ write\ to=unable to write to
 Undo=Undo
 
 Union=Union
-
-Unknown\ BibTeX\ entries=Unknown BibTeX entries
+Unknown\ BibTeX\ entries\:=Unknown BibTeX entries\:
 
 unknown\ edit=unknown edit
 
@@ -1362,7 +1356,6 @@ You\ must\ select\ either\ a\ valid\ style\ file,\ or\ use\ one\ of\ the\ defaul
 
 This\ is\ a\ simple\ copy\ and\ paste\ dialog.\ First\ load\ or\ paste\ some\ text\ into\ the\ text\ input\ area.<br>After\ that,\ you\ can\ mark\ text\ and\ assign\ it\ to\ a\ BibTeX\ field.=This is a simple copy and paste dialog. First load or paste some text into the text input area.<br>After that, you can mark text and assign it to a BibTeX field.
 This\ feature\ generates\ a\ new\ library\ based\ on\ which\ entries\ are\ needed\ in\ an\ existing\ LaTeX\ document.=This feature generates a new library based on which entries are needed in an existing LaTeX document.
-You\ need\ to\ select\ one\ of\ your\ open\ libraries\ from\ which\ to\ choose\ entries,\ as\ well\ as\ the\ AUX\ file\ produced\ by\ LaTeX\ when\ compiling\ your\ document.=You need to select one of your open libraries from which to choose entries, as well as the AUX file produced by LaTeX when compiling your document.
 
 First\ select\ entries\ to\ clean\ up.=First select entries to clean up.
 Cleanup\ entry=Cleanup entry

From 48c5a20fd9234806ce2bc1ed61f3af7fbbbfed26 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Thu, 24 Jan 2019 21:37:01 +0100
Subject: [PATCH 225/229] Convert "Customize importer" dialog to JavaFX (#4608)

* Convert "Customize importer" dialog to JavaFX

* Use nio methods to access contents of zip files
---
 .../java/org/jabref/gui/DialogService.java    |   9 +
 .../java/org/jabref/gui/FXDialogService.java  |  13 +
 src/main/java/org/jabref/gui/JabRefFrame.java |   2 +-
 .../actions/ManageCustomImportsAction.java    |  10 +-
 .../ExportCustomizationDialogView.java        |  30 +-
 .../importer/ImportCustomizationDialog.fxml   |  22 ++
 .../importer/ImportCustomizationDialog.java   | 368 +++---------------
 .../ImportCustomizationDialogViewModel.java   | 134 +++++++
 .../jabref/gui/importer/ZipFileChooser.java   | 241 ------------
 .../gui/util/ViewModelTableRowFactory.java    |  16 +
 .../org/jabref/gui/util/ZipFileChooser.java   |  96 +++++
 src/main/resources/l10n/JabRef_en.properties  |  14 -
 12 files changed, 361 insertions(+), 594 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/importer/ImportCustomizationDialogViewModel.java
 delete mode 100644 src/main/java/org/jabref/gui/importer/ZipFileChooser.java
 create mode 100644 src/main/java/org/jabref/gui/util/ZipFileChooser.java

diff --git a/src/main/java/org/jabref/gui/DialogService.java b/src/main/java/org/jabref/gui/DialogService.java
index f776d192671..947fa1c66a0 100644
--- a/src/main/java/org/jabref/gui/DialogService.java
+++ b/src/main/java/org/jabref/gui/DialogService.java
@@ -1,5 +1,6 @@
 package org.jabref.gui;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
@@ -247,4 +248,12 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      */
     boolean showPrintDialog(PrinterJob job);
 
+    /**
+     * Shows a new dialog that list all files contained in the given archive and which lets the user select one of these
+     * files. The method doesn't return until the displayed open dialog is dismissed. The return value specifies the
+     * file chosen by the user or an empty {@link Optional} if no selection has been made.
+     *
+     * @return the selected file or an empty {@link Optional} if no file has been selected
+     */
+    Optional<Path> showFileOpenFromArchiveDialog(Path archivePath) throws IOException;
 }
diff --git a/src/main/java/org/jabref/gui/FXDialogService.java b/src/main/java/org/jabref/gui/FXDialogService.java
index 60593d1edf9..93470689c79 100644
--- a/src/main/java/org/jabref/gui/FXDialogService.java
+++ b/src/main/java/org/jabref/gui/FXDialogService.java
@@ -1,6 +1,9 @@
 package org.jabref.gui;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Collections;
@@ -31,6 +34,7 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.gui.util.ZipFileChooser;
 import org.jabref.logic.l10n.Localization;
 
 import org.controlsfx.dialog.ExceptionDialog;
@@ -300,4 +304,13 @@ private FileChooser getConfiguredFileChooser(FileDialogConfiguration fileDialogC
     public boolean showPrintDialog(PrinterJob job) {
         return job.showPrintDialog(mainWindow);
     }
+
+    @Override
+    public Optional<Path> showFileOpenFromArchiveDialog(Path archivePath) throws IOException {
+        try (FileSystem zipFile = FileSystems.newFileSystem(archivePath, null)) {
+            return new ZipFileChooser(zipFile).showAndWait();
+        } catch (NoClassDefFoundError exc) {
+            throw new IOException("Could not instantiate ZIP-archive reader.", exc);
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 66e4643e1d2..d8fd07cb6f2 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -928,7 +928,7 @@ private MenuBar createMenu() {
                 new SeparatorMenuItem(),
 
                 factory.createMenuItem(StandardActions.SETUP_GENERAL_FIELDS, new SetupGeneralFieldsAction()),
-                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_IMPORTS, new ManageCustomImportsAction(this)),
+                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()),
diff --git a/src/main/java/org/jabref/gui/actions/ManageCustomImportsAction.java b/src/main/java/org/jabref/gui/actions/ManageCustomImportsAction.java
index 5359168805c..e36ea7ac07c 100644
--- a/src/main/java/org/jabref/gui/actions/ManageCustomImportsAction.java
+++ b/src/main/java/org/jabref/gui/actions/ManageCustomImportsAction.java
@@ -1,21 +1,15 @@
 package org.jabref.gui.actions;
 
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.importer.ImportCustomizationDialog;
 
 public class ManageCustomImportsAction extends SimpleCommand {
 
-    private final JabRefFrame jabRefFrame;
-
-    public ManageCustomImportsAction(JabRefFrame jabRefFrame) {
-        this.jabRefFrame = jabRefFrame;
+    public ManageCustomImportsAction() {
     }
 
     @Override
     public void execute() {
-        ImportCustomizationDialog ecd = new ImportCustomizationDialog(jabRefFrame);
-        ecd.setVisible(true);
-
+        new ImportCustomizationDialog().showAndWait();
     }
 
 }
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java
index 0ca7d26c5ee..506f829ad66 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java
@@ -41,22 +41,13 @@ public ExportCustomizationDialogView() {
                   .load()
                   .setAsDialogPane(this);
 
-        ControlHelper.setAction(addButton, getDialogPane(), event -> addExporter());
-        ControlHelper.setAction(modifyButton, getDialogPane(), event -> modifyExporter());
-        ControlHelper.setAction(removeButton, getDialogPane(), event -> removeExporter());
-        ControlHelper.setAction(closeButton, getDialogPane(), event -> saveAndClose());
-    }
-
-    private void addExporter() {
-        viewModel.addExporter();
-    }
-
-    private void modifyExporter() {
-        viewModel.modifyExporter();
-    }
-
-    private void removeExporter() {
-        viewModel.removeExporters();
+        ControlHelper.setAction(addButton, getDialogPane(), event -> viewModel.addExporter());
+        ControlHelper.setAction(modifyButton, getDialogPane(), event -> viewModel.modifyExporter());
+        ControlHelper.setAction(removeButton, getDialogPane(), event -> viewModel.removeExporters());
+        ControlHelper.setAction(closeButton, getDialogPane(), event -> {
+            viewModel.saveToPrefs();
+            close();
+        });
     }
 
     @FXML
@@ -69,9 +60,4 @@ private void initialize() {
         layoutColumn.setCellValueFactory(cellData -> cellData.getValue().layoutFileName());
         extensionColumn.setCellValueFactory(cellData -> cellData.getValue().extension());
     }
-
-    private void saveAndClose() {
-        viewModel.saveToPrefs();
-        close();
-    }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.fxml b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.fxml
new file mode 100644
index 00000000000..ef7ac89babb
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.fxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<DialogPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.171"
+            fx:controller="org.jabref.gui.importer.ImportCustomizationDialog">
+    <content>
+        <TableView fx:id="importerTable">
+            <columns>
+                <TableColumn fx:id="nameColumn" prefWidth="150.0" text="%Import name"/>
+                <TableColumn fx:id="classColumn" prefWidth="100.0" text="%Importer class"/>
+                <TableColumn fx:id="basePathColumn" prefWidth="100.0" text="%Contained in"/>
+            </columns>
+        </TableView>
+    </content>
+    <ButtonType fx:id="addButton" text="%Add"/>
+    <ButtonType fx:id="removeButton" text="%Remove"/>
+    <ButtonType fx:id="closeButton" fx:constant="OK"/>
+    <ButtonType fx:constant="CANCEL"/>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
index 3cbfa285a47..7dd005727e5 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
@@ -1,320 +1,72 @@
 package org.jabref.gui.importer;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.zip.ZipFile;
+import javax.inject.Inject;
 
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableColumnModel;
+import javafx.beans.property.ReadOnlyStringWrapper;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.Tooltip;
 
-import org.jabref.Globals;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.logic.help.HelpFile;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
+import org.jabref.gui.util.ViewModelTableRowFactory;
 import org.jabref.logic.importer.fileformat.CustomImporter;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.preferences.JabRefPreferences;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Dialog to manage custom importers.
- */
-public class ImportCustomizationDialog extends JabRefDialog {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ImportCustomizationDialog.class);
-
-    // Column widths for import customization dialog table:
-    private static final int COL_0_WIDTH = 200;
-    private static final int COL_1_WIDTH = 80;
-    private static final int COL_2_WIDTH = 200;
-
-    private static final int COL_3_WIDTH = 200;
-
-    private final JTable customImporterTable;
-
-    public ImportCustomizationDialog(final JabRefFrame frame) {
-        super(Localization.lang("Manage custom imports"), false, ImportCustomizationDialog.class);
-
-        DialogService dialogService = frame.getDialogService();
-
-        ImportTableModel tableModel = new ImportTableModel();
-        customImporterTable = new JTable(tableModel);
-        TableColumnModel cm = customImporterTable.getColumnModel();
-        cm.getColumn(0).setPreferredWidth(COL_0_WIDTH);
-        cm.getColumn(1).setPreferredWidth(COL_1_WIDTH);
-        cm.getColumn(2).setPreferredWidth(COL_2_WIDTH);
-        cm.getColumn(3).setPreferredWidth(COL_3_WIDTH);
-        JScrollPane sp = new JScrollPane(customImporterTable, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        customImporterTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        customImporterTable.setPreferredScrollableViewportSize(getSize());
-        if (customImporterTable.getRowCount() > 0) {
-            customImporterTable.setRowSelectionInterval(0, 0);
-        }
-
-        JButton addFromFolderButton = new JButton(Localization.lang("Add from folder"));
-        addFromFolderButton.addActionListener(e -> {
-
-            FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                    .addExtensionFilter(StandardFileType.CLASS, StandardFileType.JAR)
-                    .withDefaultExtension(StandardFileType.JAR)
-                    .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
-
-            Optional<Path> selectedFile = DefaultTaskExecutor
-                    .runInJavaFXThread(() -> dialogService.showFileOpenDialog(fileDialogConfiguration));
-
-            if (selectedFile.isPresent() && (selectedFile.get().getParent() != null)) {
-                String chosenFileStr = selectedFile.get().toString();
-
-                try {
-                    String basePath = selectedFile.get().getParent().toString();
-                    String className = pathToClass(basePath, new File(chosenFileStr));
-                    CustomImporter importer = new CustomImporter(basePath, className);
-
-                    addOrReplaceImporter(importer);
-                    customImporterTable.revalidate();
-                    customImporterTable.repaint();
-                } catch (Exception exc) {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Could not instantiate %0", chosenFileStr), exc);
-                } catch (NoClassDefFoundError exc) {
-                    dialogService.showErrorDialogAndWait(
-                            Localization.lang("Could not instantiate %0. Have you chosen the correct package path?", chosenFileStr),
-                            exc);
-                }
-
-            }
-        });
-        addFromFolderButton
-                .setToolTipText(Localization.lang("Add a (compiled) custom Importer class from a class path.")
-                        + "\n" + Localization.lang("The path need not be on the classpath of JabRef."));
-
-        JButton addFromJarButton = new JButton(Localization.lang("Add from JAR"));
-        addFromJarButton.addActionListener(e -> {
-            FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                    .addExtensionFilter(StandardFileType.JAR, StandardFileType.ZIP)
-                    .withDefaultExtension(StandardFileType.JAR)
-                    .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
-
-            Optional<Path> jarZipFile = DefaultTaskExecutor
-                    .runInJavaFXThread(() -> dialogService.showFileOpenDialog(fileDialogConfiguration));
-
-            if (jarZipFile.isPresent()) {
-                try (ZipFile zipFile = new ZipFile(jarZipFile.get().toFile(), ZipFile.OPEN_READ)) {
-                    ZipFileChooser zipFileChooser = new ZipFileChooser(this, zipFile);
-                    zipFileChooser.setVisible(true);
-                    customImporterTable.revalidate();
-                    customImporterTable.repaint(10);
-                } catch (IOException exc) {
-                    LOGGER.info("Could not open ZIP-archive.", exc);
-                    dialogService.showErrorDialogAndWait(
-                            Localization.lang("Could not open %0", jarZipFile.get().toString()) + "\n"
-                                    + Localization.lang("Have you chosen the correct package path?"),
-                            exc);
-                } catch (NoClassDefFoundError exc) {
-                    LOGGER.info("Could not instantiate ZIP-archive reader.", exc);
-                    dialogService.showErrorDialogAndWait(
-                            Localization.lang("Could not instantiate %0", jarZipFile.get().toString()) + "\n"
-                                    + Localization.lang("Have you chosen the correct package path?"),
-                            exc);
-                }
-            }
-        });
-        addFromJarButton
-                .setToolTipText(Localization.lang("Add a (compiled) custom Importer class from a ZIP-archive.")
-                        + "\n" + Localization.lang("The ZIP-archive need not be on the classpath of JabRef."));
-
-        JButton showDescButton = new JButton(Localization.lang("Show description"));
-        showDescButton.addActionListener(e -> {
-            int row = customImporterTable.getSelectedRow();
-            if (row == -1) {
-                dialogService.showWarningDialogAndWait(
-                        Localization.lang("Manage custom imports"),
-                        Localization.lang("Please select an importer."));
-            } else {
-                CustomImporter importer = ((ImportTableModel) customImporterTable.getModel()).getImporter(row);
-                dialogService.showWarningDialogAndWait(
-                        Localization.lang("Manage custom imports"),
-                        importer.getDescription());
-            }
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import org.fxmisc.easybind.EasyBind;
+
+public class ImportCustomizationDialog extends BaseDialog<Void> {
+
+    @FXML private ButtonType addButton;
+    @FXML private ButtonType removeButton;
+    @FXML private ButtonType closeButton;
+    @FXML private TableView<CustomImporter> importerTable;
+    @FXML private TableColumn<CustomImporter, String> nameColumn;
+    @FXML private TableColumn<CustomImporter, String> classColumn;
+    @FXML private TableColumn<CustomImporter, String> basePathColumn;
+
+    @Inject private DialogService dialogService;
+    @Inject private PreferencesService preferences;
+    @Inject private JournalAbbreviationLoader loader;
+    private ImportCustomizationDialogViewModel viewModel;
+
+    public ImportCustomizationDialog() {
+        this.setTitle(Localization.lang("Manage custom imports"));
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        ((Button) getDialogPane().lookupButton(addButton)).setTooltip(new Tooltip(
+                Localization.lang("Add a (compiled) custom Importer class from a class path.")
+                        + "\n" + Localization.lang("The path need not be on the classpath of JabRef.")));
+        ControlHelper.setAction(addButton, getDialogPane(), event -> viewModel.addImporter());
+        ControlHelper.setAction(removeButton, getDialogPane(), event -> viewModel.removeSelectedImporter());
+        ControlHelper.setAction(closeButton, getDialogPane(), event -> {
+            viewModel.saveToPrefs();
+            close();
         });
-
-        JButton removeButton = new JButton(Localization.lang("Remove"));
-        removeButton.addActionListener(e -> {
-            int row = customImporterTable.getSelectedRow();
-            if (row == -1) {
-                dialogService.showWarningDialogAndWait(
-                        Localization.lang("Manage custom imports"),
-                        Localization.lang("Please select an importer."));
-            } else {
-                customImporterTable.removeRowSelectionInterval(row, row);
-                Globals.prefs.customImports
-                        .remove(((ImportTableModel) customImporterTable.getModel()).getImporter(row));
-                Globals.IMPORT_FORMAT_READER.resetImportFormats(Globals.prefs.getImportFormatPreferences(),
-                        Globals.prefs.getXMPPreferences(), Globals.getFileUpdateMonitor());
-                customImporterTable.revalidate();
-                customImporterTable.repaint();
-            }
-        });
-
-        Action closeAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        };
-
-        JButton closeButton = new JButton(Localization.lang("Close"));
-        closeButton.addActionListener(closeAction);
-
-        JButton helpButton = new HelpAction(HelpFile.CUSTOM_IMPORTS).getHelpButton();
-
-        // Key bindings:
-        JPanel mainPanel = new JPanel();
-        ActionMap am = mainPanel.getActionMap();
-        InputMap im = mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", closeAction);
-        mainPanel.setLayout(new BorderLayout());
-        mainPanel.add(sp, BorderLayout.CENTER);
-        JPanel buttons = new JPanel();
-        ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-        buttons.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-        bb.addGlue();
-        bb.addButton(addFromFolderButton);
-        bb.addButton(addFromJarButton);
-        bb.addButton(showDescButton);
-        bb.addButton(removeButton);
-        bb.addButton(closeButton);
-        bb.addUnrelatedGap();
-        bb.addButton(helpButton);
-        bb.addGlue();
-
-        getContentPane().add(mainPanel, BorderLayout.CENTER);
-        getContentPane().add(buttons, BorderLayout.SOUTH);
-        this.setSize(getSize());
-        pack();
-        customImporterTable.requestFocus();
     }
 
-    /*
-    *  (non-Javadoc)
-    * @see java.awt.Component#getSize()
-    */
-    @Override
-    public Dimension getSize() {
-        int width = COL_0_WIDTH + COL_1_WIDTH + COL_2_WIDTH + COL_3_WIDTH;
-        return new Dimension(width, width / 2);
+    @FXML
+    private void initialize() {
+        viewModel = new ImportCustomizationDialogViewModel(preferences, dialogService);
+        importerTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+        importerTable.itemsProperty().bind(viewModel.importersProperty());
+        EasyBind.listBind(viewModel.selectedImportersProperty(), importerTable.getSelectionModel().getSelectedItems());
+        nameColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().getName()));
+        classColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().getClassName()));
+        basePathColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().getBasePath().toString()));
+        new ViewModelTableRowFactory<CustomImporter>()
+                .withTooltip(CustomImporter::getDescription)
+                .install(importerTable);
     }
-
-    /**
-     * Converts a path relative to a base-path into a class name.
-     *
-     * @param basePath  base path
-     * @param path  path that includes base-path as a prefix
-     * @return  class name
-     */
-    private static String pathToClass(String basePath, File path) {
-        String className = null;
-        File actualPath = path;
-        // remove leading basepath from path
-        while (!actualPath.equals(new File(basePath))) {
-            className = actualPath.getName() + (className == null ? "" : "." + className);
-            actualPath = actualPath.getParentFile();
-        }
-        if (className != null) {
-            int lastDot = className.lastIndexOf('.');
-            if (lastDot < 0) {
-                return className;
-            }
-            className = className.substring(0, lastDot);
-        }
-        return className;
-    }
-
-    /**
-     * Adds an importer to the model that underlies the custom importers.
-     *
-     * @param importer  importer
-     */
-    public void addOrReplaceImporter(CustomImporter importer) {
-        Globals.prefs.customImports.replaceImporter(importer);
-        Globals.IMPORT_FORMAT_READER.resetImportFormats(Globals.prefs.getImportFormatPreferences(),
-                Globals.prefs.getXMPPreferences(), Globals.getFileUpdateMonitor());
-        ((ImportTableModel) customImporterTable.getModel()).fireTableDataChanged();
-    }
-
-    /**
-     * Table model for the custom importer table.
-     */
-    private class ImportTableModel extends AbstractTableModel {
-
-        private final String[] columnNames = new String[] {Localization.lang("Import name"),
-                Localization.lang("Command line id"), Localization.lang("Importer class"),
-                Localization.lang("Contained in")};
-
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            Object value = null;
-            CustomImporter importer = getImporter(rowIndex);
-            if (columnIndex == 0) {
-                value = importer.getName();
-            } else if (columnIndex == 1) {
-                value = importer.getName();
-            } else if (columnIndex == 2) {
-                value = importer.getClassName();
-            } else if (columnIndex == 3) {
-                value = importer.getBasePath();
-            }
-            return value;
-        }
-
-        @Override
-        public int getColumnCount() {
-            return columnNames.length;
-        }
-
-        @Override
-        public int getRowCount() {
-            return Globals.prefs.customImports.size();
-        }
-
-        @Override
-        public String getColumnName(int col) {
-            return columnNames[col];
-        }
-
-        public CustomImporter getImporter(int rowIndex) {
-            CustomImporter[] importers = Globals.prefs.customImports
-                    .toArray(new CustomImporter[Globals.prefs.customImports.size()]);
-            return importers[rowIndex];
-        }
-    }
-
 }
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialogViewModel.java b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialogViewModel.java
new file mode 100644
index 00000000000..8ab6ba58277
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialogViewModel.java
@@ -0,0 +1,134 @@
+package org.jabref.gui.importer;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.Optional;
+
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.Globals;
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.importer.fileformat.CustomImporter;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.preferences.JabRefPreferences;
+import org.jabref.preferences.PreferencesService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ImportCustomizationDialogViewModel extends AbstractViewModel {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ImportCustomizationDialogViewModel.class);
+
+    private final ListProperty<CustomImporter> importers;
+    private final ListProperty<CustomImporter> selectedImporters = new SimpleListProperty<>(FXCollections.observableArrayList());
+
+    private final PreferencesService preferences;
+    private final DialogService dialogService;
+
+    public ImportCustomizationDialogViewModel(PreferencesService preferences, DialogService dialogService) {
+        this.preferences = preferences;
+        this.dialogService = dialogService;
+        this.importers = new SimpleListProperty<>(FXCollections.observableArrayList(Globals.prefs.customImports));
+    }
+
+    /**
+     * Converts a path relative to a base-path into a class name.
+     *
+     * @param basePath base path
+     * @param path     path that includes base-path as a prefix
+     * @return class name
+     */
+    private static String pathToClass(String basePath, Path path) {
+        String className = FileUtil.relativize(path, Collections.singletonList(Paths.get(basePath))).toString();
+        if (className != null) {
+            int lastDot = className.lastIndexOf('.');
+            if (lastDot < 0) {
+                return className;
+            }
+            className = className.substring(0, lastDot);
+        }
+        return className;
+    }
+
+    public void addImporter() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(StandardFileType.CLASS, StandardFileType.JAR, StandardFileType.ZIP)
+                .withDefaultExtension(StandardFileType.CLASS)
+                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
+                .build();
+
+        Optional<Path> selectedFile = dialogService.showFileOpenDialog(fileDialogConfiguration);
+
+        if (selectedFile.isPresent() && (selectedFile.get().getParent() != null)) {
+            boolean isArchive = FileUtil.getFileExtension(selectedFile.get())
+                                        .filter(extension -> extension.equalsIgnoreCase("jar") || extension.equalsIgnoreCase("zip"))
+                                        .isPresent();
+
+            if (isArchive) {
+                try {
+                    Optional<Path> selectedFileInArchive = dialogService.showFileOpenFromArchiveDialog(selectedFile.get());
+                    if (selectedFileInArchive.isPresent()) {
+                        String className = selectedFileInArchive.get().toString().substring(0, selectedFileInArchive.get().toString().lastIndexOf('.')).replace(
+                                "/", ".");
+                        CustomImporter importer = new CustomImporter(selectedFile.get().toAbsolutePath().toString(), className);
+                        importers.add(importer);
+                    }
+                } catch (IOException exc) {
+                    LOGGER.error("Could not open ZIP-archive.", exc);
+                    dialogService.showErrorDialogAndWait(
+                            Localization.lang("Could not open %0", selectedFile.get().toString()) + "\n"
+                                    + Localization.lang("Have you chosen the correct package path?"),
+                            exc);
+                } catch (ClassNotFoundException exc) {
+                    LOGGER.error("Could not instantiate importer", exc);
+                    dialogService.showErrorDialogAndWait(
+                            Localization.lang("Could not instantiate %0 %1", "importer"),
+                            exc);
+                }
+            } else {
+                try {
+                    String basePath = selectedFile.get().getParent().toString();
+                    String className = pathToClass(basePath, selectedFile.get());
+                    CustomImporter importer = new CustomImporter(basePath, className);
+
+                    importers.add(importer);
+                } catch (Exception exc) {
+                    LOGGER.error("Could not instantiate importer", exc);
+                    dialogService.showErrorDialogAndWait(Localization.lang("Could not instantiate %0", selectedFile.get().toString()), exc);
+                } catch (NoClassDefFoundError exc) {
+                    LOGGER.error("Could not find class while instantiating importer", exc);
+                    dialogService.showErrorDialogAndWait(
+                            Localization.lang("Could not instantiate %0. Have you chosen the correct package path?", selectedFile.get().toString()),
+                            exc);
+                }
+            }
+        }
+    }
+
+    public void removeSelectedImporter() {
+        importers.removeAll(selectedImporters);
+    }
+
+    public void saveToPrefs() {
+        Globals.prefs.customImports.clear();
+        Globals.prefs.customImports.addAll(importers);
+        Globals.IMPORT_FORMAT_READER.resetImportFormats(Globals.prefs.getImportFormatPreferences(), Globals.prefs.getXMPPreferences(), Globals.getFileUpdateMonitor());
+    }
+
+    public ListProperty<CustomImporter> selectedImportersProperty() {
+        return selectedImporters;
+    }
+
+    public ListProperty<CustomImporter> importersProperty() {
+        return importers;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/importer/ZipFileChooser.java b/src/main/java/org/jabref/gui/importer/ZipFileChooser.java
deleted file mode 100644
index f4a1f78f5dd..00000000000
--- a/src/main/java/org/jabref/gui/importer/ZipFileChooser.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package org.jabref.gui.importer;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import javax.swing.Box;
-import javax.swing.JButton;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableColumnModel;
-
-import org.jabref.gui.JabRefDialog;
-import org.jabref.logic.importer.fileformat.CustomImporter;
-import org.jabref.logic.l10n.Localization;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Dialog to allow users to choose a file contained in a ZIP file.
- */
-class ZipFileChooser extends JabRefDialog {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ZipFileChooser.class);
-
-
-    /**
-     * New ZIP file chooser.
-     *
-     * @param importCustomizationDialog  Owner of the file chooser
-     * @param zipFile  ZIP-Fle to choose from, must be readable
-     */
-    public ZipFileChooser(ImportCustomizationDialog importCustomizationDialog, ZipFile zipFile) {
-        super(importCustomizationDialog, Localization.lang("Select file from ZIP-archive"), false, ZipFileChooser.class);
-
-
-        ZipFileChooserTableModel tableModel = new ZipFileChooserTableModel(zipFile, getSelectableZipEntries(zipFile));
-        JTable table = new JTable(tableModel);
-        TableColumnModel cm = table.getColumnModel();
-        cm.getColumn(0).setPreferredWidth(200);
-        cm.getColumn(1).setPreferredWidth(150);
-        cm.getColumn(2).setPreferredWidth(100);
-        JScrollPane sp = new JScrollPane(table, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        table.setPreferredScrollableViewportSize(new Dimension(500, 150));
-        if (table.getRowCount() > 0) {
-            table.setRowSelectionInterval(0, 0);
-        }
-
-        // cancel: no entry is selected
-        JButton cancelButton = new JButton(Localization.lang("Cancel"));
-        cancelButton.addActionListener(e -> dispose());
-        // ok: get selected class and check if it is instantiable as an importer
-        JButton okButton = new JButton(Localization.lang("OK"));
-        okButton.addActionListener(e -> {
-            int row = table.getSelectedRow();
-            if (row == -1) {
-                JOptionPane.showMessageDialog(this, Localization.lang("Please select an importer."));
-            } else {
-                ZipFileChooserTableModel model = (ZipFileChooserTableModel) table.getModel();
-                ZipEntry tempZipEntry = model.getZipEntry(row);
-                String className = tempZipEntry.getName().substring(0, tempZipEntry.getName().lastIndexOf('.')).replace(
-                        "/", ".");
-
-                try {
-                    CustomImporter importer = new CustomImporter(model.getZipFile().getName(), className);
-                    importCustomizationDialog.addOrReplaceImporter(importer);
-                    dispose();
-                } catch (ClassNotFoundException exc) {
-                    LOGGER.warn("Could not instantiate importer: " + className, exc);
-                    JOptionPane.showMessageDialog(this, Localization.lang("Could not instantiate %0 %1",
-                            className + ":\n", exc.getMessage()));
-                }
-            }
-        });
-
-
-        // Key bindings:
-        JPanel mainPanel = new JPanel();
-        //ActionMap am = mainPanel.getActionMap();
-        //InputMap im = mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        //im.put(Globals.getKeyPrefs().getKey(KeyBinds.CLOSE_DIALOG), "close");
-        //am.put("close", closeAction);
-        mainPanel.setLayout(new BorderLayout());
-        mainPanel.add(sp, BorderLayout.CENTER);
-
-        JPanel optionsPanel = new JPanel();
-        optionsPanel.add(okButton);
-        optionsPanel.add(cancelButton);
-        optionsPanel.add(Box.createHorizontalStrut(5));
-
-        getContentPane().add(mainPanel, BorderLayout.CENTER);
-        getContentPane().add(optionsPanel, BorderLayout.SOUTH);
-        this.setSize(getSize());
-        pack();
-        this.setLocationRelativeTo(importCustomizationDialog);
-        table.requestFocus();
-    }
-
-    /**
-     * Entries that can be selected with this dialog.
-     *
-     * @param zipFile  ZIP-File
-     * @return  entries that can be selected
-     */
-    private static List<ZipEntry> getSelectableZipEntries(ZipFile zipFile) {
-        List<ZipEntry> entries = new ArrayList<>();
-        Enumeration<? extends ZipEntry> e = zipFile.entries();
-        for (ZipEntry entry : Collections.list(e)) {
-            if (!entry.isDirectory() && entry.getName().endsWith(".class")) {
-                entries.add(entry);
-            }
-        }
-        return entries;
-    }
-
-    /*
-     *  (non-Javadoc)
-     * @see java.awt.Component#getSize()
-     */
-    @Override
-    public Dimension getSize() {
-        return new Dimension(400, 300);
-    }
-
-
-    /**
-     * Table model for the ZIP archive contents.
-     *
-     * <p>Contains one row for each entry.
-     * Does not contain rows for directory entries.</p>
-     *
-     * <p>The columns contain information about ZIP file entries:
-     * <ol><li>
-     *   name {@link String}
-     * </li><li>
-     *   time of last modification {@link Date}
-     * </li><li>
-     *   size (uncompressed) {@link Long}
-     * </li></ol></p>
-     */
-    private static class ZipFileChooserTableModel extends AbstractTableModel {
-
-        private final List<String> columnNames = Arrays.asList(Localization.lang("Name"),
-                Localization.lang("Last modified"), Localization.lang("Size"));
-        private final List<ZipEntry> rows;
-        private final ZipFile zipFile;
-
-
-        ZipFileChooserTableModel(ZipFile zipFile, List<ZipEntry> rows) {
-            super();
-            this.rows = rows;
-            this.zipFile = zipFile;
-        }
-
-        /*
-         *  (non-Javadoc)
-         * @see javax.swing.table.TableModel#getColumnCount()
-         */
-        @Override
-        public int getColumnCount() {
-            return columnNames.size();
-        }
-
-        /*
-         *  (non-Javadoc)
-         * @see javax.swing.table.TableModel#getRowCount()
-         */
-        @Override
-        public int getRowCount() {
-            return this.rows.size();
-        }
-
-        /*
-         *  (non-Javadoc)
-         * @see javax.swing.table.TableModel#getColumnName(int)
-         */
-        @Override
-        public String getColumnName(int col) {
-            return columnNames.get(col);
-        }
-
-        /**
-         * ZIP-File entry at the given row index.
-         *
-         * @param rowIndex  row index
-         * @return  ZIP file entry
-         */
-        public ZipEntry getZipEntry(int rowIndex) {
-            return this.rows.get(rowIndex);
-        }
-
-        /**
-         * ZIP file which contains all entries of this model.
-         *
-         * @return zip file
-         */
-        public ZipFile getZipFile() {
-            return this.zipFile;
-        }
-
-        /*
-         *  (non-Javadoc)
-         * @see javax.swing.table.TableModel#getValueAt(int, int)
-         */
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            Object value = null;
-            ZipEntry entry = getZipEntry(rowIndex);
-            if (columnIndex == 0) {
-                value = entry.getName();
-            } else if (columnIndex == 1) {
-                value = ZonedDateTime.ofInstant(new Date(entry.getTime()).toInstant(),
-                        ZoneId.systemDefault())
-                        .format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM));
-            } else if (columnIndex == 2) {
-                value = entry.getSize();
-            }
-            return value;
-        }
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java
index 6e053fc3a40..78d50765935 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java
@@ -8,6 +8,7 @@
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
+import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeTableCell;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.KeyCode;
@@ -16,6 +17,8 @@
 import javafx.scene.input.MouseEvent;
 import javafx.util.Callback;
 
+import org.jabref.model.strings.StringUtil;
+
 import org.reactfx.util.TriConsumer;
 
 /**
@@ -33,6 +36,7 @@ public class ViewModelTableRowFactory<S> implements Callback<TableView<S>, Table
     private BiConsumer<S, ? super DragEvent> toOnDragExited;
     private BiConsumer<S, ? super DragEvent> toOnDragOver;
     private TriConsumer<TableRow<S>, S, ? super MouseDragEvent> toOnMouseDragEntered;
+    private Callback<S, String> toTooltip;
 
     public ViewModelTableRowFactory<S> withOnMouseClickedEvent(BiConsumer<S, ? super MouseEvent> onMouseClickedEvent) {
         this.onMouseClickedEvent = onMouseClickedEvent;
@@ -84,10 +88,22 @@ public ViewModelTableRowFactory<S> setOnDragOver(BiConsumer<S, ? super DragEvent
         return this;
     }
 
+    public ViewModelTableRowFactory<S> withTooltip(Callback<S, String> toTooltip) {
+        this.toTooltip = toTooltip;
+        return this;
+    }
+
     @Override
     public TableRow<S> call(TableView<S> tableView) {
         TableRow<S> row = new TableRow<>();
 
+        if (toTooltip != null) {
+            String tooltipText = toTooltip.call(row.getItem());
+            if (StringUtil.isNotBlank(tooltipText)) {
+                row.setTooltip(new Tooltip(tooltipText));
+            }
+        }
+
         if (onMouseClickedEvent != null) {
             row.setOnMouseClicked(event -> {
                 if (!row.isEmpty()) {
diff --git a/src/main/java/org/jabref/gui/util/ZipFileChooser.java b/src/main/java/org/jabref/gui/util/ZipFileChooser.java
new file mode 100644
index 00000000000..74049324e9d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/util/ZipFileChooser.java
@@ -0,0 +1,96 @@
+package org.jabref.gui.util;
+
+import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.util.stream.Collectors;
+
+import javafx.beans.property.ReadOnlyLongWrapper;
+import javafx.beans.property.ReadOnlyStringWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+
+import org.jabref.logic.l10n.Localization;
+
+/**
+ * Dialog to allow users to choose a file contained in a ZIP file.
+ */
+public class ZipFileChooser extends BaseDialog<Path> {
+
+    /**
+     * New ZIP file chooser.
+     *
+     * @param zipFile                   ZIP-Fle to choose from, must be readable
+     */
+    public ZipFileChooser(FileSystem zipFile) throws IOException {
+        setTitle(Localization.lang("Select file from ZIP-archive"));
+
+        TableView<Path> table = new TableView<>(getSelectableZipEntries(zipFile));
+        TableColumn<Path, String> nameColumn = new TableColumn<>(Localization.lang("Name"));
+        TableColumn<Path, String> modifiedColumn = new TableColumn<>(Localization.lang("Last modified"));
+        TableColumn<Path, Number> sizeColumn = new TableColumn<>(Localization.lang("Size"));
+        table.getColumns().add(nameColumn);
+        table.getColumns().add(modifiedColumn);
+        table.getColumns().add(sizeColumn);
+        nameColumn.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().toString()));
+        modifiedColumn.setCellValueFactory(data -> {
+            try {
+                return new ReadOnlyStringWrapper(
+                        ZonedDateTime.ofInstant(Files.getLastModifiedTime(data.getValue()).toInstant(),
+                                ZoneId.systemDefault())
+                                     .format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)));
+            } catch (IOException e) {
+                // Ignore
+                return new ReadOnlyStringWrapper("");
+            }
+        });
+        sizeColumn.setCellValueFactory(data -> {
+            try {
+                return new ReadOnlyLongWrapper(Files.size(data.getValue()));
+            } catch (IOException e) {
+                // Ignore
+                return new ReadOnlyLongWrapper(0);
+            }
+        });
+        table.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
+
+        getDialogPane().setContent(table);
+
+        getDialogPane().getButtonTypes().setAll(
+                ButtonType.OK,
+                ButtonType.CANCEL
+        );
+
+        setResultConverter(button -> {
+            if (button == ButtonType.OK) {
+                return table.getSelectionModel().getSelectedItem();
+            } else {
+                return null;
+            }
+        });
+    }
+
+    /**
+     * Entries that can be selected with this dialog.
+     *
+     * @param zipFile ZIP-File
+     * @return entries that can be selected
+     */
+    private static ObservableList<Path> getSelectableZipEntries(FileSystem zipFile) throws IOException {
+        Path rootDir = zipFile.getRootDirectories().iterator().next();
+
+        return FXCollections.observableArrayList(
+                Files.walk(rootDir)
+                     .filter(file -> file.endsWith(".class"))
+                     .collect(Collectors.toList()));
+    }
+}
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index f3a0cae326a..90fe32bdc9d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -40,17 +40,10 @@ Add=Add
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Add a (compiled) custom Importer class from a class path.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=The path need not be on the classpath of JabRef.
 
-Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ ZIP-archive.=Add a (compiled) custom Importer class from a ZIP-archive.
-The\ ZIP-archive\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=The ZIP-archive need not be on the classpath of JabRef.
-
 Add\ a\ regular\ expression\ for\ the\ key\ pattern.=Add a regular expression for the key pattern.
 
 Add\ selected\ entries\ to\ this\ group=Add selected entries to this group
 
-Add\ from\ folder=Add from folder
-
-Add\ from\ JAR=Add from JAR
-
 Add\ subgroup=Add subgroup
 
 Add\ to\ group=Add to group
@@ -155,8 +148,6 @@ Clear=Clear
 
 Clear\ fields=Clear fields
 
-Close=Close
-
 Close\ entry=Close entry
 
 Close\ dialog=Close dialog
@@ -167,7 +158,6 @@ Close\ window=Close window
 
 Closed\ library=Closed library
 
-Command\ line\ id=Command line id
 Comments=Comments
 
 Contained\ in=Contained in
@@ -784,8 +774,6 @@ Please\ enter\ the\ field\ to\ search\ (e.g.\ <b>keywords</b>)\ and\ the\ keywor
 
 Please\ enter\ the\ string's\ label=Please enter the string's label
 
-Please\ select\ an\ importer.=Please select an importer.
-
 Please\ restart\ JabRef\ for\ preferences\ to\ take\ effect.=Please restart JabRef for preferences to take effect.
 
 Possible\ duplicate\ entries=Possible duplicate entries
@@ -967,8 +955,6 @@ Show\ BibTeX\ source\ by\ default=Show BibTeX source by default
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Show confirmation dialog when deleting entries
 
-Show\ description=Show description
-
 Show\ file\ column=Show file column
 
 Show\ last\ names\ only=Show last names only

From 18aba35fcf77fad95577e3213e1eb66f5256cf42 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Fri, 25 Jan 2019 16:36:16 +0100
Subject: [PATCH 226/229]  Convert OO/LO SidePanel to javafx (#4341)

* Convert OO/LO SidePanel to javafx

First attempt at converting the OpenOffice side panel

* rework first part of select style dialog

* add icon to delete style
add edit function
implement rest of logic

* store settings, show path
load last selected style
subscribe preview panel to changes

* update from scence builder

* fix ok button
wrap preview panel in vbox

* add title for canceable progess dialog
rework manual connect
rework settings popup
initialize oo prefs to avoid NPE
remove old style dialog

* formatting

* Create custom dialog which returns a dialog object
fix preference storage
fix manual path select

* pass keybinding repo as dependency

* add new dialog for advanced cite
todo: find out how to change the values

* reload preferences in connect
fix passing of prefs
fix advanced cite dialog

* fix checkstyle
add some dialog basics for manage citatiosn

* further implement viewModel

* implement viewModel
fix l10n parts

TODO: editing of extra info does not yet work

* remove submodule

* Display Manage citations as TextFlow in the table
Allow editing of page info directly in the table
Replace html bold with Text-Bold style

* fix checkstyle

* rework page info
remove old dialog
fix l10n
set titles
add tooltips

* use flowpane instead of textflow to prevent table row height increasing

* cleanup and fix codacy issues

* rework dialogs
rework future handling in detect OO installation

* rework constructor and rename to CitationEntryViewModel
move gui getText to view

* fix checkstyle and l10n issues

* fix order

* fix style file select layout and inline variable'

* Add Book as preview as well

* change mac default settings to LO path

* checkstyle

* fix merge error

* first part of refactoring

* refactor and remove/fix obsolete tests
put visible/managed bindings in fxml

* Fixes #4576
Store show/hide info of panel in preferences

* use progessbar from fxdialogs
TODO: Fix execution in fx thread

* Fix autodetecting open office paths in background thread
Fix saving of settings after auto connect
Add notification when connections are cleared
remove custom dialog hack

* fix checkstyle
---
 .../java/org/jabref/gui/DialogService.java    |   8 +-
 .../java/org/jabref/gui/FXDialogService.java  |  14 +-
 .../java/org/jabref/gui/SidePaneManager.java  |   4 +-
 .../gui/openoffice/AdvancedCiteDialog.fxml    |  30 +
 .../gui/openoffice/AdvancedCiteDialog.java    | 113 ---
 .../openoffice/AdvancedCiteDialogView.java    |  46 +
 .../AdvancedCiteDialogViewModel.java          |  25 +
 .../openoffice/BibEntryNotFoundException.java |   1 -
 .../openoffice/CitationEntryViewModel.java    |  40 +
 .../gui/openoffice/CitationManager.java       | 237 ------
 .../DetectOpenOfficeInstallation.java         |  86 +-
 .../gui/openoffice/ManageCitationsDialog.fxml |  21 +
 .../openoffice/ManageCitationsDialogView.java |  95 +++
 .../ManageCitationsDialogViewModel.java       |  73 ++
 .../gui/openoffice/ManualConnectDialog.fxml   |  43 +
 .../openoffice/ManualConnectDialogView.java   |  90 ++
 .../ManualConnectDialogViewModel.java         |  79 ++
 .../org/jabref/gui/openoffice/OOBibBase.java  | 140 ++--
 .../gui/openoffice/OpenOfficePanel.java       | 786 ++++++++----------
 .../gui/openoffice/OpenOfficeSidePanel.java   |  24 +-
 .../gui/openoffice/StyleSelectDialog.fxml     |  39 +
 .../gui/openoffice/StyleSelectDialog.java     | 538 ------------
 .../gui/openoffice/StyleSelectDialogView.java | 145 ++++
 .../StyleSelectDialogViewModel.java           | 137 +++
 .../openoffice/StyleSelectItemViewModel.java  |  59 ++
 .../UndefinedCharacterFormatException.java    |   1 -
 .../logic/openoffice/CitationEntry.java       |  27 +-
 .../jabref/logic/openoffice/OOBibStyle.java   |   7 +-
 .../openoffice/OpenOfficePreferences.java     |  39 +-
 .../java/org/jabref/logic/util/TestEntry.java |  13 +
 .../jabref/preferences/JabRefPreferences.java |   3 +
 .../preferences/PreferencesService.java       |   8 +
 src/main/resources/l10n/JabRef_en.properties  |  11 +-
 .../logic/openoffice/CitationEntryTest.java   |  32 +-
 34 files changed, 1443 insertions(+), 1571 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.fxml
 delete mode 100644 src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java
 create mode 100644 src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogViewModel.java
 create mode 100644 src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
 delete mode 100644 src/main/java/org/jabref/gui/openoffice/CitationManager.java
 create mode 100644 src/main/java/org/jabref/gui/openoffice/ManageCitationsDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
 create mode 100644 src/main/java/org/jabref/gui/openoffice/ManualConnectDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/openoffice/ManualConnectDialogViewModel.java
 create mode 100644 src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml
 delete mode 100644 src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
 create mode 100644 src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
 create mode 100644 src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java

diff --git a/src/main/java/org/jabref/gui/DialogService.java b/src/main/java/org/jabref/gui/DialogService.java
index 947fa1c66a0..2e105481d1d 100644
--- a/src/main/java/org/jabref/gui/DialogService.java
+++ b/src/main/java/org/jabref/gui/DialogService.java
@@ -140,7 +140,7 @@ default void showErrorDialogAndWait(Exception exception) {
      * @return true if the use clicked "YES" otherwise false
      */
     boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
-            String optOutMessage, Consumer<Boolean> optOutAction);
+                                                    String optOutMessage, Consumer<Boolean> optOutAction);
 
     /**
      * Create and display a new confirmation dialog.
@@ -152,8 +152,8 @@ boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
      * @return true if the use clicked "YES" otherwise false
      */
     boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
-            String okButtonLabel, String cancelButtonLabel,
-            String optOutMessage, Consumer<Boolean> optOutAction);
+                                                    String okButtonLabel, String cancelButtonLabel,
+                                                    String optOutMessage, Consumer<Boolean> optOutAction);
 
     /**
      * This will create and display a new dialog of the specified
@@ -163,7 +163,7 @@ boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
      * @return Optional with the pressed Button as ButtonType
      */
     Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String title, String content,
-            ButtonType... buttonTypes);
+                                                       ButtonType... buttonTypes);
 
     /**
      * This will create and display a new dialog showing a custom {@link DialogPane}
diff --git a/src/main/java/org/jabref/gui/FXDialogService.java b/src/main/java/org/jabref/gui/FXDialogService.java
index 93470689c79..0d6bc1fecd0 100644
--- a/src/main/java/org/jabref/gui/FXDialogService.java
+++ b/src/main/java/org/jabref/gui/FXDialogService.java
@@ -74,7 +74,7 @@ private static FXDialog createDialog(AlertType type, String title, String conten
     }
 
     private static FXDialog createDialogWithOptOut(AlertType type, String title, String content,
-            String optOutMessage, Consumer<Boolean> optOutAction) {
+                                                   String optOutMessage, Consumer<Boolean> optOutAction) {
         FXDialog alert = new FXDialog(type, title, true);
         // Need to force the alert to layout in order to grab the graphic as we are replacing the dialog pane with a custom pane
         alert.getDialogPane().applyCss();
@@ -180,7 +180,7 @@ public boolean showConfirmationDialogAndWait(String title, String content, Strin
 
     @Override
     public boolean showConfirmationDialogAndWait(String title, String content,
-            String okButtonLabel, String cancelButtonLabel) {
+                                                 String okButtonLabel, String cancelButtonLabel) {
         FXDialog alert = createDialog(AlertType.CONFIRMATION, title, content);
         ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.OK_DONE);
         ButtonType cancelButtonType = new ButtonType(cancelButtonLabel, ButtonBar.ButtonData.NO);
@@ -190,7 +190,7 @@ public boolean showConfirmationDialogAndWait(String title, String content,
 
     @Override
     public boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
-            String optOutMessage, Consumer<Boolean> optOutAction) {
+                                                           String optOutMessage, Consumer<Boolean> optOutAction) {
         FXDialog alert = createDialogWithOptOut(AlertType.CONFIRMATION, title, content, optOutMessage, optOutAction);
         alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO);
         return alert.showAndWait().filter(buttonType -> buttonType == ButtonType.YES).isPresent();
@@ -198,8 +198,8 @@ public boolean showConfirmationDialogWithOptOutAndWait(String title, String cont
 
     @Override
     public boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
-            String okButtonLabel, String cancelButtonLabel,
-            String optOutMessage, Consumer<Boolean> optOutAction) {
+                                                           String okButtonLabel, String cancelButtonLabel,
+                                                           String optOutMessage, Consumer<Boolean> optOutAction) {
         FXDialog alert = createDialogWithOptOut(AlertType.CONFIRMATION, title, content, optOutMessage, optOutAction);
         ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.YES);
         ButtonType cancelButtonType = new ButtonType(cancelButtonLabel, ButtonBar.ButtonData.NO);
@@ -209,7 +209,7 @@ public boolean showConfirmationDialogWithOptOutAndWait(String title, String cont
 
     @Override
     public Optional<ButtonType> showCustomButtonDialogAndWait(AlertType type, String title, String content,
-            ButtonType... buttonTypes) {
+                                                              ButtonType... buttonTypes) {
         FXDialog alert = createDialog(type, title, content);
         alert.getButtonTypes().setAll(buttonTypes);
         return alert.showAndWait();
@@ -217,7 +217,7 @@ public Optional<ButtonType> showCustomButtonDialogAndWait(AlertType type, String
 
     @Override
     public Optional<ButtonType> showCustomDialogAndWait(String title, DialogPane contentPane,
-            ButtonType... buttonTypes) {
+                                                        ButtonType... buttonTypes) {
         FXDialog alert = new FXDialog(AlertType.NONE, title);
         alert.setDialogPane(contentPane);
         alert.getButtonTypes().setAll(buttonTypes);
diff --git a/src/main/java/org/jabref/gui/SidePaneManager.java b/src/main/java/org/jabref/gui/SidePaneManager.java
index 5a09bdcd1ab..eef7f01098b 100644
--- a/src/main/java/org/jabref/gui/SidePaneManager.java
+++ b/src/main/java/org/jabref/gui/SidePaneManager.java
@@ -33,8 +33,8 @@ public SidePaneManager(JabRefPreferences preferences, JabRefFrame frame) {
         Stream.of(
                   new FileUpdatePanel(this),
                   new GroupSidePane(this, preferences, frame.getDialogService()),
-                new WebSearchPane(this, preferences, frame),
-                  new OpenOfficeSidePanel(this, openOfficePreferences, frame))
+                  new WebSearchPane(this, preferences, frame),
+                  new OpenOfficeSidePanel(this, preferences, frame))
               .forEach(pane -> components.put(pane.getType(), pane));
 
         if (preferences.getBoolean(JabRefPreferences.GROUP_SIDEPANE_VISIBLE)) {
diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.fxml b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.fxml
new file mode 100644
index 00000000000..1127c2e08d7
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.fxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<DialogPane prefHeight="182.0" prefWidth="390.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.openoffice.AdvancedCiteDialogView">
+   <content>
+      <VBox>
+         <fx:define>
+              <ToggleGroup fx:id="citeToggleGroup" />
+         </fx:define>
+         <children>
+            <RadioButton fx:id="inPar" minWidth="-Infinity" mnemonicParsing="false" text="%Cite selected entries between parenthesis" toggleGroup="$citeToggleGroup" />
+            <RadioButton fx:id="inText" minWidth="-Infinity" mnemonicParsing="false" text="%Cite selected entries with in-text citation" toggleGroup="$citeToggleGroup" />
+            <Label minWidth="-Infinity" text="%Extra information (e.g. page number)" />
+            <TextField fx:id="pageInfo" />
+         </children>
+      </VBox>
+   </content>
+  <buttonTypes>
+    <ButtonType fx:constant="CANCEL" />
+    <ButtonType fx:constant="OK" />
+  </buttonTypes>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java
deleted file mode 100644
index 2a2d48ef26e..00000000000
--- a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.jabref.gui.openoffice;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-
-import org.jabref.Globals;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.logic.l10n.Localization;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-/**
- * Dialog for adding citation with page number info.
- */
-class AdvancedCiteDialog {
-
-    private static boolean defaultInPar = true;
-    private boolean okPressed;
-    private final JDialog diag;
-    private final JTextField pageInfo = new JTextField(15);
-
-
-    public AdvancedCiteDialog(JabRefFrame parent) {
-        diag = new JDialog((JFrame) null, Localization.lang("Cite special"), true);
-        ButtonGroup bg = new ButtonGroup();
-        JRadioButton inPar = new JRadioButton(Localization.lang("Cite selected entries between parenthesis"));
-        JRadioButton inText = new JRadioButton(Localization.lang("Cite selected entries with in-text citation"));
-        bg.add(inPar);
-        bg.add(inText);
-        if (defaultInPar) {
-            inPar.setSelected(true);
-        } else {
-            inText.setSelected(true);
-        }
-
-        inPar.addChangeListener(changeEvent -> defaultInPar = inPar.isSelected());
-
-        FormBuilder builder = FormBuilder.create()
-                .layout(new FormLayout("left:pref, 4dlu, fill:pref", "pref, 4dlu, pref, 4dlu, pref"));
-        builder.add(inPar).xyw(1, 1, 3);
-        builder.add(inText).xyw(1, 3, 3);
-        builder.add(Localization.lang("Extra information (e.g. page number)") + ":").xy(1, 5);
-        builder.add(pageInfo).xy(3, 5);
-        builder.padding("10dlu, 10dlu, 10dlu, 10dlu");
-        diag.getContentPane().add(builder.getPanel(), BorderLayout.CENTER);
-
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-        JButton ok = new JButton(Localization.lang("OK"));
-        JButton cancel = new JButton(Localization.lang("Cancel"));
-        bb.addButton(ok);
-        bb.addButton(cancel);
-        bb.addGlue();
-        bb.padding("5dlu, 5dlu, 5dlu, 5dlu");
-        diag.getContentPane().add(bb.getPanel(), BorderLayout.SOUTH);
-
-        diag.pack();
-
-        ActionListener okAction = actionEvent -> {
-                okPressed = true;
-                diag.dispose();
-        };
-
-        ok.addActionListener(okAction);
-        pageInfo.addActionListener(okAction);
-        inPar.addActionListener(okAction);
-        inText.addActionListener(okAction);
-        Action cancelAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                okPressed = false;
-                diag.dispose();
-            }
-        };
-        cancel.addActionListener(cancelAction);
-        builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-               .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        builder.getPanel().getActionMap().put("close", cancelAction);
-
-    }
-
-    public void showDialog() {
-        diag.setLocationRelativeTo(diag.getParent());
-        diag.setVisible(true);
-    }
-
-    public boolean canceled() {
-        return !okPressed;
-    }
-
-    public String getPageInfo() {
-        return pageInfo.getText().trim();
-    }
-
-    public boolean isInParenthesisCite() {
-        return defaultInPar;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
new file mode 100644
index 00000000000..f12e34fcdbe
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
@@ -0,0 +1,46 @@
+package org.jabref.gui.openoffice;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
+
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.l10n.Localization;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class AdvancedCiteDialogView extends BaseDialog<AdvancedCiteDialogViewModel> {
+
+    @FXML private TextField pageInfo;
+    @FXML private RadioButton inPar;
+    @FXML private RadioButton inText;
+    @FXML private ToggleGroup citeToggleGroup;
+    private AdvancedCiteDialogViewModel viewModel;
+
+    public AdvancedCiteDialogView() {
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+        setResultConverter(btn -> {
+            if (btn == ButtonType.OK) {
+                return viewModel;
+            }
+            return null;
+        });
+
+        setTitle(Localization.lang("Cite special"));
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new AdvancedCiteDialogViewModel();
+
+        inPar.selectedProperty().bindBidirectional(viewModel.citeInParProperty());
+        inText.selectedProperty().bindBidirectional(viewModel.citeInTextProperty());
+        pageInfo.textProperty().bindBidirectional(viewModel.pageInfoProperty());
+
+    }
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogViewModel.java
new file mode 100644
index 00000000000..c62abfeccec
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogViewModel.java
@@ -0,0 +1,25 @@
+package org.jabref.gui.openoffice;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+public class AdvancedCiteDialogViewModel {
+
+    private final StringProperty pageInfo = new SimpleStringProperty("");
+    private final BooleanProperty citeInPar = new SimpleBooleanProperty();
+    private final BooleanProperty citeInText = new SimpleBooleanProperty();
+
+    public StringProperty pageInfoProperty() {
+        return pageInfo;
+    }
+
+    public BooleanProperty citeInParProperty() {
+        return citeInPar;
+    }
+
+    public BooleanProperty citeInTextProperty() {
+        return citeInText;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java b/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java
index 15dde84a5fb..3a83f8c7177 100644
--- a/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java
+++ b/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java
@@ -4,7 +4,6 @@ class BibEntryNotFoundException extends Exception {
 
     private final String bibtexKey;
 
-
     public BibEntryNotFoundException(String bibtexKey, String message) {
         super(message);
 
diff --git a/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java b/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
new file mode 100644
index 00000000000..58ac9f04ecd
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
@@ -0,0 +1,40 @@
+package org.jabref.gui.openoffice;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.logic.openoffice.CitationEntry;
+
+public class CitationEntryViewModel {
+
+    private final StringProperty citation = new SimpleStringProperty("");
+    private final StringProperty extraInformation = new SimpleStringProperty("");
+    private final String refMarkName;
+
+    public CitationEntryViewModel(String refMarkName, String citation, String extraInfo) {
+        this.refMarkName = refMarkName;
+        this.citation.setValue(citation);
+        this.extraInformation.setValue(extraInfo);
+    }
+
+    public CitationEntryViewModel(CitationEntry citationEntry) {
+        this(citationEntry.getRefMarkName(), citationEntry.getContext(), citationEntry.getPageInfo().orElse(""));
+    }
+
+    public CitationEntry toCitationEntry() {
+        return new CitationEntry(refMarkName, citation.getValue(), extraInformation.getValue());
+    }
+
+    public StringProperty citationProperty() {
+        return citation;
+    }
+
+    public StringProperty extraInformationProperty() {
+        return extraInformation;
+    }
+
+    public void setExtraInfo(String extraInfo) {
+        extraInformation.setValue(extraInfo);
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/CitationManager.java b/src/main/java/org/jabref/gui/openoffice/CitationManager.java
deleted file mode 100644
index ae75d693d95..00000000000
--- a/src/main/java/org/jabref/gui/openoffice/CitationManager.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package org.jabref.gui.openoffice;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-
-import org.jabref.Globals;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.openoffice.CitationEntry;
-
-import ca.odell.glazedlists.BasicEventList;
-import ca.odell.glazedlists.EventList;
-import ca.odell.glazedlists.gui.TableFormat;
-import ca.odell.glazedlists.swing.DefaultEventTableModel;
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.beans.NotRemoveableException;
-import com.sun.star.beans.PropertyExistException;
-import com.sun.star.beans.UnknownPropertyException;
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.WrappedTargetException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Dialog for modifying existing citations.
- */
-class CitationManager {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CitationManager.class);
-    private final OOBibBase ooBase;
-    private final JDialog diag;
-    private final EventList<CitationEntry> list;
-    private final JTable table;
-
-    private final DefaultEventTableModel<CitationEntry> tableModel;
-
-    public CitationManager(OOBibBase ooBase, DialogService dialogService)
-            throws NoSuchElementException, WrappedTargetException, UnknownPropertyException {
-        diag = new JDialog((JFrame) null, Localization.lang("Manage citations"), true);
-        this.ooBase = ooBase;
-
-        list = new BasicEventList<>();
-        XNameAccess nameAccess = ooBase.getReferenceMarks();
-        List<String> names = ooBase.getJabRefReferenceMarks(nameAccess);
-        for (String name : names) {
-            list.add(new CitationEntry(name,
-                    "<html>..." + ooBase.getCitationContext(nameAccess, name, 30, 30, true) + "...</html>",
-                    ooBase.getCustomProperty(name)));
-        }
-        tableModel = new DefaultEventTableModel<>(list, new CitationEntryFormat());
-        table = new JTable(tableModel);
-
-        diag.add(new JScrollPane(table), BorderLayout.CENTER);
-
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-        JButton ok = new JButton(Localization.lang("OK"));
-        bb.addButton(ok);
-        JButton cancel = new JButton(Localization.lang("Cancel"));
-        bb.addButton(cancel);
-        bb.addGlue();
-        bb.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        diag.add(bb.getPanel(), BorderLayout.SOUTH);
-
-        diag.pack();
-        diag.setSize(700, 400);
-
-        ok.addActionListener(e -> {
-            try {
-                storeSettings();
-            } catch (UnknownPropertyException | NotRemoveableException | PropertyExistException | IllegalTypeException |
-                    IllegalArgumentException ex) {
-                LOGGER.warn("Problem modifying citation", ex);
-                dialogService.showErrorDialogAndWait(Localization.lang("Problem modifying citation"), ex);
-            }
-            diag.dispose();
-        });
-
-        Action cancelAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                diag.dispose();
-            }
-        };
-        cancel.addActionListener(cancelAction);
-
-        bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put
-                (Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        bb.getPanel().getActionMap().put("close", cancelAction);
-
-        table.getColumnModel().getColumn(0).setPreferredWidth(580);
-        table.getColumnModel().getColumn(1).setPreferredWidth(110);
-        table.setPreferredScrollableViewportSize(new Dimension(700, 500));
-        table.addMouseListener(new TableClickListener());
-    }
-
-    private void storeSettings() throws UnknownPropertyException, NotRemoveableException, PropertyExistException,
-            IllegalTypeException, IllegalArgumentException {
-        for (CitationEntry entry : list) {
-            Optional<String> pageInfo = entry.getPageInfo();
-            if (entry.pageInfoChanged() && pageInfo.isPresent()) {
-                ooBase.setCustomProperty(entry.getRefMarkName(), pageInfo.get());
-            }
-        }
-    }
-
-    public void showDialog() {
-        diag.setLocationRelativeTo(diag.getParent());
-        diag.setVisible(true);
-    }
-
-    private static class CitationEntryFormat implements TableFormat<CitationEntry> {
-
-        @Override
-        public int getColumnCount() {
-            return 2;
-        }
-
-        @Override
-        public String getColumnName(int i) {
-            if (i == 0) {
-                return Localization.lang("Citation");
-            } else {
-                return Localization.lang("Extra information");
-            }
-        }
-
-        @Override
-        public Object getColumnValue(CitationEntry citEntry, int i) {
-            if (i == 0) {
-                return citEntry.getContext();
-            } else {
-                return citEntry.getPageInfo().orElse("");
-            }
-        }
-    }
-
-    private class TableClickListener extends MouseAdapter {
-
-        @Override
-        public void mouseClicked(MouseEvent e) {
-            if ((e.getButton() == MouseEvent.BUTTON1) && (e.getClickCount() == 2)) {
-                int row = table.rowAtPoint(e.getPoint());
-                if (row >= 0) {
-                    SingleCitationDialog scd = new SingleCitationDialog(list.get(row));
-                    scd.showDialog();
-                }
-            }
-        }
-    }
-
-    class SingleCitationDialog {
-
-        private final JDialog singleCiteDialog;
-        private final JTextField pageInfo = new JTextField(20);
-        private final JButton okButton = new JButton(Localization.lang("OK"));
-        private final JButton cancelButton = new JButton(Localization.lang("Cancel"));
-        private final CitationEntry entry;
-
-
-        public SingleCitationDialog(CitationEntry citEntry) {
-            this.entry = citEntry;
-            pageInfo.setText(entry.getPageInfo().orElse(""));
-
-            singleCiteDialog = new JDialog(CitationManager.this.diag, Localization.lang("Citation"), true);
-
-            FormBuilder builder = FormBuilder.create()
-                    .layout(new FormLayout("left:pref, 4dlu, fill:150dlu:grow", "pref, 4dlu, pref"));
-            builder.add(entry.getContext()).xyw(1, 1, 3);
-            builder.add(Localization.lang("Extra information (e.g. page number)")).xy(1, 3);
-            builder.add(pageInfo).xy(3, 3);
-            builder.padding("10dlu, 10dlu, 10dlu, 10dlu");
-            singleCiteDialog.getContentPane().add(builder.getPanel(), BorderLayout.CENTER);
-
-            ButtonBarBuilder bb = new ButtonBarBuilder();
-            bb.addGlue();
-            bb.addButton(okButton);
-            bb.addButton(cancelButton);
-            bb.addGlue();
-            bb.padding("5dlu, 5dlu, 5dlu, 5dlu");
-            singleCiteDialog.add(bb.getPanel(), BorderLayout.SOUTH);
-
-            okButton.addActionListener(e -> {
-                if (pageInfo.getText().trim().isEmpty()) {
-                    entry.setPageInfo(null);
-                } else {
-                    entry.setPageInfo(pageInfo.getText().trim());
-                }
-                tableModel.fireTableDataChanged();
-                singleCiteDialog.dispose();
-            });
-
-            Action cancelAction = new AbstractAction() {
-
-                @Override
-                public void actionPerformed(ActionEvent actionEvent) {
-                    singleCiteDialog.dispose();
-                }
-            };
-            cancelButton.addActionListener(cancelAction);
-
-            builder.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put
-                    (Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-            builder.getPanel().getActionMap().put("close", cancelAction);
-
-        }
-
-        public void showDialog() {
-            singleCiteDialog.pack();
-            singleCiteDialog.setLocationRelativeTo(singleCiteDialog.getParent());
-            singleCiteDialog.setVisible(true);
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
index 55853091840..1f4a892f14a 100644
--- a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
+++ b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
@@ -1,83 +1,57 @@
 package org.jabref.gui.openoffice;
 
-import java.awt.BorderLayout;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
 
-import javax.swing.BorderFactory;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JProgressBar;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-
-import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.desktop.os.NativeDesktop;
-import org.jabref.gui.util.BackgroundTask;
-import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.openoffice.OpenOfficeFileSearch;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
 import org.jabref.logic.util.OS;
 import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.JabRefPreferences;
 
 /**
  * Tools for automatically detecting OpenOffice or LibreOffice installations.
  */
 public class DetectOpenOfficeInstallation {
 
-    private final OpenOfficePreferences preferences;
-    private final JDialog parent;
+    private final OpenOfficePreferences ooPrefs;
     private final DialogService dialogService;
+    private final JabRefPreferences preferences;
 
-    private JDialog progressDialog;
-
-    public DetectOpenOfficeInstallation(JDialog parent, OpenOfficePreferences preferences, DialogService dialogService) {
-        this.parent = parent;
+    public DetectOpenOfficeInstallation(JabRefPreferences preferences, DialogService dialogService) {
         this.preferences = preferences;
         this.dialogService = dialogService;
+        this.ooPrefs = preferences.getOpenOfficePreferences();
     }
 
-    public Future<Boolean> isInstalled() {
-        CompletableFuture<Boolean> future = new CompletableFuture<>();
-        if (this.checkAutoDetectedPaths(preferences)) {
-            future.complete(true);
-        } else {
-            init();
-            BackgroundTask.wrap(() -> future.complete(autoDetectPaths()))
-                          .onSuccess(x -> SwingUtilities.invokeLater(progressDialog::dispose))
-                          .executeWith(Globals.TASK_EXECUTOR);
-        }
-        return future;
+    public boolean isInstalled() {
+        return autoDetectPaths();
     }
 
-    public void init() {
-        progressDialog = showProgressDialog(parent, Localization.lang("Autodetecting paths..."),
-                Localization.lang("Please wait..."));
+    public boolean isExecutablePathDefined() {
+        return checkAutoDetectedPaths(ooPrefs);
     }
 
     private Optional<Path> selectInstallationPath() {
 
         final NativeDesktop nativeDesktop = JabRefDesktop.getNativeDesktop();
 
-        Optional<Path> path = DefaultTaskExecutor.runInJavaFXThread(() -> {
-            dialogService.showInformationDialogAndWait(Localization.lang("Could not find OpenOffice/LibreOffice installation"),
-                    Localization.lang("Unable to autodetect OpenOffice/LibreOffice installation. Please choose the installation directory manually."));
-            DirectoryDialogConfiguration dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                    .withInitialDirectory(nativeDesktop.getApplicationDirectory())
-                    .build();
-            return dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
-        });
+        dialogService.showInformationDialogAndWait(Localization.lang("Could not find OpenOffice/LibreOffice installation"),
+                                                   Localization.lang("Unable to autodetect OpenOffice/LibreOffice installation. Please choose the installation directory manually."));
+        DirectoryDialogConfiguration dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
+                                                                                                        .withInitialDirectory(nativeDesktop.getApplicationDirectory())
+                                                                                                        .build();
+        return dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
 
-        return path;
     }
 
     private boolean autoDetectPaths() {
@@ -102,7 +76,7 @@ private boolean autoDetectPaths() {
      */
     private boolean checkAutoDetectedPaths(OpenOfficePreferences openOfficePreferences) {
         String executablePath = openOfficePreferences.getExecutablePath();
-        return ((executablePath != null) && Files.exists(Paths.get(executablePath)));
+        return !StringUtil.isNullOrEmpty(executablePath) && Files.exists(Paths.get(executablePath));
     }
 
     private boolean setOpenOfficePreferences(Path installDir) {
@@ -119,9 +93,10 @@ private boolean setOpenOfficePreferences(Path installDir) {
         Optional<Path> jarFilePath = FileUtil.find(OpenOfficePreferences.OO_JARS.get(0), installDir);
 
         if (execPath.isPresent() && jarFilePath.isPresent()) {
-            preferences.setInstallationPath(installDir.toString());
-            preferences.setExecutablePath(execPath.get().toString());
-            preferences.setJarsPath(jarFilePath.get().getParent().toString());
+            ooPrefs.setInstallationPath(installDir.toString());
+            ooPrefs.setExecutablePath(execPath.get().toString());
+            ooPrefs.setJarsPath(jarFilePath.get().getParent().toString());
+            preferences.setOpenOfficePreferences(ooPrefs);
             return true;
         }
 
@@ -138,25 +113,12 @@ private Optional<Path> chooseAmongInstallations(List<Path> installDirs) {
         }
 
         String content = Localization.lang("Found more than one OpenOffice/LibreOffice executable.")
-                + "\n" + Localization.lang("Please choose which one to connect to:");
+                         + "\n" + Localization.lang("Please choose which one to connect to:");
 
-        Optional<Path> selectedPath = DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showChoiceDialogAndWait(
-                Localization.lang("Choose OpenOffice/LibreOffice executable"),
-                content, Localization.lang("Use selected instance"), installDirs));
+        Optional<Path> selectedPath = dialogService.showChoiceDialogAndWait(Localization.lang("Choose OpenOffice/LibreOffice executable"),
+                                                                            content, Localization.lang("Use selected instance"), installDirs);
 
         return selectedPath;
     }
 
-    public JDialog showProgressDialog(JDialog progressParent, String title, String message) {
-        JProgressBar bar = new JProgressBar(SwingConstants.HORIZONTAL);
-        final JDialog progressDialog = new JDialog(progressParent, title, false);
-        bar.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-        bar.setIndeterminate(true);
-        progressDialog.add(new JLabel(message), BorderLayout.NORTH);
-        progressDialog.add(bar, BorderLayout.CENTER);
-        progressDialog.pack();
-        progressDialog.setLocationRelativeTo(null);
-        progressDialog.setVisible(true);
-        return progressDialog;
-    }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialog.fxml b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialog.fxml
new file mode 100644
index 00000000000..bde42841ce5
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialog.fxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+
+<DialogPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="470.0" prefWidth="701.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.openoffice.ManageCitationsDialogView">
+	<content>
+		<TableView fx:id="citationsTableView" prefHeight="208.0" prefWidth="662.0">
+			<columns>
+				<TableColumn fx:id="citation" prefWidth="251.0" text="%Citation" />
+				<TableColumn fx:id="extraInfo" prefWidth="425.0" text="%Extra information (e.g. page number)" />
+			</columns>
+		</TableView>
+	</content>
+	<buttonTypes>
+		<ButtonType fx:constant="CANCEL" />
+		<ButtonType fx:constant="OK" />
+	</buttonTypes>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
new file mode 100644
index 00000000000..1f50783e89f
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
@@ -0,0 +1,95 @@
+package org.jabref.gui.openoffice;
+
+import javax.inject.Inject;
+
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+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.cell.TextFieldTableCell;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.text.Text;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ValueTableCellFactory;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.strings.StringUtil;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.sun.star.beans.UnknownPropertyException;
+import com.sun.star.container.NoSuchElementException;
+import com.sun.star.lang.WrappedTargetException;
+
+public class ManageCitationsDialogView extends BaseDialog<Void> {
+
+    private static final String HTML_BOLD_END_TAG = "</b>";
+    private static final String HTML_BOLD_START_TAG = "<b>";
+
+    private final OOBibBase ooBase;
+
+    @FXML private TableView<CitationEntryViewModel> citationsTableView;
+    @FXML private TableColumn<CitationEntryViewModel, String> citation;
+    @FXML private TableColumn<CitationEntryViewModel, String> extraInfo;
+
+    @Inject private DialogService dialogService;
+
+    private ManageCitationsDialogViewModel viewModel;
+
+    public ManageCitationsDialogView(OOBibBase ooBase) {
+        this.ooBase = ooBase;
+
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        setResultConverter(btn -> {
+            if (btn == ButtonType.OK) {
+                viewModel.storeSettings();
+            }
+            return null;
+        });
+
+        setTitle(Localization.lang("Manage citations"));
+    }
+
+    @FXML
+    private void initialize() throws NoSuchElementException, WrappedTargetException, UnknownPropertyException {
+
+        viewModel = new ManageCitationsDialogViewModel(ooBase, dialogService);
+
+        citation.setCellValueFactory(cellData -> cellData.getValue().citationProperty());
+        new ValueTableCellFactory<CitationEntryViewModel, String>().withGraphic(this::getText).install(citation);
+
+        extraInfo.setCellValueFactory(cellData -> cellData.getValue().extraInformationProperty());
+        extraInfo.setEditable(true);
+
+        citationsTableView.setEditable(true);
+
+        citationsTableView.itemsProperty().bindBidirectional(viewModel.citationsProperty());
+
+        extraInfo.setOnEditCommit((CellEditEvent<CitationEntryViewModel, String> cell) -> {
+            cell.getRowValue().setExtraInfo(cell.getNewValue());
+        });
+        extraInfo.setCellFactory(TextFieldTableCell.forTableColumn());
+
+    }
+
+    private Node getText(String citationContext) {
+
+        String inBetween = StringUtil.substringBetween(citationContext, HTML_BOLD_START_TAG, HTML_BOLD_END_TAG);
+        String start = citationContext.substring(0, citationContext.indexOf(HTML_BOLD_START_TAG));
+        String end = citationContext.substring(citationContext.lastIndexOf(HTML_BOLD_END_TAG) + HTML_BOLD_END_TAG.length(), citationContext.length());
+
+        Text startText = new Text(start);
+        Text inBetweenText = new Text(inBetween);
+        inBetweenText.setStyle("-fx-font-weight: bold");
+        Text endText = new Text(end);
+
+        FlowPane flow = new FlowPane(startText, inBetweenText, endText);
+        return flow;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
new file mode 100644
index 00000000000..e928f5ee673
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
@@ -0,0 +1,73 @@
+package org.jabref.gui.openoffice;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.DialogService;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.openoffice.CitationEntry;
+
+import com.sun.star.beans.IllegalTypeException;
+import com.sun.star.beans.NotRemoveableException;
+import com.sun.star.beans.PropertyExistException;
+import com.sun.star.beans.UnknownPropertyException;
+import com.sun.star.container.NoSuchElementException;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.WrappedTargetException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ManageCitationsDialogViewModel {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ManageCitationsDialogViewModel.class);
+
+    private final ListProperty<CitationEntryViewModel> citations = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final OOBibBase ooBase;
+    private final DialogService dialogService;
+
+    public ManageCitationsDialogViewModel(OOBibBase ooBase, DialogService dialogService) throws NoSuchElementException, WrappedTargetException, UnknownPropertyException {
+        this.ooBase = ooBase;
+        this.dialogService = dialogService;
+
+        XNameAccess nameAccess = ooBase.getReferenceMarks();
+        List<String> names = ooBase.getJabRefReferenceMarks(nameAccess);
+        for (String name : names) {
+
+            CitationEntry entry = new CitationEntry(name,
+                                                    ooBase.getCitationContext(nameAccess, name, 30, 30, true),
+                                                    ooBase.getCustomProperty(name));
+
+            CitationEntryViewModel itemViewModelEntry = new CitationEntryViewModel(entry);
+            citations.add(itemViewModelEntry);
+        }
+
+    }
+
+    public void storeSettings() {
+        List<CitationEntry> ciationEntries = citations.stream().map(CitationEntryViewModel::toCitationEntry).collect(Collectors.toList());
+        try {
+            for (CitationEntry entry : ciationEntries) {
+                Optional<String> pageInfo = entry.getPageInfo();
+                if (pageInfo.isPresent()) {
+                    ooBase.setCustomProperty(entry.getRefMarkName(), pageInfo.get());
+                }
+            }
+        } catch (UnknownPropertyException | NotRemoveableException | PropertyExistException | IllegalTypeException |
+                 IllegalArgumentException ex) {
+            LOGGER.warn("Problem modifying citation", ex);
+            dialogService.showErrorDialogAndWait(Localization.lang("Problem modifying citation"), ex);
+        }
+    }
+
+    public ListProperty<CitationEntryViewModel> citationsProperty() {
+        return citations;
+    }
+
+}
+
diff --git a/src/main/java/org/jabref/gui/openoffice/ManualConnectDialog.fxml b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialog.fxml
new file mode 100644
index 00000000000..751462763d6
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialog.fxml
@@ -0,0 +1,43 @@
+<?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.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+
+
+<DialogPane prefHeight="130.0" prefWidth="317.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.openoffice.ManualConnectDialogView">
+   <content>
+      <GridPane minWidth="-Infinity" prefHeight="50.0" prefWidth="585.0">
+        <columnConstraints>
+          <ColumnConstraints hgrow="SOMETIMES" maxWidth="255.0" minWidth="10.0" prefWidth="255.0" />
+          <ColumnConstraints hgrow="SOMETIMES" maxWidth="581.0" minWidth="10.0" />
+            <ColumnConstraints hgrow="SOMETIMES" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+            <Label fx:id="OOPathLabel" minWidth="-Infinity" text="%Path to OpenOffice/LibreOffice directory" managed="${ooPath.visible}" />
+            <TextField fx:id="ooPath" GridPane.columnIndex="1" managed="${ooPath.visible}" />
+            <Button fx:id="browseOOPath" mnemonicParsing="false" onAction="#browseOOPath" text="%Browse" GridPane.columnIndex="2" managed="${ooPath.visible}" />
+            <Button fx:id="browseOOExec" mnemonicParsing="false" onAction="#browseOOExec" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="1" managed="${ooExec.visible}"  />
+            <Button fx:id="browseOOJars" mnemonicParsing="false" onAction="#browseOOJars" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="2"   managed="${ooJars.visible}" />
+            <TextField fx:id="ooExec" GridPane.columnIndex="1" GridPane.rowIndex="1"  managed="${ooExec.visible}"  />
+            <TextField fx:id="ooJars" GridPane.columnIndex="1" GridPane.rowIndex="2"  managed="${ooJars.visible}" />
+            <Label fx:id="ooExecLabel" minWidth="-Infinity" text="%Path to OpenOffice/LibreOffice executable" GridPane.rowIndex="1"  managed="${ooExec.visible}"  />
+            <Label fx:id="ooJarsLabel" minWidth="-Infinity" text="%Path to OpenOffice/LibreOffice library dir" GridPane.rowIndex="2"   managed="${ooJars.visible}" />
+         </children>
+      </GridPane>
+   </content>
+     <buttonTypes>
+        <ButtonType fx:constant="CANCEL" />
+        <ButtonType fx:constant="OK"/>
+      </buttonTypes>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java
new file mode 100644
index 00000000000..5352cf97198
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java
@@ -0,0 +1,90 @@
+package org.jabref.gui.openoffice;
+
+import javax.inject.Inject;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.OS;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class ManualConnectDialogView extends BaseDialog<Boolean> {
+
+    @FXML private Label OOPathLabel;
+    @FXML private TextField ooPath;
+    @FXML private Button browseOOPath;
+    @FXML private Button browseOOExec;
+    @FXML private Button browseOOJars;
+    @FXML private TextField ooExec;
+    @FXML private TextField ooJars;
+    @FXML private Label ooExecLabel;
+    @FXML private Label ooJarsLabel;
+
+    @Inject private PreferencesService preferencesService;
+    @Inject private final DialogService dialogService;
+
+    private ManualConnectDialogViewModel viewModel;
+
+    public ManualConnectDialogView(DialogService dialogService) {
+        this.dialogService = dialogService;
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        setResultConverter(button -> {
+            if (button == ButtonType.OK) {
+                viewModel.save();
+                return true;
+            }
+            return null;
+        });
+
+        setTitle(Localization.lang("Set connection parameters"));
+    }
+
+    @FXML
+    private void initialize() {
+
+        viewModel = new ManualConnectDialogViewModel(preferencesService, dialogService);
+
+        ooPath.textProperty().bindBidirectional(viewModel.ooPathProperty());
+        ooExec.textProperty().bindBidirectional(viewModel.ooExecProperty());
+        ooJars.textProperty().bind(viewModel.ooJarsProperty());
+
+        if (OS.WINDOWS || OS.OS_X) {
+            ooPath.setVisible(true);
+            ooExec.setVisible(false);
+            ooJars.setVisible(false);
+        } else {
+            ooPath.setVisible(false);
+            ooExec.setVisible(false);
+            ooJars.setVisible(true);
+        }
+    }
+
+    @FXML
+    private void browseOOPath(ActionEvent event) {
+        viewModel.browseOOPath();
+    }
+
+    @FXML
+    private void browseOOExec(ActionEvent event) {
+        viewModel.browseOOExec();
+    }
+
+    @FXML
+    private void browseOOJars(ActionEvent event) {
+        viewModel.browseOOJars();
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogViewModel.java
new file mode 100644
index 00000000000..c628484296e
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogViewModel.java
@@ -0,0 +1,79 @@
+package org.jabref.gui.openoffice;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.gui.desktop.os.NativeDesktop;
+import org.jabref.gui.util.DirectoryDialogConfiguration;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.openoffice.OpenOfficePreferences;
+import org.jabref.logic.util.OS;
+import org.jabref.preferences.PreferencesService;
+
+public class ManualConnectDialogViewModel {
+
+    private final StringProperty ooPath = new SimpleStringProperty("");
+    private final StringProperty ooExec = new SimpleStringProperty("");
+    private final StringProperty ooJars = new SimpleStringProperty("");
+    private final DialogService dialogService;
+    private final NativeDesktop nativeDesktop = JabRefDesktop.getNativeDesktop();
+    private final FileDialogConfiguration fileDialogConfiguration;
+    private final DirectoryDialogConfiguration dirDialogConfiguration;
+    private final OpenOfficePreferences ooPreferences;
+    private final PreferencesService preferencesService;
+
+    public ManualConnectDialogViewModel(PreferencesService preferencesService, DialogService dialogService) {
+        this.dialogService = dialogService;
+        this.preferencesService = preferencesService;
+
+        ooPreferences = preferencesService.getOpenOfficePreferences();
+        ooPathProperty().setValue(ooPreferences.getInstallationPath());
+        ooExecProperty().setValue(ooPreferences.getExecutablePath());
+        ooJarsProperty().setValue(ooPreferences.getJarsPath());
+
+        dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
+                                                                           .withInitialDirectory(nativeDesktop.getApplicationDirectory())
+                                                                           .build();
+        fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                                                                       .withInitialDirectory(nativeDesktop.getApplicationDirectory())
+                                                                       .build();
+    }
+
+    public void browseOOPath() {
+        dialogService.showDirectorySelectionDialog(dirDialogConfiguration).ifPresent(path -> ooPath.setValue(path.toAbsolutePath().toString()));
+    }
+
+    public void browseOOExec() {
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(f -> ooExec.setValue(f.toAbsolutePath().toString()));
+
+    }
+
+    public void browseOOJars() {
+        dialogService.showDirectorySelectionDialog(dirDialogConfiguration).ifPresent(path -> ooJars.setValue(path.toAbsolutePath().toString()));
+    }
+
+    public StringProperty ooPathProperty() {
+        return ooPath;
+    }
+
+    public StringProperty ooExecProperty() {
+        return ooExec;
+    }
+
+    public StringProperty ooJarsProperty() {
+        return ooJars;
+    }
+
+    public void save() {
+        if (OS.WINDOWS || OS.OS_X) {
+            ooPreferences.updateConnectionParams(ooPath.getValue(), ooPath.getValue(), ooPath.getValue());
+        } else {
+            ooPreferences.updateConnectionParams(ooPath.getValue(), ooExec.getValue(), ooJars.getValue());
+        }
+
+        preferencesService.setOpenOfficePreferences(ooPreferences);
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
index b9b9ff4f704..560eaf1fe87 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
@@ -135,10 +135,9 @@ class OOBibBase {
 
     private List<String> sortedReferenceMarks;
 
-
     public OOBibBase(String pathToOO, boolean atEnd) throws IOException, IllegalAccessException,
-            InvocationTargetException, BootstrapException, CreationException, UnknownPropertyException,
-            WrappedTargetException, IndexOutOfBoundsException, NoSuchElementException, NoDocumentException {
+                                                     InvocationTargetException, BootstrapException, CreationException, UnknownPropertyException,
+                                                     WrappedTargetException, IndexOutOfBoundsException, NoSuchElementException, NoDocumentException {
         authorYearTitleList.add(authComp);
         authorYearTitleList.add(yearComp);
         authorYearTitleList.add(titleComp);
@@ -165,7 +164,7 @@ public Optional<String> getCurrentDocumentTitle() {
         } else {
             try {
                 return Optional
-                        .of(String.valueOf(OOUtil.getProperty(mxDoc.getCurrentController().getFrame(), "Title")));
+                               .of(String.valueOf(OOUtil.getProperty(mxDoc.getCurrentController().getFrame(), "Title")));
             } catch (UnknownPropertyException | WrappedTargetException e) {
                 LOGGER.warn("Could not get document title", e);
                 return Optional.empty();
@@ -174,7 +173,7 @@ public Optional<String> getCurrentDocumentTitle() {
     }
 
     public void selectDocument() throws UnknownPropertyException, WrappedTargetException, IndexOutOfBoundsException,
-            NoSuchElementException, NoDocumentException {
+        NoSuchElementException, NoDocumentException {
         List<XTextDocument> textDocumentList = getTextDocuments();
         XTextDocument selected;
         if (textDocumentList.isEmpty()) {
@@ -213,8 +212,8 @@ public void selectDocument() throws UnknownPropertyException, WrappedTargetExcep
     }
 
     private XDesktop simpleBootstrap(String pathToExecutable)
-            throws IllegalAccessException, InvocationTargetException, BootstrapException,
-            CreationException, IOException {
+        throws IllegalAccessException, InvocationTargetException, BootstrapException,
+        CreationException, IOException {
 
         ClassLoader loader = ClassLoader.getSystemClassLoader();
         if (loader instanceof URLClassLoader) {
@@ -231,7 +230,7 @@ private XDesktop simpleBootstrap(String pathToExecutable)
             }
         } else {
             LOGGER.error("Error occured, URLClassLoader expected but " + loader.getClass()
-                    + " received. Could not continue.");
+                         + " received. Could not continue.");
         }
 
         //Get the office component context:
@@ -272,13 +271,13 @@ private List<XTextDocument> getTextDocuments() throws NoSuchElementException, Wr
     }
 
     public void setCustomProperty(String property, String value) throws UnknownPropertyException,
-            NotRemoveableException, PropertyExistException, IllegalTypeException, IllegalArgumentException {
+        NotRemoveableException, PropertyExistException, IllegalTypeException, IllegalArgumentException {
         if (propertySet.getPropertySetInfo().hasPropertyByName(property)) {
             userProperties.removeProperty(property);
         }
         if (value != null) {
             userProperties.addProperty(property, com.sun.star.beans.PropertyAttribute.REMOVEABLE,
-                    new Any(Type.STRING, value));
+                                       new Any(Type.STRING, value));
         }
     }
 
@@ -318,11 +317,12 @@ public void updateSortedReferenceMarks() throws WrappedTargetException, NoSuchEl
      * @throws UndefinedParagraphFormatException
      */
     public void insertEntry(List<BibEntry> entries, BibDatabase database,
-            List<BibDatabase> allBases, OOBibStyle style,
-            boolean inParenthesis, boolean withText, String pageInfo, boolean sync) throws IllegalArgumentException,
-            UnknownPropertyException, NotRemoveableException, PropertyExistException, IllegalTypeException,
-            UndefinedCharacterFormatException, WrappedTargetException, NoSuchElementException, PropertyVetoException,
-            IOException, CreationException, BibEntryNotFoundException, UndefinedParagraphFormatException {
+                            List<BibDatabase> allBases, OOBibStyle style,
+                            boolean inParenthesis, boolean withText, String pageInfo, boolean sync)
+        throws IllegalArgumentException,
+        UnknownPropertyException, NotRemoveableException, PropertyExistException, IllegalTypeException,
+        UndefinedCharacterFormatException, WrappedTargetException, NoSuchElementException, PropertyVetoException,
+        IOException, CreationException, BibEntryNotFoundException, UndefinedParagraphFormatException {
 
         try {
 
@@ -337,10 +337,10 @@ public void insertEntry(List<BibEntry> entries, BibDatabase database,
             }
 
             String keyString = String.join(",",
-                    entries.stream().map(entry -> entry.getCiteKeyOptional().orElse("")).collect(Collectors.toList()));
+                                           entries.stream().map(entry -> entry.getCiteKeyOptional().orElse("")).collect(Collectors.toList()));
             // Insert bookmark:
             String bName = getUniqueReferenceMarkName(keyString,
-                    withText ? inParenthesis ? OOBibBase.AUTHORYEAR_PAR : OOBibBase.AUTHORYEAR_INTEXT : OOBibBase.INVISIBLE_CIT);
+                                                      withText ? inParenthesis ? OOBibBase.AUTHORYEAR_PAR : OOBibBase.AUTHORYEAR_INTEXT : OOBibBase.INVISIBLE_CIT);
 
             // If we should store metadata for page info, do that now:
             if (pageInfo != null) {
@@ -355,7 +355,7 @@ public void insertEntry(List<BibEntry> entries, BibDatabase database,
                 try {
                     xCursorProps.setPropertyValue(CHAR_STYLE_NAME, charStyle);
                 } catch (UnknownPropertyException | PropertyVetoException | IllegalArgumentException |
-                        WrappedTargetException ex) {
+                         WrappedTargetException ex) {
                     // Setting the character format failed, so we throw an exception that
                     // will result in an error message for the user. Before that,
                     // delete the space we inserted:
@@ -370,7 +370,7 @@ public void insertEntry(List<BibEntry> entries, BibDatabase database,
                 databaseMap.put(entry, database);
             }
             String citeText = style.isNumberEntries() ? "-" : style.getCitationMarker(entries, databaseMap,
-                    inParenthesis, null, null);
+                                                                                      inParenthesis, null, null);
             insertReferenceMark(bName, citeText, xViewCursor, withText, style);
 
             xViewCursor.collapseToEnd();
@@ -413,9 +413,9 @@ public void insertEntry(List<BibEntry> entries, BibDatabase database,
      * @throws UnknownPropertyException
      */
     public List<String> refreshCiteMarkers(List<BibDatabase> databases, OOBibStyle style)
-            throws WrappedTargetException, IllegalArgumentException, NoSuchElementException,
-            UndefinedCharacterFormatException, UnknownPropertyException, PropertyVetoException, IOException,
-            CreationException, BibEntryNotFoundException {
+        throws WrappedTargetException, IllegalArgumentException, NoSuchElementException,
+        UndefinedCharacterFormatException, UnknownPropertyException, PropertyVetoException, IOException,
+        CreationException, BibEntryNotFoundException {
         try {
             return refreshCiteMarkersInternal(databases, style);
         } catch (DisposedException ex) {
@@ -441,9 +441,9 @@ public List<String> getJabRefReferenceMarks(XNameAccess nameAccess) {
     }
 
     private List<String> refreshCiteMarkersInternal(List<BibDatabase> databases, OOBibStyle style)
-            throws WrappedTargetException, IllegalArgumentException, NoSuchElementException,
-            UndefinedCharacterFormatException, UnknownPropertyException, PropertyVetoException,
-            CreationException, BibEntryNotFoundException {
+        throws WrappedTargetException, IllegalArgumentException, NoSuchElementException,
+        UndefinedCharacterFormatException, UnknownPropertyException, PropertyVetoException,
+        CreationException, BibEntryNotFoundException {
 
         List<String> cited = findCitedKeys();
         Map<String, BibDatabase> linkSourceBase = new HashMap<>();
@@ -550,7 +550,7 @@ private List<String> refreshCiteMarkersInternal(List<BibDatabase> databases, OOB
                         citationMarker = style.getNumCitationMarker(num, minGroupingCount, false);
                         for (int j = 0; j < keys.length; j++) {
                             normCitMarker[j] = style.getNumCitationMarker(Collections.singletonList(num.get(j)),
-                                    minGroupingCount, false);
+                                                                          minGroupingCount, false);
                         }
                     } else {
                         // We need to find the number of the cited entry in the bibliography,
@@ -559,7 +559,7 @@ private List<String> refreshCiteMarkersInternal(List<BibDatabase> databases, OOB
 
                         if (num.isEmpty()) {
                             throw new BibEntryNotFoundException(names.get(i), Localization
-                                    .lang("Could not resolve BibTeX entry for citation marker '%0'.", names.get(i)));
+                                                                                          .lang("Could not resolve BibTeX entry for citation marker '%0'.", names.get(i)));
                         } else {
                             citationMarker = style.getNumCitationMarker(num, minGroupingCount, false);
                         }
@@ -585,11 +585,11 @@ private List<String> refreshCiteMarkersInternal(List<BibDatabase> databases, OOB
                     }
 
                     citationMarker = style.getCitationMarker(Arrays.asList(cEntries), entries,
-                            type == OOBibBase.AUTHORYEAR_PAR, null, null);
+                                                             type == OOBibBase.AUTHORYEAR_PAR, null, null);
                     // We need "normalized" (in parenthesis) markers for uniqueness checking purposes:
                     for (int j = 0; j < cEntries.length; j++) {
                         normCitMarker[j] = style.getCitationMarker(Collections.singletonList(cEntries[j]), entries,
-                                true, null, new int[] {-1});
+                                                                   true, null, new int[] {-1});
                     }
                 }
                 citMarkers[i] = citationMarker;
@@ -689,7 +689,7 @@ private List<String> refreshCiteMarkersInternal(List<BibDatabase> databases, OOB
                 }
                 if (needsChange) {
                     citMarkers[j] = style.getCitationMarker(Arrays.asList(cEntries), entries,
-                            types[j] == OOBibBase.AUTHORYEAR_PAR, uniquif, firstLimAuthors);
+                                                            types[j] == OOBibBase.AUTHORYEAR_PAR, uniquif, firstLimAuthors);
                 }
             }
         }
@@ -715,7 +715,7 @@ private List<String> refreshCiteMarkersInternal(List<BibDatabase> databases, OOB
                 try {
                     xCursorProps.setPropertyValue(CHAR_STYLE_NAME, charStyle);
                 } catch (UnknownPropertyException | PropertyVetoException | IllegalArgumentException |
-                        WrappedTargetException ex) {
+                         WrappedTargetException ex) {
                     throw new UndefinedCharacterFormatException(charStyle);
                 }
             }
@@ -745,9 +745,9 @@ private List<String> refreshCiteMarkersInternal(List<BibDatabase> databases, OOB
     }
 
     private List<String> getSortedReferenceMarks(final XNameAccess nameAccess)
-            throws WrappedTargetException, NoSuchElementException {
+        throws WrappedTargetException, NoSuchElementException {
         XTextViewCursorSupplier cursorSupplier = UnoRuntime.queryInterface(XTextViewCursorSupplier.class,
-                mxDoc.getCurrentController());
+                                                                           mxDoc.getCurrentController());
 
         XTextViewCursor viewCursor = cursorSupplier.getViewCursor();
         XTextRange initialPos = viewCursor.getStart();
@@ -781,8 +781,8 @@ private List<String> getSortedReferenceMarks(final XNameAccess nameAccess)
     }
 
     public void rebuildBibTextSection(List<BibDatabase> databases, OOBibStyle style)
-            throws NoSuchElementException, WrappedTargetException, IllegalArgumentException,
-            CreationException, PropertyVetoException, UnknownPropertyException, UndefinedParagraphFormatException {
+        throws NoSuchElementException, WrappedTargetException, IllegalArgumentException,
+        CreationException, PropertyVetoException, UnknownPropertyException, UndefinedParagraphFormatException {
         List<String> cited = findCitedKeys();
         Map<String, BibDatabase> linkSourceBase = new HashMap<>();
         Map<BibEntry, BibDatabase> entries = findCitedEntries(databases, cited, linkSourceBase); // Although entries are redefined without use, this also updates linkSourceBase
@@ -795,7 +795,7 @@ public void rebuildBibTextSection(List<BibDatabase> databases, OOBibStyle style)
         } else {
             SortedMap<BibEntry, BibDatabase> newMap = new TreeMap<>(entryComparator);
             for (Map.Entry<BibEntry, BibDatabase> bibtexEntryBibtexDatabaseEntry : findCitedEntries(databases, cited,
-                    linkSourceBase).entrySet()) {
+                                                                                                    linkSourceBase).entrySet()) {
                 newMap.put(bibtexEntryBibtexDatabaseEntry.getKey(), bibtexEntryBibtexDatabaseEntry.getValue());
             }
             entries = newMap;
@@ -821,7 +821,7 @@ private String getUniqueReferenceMarkName(String bibtexKey, int type) {
     }
 
     private Map<BibEntry, BibDatabase> findCitedEntries(List<BibDatabase> databases, List<String> keys,
-            Map<String, BibDatabase> linkSourceBase) {
+                                                        Map<String, BibDatabase> linkSourceBase) {
         Map<BibEntry, BibDatabase> entries = new LinkedHashMap<>();
         for (String key : keys) {
             boolean found = false;
@@ -862,7 +862,7 @@ private List<String> findCitedKeys() throws NoSuchElementException, WrappedTarge
     }
 
     private Map<BibEntry, BibDatabase> getSortedEntriesFromSortedRefMarks(List<String> names,
-            Map<String, BibDatabase> linkSourceBase) {
+                                                                          Map<String, BibDatabase> linkSourceBase) {
 
         Map<BibEntry, BibDatabase> newList = new LinkedHashMap<>();
         for (String name : names) {
@@ -940,7 +940,8 @@ private List<Integer> findCitedEntryIndex(String citRefName, List<String> keys)
     }
 
     public String getCitationContext(XNameAccess nameAccess, String refMarkName, int charBefore, int charAfter,
-            boolean htmlMarkup) throws NoSuchElementException, WrappedTargetException {
+                                     boolean htmlMarkup)
+        throws NoSuchElementException, WrappedTargetException {
         Object referenceMark = nameAccess.getByName(refMarkName);
         XTextContent bookmark = UnoRuntime.queryInterface(XTextContent.class, referenceMark);
 
@@ -982,8 +983,9 @@ public String getCitationContext(XNameAccess nameAccess, String refMarkName, int
     }
 
     private void insertFullReferenceAtCursor(XTextCursor cursor, Map<BibEntry, BibDatabase> entries, OOBibStyle style,
-            String parFormat) throws UndefinedParagraphFormatException, IllegalArgumentException,
-                    UnknownPropertyException, PropertyVetoException, WrappedTargetException {
+                                             String parFormat)
+        throws UndefinedParagraphFormatException, IllegalArgumentException,
+        UnknownPropertyException, PropertyVetoException, WrappedTargetException {
         Map<BibEntry, BibDatabase> correctEntries;
         // If we don't have numbered entries, we need to sort the entries before adding them:
         if (style.isSortByPosition()) {
@@ -1004,18 +1006,18 @@ private void insertFullReferenceAtCursor(XTextCursor cursor, Map<BibEntry, BibDa
             if (style.isNumberEntries()) {
                 int minGroupingCount = style.getIntCitProperty(OOBibStyle.MINIMUM_GROUPING_COUNT);
                 OOUtil.insertTextAtCurrentLocation(text, cursor,
-                        style.getNumCitationMarker(Collections.singletonList(number++), minGroupingCount, true), Collections.emptyList());
+                                                   style.getNumCitationMarker(Collections.singletonList(number++), minGroupingCount, true), Collections.emptyList());
             }
             Layout layout = style.getReferenceFormat(entry.getKey().getType());
             layout.setPostFormatter(POSTFORMATTER);
             OOUtil.insertFullReferenceAtCurrentLocation(text, cursor, layout, parFormat, entry.getKey(),
-                    entry.getValue(), uniquefiers.get(entry.getKey().getCiteKeyOptional().orElse(null)));
+                                                        entry.getValue(), uniquefiers.get(entry.getKey().getCiteKeyOptional().orElse(null)));
         }
 
     }
 
     private void createBibTextSection2(boolean end)
-            throws IllegalArgumentException, CreationException {
+        throws IllegalArgumentException, CreationException {
 
         XTextCursor mxDocCursor = text.createTextCursor();
         if (end) {
@@ -1026,7 +1028,7 @@ private void createBibTextSection2(boolean end)
         XNamed xChildNamed;
         try {
             xChildNamed = UnoRuntime.queryInterface(XNamed.class,
-                mxDocFactory.createInstance("com.sun.star.text.TextSection"));
+                                                    mxDocFactory.createInstance("com.sun.star.text.TextSection"));
         } catch (Exception e) {
             throw new CreationException(e.getMessage());
         }
@@ -1039,13 +1041,13 @@ private void createBibTextSection2(boolean end)
     }
 
     private void clearBibTextSectionContent2()
-            throws NoSuchElementException, WrappedTargetException, IllegalArgumentException, CreationException {
+        throws NoSuchElementException, WrappedTargetException, IllegalArgumentException, CreationException {
 
         // Check if the section exists:
         XTextSectionsSupplier supplier = UnoRuntime.queryInterface(XTextSectionsSupplier.class, mxDoc);
         if (supplier.getTextSections().hasByName(OOBibBase.BIB_SECTION_NAME)) {
             XTextSection section = (XTextSection) ((Any) supplier.getTextSections().getByName(OOBibBase.BIB_SECTION_NAME))
-                    .getObject();
+                                                                                                                          .getObject();
             // Clear it:
             XTextCursor cursor = text.createTextCursorByRange(section.getAnchor());
             cursor.gotoRange(section.getAnchor(), false);
@@ -1056,21 +1058,21 @@ private void clearBibTextSectionContent2()
     }
 
     private void populateBibTextSection(Map<BibEntry, BibDatabase> entries, OOBibStyle style)
-            throws NoSuchElementException, WrappedTargetException, PropertyVetoException,
-            UnknownPropertyException, UndefinedParagraphFormatException, IllegalArgumentException, CreationException {
+        throws NoSuchElementException, WrappedTargetException, PropertyVetoException,
+        UnknownPropertyException, UndefinedParagraphFormatException, IllegalArgumentException, CreationException {
         XTextSectionsSupplier supplier = UnoRuntime.queryInterface(XTextSectionsSupplier.class, mxDoc);
         XTextSection section = (XTextSection) ((Any) supplier.getTextSections().getByName(OOBibBase.BIB_SECTION_NAME))
-                .getObject();
+                                                                                                                      .getObject();
         XTextCursor cursor = text.createTextCursorByRange(section.getAnchor());
         OOUtil.insertTextAtCurrentLocation(text, cursor, (String) style.getProperty(OOBibStyle.TITLE),
-                (String) style.getProperty(OOBibStyle.REFERENCE_HEADER_PARAGRAPH_FORMAT));
+                                           (String) style.getProperty(OOBibStyle.REFERENCE_HEADER_PARAGRAPH_FORMAT));
         insertFullReferenceAtCursor(cursor, entries, style,
-                (String) style.getProperty(OOBibStyle.REFERENCE_PARAGRAPH_FORMAT));
+                                    (String) style.getProperty(OOBibStyle.REFERENCE_PARAGRAPH_FORMAT));
         insertBookMark(OOBibBase.BIB_SECTION_END_NAME, cursor);
     }
 
     private XTextContent insertBookMark(String name, XTextCursor position)
-            throws IllegalArgumentException, CreationException {
+        throws IllegalArgumentException, CreationException {
         Object bookmark;
         try {
             bookmark = mxDocFactory.createInstance("com.sun.star.text.Bookmark");
@@ -1090,8 +1092,9 @@ private XTextContent insertBookMark(String name, XTextCursor position)
     }
 
     private void insertReferenceMark(String name, String citationText, XTextCursor position, boolean withText,
-            OOBibStyle style) throws UnknownPropertyException, WrappedTargetException,
-            PropertyVetoException, IllegalArgumentException, UndefinedCharacterFormatException, CreationException {
+                                     OOBibStyle style)
+        throws UnknownPropertyException, WrappedTargetException,
+        PropertyVetoException, IllegalArgumentException, UndefinedCharacterFormatException, CreationException {
 
         // Check if there is "page info" stored for this citation. If so, insert it into
         // the citation text before inserting the citation:
@@ -1124,7 +1127,7 @@ private void insertReferenceMark(String name, String citationText, XTextCursor p
                 try {
                     xCursorProps.setPropertyValue(CHAR_STYLE_NAME, charStyle);
                 } catch (UnknownPropertyException | PropertyVetoException | IllegalArgumentException |
-                        WrappedTargetException ex) {
+                         WrappedTargetException ex) {
                     throw new UndefinedCharacterFormatException(charStyle);
                 }
             }
@@ -1152,7 +1155,7 @@ private void insertReferenceMark(String name, String citationText, XTextCursor p
     }
 
     private void italicizeOrBold(XTextCursor position, boolean italicize, int start, int end)
-            throws UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException {
+        throws UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException {
         XTextRange range = position.getStart();
         XTextCursor cursor = position.getText().createTextCursorByRange(range);
         cursor.goRight((short) start, false);
@@ -1201,9 +1204,9 @@ private XNameAccess getBookmarks() {
     }
 
     public void combineCiteMarkers(List<BibDatabase> databases, OOBibStyle style)
-            throws IOException, WrappedTargetException, NoSuchElementException, IllegalArgumentException,
-            UndefinedCharacterFormatException, UnknownPropertyException, PropertyVetoException, CreationException,
-            BibEntryNotFoundException {
+        throws IOException, WrappedTargetException, NoSuchElementException, IllegalArgumentException,
+        UndefinedCharacterFormatException, UnknownPropertyException, PropertyVetoException, CreationException,
+        BibEntryNotFoundException {
         XNameAccess nameAccess = getReferenceMarks();
         // TODO: doesn't work for citations in footnotes/tables
         List<String> names = getSortedReferenceMarks(nameAccess);
@@ -1214,9 +1217,9 @@ public void combineCiteMarkers(List<BibDatabase> databases, OOBibStyle style)
         boolean madeModifications = false;
         while (piv < (names.size() - 1)) {
             XTextRange range1 = UnoRuntime.queryInterface(XTextContent.class, nameAccess.getByName(names.get(piv)))
-                    .getAnchor().getEnd();
+                                          .getAnchor().getEnd();
             XTextRange range2 = UnoRuntime.queryInterface(XTextContent.class, nameAccess.getByName(names.get(piv + 1)))
-                    .getAnchor().getStart();
+                                          .getAnchor().getStart();
             if (range1.getText() != range2.getText()) {
                 piv++;
                 continue;
@@ -1240,7 +1243,7 @@ public void combineCiteMarkers(List<BibDatabase> databases, OOBibStyle style)
                     try {
                         xCursorProps.setPropertyValue(CHAR_STYLE_NAME, charStyle);
                     } catch (UnknownPropertyException | PropertyVetoException | IllegalArgumentException |
-                            WrappedTargetException ex) {
+                             WrappedTargetException ex) {
                         // Setting the character format failed, so we throw an exception that
                         // will result in an error message for the user:
                         throw new UndefinedCharacterFormatException(charStyle);
@@ -1263,7 +1266,7 @@ public void combineCiteMarkers(List<BibDatabase> databases, OOBibStyle style)
                 }
                 Collections.sort(entries, new FieldComparator(FieldName.YEAR));
                 String keyString = String.join(",", entries.stream().map(entry -> entry.getCiteKeyOptional().orElse(""))
-                        .collect(Collectors.toList()));
+                                                           .collect(Collectors.toList()));
                 // Insert bookmark:
                 String bName = getUniqueReferenceMarkName(keyString, OOBibBase.AUTHORYEAR_PAR);
                 insertReferenceMark(bName, "tmp", mxDocCursor, true, style);
@@ -1280,7 +1283,7 @@ public void combineCiteMarkers(List<BibDatabase> databases, OOBibStyle style)
     }
 
     public static XTextDocument selectComponent(List<XTextDocument> list)
-            throws UnknownPropertyException, WrappedTargetException, IndexOutOfBoundsException {
+        throws UnknownPropertyException, WrappedTargetException, IndexOutOfBoundsException {
         String[] values = new String[list.size()];
         int ii = 0;
         for (XTextDocument doc : list) {
@@ -1291,7 +1294,7 @@ public static XTextDocument selectComponent(List<XTextDocument> list)
         sel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         sel.setSelectedIndex(0);
         int ans = JOptionPane.showConfirmDialog(null, new JScrollPane(sel), Localization.lang("Select document"),
-                JOptionPane.OK_CANCEL_OPTION);
+                                                JOptionPane.OK_CANCEL_OPTION);
         if (ans == JOptionPane.OK_OPTION) {
             return list.get(sel.getSelectedIndex());
         } else {
@@ -1304,7 +1307,6 @@ private static class ComparableMark implements Comparable<ComparableMark> {
         private final String name;
         private final Point position;
 
-
         public ComparableMark(String name, Point position) {
             this.name = name;
             this.position = position;
@@ -1328,7 +1330,7 @@ public boolean equals(Object o) {
             if (o instanceof ComparableMark) {
                 ComparableMark other = (ComparableMark) o;
                 return (this.position.X == other.position.X) && (this.position.Y == other.position.Y)
-                        && Objects.equals(this.name, other.name);
+                       && Objects.equals(this.name, other.name);
             }
             return false;
         }
@@ -1345,7 +1347,7 @@ public int hashCode() {
     }
 
     public BibDatabase generateDatabase(List<BibDatabase> databases)
-            throws NoSuchElementException, WrappedTargetException {
+        throws NoSuchElementException, WrappedTargetException {
         BibDatabase resultDatabase = new BibDatabase();
         List<String> cited = findCitedKeys();
 
diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
index f829a652172..21b12f02321 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.openoffice;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -16,35 +13,34 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ButtonGroup;
-import javax.swing.Icon;
-import javax.swing.JButton;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JRadioButtonMenuItem;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
+import javafx.concurrent.Task;
+import javafx.geometry.Side;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckMenuItem;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.ProgressBar;
+import javafx.scene.control.RadioMenuItem;
+import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
 
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.desktop.JabRefDesktop;
-import org.jabref.gui.desktop.os.NativeDesktop;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableKeyChange;
-import org.jabref.gui.util.BackgroundTask;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.DirectoryDialogConfiguration;
-import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
 import org.jabref.logic.help.HelpFile;
@@ -53,16 +49,13 @@
 import org.jabref.logic.openoffice.OpenOfficePreferences;
 import org.jabref.logic.openoffice.StyleLoader;
 import org.jabref.logic.openoffice.UndefinedParagraphFormatException;
-import org.jabref.logic.util.OS;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.Defaults;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.preferences.JabRefPreferences;
 
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
 import com.sun.star.beans.IllegalTypeException;
 import com.sun.star.beans.NotRemoveableException;
 import com.sun.star.beans.PropertyExistException;
@@ -82,227 +75,211 @@ public class OpenOfficePanel {
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenOfficePanel.class);
     private final DialogService dialogService;
 
-    private JPanel content;
-
-    private JDialog diag;
-    private final JButton connect;
-    private final JButton manualConnect;
-    private final JButton selectDocument;
-    private final JButton setStyleFile = new JButton(Localization.lang("Select style"));
-    private final JButton pushEntries = new JButton(Localization.lang("Cite"));
-    private final JButton pushEntriesInt = new JButton(Localization.lang("Cite in-text"));
-    private final JButton pushEntriesEmpty = new JButton(Localization.lang("Insert empty citation"));
-    private final JButton pushEntriesAdvanced = new JButton(Localization.lang("Cite special"));
-    private final JButton update;
-    private final JButton merge = new JButton(Localization.lang("Merge citations"));
-    private final JButton manageCitations = new JButton(Localization.lang("Manage citations"));
-    private final JButton exportCitations = new JButton(Localization.lang("Export cited"));
-    private final JButton settingsB = new JButton(Localization.lang("Settings"));
-    private final JButton help = new HelpAction(Localization.lang("OpenOffice/LibreOffice integration"),
-            HelpFile.OPENOFFICE_LIBREOFFICE).getHelpButton();
+    private final Button connect;
+    private final Button manualConnect;
+    private final Button selectDocument;
+    private final Button setStyleFile = new Button(Localization.lang("Select style"));
+    private final Button pushEntries = new Button(Localization.lang("Cite"));
+    private final Button pushEntriesInt = new Button(Localization.lang("Cite in-text"));
+    private final Button pushEntriesEmpty = new Button(Localization.lang("Insert empty citation"));
+    private final Button pushEntriesAdvanced = new Button(Localization.lang("Cite special"));
+    private final Button update;
+    private final Button merge = new Button(Localization.lang("Merge citations"));
+    private final Button manageCitations = new Button(Localization.lang("Manage citations"));
+    private final Button exportCitations = new Button(Localization.lang("Export cited"));
+    private final Button settingsB = new Button(Localization.lang("Settings"));
+    private final Button help;
+    private final VBox vbox = new VBox();
+
     private OOBibBase ooBase;
     private final JabRefFrame frame;
     private OOBibStyle style;
-    private StyleSelectDialog styleDialog;
-    private boolean dialogOkPressed;
-    private final OpenOfficePreferences preferences;
+    private OpenOfficePreferences ooPrefs;
+    private final JabRefPreferences jabRefPreferences;
     private final StyleLoader loader;
+    private final TaskExecutor taskExecutor;
+
+    public OpenOfficePanel(JabRefFrame frame, JabRefPreferences jabRefPreferences, OpenOfficePreferences ooPrefs, KeyBindingRepository keyBindingRepository) {
+        ActionFactory factory = new ActionFactory(keyBindingRepository);
+        this.frame = frame;
+        this.ooPrefs = ooPrefs;
+        this.jabRefPreferences = jabRefPreferences;
+        this.taskExecutor = Globals.TASK_EXECUTOR;
+        dialogService = frame.getDialogService();
+
+        connect = new Button();
+        connect.setGraphic(IconTheme.JabRefIcons.CONNECT_OPEN_OFFICE.getGraphicNode());
+        connect.setTooltip(new Tooltip(Localization.lang("Connect")));
+        connect.setMaxWidth(Double.MAX_VALUE);
+
+        manualConnect = new Button();
+        manualConnect.setGraphic(IconTheme.JabRefIcons.CONNECT_OPEN_OFFICE.getGraphicNode());
+        manualConnect.setTooltip(new Tooltip(Localization.lang("Manual connect")));
+        manualConnect.setMaxWidth(Double.MAX_VALUE);
+
+        HelpAction helpCommand = new HelpAction(HelpFile.OPENOFFICE_LIBREOFFICE);
+
+        help = factory.createIconButton(StandardActions.HELP, helpCommand.getCommand());
+        help.setMaxWidth(Double.MAX_VALUE);
+
+        selectDocument = new Button();
+        selectDocument.setGraphic(IconTheme.JabRefIcons.OPEN.getGraphicNode());
+        selectDocument.setTooltip(new Tooltip(Localization.lang("Select Writer document")));
+        selectDocument.setMaxWidth(Double.MAX_VALUE);
+
+        update = new Button();
+        update.setGraphic(IconTheme.JabRefIcons.REFRESH.getGraphicNode());
+        update.setTooltip(new Tooltip(Localization.lang("Sync OpenOffice/LibreOffice bibliography")));
+        update.setMaxWidth(Double.MAX_VALUE);
+
+        loader = new StyleLoader(ooPrefs,
+                                 Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader),
+                                 Globals.prefs.getDefaultEncoding());
 
-    public OpenOfficePanel(JabRefFrame jabRefFrame) {
-        Icon connectImage = IconTheme.JabRefIcons.CONNECT_OPEN_OFFICE.getSmallIcon();
-
-        connect = new JButton(connectImage);
-        manualConnect = new JButton(connectImage);
-        connect.setToolTipText(Localization.lang("Connect"));
-        manualConnect.setToolTipText(Localization.lang("Manual connect"));
-        connect.setPreferredSize(new Dimension(24, 24));
-        manualConnect.setPreferredSize(new Dimension(24, 24));
-
-        selectDocument = new JButton(IconTheme.JabRefIcons.OPEN.getSmallIcon());
-        selectDocument.setToolTipText(Localization.lang("Select Writer document"));
-        selectDocument.setPreferredSize(new Dimension(24, 24));
-        update = new JButton(IconTheme.JabRefIcons.REFRESH.getSmallIcon());
-        update.setToolTipText(Localization.lang("Sync OpenOffice/LibreOffice bibliography"));
-        update.setPreferredSize(new Dimension(24, 24));
-        preferences = Globals.prefs.getOpenOfficePreferences();
-        loader = new StyleLoader(preferences,
-                Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader),
-                Globals.prefs.getDefaultEncoding());
-
-        this.frame = jabRefFrame;
         initPanel();
-        dialogService = frame.getDialogService();
     }
 
-    public JPanel getContent() {
-        return content;
+    public Node getContent() {
+        return vbox;
     }
 
     private void initPanel() {
 
-        connect.addActionListener(e -> connectAutomatically());
-        manualConnect.addActionListener(e -> connectManually());
+        connect.setOnAction(e -> connectAutomatically());
+        manualConnect.setOnAction(e -> connectManually());
 
-        selectDocument.setToolTipText(Localization.lang("Select which open Writer document to work on"));
-        selectDocument.addActionListener(e -> {
+        selectDocument.setTooltip(new Tooltip(Localization.lang("Select which open Writer document to work on")));
+        selectDocument.setOnAction(e -> {
 
             try {
                 ooBase.selectDocument();
-                frame.output(Localization.lang("Connected to document") + ": "
-                        + ooBase.getCurrentDocumentTitle().orElse(""));
+                dialogService.notify(Localization.lang("Connected to document") + ": "
+                                     + ooBase.getCurrentDocumentTitle().orElse(""));
             } catch (UnknownPropertyException | WrappedTargetException | IndexOutOfBoundsException |
-                    NoSuchElementException | NoDocumentException ex) {
+                     NoSuchElementException | NoDocumentException ex) {
                 LOGGER.warn("Problem connecting", ex);
                 dialogService.showErrorDialogAndWait(ex);
             }
 
         });
 
-        setStyleFile.addActionListener(event -> {
+        setStyleFile.setMaxWidth(Double.MAX_VALUE);
+        setStyleFile.setOnAction(event -> {
 
-            if (styleDialog == null) {
-                styleDialog = new StyleSelectDialog(frame, preferences, loader);
-            }
-            styleDialog.setVisible(true);
-            styleDialog.getStyle().ifPresent(selectedStyle -> {
+            StyleSelectDialogView styleDialog = new StyleSelectDialogView(loader);
+            styleDialog.showAndWait().ifPresent(selectedStyle -> {
                 style = selectedStyle;
                 try {
                     style.ensureUpToDate();
                 } catch (IOException e) {
                     LOGGER.warn("Unable to reload style file '" + style.getPath() + "'", e);
                 }
-                frame.setStatus(Localization.lang("Current style is '%0'", style.getName()));
+                dialogService.notify(Localization.lang("Current style is '%0'", style.getName()));
             });
 
         });
 
-        pushEntries.setToolTipText(Localization.lang("Cite selected entries between parenthesis"));
-        pushEntries.addActionListener(e -> pushEntries(true, true, false));
-        pushEntriesInt.setToolTipText(Localization.lang("Cite selected entries with in-text citation"));
-        pushEntriesInt.addActionListener(e -> pushEntries(false, true, false));
-        pushEntriesEmpty.setToolTipText(
-                Localization.lang("Insert a citation without text (the entry will appear in the reference list)"));
-        pushEntriesEmpty.addActionListener(e -> pushEntries(false, false, false));
-        pushEntriesAdvanced.setToolTipText(Localization.lang("Cite selected entries with extra information"));
-        pushEntriesAdvanced.addActionListener(e -> pushEntries(false, true, true));
-
-        update.setToolTipText(Localization.lang("Ensure that the bibliography is up-to-date"));
-        Action updateAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                try {
-                    if (style == null) {
-                        style = loader.getUsedStyle();
-                    } else {
-                        style.ensureUpToDate();
-                    }
+        pushEntries.setTooltip(new Tooltip(Localization.lang("Cite selected entries between parenthesis")));
+        pushEntries.setOnAction(e -> pushEntries(true, true, false));
+        pushEntries.setMaxWidth(Double.MAX_VALUE);
+        pushEntriesInt.setTooltip(new Tooltip(Localization.lang("Cite selected entries with in-text citation")));
+        pushEntriesInt.setOnAction(e -> pushEntries(false, true, false));
+        pushEntriesInt.setMaxWidth(Double.MAX_VALUE);
+        pushEntriesEmpty.setTooltip(new Tooltip(Localization.lang("Insert a citation without text (the entry will appear in the reference list)")));
+        pushEntriesEmpty.setOnAction(e -> pushEntries(false, false, false));
+        pushEntriesEmpty.setMaxWidth(Double.MAX_VALUE);
+        pushEntriesAdvanced.setTooltip(new Tooltip(Localization.lang("Cite selected entries with extra information")));
+        pushEntriesAdvanced.setOnAction(e -> pushEntries(false, true, true));
+        pushEntriesAdvanced.setMaxWidth(Double.MAX_VALUE);
+
+        update.setTooltip(new Tooltip(Localization.lang("Ensure that the bibliography is up-to-date")));
+
+        update.setOnAction(event -> {
+            try {
+                if (style == null) {
+                    style = loader.getUsedStyle();
+                } else {
+                    style.ensureUpToDate();
+                }
 
-                    ooBase.updateSortedReferenceMarks();
+                ooBase.updateSortedReferenceMarks();
 
-                    List<BibDatabase> databases = getBaseList();
-                    List<String> unresolvedKeys = ooBase.refreshCiteMarkers(databases, style);
-                    ooBase.rebuildBibTextSection(databases, style);
-                    if (!unresolvedKeys.isEmpty()) {
-                        dialogService.showErrorDialogAndWait(Localization.lang("Unable to synchronize bibliography"),
-                                Localization.lang("Your OpenOffice/LibreOffice document references the BibTeX key '%0', which could not be found in your current library.",
-                                        unresolvedKeys.get(0)));
+                List<BibDatabase> databases = getBaseList();
+                List<String> unresolvedKeys = ooBase.refreshCiteMarkers(databases, style);
+                ooBase.rebuildBibTextSection(databases, style);
+                if (!unresolvedKeys.isEmpty()) {
+                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to synchronize bibliography"),
+                                                         Localization.lang("Your OpenOffice/LibreOffice document references the BibTeX key '%0', which could not be found in your current library.",
+                                                                           unresolvedKeys.get(0)));
 
-                    }
-                } catch (UndefinedCharacterFormatException ex) {
-                    reportUndefinedCharacterFormat(ex);
-                } catch (UndefinedParagraphFormatException ex) {
-                    reportUndefinedParagraphFormat(ex);
-                } catch (ConnectionLostException ex) {
-                    showConnectionLostErrorMessage();
-                } catch (IOException ex) {
-                    LOGGER.warn("Problem with style file", ex);
-                    dialogService.showErrorDialogAndWait(Localization.lang("No valid style file defined"),
-                            Localization.lang("You must select either a valid style file, or use one of the default styles."));
-
-                } catch (BibEntryNotFoundException ex) {
-                    LOGGER.debug("BibEntry not found", ex);
-                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to synchronize bibliography"), Localization.lang(
-                            "Your OpenOffice/LibreOffice document references the BibTeX key '%0', which could not be found in your current library.",
-                            ex.getBibtexKey()));
-
-                } catch (com.sun.star.lang.IllegalArgumentException | PropertyVetoException | UnknownPropertyException | WrappedTargetException | NoSuchElementException |
-                        CreationException ex) {
-                    LOGGER.warn("Could not update bibliography", ex);
                 }
+            } catch (UndefinedCharacterFormatException ex) {
+                reportUndefinedCharacterFormat(ex);
+            } catch (UndefinedParagraphFormatException ex) {
+                reportUndefinedParagraphFormat(ex);
+            } catch (ConnectionLostException ex) {
+                showConnectionLostErrorMessage();
+            } catch (IOException ex) {
+                LOGGER.warn("Problem with style file", ex);
+                dialogService.showErrorDialogAndWait(Localization.lang("No valid style file defined"),
+                                                     Localization.lang("You must select either a valid style file, or use one of the default styles."));
+
+            } catch (BibEntryNotFoundException ex) {
+                LOGGER.debug("BibEntry not found", ex);
+                dialogService.showErrorDialogAndWait(Localization.lang("Unable to synchronize bibliography"), Localization.lang(
+                                                                                                                                "Your OpenOffice/LibreOffice document references the BibTeX key '%0', which could not be found in your current library.",
+                                                                                                                                ex.getBibtexKey()));
+
+            } catch (com.sun.star.lang.IllegalArgumentException | PropertyVetoException | UnknownPropertyException | WrappedTargetException | NoSuchElementException |
+                     CreationException ex) {
+                LOGGER.warn("Could not update bibliography", ex);
             }
-        };
-        update.addActionListener(updateAction);
 
-        merge.setToolTipText(Localization.lang("Combine pairs of citations that are separated by spaces only"));
-        merge.addActionListener(e -> {
+        });
+
+        merge.setMaxWidth(Double.MAX_VALUE);
+        merge.setTooltip(new Tooltip(Localization.lang("Combine pairs of citations that are separated by spaces only")));
+        merge.setOnAction(e -> {
             try {
                 ooBase.combineCiteMarkers(getBaseList(), style);
             } catch (UndefinedCharacterFormatException ex) {
                 reportUndefinedCharacterFormat(ex);
             } catch (com.sun.star.lang.IllegalArgumentException | UnknownPropertyException | PropertyVetoException |
-                    CreationException | NoSuchElementException | WrappedTargetException | IOException |
-                    BibEntryNotFoundException ex) {
+                     CreationException | NoSuchElementException | WrappedTargetException | IOException |
+                     BibEntryNotFoundException ex) {
                 LOGGER.warn("Problem combining cite markers", ex);
             }
 
         });
-        settingsB.addActionListener(e -> showSettingsPopup());
-        manageCitations.addActionListener(e -> {
-            try {
-                CitationManager cm = new CitationManager(ooBase, dialogService);
-                cm.showDialog();
-            } catch (NoSuchElementException | WrappedTargetException | UnknownPropertyException ex) {
-                LOGGER.warn("Problem showing citation manager", ex);
-            }
+        ContextMenu settingsMenu = createSettingsPopup();
+        settingsB.setMaxWidth(Double.MAX_VALUE);
+        settingsB.setContextMenu(settingsMenu);
+        settingsB.setOnAction(e -> settingsMenu.show(settingsB, Side.BOTTOM, 0, 0));
+        manageCitations.setMaxWidth(Double.MAX_VALUE);
+        manageCitations.setOnAction(e -> {
+            ManageCitationsDialogView dlg = new ManageCitationsDialogView(ooBase);
+            dlg.showAndWait();
         });
 
-        exportCitations.addActionListener(event -> exportEntries());
-
-        selectDocument.setEnabled(false);
-        pushEntries.setEnabled(false);
-        pushEntriesInt.setEnabled(false);
-        pushEntriesEmpty.setEnabled(false);
-        pushEntriesAdvanced.setEnabled(false);
-        update.setEnabled(false);
-        merge.setEnabled(false);
-        manageCitations.setEnabled(false);
-        exportCitations.setEnabled(false);
-        diag = new JDialog((JFrame) null, "OpenOffice/LibreOffice panel", false);
-
-        FormBuilder mainBuilder = FormBuilder.create()
-                .layout(new FormLayout("fill:pref:grow", "p,p,p,p,p,p,p,p,p,p,p"));
-
-        FormBuilder topRowBuilder = FormBuilder.create()
-                .layout(new FormLayout(
-                        "fill:pref:grow, 1dlu, fill:pref:grow, 1dlu, fill:pref:grow, 1dlu, fill:pref:grow, 1dlu, fill:pref",
-                        "pref"));
-        topRowBuilder.add(connect).xy(1, 1);
-        topRowBuilder.add(manualConnect).xy(3, 1);
-        topRowBuilder.add(selectDocument).xy(5, 1);
-        topRowBuilder.add(update).xy(7, 1);
-        topRowBuilder.add(help).xy(9, 1);
-        mainBuilder.add(topRowBuilder.getPanel()).xy(1, 1);
-        mainBuilder.add(setStyleFile).xy(1, 2);
-        mainBuilder.add(pushEntries).xy(1, 3);
-        mainBuilder.add(pushEntriesInt).xy(1, 4);
-        mainBuilder.add(pushEntriesAdvanced).xy(1, 5);
-        mainBuilder.add(pushEntriesEmpty).xy(1, 6);
-        mainBuilder.add(merge).xy(1, 7);
-        mainBuilder.add(manageCitations).xy(1, 8);
-        mainBuilder.add(exportCitations).xy(1, 9);
-        mainBuilder.add(settingsB).xy(1, 10);
-
-        content = new JPanel();
-        content.setLayout(new BorderLayout());
-        content.add(mainBuilder.getPanel(), BorderLayout.CENTER);
-
-        /*
-        frame.getTabbedPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-                .put(Globals.getKeyPrefs().getKey(KeyBinding.REFRESH_OO), "Refresh OO");
-        frame.getTabbedPane().getActionMap().put("Refresh OO", updateAction);
-        */
-
+        exportCitations.setMaxWidth(Double.MAX_VALUE);
+        exportCitations.setOnAction(event -> exportEntries());
+
+        selectDocument.setDisable(true);
+        pushEntries.setDisable(true);
+        pushEntriesInt.setDisable(true);
+        pushEntriesEmpty.setDisable(true);
+        pushEntriesAdvanced.setDisable(true);
+        update.setDisable(true);
+        merge.setDisable(true);
+        manageCitations.setDisable(true);
+        exportCitations.setDisable(true);
+
+        HBox hbox = new HBox();
+        hbox.getChildren().addAll(connect, manualConnect, selectDocument, update, help);
+        hbox.getChildren().forEach(btn -> hbox.setHgrow(btn, Priority.ALWAYS));
+
+        vbox.setFillWidth(true);
+        vbox.getChildren().addAll(hbox, setStyleFile, pushEntries, pushEntriesInt, pushEntriesAdvanced, pushEntriesEmpty, merge, manageCitations, exportCitations, settingsB);
     }
 
     private void exportEntries() {
@@ -321,25 +298,24 @@ private void exportEntries() {
             if (!unresolvedKeys.isEmpty()) {
 
                 dialogService.showErrorDialogAndWait(Localization.lang("Unable to generate new library"),
-                        Localization.lang("Your OpenOffice/LibreOffice document references the BibTeX key '%0', which could not be found in your current library.",
-                                unresolvedKeys.get(0)));
+                                                     Localization.lang("Your OpenOffice/LibreOffice document references the BibTeX key '%0', which could not be found in your current library.",
+                                                                       unresolvedKeys.get(0)));
 
             }
 
-            Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode());
-
+            Defaults defaults = new Defaults(jabRefPreferences.getDefaultBibDatabaseMode());
             BibDatabaseContext databaseContext = new BibDatabaseContext(newDatabase, defaults);
             this.frame.addTab(databaseContext, true);
 
         } catch (BibEntryNotFoundException ex) {
             LOGGER.debug("BibEntry not found", ex);
             dialogService.showErrorDialogAndWait(Localization.lang("Unable to synchronize bibliography"),
-                    Localization.lang("Your OpenOffice/LibreOffice document references the BibTeX key '%0', which could not be found in your current library.",
-                            ex.getBibtexKey()));
+                                                 Localization.lang("Your OpenOffice/LibreOffice document references the BibTeX key '%0', which could not be found in your current library.",
+                                                                   ex.getBibtexKey()));
 
         } catch (com.sun.star.lang.IllegalArgumentException | UnknownPropertyException | PropertyVetoException |
-                UndefinedCharacterFormatException | NoSuchElementException | WrappedTargetException | IOException |
-                CreationException e) {
+                 UndefinedCharacterFormatException | NoSuchElementException | WrappedTargetException | IOException |
+                 CreationException e) {
             LOGGER.warn("Problem generating new database.", e);
         }
 
@@ -347,7 +323,7 @@ private void exportEntries() {
 
     private List<BibDatabase> getBaseList() {
         List<BibDatabase> databases = new ArrayList<>();
-        if (preferences.getUseAllDatabases()) {
+        if (ooPrefs.getUseAllDatabases()) {
             for (BasePanel basePanel : frame.getBasePanelList()) {
                 databases.add(basePanel.getDatabase());
             }
@@ -359,102 +335,103 @@ private List<BibDatabase> getBaseList() {
     }
 
     private void connectAutomatically() {
-        BackgroundTask
-                .wrap(() -> {
-                    DetectOpenOfficeInstallation officeInstallation = new DetectOpenOfficeInstallation(diag, preferences, dialogService);
+        DetectOpenOfficeInstallation officeInstallation = new DetectOpenOfficeInstallation(jabRefPreferences, dialogService);
+
+        if (officeInstallation.isExecutablePathDefined()) {
+            connect();
+        } else {
 
-                    Boolean installed = officeInstallation.isInstalled().get();
-                    if (installed == null || !installed) {
+            Task<Void> taskConnectIfInstalled = new Task<Void>() {
+
+                @Override
+                protected Void call() throws Exception {
+                    updateProgress(ProgressBar.INDETERMINATE_PROGRESS, ProgressBar.INDETERMINATE_PROGRESS);
+
+                    boolean installed = officeInstallation.isInstalled();
+                    if (!installed) {
                         throw new IllegalStateException("OpenOffice Installation could not be detected.");
                     }
                     return null; // can not use BackgroundTask.wrap(Runnable) because Runnable.run() can't throw exceptions
-                })
-                .onSuccess(x -> connect())
-                .onFailure(ex ->
-                        dialogService.showErrorDialogAndWait(Localization.lang("Autodetection failed"), Localization.lang("Autodetection failed"), ex))
-                .executeWith(Globals.TASK_EXECUTOR);
-    }
+                }
+            };
 
-    private void connectManually() {
-        showManualConnectionDialog();
-        if (!dialogOkPressed) {
-            return;
+            taskConnectIfInstalled.setOnSucceeded(value -> connect());
+            taskConnectIfInstalled.setOnFailed(value -> dialogService.showErrorDialogAndWait(Localization.lang("Autodetection failed"), Localization.lang("Autodetection failed"), taskConnectIfInstalled.getException()));
+
+            dialogService.showProgressDialogAndWait(Localization.lang("Autodetecting paths..."), Localization.lang("Autodetecting paths..."), taskConnectIfInstalled);
+            taskExecutor.execute(taskConnectIfInstalled);
         }
+    }
 
-        connect();
+    private void connectManually() {
+        showManualConnectionDialog().ifPresent(ok -> connect());
     }
 
     private void connect() {
-        JDialog progressDialog = null;
+        ooPrefs = jabRefPreferences.getOpenOfficePreferences();
 
-        try {
-            // Add OO JARs to the classpath
-            loadOpenOfficeJars(Paths.get(preferences.getInstallationPath()));
-
-            // Show progress dialog:
-            progressDialog = new DetectOpenOfficeInstallation(diag, preferences, dialogService)
-                    .showProgressDialog(diag, Localization.lang("Connecting"), Localization.lang("Please wait..."));
-            JDialog finalProgressDialog = progressDialog;
-            BackgroundTask
-                    .wrap(this::createBibBase)
-                    .onFinished(() -> SwingUtilities.invokeLater(() -> {
-                        finalProgressDialog.dispose();
-                        diag.dispose();
-                    }))
-                    .onSuccess(ooBase -> {
-                        this.ooBase = ooBase;
-
-                        if (ooBase.isConnectedToDocument()) {
-                            frame.output(Localization.lang("Connected to document") + ": " + ooBase.getCurrentDocumentTitle().orElse(""));
-                        }
-
-                        // Enable actions that depend on Connect:
-                        selectDocument.setEnabled(true);
-                        pushEntries.setEnabled(true);
-                        pushEntriesInt.setEnabled(true);
-                        pushEntriesEmpty.setEnabled(true);
-                        pushEntriesAdvanced.setEnabled(true);
-                        update.setEnabled(true);
-                        merge.setEnabled(true);
-                        manageCitations.setEnabled(true);
-                        exportCitations.setEnabled(true);
-
-                    })
-                    .onFailure(ex ->
-                            dialogService.showErrorDialogAndWait(Localization.lang("Autodetection failed"), Localization.lang("Autodetection failed"), ex))
-                    .executeWith(Globals.TASK_EXECUTOR);
-            diag.dispose();
-
-        } catch (UnsatisfiedLinkError e) {
-            LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", e);
-
-            DefaultTaskExecutor.runInJavaFXThread(() ->
-                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to connect. One possible reason is that JabRef "
-                            + "and OpenOffice/LibreOffice are not both running in either 32 bit mode or 64 bit mode.")));
-
-        } catch (IOException e) {
-            LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", e);
-
-            DefaultTaskExecutor.runInJavaFXThread(() ->
-                    dialogService.showErrorDialogAndWait(Localization.lang("Could not connect to running OpenOffice/LibreOffice."),
-                            Localization.lang("Could not connect to running OpenOffice/LibreOffice.") + "\n"
-                                    + Localization.lang("Make sure you have installed OpenOffice/LibreOffice with Java support.") + "\n"
-                                    + Localization.lang("If connecting manually, please verify program and library paths.")
-                                    + "\n" + "\n" + Localization.lang("Error message:"),
-                            e));
-
-        } finally {
-            if (progressDialog != null) {
-                progressDialog.dispose();
+        Task<OOBibBase> connectTask = new Task<OOBibBase>() {
+
+            @Override
+            protected OOBibBase call() throws Exception {
+                updateProgress(ProgressBar.INDETERMINATE_PROGRESS, ProgressBar.INDETERMINATE_PROGRESS);
+                loadOpenOfficeJars(Paths.get(ooPrefs.getInstallationPath()));
+
+                return createBibBase();
             }
-        }
+        };
+
+        connectTask.setOnSucceeded(value -> {
+            ooBase = connectTask.getValue();
+
+            if (ooBase.isConnectedToDocument()) {
+                dialogService.notify(Localization.lang("Connected to document") + ": " + ooBase.getCurrentDocumentTitle().orElse(""));
+            }
+
+            // Enable actions that depend on Connect:
+            selectDocument.setDisable(false);
+            pushEntries.setDisable(false);
+            pushEntriesInt.setDisable(false);
+            pushEntriesEmpty.setDisable(false);
+            pushEntriesAdvanced.setDisable(false);
+            update.setDisable(false);
+            merge.setDisable(false);
+            manageCitations.setDisable(false);
+            exportCitations.setDisable(false);
+
+        });
+        connectTask.setOnFailed(value -> {
+            Throwable ex = connectTask.getException();
+            if (ex instanceof UnsatisfiedLinkError) {
+                LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", ex);
+
+                dialogService.showErrorDialogAndWait(Localization.lang("Unable to connect. One possible reason is that JabRef "
+                                                                       + "and OpenOffice/LibreOffice are not both running in either 32 bit mode or 64 bit mode."));
+
+            } else if (ex instanceof IOException) {
+                LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", ex);
+
+                dialogService.showErrorDialogAndWait(Localization.lang("Could not connect to running OpenOffice/LibreOffice."),
+                                                     Localization.lang("Could not connect to running OpenOffice/LibreOffice.")
+                                                                                                                                + "\n"
+                                                                                                                                + Localization.lang("Make sure you have installed OpenOffice/LibreOffice with Java support.") + "\n"
+                                                                                                                                + Localization.lang("If connecting manually, please verify program and library paths.") + "\n" + "\n" + Localization.lang("Error message:"),
+                                                     ex);
+            } else {
+                dialogService.showErrorDialogAndWait(Localization.lang("Autodetection failed"), Localization.lang("Autodetection failed"), ex);
+            }
+        });
+
+        dialogService.showProgressDialogAndWait(Localization.lang("Autodetecting paths..."), Localization.lang("Autodetecting paths..."), connectTask);
+        taskExecutor.execute(connectTask);
+
     }
 
     private void loadOpenOfficeJars(Path configurationPath) throws IOException {
         List<Optional<Path>> filePaths = OpenOfficePreferences.OO_JARS.stream().map(jar -> FileUtil.find(jar, configurationPath)).collect(Collectors.toList());
 
         if (!filePaths.stream().allMatch(Optional::isPresent)) {
-            throw new IOException("(Not all) required Open Office Jars were found inside installation path.");
+            throw new IOException("(Not all) required Open Office Jars were found inside installation path. Searched for " + OpenOfficePreferences.OO_JARS + " in " + configurationPath);
         }
 
         List<URL> jarURLs = new ArrayList<>(OpenOfficePreferences.OO_JARS.size());
@@ -465,10 +442,10 @@ private void loadOpenOfficeJars(Path configurationPath) throws IOException {
     }
 
     private OOBibBase createBibBase() throws IOException, InvocationTargetException, IllegalAccessException,
-            WrappedTargetException, BootstrapException, UnknownPropertyException, NoDocumentException,
-            NoSuchElementException, CreationException {
+        WrappedTargetException, BootstrapException, UnknownPropertyException, NoDocumentException,
+        NoSuchElementException, CreationException {
         // Connect
-        return new OOBibBase(preferences.getExecutablePath(), true);
+        return new OOBibBase(ooPrefs.getExecutablePath(), true);
     }
 
     private static void addURL(List<URL> jarList) throws IOException {
@@ -481,119 +458,39 @@ private static void addURL(List<URL> jarList) throws IOException {
                 method.invoke(sysloader, anU);
             }
         } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException |
-                InvocationTargetException e) {
+                 InvocationTargetException e) {
             LOGGER.error("Could not add URL to system classloader", e);
+            sysloader.close();
             throw new IOException("Error, could not add URL to system classloader", e);
 
         }
     }
 
-    private void showManualConnectionDialog() {
-        dialogOkPressed = false;
-        final JDialog cDiag = new JDialog((JFrame) null, Localization.lang("Set connection parameters"), true);
-        final NativeDesktop nativeDesktop = JabRefDesktop.getNativeDesktop();
-
-        final DialogService dialogService = this.dialogService;
-        DirectoryDialogConfiguration dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(nativeDesktop.getApplicationDirectory())
-                .build();
-
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(nativeDesktop.getApplicationDirectory())
-                .build();
-
-        // Path fields
-        final JTextField ooPath = new JTextField(30);
-        JButton browseOOPath = new JButton(Localization.lang("Browse"));
-        ooPath.setText(preferences.getInstallationPath());
-        browseOOPath.addActionListener(e -> DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showDirectorySelectionDialog(dirDialogConfiguration))
-                .ifPresent(f -> ooPath.setText(f.toAbsolutePath().toString())));
-
-        final JTextField ooExec = new JTextField(30);
-        JButton browseOOExec = new JButton(Localization.lang("Browse"));
-        ooExec.setText(preferences.getExecutablePath());
-        browseOOExec.addActionListener(e -> DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showFileOpenDialog(fileDialogConfiguration))
-                .ifPresent(f -> ooExec.setText(f.toAbsolutePath().toString())));
-
-        final JTextField ooJars = new JTextField(30);
-        ooJars.setText(preferences.getJarsPath());
-        JButton browseOOJars = new JButton(Localization.lang("Browse"));
-        browseOOJars.addActionListener(e -> DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showDirectorySelectionDialog(dirDialogConfiguration))
-                .ifPresent(f -> ooJars.setText(f.toAbsolutePath().toString())));
-
-        FormBuilder builder = FormBuilder.create()
-                .layout(new FormLayout("left:pref, 4dlu, fill:pref:grow, 4dlu, fill:pref", "pref"));
-
-        if (OS.WINDOWS || OS.OS_X) {
-            builder.add(Localization.lang("Path to OpenOffice/LibreOffice directory")).xy(1, 1);
-            builder.add(ooPath).xy(3, 1);
-            builder.add(browseOOPath).xy(5, 1);
-        } else {
-            builder.add(Localization.lang("Path to OpenOffice/LibreOffice executable")).xy(1, 1);
-            builder.add(ooExec).xy(3, 1);
-            builder.add(browseOOExec).xy(5, 1);
-
-            builder.appendRows("4dlu, pref");
-            builder.add(Localization.lang("Path to OpenOffice/LibreOffice library dir")).xy(1, 3);
-            builder.add(ooJars).xy(3, 3);
-            builder.add(browseOOJars).xy(5, 3);
-        }
-        builder.padding("5dlu, 5dlu, 5dlu, 5dlu");
-
-        cDiag.getContentPane().add(builder.getPanel(), BorderLayout.CENTER);
-
-        // Buttons
-        JButton ok = new JButton(Localization.lang("OK"));
-        JButton cancel = new JButton(Localization.lang("Cancel"));
-
-        ok.addActionListener(e -> {
-            if (OS.WINDOWS || OS.OS_X) {
-                preferences.updateConnectionParams(ooPath.getText(), ooPath.getText(), ooPath.getText());
-            } else {
-                preferences.updateConnectionParams(ooPath.getText(), ooExec.getText(), ooJars.getText());
-            }
-            dialogOkPressed = true;
-            cDiag.dispose();
-        });
-        cancel.addActionListener(e -> cDiag.dispose());
-
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-        bb.addRelatedGap();
-        bb.addButton(ok);
-        bb.addButton(cancel);
-        bb.addGlue();
-        bb.padding("5dlu, 5dlu, 5dlu, 5dlu");
-        cDiag.getContentPane().add(bb.getPanel(), BorderLayout.SOUTH);
-
-        // Finish and show dirDialog
-        cDiag.pack();
-        cDiag.setVisible(true);
+    private Optional<Boolean> showManualConnectionDialog() {
+        return new ManualConnectDialogView(dialogService).showAndWait();
     }
 
     private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addPageInfo) {
         if (!ooBase.isConnectedToDocument()) {
-
-            DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(
-                    Localization.lang("Error pushing entries"), Localization.lang("Not connected to any Writer document. Please"
-                            + " make sure a document is open, and use the 'Select Writer document' button to connect to it.")));
-
+            dialogService.showErrorDialogAndWait(Localization.lang("Error pushing entries"), Localization.lang("Not connected to any Writer document. Please" + " make sure a document is open, and use the 'Select Writer document' button to connect to it."));
             return;
         }
 
         Boolean inParenthesis = inParenthesisIn;
         String pageInfo = null;
         if (addPageInfo) {
-            AdvancedCiteDialog citeDialog = new AdvancedCiteDialog(frame);
-            citeDialog.showDialog();
-            if (citeDialog.canceled()) {
-                return;
-            }
-            if (!citeDialog.getPageInfo().isEmpty()) {
-                pageInfo = citeDialog.getPageInfo();
-            }
-            inParenthesis = citeDialog.isInParenthesisCite();
 
+            AdvancedCiteDialogView citeDialog = new AdvancedCiteDialogView();
+            Optional<AdvancedCiteDialogViewModel> citeDialogViewModel = citeDialog.showAndWait();
+
+            if (citeDialogViewModel.isPresent()) {
+
+                AdvancedCiteDialogViewModel model = citeDialogViewModel.get();
+                if (!model.pageInfoProperty().getValue().isEmpty()) {
+                    pageInfo = model.pageInfoProperty().getValue();
+                }
+                inParenthesis = model.citeInParProperty().getValue();
+            }
         }
 
         BasePanel panel = frame.getCurrentBasePanel();
@@ -607,12 +504,12 @@ private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addP
                         style = loader.getUsedStyle();
                     }
                     ooBase.insertEntry(entries, database, getBaseList(), style, inParenthesis, withText, pageInfo,
-                            preferences.getSyncWhenCiting());
+                                       ooPrefs.getSyncWhenCiting());
                 } catch (FileNotFoundException ex) {
 
-                    DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(
-                            Localization.lang("No valid style file defined"),
-                            Localization.lang("You must select either a valid style file, or use one of the default styles.")));
+                    dialogService.showErrorDialogAndWait(
+                                                         Localization.lang("No valid style file defined"),
+                                                         Localization.lang("You must select either a valid style file, or use one of the default styles."));
 
                     LOGGER.warn("Problem with style file", ex);
                 } catch (ConnectionLostException ex) {
@@ -622,9 +519,9 @@ private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addP
                 } catch (UndefinedParagraphFormatException ex) {
                     reportUndefinedParagraphFormat(ex);
                 } catch (com.sun.star.lang.IllegalArgumentException | UnknownPropertyException | PropertyVetoException |
-                        CreationException | NoSuchElementException | WrappedTargetException | IOException |
-                        BibEntryNotFoundException | IllegalTypeException | PropertyExistException |
-                        NotRemoveableException ex) {
+                         CreationException | NoSuchElementException | WrappedTargetException | IOException |
+                         BibEntryNotFoundException | IllegalTypeException | PropertyExistException |
+                         NotRemoveableException ex) {
                     LOGGER.warn("Could not insert entry", ex);
                 }
             }
@@ -657,21 +554,21 @@ private boolean checkThatEntriesHaveKeys(List<BibEntry> entries) {
 
         // Ask if keys should be generated
         boolean citePressed = dialogService.showConfirmationDialogAndWait(Localization.lang("Cite"),
-                Localization.lang("Cannot cite entries without BibTeX keys. Generate keys now?"),
-                Localization.lang("Generate keys"),
-                Localization.lang("Cancel"));
+                                                                          Localization.lang("Cannot cite entries without BibTeX keys. Generate keys now?"),
+                                                                          Localization.lang("Generate keys"),
+                                                                          Localization.lang("Cancel"));
 
         BasePanel panel = frame.getCurrentBasePanel();
         if (citePressed && (panel != null)) {
             // Generate keys
-            BibtexKeyPatternPreferences prefs = Globals.prefs.getBibtexKeyPatternPreferences();
+            BibtexKeyPatternPreferences prefs = jabRefPreferences.getBibtexKeyPatternPreferences();
             NamedCompound undoCompound = new NamedCompound(Localization.lang("Cite"));
             for (BibEntry entry : entries) {
                 if (!entry.getCiteKeyOptional().isPresent()) {
                     // Generate key
                     new BibtexKeyGenerator(panel.getBibDatabaseContext(), prefs)
-                            .generateAndSetKey(entry)
-                            .ifPresent(change -> undoCompound.addEdit(new UndoableKeyChange(change)));
+                                                                                .generateAndSetKey(entry)
+                                                                                .ifPresent(change -> undoCompound.addEdit(new UndoableKeyChange(change)));
                 }
             }
             undoCompound.end();
@@ -686,77 +583,70 @@ private boolean checkThatEntriesHaveKeys(List<BibEntry> entries) {
     }
 
     private void showConnectionLostErrorMessage() {
-        DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Connection lost"),
-                Localization.lang("Connection to OpenOffice/LibreOffice has been lost. "
-                        + "Please make sure OpenOffice/LibreOffice is running, and try to reconnect.")));
+        dialogService.showErrorDialogAndWait(Localization.lang("Connection lost"),
+                                             Localization.lang("Connection to OpenOffice/LibreOffice has been lost. " + "Please make sure OpenOffice/LibreOffice is running, and try to reconnect."));
 
     }
 
     private void reportUndefinedParagraphFormat(UndefinedParagraphFormatException ex) {
-        DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Undefined paragraph format"),
-                Localization.lang("Your style file specifies the paragraph format '%0', "
-                        + "which is undefined in your current OpenOffice/LibreOffice document.",
-                        ex.getFormatName())
-                        + "\n" +
-                        Localization.lang("The paragraph format is controlled by the property 'ReferenceParagraphFormat' or 'ReferenceHeaderParagraphFormat' in the style file.")));
+        dialogService.showErrorDialogAndWait(Localization.lang("Undefined paragraph format"),
+                                             Localization.lang("Your style file specifies the paragraph format '%0', "
+                                                               + "which is undefined in your current OpenOffice/LibreOffice document.",
+                                                               ex.getFormatName()) + "\n" + Localization.lang("The paragraph format is controlled by the property 'ReferenceParagraphFormat' or 'ReferenceHeaderParagraphFormat' in the style file."));
 
     }
 
     private void reportUndefinedCharacterFormat(UndefinedCharacterFormatException ex) {
-        DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Undefined character format"),
-                Localization.lang(
-                        "Your style file specifies the character format '%0', "
-                                + "which is undefined in your current OpenOffice/LibreOffice document.",
-                        ex.getFormatName())
-                        + "\n"
-                        + Localization.lang("The character format is controlled by the citation property 'CitationCharacterFormat' in the style file.")
-
-        ));
+        dialogService.showErrorDialogAndWait(Localization.lang("Undefined character format"),
+                                             Localization.lang("Your style file specifies the character format '%0', "
+                                                               + "which is undefined in your current OpenOffice/LibreOffice document.",
+                                                               ex.getFormatName()) + "\n" + Localization.lang("The character format is controlled by the citation property 'CitationCharacterFormat' in the style file.")
+
+        );
     }
 
-    private void showSettingsPopup() {
-        JPopupMenu menu = new JPopupMenu();
-        final JCheckBoxMenuItem autoSync = new JCheckBoxMenuItem(
-                Localization.lang("Automatically sync bibliography when inserting citations"),
-                preferences.getSyncWhenCiting());
-        final JRadioButtonMenuItem useActiveBase = new JRadioButtonMenuItem(
-                Localization.lang("Look up BibTeX entries in the active tab only"));
-        final JRadioButtonMenuItem useAllBases = new JRadioButtonMenuItem(
-                Localization.lang("Look up BibTeX entries in all open libraries"));
-        final JMenuItem clearConnectionSettings = new JMenuItem(Localization.lang("Clear connection settings"));
-
-        ButtonGroup lookupButtonGroup = new ButtonGroup();
-        lookupButtonGroup.add(useActiveBase);
-        lookupButtonGroup.add(useAllBases);
-        if (preferences.getUseAllDatabases()) {
+    private ContextMenu createSettingsPopup() {
+
+        ContextMenu contextMenu = new ContextMenu();
+
+        CheckMenuItem autoSync = new CheckMenuItem(Localization.lang("Automatically sync bibliography when inserting citations"));
+        autoSync.selectedProperty().set(ooPrefs.getSyncWhenCiting());
+
+        ToggleGroup toggleGroup = new ToggleGroup();
+        RadioMenuItem useActiveBase = new RadioMenuItem(Localization.lang("Look up BibTeX entries in the active tab only"));
+        RadioMenuItem useAllBases = new RadioMenuItem(Localization.lang("Look up BibTeX entries in all open libraries"));
+        useActiveBase.setToggleGroup(toggleGroup);
+        useAllBases.setToggleGroup(toggleGroup);
+
+        MenuItem clearConnectionSettings = new MenuItem(Localization.lang("Clear connection settings"));
+
+        if (ooPrefs.getUseAllDatabases()) {
             useAllBases.setSelected(true);
         } else {
             useActiveBase.setSelected(true);
         }
 
-        autoSync.addActionListener(e -> {
-            preferences.setSyncWhenCiting(autoSync.isSelected());
-            Globals.prefs.setOpenOfficePreferences(preferences);
+        autoSync.setOnAction(e -> {
+            ooPrefs.setSyncWhenCiting(autoSync.isSelected());
+            jabRefPreferences.setOpenOfficePreferences(ooPrefs);
         });
-        useAllBases.addActionListener(e -> {
-            preferences.setUseAllDatabases(useAllBases.isSelected());
-            Globals.prefs.setOpenOfficePreferences(preferences);
+        useAllBases.setOnAction(e -> {
+            ooPrefs.setUseAllDatabases(useAllBases.isSelected());
+            jabRefPreferences.setOpenOfficePreferences(ooPrefs);
         });
-        useActiveBase.addActionListener(e -> {
-            preferences.setUseAllDatabases(!useActiveBase.isSelected());
-            Globals.prefs.setOpenOfficePreferences(preferences);
+        useActiveBase.setOnAction(e -> {
+            ooPrefs.setUseAllDatabases(!useActiveBase.isSelected());
+            jabRefPreferences.setOpenOfficePreferences(ooPrefs);
         });
-        clearConnectionSettings.addActionListener(e -> {
-            preferences.clearConnectionSettings();
-            Globals.prefs.setOpenOfficePreferences(preferences);
+        clearConnectionSettings.setOnAction(e -> {
+            ooPrefs.clearConnectionSettings();
+            dialogService.notify(Localization.lang("Cleared connection settings"));
+            jabRefPreferences.setOpenOfficePreferences(ooPrefs);
         });
 
-        menu.add(autoSync);
-        menu.addSeparator();
-        menu.add(useActiveBase);
-        menu.add(useAllBases);
-        menu.addSeparator();
-        menu.add(clearConnectionSettings);
-        menu.show(settingsB, 0, settingsB.getHeight());
+        contextMenu.getItems().addAll(autoSync, new SeparatorMenuItem(), useActiveBase, useAllBases, new SeparatorMenuItem(), clearConnectionSettings);
+
+        return contextMenu;
+
     }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java
index c5e064715ce..d725a7d84c9 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.openoffice;
 
-import javax.swing.SwingUtilities;
-
-import javafx.embed.swing.SwingNode;
 import javafx.scene.Node;
 import javafx.scene.layout.Priority;
 
@@ -14,26 +11,31 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
+import org.jabref.preferences.JabRefPreferences;
 
 public class OpenOfficeSidePanel extends SidePaneComponent {
 
-    private OpenOfficePreferences preferences;
-    private JabRefFrame frame;
+    private final JabRefPreferences preferences;
+    private final JabRefFrame frame;
+    private final OpenOfficePreferences ooPrefs;
 
-    public OpenOfficeSidePanel(SidePaneManager sidePaneManager, OpenOfficePreferences preferences, JabRefFrame frame) {
+    public OpenOfficeSidePanel(SidePaneManager sidePaneManager, JabRefPreferences preferences, JabRefFrame frame) {
         super(sidePaneManager, IconTheme.JabRefIcons.FILE_OPENOFFICE, "OpenOffice/LibreOffice");
-        this.preferences = preferences;
         this.frame = frame;
+        this.preferences = preferences;
+        this.ooPrefs = preferences.getOpenOfficePreferences();
     }
 
     @Override
     public void beforeClosing() {
-        preferences.setShowPanel(false);
+        ooPrefs.setShowPanel(false);
+        preferences.setOpenOfficePreferences(ooPrefs);
     }
 
     @Override
     public void afterOpening() {
-        preferences.setShowPanel(true);
+        ooPrefs.setShowPanel(true);
+        preferences.setOpenOfficePreferences(ooPrefs);
     }
 
     @Override
@@ -48,9 +50,7 @@ public Action getToggleAction() {
 
     @Override
     protected Node createContentPane() {
-        SwingNode swingNode = new SwingNode();
-        SwingUtilities.invokeLater(() -> swingNode.setContent(new OpenOfficePanel(frame).getContent()));
-        return swingNode;
+        return new OpenOfficePanel(frame, preferences, ooPrefs, preferences.getKeyBindingRepository()).getContent();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml
new file mode 100644
index 00000000000..f994d348787
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml
@@ -0,0 +1,39 @@
+<?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.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.VBox?>
+
+<DialogPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="470.0" prefWidth="701.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.openoffice.StyleSelectDialogView">
+   <content>
+      <BorderPane>
+         <top>
+            <TableView fx:id="tvStyles" prefHeight="208.0" prefWidth="662.0" BorderPane.alignment="CENTER">
+              <columns>
+                <TableColumn fx:id="colName" minWidth="100.0" prefWidth="-1.0" text="%Name" />
+                <TableColumn fx:id="colJournals" minWidth="100.0" prefWidth="75.0" text="%Journals" />
+                  <TableColumn fx:id="colFile" minWidth="100.0" prefWidth="-1.0" text="%File" />
+                  <TableColumn fx:id="colDeleteIcon" minWidth="100.0" prefWidth="-1.0" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+         </top>
+         <right>
+            <Button fx:id="add" alignment="TOP_RIGHT" mnemonicParsing="false" onAction="#addStyleFile" text="%Add style file" BorderPane.alignment="CENTER" />
+         </right>
+         <bottom>
+            <VBox fx:id="vbox" prefHeight="84.0" prefWidth="665.0" BorderPane.alignment="CENTER" />
+         </bottom>
+      </BorderPane>
+   </content>
+      <buttonTypes>
+        <ButtonType fx:constant="CANCEL" />
+        <ButtonType fx:constant="OK" />
+      </buttonTypes>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
deleted file mode 100644
index 62317e1c8fd..00000000000
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
+++ /dev/null
@@ -1,538 +0,0 @@
-package org.jabref.gui.openoffice;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Objects;
-import java.util.Optional;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-import javax.swing.ListSelectionModel;
-import javax.swing.table.TableColumnModel;
-
-import javafx.embed.swing.JFXPanel;
-import javafx.scene.Scene;
-
-import org.jabref.Globals;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.PreviewPanel;
-import org.jabref.gui.customjfx.CustomJFXPanel;
-import org.jabref.gui.desktop.JabRefDesktop;
-import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.gui.util.WindowLocation;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.openoffice.OOBibStyle;
-import org.jabref.logic.openoffice.OpenOfficePreferences;
-import org.jabref.logic.openoffice.StyleLoader;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.logic.util.TestEntry;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.JabRefPreferences;
-
-import ca.odell.glazedlists.BasicEventList;
-import ca.odell.glazedlists.EventList;
-import ca.odell.glazedlists.SortedList;
-import ca.odell.glazedlists.event.ListEvent;
-import ca.odell.glazedlists.event.ListEventListener;
-import ca.odell.glazedlists.gui.TableFormat;
-import ca.odell.glazedlists.swing.DefaultEventSelectionModel;
-import ca.odell.glazedlists.swing.DefaultEventTableModel;
-import ca.odell.glazedlists.swing.GlazedListsSwing;
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.builder.FormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class produces a dialog box for choosing a style file.
- */
-class StyleSelectDialog {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(StyleSelectDialog.class);
-
-    private final JabRefFrame frame;
-    private final DialogService dialogService;
-    private EventList<OOBibStyle> styles;
-    private JDialog diag;
-    private JTable table;
-    private DefaultEventTableModel<OOBibStyle> tableModel;
-    private DefaultEventSelectionModel<OOBibStyle> selectionModel;
-    private final JPopupMenu popup = new JPopupMenu();
-    private final JMenuItem edit = new JMenuItem(Localization.lang("Edit"));
-    private final JMenuItem show = new JMenuItem(Localization.lang("View"));
-    private final JMenuItem remove = new JMenuItem(Localization.lang("Remove"));
-    private final JMenuItem reload = new JMenuItem(Localization.lang("Reload"));
-    private final JButton addButton = new JButton(IconTheme.JabRefIcons.ADD_NOBOX.getIcon());
-    private final JButton removeButton = new JButton(IconTheme.JabRefIcons.REMOVE_NOBOX.getIcon());
-    private PreviewPanel preview;
-    private ActionListener removeAction;
-
-    private final JButton ok = new JButton(Localization.lang("OK"));
-    private final JButton cancel = new JButton(Localization.lang("Cancel"));
-    private final BibEntry prevEntry;
-
-    private boolean okPressed;
-    private final StyleLoader loader;
-    private final OpenOfficePreferences preferences;
-
-    public StyleSelectDialog(JabRefFrame frame, OpenOfficePreferences preferences, StyleLoader loader) {
-        this.frame = Objects.requireNonNull(frame);
-        this.preferences = Objects.requireNonNull(preferences);
-        this.loader = Objects.requireNonNull(loader);
-        prevEntry = TestEntry.getTestEntry();
-        init();
-        dialogService = frame.getDialogService();
-    }
-
-    private void init() {
-        setupPopupMenu();
-
-        addButton.addActionListener(actionEvent -> {
-            AddFileDialog addDialog = new AddFileDialog();
-            addDialog.setDirectoryPath(preferences.getCurrentStyle());
-            addDialog.setVisible(true);
-            addDialog.getFileName().ifPresent(fileName -> {
-                if (loader.addStyleIfValid(fileName)) {
-                    preferences.setCurrentStyle(fileName);
-                }
-            });
-            updateStyles();
-        });
-        addButton.setToolTipText(Localization.lang("Add style file"));
-
-        removeButton.addActionListener(removeAction);
-        removeButton.setToolTipText(Localization.lang("Remove style"));
-
-        // Create a preview panel for previewing styles
-        // Must be done before creating the table to avoid NPEs
-        DefaultTaskExecutor.runInJavaFXThread(() -> {
-            preview = new PreviewPanel(null, new BibDatabaseContext(), Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService, ExternalFileTypes.getInstance());
-            // Use the test entry from the Preview settings tab in Preferences:
-            preview.setEntry(prevEntry);
-        });
-
-        setupTable();
-        updateStyles();
-
-        // Build dialog
-        diag = new JDialog((JFrame) null, Localization.lang("Select style"), true);
-
-        FormBuilder builder = FormBuilder.create();
-        builder.layout(new FormLayout("fill:pref:grow, 4dlu, left:pref, 4dlu, left:pref",
-                                      "pref, 4dlu, 100dlu:grow, 4dlu, pref, 4dlu, fill:100dlu"));
-        builder.add(Localization.lang("Select one of the available styles or add a style file from disk.")).xyw(1,
-                                                                                                                1,
-                                                                                                                5);
-        builder.add(new JScrollPane(table)).xyw(1, 3, 5);
-        builder.add(addButton).xy(3, 5);
-        builder.add(removeButton).xy(5, 5);
-        JFXPanel container = CustomJFXPanel.wrap(new Scene(preview));
-        builder.add(container).xyw(1, 7, 5);
-        builder.padding("5dlu, 5dlu, 5dlu, 5dlu");
-
-        diag.add(builder.getPanel(), BorderLayout.CENTER);
-
-        AbstractAction okListener = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                if ((table.getRowCount() == 0) || (table.getSelectedRowCount() == 0)) {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Style selection"),
-                                                         Localization.lang("You must select a valid style file."));
-                    return;
-                }
-                okPressed = true;
-                storeSettings();
-                diag.dispose();
-            }
-        };
-        ok.addActionListener(okListener);
-
-        Action cancelListener = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                diag.dispose();
-            }
-        };
-        cancel.addActionListener(cancelListener);
-
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-        bb.addButton(ok);
-        bb.addButton(cancel);
-        bb.addGlue();
-        bb.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        diag.add(bb.getPanel(), BorderLayout.SOUTH);
-
-        ActionMap am = bb.getPanel().getActionMap();
-        InputMap im = bb.getPanel().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", cancelListener);
-        im.put(KeyStroke.getKeyStroke("ENTER"), "enterOk");
-        am.put("enterOk", okListener);
-
-        diag.pack();
-
-        WindowLocation pw = new WindowLocation(diag, JabRefPreferences.STYLES_POS_X, JabRefPreferences.STYLES_POS_Y,
-                                               JabRefPreferences.STYLES_SIZE_X, JabRefPreferences.STYLES_SIZE_Y);
-        pw.displayWindowAtStoredLocation();
-    }
-
-    private void setupTable() {
-        styles = new BasicEventList<>();
-        EventList<OOBibStyle> sortedStyles = new SortedList<>(styles);
-
-        tableModel = (DefaultEventTableModel<OOBibStyle>) GlazedListsSwing
-                                                                          .eventTableModelWithThreadProxyList(sortedStyles, new StyleTableFormat());
-        table = new JTable(tableModel);
-        TableColumnModel cm = table.getColumnModel();
-        cm.getColumn(0).setPreferredWidth(100);
-        cm.getColumn(1).setPreferredWidth(200);
-        cm.getColumn(2).setPreferredWidth(80);
-
-        selectionModel = (DefaultEventSelectionModel<OOBibStyle>) GlazedListsSwing
-                                                                                  .eventSelectionModelWithThreadProxyList(sortedStyles);
-        table.setSelectionModel(selectionModel);
-        table.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        table.addMouseListener(new MouseAdapter() {
-
-            @Override
-            public void mousePressed(MouseEvent mouseEvent) {
-                if (mouseEvent.isPopupTrigger()) {
-                    tablePopup(mouseEvent);
-                }
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent mouseEvent) {
-                if (mouseEvent.isPopupTrigger()) {
-                    tablePopup(mouseEvent);
-                }
-            }
-        });
-
-        selectionModel.getSelected().addListEventListener(new EntrySelectionListener());
-    }
-
-    private void setupPopupMenu() {
-        popup.add(edit);
-        popup.add(show);
-        popup.add(remove);
-        popup.add(reload);
-
-        // Add action listener to "Edit" menu item, which is supposed to open the style file in an external editor:
-        edit.addActionListener(actionEvent -> getSelectedStyle().ifPresent(style -> {
-            Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByExt("jstyle");
-            String link = style.getPath();
-            try {
-
-                JabRefDesktop.openExternalFileAnyFormat(frame.getCurrentBasePanel().getBibDatabaseContext(), link, type);
-
-            } catch (IOException e) {
-                LOGGER.warn("Problem open style file editor", e);
-            }
-        }));
-
-        // Add action listener to "Show" menu item, which is supposed to open the style file in a dialog:
-        show.addActionListener(actionEvent -> getSelectedStyle().ifPresent(this::displayStyle));
-
-        // Create action listener for removing a style, also used for the remove button
-        removeAction = actionEvent -> getSelectedStyle().ifPresent(style -> {
-
-            if (!style.isFromResource() && dialogService.showConfirmationDialogAndWait(Localization.lang("Remove style"),
-                                                                                       Localization.lang("Are you sure you want to remove the style?"),
-                                                                                       Localization.lang("Remove style"),
-                                                                                       Localization.lang("Cancel"))) {
-                if (!loader.removeStyle(style)) {
-                    LOGGER.info("Problem removing style");
-                }
-                updateStyles();
-            }
-        });
-        // Add it to the remove menu item
-        remove.addActionListener(removeAction);
-
-        // Add action listener to the "Reload" menu item, which is supposed to reload an external style file
-        reload.addActionListener(actionEvent ->
-
-        getSelectedStyle().ifPresent(style -> {
-            try {
-                style.ensureUpToDate();
-            } catch (IOException e) {
-                LOGGER.warn("Problem with style file '" + style.getPath() + "'", e);
-            }
-        }));
-    }
-
-    public void setVisible(boolean visible) {
-        okPressed = false;
-        diag.setVisible(visible);
-    }
-
-    /**
-     * Read all style files or directories of style files indicated by the current
-     * settings, and add the styles to the list of styles.
-     */
-    private void updateStyles() {
-
-        table.clearSelection();
-        styles.getReadWriteLock().writeLock().lock();
-        styles.clear();
-        styles.addAll(loader.getStyles());
-        styles.getReadWriteLock().writeLock().unlock();
-
-        selectLastUsed();
-    }
-
-    /**
-     * This method scans the current list of styles, and looks for the styles
-     * that was last used. If found, that style is selected. If not found,
-     * the first style is selected provided there are >0 styles.
-     */
-    private void selectLastUsed() {
-        String usedStyleFile = preferences.getCurrentStyle();
-        // Set the initial selection of the table:
-        if (usedStyleFile == null) {
-            if (table.getRowCount() > 0) {
-                table.setRowSelectionInterval(0, 0);
-            }
-        } else {
-            boolean found = false;
-            for (int i = 0; i < table.getRowCount(); i++) {
-                if (usedStyleFile.equals(tableModel.getElementAt(i).getPath())) {
-                    table.setRowSelectionInterval(i, i);
-                    found = true;
-                    break;
-                }
-            }
-            if (!found && (table.getRowCount() > 0)) {
-                table.setRowSelectionInterval(0, 0);
-            }
-        }
-    }
-
-    private void storeSettings() {
-        getSelectedStyle().ifPresent(style -> preferences.setCurrentStyle(style.getPath()));
-    }
-
-    public Optional<OOBibStyle> getStyle() {
-        if (okPressed) {
-            return getSelectedStyle();
-        }
-        return Optional.empty();
-    }
-
-    /**
-     * Get the currently selected style.
-     *
-     * @return the selected style, or empty if no style is selected.
-     */
-    private Optional<OOBibStyle> getSelectedStyle() {
-        if (!selectionModel.getSelected().isEmpty()) {
-            return Optional.of(selectionModel.getSelected().get(0));
-        }
-        return Optional.empty();
-    }
-
-    static class StyleTableFormat implements TableFormat<OOBibStyle> {
-
-        @Override
-        public int getColumnCount() {
-            return 3;
-        }
-
-        @Override
-        public String getColumnName(int i) {
-            switch (i) {
-                case 0:
-                    return Localization.lang("Name");
-                case 1:
-                    return Localization.lang("Journals");
-                case 2:
-                    return Localization.lang("File");
-                default:
-                    return "";
-            }
-        }
-
-        @Override
-        public Object getColumnValue(OOBibStyle style, int i) {
-            switch (i) {
-                case 0:
-                    return style.getName();
-                case 1:
-                    return String.join(", ", style.getJournals());
-                case 2:
-                    return style.isFromResource() ? Localization.lang("Internal style") : style.getFile().getName();
-                default:
-                    return "";
-            }
-        }
-    }
-
-    public boolean isOkPressed() {
-        return okPressed;
-    }
-
-    private void tablePopup(MouseEvent e) {
-        popup.show(e.getComponent(), e.getX(), e.getY());
-    }
-
-    private void displayStyle(OOBibStyle style) {
-        // Make a dialog box to display the contents:
-        final JDialog dd = new JDialog(diag, style.getName(), true);
-
-        JTextArea ta = new JTextArea(style.getLocalCopy());
-        ta.setEditable(false);
-        JScrollPane sp = new JScrollPane(ta);
-        sp.setPreferredSize(new Dimension(700, 500));
-        dd.getContentPane().add(sp, BorderLayout.CENTER);
-        JButton okButton = new JButton(Localization.lang("OK"));
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-        bb.addButton(okButton);
-        bb.addGlue();
-        bb.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        dd.getContentPane().add(bb.getPanel(), BorderLayout.SOUTH);
-        okButton.addActionListener(actionEvent -> dd.dispose());
-        dd.pack();
-        dd.setLocationRelativeTo(diag);
-        dd.setVisible(true);
-    }
-
-    /**
-     * The listener for the Glazed list monitoring the current selection.
-     * When selection changes, we need to update the preview panel.
-     */
-    private class EntrySelectionListener implements ListEventListener<OOBibStyle> {
-
-        @Override
-        public void listChanged(ListEvent<OOBibStyle> listEvent) {
-            if (listEvent.getSourceList().size() == 1) {
-                OOBibStyle style = listEvent.getSourceList().get(0);
-
-                // Enable/disable popup menu items and buttons
-                if (style.isFromResource()) {
-                    remove.setEnabled(false);
-                    edit.setEnabled(false);
-                    reload.setEnabled(false);
-                    removeButton.setEnabled(false);
-                } else {
-                    remove.setEnabled(true);
-                    edit.setEnabled(true);
-                    reload.setEnabled(true);
-                    removeButton.setEnabled(true);
-                }
-
-                // Set new preview layout
-                preview.setLayout(style.getReferenceFormat("default"));
-            }
-        }
-    }
-
-    private class AddFileDialog extends JabRefDialog {
-
-        private final JTextField newFile = new JTextField();
-        private boolean addOKPressed;
-
-        public AddFileDialog() {
-            super(diag, Localization.lang("Add style file"), true, AddFileDialog.class);
-
-            JButton browse = new JButton(Localization.lang("Browse"));
-            FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                                                                                                   .addExtensionFilter(Localization.lang("Style file"), StandardFileType.JSTYLE)
-                                                                                                   .withDefaultExtension(Localization.lang("Style file"), StandardFileType.JSTYLE)
-                                                                                                   .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY))
-                                                                                                   .build();
-
-            browse.addActionListener(e -> {
-                Optional<Path> file = DefaultTaskExecutor
-                                                         .runInJavaFXThread(() -> dialogService.showFileOpenDialog(fileDialogConfiguration));
-                file.ifPresent(f -> newFile.setText(f.toAbsolutePath().toString()));
-            });
-
-            // Build content panel
-            FormBuilder builder = FormBuilder.create();
-            builder.layout(new FormLayout("left:pref, 4dlu, fill:100dlu:grow, 4dlu, pref", "p"));
-            builder.add(Localization.lang("File")).xy(1, 1);
-            builder.add(newFile).xy(3, 1);
-            builder.add(browse).xy(5, 1);
-            builder.padding("10dlu, 10dlu, 10dlu, 10dlu");
-            getContentPane().add(builder.build(), BorderLayout.CENTER);
-
-            // Buttons
-            ButtonBarBuilder bb = new ButtonBarBuilder();
-            JButton addOKButton = new JButton(Localization.lang("OK"));
-            JButton addCancelButton = new JButton(Localization.lang("Cancel"));
-            bb.addGlue();
-            bb.addButton(addOKButton);
-            bb.addButton(addCancelButton);
-            bb.addGlue();
-            bb.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-            getContentPane().add(bb.getPanel(), BorderLayout.SOUTH);
-            addOKButton.addActionListener(e -> {
-                addOKPressed = true;
-                dispose();
-            });
-
-            Action cancelAction = new AbstractAction() {
-
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    addOKPressed = false;
-                    dispose();
-                }
-            };
-            addCancelButton.addActionListener(cancelAction);
-
-            // Key bindings:
-            bb.getPanel()
-              .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-              .put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-            bb.getPanel().getActionMap().put("close", cancelAction);
-            pack();
-            setLocationRelativeTo(diag);
-        }
-
-        public Optional<String> getFileName() {
-            if (addOKPressed && (newFile.getText() != null) && !newFile.getText().isEmpty()) {
-                return Optional.of(newFile.getText());
-            }
-            return Optional.empty();
-        }
-
-        public void setDirectoryPath(String path) {
-            this.newFile.setText(path);
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
new file mode 100644
index 00000000000..2a160c15d03
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -0,0 +1,145 @@
+package org.jabref.gui.openoffice;
+
+import javax.inject.Inject;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.layout.VBox;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.PreviewPanel;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ValueTableCellFactory;
+import org.jabref.gui.util.ViewModelTableRowFactory;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.openoffice.OOBibStyle;
+import org.jabref.logic.openoffice.StyleLoader;
+import org.jabref.logic.util.TestEntry;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import org.fxmisc.easybind.EasyBind;
+
+public class StyleSelectDialogView extends BaseDialog<OOBibStyle> {
+
+    @FXML private TableColumn<StyleSelectItemViewModel, String> colName;
+    @FXML private TableView<StyleSelectItemViewModel> tvStyles;
+    @FXML private TableColumn<StyleSelectItemViewModel, String> colJournals;
+    @FXML private TableColumn<StyleSelectItemViewModel, String> colFile;
+    @FXML private TableColumn<StyleSelectItemViewModel, Boolean> colDeleteIcon;
+    @FXML private Button add;
+    @FXML private VBox vbox;
+
+    @Inject private PreferencesService preferencesService;
+    @Inject private DialogService dialogService;
+
+    private final MenuItem edit = new MenuItem(Localization.lang("Edit"));
+    private final MenuItem reload = new MenuItem(Localization.lang("Reload"));
+    private final StyleLoader loader;
+
+    private StyleSelectDialogViewModel viewModel;
+    private PreviewPanel previewArticle;
+    private PreviewPanel previewBook;
+
+    public StyleSelectDialogView(StyleLoader loader) {
+
+        this.loader = loader;
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        setResultConverter(button -> {
+            if (button == ButtonType.OK) {
+                viewModel.storePrefs();
+                return tvStyles.getSelectionModel().getSelectedItem().getStyle();
+            }
+            return null;
+
+        });
+        setTitle(Localization.lang("Style selection"));
+    }
+
+    @FXML
+    private void initialize() {
+
+        viewModel = new StyleSelectDialogViewModel(dialogService, loader, preferencesService);
+
+        previewArticle = new PreviewPanel(null, new BibDatabaseContext(), preferencesService.getKeyBindingRepository(), preferencesService.getPreviewPreferences(), dialogService, ExternalFileTypes.getInstance());
+        previewArticle.setEntry(TestEntry.getTestEntry());
+        vbox.getChildren().add(previewArticle);
+
+        previewBook = new PreviewPanel(null, new BibDatabaseContext(), preferencesService.getKeyBindingRepository(), preferencesService.getPreviewPreferences(), dialogService, ExternalFileTypes.getInstance());
+        previewBook.setEntry(TestEntry.getTestEntryBook());
+        vbox.getChildren().add(previewBook);
+
+        colName.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
+        colJournals.setCellValueFactory(cellData -> cellData.getValue().journalsProperty());
+        colFile.setCellValueFactory(cellData -> cellData.getValue().fileProperty());
+        colDeleteIcon.setCellValueFactory(cellData -> cellData.getValue().internalStyleProperty());
+
+        new ValueTableCellFactory<StyleSelectItemViewModel, Boolean>()
+                                                                      .withGraphic(internalStyle -> {
+                                                                          if (!internalStyle) {
+                                                                              return IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode();
+                                                                          }
+                                                                          return null;
+                                                                      })
+                                                                      .withOnMouseClickedEvent(item -> {
+                                                                          return evt -> viewModel.deleteStyle();
+                                                                      })
+                                                                      .withTooltip(item -> {
+                                                                          return Localization.lang("Remove style");
+                                                                      })
+                                                                      .install(colDeleteIcon);
+
+        edit.setOnAction(e -> viewModel.editStyle());
+
+        new ViewModelTableRowFactory<StyleSelectItemViewModel>()
+                                                                .withOnMouseClickedEvent((item, event) -> {
+                                                                    if (event.getClickCount() == 2) {
+                                                                        viewModel.viewStyle(item);
+                                                                    }
+                                                                })
+                                                                .withContextMenu(item -> createContextMenu())
+                                                                .install(tvStyles);
+
+        tvStyles.getSelectionModel().selectedItemProperty().addListener((observable, oldvalue, newvalue) -> {
+            if (newvalue == null) {
+                viewModel.selectedItemProperty().setValue(oldvalue);
+            } else {
+                viewModel.selectedItemProperty().setValue(newvalue);
+            }
+        });
+
+        tvStyles.setItems(viewModel.stylesProperty());
+
+        add.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
+
+        EasyBind.subscribe(viewModel.selectedItemProperty(), style -> {
+            tvStyles.getSelectionModel().select(style);
+            previewArticle.setLayout(style.getStyle().getReferenceFormat("default"));
+            previewBook.setLayout(style.getStyle().getReferenceFormat("default"));
+        });
+    }
+
+    private ContextMenu createContextMenu() {
+        ContextMenu contextMenu = new ContextMenu();
+        contextMenu.getItems().addAll(edit, reload);
+        return contextMenu;
+    }
+
+    @FXML
+    private void addStyleFile() {
+        viewModel.addStyleFile();
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
new file mode 100644
index 00000000000..203c495243b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
@@ -0,0 +1,137 @@
+package org.jabref.gui.openoffice;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+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.collections.FXCollections;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.DialogPane;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextArea;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.openoffice.OOBibStyle;
+import org.jabref.logic.openoffice.OpenOfficePreferences;
+import org.jabref.logic.openoffice.StyleLoader;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.preferences.PreferencesService;
+
+public class StyleSelectDialogViewModel {
+
+    private final DialogService dialogService;
+    private final StyleLoader loader;
+    private final OpenOfficePreferences preferences;
+    private final PreferencesService preferencesService;
+    private final ListProperty<StyleSelectItemViewModel> styles = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<StyleSelectItemViewModel> selectedItem = new SimpleObjectProperty<>();
+
+    public StyleSelectDialogViewModel(DialogService dialogService, StyleLoader loader, PreferencesService preferencesService) {
+        this.dialogService = dialogService;
+        this.preferences = preferencesService.getOpenOfficePreferences();
+        this.loader = loader;
+        this.preferencesService = preferencesService;
+
+        styles.addAll(loadStyles());
+
+        String currentStyle = preferences.getCurrentStyle();
+        Optional<StyleSelectItemViewModel> lastUsedStyle = styles.stream().filter(style -> style.getStylePath().equals(currentStyle)).findFirst();
+
+        if (lastUsedStyle.isPresent()) {
+            selectedItem.setValue(lastUsedStyle.get());
+        } else {
+            selectedItem.setValue(styles.get(0));
+        }
+
+    }
+
+    public StyleSelectItemViewModel fromOOBibStyle(OOBibStyle style) {
+        return new StyleSelectItemViewModel(style.getName(), String.join(", ", style.getJournals()), style.isFromResource() ? Localization.lang("Internal style") : style.getPath(), style);
+    }
+
+    public OOBibStyle toOOBibStyle(StyleSelectItemViewModel item) {
+        return item.getStyle();
+    }
+
+    public void addStyleFile() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                                                                                               .addExtensionFilter(Localization.lang("Style file"), StandardFileType.JSTYLE)
+                                                                                               .withDefaultExtension(Localization.lang("Style file"), StandardFileType.JSTYLE)
+                                                                                               .withInitialDirectory(preferencesService.getWorkingDir())
+                                                                                               .build();
+        Optional<Path> path = dialogService.showFileOpenDialog(fileDialogConfiguration);
+        path.map(Path::toAbsolutePath).map(Path::toString).ifPresent(stylePath -> {
+            if (loader.addStyleIfValid(stylePath)) {
+                preferences.setCurrentStyle(stylePath);
+                styles.setAll(loadStyles());
+            } else {
+                dialogService.showErrorDialogAndWait(Localization.lang("Invalid style selected"), Localization.lang("You must select a valid style file."));
+            }
+        });
+
+    }
+
+    public List<StyleSelectItemViewModel> loadStyles() {
+        return loader.getStyles().stream().map(this::fromOOBibStyle).collect(Collectors.toList());
+    }
+
+    public ListProperty<StyleSelectItemViewModel> stylesProperty() {
+        return styles;
+    }
+
+    public void deleteStyle() {
+
+        OOBibStyle style = selectedItem.getValue().getStyle();
+        if (loader.removeStyle(style)) {
+            styles.remove(selectedItem.get());
+        }
+
+    }
+
+    public void editStyle() {
+        OOBibStyle style = selectedItem.getValue().getStyle();
+
+        Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByExt("jstyle");
+
+        try {
+            JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), style.getPath().toString(), type);
+        } catch (IOException e) {
+            dialogService.showErrorDialogAndWait(e);
+        }
+    }
+
+    public void viewStyle(StyleSelectItemViewModel item) {
+
+        DialogPane pane = new DialogPane();
+        ScrollPane scrollPane = new ScrollPane();
+        scrollPane.setFitToHeight(true);
+        scrollPane.setFitToWidth(true);
+        TextArea styleView = new TextArea(item.getStyle().getLocalCopy());
+        scrollPane.setContent(styleView);
+        pane.setContent(scrollPane);
+        dialogService.showCustomDialogAndWait(item.getStyle().getName(), pane, ButtonType.OK);
+
+    }
+
+    public ObjectProperty<StyleSelectItemViewModel> selectedItemProperty() {
+        return selectedItem;
+    }
+
+    public void storePrefs() {
+        preferences.setCurrentStyle(selectedItem.getValue().getStylePath());
+        preferencesService.setOpenOfficePreferences(preferences);
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
new file mode 100644
index 00000000000..1b4eebf2070
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
@@ -0,0 +1,59 @@
+package org.jabref.gui.openoffice;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.Node;
+
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.logic.openoffice.OOBibStyle;
+
+public class StyleSelectItemViewModel {
+
+    private final StringProperty name = new SimpleStringProperty("");
+    private final StringProperty journals = new SimpleStringProperty("");
+    private final StringProperty file = new SimpleStringProperty("");
+    private final ObjectProperty<Node> icon = new SimpleObjectProperty<>(IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode());
+    private final OOBibStyle style;
+    private final BooleanProperty internalStyle = new SimpleBooleanProperty();
+
+    public StyleSelectItemViewModel(String name, String journals, String file, OOBibStyle style) {
+        this.name.setValue(name);
+        this.journals.setValue(journals);
+        this.file.setValue(file);
+        this.style = style;
+        this.internalStyle.set(style.isFromResource());
+    }
+
+    public StringProperty nameProperty() {
+        return name;
+    }
+
+    public StringProperty journalsProperty() {
+        return journals;
+    }
+
+    public ObjectProperty<Node> iconProperty() {
+        return icon;
+    }
+
+    public StringProperty fileProperty() {
+        return file;
+    }
+
+    public OOBibStyle getStyle() {
+        return style;
+    }
+
+    public BooleanProperty internalStyleProperty() {
+        return internalStyle;
+    }
+
+    public String getStylePath() {
+        return style.getPath();
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java b/src/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java
index bf799e91d7d..4ab29ca2fa5 100644
--- a/src/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java
+++ b/src/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java
@@ -8,7 +8,6 @@ class UndefinedCharacterFormatException extends Exception {
 
     private final String formatName;
 
-
     public UndefinedCharacterFormatException(String formatName) {
         super();
         this.formatName = formatName;
diff --git a/src/main/java/org/jabref/logic/openoffice/CitationEntry.java b/src/main/java/org/jabref/logic/openoffice/CitationEntry.java
index b2273cd7aaa..3acbee9ed35 100644
--- a/src/main/java/org/jabref/logic/openoffice/CitationEntry.java
+++ b/src/main/java/org/jabref/logic/openoffice/CitationEntry.java
@@ -1,20 +1,18 @@
 package org.jabref.logic.openoffice;
 
+import java.util.Objects;
 import java.util.Optional;
 
 public class CitationEntry implements Comparable<CitationEntry> {
 
     private final String refMarkName;
-    private Optional<String> pageInfo;
+    private final Optional<String> pageInfo;
     private final String context;
-    private final Optional<String> origPageInfo;
 
-    // Only used for testing...
     public CitationEntry(String refMarkName, String context) {
         this(refMarkName, context, Optional.empty());
     }
 
-    // Only used for testing...
     public CitationEntry(String refMarkName, String context, String pageInfo) {
         this(refMarkName, context, Optional.ofNullable(pageInfo));
     }
@@ -23,7 +21,6 @@ public CitationEntry(String refMarkName, String context, Optional<String> pageIn
         this.refMarkName = refMarkName;
         this.context = context;
         this.pageInfo = pageInfo;
-        this.origPageInfo = pageInfo;
     }
 
     public Optional<String> getPageInfo() {
@@ -34,19 +31,6 @@ public String getRefMarkName() {
         return refMarkName;
     }
 
-    public boolean pageInfoChanged() {
-        if (pageInfo.isPresent() ^ origPageInfo.isPresent()) {
-            return true;
-        }
-        if (pageInfo.isPresent()) {
-            // This means that origPageInfo.isPresent is also true here
-            return pageInfo.get().compareTo(origPageInfo.get()) != 0;
-        } else {
-            // So origPageInfo.isPresent is false here
-            return false;
-        }
-    }
-
     @Override
     public int compareTo(CitationEntry other) {
         return this.refMarkName.compareTo(other.refMarkName);
@@ -59,21 +43,18 @@ public boolean equals(Object o) {
         }
         if (o instanceof CitationEntry) {
             CitationEntry other = (CitationEntry) o;
-            return this.refMarkName.equals(other.refMarkName);
+            return Objects.equals(this.refMarkName, other.refMarkName);
         }
         return false;
     }
 
     @Override
     public int hashCode() {
-        return this.refMarkName.hashCode();
+        return Objects.hash(refMarkName);
     }
 
     public String getContext() {
         return context;
     }
 
-    public void setPageInfo(String trim) {
-        pageInfo = Optional.ofNullable(trim);
-    }
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java b/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java
index b07f09c55a8..2d71b151207 100644
--- a/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java
+++ b/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java
@@ -855,6 +855,10 @@ public Object getProperty(String propName) {
         return properties.get(propName);
     }
 
+    /**
+     * Indicate if it is an internal style
+     * @return True if an internal style
+     */
     public boolean isFromResource() {
         return fromResource;
     }
@@ -875,7 +879,8 @@ public boolean equals(Object o) {
         }
         if (o instanceof OOBibStyle) {
             OOBibStyle otherStyle = (OOBibStyle) o;
-            return Objects.equals(path, otherStyle.path) && Objects.equals(name, otherStyle.name)
+            return Objects.equals(path, otherStyle.path)
+                   && Objects.equals(name, otherStyle.name)
                     && Objects.equals(citProperties, otherStyle.citProperties)
                     && Objects.equals(properties, otherStyle.properties);
         }
diff --git a/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java b/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java
index 419377ba715..f3d6a0b29a0 100644
--- a/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java
+++ b/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.openoffice;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -9,8 +10,8 @@ public class OpenOfficePreferences {
     public static final String DEFAULT_WIN_EXEC_PATH = "C:\\Program Files\\LibreOffice 5\\program";
     public static final String WINDOWS_EXECUTABLE = "soffice.exe";
 
-    public static final String DEFAULT_OSX_PATH = "/Applications/OpenOffice.org.app";
-    public static final String DEFAULT_OSX_EXEC_PATH = "/Applications/OpenOffice.org.app/Contents/MacOS/soffice";
+    public static final String DEFAULT_OSX_PATH = "/Applications/LibreOffice.app";
+    public static final String DEFAULT_OSX_EXEC_PATH = "/Applications/LibreOffice.app/Contents/MacOS/soffice";
     public static final String OSX_EXECUTABLE = "soffice";
 
     public static final String DEFAULT_LINUX_PATH = "/usr/lib/libreoffice";
@@ -19,22 +20,22 @@ public class OpenOfficePreferences {
 
     public static final List<String> OO_JARS = Arrays.asList("unoil.jar", "jurt.jar", "juh.jar", "ridl.jar");
 
-    private String executablePath;
-    private String installationPath;
-    private Boolean useAllDatabases;
-    private Boolean syncWhenCiting;
-    private Boolean showPanel;
-    private List<String> externalStyles;
-    private String currentStyle;
-    private String jarsPath;
+    private String executablePath = "";
+    private String installationPath = "";
+    private boolean useAllDatabases;
+    private boolean syncWhenCiting;
+    private boolean showPanel;
+    private List<String> externalStyles = new ArrayList<>();
+    private String currentStyle = "";
+    private String jarsPath = "";
 
     public OpenOfficePreferences(
             String jarsPath,
             String executablePath,
             String installationPath,
-            Boolean useAllDatabases,
-            Boolean syncWhenCiting,
-            Boolean showPanel,
+                                 boolean useAllDatabases,
+                                 boolean syncWhenCiting,
+                                 boolean showPanel,
             List<String> externalStyles,
             String currentStyle
     ) {
@@ -93,18 +94,18 @@ public Boolean getSyncWhenCiting() {
         return syncWhenCiting;
     }
 
-    public void setSyncWhenCiting(Boolean syncWhenCiting) {
+    public void setSyncWhenCiting(boolean syncWhenCiting) {
         this.syncWhenCiting = syncWhenCiting;
     }
 
     /**
      * true if the OO panel is shown on startup
      */
-    public Boolean getShowPanel() {
+    public boolean getShowPanel() {
         return showPanel;
     }
 
-    public void setShowPanel(Boolean showPanel) {
+    public void setShowPanel(boolean showPanel) {
         this.showPanel = showPanel;
     }
 
@@ -148,9 +149,9 @@ public void updateConnectionParams(String ooPath, String execPath, String jarsPa
     }
 
     public void clearConnectionSettings() {
-        this.installationPath = null;
-        this.executablePath = null;
-        this.jarsPath = null;
+        this.installationPath = "";
+        this.executablePath = "";
+        this.jarsPath = "";
     }
 
 }
diff --git a/src/main/java/org/jabref/logic/util/TestEntry.java b/src/main/java/org/jabref/logic/util/TestEntry.java
index 6c98136c848..5ef00045c54 100644
--- a/src/main/java/org/jabref/logic/util/TestEntry.java
+++ b/src/main/java/org/jabref/logic/util/TestEntry.java
@@ -30,4 +30,17 @@ public static BibEntry getTestEntry() {
                 "This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger.");
         return entry;
     }
+
+    public static BibEntry getTestEntryBook() {
+        BibEntry entry = new BibEntry(BibtexEntryTypes.BOOK);
+        entry.setCiteKey("Harrer2018");
+        entry.setField(FieldName.AUTHOR, "Simon Harrer and Jörg Lenhard and Linus Dietz");
+        entry.setField(FieldName.EDITOR, "Andrea Steward");
+        entry.setField(FieldName.TITLE, "Java by Comparison");
+        entry.setField(FieldName.YEAR, "2018");
+        entry.setField(FieldName.MONTH, "March");
+        entry.setField(FieldName.PUBLISHER, "Pragmatic Bookshelf");
+        entry.setField(FieldName.ADDRESS, "Raleigh, NC");
+        return entry;
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 5d3d38d061e..e7320ee4d95 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -1546,6 +1546,7 @@ public XmpPreferences getXMPPreferences() {
                                   getKeywordDelimiter());
     }
 
+    @Override
     public OpenOfficePreferences getOpenOfficePreferences() {
         return new OpenOfficePreferences(
                                          this.get(JabRefPreferences.OO_JARS_PATH),
@@ -1558,6 +1559,7 @@ public OpenOfficePreferences getOpenOfficePreferences() {
                                          this.get(JabRefPreferences.OO_BIBLIOGRAPHY_STYLE_FILE));
     }
 
+    @Override
     public void setOpenOfficePreferences(OpenOfficePreferences openOfficePreferences) {
         this.put(JabRefPreferences.OO_JARS_PATH, openOfficePreferences.getJarsPath());
         this.put(JabRefPreferences.OO_EXECUTABLE_PATH, openOfficePreferences.getExecutablePath());
@@ -1598,6 +1600,7 @@ public JabRefPreferences storePreviewPreferences(PreviewPreferences previewPrefe
         return this;
     }
 
+    @Override
     public PreviewPreferences getPreviewPreferences() {
         int cyclePos = getInt(CYCLE_PREVIEW_POS);
         List<String> cycle = getStringList(CYCLE_PREVIEW);
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 97931addffa..46c208a12f4 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -10,9 +10,11 @@
 import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
+import org.jabref.logic.openoffice.OpenOfficePreferences;
 import org.jabref.model.metadata.FilePreferences;
 
 public interface PreferencesService {
+
     JournalAbbreviationPreferences getJournalAbbreviationPreferences();
 
     void storeKeyBindingRepository(KeyBindingRepository keyBindingRepository);
@@ -27,6 +29,12 @@ public interface PreferencesService {
 
     void setWorkingDir(Path dir);
 
+    OpenOfficePreferences getOpenOfficePreferences();
+
+    void setOpenOfficePreferences(OpenOfficePreferences openOfficePreferences);
+
+    PreviewPreferences getPreviewPreferences();
+
     Map<String, List<String>> getEntryEditorTabList();
 
     Boolean getEnforceLegalKeys();
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 90fe32bdc9d..5b5e6925b1e 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1289,7 +1289,7 @@ Extra\ information\ (e.g.\ page\ number)=Extra information (e.g. page number)
 Manage\ citations=Manage citations
 Problem\ modifying\ citation=Problem modifying citation
 Citation=Citation
-Extra\ information=Extra information
+Connecting...=Connecting...
 Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Could not resolve BibTeX entry for citation marker '%0'.
 Select\ style=Select style
 Journals=Journals
@@ -1309,7 +1309,6 @@ Your\ OpenOffice/LibreOffice\ document\ references\ the\ BibTeX\ key\ '%0',\ whi
 Unable\ to\ synchronize\ bibliography=Unable to synchronize bibliography
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Combine pairs of citations that are separated by spaces only
 Autodetection\ failed=Autodetection failed
-Connecting=Connecting
 Please\ wait...=Please wait...
 Set\ connection\ parameters=Set connection parameters
 Path\ to\ OpenOffice/LibreOffice\ directory=Path to OpenOffice/LibreOffice directory
@@ -1700,11 +1699,11 @@ Run\ field\ formatter\:=Run field formatter:
 Table\ font\ size\ is\ %0=Table font size is %0
 Internal\ style=Internal style
 Add\ style\ file=Add style file
-Are\ you\ sure\ you\ want\ to\ remove\ the\ style?=Are you sure you want to remove the style?
 Current\ style\ is\ '%0'=Current style is '%0'
 Remove\ style=Remove style
-Select\ one\ of\ the\ available\ styles\ or\ add\ a\ style\ file\ from\ disk.=Select one of the available styles or add a style file from disk.
 You\ must\ select\ a\ valid\ style\ file.=You must select a valid style file.
+Invalid\ style\ selected=Invalid style selected
+
 Reload=Reload
 
 Capitalize=Capitalize
@@ -1819,7 +1818,6 @@ booktitle\ ends\ with\ 'conference\ on'=booktitle ends with 'conference on'
 
 All\ external\ files=All external files
 
-OpenOffice/LibreOffice\ integration=OpenOffice/LibreOffice integration
 
 incorrect\ control\ digit=incorrect control digit
 incorrect\ format=incorrect format
@@ -1920,7 +1918,6 @@ Your\ issue\ was\ reported\ in\ your\ browser.=Your issue was reported in your b
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=The log and exception information was copied to your clipboard.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Please paste this information (with Ctrl+V) in the issue description.
 
-Connecting...=Connecting...
 Host=Host
 Port=Port
 Library=Library
@@ -2217,3 +2214,5 @@ Main\ layout\ file=Main layout file
 Save\ exporter=Save exporter
 File\ extension\:=File extension\:
 Export\ format\ name\:=Export format name\:
+
+Cleared\ connection\ settings=Cleared connection settings
diff --git a/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java b/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java
index 877109eb6ea..b1cd1d100a7 100644
--- a/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/CitationEntryTest.java
@@ -5,7 +5,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -14,7 +13,6 @@ class CitationEntryTest {
     @Test
     void testCitationEntryInitalPageInfo() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context", "Info");
-        assertFalse(citationEntry.pageInfoChanged());
         assertTrue(citationEntry.getPageInfo().isPresent());
         assertEquals("Info", citationEntry.getPageInfo().get());
         assertEquals("RefMark", citationEntry.getRefMarkName());
@@ -24,9 +22,8 @@ void testCitationEntryInitalPageInfo() {
     @Test
     void testCitationEntryOptionalInitalPageInfo() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context", Optional.of("Info"));
-        assertFalse(citationEntry.pageInfoChanged());
-        assertTrue(citationEntry.getPageInfo().isPresent());
-        assertEquals("Info", citationEntry.getPageInfo().get());
+
+        assertEquals(Optional.of("Info"), citationEntry.getPageInfo());
         assertEquals("RefMark", citationEntry.getRefMarkName());
         assertEquals("Context", citationEntry.getContext());
     }
@@ -34,34 +31,13 @@ void testCitationEntryOptionalInitalPageInfo() {
     @Test
     void testCitationEntryInitalPageInfoChanged() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context", "Info");
-        citationEntry.setPageInfo("Other info");
-        assertTrue(citationEntry.pageInfoChanged());
-        assertTrue(citationEntry.getPageInfo().isPresent());
-        assertEquals("Other info", citationEntry.getPageInfo().get());
-    }
-
-    @Test
-    void testCitationEntryInitalPageInfoRemoved() {
-        CitationEntry citationEntry = new CitationEntry("RefMark", "Context", "Info");
-        citationEntry.setPageInfo(null);
-        assertTrue(citationEntry.pageInfoChanged());
-        assertFalse(citationEntry.getPageInfo().isPresent());
+        assertEquals(Optional.of("Info"), citationEntry.getPageInfo());
     }
 
     @Test
     void testCitationEntryNoInitalPageInfo() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context");
-        assertFalse(citationEntry.pageInfoChanged());
-        assertFalse(citationEntry.getPageInfo().isPresent());
-    }
-
-    @Test
-    void testCitationEntryNoInitalPageInfoChanged() {
-        CitationEntry citationEntry = new CitationEntry("RefMark", "Context");
-        citationEntry.setPageInfo("Other info");
-        assertTrue(citationEntry.pageInfoChanged());
-        assertTrue(citationEntry.getPageInfo().isPresent());
-        assertEquals("Other info", citationEntry.getPageInfo().get());
+        assertEquals(Optional.empty(), citationEntry.getPageInfo());
     }
 
     @Test

From aa3657cacf9697a1236969336d1bf1ff9258ef8f Mon Sep 17 00:00:00 2001
From: frasca80 <26461960+frasca80@users.noreply.github.com>
Date: Fri, 25 Jan 2019 17:42:46 +0100
Subject: [PATCH 227/229] Fix for BibTex source tab parsing issue if field
 contains {} (#4581)

* Cleanup interfaces (#4553)

* improve styling of preferences side menu (#4556)

* Added extra stats to be sent with MrDLib recommendations (#4452)

* Refactor BibEntry deprecated method (#4554)

* Refactor BibEntry deprecated method

* Fixed error

* More on checkstyle fixing

* Fixed checkstyle issues

* Added custom entrytype for types not registered in the enumerator.

* Added getTypeOrDefault method refactor code to use it and fix NPE problem

* Fixing checkstyle rules

* More on checkstyle

* More on getType getTypeOrDefault replacement

* Revert Article EntryType into Electronic

* Added break line between different packages

* Refactor BibtextEntryTypes.getTypeOrDefault method

* Removed unused import

* Removed extra new line, checkstyle error fixing

* Delete the deprecated BibEntry Constructor (#4560)

* Bump xmpbox from 2.0.12 to 2.0.13 (#4561)

Bumps xmpbox from 2.0.12 to 2.0.13.

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Bump checkstyle from 8.15 to 8.16 (#4562)

Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.15 to 8.16.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.15...checkstyle-8.16)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Do not extract file ending from Urls (#4547)

* Fixes #4544 Do not extract file ending from Urls

* Add tests

* file type for any resource type

* Keep simple file name extraction for files

* checkstyle

* Converts integrity check dialog to JavaFX (#4559)

* Converts integrity check dialog to JavaFX

Moreover:
- Show entry by reference and not by id. Fixes #2181.
- Fixes a few issues that occurred when opening the entry editor by code from the integrity dialog
- Reuse gridpane in entry editor (should have a slightly superior performance)
- Improve display of progress dialog
- Invoke copy files task using central task executor

* fix l10n
fix aborting of copy files task and showing of integrity check dialog

* fix l10n

* Add uncaught exception message (#4565)

* Add error message for uncaught exceptions

Added a new view to the project. It's shown after the uncaught exception is logged.

* Add simple text to fallback error view

Added a label asking the user to look into the logfiles for more details.

* Add error message to language files

Added the error message to the german and english language files.

* Add ErrorDialogAndWait

Removed the FallbackErrorView. Added the showErrorDialogAndWait call instead.

* BibTex parser triggered on focus out of the text area instead of on value change event

* BibTex parser triggered on focus out of the text area instead of on value change event

* Added a post-parsing validation to be sure there's no relevant unconsidered content into epilog.
Added DialogService in SourceTab as current NotificationPane seems not working.

* Added a post-parsing validation to be sure there's no relevant unconsidered content into epilog.
Added DialogService in SourceTab as current NotificationPane seems not working.

* Codacy/PR Quality Review change.

* Codacy/PR Quality Review change.
---
 .../jabref/gui/entryeditor/EntryEditor.java   |  2 +-
 .../org/jabref/gui/entryeditor/SourceTab.java | 26 +++++++++++++++----
 .../importer/fileformat/BibtexParser.java     | 14 +++++++++-
 .../jabref/gui/entryeditor/SourceTabTest.java |  3 ++-
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index c7961bff628..4289c29d1b2 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -300,7 +300,7 @@ private List<EntryEditorTab> createTabs() {
         tabs.add(new RelatedArticlesTab(preferences, dialogService));
 
         // Source tab
-        sourceTab = new SourceTab(databaseContext, undoManager, preferences.getLatexFieldFormatterPreferences(), preferences.getImportFormatPreferences(), fileMonitor);
+        sourceTab = new SourceTab(databaseContext, undoManager, preferences.getLatexFieldFormatterPreferences(), preferences.getImportFormatPreferences(), fileMonitor, dialogService);
         tabs.add(sourceTab);
         return tabs;
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
index f380e64e269..b96fed0bea4 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
@@ -13,6 +13,7 @@
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.Tooltip;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.undo.NamedCompound;
@@ -53,8 +54,9 @@ public class SourceTab extends EntryEditorTab {
     private final ObservableRuleBasedValidator sourceValidator = new ObservableRuleBasedValidator(sourceIsValid);
     private final ImportFormatPreferences importFormatPreferences;
     private final FileUpdateMonitor fileMonitor;
+    private final DialogService dialogService;
 
-    public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undoManager, LatexFieldFormatterPreferences fieldFormatterPreferences, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
+    public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undoManager, LatexFieldFormatterPreferences fieldFormatterPreferences, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor, DialogService dialogService) {
         this.mode = bibDatabaseContext.getMode();
         this.setText(Localization.lang("%0 source", mode.getFormattedName()));
         this.setTooltip(new Tooltip(Localization.lang("Show/edit %0 source", mode.getFormattedName())));
@@ -63,6 +65,7 @@ public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undo
         this.fieldFormatterPreferences = fieldFormatterPreferences;
         this.importFormatPreferences = importFormatPreferences;
         this.fileMonitor = fileMonitor;
+        this.dialogService = dialogService;
 
     }
 
@@ -95,14 +98,21 @@ protected void bindToEntry(BibEntry entry) {
             if (sourceValidator.getValidationStatus().isValid()) {
                 notificationPane.hide();
             } else {
-                sourceValidator.getValidationStatus().getHighestMessage().ifPresent(validationMessage -> notificationPane.show(validationMessage.getMessage()));
+                sourceValidator.getValidationStatus().getHighestMessage().ifPresent(validationMessage -> {
+                    notificationPane.show(validationMessage.getMessage());//this seems not working
+                    dialogService.showErrorDialogAndWait(validationMessage.getMessage());
+                });
             }
         });
         this.setContent(codeArea);
 
-        // Store source for every change in the source code
+        // Store source for on focus out event in the source code (within its text area)
         // and update source code for every change of entry field values
-        BindingsHelper.bindContentBidirectional(entry.getFieldsObservable(), codeArea.textProperty(), this::storeSource, fields -> {
+        BindingsHelper.bindContentBidirectional(entry.getFieldsObservable(), codeArea.focusedProperty(), onFocus -> {
+            if (!onFocus) {
+                storeSource(codeArea.textProperty().getValue());
+            }
+        }, fields -> {
             DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> {
                 codeArea.clear();
                 try {
@@ -110,7 +120,7 @@ protected void bindToEntry(BibEntry entry) {
                 } catch (IOException ex) {
                     codeArea.setEditable(false);
                     codeArea.appendText(ex.getMessage() + "\n\n" +
-                            Localization.lang("Correct the entry, and reopen editor to display/edit source."));
+                                        Localization.lang("Correct the entry, and reopen editor to display/edit source."));
                     LOGGER.debug("Incorrect entry", ex);
                 }
             });
@@ -141,6 +151,12 @@ private void storeSource(String text) {
                 }
             }
 
+            if (parserResult.hasWarnings()) {
+                // put the warning into as exception text -> it will be displayed to the user
+
+                throw new IllegalStateException(parserResult.getErrorMessage());
+            }
+
             NamedCompound compound = new NamedCompound(Localization.lang("source edit"));
             BibEntry newEntry = database.getEntries().get(0);
             String newKey = newEntry.getCiteKeyOptional().orElse(null);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
index 06accaed956..db4bffee679 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.regex.Pattern;
 
 import org.jabref.logic.bibtex.FieldContentParser;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
@@ -70,7 +71,7 @@ public class BibtexParser implements Parser {
     private boolean eof;
     private int line = 1;
     private ParserResult parserResult;
-    private MetaDataParser metaDataParser;
+    private final MetaDataParser metaDataParser;
 
     public BibtexParser(ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
         this.importFormatPreferences = Objects.requireNonNull(importFormatPreferences);
@@ -211,9 +212,20 @@ private ParserResult parseFileContent() throws IOException {
 
         parseRemainingContent();
 
+        checkEpilog();
+
         return parserResult;
     }
 
+    private void checkEpilog() {
+        // This is an incomplete and inaccurate try to verify if something went wrong with previous parsing activity even though there were no warnings so far
+        // regex looks for something like 'identifier = blabla ,'
+        if (!parserResult.hasWarnings() && Pattern.compile("\\w+\\s*=.*,").matcher(database.getEpilog()).find()) {
+                parserResult.addWarning("following BibTex fragment has not been parsed:\n" + database.getEpilog());
+        }
+
+    }
+
     private void parseRemainingContent() {
         database.setEpilog(dumpTextReadSoFarToString().trim());
     }
diff --git a/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
index 48bf1243fc7..df3012e67ad 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
@@ -6,6 +6,7 @@
 import javafx.scene.control.TabPane;
 import javafx.stage.Stage;
 
+import org.jabref.gui.FXDialogService;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.logic.bibtex.LatexFieldFormatterPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -35,7 +36,7 @@ public class SourceTabTest {
     public void onStart(Stage stage) {
         area = new CodeArea();
         area.appendText("some example\n text to go here\n across a couple of \n lines....");
-        sourceTab = new SourceTab(new BibDatabaseContext(), new CountingUndoManager(), new LatexFieldFormatterPreferences(), mock(ImportFormatPreferences.class), new DummyFileUpdateMonitor());
+        sourceTab = new SourceTab(new BibDatabaseContext(), new CountingUndoManager(), new LatexFieldFormatterPreferences(), mock(ImportFormatPreferences.class), new DummyFileUpdateMonitor(), new FXDialogService());
         pane = new TabPane(
                 new Tab("main area", area),
                 new Tab("other tab", new Label("some text")),

From 16a68f3ffd3b44c05c05cd6247839fecd68affc9 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sat, 26 Jan 2019 17:52:26 +0100
Subject: [PATCH 228/229] Convert DuplicateResolverDialog to javafx (#4601)

* Convert DuplicateResolverDialog to javafx

* add result

* change buttons to button types
simplify dialog
reset duplicate bibtex key search dialog for the moment

* fix help and move buttons to init
return null on default
---
 .../jabref/gui/DuplicateResolverDialog.java   | 174 ++++++++----------
 .../java/org/jabref/gui/DuplicateSearch.java  |  60 +++---
 src/main/java/org/jabref/gui/JabRefFrame.java |   2 +-
 .../ResolveDuplicateLabelDialog.java          |   9 +-
 .../gui/importer/ImportInspectionDialog.java  |  36 ++--
 5 files changed, 124 insertions(+), 157 deletions(-)

diff --git a/src/main/java/org/jabref/gui/DuplicateResolverDialog.java b/src/main/java/org/jabref/gui/DuplicateResolverDialog.java
index 362333ebfa0..cb34df3d202 100644
--- a/src/main/java/org/jabref/gui/DuplicateResolverDialog.java
+++ b/src/main/java/org/jabref/gui/DuplicateResolverDialog.java
@@ -1,26 +1,20 @@
 package org.jabref.gui;
 
-import java.awt.BorderLayout;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonBar.ButtonData;
+import javafx.scene.control.ButtonType;
+import javafx.scene.layout.BorderPane;
 
-import javax.swing.Box;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-
-import javafx.scene.Scene;
-
-import org.jabref.gui.customjfx.CustomJFXPanel;
+import org.jabref.gui.DuplicateResolverDialog.DuplicateResolverResult;
 import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.importer.ImportInspectionDialog;
 import org.jabref.gui.mergeentries.MergeEntries;
-import org.jabref.gui.util.WindowLocation;
+import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.JabRefPreferences;
 
-public class DuplicateResolverDialog extends JabRefDialog {
+public class DuplicateResolverDialog extends BaseDialog<DuplicateResolverResult> {
 
     public enum DuplicateResolverType {
         DUPLICATE_SEARCH,
@@ -30,7 +24,6 @@ public enum DuplicateResolverType {
     }
 
     public enum DuplicateResolverResult {
-        NOT_CHOSEN,
         KEEP_BOTH,
         KEEP_LEFT,
         KEEP_RIGHT,
@@ -39,108 +32,89 @@ public enum DuplicateResolverResult {
         BREAK
     }
 
-    JButton helpButton = new HelpAction(Localization.lang("Help"), HelpFile.FIND_DUPLICATES).getHelpButton();
-    private final JButton cancel = new JButton(Localization.lang("Cancel"));
-    private final JButton merge = new JButton(Localization.lang("Keep merged entry only"));
     private final JabRefFrame frame;
-    private final JPanel options = new JPanel();
-    private DuplicateResolverResult status = DuplicateResolverResult.NOT_CHOSEN;
     private MergeEntries me;
 
     public DuplicateResolverDialog(JabRefFrame frame, BibEntry one, BibEntry two, DuplicateResolverType type) {
-        super(Localization.lang("Possible duplicate entries"), true, DuplicateResolverDialog.class);
         this.frame = frame;
-        init(one, two, type);
-    }
-
-    public DuplicateResolverDialog(ImportInspectionDialog dialog, BibEntry one, BibEntry two,
-            DuplicateResolverType type) {
-        super(dialog, Localization.lang("Possible duplicate entries"), true, DuplicateResolverDialog.class);
-        this.frame = dialog.getFrame();
+        this.setTitle(Localization.lang("Possible duplicate entries"));
         init(one, two, type);
     }
 
     private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
-        JButton both;
-        JButton second;
-        JButton first;
-        JButton removeExact = null;
-        switch (type) {
-        case DUPLICATE_SEARCH:
-            first = new JButton(Localization.lang("Keep left"));
-            second = new JButton(Localization.lang("Keep right"));
-            both = new JButton(Localization.lang("Keep both"));
-            me = new MergeEntries(one, two, frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
-            break;
-        case INSPECTION:
-            first = new JButton(Localization.lang("Remove old entry"));
-            second = new JButton(Localization.lang("Remove entry from import"));
-            both = new JButton(Localization.lang("Keep both"));
-            me = new MergeEntries(one, two, Localization.lang("Old entry"),
-                    Localization.lang("From import"), frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
-            break;
-        case DUPLICATE_SEARCH_WITH_EXACT:
-            first = new JButton(Localization.lang("Keep left"));
-            second = new JButton(Localization.lang("Keep right"));
-            both = new JButton(Localization.lang("Keep both"));
-            removeExact = new JButton(Localization.lang("Automatically remove exact duplicates"));
-            me = new MergeEntries(one, two, frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
-            break;
-        default:
-            first = new JButton(Localization.lang("Import and remove old entry"));
-            second = new JButton(Localization.lang("Do not import entry"));
-            both = new JButton(Localization.lang("Import and keep old entry"));
-            me = new MergeEntries(one, two, Localization.lang("Old entry"),
-                    Localization.lang("From import"), frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
-            break;
-        }
 
-        if (removeExact != null) {
-            options.add(removeExact);
+        HelpAction helpCommand = new HelpAction(HelpFile.FIND_DUPLICATES);
+        ButtonType help = new ButtonType(Localization.lang("Help"), ButtonData.HELP);
+
+        ButtonType cancel = ButtonType.CANCEL;
+        ButtonType merge = new ButtonType(Localization.lang("Keep merged entry only"), ButtonData.APPLY);
+
+        ButtonBar options = new ButtonBar();
+        ButtonType both;
+        ButtonType second;
+        ButtonType first;
+        ButtonType removeExact = new ButtonType(Localization.lang("Automatically remove exact duplicates"), ButtonData.APPLY);
+        boolean removeExactVisible = false;
+
+        switch (type) {
+            case DUPLICATE_SEARCH:
+                first = new ButtonType(Localization.lang("Keep left"), ButtonData.APPLY);
+                second = new ButtonType(Localization.lang("Keep right"), ButtonData.APPLY);
+                both = new ButtonType(Localization.lang("Keep both"), ButtonData.APPLY);
+                me = new MergeEntries(one, two, frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
+                break;
+            case INSPECTION:
+                first = new ButtonType(Localization.lang("Remove old entry"), ButtonData.APPLY);
+                second = new ButtonType(Localization.lang("Remove entry from import"), ButtonData.APPLY);
+                both = new ButtonType(Localization.lang("Keep both"), ButtonData.APPLY);
+                me = new MergeEntries(one, two, Localization.lang("Old entry"),
+                                      Localization.lang("From import"), frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
+                break;
+            case DUPLICATE_SEARCH_WITH_EXACT:
+                first = new ButtonType(Localization.lang("Keep left"), ButtonData.APPLY);
+                second = new ButtonType(Localization.lang("Keep right"), ButtonData.APPLY);
+                both = new ButtonType(Localization.lang("Keep both"), ButtonData.APPLY);
+
+                removeExactVisible = true;
+
+                me = new MergeEntries(one, two, frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
+                break;
+            default:
+                first = new ButtonType(Localization.lang("Import and remove old entry"), ButtonData.APPLY);
+                second = new ButtonType(Localization.lang("Do not import entry"), ButtonData.APPLY);
+                both = new ButtonType(Localization.lang("Import and keep old entry"), ButtonData.APPLY);
+                me = new MergeEntries(one, two, Localization.lang("Old entry"),
+                                      Localization.lang("From import"), frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
+                break;
         }
-        options.add(first);
-        options.add(second);
-        options.add(both);
-        options.add(merge);
-        options.add(Box.createHorizontalStrut(5));
-        options.add(cancel);
-        options.add(helpButton);
-
-        first.addActionListener(e -> buttonPressed(DuplicateResolverResult.KEEP_LEFT));
-        second.addActionListener(e -> buttonPressed(DuplicateResolverResult.KEEP_RIGHT));
-        both.addActionListener(e -> buttonPressed(DuplicateResolverResult.KEEP_BOTH));
-        merge.addActionListener(e -> buttonPressed(DuplicateResolverResult.KEEP_MERGE));
-        if (removeExact != null) {
-            removeExact.addActionListener(e -> buttonPressed(DuplicateResolverResult.AUTOREMOVE_EXACT));
+        if (removeExactVisible) {
+            this.getDialogPane().getButtonTypes().add(removeExact);
         }
 
-        cancel.addActionListener(e -> buttonPressed(DuplicateResolverResult.BREAK));
-        addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e) {
-                buttonPressed(DuplicateResolverResult.BREAK);
-            }
-        });
+        this.getDialogPane().getButtonTypes().addAll(first, second, both, merge, cancel, help);
 
-        getContentPane().add(CustomJFXPanel.wrap(new Scene(me)));
-        getContentPane().add(options, BorderLayout.SOUTH);
-        pack();
+        BorderPane borderPane = new BorderPane(me);
+        borderPane.setBottom(options);
 
-        WindowLocation pw = new WindowLocation(this, JabRefPreferences.DUPLICATES_POS_X,
-                JabRefPreferences.DUPLICATES_POS_Y, JabRefPreferences.DUPLICATES_SIZE_X,
-                JabRefPreferences.DUPLICATES_SIZE_Y);
-        pw.displayWindowAtStoredLocation();
+        this.setResultConverter(button -> {
 
-        both.requestFocus();
-    }
-
-    private void buttonPressed(DuplicateResolverResult result) {
-        status = result;
-        dispose();
-    }
+            if (button.equals(first)) {
+                return DuplicateResolverResult.KEEP_LEFT;
+            } else if (button.equals(second)) {
+                return DuplicateResolverResult.KEEP_RIGHT;
+            } else if (button.equals(both)) {
+                return DuplicateResolverResult.KEEP_BOTH;
+            } else if (button.equals(merge)) {
+                return DuplicateResolverResult.KEEP_MERGE;
+            } else if (button.equals(removeExact)) {
+                return DuplicateResolverResult.AUTOREMOVE_EXACT;
+            }
+            return null;
+        });
 
-    public DuplicateResolverResult getSelected() {
-        return status;
+        getDialogPane().setContent(borderPane);
+        Button helpButton = (Button) this.getDialogPane().lookupButton(help);
+        helpButton.setOnAction(evt -> helpCommand.getCommand().execute());
     }
 
     public BibEntry getMergedEntry() {
diff --git a/src/main/java/org/jabref/gui/DuplicateSearch.java b/src/main/java/org/jabref/gui/DuplicateSearch.java
index 8331483d01f..476b3f70276 100644
--- a/src/main/java/org/jabref/gui/DuplicateSearch.java
+++ b/src/main/java/org/jabref/gui/DuplicateSearch.java
@@ -12,8 +12,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.swing.SwingUtilities;
-
 import org.jabref.Globals;
 import org.jabref.JabRefExecutorService;
 import org.jabref.gui.DuplicateResolverDialog.DuplicateResolverResult;
@@ -37,15 +35,17 @@ public class DuplicateSearch extends SimpleCommand {
     private final AtomicBoolean libraryAnalyzed = new AtomicBoolean();
     private final AtomicBoolean autoRemoveExactDuplicates = new AtomicBoolean();
     private final AtomicInteger duplicateCount = new AtomicInteger();
+    private final DialogService dialogService;
 
-    public DuplicateSearch(JabRefFrame frame) {
+    public DuplicateSearch(JabRefFrame frame, DialogService dialogService) {
         this.frame = frame;
+        this.dialogService = dialogService;
     }
 
     @Override
     public void execute() {
         BasePanel panel = frame.getCurrentBasePanel();
-        panel.output(Localization.lang("Searching for duplicates..."));
+        dialogService.notify(Localization.lang("Searching for duplicates..."));
 
         List<BibEntry> entries = panel.getDatabase().getEntries();
         duplicates.clear();
@@ -57,8 +57,7 @@ public void execute() {
             return;
         }
 
-        JabRefExecutorService.INSTANCE
-                .executeInterruptableTask(() -> searchPossibleDuplicates(entries, panel.getBibDatabaseContext().getMode()), "DuplicateSearcher");
+        JabRefExecutorService.INSTANCE.executeInterruptableTask(() -> searchPossibleDuplicates(entries, panel.getBibDatabaseContext().getMode()), "DuplicateSearcher");
         BackgroundTask.wrap(this::verifyDuplicates)
                       .onSuccess(this::handleDuplicates)
                       .executeWith(Globals.TASK_EXECUTOR);
@@ -124,13 +123,11 @@ private DuplicateSearchResult verifyDuplicates() {
 
     private void askResolveStrategy(DuplicateSearchResult result, BibEntry first, BibEntry second, DuplicateResolverType resolverType) {
         DuplicateResolverDialog dialog = new DuplicateResolverDialog(frame, first, second, resolverType);
-        dialog.setVisible(true);
-        dialog.dispose();
 
-        DuplicateResolverResult resolverResult = dialog.getSelected();
+        DuplicateResolverResult resolverResult = dialog.showAndWait().orElse(DuplicateResolverResult.BREAK);
 
         if ((resolverResult == DuplicateResolverResult.KEEP_LEFT)
-                || (resolverResult == DuplicateResolverResult.AUTOREMOVE_EXACT)) {
+            || (resolverResult == DuplicateResolverResult.AUTOREMOVE_EXACT)) {
             result.remove(second);
             if (resolverResult == DuplicateResolverResult.AUTOREMOVE_EXACT) {
                 autoRemoveExactDuplicates.set(true); // Remember choice
@@ -150,31 +147,30 @@ private void handleDuplicates(DuplicateSearchResult result) {
             return;
         }
 
-        SwingUtilities.invokeLater(() -> {
-            BasePanel panel = frame.getCurrentBasePanel();
-            final NamedCompound compoundEdit = new NamedCompound(Localization.lang("duplicate removal"));
-            // Now, do the actual removal:
-            if (!result.getToRemove().isEmpty()) {
-                for (BibEntry entry : result.getToRemove()) {
-                    panel.getDatabase().removeEntry(entry);
-                    compoundEdit.addEdit(new UndoableRemoveEntry(panel.getDatabase(), entry, panel));
-                }
-                panel.markBaseChanged();
+        BasePanel panel = frame.getCurrentBasePanel();
+        final NamedCompound compoundEdit = new NamedCompound(Localization.lang("duplicate removal"));
+        // Now, do the actual removal:
+        if (!result.getToRemove().isEmpty()) {
+            for (BibEntry entry : result.getToRemove()) {
+                panel.getDatabase().removeEntry(entry);
+                compoundEdit.addEdit(new UndoableRemoveEntry(panel.getDatabase(), entry, panel));
             }
-            // and adding merged entries:
-            if (!result.getToAdd().isEmpty()) {
-                for (BibEntry entry : result.getToAdd()) {
-                    panel.getDatabase().insertEntry(entry);
-                    compoundEdit.addEdit(new UndoableInsertEntry(panel.getDatabase(), entry));
-                }
-                panel.markBaseChanged();
+            panel.markBaseChanged();
+        }
+        // and adding merged entries:
+        if (!result.getToAdd().isEmpty()) {
+            for (BibEntry entry : result.getToAdd()) {
+                panel.getDatabase().insertEntry(entry);
+                compoundEdit.addEdit(new UndoableInsertEntry(panel.getDatabase(), entry));
             }
+            panel.markBaseChanged();
+        }
+
+        dialogService.notify(Localization.lang("Duplicates found") + ": " + duplicateCount.get() + ' '
+                             + Localization.lang("pairs processed") + ": " + result.getDuplicateCount());
+        compoundEdit.end();
+        panel.getUndoManager().addEdit(compoundEdit);
 
-            panel.output(Localization.lang("Duplicates found") + ": " + duplicateCount.get() + ' '
-                    + Localization.lang("pairs processed") + ": " + result.getDuplicateCount());
-            compoundEdit.end();
-            panel.getUndoManager().addEdit(compoundEdit);
-        });
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index d8fd07cb6f2..b1872641c36 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -858,7 +858,7 @@ private MenuBar createMenu() {
         }
 
         quality.getItems().addAll(
-                factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this)),
+                factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this, dialogService)),
                 factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this)),
 
                 new SeparatorMenuItem(),
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java b/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java
index 61434841141..68006125528 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java
@@ -44,12 +44,11 @@ class ResolveDuplicateLabelDialog {
     private boolean okPressed;
     private boolean cancelPressed;
 
-
     public ResolveDuplicateLabelDialog(BasePanel panel, String key, List<BibEntry> entries) {
         diag = new JDialog((JFrame) null, Localization.lang("Duplicate BibTeX key"), true);
 
         FormBuilder b = FormBuilder.create().layout(new FormLayout(
-                "left:pref, 4dlu, fill:pref", "p"));
+                                                                   "left:pref, 4dlu, fill:pref", "p"));
         b.add(new JLabel(Localization.lang("Duplicate BibTeX key") + ": " + key)).xyw(1, 1, 3);
         b.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
@@ -59,7 +58,7 @@ public ResolveDuplicateLabelDialog(BasePanel panel, String key, List<BibEntry> e
             JCheckBox cb = new JCheckBox(Localization.lang("Generate BibTeX key"), !first);
             b.appendRows("1dlu, p");
             b.add(cb).xy(1, row);
-            PreviewPanel previewPanel = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService(), ExternalFileTypes.getInstance());
+            PreviewPanel previewPanel = new PreviewPanel(null, panel.getBibDatabaseContext(), Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), new FXDialogService(), ExternalFileTypes.getInstance());
             previewPanel.setEntry(entry);
             JFXPanel container = CustomJFXPanel.wrap(new Scene(previewPanel));
             container.setPreferredSize(new Dimension(800, 90));
@@ -86,8 +85,8 @@ public ResolveDuplicateLabelDialog(BasePanel panel, String key, List<BibEntry> e
         diag.pack();
 
         ok.addActionListener(e -> {
-                okPressed = true;
-                diag.dispose();
+            okPressed = true;
+            diag.dispose();
         });
 
         ignore.addActionListener(e -> diag.dispose());
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
index ae3dc7c5b4b..2ce86d731c4 100644
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
@@ -695,14 +695,12 @@ public void actionPerformed(ActionEvent event) {
                     // is indicated by the entry's group hit status:
                     if (entry.isGroupHit()) {
 
-                        boolean continuePressed =
-                                DefaultTaskExecutor.runInJavaFXThread(() ->
-                                        frame.getDialogService().showConfirmationDialogWithOptOutAndWait(Localization.lang("Duplicates found"),
-                                                                                                                   Localization.lang("There are possible duplicates (marked with an icon) that haven't been resolved. Continue?"),
-                                                                                                                   Localization.lang("Continue"),
-                                                                                                                   Localization.lang("Cancel"),
-                                                                                                                   Localization.lang("Disable this confirmation dialog"),
-                                                optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION, !optOut)));
+                        boolean continuePressed = DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showConfirmationDialogWithOptOutAndWait(Localization.lang("Duplicates found"),
+                                                                                                                                                               Localization.lang("There are possible duplicates (marked with an icon) that haven't been resolved. Continue?"),
+                                                                                                                                                               Localization.lang("Continue"),
+                                                                                                                                                               Localization.lang("Cancel"),
+                                                                                                                                                               Localization.lang("Disable this confirmation dialog"),
+                                                                                                                                                               optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION, !optOut)));
 
                         if (!continuePressed) {
                             return;
@@ -1053,12 +1051,13 @@ public void mousePressed(MouseEvent e) {
                 if (other.isPresent()) {
                     // This will be true if the duplicate is in the existing
                     // database.
-                    DuplicateResolverDialog diag = new DuplicateResolverDialog(ImportInspectionDialog.this, other.get(),
+                    DuplicateResolverDialog diag = new DuplicateResolverDialog(getFrame(), other.get(),
                                                                                first, DuplicateResolverDialog.DuplicateResolverType.INSPECTION);
-                    diag.setLocationRelativeTo(ImportInspectionDialog.this);
-                    diag.setVisible(true);
+
+                    DuplicateResolverResult result = diag.showAndWait().orElse(DuplicateResolverResult.BREAK);
+
                     ImportInspectionDialog.this.toFront();
-                    if (diag.getSelected() == DuplicateResolverResult.KEEP_LEFT) {
+                    if (result == DuplicateResolverResult.KEEP_LEFT) {
                         // Remove old entry. Or... add it to a list of entries
                         // to be deleted. We only delete
                         // it after Ok is clicked.
@@ -1074,7 +1073,7 @@ public void mousePressed(MouseEvent e) {
                             entries.getReadWriteLock().writeLock().unlock();
                         }
 
-                    } else if (diag.getSelected() == DuplicateResolverResult.KEEP_RIGHT) {
+                    } else if (result == DuplicateResolverResult.KEEP_RIGHT) {
                         // Remove the entry from the import inspection dialog.
                         entries.getReadWriteLock().writeLock().lock();
                         try {
@@ -1082,7 +1081,7 @@ public void mousePressed(MouseEvent e) {
                         } finally {
                             entries.getReadWriteLock().writeLock().unlock();
                         }
-                    } else if (diag.getSelected() == DuplicateResolverResult.KEEP_BOTH) {
+                    } else if (result == DuplicateResolverResult.KEEP_BOTH) {
                         // Do nothing.
                         entries.getReadWriteLock().writeLock().lock();
                         try {
@@ -1090,7 +1089,7 @@ public void mousePressed(MouseEvent e) {
                         } finally {
                             entries.getReadWriteLock().writeLock().unlock();
                         }
-                    } else if (diag.getSelected() == DuplicateResolverResult.KEEP_MERGE) {
+                    } else if (result == DuplicateResolverResult.KEEP_MERGE) {
                         // Remove old entry. Or... add it to a list of entries
                         // to be deleted. We only delete
                         // it after Ok is clicked.
@@ -1114,12 +1113,11 @@ public void mousePressed(MouseEvent e) {
                 // Check if the duplicate is of another entry in the import:
                 other = internalDuplicate(entries, first);
                 if (other.isPresent()) {
-                    DuplicateResolverDialog diag = new DuplicateResolverDialog(ImportInspectionDialog.this, first,
+                    DuplicateResolverDialog diag = new DuplicateResolverDialog(getFrame(), first,
                                                                                other.get(), DuplicateResolverDialog.DuplicateResolverType.DUPLICATE_SEARCH);
-                    diag.setLocationRelativeTo(ImportInspectionDialog.this);
-                    diag.setVisible(true);
+
                     ImportInspectionDialog.this.toFront();
-                    DuplicateResolverResult answer = diag.getSelected();
+                    DuplicateResolverResult answer = diag.showAndWait().get();
                     if (answer == DuplicateResolverResult.KEEP_LEFT) {
                         entries.remove(other.get());
                         first.setGroupHit(false);

From 69661a4a7ca4dc7f33726da3b80e2bfdcd1e0932 Mon Sep 17 00:00:00 2001
From: Christoph <cschwentker@gmail.com>
Date: Sun, 27 Jan 2019 12:04:48 +0100
Subject: [PATCH 229/229] Try to fix not on FX thread for search and
 autocomplete (#4618)

* Try to fix not on FX thread for search and autocomplete

* fix comment text
---
 src/main/java/org/jabref/gui/BasePanel.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index a2e7e5734b6..777c06eaf6f 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -1345,39 +1345,41 @@ public void listen(EntryRemovedEvent entryRemovedEvent) {
     /**
      * Ensures that the search auto completer is up to date when entries are changed AKA Let the auto completer, if any,
      * harvest words from the entry
+     * Actual methods for autocomplete indexing  must run in javafx thread
      */
     private class SearchAutoCompleteListener {
 
         @Subscribe
         public void listen(EntryAddedEvent addedEntryEvent) {
-            searchAutoCompleter.indexEntry(addedEntryEvent.getBibEntry());
+            DefaultTaskExecutor.runInJavaFXThread(() -> searchAutoCompleter.indexEntry(addedEntryEvent.getBibEntry()));
         }
 
         @Subscribe
         public void listen(EntryChangedEvent entryChangedEvent) {
-            searchAutoCompleter.indexEntry(entryChangedEvent.getBibEntry());
+            DefaultTaskExecutor.runInJavaFXThread(() -> searchAutoCompleter.indexEntry(entryChangedEvent.getBibEntry()));
         }
     }
 
     /**
      * Ensures that the results of the current search are updated when a new entry is inserted into the database
+     * Actual methods for performing search must run in javafx thread
      */
     private class SearchListener {
 
         @Subscribe
         public void listen(EntryAddedEvent addedEntryEvent) {
-            frame.getGlobalSearchBar().performSearch();
+            DefaultTaskExecutor.runInJavaFXThread(() -> frame.getGlobalSearchBar().performSearch());
         }
 
         @Subscribe
         public void listen(EntryChangedEvent entryChangedEvent) {
-            frame.getGlobalSearchBar().performSearch();
+            DefaultTaskExecutor.runInJavaFXThread(() -> frame.getGlobalSearchBar().performSearch());
         }
 
         @Subscribe
         public void listen(EntryRemovedEvent removedEntryEvent) {
             // IMO only used to update the status (found X entries)
-            frame.getGlobalSearchBar().performSearch();
+            DefaultTaskExecutor.runInJavaFXThread(() -> frame.getGlobalSearchBar().performSearch());
         }
     }