From 85682e90cae2a7d048d7bb81c039bfc0aebd90fe Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Thu, 21 Feb 2019 22:19:56 +0100
Subject: [PATCH 1/3] Rework import inspection dialog in JavaFX

---
 src/main/java/org/jabref/Globals.java         |    2 +
 src/main/java/org/jabref/gui/Base.css         |   35 +
 .../java/org/jabref/gui/DefaultInjector.java  |    7 +-
 .../jabref/gui/DuplicateResolverDialog.java   |   16 +-
 .../java/org/jabref/gui/DuplicateSearch.java  |    2 +-
 .../org/jabref/gui/EntryTypeViewModel.java    |   34 +-
 src/main/java/org/jabref/gui/JabRefFrame.java |   27 +-
 .../FindUnlinkedFilesDialog.java              |    4 +-
 .../gui/externalfiles/ImportHandler.java      |   61 +-
 .../java/org/jabref/gui/icon/IconTheme.java   |    6 +-
 .../org/jabref/gui/importer/ImportAction.java |   80 +-
 .../gui/importer/ImportEntriesDialog.css      |   11 +
 .../gui/importer/ImportEntriesDialog.fxml     |   24 +
 .../gui/importer/ImportEntriesDialog.java     |  158 ++
 .../gui/importer/ImportEntriesViewModel.java  |  176 ++
 .../gui/importer/ImportInspectionDialog.java  | 1411 -----------------
 .../fetcher/WebSearchPaneViewModel.java       |   30 +-
 .../org/jabref/gui/maintable/MainTable.java   |    3 +-
 .../preferences/BibtexKeyPatternPrefTab.java  |    4 -
 .../jabref/gui/search/GlobalSearchBar.java    |   25 +-
 .../gui/search/matchers/SearchMatcher.java    |   19 -
 .../org/jabref/gui/util/BackgroundTask.java   |    5 +
 .../org/jabref/gui/util/TextFlowLimited.java  |   81 +
 .../jabref/model/database/BibDatabase.java    |    9 +-
 .../java/org/jabref/model/entry/BibEntry.java |   19 -
 .../jabref/preferences/JabRefPreferences.java |    6 -
 26 files changed, 661 insertions(+), 1594 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css
 create mode 100644 src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
 create mode 100644 src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
 delete mode 100644 src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
 delete mode 100644 src/main/java/org/jabref/gui/search/matchers/SearchMatcher.java
 create mode 100644 src/main/java/org/jabref/gui/util/TextFlowLimited.java

diff --git a/src/main/java/org/jabref/Globals.java b/src/main/java/org/jabref/Globals.java
index b86cc83cbd2..634e5ffee85 100644
--- a/src/main/java/org/jabref/Globals.java
+++ b/src/main/java/org/jabref/Globals.java
@@ -9,6 +9,7 @@
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.keyboard.KeyBindingRepository;
+import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
@@ -62,6 +63,7 @@ public class Globals {
     private static DefaultFileUpdateMonitor fileUpdateMonitor;
     private static ThemeLoader themeLoader;
     private static TelemetryClient telemetryClient;
+    public static CountingUndoManager undoManager = new CountingUndoManager();
 
     private Globals() {
     }
diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index ec78513a06b..4da6ec88b8c 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -364,6 +364,11 @@
     -fx-fill: white;
 }
 
+.toggle-button:selected.icon-button:selected {
+    -fx-background-color: transparent;
+    -fx-fill: -jr-selected;
+}
+
 .icon-buttonNoSpaceBottom {
     -fx-padding: 0.5em 0.5em -0.1em 0.5em;
 }
@@ -975,3 +980,33 @@ We want to have a look that matches our icons in the tool-bar */
 .color-palette-region .button {
     -fx-border-width: 0px;
 }
+
+.bibEntry {
+
+}
+
+.bibEntry .type {
+    -fx-font-size: 110%;
+}
+
+.bibEntry .title {
+    -fx-font-size: 110%;
+    -fx-font-weight: bold;
+}
+
+.bibEntry .year {
+    -fx-font-size: 101%;
+    -fx-font-weight: bold;
+}
+
+.bibEntry .journal {
+    -fx-font-size: 101%;
+}
+
+.bibEntry .authors {
+    -fx-font-size: 101%;
+}
+
+.bibEntry .summary {
+    -fx-padding: 1ex 0ex 0ex 0ex;
+}
diff --git a/src/main/java/org/jabref/gui/DefaultInjector.java b/src/main/java/org/jabref/gui/DefaultInjector.java
index e94e6fe8697..23cb5e93521 100644
--- a/src/main/java/org/jabref/gui/DefaultInjector.java
+++ b/src/main/java/org/jabref/gui/DefaultInjector.java
@@ -2,6 +2,8 @@
 
 import java.util.function.Function;
 
+import javax.swing.undo.UndoManager;
+
 import org.jabref.Globals;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.util.TaskExecutor;
@@ -40,7 +42,10 @@ private static Object createDependency(Class<?> clazz) {
             return Globals.getFileUpdateMonitor();
         } else if (clazz == ClipBoardManager.class) {
             return Globals.clipboardManager;
-        } else {
+        } else if (clazz == UndoManager.class) {
+            return Globals.undoManager;
+        }
+        {
             try {
                 return clazz.newInstance();
             } catch (InstantiationException | IllegalAccessException ex) {
diff --git a/src/main/java/org/jabref/gui/DuplicateResolverDialog.java b/src/main/java/org/jabref/gui/DuplicateResolverDialog.java
index 0be0d823c83..858a7c7e7f2 100644
--- a/src/main/java/org/jabref/gui/DuplicateResolverDialog.java
+++ b/src/main/java/org/jabref/gui/DuplicateResolverDialog.java
@@ -12,10 +12,13 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
 public class DuplicateResolverDialog extends BaseDialog<DuplicateResolverResult> {
 
+    private final BibDatabaseContext database;
+
     public enum DuplicateResolverType {
         DUPLICATE_SEARCH,
         IMPORT_CHECK,
@@ -32,13 +35,12 @@ public enum DuplicateResolverResult {
         BREAK
     }
 
-    private final JabRefFrame frame;
     private MergeEntries me;
 
-    public DuplicateResolverDialog(JabRefFrame frame, BibEntry one, BibEntry two, DuplicateResolverType type) {
-        this.frame = frame;
+    public DuplicateResolverDialog(BibEntry one, BibEntry two, DuplicateResolverType type, BibDatabaseContext database) {
         this.setTitle(Localization.lang("Possible duplicate entries"));
         init(one, two, type);
+        this.database = database;
     }
 
     private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
@@ -61,14 +63,14 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
                 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());
+                me = new MergeEntries(one, two, database.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());
+                        Localization.lang("From import"), database.getMode());
                 break;
             case DUPLICATE_SEARCH_WITH_EXACT:
                 first = new ButtonType(Localization.lang("Keep left"), ButtonData.APPLY);
@@ -77,14 +79,14 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
 
                 removeExactVisible = true;
 
-                me = new MergeEntries(one, two, frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
+                me = new MergeEntries(one, two, database.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());
+                        Localization.lang("From import"), database.getMode());
                 break;
         }
         if (removeExactVisible) {
diff --git a/src/main/java/org/jabref/gui/DuplicateSearch.java b/src/main/java/org/jabref/gui/DuplicateSearch.java
index 9e9921f741a..0db4c5df1c2 100644
--- a/src/main/java/org/jabref/gui/DuplicateSearch.java
+++ b/src/main/java/org/jabref/gui/DuplicateSearch.java
@@ -122,7 +122,7 @@ private DuplicateSearchResult verifyDuplicates() {
     }
 
     private void askResolveStrategy(DuplicateSearchResult result, BibEntry first, BibEntry second, DuplicateResolverType resolverType) {
-        DuplicateResolverDialog dialog = new DuplicateResolverDialog(frame, first, second, resolverType);
+        DuplicateResolverDialog dialog = new DuplicateResolverDialog(first, second, resolverType, frame.getCurrentBasePanel().getBibDatabaseContext());
 
         DuplicateResolverResult resolverResult = dialog.showAndWait().orElse(DuplicateResolverResult.BREAK);
 
diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
index d023aa48900..766d449f6c4 100644
--- a/src/main/java/org/jabref/gui/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -1,6 +1,5 @@
 package org.jabref.gui;
 
-import java.util.Arrays;
 import java.util.Optional;
 
 import javafx.beans.property.BooleanProperty;
@@ -15,7 +14,6 @@
 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;
@@ -138,18 +136,30 @@ public void runFetcherWorker() {
         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();
+                final BibEntry entry = result.get();
+                Optional<BibEntry> duplicate = DuplicateCheck.containsDuplicate(basePanel.getDatabase(), entry, basePanel.getBibDatabaseContext().getMode());
+                if ((duplicate.isPresent())) {
+                    DuplicateResolverDialog dialog = new DuplicateResolverDialog(entry, duplicate.get(), DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK, basePanel.getBibDatabaseContext());
+                    switch (dialog.showAndWait().orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK)) {
+                        case KEEP_LEFT:
+                            basePanel.getDatabase().removeEntry(duplicate.get());
+                            basePanel.getDatabase().insertEntry(entry);
+                            break;
+                        case KEEP_BOTH:
+                            basePanel.getDatabase().insertEntry(entry);
+                            break;
+                        case KEEP_MERGE:
+                            basePanel.getDatabase().removeEntry(duplicate.get());
+                            basePanel.getDatabase().insertEntry(dialog.getMergedEntry());
+                            break;
+                        default:
+                            // Do nothing
+                            break;
+                    }
                 } else {
                     // Regenerate CiteKey of imported BibEntry
-                    new BibtexKeyGenerator(basePanel.getBibDatabaseContext(), prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(bibEntry);
-                    basePanel.insertEntry(bibEntry);
+                    new BibtexKeyGenerator(basePanel.getBibDatabaseContext(), prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry);
+                    basePanel.insertEntry(entry);
                 }
                 searchSuccesfulProperty.set(true);
 
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 8e4ca768b05..6df86a6f76d 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -92,7 +92,7 @@
 import org.jabref.gui.help.AboutAction;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.importer.ImportCommand;
-import org.jabref.gui.importer.ImportInspectionDialog;
+import org.jabref.gui.importer.ImportEntriesDialog;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.integrity.IntegrityCheckAction;
 import org.jabref.gui.keyboard.KeyBinding;
@@ -103,6 +103,7 @@
 import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.specialfields.SpecialFieldMenuItemFactory;
 import org.jabref.gui.undo.CountingUndoManager;
+import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.autosaveandbackup.AutosaveManager;
 import org.jabref.logic.autosaveandbackup.BackupManager;
@@ -176,7 +177,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
     private SidePaneManager sidePaneManager;
     private TabPane tabbedPane;
     private PushToApplications pushApplications;
-    private final CountingUndoManager undoManager = new CountingUndoManager();
     private final DialogService dialogService;
     private SidePane sidePane;
 
@@ -794,7 +794,7 @@ private MenuBar createMenu() {
         if (Globals.prefs.getBoolean(JabRefPreferences.SPECIALFIELDSENABLED)) {
             boolean menuItemAdded = false;
             if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RANKING)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.RANKING, factory, undoManager));
+                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.RANKING, factory, Globals.undoManager));
                 menuItemAdded = true;
             }
 
@@ -814,12 +814,12 @@ private MenuBar createMenu() {
             }
 
             if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRIORITY)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.PRIORITY, factory, undoManager));
+                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.PRIORITY, factory, Globals.undoManager));
                 menuItemAdded = true;
             }
 
             if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_READ)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.READ_STATUS, factory, undoManager));
+                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.READ_STATUS, factory, Globals.undoManager));
                 menuItemAdded = true;
             }
 
@@ -1221,21 +1221,16 @@ private boolean readyForAutosave(BibDatabaseContext context) {
     }
 
     /**
-     * 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.
+     * Opens the import inspection dialog to let the user decide which of the given entries to import.
      *
      * @param panel   The BasePanel to add to.
      * @param entries The entries to add.
      */
     private void addImportedEntries(final BasePanel panel, final List<BibEntry> entries) {
-        SwingUtilities.invokeLater(() -> {
-            ImportInspectionDialog diag = new ImportInspectionDialog(JabRefFrame.this, panel,
-                    Localization.lang("Import"), false);
-            diag.addEntries(entries);
-            diag.entryListComplete();
-            diag.setVisible(true);
-            diag.toFront();
-        });
+        BackgroundTask<List<BibEntry>> task = BackgroundTask.wrap(() -> entries);
+        ImportEntriesDialog dialog = new ImportEntriesDialog(panel.getBibDatabaseContext(), task);
+        dialog.setTitle(Localization.lang("Import"));
+        dialog.showAndWait();
     }
 
     public FileHistoryMenu getFileHistory() {
@@ -1406,7 +1401,7 @@ public GlobalSearchBar getGlobalSearchBar() {
     }
 
     public CountingUndoManager getUndoManager() {
-        return undoManager;
+        return Globals.undoManager;
     }
 
     public DialogService getDialogService() {
diff --git a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
index f9e0e8a689c..a4892565632 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
@@ -92,8 +92,8 @@ public FindUnlinkedFilesDialog(JabRefFrame frame) {
                 Globals.prefs.getImportFormatPreferences(),
                 Globals.prefs.getUpdateFieldPreferences(),
                 Globals.getFileUpdateMonitor(),
-                frame.getUndoManager()
-        );
+                frame.getUndoManager(),
+                Globals.stateManager);
 
         initialize();
     }
diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
index 6d0860f53f0..53189b82dbd 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.externalfiles;
 
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -9,19 +10,23 @@
 
 import org.jabref.Globals;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.undo.UndoableInsertEntry;
+import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
 import org.jabref.logic.externalfiles.ExternalFilesContentImporter;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.util.UpdateField;
 import org.jabref.logic.util.UpdateFieldPreferences;
 import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
