Fix #1476 NPE when importing from SQL DB because of missing DatabaseMode

JabRef · Jun 6, 2016 · 9a3c8fd · 9a3c8fd
1 parent 956abf0
commit 9a3c8fd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/src/main/java/net/sf/jabref/JabRefPreferences.java b/src/main/java/net/sf/jabref/JabRefPreferences.java
@@ -71,6 +71,7 @@
 import net.sf.jabref.logic.remote.RemotePreferences;
 import net.sf.jabref.logic.util.OS;
 import net.sf.jabref.logic.util.strings.StringUtil;
+import net.sf.jabref.model.database.BibDatabaseMode;
 import net.sf.jabref.model.entry.CustomEntryType;
 import net.sf.jabref.model.entry.EntryUtil;
 import net.sf.jabref.model.entry.InternalBibtexFields;
@@ -1037,6 +1038,19 @@ public Color getDefaultColor(String key) {
         return new Color(rgb[0], rgb[1], rgb[2]);
     }
 
+    /**
+     * Returns the default BibDatabase mode, which can be either BIBTEX or BIBLATEX.
+     *
+     * @return the default BibDatabaseMode
+     */
+    public BibDatabaseMode getDefaultBibDatabaseMode() {
+        if (getBoolean(BIBLATEX_DEFAULT_MODE)) {
+            return BibDatabaseMode.BIBLATEX;
+        } else {
+            return BibDatabaseMode.BIBTEX;
+        }
+    }
+
     /**
      * Set the default value for a key. This is useful for plugins that need to add default values for the prefs keys
      * they use.

diff --git a/src/main/java/net/sf/jabref/gui/labelpattern/LabelPatternPanel.java b/src/main/java/net/sf/jabref/gui/labelpattern/LabelPatternPanel.java
@@ -120,13 +120,11 @@ private void buildGUI() {
         // check mode of currently used DB
         if (panel != null) {
             mode = panel.getBibDatabaseContext().getMode();
-        } else { // use preferences value if no DB is open
-            if (Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE)) {
-                mode = BibDatabaseMode.BIBLATEX;
-            } else {
-                mode = BibDatabaseMode.BIBTEX;
-            }
+        } else {
+            // use preferences value if no DB is open
+            mode = Globals.prefs.getDefaultBibDatabaseMode();
         }
+
         for (EntryType type : EntryTypes.getAllValues(mode)) {
             textFields.put(type.getName().toLowerCase(), addEntryType(pan, type, y));
             y++;

diff --git a/src/main/java/net/sf/jabref/sql/importer/DbImportAction.java b/src/main/java/net/sf/jabref/sql/importer/DbImportAction.java
@@ -27,6 +27,7 @@
 import javax.swing.JOptionPane;
 
 import net.sf.jabref.BibDatabaseContext;
+import net.sf.jabref.Globals;
 import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.gui.actions.MnemonicAwareAction;
@@ -69,11 +70,8 @@ public AbstractAction getAction() {
     }
 
     class DbImpAction extends MnemonicAwareAction {
-
         public DbImpAction() {
-            super();
             putValue(Action.NAME, Localization.menuTitle("Import from external SQL database"));
-
         }
 
         @Override
@@ -151,14 +149,14 @@ private void performImport() {
                             Localization.lang("There are no available databases to be imported"),
                             Localization.lang("Import from SQL database"), JOptionPane.INFORMATION_MESSAGE);
                 } else {
-                    DBImportExportDialog dialogo = new DBImportExportDialog(frame, matrix,
-                            DBImportExportDialog.DialogType.IMPORTER);
+                    DBImportExportDialog dialogo = new DBImportExportDialog(frame, matrix, DBImportExportDialog.DialogType.IMPORTER);
                     if (dialogo.removeAction) {
                         String dbName = dialogo.selectedDB;
                         DatabaseUtil.removeDB(dialogo, dbName, conn, databaseContext);
                         performImport();
                     } else if (dialogo.moreThanOne) {
-                        databases = importer.performImport(dbs, dialogo.listOfDBs, frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
+                        // use default DB mode for import
+                        databases = importer.performImport(dbs, dialogo.listOfDBs, Globals.prefs.getDefaultBibDatabaseMode());
                         for (DBImporterResult res : databases) {
                             databaseContext = res.getDatabaseContext();
                             dbs.isConfigValid(true);