diff --git a/src/main/java/net/sf/jabref/cli/ArgumentProcessor.java b/src/main/java/net/sf/jabref/cli/ArgumentProcessor.java index 3739a674bc2..f7c095fa60a 100644 --- a/src/main/java/net/sf/jabref/cli/ArgumentProcessor.java +++ b/src/main/java/net/sf/jabref/cli/ArgumentProcessor.java @@ -44,11 +44,9 @@ import net.sf.jabref.model.Defaults; import net.sf.jabref.model.database.BibDatabase; import net.sf.jabref.model.database.BibDatabaseContext; -import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.metadata.MetaData; import net.sf.jabref.model.strings.StringUtil; -import net.sf.jabref.preferences.JabRefPreferences; import net.sf.jabref.preferences.SearchPreferences; import net.sf.jabref.shared.prefs.SharedDatabasePreferences; @@ -299,8 +297,7 @@ private boolean generateAux(List loaded, String[] data) { System.out.println(Localization.lang("Saving") + ": " + subName); SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs); BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new); - Defaults defaults = new Defaults(BibDatabaseMode - .fromPreference(Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE))); + Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode()); SaveSession session = databaseWriter.saveDatabase(new BibDatabaseContext(newBase, defaults), prefs); // Show just a warning message if encoding did not work for all characters: @@ -338,8 +335,7 @@ private void exportFile(List loaded, String[] data) { try { System.out.println(Localization.lang("Saving") + ": " + data[0]); SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs); - Defaults defaults = new Defaults(BibDatabaseMode - .fromPreference(Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE))); + Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode()); BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter<>( FileSaveSession::new); SaveSession session = databaseWriter.saveDatabase( diff --git a/src/main/java/net/sf/jabref/collab/ChangeScanner.java b/src/main/java/net/sf/jabref/collab/ChangeScanner.java index e2aeb320134..8f04cacd95b 100644 --- a/src/main/java/net/sf/jabref/collab/ChangeScanner.java +++ b/src/main/java/net/sf/jabref/collab/ChangeScanner.java @@ -32,14 +32,12 @@ import net.sf.jabref.model.DuplicateCheck; import net.sf.jabref.model.database.BibDatabase; import net.sf.jabref.model.database.BibDatabaseContext; -import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.database.EntrySorter; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.BibtexString; import net.sf.jabref.model.entry.FieldName; import net.sf.jabref.model.groups.GroupTreeNode; import net.sf.jabref.model.metadata.MetaData; -import net.sf.jabref.preferences.JabRefPreferences; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -152,8 +150,7 @@ private void storeTempDatabase() { .withEncoding(panel.getBibDatabaseContext().getMetaData().getEncoding() .orElse(Globals.prefs.getDefaultEncoding())); - Defaults defaults = new Defaults(BibDatabaseMode - .fromPreference(Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE))); + Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode()); BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new); SaveSession ss = databaseWriter.saveDatabase(new BibDatabaseContext(databaseInTemp, metadataInTemp, defaults), prefs); ss.commit(Globals.getFileUpdateMonitor().getTempFile(panel.fileMonitorHandle())); diff --git a/src/main/java/net/sf/jabref/gui/actions/NewSubDatabaseAction.java b/src/main/java/net/sf/jabref/gui/actions/NewSubDatabaseAction.java index 20eca4b8e46..1b0932eb7a7 100644 --- a/src/main/java/net/sf/jabref/gui/actions/NewSubDatabaseAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/NewSubDatabaseAction.java @@ -12,8 +12,6 @@ import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.model.Defaults; import net.sf.jabref.model.database.BibDatabaseContext; -import net.sf.jabref.model.database.BibDatabaseMode; -import net.sf.jabref.preferences.JabRefPreferences; /** * The action concerned with generate a new (sub-)database from latex AUX file. @@ -39,8 +37,7 @@ public void actionPerformed(ActionEvent e) { dialog.setVisible(true); if (dialog.generatePressed()) { - Defaults defaults = new Defaults( - BibDatabaseMode.fromPreference(Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE))); + Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode()); BasePanel bp = new BasePanel(jabRefFrame, new BibDatabaseContext(dialog.getGenerateDB(), defaults)); jabRefFrame.addTab(bp, true); jabRefFrame.output(Localization.lang("New database created.")); diff --git a/src/main/java/net/sf/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/net/sf/jabref/gui/importer/ImportInspectionDialog.java index 3a66d938fa9..65a676de753 100644 --- a/src/main/java/net/sf/jabref/gui/importer/ImportInspectionDialog.java +++ b/src/main/java/net/sf/jabref/gui/importer/ImportInspectionDialog.java @@ -88,7 +88,6 @@ import net.sf.jabref.model.DuplicateCheck; import net.sf.jabref.model.database.BibDatabase; import net.sf.jabref.model.database.BibDatabaseContext; -import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.AuthorList; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.FieldName; @@ -705,8 +704,7 @@ private void removeEntriesToDelete(NamedCompound ce) { private void addSelectedEntries(NamedCompound ce, final List selected) { if (newDatabase) { // Create a new BasePanel for the entries: - Defaults defaults = new Defaults(BibDatabaseMode - .fromPreference(Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE))); + Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode()); panel = new BasePanel(frame, new BibDatabaseContext(defaults)); } diff --git a/src/main/java/net/sf/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java b/src/main/java/net/sf/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java index 2dd1404ec1b..d662f9058f6 100644 --- a/src/main/java/net/sf/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java +++ b/src/main/java/net/sf/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java @@ -15,7 +15,6 @@ import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.CustomEntryType; import net.sf.jabref.model.entry.EntryType; -import net.sf.jabref.preferences.JabRefPreferences; /** * This action checks whether any new custom entry types were loaded from this diff --git a/src/main/java/net/sf/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/net/sf/jabref/gui/openoffice/OpenOfficePanel.java index 39d97f685f3..b981728d63e 100644 --- a/src/main/java/net/sf/jabref/gui/openoffice/OpenOfficePanel.java +++ b/src/main/java/net/sf/jabref/gui/openoffice/OpenOfficePanel.java @@ -55,9 +55,7 @@ import net.sf.jabref.model.Defaults; import net.sf.jabref.model.database.BibDatabase; import net.sf.jabref.model.database.BibDatabaseContext; -import net.sf.jabref.model.database.BibDatabaseMode; import net.sf.jabref.model.entry.BibEntry; -import net.sf.jabref.preferences.JabRefPreferences; import com.jgoodies.forms.builder.ButtonBarBuilder; import com.jgoodies.forms.builder.FormBuilder; @@ -329,8 +327,7 @@ private void exportEntries() { Localization.lang("Unable to generate new database"), JOptionPane.ERROR_MESSAGE); } - Defaults defaults = new Defaults( - BibDatabaseMode.fromPreference(Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE))); + Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode()); BibDatabaseContext databaseContext = new BibDatabaseContext(newDatabase, defaults); this.frame.addTab(databaseContext, true); diff --git a/src/main/java/net/sf/jabref/model/database/BibDatabaseMode.java b/src/main/java/net/sf/jabref/model/database/BibDatabaseMode.java index a2b40d763d2..919eea7ca74 100644 --- a/src/main/java/net/sf/jabref/model/database/BibDatabaseMode.java +++ b/src/main/java/net/sf/jabref/model/database/BibDatabaseMode.java @@ -34,19 +34,6 @@ public BibDatabaseMode getOppositeMode() { } } - /** - * Returns the {@link BibDatabaseMode} from a given boolean. - * - * @return BIBLATEX if isBibLatex is true, else BIBTEX - */ - public static BibDatabaseMode fromPreference(boolean isBibLatex) { - if (isBibLatex) { - return BIBLATEX; - } else { - return BIBTEX; - } - } - /** * Returns the {@link BibDatabaseMode} that equals the given string. The use of capital and small letters * in the string doesn't matter.If neither "bibtex" nor "biblatex" is the given string, then an