Honor biblatex mode at default constructor

JabRef · Nov 23, 2015 · 1776bb6 · 1776bb6
1 parent a1430d7
commit 1776bb6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/main/java/net/sf/jabref/bibtex/EntryTypes.java b/src/main/java/net/sf/jabref/bibtex/EntryTypes.java
@@ -74,24 +74,15 @@ private static void initBibtexEntryTypes() {
      * or null if it does not exist.
      */
     public static EntryType getType(String name) {
-        EntryType entryType = ALL_TYPES.get(name.toLowerCase());
-        if (entryType == null) {
-            return null;
-        }
-        return entryType;
+        return ALL_TYPES.get(name.toLowerCase());
     }
 
     /**
      * This method returns the standard BibtexEntryType for the
      * name of a type, or null if it does not exist.
      */
     public static EntryType getStandardType(String name) {
-        EntryType entryType = STANDARD_TYPES.get(name.toLowerCase());
-        if (entryType == null) {
-            return null;
-        } else {
-            return entryType;
-        }
+        return STANDARD_TYPES.get(name.toLowerCase());
     }
 
     public static void addOrModifyCustomEntryType(CustomEntryType type) {

diff --git a/src/main/java/net/sf/jabref/model/entry/BibtexEntry.java b/src/main/java/net/sf/jabref/model/entry/BibtexEntry.java
@@ -37,6 +37,7 @@
 
 import com.google.common.base.Strings;
 
+import net.sf.jabref.bibtex.EntryTypes;
 import net.sf.jabref.model.database.BibtexDatabase;
 
 public class BibtexEntry {
@@ -65,7 +66,7 @@ public BibtexEntry() {
     }
 
     public BibtexEntry(String id) {
-        this(id, BibtexEntryTypes.MISC);
+        this(id, EntryTypes.getBibtexEntryType("misc"));
     }
 
     public BibtexEntry(String id, EntryType type) {

diff --git a/src/test/java/net/sf/jabref/model/entry/BibtexEntryTests.java b/src/test/java/net/sf/jabref/model/entry/BibtexEntryTests.java
@@ -7,6 +7,7 @@
 
 import net.sf.jabref.Globals;
 import net.sf.jabref.JabRefPreferences;
+import net.sf.jabref.bibtex.EntryTypes;
 import net.sf.jabref.importer.fileformat.BibtexParser;
 
 import java.util.ArrayList;
@@ -20,8 +21,11 @@ public void setup() {
 
     @Test
     public void testDefaultConstructor() {
-        @SuppressWarnings("unused")
         BibtexEntry entry = new BibtexEntry();
+        // we have to use `getType("misc")` in the case of biblatex mode
+        Assert.assertEquals(EntryTypes.getType("misc"), entry.getType());
+        Assert.assertNotNull(entry.getId());
+        Assert.assertNull(entry.getField("author"));
     }
 
     @Test