diff --git a/src/main/java/net/sf/jabref/LoadedDatabase.java b/src/main/java/net/sf/jabref/LoadedDatabase.java index 3b941afb556..bbd33caa8d2 100644 --- a/src/main/java/net/sf/jabref/LoadedDatabase.java +++ b/src/main/java/net/sf/jabref/LoadedDatabase.java @@ -1,8 +1,8 @@ package net.sf.jabref; import net.sf.jabref.model.database.BibDatabase; -import net.sf.jabref.model.database.BibDatabaseType; -import net.sf.jabref.model.database.BibDatabaseTypeDetection; +import net.sf.jabref.model.database.BibDatabaseMode; +import net.sf.jabref.model.database.BibDatabaseModeDetection; import java.io.File; import java.util.Objects; @@ -10,8 +10,6 @@ public class LoadedDatabase { - private static final String DATABASE_TYPE = "DATABASE_TYPE"; - private final BibDatabase database; private final MetaData metaData; @@ -27,7 +25,7 @@ public LoadedDatabase(BibDatabase database, MetaData metaData) { this.database = Objects.requireNonNull(database); this.metaData = Objects.requireNonNull(metaData); - this.setType(getType()); + this.setMode(getMode()); } public LoadedDatabase(BibDatabase database, MetaData metaData, File file) { @@ -36,18 +34,18 @@ public LoadedDatabase(BibDatabase database, MetaData metaData, File file) { this.metaData.setFile(file); } - public BibDatabaseType getType() { - Vector data = metaData.getData(DATABASE_TYPE); + public BibDatabaseMode getMode() { + Vector data = metaData.getData(MetaData.DATABASE_TYPE); if(data == null) { - return BibDatabaseTypeDetection.inferType(database); + return BibDatabaseModeDetection.inferMode(database); } - return BibDatabaseType.valueOf(data.get(0)); + return BibDatabaseMode.valueOf(data.get(0)); } - public void setType(BibDatabaseType type) { + public void setMode(BibDatabaseMode bibDatabaseMode) { Vector list = new Vector<>(); - list.add(type.name()); - metaData.putData(DATABASE_TYPE, list); + list.add(bibDatabaseMode.name()); + metaData.putData(MetaData.DATABASE_TYPE, list); } /** @@ -68,6 +66,6 @@ public MetaData getMetaData() { } public boolean isBiblatexMode() { - return getType() == BibDatabaseType.BIBLATEX; + return getMode() == BibDatabaseMode.BIBLATEX; } } diff --git a/src/main/java/net/sf/jabref/MetaData.java b/src/main/java/net/sf/jabref/MetaData.java index efe5da36967..f3df1d0fe3c 100644 --- a/src/main/java/net/sf/jabref/MetaData.java +++ b/src/main/java/net/sf/jabref/MetaData.java @@ -31,6 +31,7 @@ public class MetaData implements Iterable { public static final String META_FLAG = "jabref-meta: "; private static final String PREFIX_KEYPATTERN = "keypattern_"; private static final String KEYPATTERNDEFAULT = "keypatterndefault"; + static final String DATABASE_TYPE = "DATABASE_TYPE"; private final HashMap> metaData = new HashMap<>(); private GroupTreeNode groupsRoot; diff --git a/src/main/java/net/sf/jabref/bibtex/BibEntryWriter.java b/src/main/java/net/sf/jabref/bibtex/BibEntryWriter.java index 9a6d9d45e19..d7d9fb4c493 100644 --- a/src/main/java/net/sf/jabref/bibtex/BibEntryWriter.java +++ b/src/main/java/net/sf/jabref/bibtex/BibEntryWriter.java @@ -4,7 +4,7 @@ import net.sf.jabref.Globals; import net.sf.jabref.exporter.LatexFieldFormatter; import net.sf.jabref.logic.util.strings.StringUtil; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.EntryType; import java.io.IOException; @@ -26,7 +26,7 @@ public BibEntryWriter(LatexFieldFormatter fieldFormatter, boolean write) { this.write = write; } - public void write(BibEntry entry, Writer out, BibDatabaseType bibDatabaseType) throws IOException { + public void write(BibEntry entry, Writer out, BibDatabaseMode bibDatabaseMode) throws IOException { // if the entry has not been modified, write it as it was if (!entry.hasChanged()) { out.write(entry.getParsedSerialization()); @@ -34,17 +34,17 @@ public void write(BibEntry entry, Writer out, BibDatabaseType bibDatabaseType) t } out.write(Globals.NEWLINE + Globals.NEWLINE); - writeRequiredFieldsFirstRemainingFieldsSecond(entry, out, bibDatabaseType); + writeRequiredFieldsFirstRemainingFieldsSecond(entry, out, bibDatabaseMode); } - public void writeWithoutPrependedNewlines(BibEntry entry, Writer out, BibDatabaseType bibDatabaseType) throws IOException { + public void writeWithoutPrependedNewlines(BibEntry entry, Writer out, BibDatabaseMode bibDatabaseMode) throws IOException { // if the entry has not been modified, write it as it was if (!entry.hasChanged()) { out.write(entry.getParsedSerialization().trim()); return; } - writeRequiredFieldsFirstRemainingFieldsSecond(entry, out, bibDatabaseType); + writeRequiredFieldsFirstRemainingFieldsSecond(entry, out, bibDatabaseMode); } /** @@ -54,9 +54,9 @@ public void writeWithoutPrependedNewlines(BibEntry entry, Writer out, BibDatabas * @param out * @throws IOException */ - private void writeRequiredFieldsFirstRemainingFieldsSecond(BibEntry entry, Writer out, BibDatabaseType bibDatabaseType) throws IOException { + private void writeRequiredFieldsFirstRemainingFieldsSecond(BibEntry entry, Writer out, BibDatabaseMode bibDatabaseMode) throws IOException { // Write header with type and bibtex-key. - TypedBibEntry typedEntry = new TypedBibEntry(entry, Optional.empty(), bibDatabaseType); + TypedBibEntry typedEntry = new TypedBibEntry(entry, Optional.empty(), bibDatabaseMode); out.write('@' + typedEntry.getTypeForDisplay() + '{'); writeKeyField(entry, out); @@ -66,7 +66,7 @@ private void writeRequiredFieldsFirstRemainingFieldsSecond(BibEntry entry, Write boolean hasWritten = false; int indentation = getLengthOfLongestFieldName(entry); - EntryType type = EntryTypes.getType(entry.getType(), bibDatabaseType); + EntryType type = EntryTypes.getType(entry.getType(), bibDatabaseMode); // Write required fields first. List fields = type.getRequiredFieldsFlat(); diff --git a/src/main/java/net/sf/jabref/bibtex/EntryTypes.java b/src/main/java/net/sf/jabref/bibtex/EntryTypes.java index 1d56f0d6354..d6e0dd1d30c 100644 --- a/src/main/java/net/sf/jabref/bibtex/EntryTypes.java +++ b/src/main/java/net/sf/jabref/bibtex/EntryTypes.java @@ -1,6 +1,6 @@ package net.sf.jabref.bibtex; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.*; import java.util.*; @@ -100,8 +100,8 @@ public void removeType(String name) { * This method returns the BibtexEntryType for the name of a type, * or null if it does not exist. */ - public static EntryType getType(String name, BibDatabaseType type) { - return type == BibDatabaseType.BIBLATEX ? BIBLATEX.getType(name) : BIBTEX.getType(name); + public static EntryType getType(String name, BibDatabaseMode type) { + return type == BibDatabaseMode.BIBLATEX ? BIBLATEX.getType(name) : BIBTEX.getType(name); } /** @@ -109,16 +109,16 @@ public static EntryType getType(String name, BibDatabaseType type) { * or the default type (*.MISC) if it does not exist. */ // Get an entry type defined in BibtexEntryType - public static EntryType getTypeOrDefault(String name, BibDatabaseType type) { - return type == BibDatabaseType.BIBLATEX ? BIBLATEX.getTypeOrDefault(name) : BIBTEX.getTypeOrDefault(name); + public static EntryType getTypeOrDefault(String name, BibDatabaseMode type) { + return type == BibDatabaseMode.BIBLATEX ? BIBLATEX.getTypeOrDefault(name) : BIBTEX.getTypeOrDefault(name); } /** * 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, BibDatabaseType type) { - return type == BibDatabaseType.BIBLATEX ? BIBLATEX.getStandardType(name) : BIBTEX.getStandardType(name); + public static EntryType getStandardType(String name, BibDatabaseMode type) { + return type == BibDatabaseMode.BIBLATEX ? BIBLATEX.getStandardType(name) : BIBTEX.getStandardType(name); } public static void addOrModifyCustomEntryType(CustomEntryType customEntryType) { @@ -130,12 +130,12 @@ private static void addOrModifyEntryType(EntryType name) { BIBTEX.addOrModifyEntryType(name); } - public static Set getAllTypes(BibDatabaseType type) { - return type == BibDatabaseType.BIBLATEX ? BIBLATEX.getAllTypes() : BIBTEX.getAllTypes(); + public static Set getAllTypes(BibDatabaseMode type) { + return type == BibDatabaseMode.BIBLATEX ? BIBLATEX.getAllTypes() : BIBTEX.getAllTypes(); } - public static Collection getAllValues(BibDatabaseType type) { - return type == BibDatabaseType.BIBLATEX ? BIBLATEX.getAllValues() : BIBTEX.getAllValues(); + public static Collection getAllValues(BibDatabaseMode type) { + return type == BibDatabaseMode.BIBLATEX ? BIBLATEX.getAllValues() : BIBTEX.getAllValues(); } /** @@ -144,8 +144,8 @@ public static Collection getAllValues(BibDatabaseType type) { * * @param name The customized entry type to remove. */ - public static void removeType(String name, BibDatabaseType type) { - if (type == BibDatabaseType.BIBLATEX) { + public static void removeType(String name, BibDatabaseMode type) { + if (type == BibDatabaseMode.BIBLATEX) { BIBLATEX.removeType(name); } else { BIBTEX.removeType(name); diff --git a/src/main/java/net/sf/jabref/exporter/FileActions.java b/src/main/java/net/sf/jabref/exporter/FileActions.java index 800ad0bd79a..5cbf5e1739f 100644 --- a/src/main/java/net/sf/jabref/exporter/FileActions.java +++ b/src/main/java/net/sf/jabref/exporter/FileActions.java @@ -224,9 +224,9 @@ public static SaveSession saveDatabase(LoadedDatabase loadedDatabase, File targe // Check if we must write the type definition for this // entry, as well. Our criterion is that all non-standard // types (*not* customized standard types) must be written. - EntryType entryType = EntryTypes.getType(entry.getType(), loadedDatabase.getType()); + EntryType entryType = EntryTypes.getType(entry.getType(), loadedDatabase.getMode()); - if (EntryTypes.getStandardType(entryType.getName(), loadedDatabase.getType()) == null) { + if (EntryTypes.getStandardType(entryType.getName(), loadedDatabase.getMode()) == null) { types.put(entryType.getName(), entryType); } @@ -242,7 +242,7 @@ public static SaveSession saveDatabase(LoadedDatabase loadedDatabase, File targe } if (write) { - bibtexEntryWriter.write(entry, writer, loadedDatabase.getType()); + bibtexEntryWriter.write(entry, writer, loadedDatabase.getMode()); } } @@ -418,12 +418,12 @@ public static SaveSession savePartOfDatabase(LoadedDatabase loadedDatabase, File // Check if we must write the type definition for this // entry, as well. Our criterion is that all non-standard // types (*not* customized standard types) must be written. - EntryType tp = EntryTypes.getType(be.getType(), loadedDatabase.getType()); - if (EntryTypes.getStandardType(tp.getName(), loadedDatabase.getType()) == null) { + EntryType tp = EntryTypes.getType(be.getType(), loadedDatabase.getMode()); + if (EntryTypes.getStandardType(tp.getName(), loadedDatabase.getMode()) == null) { types.put(tp.getName(), tp); } - bibtexEntryWriter.write(be, fw, loadedDatabase.getType()); + bibtexEntryWriter.write(be, fw, loadedDatabase.getMode()); //only append newline if the entry has changed if (!be.hasChanged()) { fw.write(Globals.NEWLINE); diff --git a/src/main/java/net/sf/jabref/gui/DuplicateResolverDialog.java b/src/main/java/net/sf/jabref/gui/DuplicateResolverDialog.java index fcf93bda3c5..ed2966a9574 100644 --- a/src/main/java/net/sf/jabref/gui/DuplicateResolverDialog.java +++ b/src/main/java/net/sf/jabref/gui/DuplicateResolverDialog.java @@ -16,8 +16,6 @@ package net.sf.jabref.gui; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; @@ -81,28 +79,28 @@ private void init(BibEntry one, BibEntry two, int type) { first = new JButton(Localization.lang("Keep left")); second = new JButton(Localization.lang("Keep right")); both = new JButton(Localization.lang("Keep both")); - me = new MergeEntries(one, two, frame.getCurrentBasePanel().getLoadedDatabase().getType()); + me = new MergeEntries(one, two, frame.getCurrentBasePanel().getLoadedDatabase().getMode()); break; case INSPECTION: first = new JButton(Localization.lang("Remove old entry")); second = new JButton(Localization.lang("Remove entry from import")); both = new JButton(Localization.lang("Keep both")); me = new MergeEntries(one, two, Localization.lang("Old entry"), - Localization.lang("From import"), frame.getCurrentBasePanel().getLoadedDatabase().getType()); + Localization.lang("From import"), frame.getCurrentBasePanel().getLoadedDatabase().getMode()); break; case DUPLICATE_SEARCH_WITH_EXACT: first = new JButton(Localization.lang("Keep left")); second = new JButton(Localization.lang("Keep right")); both = new JButton(Localization.lang("Keep both")); removeExact = new JButton(Localization.lang("Automatically remove exact duplicates")); - me = new MergeEntries(one, two, frame.getCurrentBasePanel().getLoadedDatabase().getType()); + me = new MergeEntries(one, two, frame.getCurrentBasePanel().getLoadedDatabase().getMode()); break; default: first = new JButton(Localization.lang("Import and remove old entry")); second = new JButton(Localization.lang("Do not import entry")); both = new JButton(Localization.lang("Import and keep old entry")); me = new MergeEntries(one, two, Localization.lang("Old entry"), - Localization.lang("From import"), frame.getCurrentBasePanel().getLoadedDatabase().getType()); + Localization.lang("From import"), frame.getCurrentBasePanel().getLoadedDatabase().getMode()); } if (removeExact != null) { diff --git a/src/main/java/net/sf/jabref/gui/DuplicateSearch.java b/src/main/java/net/sf/jabref/gui/DuplicateSearch.java index cb35db5da1e..01ca21b1b0d 100644 --- a/src/main/java/net/sf/jabref/gui/DuplicateSearch.java +++ b/src/main/java/net/sf/jabref/gui/DuplicateSearch.java @@ -171,7 +171,7 @@ class SearcherRunnable implements Runnable { public void run() { for (int i = 0; (i < (bes.length - 1)) && !finished; i++) { for (int j = i + 1; (j < bes.length) && !finished; j++) { - boolean eq = DuplicateCheck.isDuplicate(bes[i], bes[j], panel.getLoadedDatabase().getType()); + boolean eq = DuplicateCheck.isDuplicate(bes[i], bes[j], panel.getLoadedDatabase().getMode()); // If (suspected) duplicates, add them to the duplicates vector. if (eq) { diff --git a/src/main/java/net/sf/jabref/gui/EntryCustomizationDialog2.java b/src/main/java/net/sf/jabref/gui/EntryCustomizationDialog2.java index 1b0904adfff..a58d77264ba 100644 --- a/src/main/java/net/sf/jabref/gui/EntryCustomizationDialog2.java +++ b/src/main/java/net/sf/jabref/gui/EntryCustomizationDialog2.java @@ -86,11 +86,11 @@ private void initGui() { right.setLayout(new GridLayout(biblatexMode ? 2 : 1, 2)); List entryTypes = new ArrayList<>(); - for (String s : EntryTypes.getAllTypes(loadedDatabase.getType())) { + for (String s : EntryTypes.getAllTypes(loadedDatabase.getMode())) { entryTypes.add(s); } - typeComp = new EntryTypeList(entryTypes, loadedDatabase.getType()); + typeComp = new EntryTypeList(entryTypes, loadedDatabase.getMode()); typeComp.addListSelectionListener(this); typeComp.addAdditionActionListener(this); typeComp.addDefaultActionListener(new DefaultListener()); @@ -180,7 +180,7 @@ public void valueChanged(ListSelectionEvent e) { } List rl = reqLists.get(s); if (rl == null) { - EntryType type = EntryTypes.getType(s,loadedDatabase.getType()); + EntryType type = EntryTypes.getType(s,loadedDatabase.getMode()); if (type == null) { // New entry reqComp.setFields(new ArrayList<>()); @@ -248,13 +248,13 @@ private void applyChanges() { if (defaulted.contains(stringListEntry.getKey())) { // This type should be reverted to its default setup. String nm = EntryUtil.capitalizeFirst(stringListEntry.getKey()); - EntryTypes.removeType(nm, loadedDatabase.getType()); + EntryTypes.removeType(nm, loadedDatabase.getMode()); updateTypesForEntries(nm); continue; } - EntryType oldType = EntryTypes.getType(stringListEntry.getKey(), loadedDatabase.getType()); + EntryType oldType = EntryTypes.getType(stringListEntry.getKey(), loadedDatabase.getMode()); if (oldType != null) { List oldReq = oldType.getRequiredFieldsFlat(); List oldOpt = oldType.getOptionalFields(); @@ -281,7 +281,7 @@ private void applyChanges() { } Set toRemove = new HashSet<>(); - for (String o : EntryTypes.getAllTypes(loadedDatabase.getType())) { + for (String o : EntryTypes.getAllTypes(loadedDatabase.getMode())) { if (!types.contains(o)) { toRemove.add(o); } @@ -298,10 +298,10 @@ private void applyChanges() { } private void typeDeletion(String name) { - EntryType type = EntryTypes.getType(name, loadedDatabase.getType()); + EntryType type = EntryTypes.getType(name, loadedDatabase.getMode()); if (type instanceof CustomEntryType) { - if (EntryTypes.getStandardType(name, loadedDatabase.getType()) == null) { + if (EntryTypes.getStandardType(name, loadedDatabase.getMode()) == null) { int reply = JOptionPane.showConfirmDialog (frame, Localization.lang("All entries of this " + "type will be declared " @@ -313,7 +313,7 @@ private void typeDeletion(String name) { return; } } - EntryTypes.removeType(name, loadedDatabase.getType()); + EntryTypes.removeType(name, loadedDatabase.getMode()); updateTypesForEntries(EntryUtil.capitalizeFirst(name)); changed.remove(name); reqLists.remove(name); @@ -373,7 +373,7 @@ private void updateTypesForEntries(String typeName) { bp.entryEditors.remove(typeName); for (BibEntry entry : bp.database().getEntries()) { - EntryType newType = EntryTypes.getType(entry.getType(), loadedDatabase.getType()); + EntryType newType = EntryTypes.getType(entry.getType(), loadedDatabase.getMode()); if (newType != null) { entry.setType(newType); } @@ -401,7 +401,7 @@ public void actionPerformed(ActionEvent e) { } defaulted.add(lastSelected); - EntryType type = EntryTypes.getStandardType(lastSelected, loadedDatabase.getType()); + EntryType type = EntryTypes.getStandardType(lastSelected, loadedDatabase.getMode()); if (type != null) { List of = type.getOptionalFields(); List req = type.getRequiredFields(); diff --git a/src/main/java/net/sf/jabref/gui/EntryTypeDialog.java b/src/main/java/net/sf/jabref/gui/EntryTypeDialog.java index b4fda0756fc..95c4865b6c6 100644 --- a/src/main/java/net/sf/jabref/gui/EntryTypeDialog.java +++ b/src/main/java/net/sf/jabref/gui/EntryTypeDialog.java @@ -26,7 +26,6 @@ import com.jgoodies.forms.builder.ButtonBarBuilder; import net.sf.jabref.Globals; -import net.sf.jabref.JabRefPreferences; import net.sf.jabref.LoadedDatabase; import net.sf.jabref.gui.keyboard.KeyBinding; import net.sf.jabref.logic.CustomEntryTypesManager; @@ -92,7 +91,7 @@ private JPanel createEntryGroupsPanel() { panel.setLayout(new VerticalLayout()); if(biblatexMode) { - panel.add(createEntryGroupPanel("BibLateX", EntryTypes.getAllValues(loadedDatabase.getType()))); + panel.add(createEntryGroupPanel("BibLateX", EntryTypes.getAllValues(loadedDatabase.getMode()))); } else { panel.add(createEntryGroupPanel("BibTeX", BibtexEntryTypes.ALL)); panel.add(createEntryGroupPanel("IEEETran", IEEETranEntryTypes.ALL)); diff --git a/src/main/java/net/sf/jabref/gui/EntryTypeList.java b/src/main/java/net/sf/jabref/gui/EntryTypeList.java index 155ec5b5171..69aacf29878 100644 --- a/src/main/java/net/sf/jabref/gui/EntryTypeList.java +++ b/src/main/java/net/sf/jabref/gui/EntryTypeList.java @@ -25,7 +25,7 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.CustomEntryType; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.bibtex.EntryTypes; @@ -40,10 +40,10 @@ public class EntryTypeList extends FieldSetComponent implements ListSelectionListener { private final JButton def = new JButton(Localization.lang("Default")); - private final BibDatabaseType type; + private final BibDatabaseMode type; /** Creates a new instance of EntryTypeList */ - public EntryTypeList(List fields, BibDatabaseType type) { + public EntryTypeList(List fields, BibDatabaseMode type) { super(Localization.lang("Entry types"), fields, false, true); this.type = type; diff --git a/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java b/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java index 2a01aeb6f50..e5a623722de 100644 --- a/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java +++ b/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java @@ -1044,7 +1044,7 @@ public Component getListCellRendererComponent(JList list, Object value, int i */ private void createEntryTypesCombobox() { - Iterator iterator = EntryTypes.getAllValues(frame.getCurrentBasePanel().getLoadedDatabase().getType()).iterator(); + Iterator iterator = EntryTypes.getAllValues(frame.getCurrentBasePanel().getLoadedDatabase().getMode()).iterator(); Vector list = new Vector<>(); list.add(new BibtexEntryTypeWrapper(null)); while (iterator.hasNext()) { diff --git a/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java b/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java index bed9c893bd9..45cab14c58e 100644 --- a/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java +++ b/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java @@ -401,7 +401,7 @@ public void addEntries(Collection entriesToAdd) { // Checking duplicates means both checking against the background // database (if // applicable) and against entries already in the table. - if (((panel != null) && (DuplicateCheck.containsDuplicate(panel.database(), entry, panel.getLoadedDatabase().getType()).isPresent())) + if (((panel != null) && (DuplicateCheck.containsDuplicate(panel.database(), entry, panel.getLoadedDatabase().getMode()).isPresent())) || (internalDuplicate(this.entries, entry).isPresent())) { entry.setGroupHit(true); deselectAllDuplicates.setEnabled(true); @@ -425,7 +425,7 @@ private Optional internalDuplicate(Collection entriesDupe, B if (othEntry.equals(entry)) { continue; // Don't compare the entry to itself } - if (DuplicateCheck.isDuplicate(entry, othEntry, panel.getLoadedDatabase().getType())) { + if (DuplicateCheck.isDuplicate(entry, othEntry, panel.getLoadedDatabase().getMode())) { return Optional.of(othEntry); } } @@ -1067,7 +1067,7 @@ public void mousePressed(MouseEvent e) { // Is this the duplicate icon column, and is there an icon? if ((col == DUPL_COL) && (glTable.getValueAt(row, col) != null)) { BibEntry first = sortedList.get(row); - Optional other = DuplicateCheck.containsDuplicate(panel.database(), first, panel.getLoadedDatabase().getType()); + Optional other = DuplicateCheck.containsDuplicate(panel.database(), first, panel.getLoadedDatabase().getMode()); if (other.isPresent()) { // This will be true if the duplicate is in the existing // database. diff --git a/src/main/java/net/sf/jabref/gui/JabRefFrame.java b/src/main/java/net/sf/jabref/gui/JabRefFrame.java index 2cac0b23c8e..40b90a5c759 100644 --- a/src/main/java/net/sf/jabref/gui/JabRefFrame.java +++ b/src/main/java/net/sf/jabref/gui/JabRefFrame.java @@ -42,7 +42,6 @@ import javax.swing.event.ListSelectionListener; import net.sf.jabref.*; -import net.sf.jabref.bibtex.EntryTypes; import net.sf.jabref.exporter.*; import net.sf.jabref.gui.actions.*; import net.sf.jabref.gui.desktop.JabRefDesktop; @@ -67,7 +66,7 @@ import net.sf.jabref.logic.util.OS; import net.sf.jabref.logic.util.io.FileUtil; import net.sf.jabref.model.database.BibDatabase; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -246,10 +245,10 @@ void addJToogleButton(JToggleButton button) { public void actionPerformed(ActionEvent evt) { if(isBiblatexMode()) { // to BibteX - JabRefFrame.this.getCurrentBasePanel().getLoadedDatabase().setType(BibDatabaseType.BIBTEX); + JabRefFrame.this.getCurrentBasePanel().getLoadedDatabase().setMode(BibDatabaseMode.BIBTEX); } else { // to Biblatex - JabRefFrame.this.getCurrentBasePanel().getLoadedDatabase().setType(BibDatabaseType.BIBLATEX); + JabRefFrame.this.getCurrentBasePanel().getLoadedDatabase().setMode(BibDatabaseMode.BIBLATEX); } // update menu label putValue(Action.NAME, Localization.menuTitle("Switch to %0 mode", "BibTeX/BibLaTeX")); diff --git a/src/main/java/net/sf/jabref/gui/TransferableBibtexEntry.java b/src/main/java/net/sf/jabref/gui/TransferableBibtexEntry.java index 390849961be..119a544f7fa 100644 --- a/src/main/java/net/sf/jabref/gui/TransferableBibtexEntry.java +++ b/src/main/java/net/sf/jabref/gui/TransferableBibtexEntry.java @@ -17,7 +17,7 @@ import net.sf.jabref.exporter.LatexFieldFormatter; import net.sf.jabref.bibtex.BibEntryWriter; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.BibEntry; import javax.swing.*; @@ -62,7 +62,7 @@ public Object getTransferData(DataFlavor flavor) StringWriter sw = new StringWriter(); BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new LatexFieldFormatter(), false); for (BibEntry entry : data) { - bibtexEntryWriter.write(entry, sw, BibDatabaseType.BIBTEX); + bibtexEntryWriter.write(entry, sw, BibDatabaseMode.BIBTEX); } return sw.toString(); } catch (IOException ex) { diff --git a/src/main/java/net/sf/jabref/gui/actions/NewEntryAction.java b/src/main/java/net/sf/jabref/gui/actions/NewEntryAction.java index ee5e84425e4..06b159df6dd 100644 --- a/src/main/java/net/sf/jabref/gui/actions/NewEntryAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/NewEntryAction.java @@ -59,7 +59,7 @@ public void actionPerformed(ActionEvent e) { if (jabRefFrame.tabbedPane.getTabCount() > 0) { ((BasePanel) jabRefFrame.tabbedPane.getSelectedComponent()) - .newEntry(EntryTypes.getType(thisType, jabRefFrame.getCurrentBasePanel().getLoadedDatabase().getType())); + .newEntry(EntryTypes.getType(thisType, jabRefFrame.getCurrentBasePanel().getLoadedDatabase().getMode())); } else { LOGGER.info("Action 'New entry' must be disabled when no database is open."); } diff --git a/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java index 48ca405c6cf..cb619c33a54 100644 --- a/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java +++ b/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java @@ -58,7 +58,7 @@ import net.sf.jabref.logic.labelPattern.LabelPatternUtil; import net.sf.jabref.logic.search.SearchQueryHighlightListener; import net.sf.jabref.model.database.BibDatabase; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.*; import net.sf.jabref.specialfields.SpecialFieldUpdateListener; import net.sf.jabref.gui.undo.NamedCompound; @@ -197,7 +197,7 @@ private void setupFieldPanels() { tabbed.removeAll(); tabs.clear(); - EntryType type = EntryTypes.getType(entry.getType(), this.frame.getCurrentBasePanel().getLoadedDatabase().getType()); + EntryType type = EntryTypes.getType(entry.getType(), this.frame.getCurrentBasePanel().getLoadedDatabase().getMode()); List fieldList = type.getRequiredFieldsFlat(); @@ -355,7 +355,7 @@ private void setupToolBar() { leftPan.add(closeBut, BorderLayout.NORTH); // Create type-label - TypedBibEntry typedEntry = new TypedBibEntry(entry, Optional.empty(), panel.getLoadedDatabase().getType()); + TypedBibEntry typedEntry = new TypedBibEntry(entry, Optional.empty(), panel.getLoadedDatabase().getMode()); leftPan.add(new TypeLabel(typedEntry.getTypeForDisplay()), BorderLayout.CENTER); TypeButton typeButton = new TypeButton(); @@ -445,7 +445,7 @@ public Optional getExtra(final FieldEditor editor) { } else if (BibtexFields.EXTRA_YES_NO.equals(fieldExtras)) { return FieldExtraComponents.getYesNoExtraComponent(editor, this); } else if (BibtexFields.EXTRA_MONTH.equals(fieldExtras)) { - return FieldExtraComponents.getMonthExtraComponent(editor, this, this.frame.getCurrentBasePanel().getLoadedDatabase().getType()); + return FieldExtraComponents.getMonthExtraComponent(editor, this, this.frame.getCurrentBasePanel().getLoadedDatabase().getMode()); } return Optional.empty(); } @@ -478,7 +478,7 @@ public void updateSource() { if (updateSource) { try { - String srcString = getSourceString(entry, panel.getLoadedDatabase().getType()); + String srcString = getSourceString(entry, panel.getLoadedDatabase().getMode()); source.setText(srcString); lastSourceStringAccepted = srcString; @@ -514,7 +514,7 @@ public void run() { } } - public static String getSourceString(BibEntry entry, BibDatabaseType type) throws IOException { + public static String getSourceString(BibEntry entry, BibDatabaseMode type) throws IOException { StringWriter stringWriter = new StringWriter(200); LatexFieldFormatter formatter = LatexFieldFormatter.buildIgnoreHashes(); new BibEntryWriter(formatter, false).writeWithoutPrependedNewlines(entry, stringWriter, type); diff --git a/src/main/java/net/sf/jabref/gui/entryeditor/FieldExtraComponents.java b/src/main/java/net/sf/jabref/gui/entryeditor/FieldExtraComponents.java index 1b9e4e7d38d..21a5fb86992 100644 --- a/src/main/java/net/sf/jabref/gui/entryeditor/FieldExtraComponents.java +++ b/src/main/java/net/sf/jabref/gui/entryeditor/FieldExtraComponents.java @@ -49,7 +49,7 @@ import net.sf.jabref.logic.journals.Abbreviations; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.util.date.EasyDateFormat; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.MonthUtil; @@ -215,7 +215,7 @@ public void actionPerformed(ActionEvent actionEvent) { * @param type * @return */ - public static Optional getMonthExtraComponent(FieldEditor fieldEditor, EntryEditor entryEditor, BibDatabaseType type) { + public static Optional getMonthExtraComponent(FieldEditor fieldEditor, EntryEditor entryEditor, BibDatabaseMode type) { final String[] options = new String[13]; options[0] = Localization.lang("Select"); for (int i = 1; i <= 12; i++) { @@ -228,7 +228,7 @@ public static Optional getMonthExtraComponent(FieldEditor fieldEdito public void actionPerformed(ActionEvent actionEvent) { int monthnumber = month.getSelectedIndex(); if (monthnumber >= 1) { - if (type == BibDatabaseType.BIBLATEX) { + if (type == BibDatabaseMode.BIBLATEX) { fieldEditor.setText(String.valueOf(monthnumber)); } else { fieldEditor.setText((MonthUtil.getMonthByNumber(monthnumber).bibtexFormat)); diff --git a/src/main/java/net/sf/jabref/gui/labelPattern/LabelPatternPanel.java b/src/main/java/net/sf/jabref/gui/labelPattern/LabelPatternPanel.java index b54ef1e5202..6915d1145d0 100644 --- a/src/main/java/net/sf/jabref/gui/labelPattern/LabelPatternPanel.java +++ b/src/main/java/net/sf/jabref/gui/labelPattern/LabelPatternPanel.java @@ -123,7 +123,7 @@ public void actionPerformed(ActionEvent event) { gbl.setConstraints(btnDefault, con); pan.add(btnDefault); - for (EntryType type : EntryTypes.getAllValues(panel.getLoadedDatabase().getType())) { + for (EntryType type : EntryTypes.getAllValues(panel.getLoadedDatabase().getMode())) { textFields.put(type.getName().toLowerCase(), addEntryType(pan, type, y)); y++; } diff --git a/src/main/java/net/sf/jabref/gui/maintable/MainTable.java b/src/main/java/net/sf/jabref/gui/maintable/MainTable.java index b3c1d748706..577e1dcaca8 100644 --- a/src/main/java/net/sf/jabref/gui/maintable/MainTable.java +++ b/src/main/java/net/sf/jabref/gui/maintable/MainTable.java @@ -564,7 +564,7 @@ public void actionPerformed(ActionEvent actionEvent) { private int getCellStatus(int row, int col) { try { BibEntry be = sortedForGrouping.get(row); - EntryType type = EntryTypes.getType(be.getType(), panel.getLoadedDatabase().getType()); + EntryType type = EntryTypes.getType(be.getType(), panel.getLoadedDatabase().getMode()); String columnName = getColumnName(col).toLowerCase(); if (columnName.equals(BibEntry.KEY_FIELD) || type.getRequiredFieldsFlat().contains(columnName)) { return MainTable.REQUIRED; @@ -629,7 +629,7 @@ private boolean matches(int row, Matcher m) { private boolean isComplete(int row) { try { BibEntry entry = sortedForGrouping.get(row); - TypedBibEntry typedEntry = new TypedBibEntry(entry, Optional.of(panel.database()), panel.getLoadedDatabase().getType()); + TypedBibEntry typedEntry = new TypedBibEntry(entry, Optional.of(panel.database()), panel.getLoadedDatabase().getMode()); return typedEntry.hasAllRequiredFields(); } catch (NullPointerException ex) { return true; diff --git a/src/main/java/net/sf/jabref/gui/menus/ChangeEntryTypeMenu.java b/src/main/java/net/sf/jabref/gui/menus/ChangeEntryTypeMenu.java index 5a8cc96330c..2e03ab9c5d8 100644 --- a/src/main/java/net/sf/jabref/gui/menus/ChangeEntryTypeMenu.java +++ b/src/main/java/net/sf/jabref/gui/menus/ChangeEntryTypeMenu.java @@ -1,14 +1,13 @@ package net.sf.jabref.gui.menus; import net.sf.jabref.Globals; -import net.sf.jabref.JabRefPreferences; import net.sf.jabref.bibtex.EntryTypes; import net.sf.jabref.gui.BasePanel; import net.sf.jabref.gui.actions.ChangeTypeAction; import net.sf.jabref.gui.keyboard.KeyBinding; import net.sf.jabref.logic.CustomEntryTypesManager; import net.sf.jabref.logic.l10n.Localization; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.BibtexEntryTypes; import net.sf.jabref.model.entry.EntryType; import net.sf.jabref.model.entry.IEEETranEntryTypes; @@ -50,8 +49,8 @@ private void populateChangeEntryTypeMenu(JMenu menu, BasePanel panel) { // biblatex? if(panel.getLoadedDatabase().isBiblatexMode()) { - for (String key : EntryTypes.getAllTypes(BibDatabaseType.BIBLATEX)) { - menu.add(new ChangeTypeAction(EntryTypes.getType(key, BibDatabaseType.BIBLATEX), panel)); + for (String key : EntryTypes.getAllTypes(BibDatabaseMode.BIBLATEX)) { + menu.add(new ChangeTypeAction(EntryTypes.getType(key, BibDatabaseMode.BIBLATEX), panel)); } } else { // Bibtex diff --git a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java b/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java index 61a926223f4..1499f8993cc 100644 --- a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java +++ b/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java @@ -25,7 +25,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -68,7 +68,7 @@ public class MergeEntries { private final BibEntry mergedEntry = new BibEntry(); private final BibEntry one; private final BibEntry two; - private final BibDatabaseType type; + private final BibDatabaseMode type; private JTextArea jta; private PreviewPanel pp; private Boolean doneBuilding = false; @@ -86,7 +86,7 @@ public class MergeEntries { * @param bOne First entry * @param bTwo Second entry */ - public MergeEntries(BibEntry bOne, BibEntry bTwo, BibDatabaseType type) { + public MergeEntries(BibEntry bOne, BibEntry bTwo, BibDatabaseMode type) { one = bOne; two = bTwo; this.type = type; @@ -101,7 +101,7 @@ public MergeEntries(BibEntry bOne, BibEntry bTwo, BibDatabaseType type) { * @param headingOne Heading for first entry * @param headingTwo Heading for second entry */ - public MergeEntries(BibEntry bOne, BibEntry bTwo, String headingOne, String headingTwo, BibDatabaseType type) { + public MergeEntries(BibEntry bOne, BibEntry bTwo, String headingOne, String headingTwo, BibDatabaseMode type) { columnHeadings[1] = headingOne; columnHeadings[5] = headingTwo; one = bOne; diff --git a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntriesDialog.java b/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntriesDialog.java index 59756b70bd3..feba34221dc 100644 --- a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntriesDialog.java +++ b/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntriesDialog.java @@ -85,7 +85,7 @@ private void init(BibEntry[] selected) { one = selected[0]; two = selected[1]; - mergeEntries = new MergeEntries(one, two, panel.getLoadedDatabase().getType()); + mergeEntries = new MergeEntries(one, two, panel.getLoadedDatabase().getMode()); // Create undo-compound ce = new NamedCompound(MERGE_ENTRIES); diff --git a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntryDOIDialog.java b/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntryDOIDialog.java index 9b89e079070..4055400ef61 100644 --- a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntryDOIDialog.java +++ b/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntryDOIDialog.java @@ -93,7 +93,7 @@ public MergeEntryDOIDialog(BasePanel panel) { */ private void init() { mergeEntries = new MergeEntries(this.originalEntry, this.doiEntry, Localization.lang("Original entry"), - Localization.lang("Entry from DOI"), panel.getLoadedDatabase().getType()); + Localization.lang("Entry from DOI"), panel.getLoadedDatabase().getMode()); // Create undo-compound ce = new NamedCompound(Localization.lang("Merge from DOI")); diff --git a/src/main/java/net/sf/jabref/gui/util/FirstColumnComparator.java b/src/main/java/net/sf/jabref/gui/util/FirstColumnComparator.java index 26d87f94712..9d536d6f4d5 100644 --- a/src/main/java/net/sf/jabref/gui/util/FirstColumnComparator.java +++ b/src/main/java/net/sf/jabref/gui/util/FirstColumnComparator.java @@ -19,8 +19,6 @@ import java.util.Optional; import net.sf.jabref.LoadedDatabase; -import net.sf.jabref.bibtex.EntryTypes; -import net.sf.jabref.model.database.BibDatabase; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.TypedBibEntry; @@ -37,8 +35,8 @@ public int compare(BibEntry e1, BibEntry e2) { int score1 = 0; int score2 = 0; - TypedBibEntry typedEntry1 = new TypedBibEntry(e1, Optional.of(database.getDatabase()), database.getType()); - TypedBibEntry typedEntry2 = new TypedBibEntry(e2, Optional.of(database.getDatabase()), database.getType()); + TypedBibEntry typedEntry1 = new TypedBibEntry(e1, Optional.of(database.getDatabase()), database.getMode()); + TypedBibEntry typedEntry2 = new TypedBibEntry(e2, Optional.of(database.getDatabase()), database.getMode()); if (typedEntry1.hasAllRequiredFields()) { score1++; } diff --git a/src/main/java/net/sf/jabref/gui/worker/SendAsEMailAction.java b/src/main/java/net/sf/jabref/gui/worker/SendAsEMailAction.java index fd96028242b..7297fd57556 100644 --- a/src/main/java/net/sf/jabref/gui/worker/SendAsEMailAction.java +++ b/src/main/java/net/sf/jabref/gui/worker/SendAsEMailAction.java @@ -84,7 +84,7 @@ public void run() { for (BibEntry entry : bes) { try { - bibtexEntryWriter.write(entry, sw, panel.getLoadedDatabase().getType()); + bibtexEntryWriter.write(entry, sw, panel.getLoadedDatabase().getMode()); } catch (IOException e) { LOGGER.warn("Problem creating Bibtex file for mailing.", e); } diff --git a/src/main/java/net/sf/jabref/importer/CheckForNewEntryTypesAction.java b/src/main/java/net/sf/jabref/importer/CheckForNewEntryTypesAction.java index c0fe9a7af05..d6cd788c30f 100644 --- a/src/main/java/net/sf/jabref/importer/CheckForNewEntryTypesAction.java +++ b/src/main/java/net/sf/jabref/importer/CheckForNewEntryTypesAction.java @@ -22,7 +22,7 @@ import net.sf.jabref.LoadedDatabase; import net.sf.jabref.gui.BasePanel; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.CustomEntryType; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.bibtex.EntryTypes; @@ -36,7 +36,7 @@ public class CheckForNewEntryTypesAction implements PostOpenAction { @Override public boolean isActionNecessary(ParserResult pr) { - BibDatabaseType type = new LoadedDatabase(pr.getDatabase(), pr.getMetaData()).getType(); + BibDatabaseMode type = new LoadedDatabase(pr.getDatabase(), pr.getMetaData()).getMode(); // See if any custom entry types were imported, but disregard those we already know: for (Iterator i = pr.getEntryTypes().keySet().iterator(); i.hasNext();) { String typeName = i.next().toLowerCase(); diff --git a/src/main/java/net/sf/jabref/logic/CustomEntryTypesManager.java b/src/main/java/net/sf/jabref/logic/CustomEntryTypesManager.java index 5cdd16ecc77..e028fd4531a 100644 --- a/src/main/java/net/sf/jabref/logic/CustomEntryTypesManager.java +++ b/src/main/java/net/sf/jabref/logic/CustomEntryTypesManager.java @@ -2,7 +2,7 @@ import net.sf.jabref.Globals; import net.sf.jabref.JabRefPreferences; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.CustomEntryType; import net.sf.jabref.bibtex.EntryTypes; import net.sf.jabref.model.entry.EntryType; @@ -39,11 +39,11 @@ public static void loadCustomEntryTypes(JabRefPreferences prefs) { * JabRefFrame when the program closes. */ public static void saveCustomEntryTypes(JabRefPreferences prefs) { - Iterator iterator = EntryTypes.getAllTypes(BibDatabaseType.BIBTEX).iterator(); + Iterator iterator = EntryTypes.getAllTypes(BibDatabaseMode.BIBTEX).iterator(); int number = 0; while (iterator.hasNext()) { - EntryType entryType = EntryTypes.getType(iterator.next(), BibDatabaseType.BIBTEX); + EntryType entryType = EntryTypes.getType(iterator.next(), BibDatabaseMode.BIBTEX); if (entryType instanceof CustomEntryType) { // Store this entry type. prefs.storeCustomEntryType((CustomEntryType) entryType, number); diff --git a/src/main/java/net/sf/jabref/logic/xmp/XMPUtil.java b/src/main/java/net/sf/jabref/logic/xmp/XMPUtil.java index 76ffa18e4a5..a9f2903ff6c 100644 --- a/src/main/java/net/sf/jabref/logic/xmp/XMPUtil.java +++ b/src/main/java/net/sf/jabref/logic/xmp/XMPUtil.java @@ -22,12 +22,11 @@ import javax.xml.transform.TransformerException; import net.sf.jabref.*; -import net.sf.jabref.bibtex.EntryTypes; import net.sf.jabref.exporter.LatexFieldFormatter; import net.sf.jabref.importer.fileformat.BibtexParser; import net.sf.jabref.importer.ParserResult; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.*; import net.sf.jabref.bibtex.BibEntryWriter; import net.sf.jabref.model.database.BibDatabase; @@ -865,7 +864,7 @@ private static void writeToDCSchema(XMPSchemaDublinCore dcSchema, * * Bibtex-Fields used: title */ - TypedBibEntry typedEntry = new TypedBibEntry(entry, Optional.empty(), BibDatabaseType.BIBTEX); + TypedBibEntry typedEntry = new TypedBibEntry(entry, Optional.empty(), BibDatabaseMode.BIBTEX); String o = typedEntry.getTypeForDisplay(); if (o != null) { dcSchema.addType(o); @@ -1180,7 +1179,7 @@ public static void main(String[] args) throws IOException, for (BibEntry entry : l) { StringWriter sw = new StringWriter(); - bibtexEntryWriter.write(entry, sw, BibDatabaseType.BIBTEX); + bibtexEntryWriter.write(entry, sw, BibDatabaseMode.BIBTEX); System.out.println(sw.getBuffer()); } diff --git a/src/main/java/net/sf/jabref/model/DuplicateCheck.java b/src/main/java/net/sf/jabref/model/DuplicateCheck.java index 160dcb52266..7e8a5e84cc4 100644 --- a/src/main/java/net/sf/jabref/model/DuplicateCheck.java +++ b/src/main/java/net/sf/jabref/model/DuplicateCheck.java @@ -16,7 +16,7 @@ package net.sf.jabref.model; import net.sf.jabref.bibtex.EntryTypes; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.AuthorList; import net.sf.jabref.model.database.BibDatabase; import net.sf.jabref.model.entry.BibEntry; @@ -73,13 +73,13 @@ public class DuplicateCheck { * @param two BibEntry * @return boolean */ - public static boolean isDuplicate(BibEntry one, BibEntry two, BibDatabaseType bibDatabaseType) { + public static boolean isDuplicate(BibEntry one, BibEntry two, BibDatabaseMode bibDatabaseMode) { // First check if they are of the same type - a necessary condition: if (!one.getType().equals(two.getType())) { return false; } - EntryType type = EntryTypes.getType(one.getType(), bibDatabaseType); + EntryType type = EntryTypes.getType(one.getType(), bibDatabaseMode); // The check if they have the same required fields: java.util.List var = type.getRequiredFieldsFlat(); @@ -215,9 +215,9 @@ public static double compareEntriesStrictly(BibEntry one, BibEntry two) { * @param entry The entry of which we are looking for duplicates. * @return The first duplicate entry found. null if no duplicates are found. */ - public static Optional containsDuplicate(BibDatabase database, BibEntry entry, BibDatabaseType bibDatabaseType) { + public static Optional containsDuplicate(BibDatabase database, BibEntry entry, BibDatabaseMode bibDatabaseMode) { for (BibEntry other : database.getEntries()) { - if (DuplicateCheck.isDuplicate(entry, other, bibDatabaseType)) { + if (DuplicateCheck.isDuplicate(entry, other, bibDatabaseMode)) { return Optional.of(other); // Duplicate found. } } diff --git a/src/main/java/net/sf/jabref/model/database/BibDatabase.java b/src/main/java/net/sf/jabref/model/database/BibDatabase.java index 1564d4a88c4..55f60fbccac 100644 --- a/src/main/java/net/sf/jabref/model/database/BibDatabase.java +++ b/src/main/java/net/sf/jabref/model/database/BibDatabase.java @@ -36,7 +36,6 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import net.sf.jabref.bibtex.EntryTypes; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -67,8 +66,8 @@ public class BibDatabase { */ private final Set changeListeners = new HashSet<>(); - public BibDatabaseType getBibType() { - return BibDatabaseTypeDetection.inferType(this); + public BibDatabaseMode getBibType() { + return BibDatabaseModeDetection.inferMode(this); } /** diff --git a/src/main/java/net/sf/jabref/model/database/BibDatabaseType.java b/src/main/java/net/sf/jabref/model/database/BibDatabaseMode.java similarity index 68% rename from src/main/java/net/sf/jabref/model/database/BibDatabaseType.java rename to src/main/java/net/sf/jabref/model/database/BibDatabaseMode.java index 56f7316a969..1cca335e59e 100644 --- a/src/main/java/net/sf/jabref/model/database/BibDatabaseType.java +++ b/src/main/java/net/sf/jabref/model/database/BibDatabaseMode.java @@ -1,6 +1,6 @@ package net.sf.jabref.model.database; -public enum BibDatabaseType { +public enum BibDatabaseMode { BIBTEX, BIBLATEX } diff --git a/src/main/java/net/sf/jabref/model/database/BibDatabaseTypeDetection.java b/src/main/java/net/sf/jabref/model/database/BibDatabaseModeDetection.java similarity index 93% rename from src/main/java/net/sf/jabref/model/database/BibDatabaseTypeDetection.java rename to src/main/java/net/sf/jabref/model/database/BibDatabaseModeDetection.java index aff9425aa23..465c53fc1c3 100644 --- a/src/main/java/net/sf/jabref/model/database/BibDatabaseTypeDetection.java +++ b/src/main/java/net/sf/jabref/model/database/BibDatabaseModeDetection.java @@ -9,7 +9,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -public class BibDatabaseTypeDetection { +public class BibDatabaseModeDetection { private static final List bibtex = BibtexEntryTypes.ALL; private static final List biblatex = BibLatexEntryTypes.ALL; private static final List exclusiveBiblatex = filterEntryTypes(biblatex, isNotIncludedIn(bibtex)); @@ -27,19 +27,19 @@ public class BibDatabaseTypeDetection { * @param database a BibDatabase database * @return the inferred database type */ - public static BibDatabaseType inferType(BibDatabase database) { + public static BibDatabaseMode inferMode(BibDatabase database) { final List entryTypes = getEntryTypes(database.getEntries()); // type-based check if (entryTypes.stream().anyMatch(isIncludedIn(exclusiveBiblatex))) { - return BibDatabaseType.BIBLATEX; + return BibDatabaseMode.BIBLATEX; } else { // field-based check if(database.getEntries().stream().anyMatch(hasBiblatexFields())) { - return BibDatabaseType.BIBLATEX; + return BibDatabaseMode.BIBLATEX; } } - return BibDatabaseType.BIBTEX; + return BibDatabaseMode.BIBTEX; } private static List exclusiveBiblatexFields(String type) { diff --git a/src/main/java/net/sf/jabref/model/entry/BibEntry.java b/src/main/java/net/sf/jabref/model/entry/BibEntry.java index fc15a4a176b..ef458cc6dc6 100644 --- a/src/main/java/net/sf/jabref/model/entry/BibEntry.java +++ b/src/main/java/net/sf/jabref/model/entry/BibEntry.java @@ -34,13 +34,11 @@ import java.util.Set; import java.util.TreeSet; -import net.sf.jabref.model.database.BibDatabaseType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.google.common.base.Strings; -import net.sf.jabref.bibtex.EntryTypes; import net.sf.jabref.model.database.BibDatabase; public class BibEntry { diff --git a/src/main/java/net/sf/jabref/model/entry/TypedBibEntry.java b/src/main/java/net/sf/jabref/model/entry/TypedBibEntry.java index a4dbe41c0a7..0156924d02b 100644 --- a/src/main/java/net/sf/jabref/model/entry/TypedBibEntry.java +++ b/src/main/java/net/sf/jabref/model/entry/TypedBibEntry.java @@ -17,7 +17,7 @@ import net.sf.jabref.bibtex.EntryTypes; import net.sf.jabref.model.database.BibDatabase; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import java.util.Objects; import java.util.Optional; @@ -26,13 +26,13 @@ public class TypedBibEntry { private final BibEntry entry; private final Optional database; - private final BibDatabaseType type; + private final BibDatabaseMode type; - public TypedBibEntry(BibEntry entry, BibDatabaseType type) { + public TypedBibEntry(BibEntry entry, BibDatabaseMode type) { this(entry, Optional.empty(), type); } - public TypedBibEntry(BibEntry entry, Optional database, BibDatabaseType type) { + public TypedBibEntry(BibEntry entry, Optional database, BibDatabaseMode type) { this.entry = Objects.requireNonNull(entry); this.database = Objects.requireNonNull(database); this.type = type; diff --git a/src/main/java/net/sf/jabref/sql/exporter/DBExporter.java b/src/main/java/net/sf/jabref/sql/exporter/DBExporter.java index 2c3a45b5994..e710f30d4fe 100644 --- a/src/main/java/net/sf/jabref/sql/exporter/DBExporter.java +++ b/src/main/java/net/sf/jabref/sql/exporter/DBExporter.java @@ -29,7 +29,7 @@ import javax.swing.JOptionPane; import net.sf.jabref.LoadedDatabase; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -83,7 +83,7 @@ private void performExport(final BibDatabase database, final MetaData metaData, final int database_id = getDatabaseIDByName(metaData, out, dbName); removeAllRecordsForAGivenDB(out, database_id); - populateEntryTypesTable(out, new LoadedDatabase(database, metaData).getType()); + populateEntryTypesTable(out, new LoadedDatabase(database, metaData).getMode()); populateEntriesTable(database_id, entries, out); populateStringTable(database, out, database_id); populateGroupTypesTable(out); @@ -191,7 +191,7 @@ private int populateEntryGroupsTable(GroupTreeNode cursor, int parentID, int cur * @param type */ - private void populateEntryTypesTable(Object out, BibDatabaseType type) throws SQLException { + private void populateEntryTypesTable(Object out, BibDatabaseMode type) throws SQLException { List fieldRequirement = new ArrayList<>(); List existentTypes = new ArrayList<>(); diff --git a/src/main/java/net/sf/jabref/sql/importer/DBImporter.java b/src/main/java/net/sf/jabref/sql/importer/DBImporter.java index d3697ac654a..66aca1022d4 100644 --- a/src/main/java/net/sf/jabref/sql/importer/DBImporter.java +++ b/src/main/java/net/sf/jabref/sql/importer/DBImporter.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; import net.sf.jabref.bibtex.EntryTypes; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -80,7 +80,7 @@ public abstract class DBImporter extends DBImporterExporter { * BibDatabase, a MetaData and a String with the bib database name stored in the DBMS * @throws Exception */ - public List performImport(DBStrings dbs, List listOfDBs, BibDatabaseType type) throws Exception { + public List performImport(DBStrings dbs, List listOfDBs, BibDatabaseMode type) throws Exception { List result = new ArrayList<>(); try (Connection conn = this.connectToDB(dbs)) { diff --git a/src/main/java/net/sf/jabref/sql/importer/DbImportAction.java b/src/main/java/net/sf/jabref/sql/importer/DbImportAction.java index bca1171a299..af372d98dbe 100644 --- a/src/main/java/net/sf/jabref/sql/importer/DbImportAction.java +++ b/src/main/java/net/sf/jabref/sql/importer/DbImportAction.java @@ -157,7 +157,7 @@ private void performImport() { importer.removeDB(dialogo, dbName, conn, metaData); performImport(); } else if (dialogo.moreThanOne) { - databases = importer.performImport(dbs, dialogo.listOfDBs, frame.getCurrentBasePanel().getLoadedDatabase().getType()); + databases = importer.performImport(dbs, dialogo.listOfDBs, frame.getCurrentBasePanel().getLoadedDatabase().getMode()); for (DBImporterResult res : databases) { database = res.getDatabase(); metaData = res.getMetaData(); diff --git a/src/main/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java b/src/main/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java index d1440d33392..54f05601ce6 100644 --- a/src/main/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java +++ b/src/main/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java @@ -502,7 +502,7 @@ private boolean parseWithFreeCiteAndAddEntries() { private void updateSourceView() { StringWriter sw = new StringWriter(200); try { - new BibEntryWriter(new LatexFieldFormatter(), false).write(entry, sw, frame.getCurrentBasePanel().getLoadedDatabase().getType()); + new BibEntryWriter(new LatexFieldFormatter(), false).write(entry, sw, frame.getCurrentBasePanel().getLoadedDatabase().getMode()); String srcString = sw.getBuffer().toString(); preview.setText(srcString); } catch (IOException ignored) { @@ -514,7 +514,7 @@ private void updateSourceView() { private String[] getAllFields() { ArrayList f = new ArrayList<>(); - EntryType type = EntryTypes.getType(entry.getType(), frame.getCurrentBasePanel().getLoadedDatabase().getType()); + EntryType type = EntryTypes.getType(entry.getType(), frame.getCurrentBasePanel().getLoadedDatabase().getMode()); List req = type.getRequiredFieldsFlat(); List opt = type.getOptionalFields(); List allFields = BibtexFields.getAllFieldNames(); diff --git a/src/test/java/net/sf/jabref/LoadedDatabaseTest.java b/src/test/java/net/sf/jabref/LoadedDatabaseTest.java index 601554aae86..760cf134095 100644 --- a/src/test/java/net/sf/jabref/LoadedDatabaseTest.java +++ b/src/test/java/net/sf/jabref/LoadedDatabaseTest.java @@ -1,7 +1,7 @@ package net.sf.jabref; import net.sf.jabref.model.database.BibDatabase; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import org.junit.Test; import static org.junit.Assert.*; @@ -11,11 +11,11 @@ public class LoadedDatabaseTest { @Test public void testReadWriteType() { LoadedDatabase loadedDatabase = new LoadedDatabase(new BibDatabase(), new MetaData()); - loadedDatabase.setType(BibDatabaseType.BIBLATEX); - assertEquals(BibDatabaseType.BIBLATEX, loadedDatabase.getType()); + loadedDatabase.setMode(BibDatabaseMode.BIBLATEX); + assertEquals(BibDatabaseMode.BIBLATEX, loadedDatabase.getMode()); - loadedDatabase.setType(BibDatabaseType.BIBTEX); - assertEquals(BibDatabaseType.BIBTEX, loadedDatabase.getType()); + loadedDatabase.setMode(BibDatabaseMode.BIBTEX); + assertEquals(BibDatabaseMode.BIBTEX, loadedDatabase.getMode()); } } diff --git a/src/test/java/net/sf/jabref/bibtex/BibEntryWriterTest.java b/src/test/java/net/sf/jabref/bibtex/BibEntryWriterTest.java index 64a5fa9420b..ee0f969cd67 100644 --- a/src/test/java/net/sf/jabref/bibtex/BibEntryWriterTest.java +++ b/src/test/java/net/sf/jabref/bibtex/BibEntryWriterTest.java @@ -5,7 +5,7 @@ import net.sf.jabref.exporter.LatexFieldFormatter; import net.sf.jabref.importer.ParserResult; import net.sf.jabref.importer.fileformat.BibtexParser; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.BibEntry; import org.junit.AfterClass; @@ -55,7 +55,7 @@ public void testSerialization() throws IOException { entry.setField("number", "1"); entry.setField("note", "some note"); - writer.write(entry, stringWriter, BibDatabaseType.BIBTEX); + writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX); String actual = stringWriter.toString(); @@ -97,7 +97,7 @@ public void roundTripTest() throws IOException { //write out bibtex string StringWriter stringWriter = new StringWriter(); - writer.write(entry, stringWriter, BibDatabaseType.BIBTEX); + writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX); String actual = stringWriter.toString(); assertEquals(bibtexEntry, actual); @@ -129,7 +129,7 @@ public void roundTripWithPrependingNewlines() throws IOException { //write out bibtex string StringWriter stringWriter = new StringWriter(); - writer.write(entry, stringWriter, BibDatabaseType.BIBTEX); + writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX); String actual = stringWriter.toString(); assertEquals(bibtexEntry, actual); @@ -165,7 +165,7 @@ public void roundTripWithModification() throws IOException { // write out bibtex string StringWriter stringWriter = new StringWriter(); - writer.write(entry, stringWriter, BibDatabaseType.BIBTEX); + writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX); String actual = stringWriter.toString(); // @formatter:off @@ -211,7 +211,7 @@ public void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() thr //write out bibtex string StringWriter stringWriter = new StringWriter(); - writer.write(entry, stringWriter, BibDatabaseType.BIBTEX); + writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX); String actual = stringWriter.toString(); // @formatter:off @@ -252,7 +252,7 @@ public void roundTripWithAppendedNewlines() throws IOException { //write out bibtex string StringWriter stringWriter = new StringWriter(); - writer.write(entry, stringWriter, BibDatabaseType.BIBTEX); + writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX); String actual = stringWriter.toString(); //appending newlines are not written by the writer, but by FileActions. So, these should be removed here. @@ -293,7 +293,7 @@ private String testSingleWrite(String bibtexEntry) throws IOException { //write out bibtex string StringWriter stringWriter = new StringWriter(); - writer.write(entry, stringWriter, BibDatabaseType.BIBTEX); + writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX); String actual = stringWriter.toString(); assertEquals(bibtexEntry, actual); @@ -325,7 +325,7 @@ public void monthFieldSpecialSyntax() throws IOException { //write out bibtex string StringWriter stringWriter = new StringWriter(); - writer.write(entry, stringWriter, BibDatabaseType.BIBTEX); + writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX); String actual = stringWriter.toString(); assertEquals(bibtexEntry, actual); @@ -353,7 +353,7 @@ public void addFieldWithLongerLength() throws IOException { //write out bibtex string StringWriter stringWriter = new StringWriter(); - writer.write(entry, stringWriter, BibDatabaseType.BIBTEX); + writer.write(entry, stringWriter, BibDatabaseMode.BIBTEX); String actual = stringWriter.toString(); // @formatter:off diff --git a/src/test/java/net/sf/jabref/bibtex/DuplicateCheckTest.java b/src/test/java/net/sf/jabref/bibtex/DuplicateCheckTest.java index f055e5de399..77bbafa351d 100644 --- a/src/test/java/net/sf/jabref/bibtex/DuplicateCheckTest.java +++ b/src/test/java/net/sf/jabref/bibtex/DuplicateCheckTest.java @@ -3,7 +3,7 @@ import net.sf.jabref.Globals; import net.sf.jabref.JabRefPreferences; import net.sf.jabref.model.DuplicateCheck; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.IdGenerator; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.BibtexEntryTypes; @@ -35,14 +35,14 @@ public void testDuplicateDetection() { one.setField("author", "Billy Bob"); two.setField("author", "Billy Bob"); - Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseType.BIBTEX)); + Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseMode.BIBTEX)); two.setField("author", "James Joyce"); - Assert.assertFalse(DuplicateCheck.isDuplicate(one, two, BibDatabaseType.BIBTEX)); + Assert.assertFalse(DuplicateCheck.isDuplicate(one, two, BibDatabaseMode.BIBTEX)); two.setField("author", "Billy Bob"); two.setType(BibtexEntryTypes.BOOK); - Assert.assertFalse(DuplicateCheck.isDuplicate(one, two, BibDatabaseType.BIBTEX)); + Assert.assertFalse(DuplicateCheck.isDuplicate(one, two, BibDatabaseMode.BIBTEX)); two.setType(BibtexEntryTypes.ARTICLE); one.setField("year", "2005"); @@ -51,11 +51,11 @@ public void testDuplicateDetection() { two.setField("title", "A title"); one.setField("journal", "A"); two.setField("journal", "A"); - Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseType.BIBTEX)); + Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseMode.BIBTEX)); Assert.assertEquals(1.01, DuplicateCheck.compareEntriesStrictly(one, two), 0.01); two.setField("journal", "B"); - Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseType.BIBTEX)); + Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseMode.BIBTEX)); Assert.assertEquals(0.75, DuplicateCheck.compareEntriesStrictly(one, two), 0.01); two.setField("journal", "A"); @@ -63,24 +63,24 @@ public void testDuplicateDetection() { two.setField("volume", "21"); one.setField("pages", "334--337"); two.setField("pages", "334--337"); - Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseType.BIBTEX)); + Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseMode.BIBTEX)); two.setField("number", "1"); one.setField("volume", "21"); - Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseType.BIBTEX)); + Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseMode.BIBTEX)); two.setField("volume", "22"); - Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseType.BIBTEX)); + Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseMode.BIBTEX)); two.setField("journal", "B"); - Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseType.BIBTEX)); + Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseMode.BIBTEX)); one.setField("journal", ""); two.setField("journal", ""); - Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseType.BIBTEX)); + Assert.assertTrue(DuplicateCheck.isDuplicate(one, two, BibDatabaseMode.BIBTEX)); two.setField("title", "Another title"); - Assert.assertFalse(DuplicateCheck.isDuplicate(one, two, BibDatabaseType.BIBTEX)); + Assert.assertFalse(DuplicateCheck.isDuplicate(one, two, BibDatabaseMode.BIBTEX)); } @Test diff --git a/src/test/java/net/sf/jabref/bibtex/EntryTypesTestBibLatex.java b/src/test/java/net/sf/jabref/bibtex/EntryTypesTestBibLatex.java index b9179532237..70c393fbdb4 100644 --- a/src/test/java/net/sf/jabref/bibtex/EntryTypesTestBibLatex.java +++ b/src/test/java/net/sf/jabref/bibtex/EntryTypesTestBibLatex.java @@ -2,7 +2,7 @@ import static org.junit.Assert.*; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -34,21 +34,21 @@ public void tearDown() throws Exception { public void testBibLatexMode() { // BibLatex mode EntryTypes biblatexentrytypes = new EntryTypes(); - assertEquals(BibLatexEntryTypes.ARTICLE, biblatexentrytypes.getType("article", BibDatabaseType.BIBLATEX)); - assertNull(biblatexentrytypes.getType("aaaaarticle", BibDatabaseType.BIBLATEX)); - assertNull(biblatexentrytypes.getStandardType("aaaaarticle", BibDatabaseType.BIBLATEX)); - assertEquals(34, biblatexentrytypes.getAllValues(BibDatabaseType.BIBLATEX).size()); - assertEquals(34, biblatexentrytypes.getAllTypes(BibDatabaseType.BIBLATEX).size()); + assertEquals(BibLatexEntryTypes.ARTICLE, biblatexentrytypes.getType("article", BibDatabaseMode.BIBLATEX)); + assertNull(biblatexentrytypes.getType("aaaaarticle", BibDatabaseMode.BIBLATEX)); + assertNull(biblatexentrytypes.getStandardType("aaaaarticle", BibDatabaseMode.BIBLATEX)); + assertEquals(34, biblatexentrytypes.getAllValues(BibDatabaseMode.BIBLATEX).size()); + assertEquals(34, biblatexentrytypes.getAllTypes(BibDatabaseMode.BIBLATEX).size()); - biblatexentrytypes.removeType("article", BibDatabaseType.BIBLATEX); + biblatexentrytypes.removeType("article", BibDatabaseMode.BIBLATEX); // Should not be possible to remove a standard type - assertEquals(BibLatexEntryTypes.ARTICLE, biblatexentrytypes.getType("article", BibDatabaseType.BIBLATEX)); + assertEquals(BibLatexEntryTypes.ARTICLE, biblatexentrytypes.getType("article", BibDatabaseMode.BIBLATEX)); } @Test public void defaultType() { EntryTypes types = new EntryTypes(); - assertEquals(BibLatexEntryTypes.MISC, types.getTypeOrDefault("unknowntype", BibDatabaseType.BIBLATEX)); + assertEquals(BibLatexEntryTypes.MISC, types.getTypeOrDefault("unknowntype", BibDatabaseMode.BIBLATEX)); } diff --git a/src/test/java/net/sf/jabref/bibtex/EntryTypesTestBibtex.java b/src/test/java/net/sf/jabref/bibtex/EntryTypesTestBibtex.java index 16f14515f5e..c510b2ed85e 100644 --- a/src/test/java/net/sf/jabref/bibtex/EntryTypesTestBibtex.java +++ b/src/test/java/net/sf/jabref/bibtex/EntryTypesTestBibtex.java @@ -4,7 +4,7 @@ import java.util.ArrayList; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -36,11 +36,11 @@ public void testBibtexMode() { // Bibtex mode EntryTypes bibtexentrytypes = new EntryTypes(); - assertEquals(BibtexEntryTypes.ARTICLE, bibtexentrytypes.getType("article", BibDatabaseType.BIBTEX)); - assertNull(bibtexentrytypes.getType("aaaaarticle", BibDatabaseType.BIBTEX)); - assertNull(bibtexentrytypes.getStandardType("aaaaarticle", BibDatabaseType.BIBTEX)); - assertEquals(19, bibtexentrytypes.getAllValues(BibDatabaseType.BIBTEX).size()); - assertEquals(19, bibtexentrytypes.getAllTypes(BibDatabaseType.BIBTEX).size()); + assertEquals(BibtexEntryTypes.ARTICLE, bibtexentrytypes.getType("article", BibDatabaseMode.BIBTEX)); + assertNull(bibtexentrytypes.getType("aaaaarticle", BibDatabaseMode.BIBTEX)); + assertNull(bibtexentrytypes.getStandardType("aaaaarticle", BibDatabaseMode.BIBTEX)); + assertEquals(19, bibtexentrytypes.getAllValues(BibDatabaseMode.BIBTEX).size()); + assertEquals(19, bibtexentrytypes.getAllTypes(BibDatabaseMode.BIBTEX).size()); // Edit the "article" entry type ArrayList requiredFields = new ArrayList<>(BibtexEntryTypes.ARTICLE.getRequiredFields()); @@ -51,18 +51,18 @@ public void testBibtexMode() { bibtexentrytypes.addOrModifyCustomEntryType(newArticle); // Should not be the same any more - assertNotEquals(BibtexEntryTypes.ARTICLE, bibtexentrytypes.getType("article", BibDatabaseType.BIBTEX)); + assertNotEquals(BibtexEntryTypes.ARTICLE, bibtexentrytypes.getType("article", BibDatabaseMode.BIBTEX)); // Remove the custom "article" entry type, which should restore the original - bibtexentrytypes.removeType("article", BibDatabaseType.BIBTEX); + bibtexentrytypes.removeType("article", BibDatabaseMode.BIBTEX); // Should not be possible to remove a standard type - assertEquals(BibtexEntryTypes.ARTICLE, bibtexentrytypes.getType("article", BibDatabaseType.BIBTEX)); + assertEquals(BibtexEntryTypes.ARTICLE, bibtexentrytypes.getType("article", BibDatabaseMode.BIBTEX)); } @Test public void defaultType() { EntryTypes types = new EntryTypes(); - assertEquals(BibtexEntryTypes.MISC, types.getTypeOrDefault("unknowntype", BibDatabaseType.BIBTEX)); + assertEquals(BibtexEntryTypes.MISC, types.getTypeOrDefault("unknowntype", BibDatabaseMode.BIBTEX)); } } diff --git a/src/test/java/net/sf/jabref/importer/fileformat/MedlinePlainImporterTest.java b/src/test/java/net/sf/jabref/importer/fileformat/MedlinePlainImporterTest.java index 3de3defc297..64071cc607c 100644 --- a/src/test/java/net/sf/jabref/importer/fileformat/MedlinePlainImporterTest.java +++ b/src/test/java/net/sf/jabref/importer/fileformat/MedlinePlainImporterTest.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -175,7 +175,7 @@ public void testAllArticleTypes() throws IOException { List actualEntries = importer.importEntries(stream, new OutputPrinterToNull()); BibEntry expectedEntry = new BibEntry(); - expectedEntry.setType(EntryTypes.getType("article", BibDatabaseType.BIBTEX)); + expectedEntry.setType(EntryTypes.getType("article", BibDatabaseMode.BIBTEX)); BibtexEntryAssert.assertEquals(Arrays.asList(expectedEntry), actualEntries); } } diff --git a/src/test/java/net/sf/jabref/model/database/BibDatabaseTypeDetectionTest.java b/src/test/java/net/sf/jabref/model/database/BibDatabaseModeDetectionTest.java similarity index 77% rename from src/test/java/net/sf/jabref/model/database/BibDatabaseTypeDetectionTest.java rename to src/test/java/net/sf/jabref/model/database/BibDatabaseModeDetectionTest.java index 1ed3532adfb..935e7544a2e 100644 --- a/src/test/java/net/sf/jabref/model/database/BibDatabaseTypeDetectionTest.java +++ b/src/test/java/net/sf/jabref/model/database/BibDatabaseModeDetectionTest.java @@ -12,12 +12,12 @@ import static org.junit.Assert.*; -public class BibDatabaseTypeDetectionTest { +public class BibDatabaseModeDetectionTest { @Test public void detectBiblatex() { Collection entries = Arrays.asList(new BibEntry("someid", BibLatexEntryTypes.MVBOOK.getName())); - assertEquals(BibDatabaseType.BIBLATEX, BibDatabaseTypeDetection.inferType(BibDatabases.createDatabase(entries))); + assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries))); } @Test @@ -26,7 +26,7 @@ public void detectBiblatexBasedOnFields() { entry.setField("translator", "Stefan Kolb"); Collection entries = Arrays.asList(entry); - assertEquals(BibDatabaseType.BIBLATEX, BibDatabaseTypeDetection.inferType(BibDatabases.createDatabase(entries))); + assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries))); } @Test @@ -35,7 +35,7 @@ public void detectBibtexBasedOnFields() { entry.setField("journal", "IEEE Trans. Services Computing"); Collection entries = Arrays.asList(entry); - assertEquals(BibDatabaseType.BIBTEX, BibDatabaseTypeDetection.inferType(BibDatabases.createDatabase(entries))); + assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries))); } @Test @@ -44,7 +44,7 @@ public void detectUndistinguishableAsBibtex() { entry.setField("title", "My cool paper"); Collection entries = Arrays.asList(entry); - assertEquals(BibDatabaseType.BIBTEX, BibDatabaseTypeDetection.inferType(BibDatabases.createDatabase(entries))); + assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries))); } @Test @@ -55,7 +55,7 @@ public void detectMixedModeAsBiblatex() { biblatex.setField("translator", "Stefan Kolb"); Collection entries = Arrays.asList(bibtex, biblatex); - assertEquals(BibDatabaseType.BIBLATEX, BibDatabaseTypeDetection.inferType(BibDatabases.createDatabase(entries))); + assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries))); } @Test @@ -63,7 +63,7 @@ public void detectUnknownTypeAsBibtex() { BibEntry entry = new BibEntry("someid", new CustomEntryType("unknowntype", new ArrayList<>(0), new ArrayList<>(0)).getName()); Collection entries = Arrays.asList(entry); - assertEquals(BibDatabaseType.BIBTEX, BibDatabaseTypeDetection.inferType(BibDatabases.createDatabase(entries))); + assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries))); } @Test @@ -72,7 +72,7 @@ public void detectUnknownTypeAsBibtexBasedOnFields() { entry.setField("someunknownfield", "value"); Collection entries = Arrays.asList(entry); - assertEquals(BibDatabaseType.BIBTEX, BibDatabaseTypeDetection.inferType(BibDatabases.createDatabase(entries))); + assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries))); } @Test @@ -82,7 +82,7 @@ public void ignoreUnknownTypesForBibtexDecision() { BibEntry biblatex = new BibEntry("someid", BibLatexEntryTypes.ARTICLE.getName()); Collection entries = Arrays.asList(custom, bibtex, biblatex); - assertEquals(BibDatabaseType.BIBTEX, BibDatabaseTypeDetection.inferType(BibDatabases.createDatabase(entries))); + assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries))); } @Test @@ -96,7 +96,7 @@ public void ignoreUnknownTypesForBibtexDecisionBasedOnFields() { Collection entries = Arrays.asList(custom, bibtex, biblatex); - assertEquals(BibDatabaseType.BIBTEX, BibDatabaseTypeDetection.inferType(BibDatabases.createDatabase(entries))); + assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries))); } @Test @@ -106,7 +106,7 @@ public void ignoreUnknownTypesForBiblatexDecision() { BibEntry biblatex = new BibEntry("someid", BibLatexEntryTypes.MVBOOK.getName()); Collection entries = Arrays.asList(custom, bibtex, biblatex); - assertEquals(BibDatabaseType.BIBLATEX, BibDatabaseTypeDetection.inferType(BibDatabases.createDatabase(entries))); + assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries))); } @Test @@ -119,6 +119,6 @@ public void ignoreUnknownTypesForBiblatexDecisionBasedOnFields() { biblatex.setField("translator", "Stefan Kolb"); Collection entries = Arrays.asList(custom, bibtex, biblatex); - assertEquals(BibDatabaseType.BIBLATEX, BibDatabaseTypeDetection.inferType(BibDatabases.createDatabase(entries))); + assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries))); } } diff --git a/src/test/java/net/sf/jabref/model/entry/TypedBibEntryTest.java b/src/test/java/net/sf/jabref/model/entry/TypedBibEntryTest.java index 0291d43d07b..73cd223814c 100644 --- a/src/test/java/net/sf/jabref/model/entry/TypedBibEntryTest.java +++ b/src/test/java/net/sf/jabref/model/entry/TypedBibEntryTest.java @@ -1,6 +1,6 @@ package net.sf.jabref.model.entry; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import org.junit.Assert; import org.junit.Test; @@ -14,7 +14,7 @@ public void hasAllRequiredFieldsFail() { e.setField("title", "abc"); e.setField("journal", "abc"); - TypedBibEntry typedEntry = new TypedBibEntry(e, Optional.empty(), BibDatabaseType.BIBTEX); + TypedBibEntry typedEntry = new TypedBibEntry(e, Optional.empty(), BibDatabaseMode.BIBTEX); Assert.assertFalse(typedEntry.hasAllRequiredFields()); } @@ -26,7 +26,7 @@ public void hasAllRequiredFields() { e.setField("journal", "abc"); e.setField("year", "2015"); - TypedBibEntry typedEntry = new TypedBibEntry(e, Optional.empty(), BibDatabaseType.BIBTEX); + TypedBibEntry typedEntry = new TypedBibEntry(e, Optional.empty(), BibDatabaseMode.BIBTEX); Assert.assertTrue(typedEntry.hasAllRequiredFields()); } } diff --git a/src/test/java/net/sf/jabref/util/XMPUtilTest.java b/src/test/java/net/sf/jabref/util/XMPUtilTest.java index dd78e1428bb..f24efff6e38 100644 --- a/src/test/java/net/sf/jabref/util/XMPUtilTest.java +++ b/src/test/java/net/sf/jabref/util/XMPUtilTest.java @@ -8,7 +8,7 @@ import net.sf.jabref.logic.xmp.EncryptionNotSupportedException; import net.sf.jabref.logic.xmp.XMPSchemaBibtex; import net.sf.jabref.logic.xmp.XMPUtil; -import net.sf.jabref.model.database.BibDatabaseType; +import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.AuthorList; import net.sf.jabref.bibtex.BibEntryWriter; import net.sf.jabref.model.entry.IdGenerator; @@ -117,7 +117,7 @@ public static BibEntry bibtexString2BibtexEntry(String s) throws IOException { public static String bibtexEntry2BibtexString(BibEntry e) throws IOException { StringWriter sw = new StringWriter(); - new BibEntryWriter(new LatexFieldFormatter(), false).write(e, sw, BibDatabaseType.BIBTEX); + new BibEntryWriter(new LatexFieldFormatter(), false).write(e, sw, BibDatabaseMode.BIBTEX); return sw.getBuffer().toString(); }