ISBN Fetcher using the new fetcher infrastructure

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

@@ -4,15 +4,16 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import net.sf.jabref.Globals;
 import net.sf.jabref.logic.importer.fetcher.ArXiv;
 import net.sf.jabref.logic.importer.fetcher.GvkFetcher;
+import net.sf.jabref.logic.importer.fetcher.IsbnFetcher;
 import net.sf.jabref.logic.journals.JournalAbbreviationLoader;
 
 public class EntryFetchers {
 
     private final List<EntryFetcher> entryFetchers = new LinkedList<>();
 
-
     public EntryFetchers(JournalAbbreviationLoader abbreviationLoader) {
         entryFetchers.add(new ADSFetcher());
         entryFetchers.add(new CiteSeerXFetcher());
@@ -21,7 +22,6 @@ public EntryFetchers(JournalAbbreviationLoader abbreviationLoader) {
         entryFetchers.add(new DOItoBibTeXFetcher());
         entryFetchers.add(new IEEEXploreFetcher(abbreviationLoader));
         entryFetchers.add(new INSPIREFetcher());
-        entryFetchers.add(new ISBNtoBibTeXFetcher());
         entryFetchers.add(new MedlineFetcher());
         // entryFetchers.add(new OAI2Fetcher()); - new arXiv fetcher in place, see below
         // entryFetchers.add(new ScienceDirectFetcher()); currently not working - removed see #409
@@ -30,6 +30,7 @@ public EntryFetchers(JournalAbbreviationLoader abbreviationLoader) {
         entryFetchers.add(new DOAJFetcher());
         entryFetchers.add(new SpringerFetcher());
 
+        entryFetchers.add(new IdBasedEntryFetcher(new IsbnFetcher(Globals.prefs.getImportFormatPreferences ())));
         entryFetchers.add(new SearchBasedEntryFetcher(new ArXiv()));
         entryFetchers.add(new SearchBasedEntryFetcher(new GvkFetcher()));
     }

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

@@ -0,0 +1,64 @@
+package net.sf.jabref.gui.importer.fetcher;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import javax.swing.JPanel;
+
+import net.sf.jabref.logic.help.HelpFile;
+import net.sf.jabref.logic.importer.FetcherException;
+import net.sf.jabref.logic.importer.IdBasedFetcher;
+import net.sf.jabref.logic.importer.ImportInspector;
+import net.sf.jabref.logic.importer.OutputPrinter;
+import net.sf.jabref.logic.l10n.Localization;
+import net.sf.jabref.model.entry.BibEntry;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class IdBasedEntryFetcher implements EntryFetcher {
+
+    private static final Log LOGGER = LogFactory.getLog(IdBasedEntryFetcher.class);
+    private final IdBasedFetcher fetcher;
+
+    public IdBasedEntryFetcher(IdBasedFetcher fetcher) {
+        this.fetcher = Objects.requireNonNull(fetcher);
+    }
+
+    @Override
+    public boolean processQuery(String query, ImportInspector inspector, OutputPrinter status) {
+
+        status.setStatus(Localization.lang("Processing %0", query));
+        try {
+            Optional<BibEntry> match = fetcher.performSearchById(query);
+            match.ifPresent(inspector::addEntry);
+            return match.isPresent();
+        } catch (FetcherException e) {
+            status.setStatus(Localization.lang("Error while fetching from %0", fetcher.getName()));
+            LOGGER.error("Error while fetching from" + fetcher.getName(), e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public String getTitle() {
+        return fetcher.getName();
+    }
+
+    @Override
+    public HelpFile getHelpPage() {
+        return fetcher.getHelpPage();
+    }
+
+    @Override
+    public JPanel getOptionsPanel() {
+        // not supported
+        return null;
+    }
+
+    @Override
+    public void stopFetching() {
+        // not supported
+    }
+}

src/main/java/net/sf/jabref/gui/mergeentries/FetchAndMergeEntry.java

@@ -7,20 +7,25 @@
 
 import net.sf.jabref.Globals;
 import net.sf.jabref.gui.BasePanel;
-import net.sf.jabref.gui.importer.fetcher.ISBNtoBibTeXFetcher;
 import net.sf.jabref.logic.importer.FetcherException;
 import net.sf.jabref.logic.importer.fetcher.ArXiv;
 import net.sf.jabref.logic.importer.fetcher.DOItoBibTeX;
+import net.sf.jabref.logic.importer.fetcher.IsbnFetcher;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.model.entry.BibEntry;
 import net.sf.jabref.model.entry.FieldName;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * Class for fetching and merging information based on a specific field
  *
  */
 public class FetchAndMergeEntry {
 
+    private static final Log LOGGER = LogFactory.getLog(FetchAndMergeEntry.class);
+
     // A list of all field which are supported
     public static List<String> SUPPORTED_FIELDS = Arrays.asList(FieldName.DOI, FieldName.EPRINT, FieldName.ISBN);
 
@@ -57,13 +62,21 @@ public FetchAndMergeEntry(BibEntry entry, BasePanel panel, List<String> fields)
                     fetchedEntry = new DOItoBibTeX().getEntryFromDOI(fieldContent.get(),
                             Globals.prefs.getImportFormatPreferences());
                 } else if (FieldName.ISBN.equals(field)) {
-                    fetchedEntry = new ISBNtoBibTeXFetcher().getEntryFromISBN(fieldContent.get(), null);
+                    try {
+                        fetchedEntry = new IsbnFetcher(Globals.prefs.getImportFormatPreferences ()).performSearchById(fieldContent.get());
+                    } catch (FetcherException e) {
+                        LOGGER.error("Info cannot be found", e);
+                        panel.frame().setStatus(
+                                Localization.lang("Cannot get info based on given %0: %1", type, fieldContent.get()));
+                    }
+
                 } else if (FieldName.EPRINT.equals(field)) {
                     try {
                         fetchedEntry = new ArXiv().performSearchById(fieldContent.get());
                     } catch (FetcherException e) {
+                        LOGGER.error("Info cannot be found", e);
                         panel.frame().setStatus(
-                                Localization.lang("Cannot get info based on given %0:_%1", type, fieldContent.get()));
+                                Localization.lang("Cannot get info based on given %0: %1", type, fieldContent.get()));
                     }
                 }
 
@@ -73,7 +86,7 @@ public FetchAndMergeEntry(BibEntry entry, BasePanel panel, List<String> fields)
                     dialog.setVisible(true);
                 } else {
                     panel.frame()
-                            .setStatus(Localization.lang("Cannot get info based on given %0:_%1", type,
+                            .setStatus(Localization.lang("Cannot get info based on given %0: %1", type,
                                     fieldContent.get()));
                 }
             } else {

src/main/java/net/sf/jabref/logic/importer/IdBasedFetcher.java

@@ -14,6 +14,7 @@ public interface IdBasedFetcher extends WebFetcher {
      *
      * @param identifier a string which uniquely identifies the item
      * @return a {@link BibEntry} containing the bibliographic information (or an empty optional if no data was found)
+     * @throws FetcherException
      */
     Optional<BibEntry> performSearchById(String identifier) throws FetcherException;
 }