+import org.jabref.model.groups.GroupEntryChanger;
+import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.metadata.FilePreferences;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.JabRefPreferences;
 
 public class ImportHandler {
 
@@ -32,6 +37,7 @@ public class ImportHandler {
     private final ExternalFilesEntryLinker linker;
     private final ExternalFilesContentImporter contentImporter;
     private final UndoManager undoManager;
+    private final StateManager stateManager;
 
     public ImportHandler(DialogService dialogService,
                          BibDatabaseContext database,
@@ -40,12 +46,14 @@ public ImportHandler(DialogService dialogService,
                          ImportFormatPreferences importFormatPreferences,
                          UpdateFieldPreferences updateFieldPreferences,
                          FileUpdateMonitor fileupdateMonitor,
-                         UndoManager undoManager) {
+                         UndoManager undoManager,
+                         StateManager stateManager) {
 
         this.dialogService = dialogService;
         this.database = database;
         this.updateFieldPreferences = updateFieldPreferences;
         this.fileUpdateMonitor = fileupdateMonitor;
+        this.stateManager = stateManager;
 
         this.linker = new ExternalFilesEntryLinker(externalFileTypes, filePreferences, database);
         this.contentImporter = new ExternalFilesContentImporter(importFormatPreferences);
@@ -83,7 +91,7 @@ public void importAsNewEntries(List<Path> files) {
                 entriesToAdd = Collections.singletonList(createEmptyEntryWithLink(file));
             }
 
-            insertEntries(entriesToAdd);
+            importEntries(entriesToAdd);
             entriesToAdd.forEach(entry -> ce.addEdit(new UndoableInsertEntry(database.getDatabase(), entry)));
         }
         ce.end();
@@ -99,15 +107,52 @@ private BibEntry createEmptyEntryWithLink(Path file) {
 
     public void importEntriesFromBibFiles(Path bibFile) {
         List<BibEntry> entriesToImport = contentImporter.importFromBibFile(bibFile, fileUpdateMonitor);
-        insertEntries(entriesToImport);
+        importEntries(entriesToImport);
     }
 
-    private void insertEntries(List<BibEntry> entries) {
+    public void importEntries(List<BibEntry> entries) {
+        //TODO: Add undo/redo
+        //ce.addEdit(new UndoableInsertEntry(panel.getDatabase(), entry));
+
         database.getDatabase().insertEntries(entries);
 
-        if (Globals.prefs.getBoolean(JabRefPreferences.USE_OWNER)) {
-            // Set owner field to default value
-            UpdateField.setAutomaticFields(entries, true, true, updateFieldPreferences);
+        // Set owner/timestamp
+        UpdateField.setAutomaticFields(entries, updateFieldPreferences);
+
+        // Generate bibtex keys
+        generateKeys(entries);
+
+        // Add to group
+        addToGroups(entries, stateManager.getSelectedGroup(database));
+    }
+
+    private void addToGroups(List<BibEntry> entries, Collection<GroupTreeNode> groups) {
+        for (GroupTreeNode node : groups) {
+            if (node.getGroup() instanceof GroupEntryChanger) {
+                GroupEntryChanger entryChanger = (GroupEntryChanger) node.getGroup();
+                List<FieldChange> undo = entryChanger.add(entries);
+                // TODO: Add undo
+                //if (!undo.isEmpty()) {
+                //    ce.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(new GroupTreeNodeViewModel(node),
+                //            undo));
+                //}
+            }
+        }
+    }
+
+    /**
+     * Generate keys for given entries.
+     *
+     * @param entries entries to generate keys for
+     */
+    private void generateKeys(List<BibEntry> entries) {
+        BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(
+                database.getMetaData().getCiteKeyPattern(Globals.prefs.getBibtexKeyPatternPreferences().getKeyPattern()),
+                database.getDatabase(),
+                Globals.prefs.getBibtexKeyPatternPreferences());
+
+        for (BibEntry entry : entries) {
+            keyGenerator.generateAndSetKey(entry);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 5c0510f862a..5d271c203f1 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -44,6 +44,7 @@ public class IconTheme {
      */
     public static final Color DEFAULT_COLOR = JabRefPreferences.getInstance().getColor(JabRefPreferences.ICON_ENABLED_COLOR);
     public static final Color DEFAULT_DISABLED_COLOR = JabRefPreferences.getInstance().getColor(JabRefPreferences.ICON_DISABLED_COLOR);
+    public static final javafx.scene.paint.Color SELECTED_COLOR = javafx.scene.paint.Color.web("#50618F");
     public static Font FONT;
     private static final String DEFAULT_ICON_PATH = "/images/external/red.png";
     private static final Logger LOGGER = LoggerFactory.getLogger(IconTheme.class);
@@ -179,6 +180,7 @@ public static List<Image> getLogoSetFX() {
     public enum JabRefIcons implements JabRefIcon {
 
         ADD(MaterialDesignIcon.PLUS_CIRCLE_OUTLINE),
+        ADD_FILLED(MaterialDesignIcon.PLUS_CIRCLE),
         ADD_NOBOX(MaterialDesignIcon.PLUS),
         ADD_ENTRY(MaterialDesignIcon.BOOKMARK_PLUS),
         EDIT_ENTRY(MaterialDesignIcon.TOOLTIP_EDIT),
@@ -312,7 +314,9 @@ public enum JabRefIcons implements JabRefIcon {
         NEW_FILE(MaterialDesignIcon.PLUS),
         DOWNLOAD(MaterialDesignIcon.DOWNLOAD),
         OWNER(MaterialDesignIcon.ACCOUNT),
-        CLOSE_JABREF(MaterialDesignIcon.GLASSDOOR);
+        CLOSE_JABREF(MaterialDesignIcon.GLASSDOOR),
+        ARTICLE(MaterialDesignIcon.FILE_DOCUMENT),
+        BOOK(MaterialDesignIcon.BOOK_OPEN_PAGE_VARIANT);
 
         private final JabRefIcon icon;
 
diff --git a/src/main/java/org/jabref/gui/importer/ImportAction.java b/src/main/java/org/jabref/gui/importer/ImportAction.java
index f81bb517c9e..99fa2b36f33 100644
--- a/src/main/java/org/jabref/gui/importer/ImportAction.java
+++ b/src/main/java/org/jabref/gui/importer/ImportAction.java
@@ -9,9 +9,8 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.swing.SwingUtilities;
-
 import org.jabref.Globals;
+import org.jabref.JabRefException;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
@@ -24,6 +23,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.UpdateField;
 import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.KeyCollisionException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibtexString;
@@ -37,10 +37,6 @@ public class ImportAction {
     private Exception importError;
     private final TaskExecutor taskExecutor = Globals.TASK_EXECUTOR;
 
-    public ImportAction(JabRefFrame frame, boolean openInNew) {
-        this(frame, openInNew, null);
-    }
-
     public ImportAction(JabRefFrame frame, boolean openInNew, Importer importer) {
         this.importer = Optional.ofNullable(importer);
         this.frame = frame;
@@ -54,53 +50,41 @@ public ImportAction(JabRefFrame frame, boolean openInNew, Importer importer) {
      */
     public void automatedImport(List<String> filenames) {
         List<Path> files = filenames.stream().map(Paths::get).collect(Collectors.toList());
-        BackgroundTask.wrap(() -> doImport(files))
-                      .onSuccess(this::reportResult)
-                      .executeWith(taskExecutor);
-    }
-
-    private void reportResult(List<ImportFormatReader.UnknownFormatImport> imports) {
-        // Ok, done. Then try to gather in all we have found. Since we might
-        // have found
-        // one or more bibtex results, it's best to gather them in a
-        // BibDatabase.
-        ParserResult bibtexResult = mergeImportResults(imports);
-
-        /* show parserwarnings, if any. */
-        for (ImportFormatReader.UnknownFormatImport p : imports) {
-            if (p != null) {
-                ParserResult pr = p.parserResult;
-                ParserResultWarningDialog.showParserResultWarningDialog(pr, frame);
-            }
-        }
-
-        if (bibtexResult == null) {
-            if (importer == null) {
-                frame.output(Localization.lang("Could not find a suitable import format."));
-            } else {
-                // Import in a specific format was specified. Check if we have stored error information:
+        BackgroundTask<List<BibEntry>> task = BackgroundTask.wrap(() -> {
+            List<ImportFormatReader.UnknownFormatImport> imports = doImport(files);
+            // Ok, done. Then try to gather in all we have found. Since we might
+            // have found
+            // one or more bibtex results, it's best to gather them in a
+            // BibDatabase.
+            ParserResult bibtexResult = mergeImportResults(imports);
+
+            // TODO: show parserwarnings, if any (not here)
+            // for (ImportFormatReader.UnknownFormatImport p : imports) {
+            //    ParserResultWarningDialog.showParserResultWarningDialog(p.parserResult, frame);
+            //}
+            if (bibtexResult == null) {
                 if (importError == null) {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Import failed"),
-                                                         Localization.lang("No entries found. Please make sure you are using the correct import filter."));
+                    throw new JabRefException(Localization.lang("No entries found. Please make sure you are using the correct import filter."));
                 } else {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Import failed"), importError);
+                    throw importError;
                 }
             }
+
+            return bibtexResult.getDatabase().getEntries();
+        });
+
+        if (openInNew) {
+            task.onSuccess(entries -> {
+                frame.addTab(new BibDatabaseContext(new BibDatabase(entries)), true);
+                dialogService.notify(Localization.lang("Imported entries") + ": " + entries.size());
+            })
+                .executeWith(taskExecutor);
         } else {
-            if (openInNew) {
-                frame.addTab(bibtexResult.getDatabaseContext(), true);
-                frame.output(Localization.lang("Imported entries") + ": " + bibtexResult.getDatabase().getEntryCount());
-            } else {
-                final BasePanel panel = frame.getCurrentBasePanel();
-
-                SwingUtilities.invokeLater(() -> {
-                    ImportInspectionDialog diag = new ImportInspectionDialog(frame, panel, Localization.lang("Import"), false);
-                    diag.addEntries(bibtexResult.getDatabase().getEntries());
-                    diag.entryListComplete();
-                    diag.setVisible(true);
-                    diag.toFront();
-                });
-            }
+            final BasePanel panel = frame.getCurrentBasePanel();
+
+            ImportEntriesDialog dialog = new ImportEntriesDialog(panel.getBibDatabaseContext(), task);
+            dialog.setTitle(Localization.lang("Import"));
+            dialog.showAndWait();
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css
new file mode 100644
index 00000000000..0fe81f0b524
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css
@@ -0,0 +1,11 @@
+.addEntryButton {
+    -fx-font-size: 2em;
+}
+
+.entry-container {
+    /*-fx-padding: 0.5em 0em 0.5em 0em;*/
+}
+
+.entry-container:entry-selected {
+    /*-fx-background-color: derive(-jr-selected, 60%);*/
+}
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
new file mode 100644
index 00000000000..db855229fe6
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
@@ -0,0 +1,24 @@
+<?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.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import org.controlsfx.control.CheckListView?>
+<DialogPane xmlns:fx="http://javafx.com/fxml"
+            xmlns="http://javafx.com/javafx"
+            fx:controller="org.jabref.gui.importer.ImportEntriesDialog"
+            prefHeight="700.0" prefWidth="1000.0">
+    <content>
+        <VBox>
+            <CheckListView fx:id="entriesListView" VBox.vgrow="ALWAYS"/>
+            <HBox>
+                <Button text="%Select all new entries" styleClass="text-button" onAction="#selectAllNewEntries"/>
+                <Button text="%Unselect all" styleClass="text-button" onAction="#unselectAll"/>
+            </HBox>
+        </VBox>
+    </content>
+    <ButtonType fx:id="importButton" text="%Import entries" buttonData="OK_DONE"/>
+    <ButtonType fx:constant="CANCEL"/>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
new file mode 100644
index 00000000000..0d025467088
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -0,0 +1,158 @@
+package org.jabref.gui.importer;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.swing.undo.UndoManager;
+
+import javafx.css.PseudoClass;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Text;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.BindingsHelper;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.gui.util.TextFlowLimited;
+import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.FieldName;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import org.controlsfx.control.CheckListView;
+import org.fxmisc.easybind.EasyBind;
+
+public class ImportEntriesDialog extends BaseDialog<Void> {
+
+    public CheckListView<BibEntry> entriesListView;
+    public ButtonType importButton;
+    private final BackgroundTask<List<BibEntry>> task;
+    private ImportEntriesViewModel viewModel;
+    @Inject private TaskExecutor taskExecutor;
+    @Inject private DialogService dialogService;
+    @Inject private UndoManager undoManager;
+    private BibDatabaseContext database;
+
+    public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<List<BibEntry>> task) {
+        this.database = database;
+        this.task = task;
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        setResultConverter(button -> {
+            if (button == importButton) {
+                viewModel.importEntries(entriesListView.getCheckModel().getCheckedItems());
+            } else {
+                dialogService.notify(Localization.lang("Import canceled"));
+            }
+
+            return null;
+        });
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new ImportEntriesViewModel(task, taskExecutor, database, dialogService, undoManager);
+
+        Label placeholder = new Label();
+        placeholder.textProperty().bind(viewModel.messageProperty());
+        entriesListView.setPlaceholder(placeholder);
+        entriesListView.setItems(viewModel.getEntries());
+
+        PseudoClass entrySelected = PseudoClass.getPseudoClass("entry-selected");
+        new ViewModelListCellFactory<BibEntry>()
+                .withGraphic(entry -> {
+                    ToggleButton addToggle = IconTheme.JabRefIcons.ADD.asToggleButton();
+                    EasyBind.subscribe(addToggle.selectedProperty(), selected -> {
+                        if (selected) {
+                            addToggle.setGraphic(IconTheme.JabRefIcons.ADD_FILLED.withColor(IconTheme.SELECTED_COLOR).getGraphicNode());
+                        } else {
+                            addToggle.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
+                        }
+                    });
+                    addToggle.getStyleClass().add("addEntryButton");
+                    addToggle.selectedProperty().bindBidirectional(entriesListView.getItemBooleanProperty(entry));
+                    HBox separator = new HBox();
+                    HBox.setHgrow(separator, Priority.SOMETIMES);
+                    Node entryNode = getEntryNode(entry);
+                    HBox.setHgrow(entryNode, Priority.ALWAYS);
+                    HBox container = new HBox(entryNode, separator, addToggle);
+                    container.getStyleClass().add("entry-container");
+                    BindingsHelper.includePseudoClassWhen(container, entrySelected, addToggle.selectedProperty());
+
+                    if (viewModel.hasDuplicate(entry)) {
+                        Button duplicateButton = IconTheme.JabRefIcons.DUPLICATE.asButton();
+                        duplicateButton.setTooltip(new Tooltip(Localization.lang("Possible duplicate of existing entry. Click to resolve.")));
+                        duplicateButton.setOnAction(event -> viewModel.resolveDuplicate(entry));
+                        container.getChildren().add(1, duplicateButton);
+                    }
+
+                    return container;
+                })
+                .install(entriesListView);
+    }
+
+    private Node getEntryNode(BibEntry entry) {
+        Node entryType = getIcon(entry.getType()).getGraphicNode();
+        entryType.getStyleClass().add("type");
+        Label authors = new Label(entry.getFieldOrAliasLatexFree(FieldName.AUTHOR).orElse(""));
+        authors.getStyleClass().add("authors");
+        Label title = new Label(entry.getFieldOrAliasLatexFree(FieldName.TITLE).orElse(""));
+        title.getStyleClass().add("title");
+        Label year = new Label(entry.getFieldOrAliasLatexFree(FieldName.YEAR).orElse(""));
+        year.getStyleClass().add("year");
+        Label journal = new Label(entry.getFieldOrAliasLatexFree(FieldName.JOURNAL).orElse(""));
+        journal.getStyleClass().add("journal");
+
+        VBox entryContainer = new VBox(
+                new HBox(10, entryType, title),
+                new HBox(5, year, journal),
+                authors
+        );
+        entry.getFieldOrAliasLatexFree(FieldName.ABSTRACT).ifPresent(summaryText -> {
+            TextFlowLimited summary = new TextFlowLimited(new Text(summaryText));
+            summary.getStyleClass().add("summary");
+            entryContainer.getChildren().add(summary);
+        });
+
+        entryContainer.getStyleClass().add("bibEntry");
+        return entryContainer;
+    }
+
+    private IconTheme.JabRefIcons getIcon(String type) {
+        switch (type.toLowerCase()) {
+            case "book":
+                return IconTheme.JabRefIcons.BOOK;
+            default:
+                return IconTheme.JabRefIcons.ARTICLE;
+        }
+    }
+
+    public void unselectAll() {
+        entriesListView.getCheckModel().clearChecks();
+    }
+
+    public void selectAllNewEntries() {
+        unselectAll();
+        for (BibEntry entry : entriesListView.getItems()) {
+            if (!viewModel.hasDuplicate(entry)) {
+                entriesListView.getCheckModel().check(entry);
+            }
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
new file mode 100644
index 00000000000..af3e89319a0
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -0,0 +1,176 @@
+package org.jabref.gui.importer;
+
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.Globals;
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.DuplicateResolverDialog;
+import org.jabref.gui.externalfiles.ImportHandler;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.bibtex.DuplicateCheck;
+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 ImportEntriesViewModel extends AbstractViewModel {
+
+    private final BackgroundTask<List<BibEntry>> task;
+    private final StringProperty message;
+    private final BibDatabaseContext database;
+    private final DialogService dialogService;
+    private final UndoManager undoManager;
+    private ObservableList<BibEntry> entries;
+
+    public ImportEntriesViewModel(BackgroundTask<List<BibEntry>> task, TaskExecutor taskExecutor, BibDatabaseContext database, DialogService dialogService, UndoManager undoManager) {
+        this.task = task;
+        this.database = database;
+        this.dialogService = dialogService;
+        this.undoManager = undoManager;
+        this.entries = FXCollections.observableArrayList();
+        this.message = new SimpleStringProperty();
+        this.message.bind(task.messageProperty());
+
+        task.onSuccess(entriesToImport -> entries.addAll(entriesToImport))
+            .executeWith(taskExecutor);
+    }
+
+    public String getMessage() {
+        return message.get();
+    }
+
+    public StringProperty messageProperty() {
+        return message;
+    }
+
+    public ObservableList<BibEntry> getEntries() {
+        return entries;
+    }
+
+    public boolean hasDuplicate(BibEntry entry) {
+        return findInternalDuplicate(entry).isPresent()
+                ||
+                DuplicateCheck.containsDuplicate(database.getDatabase(), entry, database.getMode()).isPresent();
+    }
+
+    public void importEntries(List<BibEntry> entriesToImport) {
+        // Check if we are supposed to warn about duplicates.
+        // If so, then see if there are duplicates, and warn if yes.
+        if (Globals.prefs.getBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION)) {
+            boolean containsDuplicate = entriesToImport.stream()
+                                                       .anyMatch(this::hasDuplicate);
+
+            if (containsDuplicate) {
+                boolean continueImport = dialogService.showConfirmationDialogWithOptOutAndWait(Localization.lang("Duplicates found"),
+                        Localization.lang("There are possible duplicates (marked with an icon) that haven't been resolved. Continue?"),
+                        Localization.lang("Continue with import"),
+                        Localization.lang("Cancel import"),
+                        Localization.lang("Disable this confirmation dialog"),
+                        optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION, !optOut));
+
+                if (!continueImport) {
+                    dialogService.notify(Localization.lang("Import canceled"));
+                    return;
+                }
+            }
+        }
+
+        ImportHandler importHandler = new ImportHandler(
+                dialogService,
+                database,
+                ExternalFileTypes.getInstance(),
+                Globals.prefs.getFilePreferences(),
+                Globals.prefs.getImportFormatPreferences(),
+                Globals.prefs.getUpdateFieldPreferences(),
+                Globals.getFileUpdateMonitor(),
+                undoManager,
+                Globals.stateManager);
+        importHandler.importEntries(entriesToImport);
+
+        dialogService.notify(Localization.lang("Number of entries successfully imported") + ": " + entriesToImport.size());
+    }
+
+    /**
+     * Checks if there are duplicates to the given entry in the list of entries to be imported.
+     *
+     * @param entry The entry to search for duplicates of.
+     * @return A possible duplicate, if any, or null if none were found.
+     */
+    private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
+        for (BibEntry othEntry : entries) {
+            if (othEntry.equals(entry)) {
+                continue; // Don't compare the entry to itself
+            }
+            if (DuplicateCheck.isDuplicate(entry, othEntry, database.getMode())) {
+                return Optional.of(othEntry);
+            }
+        }
+        return Optional.empty();
+    }
+
+    public void resolveDuplicate(BibEntry entry) {
+        // First, try to find duplicate in the existing library
+        Optional<BibEntry> other = DuplicateCheck.containsDuplicate(database.getDatabase(), entry, database.getMode());
+        if (other.isPresent()) {
+            DuplicateResolverDialog dialog = new DuplicateResolverDialog(other.get(),
+                    entry, DuplicateResolverDialog.DuplicateResolverType.INSPECTION, database);
+
+            DuplicateResolverDialog.DuplicateResolverResult result = dialog.showAndWait().orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK);
+
+            if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT) {
+                // TODO: Remove old entry. Or... add it to a list of entries
+                // to be deleted. We only delete
+                // it after Ok is clicked.
+                // entriesToDelete.add(other.get());
+            } else if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT) {
+                // Remove the entry from the import inspection dialog.
+                entries.remove(entry);
+            } else if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH) {
+                // Do nothing.
+            } else if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE) {
+                // TODO: Remove old entry. Or... add it to a list of entries
+                // to be deleted. We only delete
+                // it after Ok is clicked.
+                //entriesToDelete.add(other.get());
+
+                // Replace entry by merged entry
+                entries.add(dialog.getMergedEntry());
+                entries.remove(entry);
+            }
+            return;
+        }
+        // Second, check if the duplicate is of another entry in the import:
+        other = findInternalDuplicate(entry);
+        if (other.isPresent()) {
+            DuplicateResolverDialog diag = new DuplicateResolverDialog(entry,
+                    other.get(), DuplicateResolverDialog.DuplicateResolverType.DUPLICATE_SEARCH, database);
+
+            DuplicateResolverDialog.DuplicateResolverResult answer = diag.showAndWait().orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK);
+            if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT) {
+                // Remove other entry
+                entries.remove(other.get());
+            } else if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT) {
+                // Remove entry
+                entries.remove(entry);
+            } else if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH) {
+                // Do nothing
+            } else if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE) {
+                // Replace both entries by merged entry
+                entries.add(diag.getMergedEntry());
+                entries.remove(entry);
+                entries.remove(other.get());
+            }
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
deleted file mode 100644
index 6906a6e36cc..00000000000
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ /dev/null
@@ -1,1411 +0,0 @@
-package org.jabref.gui.importer;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-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.InputMap;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JProgressBar;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.JTable;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumnModel;
-import javax.swing.table.TableModel;
-
-import javafx.embed.swing.JFXPanel;
-import javafx.scene.Scene;
-
-import org.jabref.Globals;
-import org.jabref.JabRefExecutorService;
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.BasePanelPreferences;
-import org.jabref.gui.DuplicateResolverDialog;
-import org.jabref.gui.DuplicateResolverDialog.DuplicateResolverResult;
-import org.jabref.gui.GUIGlobals;
-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.externalfiles.AutoSetLinks;
-import org.jabref.gui.externalfiles.DownloadExternalFile;
-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.filelist.LinkedFileEditDialogView;
-import org.jabref.gui.groups.GroupTreeNodeViewModel;
-import org.jabref.gui.groups.UndoableChangeEntriesOfGroup;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.renderer.GeneralRenderer;
-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.comparator.IconComparator;
-import org.jabref.logic.bibtex.DuplicateCheck;
-import org.jabref.logic.bibtex.comparator.FieldComparator;
-import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.importer.OutputPrinter;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.UpdateField;
-import org.jabref.model.Defaults;
-import org.jabref.model.FieldChange;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.AuthorList;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.FieldName;
-import org.jabref.model.entry.FieldProperty;
-import org.jabref.model.entry.IdGenerator;
-import org.jabref.model.entry.InternalBibtexFields;
-import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.groups.AllEntriesGroup;
-import org.jabref.model.groups.GroupEntryChanger;
-import org.jabref.model.groups.GroupTreeNode;
-import org.jabref.model.metadata.MetaData;
-import org.jabref.model.strings.StringUtil;
-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.AbstractTableComparatorChooser;
-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 ca.odell.glazedlists.swing.TableComparatorChooser;
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.builder.ButtonStackBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Dialog to allow the selection of entries as part of an Import.
- * <p>
- * The usual way to use this class is to pass it to an Importer which will do
- * the following:
- * <ul>
- * <li>Register itself as a callback to get notified if the user wants to stop
- * the import.</li>
- * <li>Call setVisible(true) to display the dialog</li>
- * <li>For each entry that has been found call addEntry(...)</li>
- * <li>Call entryListComplete() after all entries have been fetched</li>
- * </ul>
- * <p>
- * If the importer wants to cancel the import, it should call the dispose()
- * method.
- * <p>
- * If the importer receives the stopFetching-call, it should stop fetching as
- * soon as possible (it is not really critical, but good style to not contribute
- * any more results via addEntry, call entryListComplete() or dispose(), after
- * receiving this call).
- */
-
-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);
-    private static final int DUPL_COL = 1;
-    private static final int FILE_COL = 2;
-    private static final int URL_COL = 3;
-    private static final int PAD = 4;
-    private final JabRefFrame frame;
-    private final BibDatabaseContext bibDatabaseContext;
-    private final JSplitPane contentPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
-    private final JTable glTable;
-    private final TableComparatorChooser<BibEntry> comparatorChooser;
-    private final DefaultEventSelectionModel<BibEntry> selectionModel;
-    private final JProgressBar progressBar = new JProgressBar(SwingConstants.HORIZONTAL);
-    private final JButton ok = new JButton(Localization.lang("OK"));
-    private final JButton generate = new JButton(Localization.lang("Generate now"));
-    private final EventList<BibEntry> entries = new BasicEventList<>();
-    private final SortedList<BibEntry> sortedList;
-    /**
-     * Duplicate resolving may require deletion of old entries.
-     */
-    private final List<BibEntry> entriesToDelete = new ArrayList<>();
-    private final String undoName;
-    private final boolean newDatabase;
-    private final JPopupMenu popup = new JPopupMenu();
-    private final JButton deselectAllDuplicates = new JButton(Localization.lang("Deselect all duplicates"));
-    private final JButton stop = new JButton(Localization.lang("Stop"));
-    private final PreviewPanel preview;
-    private final Map<BibEntry, Set<GroupTreeNode>> groupAdditions = new HashMap<>();
-    private final JCheckBox autoGenerate = new JCheckBox(Localization.lang("Generate keys"),
-                                                         Globals.prefs.getBoolean(JabRefPreferences.GENERATE_KEYS_AFTER_INSPECTION));
-    private final JLabel duplLabel = new JLabel(IconTheme.JabRefIcons.DUPLICATE.getSmallIcon());
-    private final JLabel fileLabel = new JLabel(IconTheme.JabRefIcons.FILE.getSmallIcon());
-    private final JLabel urlLabel = new JLabel(IconTheme.JabRefIcons.WWW.getSmallIcon());
-    private BasePanel panel;
-    private boolean generatedKeys; // Set to true after keys have been generated.
-    private boolean defaultSelected = true;
-
-    /**
-     * Creates a dialog that displays the given list of fields in the table. The
-     * dialog allows another process to add entries dynamically while the dialog
-     * is shown.
-     *
-     * @param frame
-     * @param panel
-     */
-    public ImportInspectionDialog(JabRefFrame frame, BasePanel panel, String undoName, boolean newDatabase) {
-        super(ImportInspectionDialog.class);
-        this.frame = frame;
-        this.panel = panel;
-        this.bibDatabaseContext = (panel == null) ? null : panel.getBibDatabaseContext();
-        this.undoName = undoName;
-        this.newDatabase = newDatabase;
-        setIconImages(IconTheme.getLogoSet());
-        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."));
-
-        sortedList = new SortedList<>(entries);
-        DefaultEventTableModel<BibEntry> tableModelGl = (DefaultEventTableModel<BibEntry>) GlazedListsSwing
-                                                                                                           .eventTableModelWithThreadProxyList(sortedList, new EntryTableFormat());
-        glTable = new EntryTable(tableModelGl);
-        GeneralRenderer renderer = new GeneralRenderer(Color.white);
-        glTable.setDefaultRenderer(JLabel.class, renderer);
-        glTable.setDefaultRenderer(String.class, renderer);
-        glTable.getInputMap().put(Globals.getKeyPrefs().getKey(KeyBinding.DELETE_ENTRY), "delete");
-        DeleteListener deleteListener = new DeleteListener();
-        glTable.getActionMap().put("delete", deleteListener);
-
-        selectionModel = (DefaultEventSelectionModel<BibEntry>) GlazedListsSwing
-                                                                                .eventSelectionModelWithThreadProxyList(sortedList);
-        glTable.setSelectionModel(selectionModel);
-        selectionModel.getSelected().addListEventListener(new EntrySelectionListener());
-        comparatorChooser = TableComparatorChooser.install(glTable, sortedList,
-                                                           AbstractTableComparatorChooser.MULTIPLE_COLUMN_KEYBOARD);
-        setupComparatorChooser();
-        glTable.addMouseListener(new TableClickListener());
-
-        setWidths();
-
-        getContentPane().setLayout(new BorderLayout());
-        progressBar.setIndeterminate(true);
-        JPanel centerPan = new JPanel();
-        centerPan.setLayout(new BorderLayout());
-
-        contentPane.setTopComponent(new JScrollPane(glTable));
-        JFXPanel container = CustomJFXPanel.wrap(new Scene(preview));
-        contentPane.setBottomComponent(container);
-
-        centerPan.add(contentPane, BorderLayout.CENTER);
-        centerPan.add(progressBar, BorderLayout.SOUTH);
-
-        popup.add(deleteListener);
-        popup.addSeparator();
-        if (!newDatabase && (bibDatabaseContext != null) && bibDatabaseContext.getMetaData().getGroups().isPresent()) {
-            GroupTreeNode node = bibDatabaseContext.getMetaData().getGroups().get();
-            JMenu groupsAdd = new JMenu(Localization.lang("Add to group"));
-            groupsAdd.setEnabled(false); // Will get enabled if there are groups that can be added to.
-            insertNodes(groupsAdd, node);
-            popup.add(groupsAdd);
-        }
-
-        // Add "Attach file" menu choices to right click menu:
-        popup.add(new LinkLocalFile());
-        popup.add(new DownloadFile());
-        popup.add(new InternalAutoSetLinks());
-        popup.add(new AttachUrl());
-        getContentPane().add(centerPan, BorderLayout.CENTER);
-
-        ButtonBarBuilder bb = new ButtonBarBuilder();
-        bb.addGlue();
-        bb.addButton(ok);
-        bb.addButton(stop);
-        JButton cancel = new JButton(Localization.lang("Cancel"));
-        bb.addButton(cancel);
-        bb.addRelatedGap();
-        JButton help = new HelpAction(HelpFile.IMPORT_INSPECTION).getHelpButton();
-        bb.addButton(help);
-        bb.addGlue();
-        bb.getPanel().setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-
-        ButtonStackBuilder builder = new ButtonStackBuilder();
-        JButton selectAll = new JButton(Localization.lang("Select all"));
-        builder.addButton(selectAll);
-        JButton deselectAll = new JButton(Localization.lang("Deselect all"));
-        builder.addButton(deselectAll);
-        builder.addButton(deselectAllDuplicates);
-        builder.addRelatedGap();
-        JButton delete = new JButton(Localization.lang("Delete"));
-        builder.addButton(delete);
-        builder.addRelatedGap();
-        builder.addFixed(autoGenerate);
-        builder.addButton(generate);
-        builder.getPanel().setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-        centerPan.add(builder.getPanel(), BorderLayout.WEST);
-
-        ok.setEnabled(false);
-        generate.setEnabled(false);
-        ok.addActionListener(new OkListener());
-        cancel.addActionListener(e -> {
-            dispose();
-            frame.output(Localization.lang("Import canceled by user"));
-        });
-        generate.addActionListener(e -> {
-            generate.setEnabled(false);
-            generatedKeys = true; // To prevent the button from getting
-            // enabled again.
-            generateKeys(); // Generate the keys.
-        });
-        stop.addActionListener(e -> {
-            entryListComplete();
-        });
-        selectAll.addActionListener(new SelectionButton(true));
-        deselectAll.addActionListener(new SelectionButton(false));
-        deselectAllDuplicates.addActionListener(e -> {
-            for (int i = 0; i < glTable.getRowCount(); i++) {
-                if (glTable.getValueAt(i, DUPL_COL) != null) {
-                    glTable.setValueAt(false, i, 0);
-                }
-            }
-            glTable.repaint();
-        });
-        deselectAllDuplicates.setEnabled(false);
-        delete.addActionListener(deleteListener);
-        getContentPane().add(bb.getPanel(), BorderLayout.SOUTH);
-
-        // Remember and default to last size:
-        setSize(new Dimension(Globals.prefs.getInt(JabRefPreferences.IMPORT_INSPECTION_DIALOG_WIDTH),
-                              Globals.prefs.getInt(JabRefPreferences.IMPORT_INSPECTION_DIALOG_HEIGHT)));
-        addWindowListener(new WindowAdapter() {
-
-            @Override
-            public void windowOpened(WindowEvent e) {
-                contentPane.setDividerLocation(0.5f);
-            }
-
-            @Override
-            public void windowClosed(WindowEvent e) {
-                Globals.prefs.putInt(JabRefPreferences.IMPORT_INSPECTION_DIALOG_WIDTH, getSize().width);
-                Globals.prefs.putInt(JabRefPreferences.IMPORT_INSPECTION_DIALOG_HEIGHT, getSize().height);
-            }
-        });
-        // Key bindings:
-        Action closeAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        };
-        ActionMap am = contentPane.getActionMap();
-        InputMap im = contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", closeAction);
-
-    }
-
-    public void addEntries(Collection<BibEntry> entriesToAdd) {
-
-        for (BibEntry entry : entriesToAdd) {
-            // We exploit the entry's search status for indicating "Keep"
-            // status:
-            entry.setSearchHit(defaultSelected);
-            // We exploit the entry's group status for indicating duplicate
-            // status.
-            // Checking duplicates means both checking against the background
-            // database (if
-            // applicable) and against entries already in the table.
-            if ((panel != null) && (DuplicateCheck
-                                                  .containsDuplicate(panel.getDatabase(), entry, panel.getBibDatabaseContext().getMode()).isPresent()
-                                    || (internalDuplicate(this.entries, entry).isPresent()))) {
-                entry.setGroupHit(true);
-                SwingUtilities.invokeLater(() -> deselectAllDuplicates.setEnabled(true));
-            }
-            this.entries.getReadWriteLock().writeLock().lock();
-            try {
-                this.entries.add(entry);
-            } finally {
-                this.entries.getReadWriteLock().writeLock().unlock();
-            }
-        }
-    }
-
-    /**
-     * Checks if there are duplicates to the given entry in the Collection. Does
-     * not report the entry as duplicate of itself if it is in the Collection.
-     *
-     * @param entriesDupe A Collection of BibEntry instances.
-     * @param entry       The entry to search for duplicates of.
-     * @return A possible duplicate, if any, or null if none were found.
-     */
-    private Optional<BibEntry> internalDuplicate(Collection<BibEntry> entriesDupe, BibEntry entry) {
-        for (BibEntry othEntry : entriesDupe) {
-            if (othEntry.equals(entry)) {
-                continue; // Don't compare the entry to itself
-            }
-            if (DuplicateCheck.isDuplicate(entry, othEntry, panel.getBibDatabaseContext().getMode())) {
-                return Optional.of(othEntry);
-            }
-        }
-        return Optional.empty();
-    }
-
-    public void entryListComplete() {
-        SwingUtilities.invokeLater(() -> {
-            progressBar.setIndeterminate(false);
-            progressBar.setVisible(false);
-            ok.setEnabled(true);
-            if (!generatedKeys) {
-                generate.setEnabled(true);
-            }
-            stop.setEnabled(false);
-
-            //This is for selecting and displaying the first entry in the glTable
-            this.glTable.repaint();
-            if ((this.glTable.getSelectedRowCount() == 0) && (this.glTable.getRowCount() > 0)) {
-                this.glTable.setRowSelectionInterval(0, 0); //Select first row in the table
-            }
-        });
-    }
-
-    /**
-     * Generate key for an entry.
-     */
-    private void generateKeyForEntry(BibEntry entry) {
-
-        entries.getReadWriteLock().writeLock().lock();
-        try {
-            BibDatabase database;
-            MetaData localMetaData;
-
-            // Relate to existing database, if any:
-            if (panel == null) {
-                database = new BibDatabase();
-                localMetaData = new MetaData();
-            } else {
-                database = panel.getDatabase();
-                localMetaData = panel.getBibDatabaseContext().getMetaData();
-            }
-
-            entry.setId(IdGenerator.next());
-            // Add the entry to the database we are working with:
-            database.insertEntry(entry);
-
-            // Generate a unique key:
-            new BibtexKeyGenerator(localMetaData.getCiteKeyPattern(Globals.prefs.getBibtexKeyPatternPreferences().getKeyPattern()),
-                                   database, Globals.prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry);
-            // Remove the entry from the database again, since we only added it in
-            // order to
-            // make sure the key was unique:
-            database.removeEntry(entry);
-        } finally {
-            entries.getReadWriteLock().writeLock().unlock();
-        }
-        glTable.repaint();
-    }
-
-    /**
-     * Generate keys for all entries. All keys will be unique with respect to
-     * one another, and, if they are destined for an existing database, with
-     * respect to existing keys in the database.
-     */
-    private void generateKeys() {
-        entries.getReadWriteLock().writeLock().lock();
-        try {
-
-            BibDatabase database;
-            MetaData localMetaData;
-
-            // Relate to existing database, if any:
-            if (panel == null) {
-                database = new BibDatabase();
-                localMetaData = new MetaData();
-            } else {
-                database = panel.getDatabase();
-                localMetaData = panel.getBibDatabaseContext().getMetaData();
-            }
-
-            List<Optional<String>> keys = new ArrayList<>(entries.size());
-            // Iterate over the entries, add them to the database we are working
-            // with,
-            // and generate unique keys:
-            for (BibEntry entry : entries) {
-
-                entry.setId(IdGenerator.next());
-                database.insertEntry(entry);
-
-                new BibtexKeyGenerator(localMetaData.getCiteKeyPattern(Globals.prefs.getBibtexKeyPatternPreferences().getKeyPattern()),
-                                       database, Globals.prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry);
-                // Add the generated key to our list:   -- TODO: Why??
-                keys.add(entry.getCiteKeyOptional());
-            }
-
-            preview.update();
-            // Remove the entries from the database again, since they are not
-            // supposed to
-            // added yet. They only needed to be in it while we generated the keys,
-            // to keep
-            // control over key uniqueness.
-            for (BibEntry entry : entries) {
-                database.removeEntry(entry);
-            }
-        } finally {
-            entries.getReadWriteLock().writeLock().unlock();
-        }
-
-        glTable.repaint();
-    }
-
-    private void insertNodes(JMenu menu, GroupTreeNode node) {
-        final AbstractAction action = getAction(node);
-
-        if (node.getNumberOfChildren() == 0) {
-            menu.add(action);
-            if (action.isEnabled()) {
-                menu.setEnabled(true);
-            }
-            return;
-        }
-
-        JMenu submenu;
-        if (node.getGroup() instanceof AllEntriesGroup) {
-            for (GroupTreeNode child : node.getChildren()) {
-                insertNodes(menu, child);
-            }
-        } else {
-            submenu = new JMenu('[' + node.getName() + ']');
-            // setEnabled(true) is done above/below if at least one menu
-            // entry (item or submenu) is enabled
-            submenu.setEnabled(action.isEnabled());
-            submenu.add(action);
-            submenu.add(new JPopupMenu.Separator());
-            for (GroupTreeNode child : node.getChildren()) {
-                insertNodes(submenu, child);
-            }
-            menu.add(submenu);
-            if (submenu.isEnabled()) {
-                menu.setEnabled(true);
-            }
-        }
-    }
-
-    private AbstractAction getAction(GroupTreeNode node) {
-        AbstractAction action = new AddToGroupAction(node);
-        action.setEnabled(node.getGroup() instanceof GroupEntryChanger);
-        return action;
-    }
-
-    private void setWidths() {
-        TableColumnModel cm = glTable.getColumnModel();
-        cm.getColumn(0).setPreferredWidth(55);
-        cm.getColumn(0).setMinWidth(55);
-        cm.getColumn(0).setMaxWidth(55);
-        for (int i = 1; i < PAD; i++) {
-            // Lock the width of icon columns.
-            cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
-            cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
-            cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
-        }
-
-        for (int i = 0; i < INSPECTION_FIELDS.size(); i++) {
-            Double width = InternalBibtexFields.getFieldLength(INSPECTION_FIELDS.get(i));
-            glTable.getColumnModel().getColumn(i + PAD).setPreferredWidth(width.intValue());
-        }
-    }
-
-    private void setupComparatorChooser() {
-        // First column:
-
-        List<Comparator> comparators = comparatorChooser.getComparatorsForColumn(0);
-        comparators.clear();
-
-        comparators = comparatorChooser.getComparatorsForColumn(1);
-        comparators.clear();
-
-        // Icon columns:
-        for (int i = 2; i < PAD; i++) {
-            comparators = comparatorChooser.getComparatorsForColumn(i);
-            comparators.clear();
-            if (i == FILE_COL) {
-                comparators.add(new IconComparator(Collections.singletonList(FieldName.FILE)));
-            } else if (i == URL_COL) {
-                comparators.add(new IconComparator(Collections.singletonList(FieldName.URL)));
-            }
-        }
-        // Remaining columns:
-        for (int i = PAD; i < (PAD + INSPECTION_FIELDS.size()); i++) {
-            comparators = comparatorChooser.getComparatorsForColumn(i);
-            comparators.clear();
-            comparators.add(new FieldComparator(INSPECTION_FIELDS.get(i - PAD)));
-        }
-
-        sortedList.getReadWriteLock().writeLock().lock();
-        try {
-            comparatorChooser.appendComparator(PAD, 0, false);
-        } finally {
-            sortedList.getReadWriteLock().writeLock().unlock();
-        }
-    }
-
-    /**
-     * The "defaultSelected" boolean value determines if new entries added are
-     * selected for import or not. This value is true by default.
-     *
-     * @param defaultSelected The desired value.
-     */
-    public void setDefaultSelected(boolean defaultSelected) {
-        this.defaultSelected = defaultSelected;
-    }
-
-    @Override
-    public void setStatus(String s) {
-        frame.setStatus(s);
-    }
-
-    @Override
-    public void showMessage(String message, String title, int msgType) {
-        JOptionPane.showMessageDialog(this, message, title, msgType);
-    }
-
-    @Override
-    public void showMessage(String message) {
-        JOptionPane.showMessageDialog(this, message);
-    }
-
-    /**
-     * Displays a dialog which tells the user that an error occurred while fetching entries
-     */
-    public void showErrorMessage(String fetcherTitle, String localizedException) {
-        showMessage(Localization.lang("Error while fetching from %0", fetcherTitle) + "\n" +
-                    Localization.lang("Please try again later and/or check your network connection.") + "\n" +
-                    localizedException,
-                    Localization.lang("Search %0", fetcherTitle), JOptionPane.ERROR_MESSAGE);
-    }
-
-    public JabRefFrame getFrame() {
-        return frame;
-    }
-
-    @FunctionalInterface
-    public interface CallBack {
-
-        /**
-         * This method is called by the dialog when the user has canceled or
-         * signaled a stop. It is expected that any long-running fetch
-         * operations will stop after this method is called.
-         */
-        void stopFetching();
-    }
-
-    /**
-     * Stores the information about the selected entries being scheduled for
-     * addition to this group. The entries are *not* added to the group at this
-     * time. <p/> Synchronizes on this.entries to prevent conflict with threads
-     * that modify the entry list.
-     */
-    class AddToGroupAction extends AbstractAction {
-
-        private final GroupTreeNode node;
-
-        public AddToGroupAction(GroupTreeNode node) {
-            super(node.getName());
-            this.node = node;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent event) {
-
-            selectionModel.getSelected().getReadWriteLock().writeLock().lock();
-            try {
-                for (BibEntry entry : selectionModel.getSelected()) {
-                    // We store the groups this entry should be added to in a Set in
-                    // the Map:
-                    Set<GroupTreeNode> groups = groupAdditions.get(entry);
-                    if (groups == null) {
-                        // No previous definitions, so we create the Set now:
-                        groups = new HashSet<>();
-                        groupAdditions.put(entry, groups);
-                    }
-                    // Add the group:
-                    groups.add(node);
-                }
-            } finally {
-                selectionModel.getSelected().getReadWriteLock().writeLock().unlock();
-            }
-        }
-    }
-
-    private class OkListener implements ActionListener {
-
-        @Override
-        public void actionPerformed(ActionEvent event) {
-
-            // First check if we are supposed to warn about duplicates. If so,
-            // see if there
-            // are unresolved duplicates, and warn if yes.
-            if (Globals.prefs.getBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION)) {
-                for (BibEntry entry : entries) {
-
-                    // Only check entries that are to be imported. Keep status
-                    // is indicated
-                    // through the search hit status of the entry:
-                    if (!entry.isSearchHit()) {
-                        continue;
-                    }
-
-                    // Check if the entry is a suspected, unresolved, duplicate.
-                    // This status
-                    // 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)));
-
-                        if (!continuePressed) {
-                            return;
-                        }
-                        break;
-                    }
-                }
-            }
-
-            // The compund undo action used to contain all changes made by this
-            // dialog.
-            NamedCompound ce = new NamedCompound(undoName);
-
-            // See if we should remove any old entries for duplicate resolving:
-            if (!entriesToDelete.isEmpty()) {
-                removeEntriesToDelete(ce);
-            }
-
-            // If "Generate keys" is checked, generate keys unless it's already
-            // been done:
-            if (autoGenerate.isSelected() && !generatedKeys) {
-                generateKeys();
-            }
-            // Remember the choice until next time:
-            Globals.prefs.putBoolean(JabRefPreferences.GENERATE_KEYS_AFTER_INSPECTION, autoGenerate.isSelected());
-
-            final List<BibEntry> selected = getSelectedEntries();
-
-            if (!selected.isEmpty()) {
-                addSelectedEntries(ce, selected);
-            }
-
-            dispose();
-            SwingUtilities.invokeLater(() -> updateGUI(selected.size()));
-        }
-
-        private void updateGUI(int entryCount) {
-            if (newDatabase) {
-                frame.addTab(panel, true);
-            }
-            panel.markBaseChanged();
-
-            if (entryCount == 0) {
-                frame.output(Localization.lang("No entries imported."));
-            } else {
-                frame.output(Localization.lang("Number of entries successfully imported") + ": " + entryCount);
-            }
-        }
-
-        private void removeEntriesToDelete(NamedCompound ce) {
-            for (BibEntry entry : entriesToDelete) {
-                ce.addEdit(new UndoableRemoveEntry(panel.getDatabase(), entry, panel));
-                panel.getDatabase().removeEntry(entry);
-            }
-        }
-
-        private void addSelectedEntries(NamedCompound ce, final List<BibEntry> selected) {
-            if (newDatabase) {
-                // Create a new BasePanel for the entries:
-                Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode());
-                panel = new BasePanel(frame, BasePanelPreferences.from(Globals.prefs), new BibDatabaseContext(defaults), ExternalFileTypes.getInstance());
-            }
-
-            boolean groupingCanceled = false;
-
-            // Set owner/timestamp if options are enabled:
-            UpdateField.setAutomaticFields(selected, Globals.prefs.getUpdateFieldPreferences());
-
-            for (BibEntry entry : selected) {
-                // Remove settings to group/search hit status:
-                entry.setSearchHit(false);
-                entry.setGroupHit(false);
-
-                // If this entry should be added to any groups, do it now:
-                Set<GroupTreeNode> groups = groupAdditions.get(entry);
-                if (!groupingCanceled && (groups != null)) {
-                    groupingCanceled = addToGroups(ce, entry, groups);
-                }
-
-                entry.setId(IdGenerator.next());
-                ce.addEdit(new UndoableInsertEntry(panel.getDatabase(), entry));
-            }
-            panel.getDatabase().insertEntries(selected);
-
-            ce.end();
-            panel.getUndoManager().addEdit(ce);
-        }
-
-        private boolean addToGroups(NamedCompound ce, BibEntry entry, Set<GroupTreeNode> groups) {
-            boolean groupingCanceled = false;
-            if (!entry.hasCiteKey()) {
-                // The entry has no key, so it can't be added to the
-                // group.
-                // The best course of action is probably to ask the
-                // user if a key should be generated
-                // immediately.
-
-                boolean generateKeysPressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Add to group"),
-                                                                                                     Localization.lang("Cannot add entries to group without generating keys. Generate keys now?"),
-                                                                                                     Localization.lang("Generate keys"),
-                                                                                                     Localization.lang("Cancel"));
-
-                if (generateKeysPressed) {
-                    generateKeys();
-                } else {
-                    groupingCanceled = true;
-                }
-            }
-
-            // If the key existed, or exists now, go ahead:
-            if (entry.hasCiteKey()) {
-                for (GroupTreeNode node : groups) {
-                    if (node.getGroup() instanceof GroupEntryChanger) {
-                        // Add the entry:
-                        GroupEntryChanger entryChanger = (GroupEntryChanger) node.getGroup();
-                        List<FieldChange> undo = entryChanger.add(Collections.singletonList(entry));
-                        if (!undo.isEmpty()) {
-                            ce.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(new GroupTreeNodeViewModel(node),
-                                                                                    undo));
-                        }
-                    }
-                }
-            }
-            return groupingCanceled;
-        }
-
-        /**
-         * This method returns a List containing all entries that are selected
-         * (checkbox checked).
-         *
-         * @return a List containing the selected entries.
-         */
-        private List<BibEntry> getSelectedEntries() {
-            List<BibEntry> selected = new ArrayList<>();
-            for (BibEntry entry : entries) {
-                if (entry.isSearchHit()) {
-                    selected.add(entry);
-                }
-            }
-
-            return selected;
-        }
-
-    }
-
-    private class DeleteListener extends AbstractAction {
-
-        public DeleteListener() {
-            super(Localization.lang("Delete"), IconTheme.JabRefIcons.DELETE_ENTRY.getSmallIcon());
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent event) {
-            removeSelectedEntries();
-        }
-
-        /**
-         * Removes all selected entries from the table. Synchronizes on this.entries
-         * to prevent conflict with addition of new entries.
-         */
-        private void removeSelectedEntries() {
-            int row = glTable.getSelectedRow();
-            List<BibEntry> toRemove = new ArrayList<>();
-            toRemove.addAll(selectionModel.getSelected());
-
-            entries.getReadWriteLock().writeLock().lock();
-            try {
-                for (BibEntry entry : toRemove) {
-                    entries.remove(entry);
-                }
-            } finally {
-                entries.getReadWriteLock().writeLock().unlock();
-            }
-            glTable.clearSelection();
-            if ((row >= 0) && (!entries.isEmpty())) {
-                row = Math.min(entries.size() - 1, row);
-                glTable.addRowSelectionInterval(row, row);
-            }
-        }
-    }
-
-    private class SelectionButton implements ActionListener {
-
-        private final Boolean enable;
-
-        public SelectionButton(boolean enable) {
-            this.enable = enable;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent event) {
-            for (int i = 0; i < glTable.getRowCount(); i++) {
-                glTable.setValueAt(enable, i, 0);
-            }
-            glTable.repaint();
-        }
-    }
-
-    private class EntrySelectionListener implements ListEventListener<BibEntry> {
-
-        @Override
-        public void listChanged(ListEvent<BibEntry> listEvent) {
-            if (listEvent.getSourceList().size() == 1) {
-                preview.setEntry(listEvent.getSourceList().get(0));
-            }
-        }
-    }
-
-    /**
-     * This class handles clicks on the table that should trigger specific
-     * events, like opening the popup menu.
-     */
-    private class TableClickListener implements MouseListener {
-
-        private boolean isIconColumn(int col) {
-            return (col == FILE_COL) || (col == URL_COL);
-        }
-
-        @Override
-        public void mouseClicked(MouseEvent e) {
-            final int col = glTable.columnAtPoint(e.getPoint());
-            final int row = glTable.rowAtPoint(e.getPoint());
-            if (isIconColumn(col)) {
-                BibEntry entry = sortedList.get(row);
-
-                if (col == FILE_COL) {
-                    if (entry.hasField(FieldName.FILE)) {
-                        FileListTableModel tableModel = new FileListTableModel();
-                        entry.getField(FieldName.FILE).ifPresent(tableModel::setContent);
-                        if (tableModel.getRowCount() == 0) {
-                            return;
-                        }
-                        FileListEntry fl = tableModel.getEntry(0);
-                        (new ExternalFileMenuItem(frame, "", fl.getLink(), null, panel.getBibDatabaseContext(),
-                                                  fl.getType())).actionPerformed(null);
-                    }
-                } else { // Must be URL_COL
-                    openExternalLink(FieldName.URL, e);
-                }
-            }
-        }
-
-        @Override
-        public void mouseEntered(MouseEvent e) {
-            // Nothing
-        }
-
-        @Override
-        public void mouseExited(MouseEvent e) {
-            // Nothing
-        }
-
-        /**
-         * Show right-click menu. If the click happened in an icon column that
-         * presents its own popup menu, show that. Otherwise, show the ordinary
-         * popup menu.
-         *
-         * @param e The mouse event that triggered the popup.
-         */
-        private void showPopup(MouseEvent e) {
-            final int col = glTable.columnAtPoint(e.getPoint());
-            if (col == FILE_COL) {
-                showFileFieldMenu(e);
-            } else {
-                showOrdinaryRightClickMenu(e);
-            }
-        }
-
-        private void showOrdinaryRightClickMenu(MouseEvent e) {
-            popup.show(glTable, e.getX(), e.getY());
-        }
-
-        /**
-         * Show the popup menu for the FILE field.
-         *
-         * @param e The mouse event that triggered the popup.
-         */
-        private void showFileFieldMenu(MouseEvent e) {
-            final int row = glTable.rowAtPoint(e.getPoint());
-            BibEntry entry = sortedList.get(row);
-            JPopupMenu menu = new JPopupMenu();
-            int count = 0;
-            FileListTableModel fileList = new FileListTableModel();
-            entry.getField(FieldName.FILE).ifPresent(fileList::setContent);
-            // If there are one or more links, open the first one:
-            for (int i = 0; i < fileList.getRowCount(); i++) {
-                FileListEntry flEntry = fileList.getEntry(i);
-                String description = flEntry.getDescription();
-                if ((description == null) || (description.trim().isEmpty())) {
-                    description = flEntry.getLink();
-                }
-                menu.add(new ExternalFileMenuItem(panel.frame(), description, flEntry.getLink(),
-                                                  flEntry.getType().get().getIcon().getSmallIcon(), panel.getBibDatabaseContext(), flEntry.getType()));
-                count++;
-            }
-            if (count == 0) {
-                showOrdinaryRightClickMenu(e);
-            } else {
-                menu.show(glTable, e.getX(), e.getY());
-            }
-        }
-
-        /**
-         * Open old-style external links after user clicks icon.
-         *
-         * @param fieldName The name of the BibTeX field this icon is used for.
-         * @param e         The MouseEvent that triggered this operation.
-         */
-        private void openExternalLink(String fieldName, MouseEvent e) {
-            final int row = glTable.rowAtPoint(e.getPoint());
-            BibEntry entry = sortedList.get(row);
-
-            entry.getField(fieldName).ifPresent(link -> {
-                try {
-                    JabRefDesktop.openExternalViewer(panel.getBibDatabaseContext(), link, fieldName);
-                } catch (IOException ex) {
-                    LOGGER.warn("Could not open link", ex);
-                }
-            });
-        }
-
-        @Override
-        public void mouseReleased(MouseEvent e) {
-            // Check if the user has right-clicked. If so, open the right-click
-            // menu.
-            if (e.isPopupTrigger()) {
-                showPopup(e);
-            }
-        }
-
-        @Override
-        public void mousePressed(MouseEvent e) {
-            // Check if the user has right-clicked. If so, open the right-click
-            // menu.
-            if (e.isPopupTrigger()) {
-                showPopup(e);
-                return;
-            }
-
-            // Check if any other action should be taken:
-            final int col = glTable.columnAtPoint(e.getPoint());
-            final int row = glTable.rowAtPoint(e.getPoint());
-            // Is this the duplicate icon column, and is there an icon?
-            if ((col == DUPL_COL) && (glTable.getValueAt(row, col) != null)) {
-                BibEntry first = sortedList.get(row);
-                Optional<BibEntry> other = DuplicateCheck.containsDuplicate(panel.getDatabase(), first,
-                                                                            panel.getBibDatabaseContext().getMode());
-                if (other.isPresent()) {
-                    // This will be true if the duplicate is in the existing
-                    // database.
-                    DuplicateResolverDialog diag = new DuplicateResolverDialog(getFrame(), other.get(),
-                                                                               first, DuplicateResolverDialog.DuplicateResolverType.INSPECTION);
-
-                    DuplicateResolverResult result = diag.showAndWait().orElse(DuplicateResolverResult.BREAK);
-
-                    ImportInspectionDialog.this.toFront();
-                    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.
-                        entriesToDelete.add(other.get());
-                        // Clear duplicate icon, which is controlled by the
-                        // group hit
-                        // field of the entry:
-
-                        entries.getReadWriteLock().writeLock().lock();
-                        try {
-                            first.setGroupHit(false);
-                        } finally {
-                            entries.getReadWriteLock().writeLock().unlock();
-                        }
-                    } else if (result == DuplicateResolverResult.KEEP_RIGHT) {
-                        // Remove the entry from the import inspection dialog.
-                        entries.getReadWriteLock().writeLock().lock();
-                        try {
-                            entries.remove(first);
-                        } finally {
-                            entries.getReadWriteLock().writeLock().unlock();
-                        }
-                    } else if (result == DuplicateResolverResult.KEEP_BOTH) {
-                        // Do nothing.
-                        entries.getReadWriteLock().writeLock().lock();
-                        try {
-                            first.setGroupHit(false);
-                        } finally {
-                            entries.getReadWriteLock().writeLock().unlock();
-                        }
-                    } 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.
-                        entriesToDelete.add(other.get());
-                        // Store merged entry for later adding
-                        // Clear duplicate icon, which is controlled by the
-                        // group hit
-                        // field of the entry:
-                        entries.getReadWriteLock().writeLock().lock();
-                        try {
-                            diag.getMergedEntry().setGroupHit(false);
-                            diag.getMergedEntry().setSearchHit(true);
-                            entries.add(diag.getMergedEntry());
-                            entries.remove(first);
-                            first = new BibEntry(); // Reset first so the next duplicate doesn't trigger
-                        } finally {
-                            entries.getReadWriteLock().writeLock().unlock();
-                        }
-                    }
-                }
-                // Check if the duplicate is of another entry in the import:
-                other = internalDuplicate(entries, first);
-                if (other.isPresent()) {
-                    DuplicateResolverDialog diag = new DuplicateResolverDialog(getFrame(), first,
-                                                                               other.get(), DuplicateResolverDialog.DuplicateResolverType.DUPLICATE_SEARCH);
-
-                    ImportInspectionDialog.this.toFront();
-                    DuplicateResolverResult answer = diag.showAndWait().get();
-                    if (answer == DuplicateResolverResult.KEEP_LEFT) {
-                        entries.remove(other.get());
-                        first.setGroupHit(false);
-                    } else if (answer == DuplicateResolverResult.KEEP_RIGHT) {
-                        entries.remove(first);
-                    } else if (answer == DuplicateResolverResult.KEEP_BOTH) {
-                        first.setGroupHit(false);
-                    } else if (answer == DuplicateResolverResult.KEEP_MERGE) {
-                        diag.getMergedEntry().setGroupHit(false);
-                        diag.getMergedEntry().setSearchHit(true);
-                        entries.add(diag.getMergedEntry());
-                        entries.remove(first);
-                        entries.remove(other.get());
-                    }
-                }
-            }
-        }
-    }
-
-    class AttachUrl extends JMenuItem implements ActionListener {
-
-        public AttachUrl() {
-            super(Localization.lang("Attach URL"));
-            addActionListener(this);
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent event) {
-            if (selectionModel.getSelected().size() != 1) {
-                return;
-            }
-            BibEntry entry = selectionModel.getSelected().get(0);
-
-            Optional<String> result = frame.getDialogService().showInputDialogAndWait(Localization.lang("Enter URL"), Localization.lang("Enter URL"));
-
-            entries.getReadWriteLock().writeLock().lock();
-            try {
-                if (result.isPresent()) {
-                    if (result.get().isEmpty()) {
-                        entry.clearField(FieldName.URL);
-                    } else {
-                        entry.setField(FieldName.URL, result.get());
-                    }
-                }
-            } finally {
-                entries.getReadWriteLock().writeLock().unlock();
-            }
-            glTable.repaint();
-        }
-    }
-
-    class DownloadFile extends JMenuItem implements ActionListener, DownloadExternalFile.DownloadCallback {
-
-        private BibEntry entry;
-
-        public DownloadFile() {
-            super(Localization.lang("Download file"));
-            addActionListener(this);
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent actionEvent) {
-            if (selectionModel.getSelected().size() != 1) {
-                return;
-            }
-            entry = selectionModel.getSelected().get(0);
-            if (!entry.getCiteKeyOptional().isPresent()) {
-
-                boolean generateKeyPressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Download file"),
-                                                                                                    Localization.lang("This entry has no BibTeX key. Generate key now?"),
-                                                                                                    Localization.lang("Generate key"),
-                                                                                                    Localization.lang("Cancel"));
-
-                if (generateKeyPressed) {
-                    generateKeyForEntry(entry);
-                }
-            }
-            DownloadExternalFile def = new DownloadExternalFile(frame.getDialogService(), bibDatabaseContext, entry);
-            try {
-                def.download(this);
-            } catch (IOException ex) {
-                LOGGER.warn("Could not download file", ex);
-            }
-        }
-
-        @Override
-        public void downloadComplete(LinkedFile file) {
-            ImportInspectionDialog.this.toFront(); // Hack
-            entries.getReadWriteLock().writeLock().lock();
-            try {
-                entry.addFile(file);
-            } finally {
-                entries.getReadWriteLock().writeLock().unlock();
-            }
-            glTable.repaint();
-        }
-    }
-
-    private class InternalAutoSetLinks extends JMenuItem implements ActionListener {
-
-        public InternalAutoSetLinks() {
-            super(Localization.lang("Automatically set file links"));
-            addActionListener(this);
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent actionEvent) {
-            if (selectionModel.getSelected().size() != 1) {
-                return;
-            }
-            final BibEntry entry = selectionModel.getSelected().get(0);
-            if (!entry.hasCiteKey()) {
-
-                boolean generateKeyPressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Download file"),
-                                                                                                    Localization.lang("This entry has no BibTeX key. Generate key now?"),
-                                                                                                    Localization.lang("Generate key"),
-                                                                                                    Localization.lang("Cancel"));
-
-                if (generateKeyPressed) {
-                    generateKeyForEntry(entry);
-                } else {
-                    return; // Can't go on without the bibtex key.
-                }
-            }
-            final FileListTableModel localModel = new FileListTableModel();
-            entry.getField(FieldName.FILE).ifPresent(localModel::setContent);
-            // We have a static utility method for searching for all relevant
-            // links:
-            JDialog diag = new JDialog(ImportInspectionDialog.this, true);
-            JabRefExecutorService.INSTANCE
-                                          .execute(AutoSetLinks.autoSetLinks(entry, bibDatabaseContext, e -> {
-                                              if (e.getID() > 0) {
-
-                                                  entries.getReadWriteLock().writeLock().lock();
-                                                  try {
-                                                      entry.setField(FieldName.FILE, localModel.getStringRepresentation());
-                                                  } finally {
-                                                      entries.getReadWriteLock().writeLock().unlock();
-                                                  }
-                                                  glTable.repaint();
-                                              }
-                                          }, diag));
-
-        }
-    }
-
-    private class LinkLocalFile extends JMenuItem implements ActionListener, DownloadExternalFile.DownloadCallback {
-
-        private BibEntry entry;
-
-        public LinkLocalFile() {
-            super(Localization.lang("Link local file"));
-            addActionListener(this);
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent actionEvent) {
-            if (selectionModel.getSelected().size() != 1) {
-                return;
-            }
-            entry = selectionModel.getSelected().get(0);
-            LinkedFile linkedFile = new LinkedFile("", "", "");
-
-            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(linkedFile);
-
-            Optional<LinkedFile> editedLinkedFile = DefaultTaskExecutor.runInJavaFXThread(() -> dialog.showAndWait());
-            editedLinkedFile.ifPresent(file -> entry.addFile(linkedFile));
-        }
-
-        @Override
-        public void downloadComplete(LinkedFile file) {
-            ImportInspectionDialog.this.toFront(); // Hack
-            entries.getReadWriteLock().writeLock().lock();
-            try {
-                entry.addFile(file);
-            } finally {
-                entries.getReadWriteLock().writeLock().unlock();
-            }
-            glTable.repaint();
-        }
-    }
-
-    class EntryTable extends JTable {
-
-        private final GeneralRenderer renderer = new GeneralRenderer(Color.white);
-
-        public EntryTable(TableModel model) {
-            super(model);
-            getTableHeader().setReorderingAllowed(false);
-
-            setFont(GUIGlobals.currentFont);
-            int maxOfIconsAndFontSize = GUIGlobals.currentFont.getSize();
-            setRowHeight(maxOfIconsAndFontSize);
-            // Update Table header with new settings
-            this.getTableHeader().resizeAndRepaint();
-        }
-
-        @Override
-        public TableCellRenderer getCellRenderer(int row, int column) {
-            return column == 0 ? getDefaultRenderer(Boolean.class) : renderer;
-        }
-
-        @Override
-        public Class<?> getColumnClass(int col) {
-            if (col == 0) {
-                return Boolean.class;
-            } else if (col < PAD) {
-                return JLabel.class;
-            } else {
-                return String.class;
-            }
-        }
-
-        @Override
-        public boolean isCellEditable(int row, int column) {
-            return column == 0;
-        }
-
-        @Override
-        public void setValueAt(Object value, int row, int column) {
-            // Only column 0, which is controlled by BibEntry.searchHit, is
-            // editable:
-            entries.getReadWriteLock().writeLock().lock();
-            try {
-                BibEntry entry = sortedList.get(row);
-                entry.setSearchHit((Boolean) value);
-            } finally {
-                entries.getReadWriteLock().writeLock().unlock();
-            }
-        }
-    }
-
-    private class EntryTableFormat implements TableFormat<BibEntry> {
-
-        @Override
-        public int getColumnCount() {
-            return PAD + INSPECTION_FIELDS.size();
-        }
-
-        @Override
-        public String getColumnName(int i) {
-            if (i == 0) {
-                return Localization.lang("Keep");
-            }
-            if (i >= PAD) {
-                return StringUtil.capitalizeFirst(INSPECTION_FIELDS.get(i - PAD));
-            }
-            return "";
-        }
-
-        @Override
-        public Object getColumnValue(BibEntry entry, int i) {
-            if (i == 0) {
-                return entry.isSearchHit() ? Boolean.TRUE : Boolean.FALSE;
-            } else if (i < PAD) {
-                switch (i) {
-                    case DUPL_COL:
-                        return entry.isGroupHit() ? duplLabel : null;
-                    case FILE_COL:
-                        if (entry.hasField(FieldName.FILE)) {
-                            FileListTableModel model = new FileListTableModel();
-                            entry.getField(FieldName.FILE).ifPresent(model::setContent);
-                            fileLabel.setToolTipText(model.getToolTipHTMLRepresentation());
-                            if ((model.getRowCount() > 0) && model.getEntry(0).getType().isPresent()) {
-                                fileLabel.setIcon(model.getEntry(0).getType().get().getIcon().getSmallIcon());
-                            }
-                            return fileLabel;
-                        } else {
-                            return null;
-                        }
-                    case URL_COL:
-                        if (entry.hasField(FieldName.URL)) {
-                            urlLabel.setToolTipText(entry.getField(FieldName.URL).orElse(""));
-                            return urlLabel;
-                        } else {
-                            return null;
-                        }
-                    default:
-                        return null;
-                }
-            } else {
-                String field = INSPECTION_FIELDS.get(i - PAD);
-                if (InternalBibtexFields.getFieldProperties(field).contains(FieldProperty.PERSON_NAMES)) {
-                    return entry.getField(field).map(AuthorList::fixAuthorNatbib).orElse("");
-                } else {
-                    return entry.getField(field).orElse(null);
-                }
-            }
-        }
-
-    }
-}
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 984b11025d9..77354393115 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -3,8 +3,6 @@
 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;
