diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java index 36ab61e5a66..8d7282788d8 100644 --- a/src/main/java/org/jabref/gui/EntryTypeView.java +++ b/src/main/java/org/jabref/gui/EntryTypeView.java @@ -21,10 +21,10 @@ import org.jabref.logic.l10n.Localization; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntryType; -import org.jabref.model.entry.BiblatexEntryTypes; -import org.jabref.model.entry.BibtexEntryTypes; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.IEEETranEntryTypes; +import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions; +import org.jabref.model.entry.types.BibtexEntryTypeDefinitions; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions; import org.jabref.preferences.JabRefPreferences; import com.airhacks.afterburner.views.ViewLoader; @@ -119,7 +119,7 @@ public void initialize() { customTitlePane.managedProperty().bind(customTitlePane.visibleProperty()); if (basePanel.getBibDatabaseContext().isBiblatexMode()) { - addEntriesToPane(biblatexPane, BiblatexEntryTypes.ALL); + addEntriesToPane(biblatexPane, BiblatexEntryTypeDefinitions.ALL); bibTexTitlePane.setVisible(false); ieeeTranTitlePane.setVisible(false); @@ -133,8 +133,8 @@ public void initialize() { } else { biblatexTitlePane.setVisible(false); - addEntriesToPane(bibTexPane, BibtexEntryTypes.ALL); - addEntriesToPane(ieeetranPane, IEEETranEntryTypes.ALL); + addEntriesToPane(bibTexPane, BibtexEntryTypeDefinitions.ALL); + addEntriesToPane(ieeetranPane, IEEETranEntryTypeDefinitions.ALL); List customTypes = Globals.entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBTEX); if (customTypes.isEmpty()) { diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index 4ce6c1c1ffc..ba6c2a02b0d 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -121,9 +121,9 @@ import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.database.shared.DatabaseLocation; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.SpecialField; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.preferences.JabRefPreferences; import org.jabref.preferences.LastFocusedTabPreferences; diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java index 76649341ab2..34c1fd863b6 100644 --- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java +++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java @@ -22,7 +22,7 @@ import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntryType; -import org.jabref.model.entry.EntryType; +import org.jabref.model.entry.types.EntryType; import org.jabref.preferences.JabRefPreferences; public class BibtexKeyPatternPanel extends Pane { diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java index 0b8acb1ea94..a0b91a914f7 100644 --- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java +++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java @@ -3,7 +3,7 @@ import javafx.scene.control.Tab; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; +import org.jabref.model.entry.types.EntryType; public abstract class EntryEditorTab extends Tab { diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java index 0ca3e863243..f1f588faca0 100644 --- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java +++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java @@ -15,13 +15,13 @@ import org.jabref.logic.integrity.FieldCheckers; import org.jabref.logic.journals.JournalAbbreviationRepository; import org.jabref.model.database.BibDatabaseContext; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.FieldProperty; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.IEEETranEntryType; import org.jabref.model.metadata.MetaData; import org.jabref.preferences.JabRefPreferences; @@ -79,7 +79,7 @@ public static FieldEditorFX getForField(final Field field, } else if (fieldProperties.contains(FieldProperty.PAGINATION)) { return new OptionEditor<>(new PaginationEditorViewModel(field, suggestionProvider, fieldCheckers)); } else if (fieldProperties.contains(FieldProperty.TYPE)) { - if (entryType.equals(StandardEntryType.Patent)) { + if (entryType.equals(IEEETranEntryType.Patent)) { return new OptionEditor<>(new PatentTypeEditorViewModel(field, suggestionProvider, fieldCheckers)); } else { return new OptionEditor<>(new TypeEditorViewModel(field, suggestionProvider, fieldCheckers)); diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java index 1df4e4213d5..7504ded4cf2 100644 --- a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java +++ b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java @@ -9,7 +9,7 @@ import org.jabref.Globals; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntryType; -import org.jabref.model.entry.EntryTypeFactory; +import org.jabref.model.entry.types.EntryTypeFactory; import org.jabref.preferences.PreferencesService; public class ImportCustomEntryTypesDialogViewModel { diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java index 05c475f2d1b..59d7a6c29cf 100644 --- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java +++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java @@ -34,9 +34,9 @@ import org.jabref.logic.l10n.Localization; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.util.FileUpdateMonitor; import org.jabref.preferences.PreferencesService; diff --git a/src/main/java/org/jabref/gui/importer/NewEntryAction.java b/src/main/java/org/jabref/gui/importer/NewEntryAction.java index 7aaa203d991..638b6ba40a5 100644 --- a/src/main/java/org/jabref/gui/importer/NewEntryAction.java +++ b/src/main/java/org/jabref/gui/importer/NewEntryAction.java @@ -11,7 +11,7 @@ import org.jabref.gui.StateManager; import org.jabref.gui.actions.SimpleCommand; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; +import org.jabref.model.entry.types.EntryType; import org.jabref.preferences.JabRefPreferences; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java index 4bb94c53b92..bf574cf411a 100644 --- a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java +++ b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java @@ -20,9 +20,9 @@ import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.BibEntryType; -import org.jabref.model.entry.BibtexEntryTypes; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.IEEETranEntryTypes; +import org.jabref.model.entry.types.BibtexEntryTypeDefinitions; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions; public class ChangeEntryTypeMenu { @@ -63,11 +63,11 @@ private void populateComplete(ObservableList items, BibEntry entry, Bi populateSubMenu(items, Localization.lang("Custom"), Globals.entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBLATEX), entry, undoManager); } else { // Default BibTeX - populateSubMenu(items, BibDatabaseMode.BIBTEX.getFormattedName(), BibtexEntryTypes.ALL, entry, undoManager); + populateSubMenu(items, BibDatabaseMode.BIBTEX.getFormattedName(), BibtexEntryTypeDefinitions.ALL, entry, undoManager); items.remove(0); // Remove separator // IEEETran - populateSubMenu(items, "IEEETran", IEEETranEntryTypes.ALL, entry, undoManager); + populateSubMenu(items, "IEEETran", IEEETranEntryTypeDefinitions.ALL, entry, undoManager); // Custom types populateSubMenu(items, Localization.lang("Custom"), Globals.entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBTEX), entry, undoManager); diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java index 159b6cae598..38990ef07c5 100644 --- a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java +++ b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java @@ -22,10 +22,10 @@ import org.jabref.logic.importer.WebFetchers; import org.jabref.logic.l10n.Localization; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml b/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml index ae24bdd63bd..7c9886d84fb 100644 --- a/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml @@ -9,9 +9,7 @@ - - diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml b/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml index 51b9eecd5e5..88344fff4ef 100644 --- a/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml @@ -7,13 +7,12 @@ + - - diff --git a/src/main/java/org/jabref/gui/preferences/FileTab.fxml b/src/main/java/org/jabref/gui/preferences/FileTab.fxml index 6596a8cee14..70c46cf4bca 100644 --- a/src/main/java/org/jabref/gui/preferences/FileTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/FileTab.fxml @@ -10,7 +10,6 @@ - diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml index 38dc07ecd0b..a58433fb82d 100644 --- a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml @@ -11,7 +11,6 @@ - diff --git a/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml b/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml index 063aca5dfb1..40b0a18537d 100644 --- a/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml @@ -4,13 +4,11 @@ + - - - diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml index 7a90f13ef60..c28ca142d01 100644 --- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml +++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml @@ -9,9 +9,7 @@ - - diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml b/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml index 2a0477e9349..f71fc84da18 100644 --- a/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml @@ -3,16 +3,13 @@ + + + - - - - - - - + diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexDialog.fxml b/src/main/java/org/jabref/gui/texparser/ParseTexDialog.fxml index ee6fa85c697..956d744f5ad 100644 --- a/src/main/java/org/jabref/gui/texparser/ParseTexDialog.fxml +++ b/src/main/java/org/jabref/gui/texparser/ParseTexDialog.fxml @@ -9,7 +9,6 @@ - diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexResult.fxml b/src/main/java/org/jabref/gui/texparser/ParseTexResult.fxml index ff8ee769fcf..68cae58e98e 100644 --- a/src/main/java/org/jabref/gui/texparser/ParseTexResult.fxml +++ b/src/main/java/org/jabref/gui/texparser/ParseTexResult.fxml @@ -6,7 +6,6 @@ - diff --git a/src/main/java/org/jabref/gui/undo/UndoableChangeType.java b/src/main/java/org/jabref/gui/undo/UndoableChangeType.java index a4f3e86a04a..23f7cf18faf 100644 --- a/src/main/java/org/jabref/gui/undo/UndoableChangeType.java +++ b/src/main/java/org/jabref/gui/undo/UndoableChangeType.java @@ -3,8 +3,8 @@ import org.jabref.logic.l10n.Localization; import org.jabref.model.FieldChange; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.EntryTypeFactory; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.EntryTypeFactory; import org.jabref.model.strings.StringUtil; /** diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java index 7533e9c7d99..8a03e9d0966 100644 --- a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java +++ b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java @@ -12,7 +12,7 @@ import org.jabref.model.database.BibDatabase; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; +import org.jabref.model.entry.types.EntryType; import org.jabref.model.strings.StringUtil; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java b/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java index bf04f2d3ff9..2c0100b5f12 100644 --- a/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java +++ b/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java @@ -40,9 +40,10 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,7 +77,7 @@ public void export(final BibDatabaseContext databaseContext, final Path resultFi bibEntry.getCiteKeyOptional().ifPresent(entry::setId); - org.jabref.model.entry.EntryType i = bibEntry.getType(); + EntryType i = bibEntry.getType(); if (StandardEntryType.Article.equals(i)) { parse(new Article(), bibEntry, entry); } else if (StandardEntryType.Book.equals(i)) { diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java index c8af96aa8ee..07669c60f12 100644 --- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java +++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java @@ -11,7 +11,7 @@ import org.jabref.model.bibtexkeypattern.AbstractBibtexKeyPattern; import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern; import org.jabref.model.cleanup.FieldFormatterCleanups; -import org.jabref.model.entry.EntryType; +import org.jabref.model.entry.types.EntryType; import org.jabref.model.groups.GroupTreeNode; import org.jabref.model.metadata.ContentSelector; import org.jabref.model.metadata.MetaData; diff --git a/src/main/java/org/jabref/logic/exporter/ModsExporter.java b/src/main/java/org/jabref/logic/exporter/ModsExporter.java index 7eb0392e1e5..7e80a699ddd 100644 --- a/src/main/java/org/jabref/logic/exporter/ModsExporter.java +++ b/src/main/java/org/jabref/logic/exporter/ModsExporter.java @@ -47,10 +47,10 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.EntryType; /** * TemplateExporter for exporting in MODS XML format. diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java index 2f98a4aaa8f..3b04572b50b 100644 --- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java +++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java @@ -23,7 +23,7 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; +import org.jabref.model.entry.types.EntryType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java b/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java index d62211644fc..9dc7da1acf0 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java @@ -29,10 +29,10 @@ import org.jabref.logic.util.strings.StringSimilarity; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.identifier.ArXivIdentifier; import org.jabref.model.entry.identifier.DOI; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.strings.StringUtil; import org.jabref.model.util.OptionalUtil; diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java b/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java index 41bfe2cb3c0..38452bbeab5 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java @@ -21,10 +21,10 @@ import org.jabref.model.cleanup.FieldFormatterCleanup; import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.identifier.DOI; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.util.OptionalUtil; import org.apache.http.client.utils.URIBuilder; diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java index 31534736ac5..074c47cff62 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java @@ -18,9 +18,9 @@ import org.jabref.logic.importer.SearchBasedParserFetcher; import org.jabref.logic.util.OS; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.strings.StringUtil; import org.apache.http.client.utils.URIBuilder; diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java index 5a67e66e2ee..79b03b83d71 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java @@ -24,9 +24,9 @@ import org.jabref.logic.util.OS; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.identifier.DOI; +import org.jabref.model.entry.types.StandardEntryType; import org.apache.http.client.utils.URIBuilder; import org.json.JSONArray; diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java index bb2d17b1c46..fd38b2e61b1 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java @@ -18,9 +18,9 @@ import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; import org.jabref.model.entry.Month; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.apache.http.client.utils.URIBuilder; import org.json.JSONArray; diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java index 3ea20d8d414..7465b5c3a8c 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java @@ -27,10 +27,10 @@ import org.jabref.logic.importer.fileformat.bibtexml.Incollection; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java index 56ddbb812bc..9fc35b6bb43 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java @@ -13,10 +13,10 @@ import org.jabref.logic.importer.ParserResult; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; /** * Imports a Biblioscape Tag File. The format is described on diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java index f342ca74138..67837f3e0f1 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java @@ -35,11 +35,11 @@ import org.jabref.model.entry.BibEntryType; import org.jabref.model.entry.BibEntryTypesManager; import org.jabref.model.entry.BibtexString; -import org.jabref.model.entry.EntryTypeFactory; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.FieldProperty; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryTypeFactory; import org.jabref.model.metadata.MetaData; import org.jabref.model.util.FileUpdateMonitor; diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java b/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java index ab53746c53f..9763529fb85 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java @@ -14,9 +14,9 @@ import org.jabref.logic.importer.Parser; import org.jabref.logic.util.OS; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; /** * @implNote implemented by reverse-engineering the implementation by CiteSeerX diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java index 134a122ffaf..1cd2e5d54c9 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java @@ -11,11 +11,11 @@ import org.jabref.logic.importer.ParserResult; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; /** * Importer for COPAC format. diff --git a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java index a606c8b39aa..f306a5e307a 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java @@ -15,11 +15,11 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; /** * Importer for the Refer/Endnote format. diff --git a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java index 6c4b3989019..9268a519630 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java @@ -49,10 +49,11 @@ import org.jabref.logic.importer.fileformat.endnote.Year; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; import org.jabref.model.entry.LinkedFile; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.IEEETranEntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.strings.StringUtil; import org.jabref.model.util.OptionalUtil; @@ -162,8 +163,8 @@ private static EntryType convertRefNameToType(String refName) { return StandardEntryType.Misc; case "generic": return StandardEntryType.Misc; - case "electronic rticle": - return StandardEntryType.Electronic; + case "electronic article": + return IEEETranEntryType.Electronic; case "book section": return StandardEntryType.InBook; case "book": diff --git a/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java index 7295b1c0397..6a7c80ffedd 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java @@ -26,12 +26,12 @@ import org.jabref.logic.util.OS; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java b/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java index 9f728b172d7..29c24e20f4d 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java @@ -12,10 +12,10 @@ import org.jabref.logic.importer.ParseException; import org.jabref.logic.importer.Parser; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; import com.google.common.base.Strings; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java index c6e12bfc418..c0979e335f6 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java @@ -13,11 +13,11 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.EntryTypeFactory; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.EntryTypeFactory; +import org.jabref.model.entry.types.StandardEntryType; /** * INSPEC format importer. diff --git a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java index 15bab5626c6..d9ed2e873f3 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java @@ -17,13 +17,13 @@ import org.jabref.logic.importer.ParserResult; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; import org.jabref.model.entry.Month; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; /** * Importer for the ISI Web of Science, INSPEC and Medline format. diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java index 59602c2bf23..bc8feb039f0 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java @@ -74,12 +74,12 @@ import org.jabref.logic.importer.fileformat.medline.Text; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.strings.StringUtil; import com.google.common.base.Joiner; diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java index a258a22b8e1..4e911b1e8b2 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java @@ -15,12 +15,12 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; /** * Importer for the MEDLINE Plain format. diff --git a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java index 9fb4136cc27..b234fdf53a2 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java @@ -56,11 +56,11 @@ import org.jabref.logic.importer.fileformat.mods.UrlDefinition; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryTypeFactory; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.EntryTypeFactory; import com.google.common.base.Joiner; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java index 951896621bc..791f40439a6 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java @@ -14,13 +14,13 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.EntryTypeFactory; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.EntryTypeFactory; +import org.jabref.model.entry.types.StandardEntryType; /** * Imports an Ovid file. diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java index 0ff9114e7d3..79060c67918 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java @@ -23,11 +23,11 @@ import org.jabref.logic.xmp.EncryptedPdfsNotSupportedException; import org.jabref.logic.xmp.XmpUtilReader; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; import org.jabref.model.entry.LinkedFile; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.identifier.DOI; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.strings.StringUtil; import com.google.common.base.Strings; diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java index 0326dfff737..c330a465c6b 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java @@ -14,9 +14,9 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.Date; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java index dea7e1e3c00..5c941f75fcb 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java @@ -20,12 +20,13 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; import org.jabref.model.entry.Month; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.IEEETranEntryType; +import org.jabref.model.entry.types.StandardEntryType; public class RisImporter extends Importer { @@ -121,7 +122,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException { } else if ("CHAP".equals(value)) { type = StandardEntryType.InCollection; } else if ("PAT".equals(value)) { - type = StandardEntryType.Patent; + type = IEEETranEntryType.Patent; } else { type = StandardEntryType.Misc; } diff --git a/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java index db49b702e8f..e7c6f9b9516 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java @@ -14,11 +14,11 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.EntryTypeFactory; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.EntryTypeFactory; +import org.jabref.model.entry.types.StandardEntryType; /** * Imports a SilverPlatter exported file. This is a poor format to parse, diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java index 618ad166fad..63d69ddfbea 100644 --- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java +++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java @@ -15,9 +15,9 @@ import org.jabref.logic.cleanup.Cleanups; import org.jabref.logic.importer.ParseException; import org.jabref.model.database.BibDatabaseMode; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.EntryTypeFactory; import org.jabref.model.entry.field.FieldFactory; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.EntryTypeFactory; import org.jabref.model.metadata.ContentSelectors; import org.jabref.model.metadata.MetaData; import org.jabref.model.metadata.SaveOrderConfig; diff --git a/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java b/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java index cab4a6319cc..6d465292fd2 100644 --- a/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java +++ b/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java @@ -6,8 +6,8 @@ import org.jabref.logic.integrity.IntegrityCheck.Checker; import org.jabref.logic.l10n.Localization; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryTypeFactory; import org.jabref.model.entry.field.InternalField; +import org.jabref.model.entry.types.EntryTypeFactory; /** * BibTeX mode only checker diff --git a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java index b598d744217..8c3cc2b0198 100644 --- a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java +++ b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java @@ -7,11 +7,11 @@ import org.jabref.logic.integrity.IntegrityCheck.Checker; import org.jabref.logic.l10n.Localization; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.BiblatexEntryTypes; -import org.jabref.model.entry.BibtexEntryTypes; import org.jabref.model.entry.field.BibField; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions; +import org.jabref.model.entry.types.BibtexEntryTypeDefinitions; /** * This checker checks whether the entry does not contain any field appearing only in biblatex (and not in BibTeX) @@ -19,17 +19,17 @@ public class NoBibtexFieldChecker implements Checker { private Set getAllBiblatexOnlyFields() { - Set allBibtexFields = BibtexEntryTypes.ALL.stream().flatMap(type -> type.getAllFields().stream()).collect(Collectors.toSet()); - return BiblatexEntryTypes.ALL.stream() - .flatMap(type -> type.getAllFields().stream()) - .filter(field -> !allBibtexFields.contains(field)) - .map(BibField::getField) - // these fields are displayed by JabRef as default - .filter(field -> !field.equals(StandardField.ABSTRACT)) - .filter(field -> !field.equals(StandardField.COMMENT)) - .filter(field -> !field.equals(StandardField.DOI)) - .filter(field -> !field.equals(StandardField.URL)) - .collect(Collectors.toSet()); + Set allBibtexFields = BibtexEntryTypeDefinitions.ALL.stream().flatMap(type -> type.getAllFields().stream()).collect(Collectors.toSet()); + return BiblatexEntryTypeDefinitions.ALL.stream() + .flatMap(type -> type.getAllFields().stream()) + .filter(field -> !allBibtexFields.contains(field)) + .map(BibField::getField) + // these fields are displayed by JabRef as default + .filter(field -> !field.equals(StandardField.ABSTRACT)) + .filter(field -> !field.equals(StandardField.COMMENT)) + .filter(field -> !field.equals(StandardField.DOI)) + .filter(field -> !field.equals(StandardField.URL)) + .collect(Collectors.toSet()); } @Override diff --git a/src/main/java/org/jabref/logic/integrity/TypeChecker.java b/src/main/java/org/jabref/logic/integrity/TypeChecker.java index 07fc7c267d9..51e899f366c 100644 --- a/src/main/java/org/jabref/logic/integrity/TypeChecker.java +++ b/src/main/java/org/jabref/logic/integrity/TypeChecker.java @@ -7,8 +7,8 @@ import org.jabref.logic.integrity.IntegrityCheck.Checker; import org.jabref.logic.l10n.Localization; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; public class TypeChecker implements Checker { diff --git a/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java b/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java index 7aa1317f538..c0f7b784875 100644 --- a/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java +++ b/src/main/java/org/jabref/logic/layout/format/EntryTypeFormatter.java @@ -1,7 +1,7 @@ package org.jabref.logic.layout.format; import org.jabref.logic.layout.LayoutFormatter; -import org.jabref.model.entry.EntryTypeFactory; +import org.jabref.model.entry.types.EntryTypeFactory; /* * Camel casing of entry type string, unknown entry types gets a leading capital diff --git a/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java b/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java index c3228671c00..dd38c1ee97c 100644 --- a/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java +++ b/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java @@ -9,11 +9,11 @@ import java.util.stream.Collectors; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; import org.jabref.model.entry.Month; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.EntryType; public class BibTeXConverter { diff --git a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java index fab8d0087f1..de99ce6d919 100644 --- a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java +++ b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java @@ -7,10 +7,11 @@ import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.Month; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.IEEETranEntryType; +import org.jabref.model.entry.types.StandardEntryType; public class MSBibConverter { @@ -54,7 +55,7 @@ public static MSBibEntry convert(BibEntry entry) { result.number = entry.getLatexFreeField(StandardField.NUMBER).orElse(null); - if (entry.getType().equals(StandardEntryType.Patent)) { + if (entry.getType().equals(IEEETranEntryType.Patent)) { result.patentNumber = entry.getLatexFreeField(StandardField.NUMBER).orElse(null); result.number = null; } diff --git a/src/main/java/org/jabref/logic/msbib/MSBibMapping.java b/src/main/java/org/jabref/logic/msbib/MSBibMapping.java index a4bdc235933..4f4fe16a7de 100644 --- a/src/main/java/org/jabref/logic/msbib/MSBibMapping.java +++ b/src/main/java/org/jabref/logic/msbib/MSBibMapping.java @@ -3,12 +3,13 @@ import java.util.HashMap; import java.util.Map; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.IEEETranEntryType; +import org.jabref.model.entry.types.StandardEntryType; import com.google.common.collect.HashBiMap; @@ -87,10 +88,10 @@ public static EntryType getBiblatexEntryType(String msbibType) { entryTypeMapping.put("Book", StandardEntryType.Book); entryTypeMapping.put("BookSection", StandardEntryType.Book); entryTypeMapping.put("JournalArticle", StandardEntryType.Article); - entryTypeMapping.put("ArticleInAPeriodical", StandardEntryType.Periodical); + entryTypeMapping.put("ArticleInAPeriodical", IEEETranEntryType.Periodical); entryTypeMapping.put("ConferenceProceedings", StandardEntryType.InProceedings); entryTypeMapping.put("Report", StandardEntryType.TechReport); - entryTypeMapping.put("Patent", StandardEntryType.Patent); + entryTypeMapping.put("Patent", IEEETranEntryType.Patent); entryTypeMapping.put("InternetSite", StandardEntryType.Online); return entryTypeMapping.getOrDefault(msbibType, StandardEntryType.Misc); @@ -113,9 +114,9 @@ public static MSBibEntryType getMSBibEntryType(EntryType bibtexType) { entryTypeMapping.put(StandardEntryType.MastersThesis, MSBibEntryType.Report); entryTypeMapping.put(StandardEntryType.PhdThesis, MSBibEntryType.Report); entryTypeMapping.put(StandardEntryType.Unpublished, MSBibEntryType.Report); - entryTypeMapping.put(StandardEntryType.Patent, MSBibEntryType.Patent); + entryTypeMapping.put(IEEETranEntryType.Patent, MSBibEntryType.Patent); entryTypeMapping.put(StandardEntryType.Misc, MSBibEntryType.Misc); - entryTypeMapping.put(StandardEntryType.Electronic, MSBibEntryType.ElectronicSource); + entryTypeMapping.put(IEEETranEntryType.Electronic, MSBibEntryType.ElectronicSource); entryTypeMapping.put(StandardEntryType.Online, MSBibEntryType.InternetSite); return entryTypeMapping.getOrDefault(bibtexType, MSBibEntryType.Misc); diff --git a/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java b/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java index 4d3531bdcaa..b42252ac914 100644 --- a/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java +++ b/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java @@ -29,11 +29,11 @@ import org.jabref.model.entry.Author; import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.EntryTypeFactory; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.EntryTypeFactory; import org.jabref.model.strings.StringUtil; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java index a94dc133901..e361ba20875 100644 --- a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java +++ b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java @@ -22,10 +22,10 @@ import org.jabref.model.database.shared.DatabaseConnection; import org.jabref.model.database.shared.DatabaseConnectionProperties; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryTypeFactory; import org.jabref.model.entry.event.EntryEventSource; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; +import org.jabref.model.entry.types.EntryTypeFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/logic/util/TestEntry.java b/src/main/java/org/jabref/logic/util/TestEntry.java index e534117fd0f..d2d6e80ceed 100644 --- a/src/main/java/org/jabref/logic/util/TestEntry.java +++ b/src/main/java/org/jabref/logic/util/TestEntry.java @@ -3,8 +3,8 @@ import java.util.Arrays; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; public class TestEntry { diff --git a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java index fdb985e1266..4d700f2bc98 100644 --- a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java +++ b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java @@ -4,11 +4,11 @@ import java.util.Optional; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryTypeFactory; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryTypeFactory; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSDictionary; diff --git a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java index 19b02fc9906..e6fb8223a7f 100644 --- a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java +++ b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java @@ -16,12 +16,12 @@ import org.jabref.model.entry.Author; import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryTypeFactory; import org.jabref.model.entry.Month; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.EntryTypeFactory; import org.jabref.model.strings.StringUtil; import org.apache.xmpbox.DateConverter; diff --git a/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java b/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java index 200337e811e..350c822510c 100644 --- a/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java +++ b/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java @@ -9,8 +9,8 @@ import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntryType; import org.jabref.model.entry.BibEntryTypeBuilder; -import org.jabref.model.entry.EntryTypeFactory; import org.jabref.model.entry.field.FieldFactory; +import org.jabref.model.entry.types.EntryTypeFactory; import org.jabref.preferences.JabRefPreferences; class CustomEntryTypePreferenceMigration { diff --git a/src/main/java/org/jabref/migrations/PreferencesMigrations.java b/src/main/java/org/jabref/migrations/PreferencesMigrations.java index da2f54946c5..a5386c8b1d4 100644 --- a/src/main/java/org/jabref/migrations/PreferencesMigrations.java +++ b/src/main/java/org/jabref/migrations/PreferencesMigrations.java @@ -13,8 +13,8 @@ import org.jabref.Globals; import org.jabref.JabRefMain; import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern; -import org.jabref.model.entry.EntryTypeFactory; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryTypeFactory; import org.jabref.preferences.JabRefPreferences; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/model/bibtexkeypattern/AbstractBibtexKeyPattern.java b/src/main/java/org/jabref/model/bibtexkeypattern/AbstractBibtexKeyPattern.java index d8d549368f5..e533ddd7bcc 100644 --- a/src/main/java/org/jabref/model/bibtexkeypattern/AbstractBibtexKeyPattern.java +++ b/src/main/java/org/jabref/model/bibtexkeypattern/AbstractBibtexKeyPattern.java @@ -9,7 +9,7 @@ import java.util.StringTokenizer; import java.util.stream.Collectors; -import org.jabref.model.entry.EntryType; +import org.jabref.model.entry.types.EntryType; /** * A small table, where an entry type is associated with a Bibtex key pattern (an diff --git a/src/main/java/org/jabref/model/bibtexkeypattern/DatabaseBibtexKeyPattern.java b/src/main/java/org/jabref/model/bibtexkeypattern/DatabaseBibtexKeyPattern.java index 78be7292b6e..82570f1e0af 100644 --- a/src/main/java/org/jabref/model/bibtexkeypattern/DatabaseBibtexKeyPattern.java +++ b/src/main/java/org/jabref/model/bibtexkeypattern/DatabaseBibtexKeyPattern.java @@ -2,7 +2,7 @@ import java.util.List; -import org.jabref.model.entry.EntryType; +import org.jabref.model.entry.types.EntryType; public class DatabaseBibtexKeyPattern extends AbstractBibtexKeyPattern { diff --git a/src/main/java/org/jabref/model/bibtexkeypattern/GlobalBibtexKeyPattern.java b/src/main/java/org/jabref/model/bibtexkeypattern/GlobalBibtexKeyPattern.java index 757395ebf44..1203bd1a518 100644 --- a/src/main/java/org/jabref/model/bibtexkeypattern/GlobalBibtexKeyPattern.java +++ b/src/main/java/org/jabref/model/bibtexkeypattern/GlobalBibtexKeyPattern.java @@ -2,7 +2,7 @@ import java.util.List; -import org.jabref.model.entry.EntryType; +import org.jabref.model.entry.types.EntryType; public class GlobalBibtexKeyPattern extends AbstractBibtexKeyPattern { diff --git a/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java b/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java index 7dc1a606be0..69472948e0a 100644 --- a/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java +++ b/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java @@ -3,8 +3,8 @@ import java.util.stream.Stream; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.EntryTypeFactory; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.EntryTypeFactory; public class BibDatabaseModeDetection { diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java index b7e13ed723c..85adabb0ed7 100644 --- a/src/main/java/org/jabref/model/entry/BibEntry.java +++ b/src/main/java/org/jabref/model/entry/BibEntry.java @@ -31,6 +31,8 @@ import org.jabref.model.entry.field.OrFields; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.identifier.DOI; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.strings.LatexToUnicodeAdapter; import org.jabref.model.strings.StringUtil; diff --git a/src/main/java/org/jabref/model/entry/BibEntryType.java b/src/main/java/org/jabref/model/entry/BibEntryType.java index da3e3a6d27a..2c1b2ea0504 100644 --- a/src/main/java/org/jabref/model/entry/BibEntryType.java +++ b/src/main/java/org/jabref/model/entry/BibEntryType.java @@ -13,6 +13,7 @@ import org.jabref.model.entry.field.FieldPriority; import org.jabref.model.entry.field.OrFields; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; public class BibEntryType implements Comparable { @@ -70,7 +71,7 @@ public SortedSet getPrimaryOptionalFields() { .collect(Collectors.toCollection(TreeSet::new)); } - SortedSet getSecondaryOptionalFields() { + public SortedSet getSecondaryOptionalFields() { return getOptionalFields().stream() .filter(field -> field.getPriority() == FieldPriority.DETAIL) .map(BibField::getField) diff --git a/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java b/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java index 457f3f39aaa..a48e7b8001a 100644 --- a/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java +++ b/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java @@ -13,6 +13,8 @@ import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldPriority; import org.jabref.model.entry.field.OrFields; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; import com.google.common.collect.Streams; diff --git a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java index c412cac61ed..9c7082bcbf7 100644 --- a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java +++ b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java @@ -11,11 +11,16 @@ import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.field.BibField; import org.jabref.model.entry.field.FieldFactory; +import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions; +import org.jabref.model.entry.types.BibtexEntryTypeDefinitions; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.EntryTypeFactory; +import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions; public class BibEntryTypesManager { public static final String ENTRYTYPE_FLAG = "jabref-entrytype: "; - private final InternalEntryTypes BIBTEX = new InternalEntryTypes(Stream.concat(BibtexEntryTypes.ALL.stream(), IEEETranEntryTypes.ALL.stream()).collect(Collectors.toList())); - private final InternalEntryTypes BIBLATEX = new InternalEntryTypes(BiblatexEntryTypes.ALL); + private final InternalEntryTypes BIBTEX = new InternalEntryTypes(Stream.concat(BibtexEntryTypeDefinitions.ALL.stream(), IEEETranEntryTypeDefinitions.ALL.stream()).collect(Collectors.toList())); + private final InternalEntryTypes BIBLATEX = new InternalEntryTypes(BiblatexEntryTypeDefinitions.ALL); public BibEntryTypesManager() { } @@ -82,12 +87,12 @@ public List getAllCustomTypes(BibDatabaseMode mode) { Collection customizedTypes = getAllTypes(mode); if (mode == BibDatabaseMode.BIBTEX) { return customizedTypes.stream() - .filter(entryType -> BibtexEntryTypes.ALL.stream().noneMatch(bibtexType -> bibtexType.getType().equals(entryType.getType()))) - .filter(entryType -> IEEETranEntryTypes.ALL.stream().noneMatch(ieeeType -> ieeeType.getType().equals(entryType.getType()))) + .filter(entryType -> BibtexEntryTypeDefinitions.ALL.stream().noneMatch(bibtexType -> bibtexType.getType().equals(entryType.getType()))) + .filter(entryType -> IEEETranEntryTypeDefinitions.ALL.stream().noneMatch(ieeeType -> ieeeType.getType().equals(entryType.getType()))) .collect(Collectors.toList()); } else { return customizedTypes.stream() - .filter(entryType -> BiblatexEntryTypes.ALL.stream().noneMatch(biblatexType -> biblatexType.getType().equals(entryType.getType()))) + .filter(entryType -> BiblatexEntryTypeDefinitions.ALL.stream().noneMatch(biblatexType -> biblatexType.getType().equals(entryType.getType()))) .collect(Collectors.toList()); } } diff --git a/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java b/src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java similarity index 99% rename from src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java rename to src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java index cbd5087f393..1e50af39b65 100644 --- a/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java +++ b/src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java @@ -1,8 +1,10 @@ -package org.jabref.model.entry; +package org.jabref.model.entry.types; import java.util.Arrays; import java.util.List; +import org.jabref.model.entry.BibEntryType; +import org.jabref.model.entry.BibEntryTypeBuilder; import org.jabref.model.entry.field.OrFields; import org.jabref.model.entry.field.StandardField; @@ -11,7 +13,7 @@ * * @see biblatex documentation */ -public class BiblatexEntryTypes { +public class BiblatexEntryTypeDefinitions { private static final BibEntryType ARTICLE = new BibEntryTypeBuilder() .withType(StandardEntryType.Article) @@ -207,7 +209,7 @@ public class BiblatexEntryTypes { .build(); private static final BibEntryType PATENT = new BibEntryTypeBuilder() - .withType(StandardEntryType.Patent) + .withType(IEEETranEntryType.Patent) .withImportantFields(StandardField.HOLDER, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE) @@ -219,7 +221,7 @@ public class BiblatexEntryTypes { .build(); private static final BibEntryType PERIODICAL = new BibEntryTypeBuilder() - .withType(StandardEntryType.Periodical) + .withType(IEEETranEntryType.Periodical) .withImportantFields( StandardField.SUBTITLE, StandardField.ISSUETITLE, StandardField.ISSUESUBTITLE, StandardField.ISSN, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE) @@ -361,7 +363,7 @@ public class BiblatexEntryTypes { .build(); private static final BibEntryType ELECTRONIC = new BibEntryTypeBuilder() - .withType(StandardEntryType.Electronic) + .withType(IEEETranEntryType.Electronic) .withImportantFields(ONLINE.getPrimaryOptionalFields()) .withDetailFields(ONLINE.getSecondaryOptionalFields()) .withRequiredFields(ONLINE.getRequiredFields()) diff --git a/src/main/java/org/jabref/model/entry/BibtexEntryTypes.java b/src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java similarity index 91% rename from src/main/java/org/jabref/model/entry/BibtexEntryTypes.java rename to src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java index b180c120a7b..068db83100f 100644 --- a/src/main/java/org/jabref/model/entry/BibtexEntryTypes.java +++ b/src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java @@ -1,9 +1,10 @@ -package org.jabref.model.entry; +package org.jabref.model.entry.types; import java.util.Arrays; import java.util.List; -import org.jabref.model.entry.field.IEEEField; +import org.jabref.model.entry.BibEntryType; +import org.jabref.model.entry.BibEntryTypeBuilder; import org.jabref.model.entry.field.OrFields; import org.jabref.model.entry.field.StandardField; @@ -13,7 +14,7 @@ * Article, Book, Booklet, Conference, Inbook, Incollection, Inproceedings, * Manual, Mastersthesis, Misc, Phdthesis, Proceedings, Techreport, Unpublished */ -public class BibtexEntryTypes { +public class BibtexEntryTypeDefinitions { /** * An article from a journal or magazine. *

@@ -176,20 +177,9 @@ public class BibtexEntryTypes { .withImportantFields(StandardField.MONTH, StandardField.YEAR) .build(); - /** - * This type is used by the IEEEtran.bst to control the appearance of the bibliography - */ - private static final BibEntryType IEEETRANBSTCTL = new BibEntryTypeBuilder() - .withType(StandardEntryType.IEEEtranBSTCTL) - .withDetailFields(IEEEField.CTLUSE_ARTICLE_NUMBER, IEEEField.CTLUSE_PAPER, IEEEField.CTLUSE_FORCED_ETAL, - IEEEField.CTLUSE_URL, IEEEField.CTLMAX_NAMES_FORCED_ETAL, IEEEField.CTLNAMES_SHOW_ETAL, - IEEEField.CTLUSE_ALT_SPACING, IEEEField.CTLALT_STRETCH_FACTOR, IEEEField.CTLDASH_REPEATED_NAMES, - IEEEField.CTLNAME_FORMAT_STRING, IEEEField.CTLNAME_LATEX_CMD, IEEEField.CTLNAME_URL_PREFIX) - .build(); - public static final List ALL = Arrays.asList(ARTICLE, INBOOK, BOOK, BOOKLET, INCOLLECTION, CONFERENCE, - INPROCEEDINGS, PROCEEDINGS, MANUAL, MASTERSTHESIS, PHDTHESIS, TECHREPORT, UNPUBLISHED, MISC, IEEETRANBSTCTL); + INPROCEEDINGS, PROCEEDINGS, MANUAL, MASTERSTHESIS, PHDTHESIS, TECHREPORT, UNPUBLISHED, MISC); - private BibtexEntryTypes() { + private BibtexEntryTypeDefinitions() { } } diff --git a/src/main/java/org/jabref/model/entry/EntryType.java b/src/main/java/org/jabref/model/entry/types/EntryType.java similarity index 83% rename from src/main/java/org/jabref/model/entry/EntryType.java rename to src/main/java/org/jabref/model/entry/types/EntryType.java index 0cd350402b3..90d0264c00d 100644 --- a/src/main/java/org/jabref/model/entry/EntryType.java +++ b/src/main/java/org/jabref/model/entry/types/EntryType.java @@ -1,4 +1,4 @@ -package org.jabref.model.entry; +package org.jabref.model.entry.types; public interface EntryType { diff --git a/src/main/java/org/jabref/model/entry/EntryTypeFactory.java b/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java similarity index 82% rename from src/main/java/org/jabref/model/entry/EntryTypeFactory.java rename to src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java index 455aac578b2..64e4f6cfc64 100644 --- a/src/main/java/org/jabref/model/entry/EntryTypeFactory.java +++ b/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java @@ -1,5 +1,6 @@ -package org.jabref.model.entry; +package org.jabref.model.entry.types; +import org.jabref.model.entry.BibEntryType; import org.jabref.model.util.OptionalUtil; public class EntryTypeFactory { @@ -33,11 +34,11 @@ public static boolean isExclusiveBiblatex(EntryType type) { } private static boolean isBibtex(EntryType type) { - return BibtexEntryTypes.ALL.stream().anyMatch(bibEntryType -> bibEntryType.getType().equals(type)); + return BibtexEntryTypeDefinitions.ALL.stream().anyMatch(bibEntryType -> bibEntryType.getType().equals(type)); } private static boolean isBiblatex(EntryType type) { - return BiblatexEntryTypes.ALL.stream().anyMatch(bibEntryType -> bibEntryType.getType().equals(type)); + return BiblatexEntryTypeDefinitions.ALL.stream().anyMatch(bibEntryType -> bibEntryType.getType().equals(type)); } public static EntryType parse(String typeName) { diff --git a/src/main/java/org/jabref/model/entry/types/IEEETranEntryType.java b/src/main/java/org/jabref/model/entry/types/IEEETranEntryType.java new file mode 100644 index 00000000000..4c3305ded22 --- /dev/null +++ b/src/main/java/org/jabref/model/entry/types/IEEETranEntryType.java @@ -0,0 +1,35 @@ +package org.jabref.model.entry.types; + +import java.util.Arrays; +import java.util.Locale; +import java.util.Optional; + +public enum IEEETranEntryType implements EntryType { + IEEEtranBSTCTL("IEEEtranBSTCTL"), + Electronic("Electronic"), + Patent("Patent"), + Periodical("Periodical"), + Standard("Standard"); + + private final String displayName; + + IEEETranEntryType(String displayName) { + this.displayName = displayName; + } + + public static Optional fromName(String name) { + return Arrays.stream(IEEETranEntryType.values()) + .filter(field -> field.getName().equalsIgnoreCase(name)) + .findAny(); + } + + @Override + public String getName() { + return displayName.toLowerCase(Locale.ENGLISH); + } + + @Override + public String getDisplayName() { + return displayName; + } +} diff --git a/src/main/java/org/jabref/model/entry/IEEETranEntryTypes.java b/src/main/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitions.java similarity index 88% rename from src/main/java/org/jabref/model/entry/IEEETranEntryTypes.java rename to src/main/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitions.java index a19befb5851..9c04458b92c 100644 --- a/src/main/java/org/jabref/model/entry/IEEETranEntryTypes.java +++ b/src/main/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitions.java @@ -1,8 +1,10 @@ -package org.jabref.model.entry; +package org.jabref.model.entry.types; import java.util.Arrays; import java.util.List; +import org.jabref.model.entry.BibEntryType; +import org.jabref.model.entry.BibEntryTypeBuilder; import org.jabref.model.entry.field.IEEEField; import org.jabref.model.entry.field.OrFields; import org.jabref.model.entry.field.StandardField; @@ -11,10 +13,10 @@ * This class represents all supported IEEETran entry types. * * @see http://ctan.sharelatex.com/tex-archive/macros/latex/contrib/IEEEtran/bibtex/IEEEtran_bst_HOWTO.pdf - *

- * Electronic, IEEETranBSTCTL, Periodical, Patent, Standard + *

+ * Electronic, IEEETranBSTCTL, Periodical, Patent, Standard */ -public class IEEETranEntryTypes { +public class IEEETranEntryTypeDefinitions { /** * Electronic entry type for internet references *

@@ -22,7 +24,7 @@ public class IEEETranEntryTypes { * Optional fields: author, month, year, title, language, howpublished, organization, address, note, url */ private static final BibEntryType ELECTRONIC = new BibEntryTypeBuilder() - .withType(StandardEntryType.Electronic) + .withType(IEEETranEntryType.Electronic) .withImportantFields(StandardField.AUTHOR, StandardField.MONTH, StandardField.YEAR, StandardField.TITLE, StandardField.LANGUAGE, StandardField.HOWPUBLISHED, StandardField.ORGANIZATION, StandardField.ADDRESS, StandardField.NOTE, StandardField.URL) .build(); @@ -31,7 +33,7 @@ public class IEEETranEntryTypes { * Special entry type that can be used to externally control some aspects of the bibliography style. */ private static final BibEntryType IEEETRANBSTCTL = new BibEntryTypeBuilder() - .withType(StandardEntryType.IEEEtranBSTCTL) + .withType(IEEETranEntryType.IEEEtranBSTCTL) .withImportantFields(IEEEField.CTLUSE_ARTICLE_NUMBER, IEEEField.CTLUSE_PAPER, IEEEField.CTLUSE_FORCED_ETAL, IEEEField.CTLUSE_URL, IEEEField.CTLMAX_NAMES_FORCED_ETAL, IEEEField.CTLNAMES_SHOW_ETAL, IEEEField.CTLUSE_ALT_SPACING, IEEEField.CTLALT_STRETCH_FACTOR, IEEEField.CTLDASH_REPEATED_NAMES, @@ -45,7 +47,7 @@ public class IEEETranEntryTypes { * Optional fields: editor, language, series, volume, number, organization, month, note, url */ private static final BibEntryType PERIODICAL = new BibEntryTypeBuilder() - .withType(StandardEntryType.Periodical) + .withType(IEEETranEntryType.Periodical) .withRequiredFields(StandardField.TITLE, StandardField.YEAR) .withImportantFields(StandardField.EDITOR, StandardField.LANGUAGE, StandardField.SERIES, StandardField.VOLUME, StandardField.NUMBER, StandardField.ORGANIZATION, StandardField.MONTH, StandardField.NOTE, StandardField.URL) .build(); @@ -57,7 +59,7 @@ public class IEEETranEntryTypes { * Optional fields: author, title, language, assignee, address, type, number, day, dayfiled, month, monthfiled, note, url */ private static final BibEntryType PATENT = new BibEntryTypeBuilder() - .withType(StandardEntryType.Patent) + .withType(IEEETranEntryType.Patent) .withRequiredFields(new OrFields(StandardField.YEAR, StandardField.YEARFILED), StandardField.NATIONALITY, StandardField.NUMBER) .withImportantFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.LANGUAGE, StandardField.ASSIGNEE, StandardField.ADDRESS, StandardField.TYPE, StandardField.NUMBER, StandardField.DAY, StandardField.DAYFILED, StandardField.MONTH, @@ -71,7 +73,7 @@ public class IEEETranEntryTypes { * Optional fields: author, language, howpublished, type, number, revision, address, month, year, note, url */ private static final BibEntryType STANDARD = new BibEntryTypeBuilder() - .withType(StandardEntryType.Standard) + .withType(IEEETranEntryType.Standard) .withRequiredFields(new OrFields(StandardField.ORGANIZATION, StandardField.INSTITUTION), StandardField.TITLE) .withImportantFields(StandardField.AUTHOR, StandardField.LANGUAGE, StandardField.HOWPUBLISHED, StandardField.TYPE, StandardField.NUMBER, StandardField.REVISION, StandardField.ADDRESS, StandardField.MONTH, StandardField.YEAR, @@ -80,6 +82,6 @@ public class IEEETranEntryTypes { public static final List ALL = Arrays.asList(ELECTRONIC, IEEETRANBSTCTL, PERIODICAL, PATENT, STANDARD); - private IEEETranEntryTypes() { + private IEEETranEntryTypeDefinitions() { } } diff --git a/src/main/java/org/jabref/model/entry/StandardEntryType.java b/src/main/java/org/jabref/model/entry/types/StandardEntryType.java similarity index 88% rename from src/main/java/org/jabref/model/entry/StandardEntryType.java rename to src/main/java/org/jabref/model/entry/types/StandardEntryType.java index d3daf7ab5f2..51bfd341e23 100644 --- a/src/main/java/org/jabref/model/entry/StandardEntryType.java +++ b/src/main/java/org/jabref/model/entry/types/StandardEntryType.java @@ -1,45 +1,42 @@ -package org.jabref.model.entry; +package org.jabref.model.entry.types; import java.util.Arrays; import java.util.Locale; import java.util.Optional; public enum StandardEntryType implements EntryType { + // BibTeX Article("Article"), Book("Book"), - BookInBook("BookInBook"), Booklet("Booklet"), Collection("Collection"), Conference("Conference"), - Electronic("Electronic"), - IEEEtranBSTCTL("IEEEtranBSTCTL"), InBook("InBook"), InCollection("InCollection"), InProceedings("InProceedings"), - InReference("InReference"), Manual("Manual"), MastersThesis("MastersThesis"), Misc("Misc"), + PhdThesis("PhdThesis"), + Proceedings("Proceedings"), + TechReport("TechReport"), + Unpublished("Unpublished"), + // Biblatex + BookInBook("BookInBook"), + InReference("InReference"), MvBook("MvBook"), MvCollection("MvCollection"), MvProceedings("MvProceedings"), MvReference("MvReference"), Online("Online"), - Patent("Patent"), - Periodical("Periodical"), - PhdThesis("PhdThesis"), - Proceedings("Proceedings"), Reference("Reference"), Report("Report"), Set("Set"), SuppBook("SuppBook"), SuppCollection("SuppCollection"), SuppPeriodical("SuppPeriodical"), - TechReport("TechReport"), Thesis("Thesis"), - Unpublished("Unpublished"), - WWW("WWW"), - Standard("Standard"); + WWW("WWW"); private final String displayName; diff --git a/src/main/java/org/jabref/model/entry/UnknownEntryType.java b/src/main/java/org/jabref/model/entry/types/UnknownEntryType.java similarity index 96% rename from src/main/java/org/jabref/model/entry/UnknownEntryType.java rename to src/main/java/org/jabref/model/entry/types/UnknownEntryType.java index 2b1cacc654f..40d0d9d1c1f 100644 --- a/src/main/java/org/jabref/model/entry/UnknownEntryType.java +++ b/src/main/java/org/jabref/model/entry/types/UnknownEntryType.java @@ -1,4 +1,4 @@ -package org.jabref.model.entry; +package org.jabref.model.entry.types; import java.util.Locale; import java.util.Objects; diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java index 24cb3d77a89..cc998f373d9 100644 --- a/src/main/java/org/jabref/model/metadata/MetaData.java +++ b/src/main/java/org/jabref/model/metadata/MetaData.java @@ -15,8 +15,8 @@ import org.jabref.model.cleanup.FieldFormatterCleanups; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.database.event.ChangePropagation; -import org.jabref.model.entry.EntryType; import org.jabref.model.entry.field.Field; +import org.jabref.model.entry.types.EntryType; import org.jabref.model.groups.GroupTreeNode; import org.jabref.model.groups.event.GroupUpdatedEvent; import org.jabref.model.metadata.event.MetaDataChangedEvent; diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java index 4022e0e9766..6f55197f51b 100644 --- a/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -98,13 +98,13 @@ import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntryType; import org.jabref.model.entry.BibEntryTypesManager; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.EntryTypeFactory; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.SpecialField; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.EntryTypeFactory; import org.jabref.model.metadata.FilePreferences; import org.jabref.model.metadata.SaveOrderConfig; import org.jabref.model.strings.StringUtil; diff --git a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java index 224be6ee11a..04050a9bd20 100644 --- a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java +++ b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java @@ -11,7 +11,7 @@ import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; -import org.jabref.model.entry.StandardEntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.metadata.FilePreferences; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/TypedBibEntryTest.java b/src/test/java/org/jabref/logic/TypedBibEntryTest.java index 480ef69f6ca..683d636e7c2 100644 --- a/src/test/java/org/jabref/logic/TypedBibEntryTest.java +++ b/src/test/java/org/jabref/logic/TypedBibEntryTest.java @@ -3,9 +3,9 @@ import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.BibEntryTypesManager; -import org.jabref.model.entry.StandardEntryType; -import org.jabref.model.entry.UnknownEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.entry.types.UnknownEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java index 1c153440702..3c158a64d53 100644 --- a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java +++ b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java @@ -14,10 +14,10 @@ import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.BibEntryTypesManager; import org.jabref.model.entry.LinkedFile; -import org.jabref.model.entry.StandardEntryType; -import org.jabref.model.entry.UnknownEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.entry.types.UnknownEntryType; import org.jabref.model.util.DummyFileUpdateMonitor; import org.jabref.model.util.FileUpdateMonitor; diff --git a/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java b/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java index dc5edd2793d..a4dddfacea5 100644 --- a/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java +++ b/src/test/java/org/jabref/logic/bibtex/DuplicateCheckTest.java @@ -3,9 +3,9 @@ import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.BibEntryTypesManager; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java index 7be7378a872..706e4f04427 100644 --- a/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java +++ b/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java @@ -1,10 +1,10 @@ package org.jabref.logic.bibtex.comparator; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.OrFields; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java b/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java index b8620ab83cc..fe5f3d8b123 100644 --- a/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java +++ b/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java @@ -1,9 +1,9 @@ package org.jabref.logic.cleanup; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java index 718df383768..dc0b5a9958c 100644 --- a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java +++ b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java @@ -7,10 +7,10 @@ import org.jabref.logic.formatter.casechanger.UpperCaseFormatter; import org.jabref.model.cleanup.FieldFormatterCleanup; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java index 3392af70679..4c001b7b70d 100644 --- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java +++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java @@ -29,13 +29,13 @@ import org.jabref.model.entry.BibEntryType; import org.jabref.model.entry.BibEntryTypesManager; import org.jabref.model.entry.BibtexString; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; -import org.jabref.model.entry.UnknownEntryType; import org.jabref.model.entry.field.BibField; import org.jabref.model.entry.field.FieldPriority; import org.jabref.model.entry.field.OrFields; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.entry.types.UnknownEntryType; import org.jabref.model.groups.AllEntriesGroup; import org.jabref.model.groups.ExplicitGroup; import org.jabref.model.groups.GroupHierarchyType; diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java index 0fa6bb16820..d732c561bed 100644 --- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java +++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java @@ -15,8 +15,8 @@ import org.jabref.logic.xmp.XmpPreferences; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java b/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java index 1e3c1aeb002..b6a9b8de6c7 100644 --- a/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java +++ b/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java @@ -13,8 +13,8 @@ import org.jabref.model.cleanup.FieldFormatterCleanup; import org.jabref.model.cleanup.FieldFormatterCleanups; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java index 03891b6cdb6..4a673179f57 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java @@ -6,9 +6,9 @@ import org.jabref.logic.bibtex.FieldContentParserPreferences; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java index 6c54e70205a..572d6681164 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java @@ -8,9 +8,9 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.identifier.ArXivIdentifier; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java index c2d3eb88667..4ece520646d 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java @@ -7,9 +7,9 @@ import org.jabref.logic.bibtex.FieldContentParserPreferences; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java index cea68541972..26ee250cda8 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java @@ -4,8 +4,8 @@ import java.util.List; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java index 7fa7e5f90ac..1ae95774833 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java @@ -5,8 +5,8 @@ import java.util.Optional; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java index e89a27396bd..8618818fbd5 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java @@ -7,9 +7,9 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java index 040b81d9789..a5c81f98570 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java @@ -6,8 +6,8 @@ import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.apache.http.client.utils.URIBuilder; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java index 88b3f5bf962..e9fea44adff 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java @@ -5,8 +5,8 @@ import org.jabref.logic.help.HelpFile; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java index d57189bfcb6..88411f1f08d 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java @@ -5,8 +5,8 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java index 60c54fe4132..a9b7ced5928 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java @@ -10,8 +10,8 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.support.DisabledOnCIServer; import org.jabref.testutils.category.FetcherTest; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java index d47c1d06816..c97574620a7 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java @@ -8,9 +8,9 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java b/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java index 5ddaa686ade..112fc0f0efb 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java @@ -9,8 +9,8 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.support.DisabledOnCIServer; import org.jabref.testutils.category.FetcherTest; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java index 681feb49e9e..239955ca8dd 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java @@ -6,9 +6,9 @@ import org.jabref.logic.bibtex.FieldContentParserPreferences; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java index 5e4da402c95..0c0a3c94531 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java @@ -10,8 +10,8 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java index 84638ed911e..4c1fe285d31 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java @@ -7,9 +7,9 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java index 29a168fec02..21fc0268564 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java @@ -5,8 +5,8 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java index d292d0ac3de..90d8b99902f 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java @@ -5,9 +5,9 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcherTest.java index 9076b123f68..c6f6a05fc77 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcherTest.java @@ -5,8 +5,8 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java index be0d4ed7721..6bf142f76ab 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java @@ -7,8 +7,8 @@ import org.jabref.logic.bibtex.FieldContentParserPreferences; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.support.DisabledOnCIServer; import org.jabref.testutils.category.FetcherTest; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java index e73af702a57..578e8cdb569 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java @@ -5,10 +5,10 @@ import java.util.Optional; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java index 98e1c013ebe..2cea53e900f 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java @@ -4,8 +4,8 @@ import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java index f6d851c201c..063b561a4cf 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java @@ -5,8 +5,8 @@ import java.util.Optional; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.json.JSONObject; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java index 359260c2be0..aadd223f5cf 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java @@ -5,8 +5,8 @@ import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.FetcherTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java index 8f61fb74513..55a77da28ca 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java @@ -6,9 +6,9 @@ import org.jabref.logic.bibtex.FieldContentParserPreferences; import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.support.DisabledOnCIServer; import org.jabref.testutils.category.FetcherTest; diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java b/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java index a76b9b20d5a..18f415931be 100644 --- a/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java +++ b/src/test/java/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTypes.java @@ -9,9 +9,9 @@ import java.util.List; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java index 53e7548d4c3..387d057fd74 100644 --- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java +++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTestTypes.java @@ -8,9 +8,9 @@ import java.util.stream.Stream; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java index 69b9e1ae4bd..71b452cdd8b 100644 --- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java +++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java @@ -26,14 +26,14 @@ import org.jabref.model.entry.BibEntryType; import org.jabref.model.entry.BibtexString; import org.jabref.model.entry.Date; -import org.jabref.model.entry.StandardEntryType; -import org.jabref.model.entry.UnknownEntryType; import org.jabref.model.entry.field.BibField; import org.jabref.model.entry.field.FieldPriority; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.OrFields; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.entry.types.UnknownEntryType; import org.jabref.model.groups.AllEntriesGroup; import org.jabref.model.groups.ExplicitGroup; import org.jabref.model.groups.GroupHierarchyType; diff --git a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java index 3dc2e000408..de1bb49f04e 100644 --- a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java +++ b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java @@ -15,8 +15,8 @@ import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java index 12280cbdbb3..60de76aff26 100644 --- a/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java +++ b/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java @@ -12,8 +12,8 @@ import org.jabref.logic.bibtex.BibEntryAssert; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java index 5d37b416bbc..daa7834214b 100644 --- a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java +++ b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java @@ -13,10 +13,10 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java index fba93d01a0e..536ecb8009d 100644 --- a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java +++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java @@ -18,8 +18,8 @@ import org.jabref.logic.bibtex.BibEntryAssert; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.apache.commons.codec.Charsets; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java index 85396c42e15..b3ea3c95c33 100644 --- a/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java +++ b/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java @@ -15,9 +15,9 @@ import org.jabref.logic.bibtex.BibEntryAssert; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java index e7df979a3a1..6a1c7b2b2e4 100644 --- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java +++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java @@ -11,8 +11,8 @@ import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java index 2fcbd2096fd..fbfb3f556c9 100644 --- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java +++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java @@ -18,12 +18,13 @@ import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.IEEETranEntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.metadata.FilePreferences; import org.jabref.model.metadata.MetaData; @@ -41,8 +42,8 @@ class IntegrityCheckTest { @Test void testEntryTypeChecks() { assertCorrect(withMode(createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article), BibDatabaseMode.BIBTEX)); - assertWrong(withMode(createContext(StandardField.TITLE, "sometitle", StandardEntryType.Patent), BibDatabaseMode.BIBTEX)); - assertCorrect((withMode(createContext(StandardField.TITLE, "sometitle", StandardEntryType.Patent), BibDatabaseMode.BIBLATEX))); + assertWrong(withMode(createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent), BibDatabaseMode.BIBTEX)); + assertCorrect((withMode(createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent), BibDatabaseMode.BIBLATEX))); assertCorrect(withMode(createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article), BibDatabaseMode.BIBLATEX)); } diff --git a/src/test/java/org/jabref/logic/layout/LayoutTest.java b/src/test/java/org/jabref/logic/layout/LayoutTest.java index e4d310ee379..368e1bd5fc2 100644 --- a/src/test/java/org/jabref/logic/layout/LayoutTest.java +++ b/src/test/java/org/jabref/logic/layout/LayoutTest.java @@ -9,9 +9,9 @@ import org.jabref.logic.layout.format.NameFormatterPreferences; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; -import org.jabref.model.entry.StandardEntryType; -import org.jabref.model.entry.UnknownEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.entry.types.UnknownEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java b/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java index 45998376145..c08c319e581 100644 --- a/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java +++ b/src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java @@ -21,9 +21,9 @@ import org.jabref.logic.layout.LayoutFormatterPreferences; import org.jabref.model.database.BibDatabase; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; -import org.jabref.model.entry.UnknownEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.entry.types.UnknownEntryType; import org.jabref.model.util.DummyFileUpdateMonitor; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java index 3c64fcc21d8..22b48a39759 100644 --- a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java +++ b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java @@ -5,8 +5,8 @@ import org.jabref.model.database.BibDatabase; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/search/SearchQueryTest.java b/src/test/java/org/jabref/logic/search/SearchQueryTest.java index 8e030482fe7..d430eab0e3f 100644 --- a/src/test/java/org/jabref/logic/search/SearchQueryTest.java +++ b/src/test/java/org/jabref/logic/search/SearchQueryTest.java @@ -4,8 +4,8 @@ import java.util.regex.Pattern; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.Test; @@ -122,7 +122,7 @@ public void testIsMatch() { entry.setType(StandardEntryType.Article); entry.setField(StandardField.AUTHOR, "asdf"); - assertFalse(new SearchQuery("qwer", true, true).isMatch(entry)); + assertFalse(new SearchQuery("BiblatexEntryType", true, true).isMatch(entry)); assertTrue(new SearchQuery("asdf", true, true).isMatch(entry)); assertTrue(new SearchQuery("author=asdf", true, true).isMatch(entry)); } diff --git a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java index 7b291419b38..52006447666 100644 --- a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java +++ b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java @@ -15,10 +15,10 @@ import org.jabref.logic.shared.exception.OfflineLockException; import org.jabref.model.database.shared.DBMSType; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.testutils.category.DatabaseTest; import org.junit.jupiter.api.AfterEach; diff --git a/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java b/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java index 6d36ab26fb6..2575e069719 100644 --- a/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java +++ b/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java @@ -21,10 +21,10 @@ import org.jabref.model.database.shared.DBMSType; import org.jabref.model.database.shared.DatabaseNotSupportedException; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.event.EntryEventSource; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.metadata.MetaData; import org.jabref.model.util.DummyFileUpdateMonitor; import org.jabref.testutils.category.DatabaseTest; diff --git a/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java b/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java index ea8f4452053..d694a697f7e 100644 --- a/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java +++ b/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java @@ -11,9 +11,9 @@ import org.jabref.model.database.shared.DBMSType; import org.jabref.model.database.shared.DatabaseNotSupportedException; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.util.DummyFileUpdateMonitor; import org.jabref.testutils.category.DatabaseTest; diff --git a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java index 893e5409309..6c5816b630f 100644 --- a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java +++ b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java @@ -7,8 +7,8 @@ import org.jabref.model.database.BibDatabase; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.texparser.TexBibEntriesResolverResult; import org.jabref.model.texparser.TexParserResult; diff --git a/src/test/java/org/jabref/logic/texparser/TexParserTest.java b/src/test/java/org/jabref/logic/texparser/TexParserTest.java index 36e8f919ec2..4bb0e614caa 100644 --- a/src/test/java/org/jabref/logic/texparser/TexParserTest.java +++ b/src/test/java/org/jabref/logic/texparser/TexParserTest.java @@ -7,8 +7,8 @@ import org.jabref.model.database.BibDatabase; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.texparser.TexBibEntriesResolverResult; import org.jabref.model.texparser.TexParserResult; diff --git a/src/test/java/org/jabref/logic/util/BracketedPatternTest.java b/src/test/java/org/jabref/logic/util/BracketedPatternTest.java index 2df745ce4e5..5e2cd0511e9 100644 --- a/src/test/java/org/jabref/logic/util/BracketedPatternTest.java +++ b/src/test/java/org/jabref/logic/util/BracketedPatternTest.java @@ -4,8 +4,8 @@ import org.jabref.model.database.BibDatabase; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.BibtexString; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java b/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java index b57eed02982..a6678557fb4 100644 --- a/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java +++ b/src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java b/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java index ec10590f8b7..8110322183c 100644 --- a/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java +++ b/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java @@ -7,8 +7,8 @@ import org.jabref.model.database.BibDatabase; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java index 2cbf14dc57c..4374f76b69c 100644 --- a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java +++ b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java @@ -10,9 +10,9 @@ import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.Month; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; diff --git a/src/test/java/org/jabref/model/BibDatabaseContextTest.java b/src/test/java/org/jabref/model/BibDatabaseContextTest.java index 22c9f64d969..09434f50c67 100644 --- a/src/test/java/org/jabref/model/BibDatabaseContextTest.java +++ b/src/test/java/org/jabref/model/BibDatabaseContextTest.java @@ -4,7 +4,7 @@ import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; +import org.jabref.model.entry.types.IEEETranEntryType; import org.jabref.model.metadata.MetaData; import org.junit.jupiter.api.Test; @@ -43,7 +43,7 @@ public void testTypeBasedOnInferredModeBibTeX() { @Test public void testTypeBasedOnInferredModeBiblatex() { BibDatabase db = new BibDatabase(); - BibEntry e1 = new BibEntry(StandardEntryType.Electronic); + BibEntry e1 = new BibEntry(IEEETranEntryType.Electronic); db.insertEntry(e1); BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(db); diff --git a/src/test/java/org/jabref/model/BibEntryTypeFactoryTest.java b/src/test/java/org/jabref/model/BibEntryTypeFactoryTest.java index ad8a98a808a..9cfd2533521 100644 --- a/src/test/java/org/jabref/model/BibEntryTypeFactoryTest.java +++ b/src/test/java/org/jabref/model/BibEntryTypeFactoryTest.java @@ -8,15 +8,15 @@ import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntryType; import org.jabref.model.entry.BibEntryTypesManager; -import org.jabref.model.entry.BiblatexEntryTypes; -import org.jabref.model.entry.BibtexEntryTypes; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.IEEETranEntryTypes; -import org.jabref.model.entry.StandardEntryType; -import org.jabref.model.entry.UnknownEntryType; import org.jabref.model.entry.field.BibField; import org.jabref.model.entry.field.FieldPriority; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions; +import org.jabref.model.entry.types.BibtexEntryTypeDefinitions; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions; +import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.entry.types.UnknownEntryType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ class BibEntryTypeFactoryTest { - private static final EntryType UNKNOWN_TYPE = new UnknownEntryType("aaaaarticle"); + private static final EntryType UNKNOWN_TYPE = new UnknownEntryType("unknownType"); private static final EntryType CUSTOM_TYPE = new UnknownEntryType("customType"); private BibEntryType newCustomType; private BibEntryType overwrittenStandardType; @@ -53,15 +53,15 @@ void setUp() { @Test void allTypesBibtexAreCorrect() { - TreeSet defaultTypes = new TreeSet<>(BibtexEntryTypes.ALL); - defaultTypes.addAll(IEEETranEntryTypes.ALL); + TreeSet defaultTypes = new TreeSet<>(BibtexEntryTypeDefinitions.ALL); + defaultTypes.addAll(IEEETranEntryTypeDefinitions.ALL); assertEquals(defaultTypes, entryTypesManager.getAllTypes(BibDatabaseMode.BIBTEX)); } @Test void allTypesBiblatexAreCorrect() { - TreeSet defaultTypes = new TreeSet<>(BiblatexEntryTypes.ALL); + TreeSet defaultTypes = new TreeSet<>(BiblatexEntryTypeDefinitions.ALL); assertEquals(defaultTypes, entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX)); } diff --git a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java index 98402b03023..92e001e3604 100644 --- a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java +++ b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java @@ -4,10 +4,10 @@ import java.util.Collection; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.EntryType; -import org.jabref.model.entry.StandardEntryType; -import org.jabref.model.entry.UnknownEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.EntryType; +import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.entry.types.UnknownEntryType; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/model/database/BibDatabaseTest.java b/src/test/java/org/jabref/model/database/BibDatabaseTest.java index e064d56a737..a790027e58b 100644 --- a/src/test/java/org/jabref/model/database/BibDatabaseTest.java +++ b/src/test/java/org/jabref/model/database/BibDatabaseTest.java @@ -12,9 +12,9 @@ import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.BibtexString; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.event.TestEventListener; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/model/entry/BibEntryTests.java b/src/test/java/org/jabref/model/entry/BibEntryTests.java index e5493210db7..a0e2ee64ad0 100644 --- a/src/test/java/org/jabref/model/entry/BibEntryTests.java +++ b/src/test/java/org/jabref/model/entry/BibEntryTests.java @@ -11,6 +11,7 @@ import org.jabref.model.entry.field.OrFields; import org.jabref.model.entry.field.SpecialField; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import com.google.common.collect.Sets; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java index 93ed231d33b..f4ce6967dfa 100644 --- a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java +++ b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java @@ -1,6 +1,7 @@ package org.jabref.model.entry; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java b/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java index cd75a4436f9..b16ddb1337d 100644 --- a/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java +++ b/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java @@ -1,8 +1,8 @@ package org.jabref.model.search.rules; import org.jabref.model.entry.BibEntry; -import org.jabref.model.entry.StandardEntryType; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.entry.types.StandardEntryType; import org.junit.jupiter.api.Test;