From ca4e025ae225c02832b94e620ddfd9fcb5ac247a Mon Sep 17 00:00:00 2001
From: Caroline de Pourtales <caro.de.pourtales@gmail.com>
Date: Wed, 11 Dec 2019 14:11:09 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Travail=20sur=20l'issue=20#4183=20et=20#550?=
 =?UTF-8?q?=20pour=20impl=C3=A9menter=20un=20bouton=20qui=20ouvre=20un=20d?=
 =?UTF-8?q?ialog=20avec=20un=20textfield=20pour=20un=20id=20dont=20le=20Fe?=
 =?UTF-8?q?tcher=20est=20trouv=C3=A9=20par=20Regex.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/jabref/Globals.java         |   1 +
 src/main/java/org/jabref/gui/BasePanel.java   |   2 +
 src/main/java/org/jabref/gui/EntryFromID.fxml |  50 ++++
 .../java/org/jabref/gui/EntryFromIDView.java  |  86 ++++++
 .../org/jabref/gui/EntryFromIDViewModel.java  | 276 ++++++++++++++++++
 src/main/java/org/jabref/gui/EntryType.fxml   |   9 +
 .../org/jabref/gui/EntryTypeViewModel.java    |   2 +-
 src/main/java/org/jabref/gui/JabRefFrame.java |  14 +-
 .../jabref/gui/actions/StandardActions.java   |   3 +
 .../java/org/jabref/gui/icon/IconTheme.java   |   1 +
 .../jabref/gui/importer/NewEntryAction.java   |  41 ++-
 .../org/jabref/gui/keyboard/KeyBinding.java   |   1 +
 .../logic/importer/FetcherException.java      |   1 -
 .../importer/NoFetcherFoundException.java     |  15 +
 src/main/resources/build.properties           |   1 +
 src/main/resources/l10n/JabRef_en.properties  |  12 +
 src/main/resources/l10n/JabRef_fr.properties  |  12 +
 17 files changed, 509 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/EntryFromID.fxml
 create mode 100644 src/main/java/org/jabref/gui/EntryFromIDView.java
 create mode 100644 src/main/java/org/jabref/gui/EntryFromIDViewModel.java
 create mode 100644 src/main/java/org/jabref/logic/importer/NoFetcherFoundException.java