@@ -14,10 +12,9 @@
 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.gui.importer.ImportEntriesDialog;
+import org.jabref.gui.util.BackgroundTask;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.importer.WebFetcher;
@@ -97,21 +94,12 @@ public void search() {
         }
 
         SearchBasedFetcher activeFetcher = getSelectedFetcher();
-        final ImportInspectionDialog dialog = new ImportInspectionDialog(frame, frame.getCurrentBasePanel(),
-                activeFetcher.getName(), false);
-
-        SwingUtilities.invokeLater(() -> 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());
-            }
-        });
+
+        BackgroundTask<List<BibEntry>> task = BackgroundTask.wrap(() -> activeFetcher.performSearch(getQuery().trim()))
+                                                            .withInitialMessage(Localization.lang("Processing %0", getQuery()));
+
+        ImportEntriesDialog dialog = new ImportEntriesDialog(frame.getCurrentBasePanel().getBibDatabaseContext(), task);
+        dialog.setTitle(activeFetcher.getName());
+        dialog.showAndWait();
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 7ff9de40304..d852104c1fd 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -77,7 +77,8 @@ public MainTable(MainTableDataModel model, JabRefFrame frame,
                 Globals.prefs.getImportFormatPreferences(),
                 Globals.prefs.getUpdateFieldPreferences(),
                 Globals.getFileUpdateMonitor(),
-                undoManager);
+                undoManager,
+                Globals.stateManager);
 
         this.getColumns().addAll(new MainTableColumnFactory(database, preferences.getColumnPreferences(), externalFileTypes, panel.getUndoManager(), frame.getDialogService()).createColumns());
 
