Add ID Fetcher in Entrytypedialog

CHANGELOG.md

@@ -18,6 +18,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - [#1813](https://github.com/JabRef/jabref/issues/1813) Import/Export preferences dialog default directory set to working directory
 - [#1897](https://github.com/JabRef/jabref/issues/1897) Implemented integrity check for `year` field: Last four nonpunctuation characters should be numerals
 - Address in MS-Office 2007 xml format is now imported as `location`
+- Add ID Fetcher in EntryTypeDialog
 
 
 ### Fixed

src/main/java/net/sf/jabref/gui/EntryTypeDialog.java

@@ -9,33 +9,52 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.Collection;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
+import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.SwingWorker;
 
 import net.sf.jabref.BibDatabaseContext;
 import net.sf.jabref.Globals;
+import net.sf.jabref.gui.importer.fetcher.EntryFetchers;
 import net.sf.jabref.gui.keyboard.KeyBinding;
 import net.sf.jabref.logic.CustomEntryTypesManager;
+import net.sf.jabref.logic.importer.FetcherException;
+import net.sf.jabref.logic.importer.IdBasedFetcher;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.model.EntryTypes;
+import net.sf.jabref.model.entry.BibEntry;
 import net.sf.jabref.model.entry.BibtexEntryTypes;
 import net.sf.jabref.model.entry.EntryType;
 import net.sf.jabref.model.entry.IEEETranEntryTypes;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jdesktop.swingx.VerticalLayout;
 
+import static net.sf.jabref.gui.importer.fetcher.EntryFetchers.getIdFetchers;
+
 /**
  * Dialog that prompts the user to choose a type for an entry.
  * Returns null if canceled.
  */
 public class EntryTypeDialog extends JDialog implements ActionListener {
+
+    private static final Log LOGGER = LogFactory.getLog(EntryTypeDialog.class);
+
     private EntryType type;
+    private JabRefFrame frame;
     private static final int COLUMN = 3;
     private final boolean biblatexMode;
 
@@ -47,7 +66,7 @@ static class TypeButton extends JButton implements Comparable<TypeButton> {
         private final EntryType type;
 
 
-        public TypeButton(String label, EntryType type) {
+        TypeButton(String label, EntryType type) {
             super(label);
             this.type = type;
         }
@@ -66,6 +85,8 @@ public EntryTypeDialog(JabRefFrame frame) {
         // modal dialog
         super(frame, true);
 
+        this.frame = frame;
+
         bibDatabaseContext = frame.getCurrentBasePanel().getBibDatabaseContext();
         biblatexMode = bibDatabaseContext.isBiblatexMode();
 
@@ -91,12 +112,17 @@ private JPanel createEntryGroupsPanel() {
         JPanel panel = new JPanel();
         panel.setLayout(new VerticalLayout());
 
-        if(biblatexMode) {
+        if (biblatexMode) {
             panel.add(createEntryGroupPanel("BibLateX", EntryTypes.getAllValues(bibDatabaseContext.getMode())));
         } else {
             panel.add(createEntryGroupPanel("BibTeX", BibtexEntryTypes.ALL));
             panel.add(createEntryGroupPanel("IEEETran", IEEETranEntryTypes.ALL));
-            panel.add(createEntryGroupPanel(Localization.lang("Custom"), CustomEntryTypesManager.ALL));
+
+            if (!CustomEntryTypesManager.ALL.isEmpty()) {
+                panel.add(createEntryGroupPanel(Localization.lang("Custom"), CustomEntryTypesManager.ALL));
+            }
+
+            panel.add(createIdFetcher("ID based generator"));
         }
 
         return panel;
@@ -148,6 +174,91 @@ private JPanel createEntryGroupPanel(String groupTitle, Collection<EntryType> en
         return panel;
     }
 
+    private JPanel createIdFetcher(String groupTitle) {
+        JButton searchButton = new JButton(Localization.lang("Search"));
+        JTextField idTextField = new JTextField("");
+        JComboBox<String> comboBox = new JComboBox<>();
+        getIdFetchers().forEach(n -> comboBox.addItem(n.getName()));
+        JLabel fetcherLabel = new JLabel("ID type"), idLabel = new JLabel("ID");
+
+        SwingWorker<Optional<BibEntry>, Void> fetcherWorker = new SwingWorker<Optional<BibEntry>, Void>() {
+            Optional<BibEntry> bibEntry = Optional.empty();
+            IdBasedFetcher fetcher;
+            String searchID;
+
+            @Override
+            protected Optional<BibEntry> doInBackground() throws Exception {
+                searchID = idTextField.getText();
+                if (!searchID.isEmpty()) {
+                    fetcher = EntryFetchers.getIdFetchers().get(comboBox.getSelectedIndex());
+                    try {
+                        bibEntry = fetcher.performSearchById(searchID);
+                        dispose();
+                    } catch (FetcherException e) {
+                        LOGGER.error(Localization.lang("Error_fetching_from_'%0'.", fetcher.getName()), e);
+                        JOptionPane.showMessageDialog(null, Localization.lang("Error_fetching_from_'%0'.", fetcher.getName()), Localization.lang("Error_ while_fetching."), JOptionPane.ERROR_MESSAGE);
+                    }
+                }
+                return bibEntry;
+            }
+
+            @Override
+            protected void done() {
+                if (isCancelled()) {
+                    return;
+                }
+
+                try {
+                    Optional<BibEntry> result = get();
+                    if (result.isPresent()) {
+                        frame.getCurrentBasePanel().insertEntry(result.get());
+                    } else {
+                        JOptionPane.showMessageDialog(null, Localization.lang("No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.", searchID, fetcher.getName()), Localization.lang("No_files_found."), JOptionPane.WARNING_MESSAGE);
+                    }
+                } catch (ExecutionException | InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        };
+
+        searchButton.addActionListener(n -> fetcherWorker.execute());
+
+        JPanel jPanel = new JPanel();
+
+        GridBagConstraints constraints = new GridBagConstraints();
+
+        GridBagLayout layout = new GridBagLayout();
+        jPanel.setLayout(layout);
+        constraints.fill = GridBagConstraints.HORIZONTAL;
+        constraints.gridx = 0;
+        constraints.gridy = 0;
+        constraints.weightx = 1;
+        jPanel.add(fetcherLabel, constraints);
+        constraints.gridx = 1;
+        constraints.gridy = 0;
+        constraints.weightx = 2;
+        jPanel.add(comboBox, constraints);
+        constraints.gridx = 0;
+        constraints.gridy = 1;
+        constraints.weightx = 1;
+        jPanel.add(idLabel, constraints);
+        constraints.gridx = 1;
+        constraints.gridy = 1;
+        constraints.weightx = 2;
+        jPanel.add(idTextField, constraints);
+
+        constraints.gridy = 2;
+        JPanel buttons = new JPanel();
+        ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
+        bb.addButton(searchButton);
+
+        jPanel.add(buttons, constraints);
+        jPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), groupTitle));
+
+
+        return jPanel;
+    }
+
     @Override
     public void actionPerformed(ActionEvent e) {
         if (e.getSource() instanceof TypeButton) {

src/main/java/net/sf/jabref/gui/importer/fetcher/EntryFetchers.java

@@ -5,6 +5,7 @@
 import java.util.List;
 
 import net.sf.jabref.Globals;
+import net.sf.jabref.logic.importer.IdBasedFetcher;
 import net.sf.jabref.logic.importer.fetcher.ArXiv;
 import net.sf.jabref.logic.importer.fetcher.DiVA;
 import net.sf.jabref.logic.importer.fetcher.GvkFetcher;
@@ -30,13 +31,19 @@ public EntryFetchers(JournalAbbreviationLoader abbreviationLoader) {
         entryFetchers.add(new DOAJFetcher());
         entryFetchers.add(new SpringerFetcher());
 
-        entryFetchers.add(new IdBasedEntryFetcher(new DiVA(Globals.prefs.getImportFormatPreferences())));
-        entryFetchers.add(new IdBasedEntryFetcher(new IsbnFetcher(Globals.prefs.getImportFormatPreferences())));
         entryFetchers.add(new SearchBasedEntryFetcher(new ArXiv()));
         entryFetchers.add(new SearchBasedEntryFetcher(new GvkFetcher()));
     }
 
     public List<EntryFetcher> getEntryFetchers() {
         return Collections.unmodifiableList(this.entryFetchers);
     }
+
+    public static List<IdBasedFetcher> getIdFetchers() {
+        List<IdBasedFetcher> list = new LinkedList<>();
+        list.add(new IsbnFetcher(Globals.prefs.getImportFormatPreferences()));
+        list.add(new DiVA(Globals.prefs.getImportFormatPreferences()));
+        list.sort((o1, o2) -> o1.getName().compareTo(o2.getName()));
+        return list;
+    }
 }

src/main/resources/l10n/JabRef_da.properties

@@ -1769,7 +1769,6 @@ See_what_has_been_changed_in_the_JabRef_versions=
 Referenced_BibTeX_key_does_not_exist=
 
 
-Finished_downloading_full_text_document_for_entry_%0.=
 Full_text_document_download_failed_for_entry_%0.=
 Look_up_full_text_documents=
 You_are_about_to_look_up_full_text_documents_for_%0_entries.=
@@ -1778,3 +1777,6 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+Finished_downloading_full_text_document_for_entry_%0.=
+
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_de.properties

@@ -2490,3 +2490,4 @@ last_four_nonpunctuation_characters_should_be_numerals=Die letzten vier Nichtint
 Remember_password?=Passwort_merken?
 
 shared=geteilt
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=Kein_Eintrag_mit_der_ID_'%0'_für_fetcher_'%1'_wurde_gefunden.

src/main/resources/l10n/JabRef_en.properties

@@ -2306,3 +2306,4 @@ Look_up_full_text_documents=Look_up_full_text_documents
 You_are_about_to_look_up_full_text_documents_for_%0_entries.=You_are_about_to_look_up_full_text_documents_for_%0_entries.
 last_four_nonpunctuation_characters_should_be_numerals=last_four_nonpunctuation_characters_should_be_numerals
 shared=shared
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.

src/main/resources/l10n/JabRef_es.properties

@@ -1679,3 +1679,4 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_fa.properties

@@ -2459,3 +2459,4 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_fr.properties

@@ -1726,3 +1726,5 @@ last_four_nonpunctuation_characters_should_be_numerals=Les_4_derniers_caractère
 Remember_password?=
 
 shared=
+last_four_nonpunctuation_characters_should_be_numerals=
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_in.properties

@@ -1695,3 +1695,4 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_it.properties

@@ -1796,3 +1796,4 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_ja.properties

@@ -2436,3 +2436,4 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_nl.properties

@@ -2468,3 +2468,4 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_no.properties

@@ -2860,3 +2860,6 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_was_found.=
+
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_pt_BR.properties

@@ -1692,3 +1692,6 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_was_found.=
+
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_ru.properties

@@ -2437,3 +2437,6 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_was_found.=
+
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_sv.properties

@@ -1640,3 +1640,8 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=Kom_ihåg_lösenord?
 
 shared=delad
+Remember_password?=
+
+No_entry_with_id_'%0'_was_found.=
+
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_tr.properties

@@ -1713,3 +1713,6 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_was_found.=
+
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_vi.properties

@@ -2463,3 +2463,6 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_was_found.=
+
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=

src/main/resources/l10n/JabRef_zh.properties

@@ -1704,3 +1704,6 @@ last_four_nonpunctuation_characters_should_be_numerals=
 Remember_password?=
 
 shared=
+No_entry_with_id_'%0'_was_found.=
+
+No_entry_with_id_'%0'_for_fetcher_'%1'_was_found.=