Try to import as regular bibtex file before trying anything else

JabRef · Jan 24, 2016 · f405cf4 · f405cf4
1 parent 6f9c748
commit f405cf4
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/src/main/java/net/sf/jabref/importer/ImportFormatReader.java b/src/main/java/net/sf/jabref/importer/ImportFormatReader.java
@@ -362,6 +362,18 @@ public UnknownFormatImport importUnknownFormat(String filename) {
         int bestResultCount = 0;
         String bestFormatName = null;
 
+        // First, see if it is a BibTeX file:
+        try {
+            ParserResult pr = OpenDatabaseAction.loadDatabase(new File(filename),
+                    Globals.prefs.getDefaultEncoding());
+            if ((pr.getDatabase().getEntryCount() > 0)
+                    || (pr.getDatabase().getStringCount() > 0)) {
+                pr.setFile(new File(filename));
+                return new UnknownFormatImport(ImportFormatReader.BIBTEX_FORMAT, pr);
+            }
+        } catch (Throwable ignore) {
+        }
+
         // Cycle through all importers:
         for (ImportFormat imFo : getImportFormats()) {
 
@@ -393,19 +405,6 @@ public UnknownFormatImport importUnknownFormat(String filename) {
             return new UnknownFormatImport(bestFormatName, parserResult);
         }
 
-        // Finally, if all else fails, see if it is a BibTeX file:
-        try {
-            ParserResult pr = OpenDatabaseAction.loadDatabase(new File(filename),
-                    Globals.prefs.getDefaultEncoding());
-            if ((pr.getDatabase().getEntryCount() > 0)
-                    || (pr.getDatabase().getStringCount() > 0)) {
-                pr.setFile(new File(filename));
-                return new UnknownFormatImport(ImportFormatReader.BIBTEX_FORMAT, pr);
-            }
-        } catch (Throwable ex) {
-            return null;
-        }
-
         return null;
     }
 }