diff --git a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
index 3dabc05b209..8240accc730 100644
--- a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
+++ b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
@@ -24,7 +24,6 @@ class BibtexKeyPatternPrefTab extends BibtexKeyPatternPanel implements PrefsTab
     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 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, ...)"));
@@ -57,7 +56,6 @@ public void storeSettings() {
 
         Globals.prefs.put(JabRefPreferences.KEY_PATTERN_REGEX, keyPatternRegex.getText());
         Globals.prefs.put(JabRefPreferences.KEY_PATTERN_REPLACEMENT, keyPatternReplacement.getText());
-        Globals.prefs.putBoolean(JabRefPreferences.GENERATE_KEYS_AFTER_INSPECTION, autoGenerateOnImport.isSelected());
         Globals.prefs.putBoolean(JabRefPreferences.GENERATE_KEYS_BEFORE_SAVING, generateOnSave.isSelected());
 
         if (alwaysAddLetter.isSelected()) {
@@ -82,7 +80,6 @@ private void appendKeyGeneratorSettings() {
         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);
         builder.add(warnBeforeOverwriting, 1, 12);
         builder.add(letterStartB, 2, 12);
@@ -116,7 +113,6 @@ public void setValues() {
         defaultPat.setText(Globals.prefs.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN));
         dontOverwrite.setSelected(Globals.prefs.getBoolean(JabRefPreferences.AVOID_OVERWRITING_KEY));
         generateOnSave.setSelected(Globals.prefs.getBoolean(JabRefPreferences.GENERATE_KEYS_BEFORE_SAVING));
-        autoGenerateOnImport.setSelected(Globals.prefs.getBoolean(JabRefPreferences.GENERATE_KEYS_AFTER_INSPECTION));
         warnBeforeOverwriting.setSelected(Globals.prefs.getBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY));
 
         boolean prefAlwaysAddLetter = Globals.prefs.getBoolean(JabRefPreferences.KEY_GEN_ALWAYS_ADD_LETTER);
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index e0fb4494af1..3f18ba400c6 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -2,10 +2,8 @@
 
 import java.lang.reflect.Field;
 import java.nio.file.Path;
-import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
@@ -53,7 +51,6 @@
 import org.jabref.logic.search.SearchQuery;
 import org.jabref.logic.search.SearchQueryHighlightObservable;
 import org.jabref.model.entry.Author;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.SearchPreferences;
 
 import impl.org.controlsfx.skin.AutoCompletePopup;
@@ -226,18 +223,16 @@ private void openLocalFindingsInExternalPanel() {
             return;
         }
 
-        SearchResultFrame searchDialog = new SearchResultFrame(currentBasePanel.frame(), Localization.lang("Search results in library %0 for %1", currentBasePanel.getBibDatabaseContext()
-                                                                                                                                                                  .getDatabasePath()
-                                                                                                                                                                  .map(Path::getFileName)
-                                                                                                                                                                  .map(Path::toString)
-                                                                                                                                                                  .orElse(GUIGlobals.UNTITLED_TITLE),
-                                                                                                           this.getSearchQuery().localize()), getSearchQuery(), false);
-        List<BibEntry> entries = currentBasePanel.getDatabase()
-                                                 .getEntries()
-                                                 .stream()
-                                                 .filter(BibEntry::isSearchHit)
-                                                 .collect(Collectors.toList());
-        searchDialog.addEntries(entries, currentBasePanel);
+        SearchResultFrame searchDialog = new SearchResultFrame(
+                currentBasePanel.frame(),
+                Localization.lang("Search results in library %0 for %1",
+                        currentBasePanel.getBibDatabaseContext()
+                                        .getDatabasePath()
+                                        .map(Path::getFileName)
+                                        .map(Path::toString)
+                                        .orElse(GUIGlobals.UNTITLED_TITLE),
+                        this.getSearchQuery().localize()), getSearchQuery(), false);
+        searchDialog.addEntries(currentBasePanel.getDatabase().getEntries(), currentBasePanel);
         searchDialog.selectFirstEntry();
         searchDialog.setVisible(true);
     }