diff --git a/src/main/java/org/jabref/Globals.java b/src/main/java/org/jabref/Globals.java
index a4399b13207..0a25ff4efe7 100644
--- a/src/main/java/org/jabref/Globals.java
+++ b/src/main/java/org/jabref/Globals.java
@@ -63,6 +63,7 @@ public class Globals {
     public static ExporterFactory exportFactory;
     public static CountingUndoManager undoManager = new CountingUndoManager();
     public static BibEntryTypesManager entryTypesManager = new BibEntryTypesManager();
+
     // Key binding preferences
     private static KeyBindingRepository keyBindingRepository;
     private static DefaultFileUpdateMonitor fileUpdateMonitor;
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index ecc1673e29b..75da6e65a40 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -244,6 +244,7 @@ public void output(String s) {
 
     private void setupActions() {
         SaveDatabaseAction saveAction = new SaveDatabaseAction(this, Globals.prefs, Globals.entryTypesManager);
+
         CleanupAction cleanUpAction = new CleanupAction(this, Globals.prefs, Globals.TASK_EXECUTOR);
 
         actions.put(Actions.UNDO, undoAction);
@@ -259,6 +260,7 @@ private void setupActions() {
 
         actions.put(Actions.SAVE_SELECTED_AS_PLAIN, saveAction::saveSelectedAsPlain);
 
+
         // The action for copying selected entries.
         actions.put(Actions.COPY, this::copy);
 
diff --git a/src/main/java/org/jabref/gui/EntryFromID.fxml b/src/main/java/org/jabref/gui/EntryFromID.fxml
new file mode 100644
index 00000000000..7e47d576084
--- /dev/null
+++ b/src/main/java/org/jabref/gui/EntryFromID.fxml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.TitledPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+
+
+<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefWidth="476.0" xmlns="http://javafx.com/javafx/8.0.171" fx:controller="org.jabref.gui.EntryFromIDView">
+
+    <buttonTypes>
+        <ButtonType fx:id="lookupButton" buttonData="OK_DONE" text="%LookUp"/>
+        <ButtonType fx:id="generateButton" buttonData="OK_DONE" text="%Generate"/>
+        <ButtonType fx:constant="CANCEL"/>
+    </buttonTypes>
+
+    <content>
+        <VBox prefHeight="200.0" prefWidth="400.0">
+
+                <GridPane alignment="CENTER">
+                    <children>
+                        <Label text="%FromID" GridPane.rowIndex="1" />
+                        <TextField fx:id="idTextField" onAction="#runFetcherWorker" prefHeight="30.0" prefWidth="300.0"
+                                   GridPane.rowIndex="2"/>
+
+                        <Label text="%LookUp" GridPane.rowIndex="3" />
+
+                        <TextArea fx:id="lookUpField"
+                              GridPane.rowIndex="4"/>
+
+                    </children>
+
+                </GridPane>
+        </VBox>
+    </content>
+</DialogPane>
+
diff --git a/src/main/java/org/jabref/gui/EntryFromIDView.java b/src/main/java/org/jabref/gui/EntryFromIDView.java
new file mode 100644
index 00000000000..f2fb92c6132
--- /dev/null
+++ b/src/main/java/org/jabref/gui/EntryFromIDView.java
@@ -0,0 +1,86 @@
+package org.jabref.gui;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import javafx.application.Platform;
+import javafx.event.Event;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.layout.FlowPane;
+import org.fxmisc.easybind.EasyBind;
+import org.jabref.Globals;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
+import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.importer.IdBasedFetcher;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions;
+import org.jabref.model.entry.types.BibtexEntryTypeDefinitions;
+import org.jabref.model.entry.types.EntryType;
+import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions;
+import org.jabref.preferences.JabRefPreferences;
+
+public class EntryFromIDView extends BaseDialog<EntryType> {
+
+    @FXML private ButtonType generateButton;
+    @FXML private ButtonType lookupButton;
+    @FXML private TextField idTextField;
+    @FXML private TextArea lookUpField;
+
+    private final BasePanel basePanel;
+    private final DialogService dialogService;
+    private final JabRefPreferences prefs;
+
+    private EntryFromIDViewModel viewModel;
+
+    public EntryFromIDView(BasePanel basePanel, DialogService dialogService, JabRefPreferences preferences) {
+        this.basePanel = basePanel;
+        this.dialogService = dialogService;
+        this.prefs = preferences;
+
+        this.setTitle(Localization.lang("Select entry type from ID"));
+        ViewLoader.view(this).load().setAsDialogPane(this);
+
+        ControlHelper.setAction(lookupButton, this.getDialogPane(), event -> viewModel.runFetcherWorkerForLookUp(lookUpField));
+
+        Button btnLookUp = (Button) this.getDialogPane().lookupButton(lookupButton);
+        btnLookUp.textProperty().bind(EasyBind.map(viewModel.searchingProperty(), searching -> (searching) ? Localization.lang("Searching...") : Localization.lang("LookUp")));
+        btnLookUp.disableProperty().bind(viewModel.searchingProperty());
+
+        ControlHelper.setAction(generateButton, this.getDialogPane(), event -> viewModel.runFetcherWorker());
+
+        Button btnGenerate = (Button) this.getDialogPane().lookupButton(generateButton);
+        btnGenerate.textProperty().bind(EasyBind.map(viewModel.searchingProperty(), searching -> (searching) ? Localization.lang("Adding...") : Localization.lang("Generate")));
+        btnGenerate.disableProperty().bind(viewModel.searchingProperty());
+
+    }
+
+    @FXML
+    public void initialize() {
+        viewModel = new EntryFromIDViewModel(prefs, basePanel, dialogService);
+
+        idTextField.textProperty().bindBidirectional(viewModel.idTextProperty());
+
+        EasyBind.subscribe(viewModel.getFocusAndSelectAllProperty(), evt -> {
+            if (evt) {
+                idTextField.requestFocus();
+                idTextField.selectAll();
+            }
+        });
+
+        Platform.runLater(() -> idTextField.requestFocus());
+    }
+
+    @FXML
+    private void runFetcherWorker(Event event) {
+        viewModel.runFetcherWorker();
+    }
+
+    @FXML
+    private void focusTextField(Event event) {
+        idTextField.requestFocus();
+        idTextField.selectAll();
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/EntryFromIDViewModel.java b/src/main/java/org/jabref/gui/EntryFromIDViewModel.java
new file mode 100644
index 00000000000..4efa2079672
--- /dev/null
+++ b/src/main/java/org/jabref/gui/EntryFromIDViewModel.java
@@ -0,0 +1,276 @@
+package org.jabref.gui;
+
+import java.util.Optional;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.concurrent.Task;
+import javafx.concurrent.Worker;
+
+import java.util.regex.Pattern;
+import java.util.HashMap;
+import  java.util.function.Predicate;
+
+import javafx.scene.control.TextArea;
+import org.jabref.Globals;
+import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
+import org.jabref.logic.bibtex.DuplicateCheck;
+import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.IdBasedFetcher;
+import org.jabref.logic.importer.NoFetcherFoundException;
+import org.jabref.logic.importer.WebFetchers;
+import org.jabref.logic.importer.fetcher.*;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.JabRefPreferences;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EntryFromIDViewModel {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(EntryFromIDViewModel.class);
+
+    private final JabRefPreferences prefs;
+    private final BooleanProperty searchingProperty = new SimpleBooleanProperty();
+    private final BooleanProperty searchSuccesfulProperty = new SimpleBooleanProperty();
+    private final StringProperty idText = new SimpleStringProperty();
+    private  String fetcherName;
+    private final BooleanProperty focusAndSelectAllProperty = new SimpleBooleanProperty();
+    private Task<Optional<BibEntry>> fetcherWorker = new FetcherWorker();
+    private HashMap <Predicate<String>,IdBasedFetcher> fetcherMatchPattern = new HashMap<>();
+    private final BasePanel basePanel;
+    private final DialogService dialogService;
+
+    public EntryFromIDViewModel(JabRefPreferences preferences, BasePanel basePanel, DialogService dialogService) {
+        this.basePanel = basePanel;
+        this.prefs = preferences;
+        this.dialogService = dialogService;
+
+        //DOI validate hors http
+        Pattern pdoi = Pattern.compile("10\\.[0-9]{4}/([0-9]{13}|[a-zA-Z]+\\.[0-9]{4}\\.[0-9]{2}|[-_0-9]+)");
+        fetcherMatchPattern.put(pdoi.asPredicate(),new DoiFetcher(preferences.getImportFormatPreferences()));
+
+        //HTTPDOI
+        Pattern pHTTPdoi = Pattern.compile("10\\.[0-9]{4}/([0-9]{13}|[a-zA-Z]+\\.[0-9]{4}\\.[0-9]{2}|[-_0-9]+)");
+        fetcherMatchPattern.put(pHTTPdoi.asPredicate(),new DoiFetcher(preferences.getImportFormatPreferences()));
+
+        //ISBN validate
+        Pattern pisbn = Pattern.compile("^(?:ISBN(?:-1[03])?:? )?(?=[0-9X]{10}$|(?=(?:[0-9]+[- ]){3})[- 0-9X]{13}$|97[89][0-9]{10}$|(?=(?:[0-9]+[- ]){4})[- 0-9]{17}$)(?:97[89][- ]?)?[0-9]{1,5}[- ]?[0-9]+[- ]?[0-9]+[- ]?[0-9X]$");
+        fetcherMatchPattern.put(pisbn.asPredicate(),new IsbnFetcher(preferences.getImportFormatPreferences()));
+        //Rajouter pour long isbn
+
+        //DIVA Validate
+        Pattern pdiva = Pattern.compile("diva2:[0-9]{6}");
+        fetcherMatchPattern.put(pdiva.asPredicate(), new DiVA(preferences.getImportFormatPreferences()));
+
+        //MedlineFetcher Validate
+        Pattern pmd = Pattern.compile("[0-9]{8}");
+        fetcherMatchPattern.put(pmd.asPredicate(), new MedlineFetcher());
+
+        //MathSciNetId validate
+        Pattern pMathSciNetId = Pattern.compile("[0-9]{7}");
+        fetcherMatchPattern.put(pMathSciNetId.asPredicate(), new MathSciNet(preferences.getImportFormatPreferences()));
+
+        //LibraryOfCongress validate
+        Pattern pLibraryOfCongress= Pattern.compile("[0-9]{10}");
+        fetcherMatchPattern.put(pLibraryOfCongress.asPredicate(), new LibraryOfCongress(preferences.getImportFormatPreferences()));
+
+        //RfcFetcher validate
+        Pattern pRfcFetcher = Pattern.compile("[rR]*[fF]*[cC]*[0-9]{4}");
+        fetcherMatchPattern.put(pRfcFetcher.asPredicate(),new RfcFetcher(preferences.getImportFormatPreferences()));
+
+        //Arxiv
+        Pattern parxiv = Pattern.compile("[arXiv:]*[0-9][0-9](0[1-9]|1[0-2])\\.[0-9]{4}([v][0-9]+)*");
+        fetcherMatchPattern.put(parxiv.asPredicate(), new ArXiv(preferences.getImportFormatPreferences()));
+
+        //AstrophysicsDataSystem
+        Pattern pads = Pattern.compile("10\\.[0-9]{5}/([0-9]{13}|[a-zA-Z]+\\.[0-9]{4}\\.[0-9]{2}|[-_0-9]+)");
+        fetcherMatchPattern.put(pads.asPredicate(),new AstrophysicsDataSystem(preferences.getImportFormatPreferences()));
+
+        //TitleFetcher
+        //CrossRef -> DOI
+
+        //IacrEprintFetcher "Report 2017/1118 "
+        Pattern pIacr = Pattern.compile("[a-zA-Z]*\\s*[0-9]{4}/[0-9]{4}");
+        fetcherMatchPattern.put(pIacr.asPredicate(),new IacrEprintFetcher(preferences.getImportFormatPreferences()));
+
+
+    }
+
+    public BooleanProperty searchSuccesfulProperty() {
+        return searchSuccesfulProperty;
+    }
+
+    public BooleanProperty searchingProperty() {
+        return searchingProperty;
+    }
+
+    public StringProperty idTextProperty() {
+        return idText;
+    }
+
+    public BooleanProperty getFocusAndSelectAllProperty() {
+        return focusAndSelectAllProperty;
+    }
+
+
+    public void stopFetching() {
+        if (fetcherWorker.getState() == Worker.State.RUNNING) {
+            fetcherWorker.cancel(true);
+        }
+    }
+
+    private class FetcherWorker extends Task<Optional<BibEntry>> {
+
+        private IdBasedFetcher fetcher = null;
+        private String searchID = "";
+
+        public IdBasedFetcher findFetcher (String id) {
+
+            return fetcherMatchPattern.entrySet().stream()
+                    .filter(e -> e.getKey().test(id))
+                    .map(e -> e.getValue())
+                    .findFirst()
+                    .orElseThrow(()-> new NoFetcherFoundException("Can't find fetcher for this id :" + id));
+
+        }
+
+        @Override
+        protected Optional<BibEntry> call() throws InterruptedException, FetcherException {
+            Optional<BibEntry> bibEntry = Optional.empty();
+
+            searchingProperty().setValue(true);
+
+            searchID = idText.getValue();
+
+            if (!searchID.isEmpty()) {
+                try {
+                    fetcher = this.findFetcher(searchID);
+                    fetcherName=fetcher.getName();
+                    bibEntry = fetcher.performSearchById(searchID);
+                } catch (NoFetcherFoundException e) {
+                    dialogService.showErrorDialogAndWait(Localization.lang("No fetcher found."), Localization.lang("Error while searching fetcher from %0", searchID));
+                }
+
+            }
+            return bibEntry;
+        }
+    }
+
+    public void runFetcherWorker() {
+        searchSuccesfulProperty.set(false);
+        fetcherWorker.run();
+        fetcherWorker.setOnFailed(event -> {
+            Throwable exception = fetcherWorker.getException();
+            String fetcherExceptionMessage = exception.getMessage();
+            String fetcher = fetcherName;
+            String searchId = idText.getValue();
+            if (exception instanceof FetcherException) {
+                dialogService.showErrorDialogAndWait(Localization.lang("Error"), Localization.lang("Error while fetching from %0", fetcher + "." + "\n" + fetcherExceptionMessage));
+            } else {
+                dialogService.showErrorDialogAndWait(Localization.lang("No files found.", Localization.lang("Fetcher '%0' did not find an entry for id '%1'.", fetcher, searchId) + "\n" + fetcherExceptionMessage));
+            }
+            LOGGER.error(String.format("Exception during fetching when using fetcher '%s' with entry id '%s'.", searchId, fetcher), exception);
+
+            searchingProperty.set(false);
+
+            fetcherWorker = new FetcherWorker();
+
+        });
+
+        fetcherWorker.setOnSucceeded(evt -> {
+            Optional<BibEntry> result = fetcherWorker.getValue();
+            if (result.isPresent()) {
+                final BibEntry entry = result.get();
+                Optional<BibEntry> duplicate = new DuplicateCheck(Globals.entryTypesManager).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(entry);
+                    basePanel.insertEntry(entry);
+                }
+                searchSuccesfulProperty.set(true);
+
+            } else if (StringUtil.isBlank(idText.getValue())) {
+                dialogService.showWarningDialogAndWait(Localization.lang("Empty search ID"), Localization.lang("The given search ID was empty."));
+            }
+            fetcherWorker = new FetcherWorker();
+
+            focusAndSelectAllProperty.set(true);
+            searchingProperty().setValue(false);
+
+        });
+    }
+
+    public void runFetcherWorkerForLookUp(TextArea lookUpField) {
+        searchSuccesfulProperty.set(false);
+        fetcherWorker.run();
+        fetcherWorker.setOnFailed(event -> {
+            Throwable exception = fetcherWorker.getException();
+            String fetcherExceptionMessage = exception.getMessage();
+            String fetcher = fetcherName;
+            String searchId = idText.getValue();
+            if (exception instanceof FetcherException) {
+                dialogService.showErrorDialogAndWait(Localization.lang("Error"), Localization.lang("Error while fetching from %0", fetcher + "." + "\n" + fetcherExceptionMessage));
+            } else {
+                dialogService.showErrorDialogAndWait(Localization.lang("No files found.", Localization.lang("Fetcher '%0' did not find an entry for id '%1'.", fetcher, searchId) + "\n" + fetcherExceptionMessage));
+            }
+            LOGGER.error(String.format("Exception during fetching when using fetcher '%s' with entry id '%s'.", searchId, fetcher), exception);
+
+            searchingProperty.set(false);
+
+            fetcherWorker = new FetcherWorker();
+
+        });
+
+        fetcherWorker.setOnSucceeded(evt -> {
+            Optional<BibEntry> result = fetcherWorker.getValue();
+
+            if (result.isPresent()) {
+
+                final BibEntry entry = result.get();
+
+                String entryString = "Found with : " + fetcherName + " Title : " + entry.getTitle();
+                lookUpField.setText(entryString);
+
+                searchSuccesfulProperty.set(true);
+
+            } else if (StringUtil.isBlank(idText.getValue())) {
+                dialogService.showWarningDialogAndWait(Localization.lang("Empty search ID"), Localization.lang("The given search ID was empty."));
+            }
+
+            fetcherWorker = new FetcherWorker();
+
+            focusAndSelectAllProperty.set(true);
+            searchingProperty().setValue(false);
+
+        });
+    }
+}
diff --git a/src/main/java/org/jabref/gui/EntryType.fxml b/src/main/java/org/jabref/gui/EntryType.fxml
index 0ed5f37b502..96402a87298 100644
--- a/src/main/java/org/jabref/gui/EntryType.fxml
+++ b/src/main/java/org/jabref/gui/EntryType.fxml
@@ -12,35 +12,43 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
+
 <DialogPane xmlns:fx="http://javafx.com/fxml/1" prefWidth="476.0" xmlns="http://javafx.com/javafx/8.0.171"
             fx:controller="org.jabref.gui.EntryTypeView">
+
     <buttonTypes>
         <ButtonType fx:constant="CANCEL"/>
         <ButtonType fx:id="generateButton" buttonData="OK_DONE" text="%Generate"/>
     </buttonTypes>
+
    <content>
        <VBox prefHeight="200.0" prefWidth="400.0">
            <children>
+
                <TitledPane fx:id="biblatexTitlePane" animated="false" collapsible="false" text="Biblatex">
                    <content>
                        <FlowPane fx:id="biblatexPane" prefHeight="200.0" prefWidth="200.0"/>
                    </content>
                </TitledPane>
+
                <TitledPane fx:id="bibTexTitlePane" animated="false" collapsible="false" text="BibTeX">
                    <content>
                        <FlowPane fx:id="bibTexPane" prefHeight="200.0" prefWidth="200.0"/>
                    </content>
                </TitledPane>
+
                <TitledPane fx:id="ieeeTranTitlePane" animated="false" collapsible="false" text="IEEETran">
                    <content>
                        <FlowPane fx:id="ieeetranPane" prefHeight="200.0" prefWidth="200.0"/>
                    </content>
                </TitledPane>
+
                <TitledPane fx:id="customTitlePane" animated="false" collapsible="false" text="%Custom">
                    <content>
                        <FlowPane fx:id="customPane" prefHeight="200.0" prefWidth="200.0"/>
                    </content>
                </TitledPane>
+
                <GridPane alignment="CENTER">
                <children>
                    <Label text="%ID type"/>
@@ -50,6 +58,7 @@
                    <TextField fx:id="idTextField" onAction="#runFetcherWorker" prefHeight="30.0" prefWidth="300.0"
                               GridPane.columnIndex="1" GridPane.rowIndex="1"/>
                </children>
+
                <columnConstraints>
                   <ColumnConstraints hgrow="SOMETIMES" maxWidth="122.0" minWidth="10.0" prefWidth="100.0" />
                   <ColumnConstraints hgrow="SOMETIMES" maxWidth="146.0" minWidth="10.0" prefWidth="300.0" />
diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
index 62344a16889..c977d9cefd0 100644
--- a/src/main/java/org/jabref/gui/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -80,7 +80,7 @@ public void storeSelectedFetcher() {
 
     private IdBasedFetcher getLastSelectedFetcher() {
         return fetchers.stream().filter(fetcher -> fetcher.getName().equals(prefs.getIdBasedFetcherForEntryGenerator()))
-                       .findFirst().orElse(new DoiFetcher(prefs.getImportFormatPreferences()));
+                .findFirst().orElse(new DoiFetcher(prefs.getImportFormatPreferences()));
     }
 
     public ListProperty<IdBasedFetcher> fetcherItemsProperty() {
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 364a834056e..545ce4a7208 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -74,11 +74,7 @@
 import org.jabref.gui.help.ErrorConsoleAction;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.help.SearchForUpdateAction;
-import org.jabref.gui.importer.ImportCommand;
-import org.jabref.gui.importer.ImportEntriesDialog;
-import org.jabref.gui.importer.ManageCustomImportsAction;
-import org.jabref.gui.importer.NewDatabaseAction;
-import org.jabref.gui.importer.NewEntryAction;
+import org.jabref.gui.importer.*;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.importer.fetcher.LookupIdentifierAction;
 import org.jabref.gui.integrity.IntegrityCheckAction;
@@ -481,6 +477,10 @@ private Node createToolbar() {
         HBox rightSide = new HBox(
                 factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(this, StandardEntryType.Article, dialogService, Globals.prefs, stateManager)),
                 factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(this, dialogService, Globals.prefs, stateManager)),
+
+                //AJOUT_ICI
+                factory.createIconButton(StandardActions.NEW_ENTRY_FROM_ID, new NewEntryAction(this, true,  dialogService, Globals.prefs, stateManager)),
+
                 factory.createIconButton(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, stateManager)),
                 new Separator(Orientation.VERTICAL),
                 factory.createIconButton(StandardActions.UNDO, new OldDatabaseCommandWrapper(Actions.UNDO, this, stateManager)),
@@ -729,6 +729,10 @@ private MenuBar createMenu() {
         //@formatter:off
         library.getItems().addAll(
                 factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(this, dialogService, Globals.prefs, stateManager)),
+
+                //AJOUT_ICI
+                factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_ID, new NewEntryAction(this, true, dialogService, Globals.prefs, stateManager)),
+
                 factory.createMenuItem(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, stateManager)),
 
                 new SeparatorMenuItem(),
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 117b75ceffa..7638d0a9ff8 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -118,6 +118,9 @@ public enum StandardActions implements Action {
     SELECT_ALL(Localization.lang("Select all"), KeyBinding.SELECT_ALL),
 
     NEW_ENTRY(Localization.lang("New entry"), IconTheme.JabRefIcons.ADD_ENTRY, KeyBinding.NEW_ENTRY),
+
+    NEW_ENTRY_FROM_ID(Localization.lang("New entry From ID"), IconTheme.JabRefIcons.ADD_ENTRY_FROM_ID, KeyBinding.NEW_ENTRY_FROM_ID),
+
     NEW_ARTICLE(Localization.lang("New article"), IconTheme.JabRefIcons.ADD_ARTICLE),
     NEW_ENTRY_FROM_PLAINTEX(Localization.lang("New entry from plain text"), KeyBinding.NEW_FROM_PLAIN_TEXT),
     LIBRARY_PROPERTIES(Localization.lang("Library properties")),
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 3dec2613770..ec374b06dea 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -148,6 +148,7 @@ public enum JabRefIcons implements JabRefIcon {
         ADD_NOBOX(MaterialDesignIcon.PLUS),
         ADD_ARTICLE(MaterialDesignIcon.PLUS),
         ADD_ENTRY(MaterialDesignIcon.PLAYLIST_PLUS),
+        ADD_ENTRY_FROM_ID(MaterialDesignIcon.NEWSPAPER),
         EDIT_ENTRY(MaterialDesignIcon.TOOLTIP_EDIT),
         EDIT_STRINGS(MaterialDesignIcon.TOOLTIP_TEXT),
         FOLDER(MaterialDesignIcon.FOOD_FORK_DRINK),
diff --git a/src/main/java/org/jabref/gui/importer/NewEntryAction.java b/src/main/java/org/jabref/gui/importer/NewEntryAction.java
index 638b6ba40a5..65bb1dba6db 100644
--- a/src/main/java/org/jabref/gui/importer/NewEntryAction.java
+++ b/src/main/java/org/jabref/gui/importer/NewEntryAction.java
@@ -5,10 +5,7 @@
 import java.util.Optional;
 
 import org.jabref.Globals;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.EntryTypeView;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.StateManager;
+import org.jabref.gui.*;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.EntryType;
@@ -28,6 +25,8 @@ public class NewEntryAction extends SimpleCommand {
      * The type of the entry to create.
      */
     private Optional<EntryType> type;
+    private boolean fromID;
+
     private final DialogService dialogService;
     private final JabRefPreferences preferences;
 
@@ -37,6 +36,7 @@ public NewEntryAction(JabRefFrame jabRefFrame, DialogService dialogService, JabR
         this.preferences = preferences;
 
         this.type = Optional.empty();
+        this.fromID = false;
 
         this.executable.bind(needsDatabase(stateManager));
     }
@@ -44,6 +44,16 @@ public NewEntryAction(JabRefFrame jabRefFrame, DialogService dialogService, JabR
     public NewEntryAction(JabRefFrame jabRefFrame, EntryType type, DialogService dialogService, JabRefPreferences preferences, StateManager stateManager) {
         this(jabRefFrame, dialogService, preferences, stateManager);
         this.type = Optional.of(type);
+        this.fromID = false;
+    }
+
+    public NewEntryAction(JabRefFrame jabRefFrame, boolean fromID, DialogService dialogService, JabRefPreferences preferences, StateManager stateManager) {
+        this.jabRefFrame = jabRefFrame;
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+
+        this.type = Optional.empty();
+        this.fromID = fromID;
     }
 
     @Override
@@ -53,17 +63,26 @@ public void execute() {
             return;
         }
 
-        if (type.isPresent()) {
-            jabRefFrame.getCurrentBasePanel().insertEntry(new BibEntry(type.get()));
-        } else {
-            EntryTypeView typeChoiceDialog = new EntryTypeView(jabRefFrame.getCurrentBasePanel(), dialogService, preferences);
-            EntryType selectedType = typeChoiceDialog.showAndWait().orElse(null);
+        if (fromID){
+            EntryFromIDView idDialog = new EntryFromIDView(jabRefFrame.getCurrentBasePanel(), dialogService, preferences);
+            EntryType selectedType = idDialog.showAndWait().orElse(null);
             if (selectedType == null) {
                 return;
             }
 
-            trackNewEntry(selectedType);
-            jabRefFrame.getCurrentBasePanel().insertEntry(new BibEntry(selectedType));
+        } else {
+            if (type.isPresent()) {
+                jabRefFrame.getCurrentBasePanel().insertEntry(new BibEntry(type.get()));
+            } else {
+                EntryTypeView typeChoiceDialog = new EntryTypeView(jabRefFrame.getCurrentBasePanel(), dialogService, preferences);
+                EntryType selectedType = typeChoiceDialog.showAndWait().orElse(null);
+                if (selectedType == null) {
+                    return;
+                }
+
+                trackNewEntry(selectedType);
+                jabRefFrame.getCurrentBasePanel().insertEntry(new BibEntry(selectedType));
+            }
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index 41cdde8a12b..8bd4adfbaf4 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -48,6 +48,7 @@ public enum KeyBinding {
     NEW_ARTICLE("New article", Localization.lang("New article"), "ctrl+shift+A", KeyBindingCategory.BIBTEX),
     NEW_BOOK("New book", Localization.lang("New book"), "ctrl+shift+B", KeyBindingCategory.BIBTEX),
     NEW_ENTRY("New entry", Localization.lang("New entry"), "ctrl+N", KeyBindingCategory.BIBTEX),
+    NEW_ENTRY_FROM_ID("New entry From ID", Localization.lang("New entry From ID"), "ctrl+D", KeyBindingCategory.BIBTEX),
     NEW_FROM_PLAIN_TEXT("New from plain text", Localization.lang("New from plain text"), "ctrl+shift+N", KeyBindingCategory.BIBTEX),
     NEW_INBOOK("New inbook", Localization.lang("New inbook"), "ctrl+shift+I", KeyBindingCategory.BIBTEX),
     NEW_MASTERSTHESIS("New mastersthesis", Localization.lang("New mastersthesis"), "ctrl+shift+M", KeyBindingCategory.BIBTEX),
diff --git a/src/main/java/org/jabref/logic/importer/FetcherException.java b/src/main/java/org/jabref/logic/importer/FetcherException.java
index 23bd9fc6826..d97a43a6ec1 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherException.java
@@ -4,7 +4,6 @@
 
 public class FetcherException extends JabRefException {
 
-
     public FetcherException(String errorMessage, Throwable cause) {
         super(errorMessage, cause);
     }
diff --git a/src/main/java/org/jabref/logic/importer/NoFetcherFoundException.java b/src/main/java/org/jabref/logic/importer/NoFetcherFoundException.java
new file mode 100644
index 00000000000..ef534674c63
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/NoFetcherFoundException.java
@@ -0,0 +1,15 @@
+package org.jabref.logic.importer;
+
+import org.jabref.JabRefException;
+
+public class NoFetcherFoundException extends RuntimeException {
+
+    public NoFetcherFoundException(String errorMessage, Throwable cause) {
+        super(errorMessage, cause);
+    }
+
+    public NoFetcherFoundException(String errorMessage) {
+        super(errorMessage);
+    }
+
+}
diff --git a/src/main/resources/build.properties b/src/main/resources/build.properties
index 4b0475757d0..7c84364955d 100644
--- a/src/main/resources/build.properties
+++ b/src/main/resources/build.properties
@@ -5,3 +5,4 @@ developers=${developers}
 azureInstrumentationKey=${azureInstrumentationKey}
 minRequiredJavaVersion = ${minRequiredJavaVersion}
 allowJava9 = ${allowJava9}
+
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 5b9d9f3027c..7fd126fe9c1 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -93,6 +93,8 @@ Automatically\ remove\ exact\ duplicates=Automatically remove exact duplicates
 
 AUX\ file\ import=AUX file import
 
+author = Author
+
 Available\ export\ formats=Available export formats
 
 Available\ import\ formats=Available import formats
@@ -391,6 +393,8 @@ Formatter\ name=Formatter name
 
 found\ in\ AUX\ file=found in AUX file
 
+FromID = Enter the identifier like ISBN, DOI, or Arxiv  in the field below
+
 Further\ information\ about\ Mr\ DLib.\ for\ JabRef\ users.=Further information about Mr DLib. for JabRef users.
 
 General=General
@@ -517,6 +521,8 @@ Link=Link
 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)
 
+LookUp = Look Up
+
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Show advanced hints (i.e. helpful tooltips, suggestions and explanation)
 
 Main\ file\ directory=Main file directory
@@ -576,6 +582,8 @@ 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\ files\ found.=No files found.
 
+No\ fetcher\ found.=No fetcher found.
+
 No\ GUI.\ Only\ process\ command\ line\ options=No GUI. Only process command line options
 
 No\ journal\ names\ could\ be\ abbreviated.=No journal names could be abbreviated.
@@ -921,6 +929,8 @@ Timezone\ (Provides\ for\ better\ recommendations\ by\ indicating\ the\ time\ of
 Time\ stamp=Time stamp
 Toggle\ groups\ interface=Toggle groups interface
 
+title = Title
+
 Trim\ all\ whitespace\ characters\ in\ the\ field\ content.=Trim all whitespace characters in the field content.
 
 Trim\ whitespace\ characters=Trim whitespace characters
@@ -1007,6 +1017,7 @@ 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
 Error\ while\ fetching\ from\ %0=Error while fetching from %0
+Error\ while\ searching\ fetcher\ from\ %0 = Error while searching fetcher from %0
 
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Refuse to save the library before external changes have been reviewed.
 Library\ protection=Library protection
@@ -1258,6 +1269,7 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Your style file specifies the paragraph format '%0', which is undefined in your current OpenOffice/LibreOffice document.
 
 Searching...=Searching...
+Adding... = Adding ...
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Add {} to specified title words on search to keep the correct case
 Import\ conversions=Import conversions
 Please\ enter\ a\ search\ string=Please enter a search string
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index 2b636294414..f32bc03dbce 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -91,6 +91,8 @@ Automatically\ remove\ exact\ duplicates=Supprimer automatiquement les doublons
 
 AUX\ file\ import=Importation de fichier AUX
 
+author = Auteur
+
 Available\ export\ formats=Formats d'exportation disponibles
 
 Available\ import\ formats=Formats d'importation disponibles
@@ -394,6 +396,8 @@ Formatter\ name=Nom de formateur
 
 found\ in\ AUX\ file=trouvées dans le fichier AUX
 
+FromID = Entrez l'identifiant comme un ISBN, DOI, ou Arxiv  dans le champ ci-dessous
+
 Further\ information\ about\ Mr\ DLib.\ for\ JabRef\ users.=Informations supplémentaires à propos de Mr. Dlib pour les utilisateurs de JabRef.
 
 General=Général
@@ -523,6 +527,8 @@ Link=Lien
 Listen\ for\ remote\ operation\ on\ port=Écouter le port pour des opérations à distance
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Charger et enregistrer les préférences de/vers jabref.xml au démarrage (mode clef-mémoire)
 
+LookUp = Aperçu
+
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Afficher les astuces avancées (c'est-à-dire les astuces utiles, les suggestions et l'explication)
 
 Main\ file\ directory=Répertoire de fichiers principal
@@ -581,6 +587,8 @@ no\ library\ generated=pas de fichier créé
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Pas d'entrées trouvées. Veuillez vous assurez que vous utilisez le filtre d'importation approprié.
 No\ files\ found.=Fichiers non trouvés.
 
+No\ fetcher\ found.= Outil de recherche non trouvé.
+
 No\ GUI.\ Only\ process\ command\ line\ options=Pas d'interface graphique. Traitement limité aux options de la ligne de commande
 
 No\ journal\ names\ could\ be\ abbreviated.=Aucun nom de journal n'a pu être abrégé.
@@ -929,6 +937,8 @@ Timezone\ (Provides\ for\ better\ recommendations\ by\ indicating\ the\ time\ of
 Time\ stamp=Horodatage
 Toggle\ groups\ interface=Afficher/Masquer l'interface des groupes
 
+title = Titre
+
 Trim\ all\ whitespace\ characters\ in\ the\ field\ content.=Supprime tous les caractères d’espacement du contenu du champ.
 
 Trim\ whitespace\ characters=Supprimez les caractères d’espacement
@@ -1018,6 +1028,7 @@ Could\ not\ move\ file\ '%0'.=Le fichier « %0 » n'a pas pu être déplacé.
 Could\ not\ find\ file\ '%0'.=Le fichier « %0 » n'a pas pu être trouvé.
 Number\ of\ entries\ successfully\ imported=Nombre d'entrées importées avec succès
 Error\ while\ fetching\ from\ %0=Erreur au cours de la recherche %0
+Error\ while\ searching\ fetcher\ from\ %0 = Erreur pour trouver un outil de recherche depuis %0
 
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Refus d'enregistrement du fichier tant que les changements externes ne sont pas vérifiés.
 Library\ protection=Protection du fichier
@@ -1279,6 +1290,7 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Votre fichier de style spécifie le format de paragraphe « %0 », qui n'est pas défini dans votre document OpenOffice/LibreOffice actuel.
 
 Searching...=Recherche...
+Adding... = Ajout ...
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Ajouter {} aux mots du titre spécifiés lors d'une recherche pour préserver la casse correcte
 Import\ conversions=Importer les conversions
 Please\ enter\ a\ search\ string=Veuillez entrer une chaîne de recherche

From b38d442a0ab335693bf49c99af19814a26ade01a Mon Sep 17 00:00:00 2001
From: Caroline de Pourtales <caro.de.pourtales@gmail.com>
Date: Sun, 15 Dec 2019 15:48:53 +0100
Subject: [PATCH 2/2] =?UTF-8?q?avanc=C3=A9e=20issue=204183=20:=20reste=20t?=
 =?UTF-8?q?ravail=20sur=20pattern,=20beaut=C3=A9=20affichage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/jabref/gui/EntryFromID.fxml | 24 +++++--
 .../java/org/jabref/gui/EntryFromIDView.java  | 16 ++++-
 .../org/jabref/gui/EntryFromIDViewModel.java  | 62 +++---------------
 .../jabref/logic/importer/WebFetchers.java    | 63 ++++++++++++++++++-
 src/main/resources/l10n/JabRef_en.properties  | 12 ++--
 src/main/resources/l10n/JabRef_fr.properties  | 12 ++--
 6 files changed, 114 insertions(+), 75 deletions(-)

diff --git a/src/main/java/org/jabref/gui/EntryFromID.fxml b/src/main/java/org/jabref/gui/EntryFromID.fxml
index 7e47d576084..f81efcc3c60 100644
--- a/src/main/java/org/jabref/gui/EntryFromID.fxml
+++ b/src/main/java/org/jabref/gui/EntryFromID.fxml
@@ -19,7 +19,8 @@
 <?import javafx.scene.layout.VBox?>
 
 
-<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefWidth="476.0" xmlns="http://javafx.com/javafx/8.0.171" fx:controller="org.jabref.gui.EntryFromIDView">
+<?import javafx.geometry.Insets?>
+<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.171" fx:controller="org.jabref.gui.EntryFromIDView">
 
     <buttonTypes>
         <ButtonType fx:id="lookupButton" buttonData="OK_DONE" text="%LookUp"/>
@@ -28,22 +29,35 @@
     </buttonTypes>
 
     <content>
-        <VBox prefHeight="200.0" prefWidth="400.0">
-
+        <VBox prefHeight="400.0" prefWidth="850.0">
+            <children>
                 <GridPane alignment="CENTER">
                     <children>
                         <Label text="%FromID" GridPane.rowIndex="1" />
-                        <TextField fx:id="idTextField" onAction="#runFetcherWorker" prefHeight="30.0" prefWidth="300.0"
+                        <TextField fx:id="idTextField" onAction="#runFetcherWorker" prefHeight="30.0" prefWidth="400.0"
                                    GridPane.rowIndex="2"/>
 
                         <Label text="%LookUp" GridPane.rowIndex="3" />
 
-                        <TextArea fx:id="lookUpField"
+                        <Label fx:id="lookUpField"
                               GridPane.rowIndex="4"/>
 
                     </children>
 
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="850.0" minWidth="10.0" prefWidth="850.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="10.0" prefWidth="150.0" />
+                    </columnConstraints>
+                    <opaqueInsets>
+                        <Insets bottom="4.0" left="4.0" right="4.0" top="4.0" />
+                    </opaqueInsets>
+                    <rowConstraints>
+                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                    </rowConstraints>
+
                 </GridPane>
+            </children>
         </VBox>
     </content>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/EntryFromIDView.java b/src/main/java/org/jabref/gui/EntryFromIDView.java
index f2fb92c6132..ca7dc1e238d 100644
--- a/src/main/java/org/jabref/gui/EntryFromIDView.java
+++ b/src/main/java/org/jabref/gui/EntryFromIDView.java
@@ -21,17 +21,22 @@
 import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions;
 import org.jabref.preferences.JabRefPreferences;
 
+/**
+ * Dialog that prompts the user to enter an id for an entry.
+ * Returns null if canceled.
+ */
 public class EntryFromIDView extends BaseDialog<EntryType> {
 
     @FXML private ButtonType generateButton;
     @FXML private ButtonType lookupButton;
     @FXML private TextField idTextField;
-    @FXML private TextArea lookUpField;
+    @FXML private Label lookUpField;
 
     private final BasePanel basePanel;
     private final DialogService dialogService;
     private final JabRefPreferences prefs;
 
+    private EntryType type;
     private EntryFromIDViewModel viewModel;
 
     public EntryFromIDView(BasePanel basePanel, DialogService dialogService, JabRefPreferences preferences) {
@@ -40,7 +45,14 @@ public EntryFromIDView(BasePanel basePanel, DialogService dialogService, JabRefP
         this.prefs = preferences;
 
         this.setTitle(Localization.lang("Select entry type from ID"));
-        ViewLoader.view(this).load().setAsDialogPane(this);
+        ViewLoader.view(this)
+                .load()
+                .setAsDialogPane(this);
+
+        setResultConverter(button -> {
+            //The buttonType will always be cancel, even if we pressed one of the entry type buttons
+            return type;
+        });
 
         ControlHelper.setAction(lookupButton, this.getDialogPane(), event -> viewModel.runFetcherWorkerForLookUp(lookUpField));
 
diff --git a/src/main/java/org/jabref/gui/EntryFromIDViewModel.java b/src/main/java/org/jabref/gui/EntryFromIDViewModel.java
index 4efa2079672..0e137098be2 100644
--- a/src/main/java/org/jabref/gui/EntryFromIDViewModel.java
+++ b/src/main/java/org/jabref/gui/EntryFromIDViewModel.java
@@ -18,6 +18,7 @@
 import java.util.HashMap;
 import  java.util.function.Predicate;
 
+import javafx.scene.control.Label;
 import javafx.scene.control.TextArea;
 import org.jabref.Globals;
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
@@ -47,7 +48,7 @@ public class EntryFromIDViewModel {
     private  String fetcherName;
     private final BooleanProperty focusAndSelectAllProperty = new SimpleBooleanProperty();
     private Task<Optional<BibEntry>> fetcherWorker = new FetcherWorker();
-    private HashMap <Predicate<String>,IdBasedFetcher> fetcherMatchPattern = new HashMap<>();
+    private HashMap <Predicate<String>,IdBasedFetcher> fetcherMatchPattern = new HashMap<Predicate<String>,IdBasedFetcher>();
     private final BasePanel basePanel;
     private final DialogService dialogService;
 
@@ -56,54 +57,7 @@ public EntryFromIDViewModel(JabRefPreferences preferences, BasePanel basePanel,
         this.prefs = preferences;
         this.dialogService = dialogService;
 
-        //DOI validate hors http
-        Pattern pdoi = Pattern.compile("10\\.[0-9]{4}/([0-9]{13}|[a-zA-Z]+\\.[0-9]{4}\\.[0-9]{2}|[-_0-9]+)");
-        fetcherMatchPattern.put(pdoi.asPredicate(),new DoiFetcher(preferences.getImportFormatPreferences()));
-
-        //HTTPDOI
-        Pattern pHTTPdoi = Pattern.compile("10\\.[0-9]{4}/([0-9]{13}|[a-zA-Z]+\\.[0-9]{4}\\.[0-9]{2}|[-_0-9]+)");
-        fetcherMatchPattern.put(pHTTPdoi.asPredicate(),new DoiFetcher(preferences.getImportFormatPreferences()));
-
-        //ISBN validate
-        Pattern pisbn = Pattern.compile("^(?:ISBN(?:-1[03])?:? )?(?=[0-9X]{10}$|(?=(?:[0-9]+[- ]){3})[- 0-9X]{13}$|97[89][0-9]{10}$|(?=(?:[0-9]+[- ]){4})[- 0-9]{17}$)(?:97[89][- ]?)?[0-9]{1,5}[- ]?[0-9]+[- ]?[0-9]+[- ]?[0-9X]$");
-        fetcherMatchPattern.put(pisbn.asPredicate(),new IsbnFetcher(preferences.getImportFormatPreferences()));
-        //Rajouter pour long isbn
-
-        //DIVA Validate
-        Pattern pdiva = Pattern.compile("diva2:[0-9]{6}");
-        fetcherMatchPattern.put(pdiva.asPredicate(), new DiVA(preferences.getImportFormatPreferences()));
-
-        //MedlineFetcher Validate
-        Pattern pmd = Pattern.compile("[0-9]{8}");
-        fetcherMatchPattern.put(pmd.asPredicate(), new MedlineFetcher());
-
-        //MathSciNetId validate
-        Pattern pMathSciNetId = Pattern.compile("[0-9]{7}");
-        fetcherMatchPattern.put(pMathSciNetId.asPredicate(), new MathSciNet(preferences.getImportFormatPreferences()));
-
-        //LibraryOfCongress validate
-        Pattern pLibraryOfCongress= Pattern.compile("[0-9]{10}");
-        fetcherMatchPattern.put(pLibraryOfCongress.asPredicate(), new LibraryOfCongress(preferences.getImportFormatPreferences()));
-
-        //RfcFetcher validate
-        Pattern pRfcFetcher = Pattern.compile("[rR]*[fF]*[cC]*[0-9]{4}");
-        fetcherMatchPattern.put(pRfcFetcher.asPredicate(),new RfcFetcher(preferences.getImportFormatPreferences()));
-
-        //Arxiv
-        Pattern parxiv = Pattern.compile("[arXiv:]*[0-9][0-9](0[1-9]|1[0-2])\\.[0-9]{4}([v][0-9]+)*");
-        fetcherMatchPattern.put(parxiv.asPredicate(), new ArXiv(preferences.getImportFormatPreferences()));
-
-        //AstrophysicsDataSystem
-        Pattern pads = Pattern.compile("10\\.[0-9]{5}/([0-9]{13}|[a-zA-Z]+\\.[0-9]{4}\\.[0-9]{2}|[-_0-9]+)");
-        fetcherMatchPattern.put(pads.asPredicate(),new AstrophysicsDataSystem(preferences.getImportFormatPreferences()));
-
-        //TitleFetcher
-        //CrossRef -> DOI
-
-        //IacrEprintFetcher "Report 2017/1118 "
-        Pattern pIacr = Pattern.compile("[a-zA-Z]*\\s*[0-9]{4}/[0-9]{4}");
-        fetcherMatchPattern.put(pIacr.asPredicate(),new IacrEprintFetcher(preferences.getImportFormatPreferences()));
-
+        fetcherMatchPattern.putAll(WebFetchers.getHashMapPredicateIdBasedFetchers(preferences.getImportFormatPreferences()));
 
     }
 
@@ -141,8 +95,7 @@ public IdBasedFetcher findFetcher (String id) {
                     .filter(e -> e.getKey().test(id))
                     .map(e -> e.getValue())
                     .findFirst()
-                    .orElseThrow(()-> new NoFetcherFoundException("Can't find fetcher for this id :" + id));
-
+                    .orElseThrow(()-> new NoFetcherFoundException(Localization.lang("Error while searching fetcher from %0", id)));
         }
 
         @Override
@@ -161,7 +114,6 @@ protected Optional<BibEntry> call() throws InterruptedException, FetcherExceptio
                 } catch (NoFetcherFoundException e) {
                     dialogService.showErrorDialogAndWait(Localization.lang("No fetcher found."), Localization.lang("Error while searching fetcher from %0", searchID));
                 }
-
             }
             return bibEntry;
         }
@@ -229,7 +181,7 @@ public void runFetcherWorker() {
         });
     }
 
-    public void runFetcherWorkerForLookUp(TextArea lookUpField) {
+    public void runFetcherWorkerForLookUp(Label lookUpField) {
         searchSuccesfulProperty.set(false);
         fetcherWorker.run();
         fetcherWorker.setOnFailed(event -> {
@@ -257,8 +209,8 @@ public void runFetcherWorkerForLookUp(TextArea lookUpField) {
 
                 final BibEntry entry = result.get();
 
-                String entryString = "Found with : " + fetcherName + " Title : " + entry.getTitle();
-                lookUpField.setText(entryString);
+                String entryString = "Found with : \n" + fetcherName + "\n\n with ID : \n" + entry.getId() + "\n\n Title : \n" + entry.getTitle() + "\n\n Publication date : \n" + entry.getPublicationDate();
+                lookUpField.setText(entry.toString());
 
                 searchSuccesfulProperty.set(true);
 
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index 66319f5e6b4..ad7caf229b5 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -7,6 +7,10 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import java.util.regex.Pattern;
+import java.util.HashMap;
+import  java.util.function.Predicate;
+
 import org.jabref.logic.importer.fetcher.ACMPortalFetcher;
 import org.jabref.logic.importer.fetcher.ACS;
 import org.jabref.logic.importer.fetcher.ArXiv;
@@ -122,8 +126,65 @@ public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferenc
     }
 
     /**
-     * @return sorted set containing entry based fetchers
+     * @return an Hashmap containing predicate from id type and their id based fetchers
      */
+    public static HashMap<Predicate<String>,IdBasedFetcher> getHashMapPredicateIdBasedFetchers(ImportFormatPreferences importFormatPreferences) {
+
+        HashMap <Predicate<String>,IdBasedFetcher> fetcherMatchPattern = new HashMap<Predicate<String>,IdBasedFetcher>();
+
+        //DOI validate
+        Pattern pdoi = Pattern.compile("(https://doi\\.org/)?10\\.[0-9]{4}/([0-9]{13}|[a-zA-Z]+\\.[0-9]{4}\\.[0-9]{2}|[-_0-9]+)");
+        fetcherMatchPattern.put(pdoi.asPredicate(), new DoiFetcher(importFormatPreferences));
+
+        //ISBN validate
+        Pattern pisbn = Pattern.compile("^(?:ISBN(?:-1[03])?:? )?(?=[0-9X]{10}$|(?=(?:[0-9]+[- ]){3})[- 0-9X]{13}$|97[89][0-9]{10}$|(?=(?:[0-9]+[- ]){4})[- 0-9]{17}$)(?:97[89][- ]?)?[0-9]{1,5}[- ]?[0-9]+[- ]?[0-9]+[- ]?[0-9X]$");
+        fetcherMatchPattern.put(pisbn.asPredicate(), new IsbnFetcher(importFormatPreferences));
+        //Rajouter pour long isbn
+
+        //DIVA Validate
+        Pattern pdiva = Pattern.compile("diva2:[0-9]{6}");
+        fetcherMatchPattern.put(pdiva.asPredicate(), new DiVA(importFormatPreferences));
+
+        //MedlineFetcher Validate
+        Pattern pmd = Pattern.compile("[0-9]{8}");
+        fetcherMatchPattern.put(pmd.asPredicate(), new MedlineFetcher());
+
+        //MathSciNetId validate
+        Pattern pMathSciNetId = Pattern.compile("[0-9]{7}");
+        fetcherMatchPattern.put(pMathSciNetId.asPredicate(), new MathSciNet(importFormatPreferences));
+
+        //LibraryOfCongress validate
+        Pattern pLibraryOfCongress = Pattern.compile("[0-9]{10}");
+        fetcherMatchPattern.put(pLibraryOfCongress.asPredicate(), new LibraryOfCongress(importFormatPreferences));
+
+        //RfcFetcher validate
+        Pattern pRfcFetcher = Pattern.compile("([rR][fF][cC])?[0-9]{4}");
+        fetcherMatchPattern.put(pRfcFetcher.asPredicate(), new RfcFetcher(importFormatPreferences));
+
+        //IacrEprintFetcher validate
+        Pattern pIacr = Pattern.compile("[a-zA-Z]*[0-9]{4}/[0-9]{4}");
+        fetcherMatchPattern.put(pIacr.asPredicate(), new IacrEprintFetcher(importFormatPreferences));
+
+        //Arxiv validate
+        Pattern parxiv = Pattern.compile("(http[s]?://arxiv\\.org/(abs/)?)?(arXiv:)?[0-9][0-9](0[1-9]|1[0-2])\\.[0-9]{4,5}([v][0-9]+)?");
+        fetcherMatchPattern.put(parxiv.asPredicate(), new ArXiv(importFormatPreferences));
+
+        //AstrophysicsDataSystem
+        Pattern pads = Pattern.compile("10\\.[0-9]{4,5}/[-)(.a-zA-Z_0-9]+");
+        fetcherMatchPattern.put(pads.asPredicate(), new AstrophysicsDataSystem(importFormatPreferences));
+
+        //TitleFetcher
+        Pattern pTitleFetcher = Pattern.compile("[-)(.a-zA-Z_0-9]+");
+        fetcherMatchPattern.put(pTitleFetcher.asPredicate(), new TitleFetcher(importFormatPreferences));
+
+        //CrossRef -> DOI
+
+        return fetcherMatchPattern;
+    }
+
+        /**
+         * @return sorted set containing entry based fetchers
+         */
     public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImportFormatPreferences importFormatPreferences) {
         SortedSet<EntryBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new AstrophysicsDataSystem(importFormatPreferences));
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 7fd126fe9c1..dd54df6bc50 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -93,7 +93,7 @@ Automatically\ remove\ exact\ duplicates=Automatically remove exact duplicates
 
 AUX\ file\ import=AUX file import
 
-author = Author
+author= Author
 
 Available\ export\ formats=Available export formats
 
@@ -393,7 +393,7 @@ Formatter\ name=Formatter name
 
 found\ in\ AUX\ file=found in AUX file
 
-FromID = Enter the identifier like ISBN, DOI, or Arxiv  in the field below
+FromID= Enter the identifier like ISBN, DOI, or Arxiv  in the field below
 
 Further\ information\ about\ Mr\ DLib.\ for\ JabRef\ users.=Further information about Mr DLib. for JabRef users.
 
@@ -521,7 +521,7 @@ Link=Link
 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)
 
-LookUp = Look Up
+LookUp= Look Up
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Show advanced hints (i.e. helpful tooltips, suggestions and explanation)
 
@@ -929,7 +929,7 @@ Timezone\ (Provides\ for\ better\ recommendations\ by\ indicating\ the\ time\ of
 Time\ stamp=Time stamp
 Toggle\ groups\ interface=Toggle groups interface
 
-title = Title
+title= Title
 
 Trim\ all\ whitespace\ characters\ in\ the\ field\ content.=Trim all whitespace characters in the field content.
 
@@ -1017,7 +1017,7 @@ 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
 Error\ while\ fetching\ from\ %0=Error while fetching from %0
-Error\ while\ searching\ fetcher\ from\ %0 = Error while searching fetcher from %0
+Error\ while\ searching\ fetcher\ from\ %0= Error while searching fetcher from %0
 
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Refuse to save the library before external changes have been reviewed.
 Library\ protection=Library protection
@@ -1269,7 +1269,7 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Your style file specifies the paragraph format '%0', which is undefined in your current OpenOffice/LibreOffice document.
 
 Searching...=Searching...
-Adding... = Adding ...
+Adding...= Adding ...
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Add {} to specified title words on search to keep the correct case
 Import\ conversions=Import conversions
 Please\ enter\ a\ search\ string=Please enter a search string
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index f32bc03dbce..f45ab8fc280 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -91,7 +91,7 @@ Automatically\ remove\ exact\ duplicates=Supprimer automatiquement les doublons
 
 AUX\ file\ import=Importation de fichier AUX
 
-author = Auteur
+author= Auteur
 
 Available\ export\ formats=Formats d'exportation disponibles
 
@@ -396,7 +396,7 @@ Formatter\ name=Nom de formateur
 
 found\ in\ AUX\ file=trouvées dans le fichier AUX
 
-FromID = Entrez l'identifiant comme un ISBN, DOI, ou Arxiv  dans le champ ci-dessous
+FromID= Entrez l'identifiant comme un ISBN, DOI, ou Arxiv  dans le champ ci-dessous
 
 Further\ information\ about\ Mr\ DLib.\ for\ JabRef\ users.=Informations supplémentaires à propos de Mr. Dlib pour les utilisateurs de JabRef.
 
@@ -527,7 +527,7 @@ Link=Lien
 Listen\ for\ remote\ operation\ on\ port=Écouter le port pour des opérations à distance
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Charger et enregistrer les préférences de/vers jabref.xml au démarrage (mode clef-mémoire)
 
-LookUp = Aperçu
+LookUp= Aperçu
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Afficher les astuces avancées (c'est-à-dire les astuces utiles, les suggestions et l'explication)
 
@@ -937,7 +937,7 @@ Timezone\ (Provides\ for\ better\ recommendations\ by\ indicating\ the\ time\ of
 Time\ stamp=Horodatage
 Toggle\ groups\ interface=Afficher/Masquer l'interface des groupes
 
-title = Titre
+title= Titre
 
 Trim\ all\ whitespace\ characters\ in\ the\ field\ content.=Supprime tous les caractères d’espacement du contenu du champ.
 
@@ -1028,7 +1028,7 @@ Could\ not\ move\ file\ '%0'.=Le fichier « %0 » n'a pas pu être déplacé.
 Could\ not\ find\ file\ '%0'.=Le fichier « %0 » n'a pas pu être trouvé.
 Number\ of\ entries\ successfully\ imported=Nombre d'entrées importées avec succès
 Error\ while\ fetching\ from\ %0=Erreur au cours de la recherche %0
-Error\ while\ searching\ fetcher\ from\ %0 = Erreur pour trouver un outil de recherche depuis %0
+Error\ while\ searching\ fetcher\ from\ %0= Erreur pour trouver un outil de recherche depuis %0
 
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Refus d'enregistrement du fichier tant que les changements externes ne sont pas vérifiés.
 Library\ protection=Protection du fichier
@@ -1290,7 +1290,7 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Votre fichier de style spécifie le format de paragraphe « %0 », qui n'est pas défini dans votre document OpenOffice/LibreOffice actuel.
 
 Searching...=Recherche...
-Adding... = Ajout ...
+Adding...= Ajout ...
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Ajouter {} aux mots du titre spécifiés lors d'une recherche pour préserver la casse correcte
 Import\ conversions=Importer les conversions
 Please\ enter\ a\ search\ string=Veuillez entrer une chaîne de recherche