diff --git a/src/main/java/org/jabref/gui/search/matchers/SearchMatcher.java b/src/main/java/org/jabref/gui/search/matchers/SearchMatcher.java
deleted file mode 100644
index 232f022ae71..00000000000
--- a/src/main/java/org/jabref/gui/search/matchers/SearchMatcher.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jabref.gui.search.matchers;
-
-import org.jabref.model.entry.BibEntry;
-
-import ca.odell.glazedlists.matchers.Matcher;
-
-/**
- * Matcher for filtering or sorting the table according to whether entries are
- * tagged as search matches.
- */
-public class SearchMatcher implements Matcher<BibEntry> {
-
-    public static final Matcher<BibEntry> INSTANCE = new SearchMatcher();
-
-    @Override
-    public boolean matches(BibEntry entry) {
-        return entry.isSearchHit();
-    }
-}
diff --git a/src/main/java/org/jabref/gui/util/BackgroundTask.java b/src/main/java/org/jabref/gui/util/BackgroundTask.java
index bab42164053..7b0b8df1424 100644
--- a/src/main/java/org/jabref/gui/util/BackgroundTask.java
+++ b/src/main/java/org/jabref/gui/util/BackgroundTask.java
@@ -223,6 +223,11 @@ protected void updateMessage(String newMessage) {
         message.setValue(newMessage);
     }
 
+    public BackgroundTask<V> withInitialMessage(String message) {
+        updateMessage(message);
+        return this;
+    }
+
     class BackgroundProgress {
 
         private final double workDone;
diff --git a/src/main/java/org/jabref/gui/util/TextFlowLimited.java b/src/main/java/org/jabref/gui/util/TextFlowLimited.java
new file mode 100644
index 00000000000..42638536c66
--- /dev/null
+++ b/src/main/java/org/jabref/gui/util/TextFlowLimited.java
@@ -0,0 +1,81 @@
+package org.jabref.gui.util;
+
+import javafx.animation.Animation;
+import javafx.animation.Transition;
+import javafx.geometry.HPos;
+import javafx.geometry.VPos;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.layout.Region;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextFlow;
+import javafx.util.Duration;
+
+import org.jabref.logic.l10n.Localization;
+
+public class TextFlowLimited extends TextFlow {
+    private boolean isCollapsed = true;
+    private Hyperlink moreLink = new Hyperlink(Localization.lang("(more)"));
+    private Rectangle clip = new Rectangle();
+
+    public TextFlowLimited(Text... texts) {
+        super(texts);
+
+        this.setPrefWidth(Region.USE_PREF_SIZE);
+
+        moreLink.setOnAction(event -> expand());
+        moreLink.setStyle("-fx-background-color: white");
+
+        this.setOnMouseClicked(event -> expand());
+    }
+
+    private void expand() {
+        double newPrefHeight = super.computePrefHeight(getWidth());
+        final Animation expandPanel = new Transition() {
+            {
+                setCycleDuration(Duration.millis(200));
+            }
+
+            @Override
+            protected void interpolate(double fraction) {
+                setPrefHeight(newPrefHeight * fraction);
+            }
+        };
+
+        expandPanel.setOnFinished(event -> {
+            isCollapsed = false;
+            requestLayout();
+        });
+        expandPanel.play();
+    }
+
+    @Override
+    protected double computePrefHeight(double width) {
+        if (isCollapsed) {
+            return 38;
+        } else {
+            return super.computePrefHeight(width);
+        }
+    }
+
+    @Override
+    protected void layoutChildren() {
+        super.layoutChildren();
+
+        if (isCollapsed) {
+            // Display link to expand text
+            if (!this.getChildren().contains(moreLink)) {
+                this.getChildren().add(moreLink);
+            }
+            layoutInArea(moreLink, 0, 0, getWidth(), getHeight(), getBaselineOffset(), HPos.RIGHT, VPos.BOTTOM);
+
+            // Clip content if it expands above pref height (no idea why this is needed, but otherwise sometimes the text is still visible)
+            clip.setHeight(computePrefHeight(this.getWidth()));
+            clip.setWidth(this.getWidth());
+            this.setClip(clip);
+        } else {
+            this.getChildren().remove(moreLink);
+            this.setClip(null);
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index 40e6abcc0ff..e79cc81412b 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -68,6 +68,11 @@ public BibDatabase() {
         this.registerListener(new KeyChangeListener(this));
     }
 
+    public BibDatabase(List<BibEntry> entries) {
+        this();
+        insertEntries(entries);
+    }
+
     /**
      * @param toResolve maybenull The text to resolve.
      * @param database  maybenull The database to use for resolving the text.
@@ -505,7 +510,7 @@ private String resolveContent(String result, Set<String> usedIds, Set<String> al
                 // We found the next string ref. Append the text
                 // up to it.
                 if (next > 0) {
-                    newRes.append(res.substring(piv, next));
+                    newRes.append(res, piv, next);
                 }
                 int stringEnd = res.indexOf('#', next + 1);
                 if (stringEnd >= 0) {
@@ -517,7 +522,7 @@ private String resolveContent(String result, Set<String> usedIds, Set<String> al
                     if (resolved == null) {
                         // Could not resolve string. Display the #
                         // characters rather than removing them:
-                        newRes.append(res.substring(next, stringEnd + 1));
+                        newRes.append(res, next, stringEnd + 1);
                     } else {
                         // The string was resolved, so we display its meaning only,
                         // stripping the # characters signifying the string label:
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index 3f901d9b4cc..6351d9bde36 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -62,9 +62,6 @@ public class BibEntry implements Cloneable {
     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 commentsBeforeEntry = "";
     /**
@@ -549,22 +546,6 @@ public String toString() {
         return CanonicalBibtexEntry.getCanonicalRepresentation(this);
     }
 
-    public boolean isSearchHit() {
-        return searchHit;
-    }
-
-    public void setSearchHit(boolean searchHit) {
-        this.searchHit = searchHit;
-    }
-
-    public boolean isGroupHit() {
-        return groupHit;
-    }
-
-    public void setGroupHit(boolean groupHit) {
-        this.groupHit = groupHit;
-    }
-
     /**
      * @param maxCharacters The maximum number of characters (additional
      *                      characters are replaced with "..."). Set to 0 to disable truncation.
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index a8bbd319222..50dcf175e63 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -189,8 +189,6 @@ public class JabRefPreferences implements PreferencesService {
     public static final String TERMS_POS_X = "termsPosX";
     public static final String SEARCH_DIALOG_HEIGHT = "searchDialogHeight";
     public static final String SEARCH_DIALOG_WIDTH = "searchDialogWidth";
-    public static final String IMPORT_INSPECTION_DIALOG_HEIGHT = "importInspectionDialogHeight";
-    public static final String IMPORT_INSPECTION_DIALOG_WIDTH = "importInspectionDialogWidth";
     public static final String LAST_EDITED = "lastEdited";
     public static final String OPEN_LAST_EDITED = "openLastEdited";
     public static final String LAST_FOCUSED = "lastFocused";
@@ -237,7 +235,6 @@ public class JabRefPreferences implements PreferencesService {
     public static final String OVERWRITE_TIME_STAMP = "overwriteTimeStamp";
 
     public static final String WARN_ABOUT_DUPLICATES_IN_INSPECTION = "warnAboutDuplicatesInInspection";
-    public static final String GENERATE_KEYS_AFTER_INSPECTION = "generateKeysAfterInspection";
     public static final String NON_WRAPPABLE_FIELDS = "nonWrappableFields";
     public static final String RESOLVE_STRINGS_ALL_FIELDS = "resolveStringsAllFields";
     public static final String DO_NOT_RESOLVE_STRINGS_FOR = "doNotResolveStringsFor";
@@ -667,7 +664,6 @@ private JabRefPreferences() {
         defaults.put(DO_NOT_RESOLVE_STRINGS_FOR, FieldName.URL);
         defaults.put(RESOLVE_STRINGS_ALL_FIELDS, Boolean.FALSE);
         defaults.put(NON_WRAPPABLE_FIELDS, "pdf;ps;url;doi;file;isbn;issn");
-        defaults.put(GENERATE_KEYS_AFTER_INSPECTION, Boolean.TRUE);
         defaults.put(WARN_ABOUT_DUPLICATES_IN_INSPECTION, Boolean.TRUE);
         defaults.put(USE_TIME_STAMP, Boolean.FALSE);
         defaults.put(OVERWRITE_TIME_STAMP, Boolean.FALSE);
@@ -693,8 +689,6 @@ private JabRefPreferences() {
         defaults.put(MAIN_FONT_SIZE, 9);
         defaults.put(OVERRIDE_DEFAULT_FONT_SIZE, false);
 
-        defaults.put(IMPORT_INSPECTION_DIALOG_WIDTH, 650);
-        defaults.put(IMPORT_INSPECTION_DIALOG_HEIGHT, 650);
         defaults.put(SHOW_FILE_LINKS_UPGRADE_WARNING, Boolean.TRUE);
         defaults.put(AUTOLINK_EXACT_KEY_ONLY, Boolean.FALSE);
         defaults.put(NUMERIC_FIELDS, "mittnum;author");

From d4b659adec7808bd0dd1a20adec9bac97701def3 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sat, 9 Mar 2019 10:53:06 +0100
Subject: [PATCH 2/3] Implement feedback and improve ui design

---
 .../java/org/jabref/gui/DefaultInjector.java  |  3 +-
 .../gui/importer/ImportEntriesDialog.css      |  8 +-
 .../gui/importer/ImportEntriesDialog.fxml     |  4 +-
 .../gui/importer/ImportEntriesDialog.java     | 12 ++-
 .../gui/importer/ImportEntriesViewModel.java  | 27 ++++---
 .../org/jabref/gui/util/NoSelectionModel.java | 75 +++++++++++++++++++
 .../gui/util/ViewModelListCellFactory.java    | 14 ++++
 .../jabref/preferences/JabRefPreferences.java | 20 ++++-
 .../preferences/PreferencesService.java       | 10 +++
 src/main/resources/l10n/JabRef_en.properties  | 38 ++--------
 .../l10n/LocalizationConsistencyTest.java     |  4 +-
 .../org/jabref/model/entry/BibEntryTests.java | 13 ----
 12 files changed, 161 insertions(+), 67 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/util/NoSelectionModel.java

diff --git a/src/main/java/org/jabref/gui/DefaultInjector.java b/src/main/java/org/jabref/gui/DefaultInjector.java
index 23cb5e93521..20a34bfdbd0 100644
--- a/src/main/java/org/jabref/gui/DefaultInjector.java
+++ b/src/main/java/org/jabref/gui/DefaultInjector.java
@@ -44,8 +44,7 @@ private static Object createDependency(Class<?> clazz) {
             return Globals.clipboardManager;
         } else if (clazz == UndoManager.class) {
             return Globals.undoManager;
-        }
-        {
+        } else {
             try {
                 return clazz.newInstance();
             } catch (InstantiationException | IllegalAccessException ex) {
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css
index 0fe81f0b524..81442716e85 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css
@@ -6,6 +6,10 @@
     /*-fx-padding: 0.5em 0em 0.5em 0em;*/
 }
 
-.entry-container:entry-selected {
-    /*-fx-background-color: derive(-jr-selected, 60%);*/
+.list-cell {
+    -fx-padding: 0.5em 0 1em 0.5em;
+}
+
+.list-cell:entry-selected {
+    -fx-background-color: derive(-jr-selected, 60%);
 }
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
index db855229fe6..005abb8ca28 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
@@ -3,6 +3,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import org.controlsfx.control.CheckListView?>
@@ -11,7 +12,8 @@
             fx:controller="org.jabref.gui.importer.ImportEntriesDialog"
             prefHeight="700.0" prefWidth="1000.0">
     <content>
-        <VBox>
+        <VBox spacing="10">
+            <Label text="%Select the entries to be imported:"/>
             <CheckListView fx:id="entriesListView" VBox.vgrow="ALWAYS"/>
             <HBox>
                 <Button text="%Select all new entries" styleClass="text-button" onAction="#selectAllNewEntries"/>
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 0d025467088..bc72cb28fcb 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -19,10 +19,12 @@
 import javafx.scene.text.Text;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.BindingsHelper;
+import org.jabref.gui.util.NoSelectionModel;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.gui.util.TextFlowLimited;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -30,6 +32,8 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import org.controlsfx.control.CheckListView;
@@ -44,6 +48,9 @@ public class ImportEntriesDialog extends BaseDialog<Void> {
     @Inject private TaskExecutor taskExecutor;
     @Inject private DialogService dialogService;
     @Inject private UndoManager undoManager;
+    @Inject private PreferencesService preferences;
+    @Inject private StateManager stateManager;
+    @Inject private FileUpdateMonitor fileUpdateMonitor;
     private BibDatabaseContext database;
 
     public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<List<BibEntry>> task) {
@@ -67,7 +74,7 @@ public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<List<BibE
 
     @FXML
     private void initialize() {
-        viewModel = new ImportEntriesViewModel(task, taskExecutor, database, dialogService, undoManager);
+        viewModel = new ImportEntriesViewModel(task, taskExecutor, database, dialogService, undoManager, preferences, stateManager, fileUpdateMonitor);
 
         Label placeholder = new Label();
         placeholder.textProperty().bind(viewModel.messageProperty());
@@ -104,7 +111,10 @@ private void initialize() {
 
                     return container;
                 })
+                .withOnMouseClickedEvent((entry, event) -> entriesListView.getCheckModel().toggleCheckState(entry))
+                .withPseudoClass(entrySelected, entriesListView::getItemBooleanProperty)
                 .install(entriesListView);
+        entriesListView.setSelectionModel(new NoSelectionModel<>());
     }
 
     private Node getEntryNode(BibEntry entry) {
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index af3e89319a0..a28a437400b 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -10,10 +10,10 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-import org.jabref.Globals;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.DuplicateResolverDialog;
+import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiles.ImportHandler;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.BackgroundTask;
@@ -22,7 +22,8 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.JabRefPreferences;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.PreferencesService;
 
 public class ImportEntriesViewModel extends AbstractViewModel {
 
@@ -31,13 +32,19 @@ public class ImportEntriesViewModel extends AbstractViewModel {
     private final BibDatabaseContext database;
     private final DialogService dialogService;
     private final UndoManager undoManager;
+    private final StateManager stateManager;
+    private final FileUpdateMonitor fileUpdateMonitor;
     private ObservableList<BibEntry> entries;
+    private PreferencesService preferences;
 
-    public ImportEntriesViewModel(BackgroundTask<List<BibEntry>> task, TaskExecutor taskExecutor, BibDatabaseContext database, DialogService dialogService, UndoManager undoManager) {
+    public ImportEntriesViewModel(BackgroundTask<List<BibEntry>> task, TaskExecutor taskExecutor, BibDatabaseContext database, DialogService dialogService, UndoManager undoManager, PreferencesService preferences, StateManager stateManager, FileUpdateMonitor fileUpdateMonitor) {
         this.task = task;
         this.database = database;
         this.dialogService = dialogService;
         this.undoManager = undoManager;
+        this.preferences = preferences;
+        this.stateManager = stateManager;
+        this.fileUpdateMonitor = fileUpdateMonitor;
         this.entries = FXCollections.observableArrayList();
         this.message = new SimpleStringProperty();
         this.message.bind(task.messageProperty());
@@ -67,7 +74,7 @@ public boolean hasDuplicate(BibEntry entry) {
     public void importEntries(List<BibEntry> entriesToImport) {
         // Check if we are supposed to warn about duplicates.
         // If so, then see if there are duplicates, and warn if yes.
-        if (Globals.prefs.getBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION)) {
+        if (preferences.shouldWarnAboutDuplicatesForImport()) {
             boolean containsDuplicate = entriesToImport.stream()
                                                        .anyMatch(this::hasDuplicate);
 
@@ -77,7 +84,7 @@ public void importEntries(List<BibEntry> entriesToImport) {
                         Localization.lang("Continue with import"),
                         Localization.lang("Cancel import"),
                         Localization.lang("Disable this confirmation dialog"),
-                        optOut -> Globals.prefs.putBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION, !optOut));
+                        optOut -> preferences.setShouldWarnAboutDuplicatesForImport(!optOut));
 
                 if (!continueImport) {
                     dialogService.notify(Localization.lang("Import canceled"));
@@ -90,12 +97,12 @@ public void importEntries(List<BibEntry> entriesToImport) {
                 dialogService,
                 database,
                 ExternalFileTypes.getInstance(),
-                Globals.prefs.getFilePreferences(),
-                Globals.prefs.getImportFormatPreferences(),
-                Globals.prefs.getUpdateFieldPreferences(),
-                Globals.getFileUpdateMonitor(),
+                preferences.getFilePreferences(),
+                preferences.getImportFormatPreferences(),
+                preferences.getUpdateFieldPreferences(),
+                fileUpdateMonitor,
                 undoManager,
-                Globals.stateManager);
+                stateManager);
         importHandler.importEntries(entriesToImport);
 
         dialogService.notify(Localization.lang("Number of entries successfully imported") + ": " + entriesToImport.size());
diff --git a/src/main/java/org/jabref/gui/util/NoSelectionModel.java b/src/main/java/org/jabref/gui/util/NoSelectionModel.java
new file mode 100644
index 00000000000..88cba6e413c
--- /dev/null
+++ b/src/main/java/org/jabref/gui/util/NoSelectionModel.java
@@ -0,0 +1,75 @@
+package org.jabref.gui.util;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.control.MultipleSelectionModel;
+
+/**
+ * Disables selection
+ */
+public class NoSelectionModel<T> extends MultipleSelectionModel<T> {
+
+    @Override
+    public ObservableList<Integer> getSelectedIndices() {
+        return FXCollections.emptyObservableList();
+    }
+
+    @Override
+    public ObservableList<T> getSelectedItems() {
+        return FXCollections.emptyObservableList();
+    }
+
+    @Override
+    public void selectIndices(int index, int... indices) {
+    }
+
+    @Override
+    public void selectAll() {
+    }
+
+    @Override
+    public void selectFirst() {
+    }
+
+    @Override
+    public void selectLast() {
+    }
+
+    @Override
+    public void clearAndSelect(int index) {
+    }
+
+    @Override
+    public void select(int index) {
+    }
+
+    @Override
+    public void select(T obj) {
+    }
+
+    @Override
+    public void clearSelection(int index) {
+    }
+
+    @Override
+    public void clearSelection() {
+    }
+
+    @Override
+    public boolean isSelected(int index) {
+        return false;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return true;
+    }
+
+    @Override
+    public void selectPrevious() {
+    }
+
+    @Override
+    public void selectNext() {
+    }
+}
diff --git a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
index 983e4c4b29e..3f58f3cc9b3 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
@@ -1,7 +1,11 @@
 package org.jabref.gui.util;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.function.BiConsumer;
 
+import javafx.beans.value.ObservableValue;
+import javafx.css.PseudoClass;
 import javafx.scene.Node;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.ContextMenu;
@@ -37,6 +41,7 @@ public class ViewModelListCellFactory<T> implements Callback<ListView<T>, ListCe
     private BiConsumer<T, ? super DragEvent> toOnDragEntered;
     private BiConsumer<T, ? super DragEvent> toOnDragExited;
     private BiConsumer<T, ? super DragEvent> toOnDragOver;
+    private Map<PseudoClass, Callback<T, ObservableValue<Boolean>>> pseudoClasses = new HashMap<>();
 
     public ViewModelListCellFactory<T> withText(Callback<T, String> toText) {
         this.toText = toText;
@@ -115,6 +120,11 @@ public ViewModelListCellFactory<T> setOnDragOver(BiConsumer<T, ? super DragEvent
         return this;
     }
 
+    public ViewModelListCellFactory<T> withPseudoClass(PseudoClass pseudoClass, Callback<T, ObservableValue<Boolean>> toCondition) {
+        this.pseudoClasses.putIfAbsent(pseudoClass, toCondition);
+        return this;
+    }
+
     public void install(ComboBox<T> comboBox) {
         comboBox.setButtonCell(this.call(null));
         comboBox.setCellFactory(this);
@@ -176,6 +186,10 @@ protected void updateItem(T item, boolean empty) {
                     if (toOnDragOver != null) {
                         setOnDragOver(event -> toOnDragOver.accept(viewModel, event));
                     }
+                    for (Map.Entry<PseudoClass, Callback<T, ObservableValue<Boolean>>> pseudoClassWithCondition : pseudoClasses.entrySet()) {
+                        ObservableValue<Boolean> condition = pseudoClassWithCondition.getValue().call(viewModel);
+                        BindingsHelper.includePseudoClassWhen(this, pseudoClassWithCondition.getKey(), condition);
+                    }
                 }
                 getListView().refresh();
             }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 50dcf175e63..c12b9afa258 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -1434,10 +1434,11 @@ public FilePreferences getFilePreferences() {
                                    get(IMPORT_FILEDIRPATTERN));
     }
 
+    @Override
     public UpdateFieldPreferences getUpdateFieldPreferences() {
         return new UpdateFieldPreferences(getBoolean(USE_OWNER), getBoolean(OVERWRITE_OWNER), get(DEFAULT_OWNER),
-                                          getBoolean(USE_TIME_STAMP), getBoolean(OVERWRITE_TIME_STAMP), get(TIME_STAMP_FIELD),
-                                          get(TIME_STAMP_FORMAT));
+                getBoolean(USE_TIME_STAMP), getBoolean(OVERWRITE_TIME_STAMP), get(TIME_STAMP_FIELD),
+                get(TIME_STAMP_FORMAT));
     }
 
     public LatexFieldFormatterPreferences getLatexFieldFormatterPreferences() {
@@ -1454,10 +1455,11 @@ public boolean isKeywordSyncEnabled() {
                && getBoolean(JabRefPreferences.AUTOSYNCSPECIALFIELDSTOKEYWORDS);
     }
 
+    @Override
     public ImportFormatPreferences getImportFormatPreferences() {
         return new ImportFormatPreferences(customImports, getDefaultEncoding(), getKeywordDelimiter(),
-                                           getBibtexKeyPatternPreferences(), getFieldContentParserPreferences(), getXMPPreferences(),
-                                           isKeywordSyncEnabled());
+                getBibtexKeyPatternPreferences(), getFieldContentParserPreferences(), getXMPPreferences(),
+                isKeywordSyncEnabled());
     }
 
     @Override
@@ -2042,4 +2044,14 @@ public String getExportWorkingDirectory() {
     public void setExportWorkingDirectory(String layoutFileDirString) {
         put(EXPORT_WORKING_DIRECTORY, layoutFileDirString);
     }
+
+    @Override
+    public boolean shouldWarnAboutDuplicatesForImport() {
+        return getBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION);
+    }
+
+    @Override
+    public void setShouldWarnAboutDuplicatesForImport(boolean value) {
+        putBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION, value);
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 47ec943c9c4..c9c2e904724 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -7,10 +7,12 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.importer.ImportFormatPreferences;
 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.logic.util.UpdateFieldPreferences;
 import org.jabref.model.metadata.FilePreferences;
 
 public interface PreferencesService {
@@ -53,9 +55,17 @@ public interface PreferencesService {
 
     LayoutFormatterPreferences getLayoutFormatterPreferences(JournalAbbreviationLoader loader);
 
+    UpdateFieldPreferences getUpdateFieldPreferences();
+
+    ImportFormatPreferences getImportFormatPreferences();
+
     SavePreferences loadForExportFromPreferences();
 
     String getExportWorkingDirectory();
 
     void setExportWorkingDirectory(String layoutFileDirString);
+
+    boolean shouldWarnAboutDuplicatesForImport();
+
+    void setShouldWarnAboutDuplicatesForImport(boolean value);
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index e7b59c36dad..d198b4c7b5c 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -84,8 +84,6 @@ Assigned\ %0\ entries\ to\ group\ "%1".=Assigned %0 entries to group "%1".
 
 Assigned\ 1\ entry\ to\ group\ "%0".=Assigned 1 entry to group "%0".
 
-Attach\ URL=Attach URL
-
 Autogenerate\ BibTeX\ keys=Autogenerate BibTeX keys
 
 Autolink\ files\ with\ names\ starting\ with\ the\ BibTeX\ key=Autolink files with names starting with the BibTeX key
@@ -115,8 +113,6 @@ The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comm
 
 Cancel=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
@@ -263,9 +259,6 @@ Descending=Descending
 
 Description=Description
 
-Deselect\ all=Deselect all
-Deselect\ all\ duplicates=Deselect all duplicates
-
 Disable\ this\ confirmation\ dialog=Disable this confirmation dialog
 
 Display\ all\ entries\ belonging\ to\ one\ or\ more\ of\ the\ selected\ groups.=Display all entries belonging to one or more of the selected groups.
@@ -329,8 +322,6 @@ Editor\ options=Editor options
 empty\ library=empty library
 Enable\ word/name\ autocompletion=Enable word/name autocompletion
 
-Enter\ URL=Enter URL
-
 Enter\ URL\ to\ download=Enter URL to download
 
 entries=entries
@@ -455,9 +446,6 @@ Generate\ BibTeX\ key=Generate BibTeX key
 Generate\ keys=Generate keys
 
 Generate\ keys\ before\ saving\ (for\ entries\ without\ a\ key)=Generate keys before saving (for entries without a key)
-Generate\ keys\ for\ imported\ entries=Generate keys for imported entries
-
-Generate\ now=Generate now
 
 Generated\ BibTeX\ key\ for=Generated BibTeX key for
 
@@ -503,9 +491,6 @@ Import\ and\ keep\ old\ entry=Import and keep old entry
 Import\ and\ remove\ old\ entry=Import and remove old entry
 
 Import\ entries=Import entries
-
-Import\ failed=Import failed
-
 Import\ file=Import file
 
 Import\ group\ definitions=Import group definitions
@@ -564,9 +549,6 @@ Join=Join
 Joins\ selected\ keywords\ and\ deletes\ selected\ keywords.=Joins selected keywords and deletes selected keywords.
 
 Journal\ abbreviations=Journal abbreviations
-
-Keep=Keep
-
 Keep\ both=Keep both
 
 Key\ bindings=Key bindings
@@ -591,8 +573,6 @@ LaTeX\ AUX\ file\:=LaTeX AUX file\:
 Left=Left
 
 Link=Link
-Link\ local\ file=Link local file
-
 Listen\ for\ remote\ operation\ on\ port=Listen for remote operation on port
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Load and Save preferences from/to jabref.xml on start-up (memory stick mode)
 
@@ -662,9 +642,6 @@ no\ base-BibTeX-file\ specified=no base-BibTeX-file specified
 no\ library\ generated=no library generated
 
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=No entries found. Please make sure you are using the correct import filter.
-
-No\ entries\ imported.=No entries imported.
-
 No\ files\ found.=No files found.
 
 No\ GUI.\ Only\ process\ command\ line\ options.=No GUI. Only process command line options.
@@ -976,9 +953,6 @@ Special\ table\ columns=Special table columns
 Statically\ group\ entries\ by\ manual\ assignment=Statically group entries by manual assignment
 
 Status=Status
-
-Stop=Stop
-
 Strings\ for\ library=Strings for library
 
 Sublibrary\ from\ AUX=Sublibrary from AUX
@@ -1022,9 +996,6 @@ The\ search\ is\ case\ sensitive.=The search is case sensitive.
 The\ string\ has\ been\ removed\ locally=The string has been removed locally
 
 There\ are\ possible\ duplicates\ (marked\ with\ an\ icon)\ that\ haven't\ been\ resolved.\ Continue?=There are possible duplicates (marked with an icon) that haven't been resolved. Continue?
-
-This\ entry\ has\ no\ BibTeX\ key.\ Generate\ key\ now?=This entry has no BibTeX key. Generate key now?
-
 This\ entry\ type\ cannot\ be\ removed.=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 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.
@@ -1138,7 +1109,6 @@ Move\ file\ to\ file\ directory\ and\ rename\ file=Move file to file directory a
 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
 Error\ while\ fetching\ from\ %0=Error while fetching from %0
 
 Show\ search\ results\ in\ a\ window=Show search results in a window
@@ -2086,8 +2056,6 @@ Keep\ entry=Keep entry
 Ignore\ backup=Ignore backup
 Restore\ from\ backup=Restore from backup
 
-Continue=Continue
-Generate\ key=Generate key
 Overwrite\ file=Overwrite file
 Shared\ database\ connection=Shared database connection
 
@@ -2173,3 +2141,9 @@ File\ extension\:=File extension\:
 Export\ format\ name\:=Export format name\:
 Cleared\ connection\ settings=Cleared connection settings
 Error\ adding\ discovered\ CitationStyles=Error adding discovered CitationStyles
+(more)=(more)
+Cancel\ import=Cancel import
+Continue\ with\ import=Continue with import
+Import\ canceled=Import canceled
+Select\ all\ new\ entries=Select all new entries
+Select\ the\ entries\ to\ be\ imported\:=Select the entries to be imported\:
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
index 6f8aa2c15de..7e8ef1db2d9 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
@@ -112,8 +112,8 @@ void findMissingLocalizationKeys() throws IOException {
                 "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")));
+                                   .map(key -> String.format("%s=%s", key.getKey(), key.getKey().replaceAll("\\\\ ", " ")))
+                                   .collect(Collectors.joining("\n", "\n", "\n")));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTests.java b/src/test/java/org/jabref/model/entry/BibEntryTests.java
index 872ba189f65..b2e0d35cdaf 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTests.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTests.java
@@ -396,19 +396,6 @@ public void removeKeywordsWithExistingKeywordsRemovesThem() {
         assertEquals(KeywordList.parse("kw3", ','), keywordEntry.getKeywords(','));
     }
 
-    @Test
-    public void testGroupAndSearchHits() {
-        BibEntry be = new BibEntry();
-        be.setGroupHit(true);
-        assertTrue(be.isGroupHit());
-        be.setGroupHit(false);
-        assertFalse(be.isGroupHit());
-        be.setSearchHit(true);
-        assertTrue(be.isSearchHit());
-        be.setSearchHit(false);
-        assertFalse(be.isSearchHit());
-    }
-
     @Test
     public void setCiteKey() {
         BibEntry be = new BibEntry();

From 58cdb5663b561d406a800545da5b946fe09d878c Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sat, 9 Mar 2019 11:05:14 +0100
Subject: [PATCH 3/3] Fix build

---
 src/main/java/org/jabref/Globals.java        | 2 +-
 src/main/resources/l10n/JabRef_en.properties | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/Globals.java b/src/main/java/org/jabref/Globals.java
index 634e5ffee85..1a5cc0ee385 100644
--- a/src/main/java/org/jabref/Globals.java
+++ b/src/main/java/org/jabref/Globals.java
@@ -58,12 +58,12 @@ public class Globals {
 
     public static StateManager stateManager = new StateManager();
     public static ExporterFactory exportFactory;
+    public static CountingUndoManager undoManager = new CountingUndoManager();
     // Key binding preferences
     private static KeyBindingRepository keyBindingRepository;
     private static DefaultFileUpdateMonitor fileUpdateMonitor;
     private static ThemeLoader themeLoader;
     private static TelemetryClient telemetryClient;
-    public static CountingUndoManager undoManager = new CountingUndoManager();
 
     private Globals() {
     }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 39855d2916d..0a4929876ab 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -43,8 +43,6 @@ Add\ selected\ entries\ to\ this\ group=Add selected entries to this group
 
 Add\ subgroup=Add subgroup
 
-Add\ to\ group=Add to group
-
 Added\ group\ "%0".=Added group "%0".
 
 Added\ string=Added string
@@ -109,9 +107,6 @@ by=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=Cancel
-
-Cannot\ add\ entries\ to\ group\ without\ generating\ keys.\ Generate\ keys\ now?=Cannot add entries to group without generating keys. Generate keys now?
-
 Cannot\ create\ group=Cannot create group
 
 Cannot\ create\ group.\ Please\ create\ a\ library\ first.=Cannot create group. Please create a library first.