From b3dca26cbe600e3da1082c0e41ed97a632a71d4d Mon Sep 17 00:00:00 2001 From: Carl Christian Snethlage Date: Wed, 27 May 2020 18:39:28 +0200 Subject: [PATCH 1/4] Reworded 'BibtexKey' to 'CitationKey' --- .../org/jabref/cli/ArgumentProcessor.java | 12 +- src/main/java/org/jabref/cli/JabRefCLI.java | 6 +- .../org/jabref/gui/EntryTypeViewModel.java | 4 +- src/main/java/org/jabref/gui/JabRefFrame.java | 10 +- .../jabref/gui/actions/StandardActions.java | 18 +- .../CitationKeyPatternAction.java} | 8 +- .../CitationKeyPatternDialog.java} | 22 +- .../CitationKeyPatternPanel.java} | 24 +- .../GenerateCitationKeyAction.java} | 19 +- .../GenerateCitationKeySingleAction.java} | 14 +- ...anel.fxml => CitationKeyPatternPanel.fxml} | 2 +- ...anel.java => CitationKeyPatternPanel.java} | 34 +- ... => CitationKeyPatternPanelItemModel.java} | 4 +- ... => CitationKeyPatternPanelViewModel.java} | 24 +- ...CustomizeGeneralFieldsDialogViewModel.java | 4 +- .../org/jabref/gui/edit/CopyMoreAction.java | 22 +- .../jabref/gui/entryeditor/EntryEditor.fxml | 2 +- .../jabref/gui/entryeditor/EntryEditor.java | 4 +- .../LatexCitationsTabViewModel.java | 2 +- .../gui/externalfiles/ImportHandler.java | 8 +- ...xKeyEditor.fxml => CitationKeyEditor.fxml} | 2 +- ...xKeyEditor.java => CitationKeyEditor.java} | 17 +- ...l.java => CitationKeyEditorViewModel.java} | 8 +- .../jabref/gui/fieldeditors/FieldEditors.java | 2 +- .../gui/integrity/IntegrityCheckAction.java | 2 +- .../gui/integrity/IntegrityCheckDialog.fxml | 4 +- .../org/jabref/gui/keyboard/KeyBinding.java | 12 +- .../openoffice/BibEntryNotFoundException.java | 10 +- .../org/jabref/gui/openoffice/OOBibBase.java | 10 +- .../gui/openoffice/OpenOfficePanel.java | 26 +- ...ernTab.fxml => CitationKeyPatternTab.fxml} | 4 +- ...ew.java => CitationKeyPatternTabView.java} | 16 +- ...va => CitationKeyPatternTabViewModel.java} | 62 +-- .../org/jabref/gui/preferences/FileTab.fxml | 4 +- .../PreferencesDialogViewModel.java | 4 +- .../gui/push/AbstractPushToApplication.java | 2 +- .../jabref/gui/push/PushToApplication.java | 6 +- .../gui/push/PushToApplicationAction.java | 6 +- .../gui/shared/SharedDatabaseUIManager.java | 4 +- .../jabref/logic/bibtex/BibEntryWriter.java | 4 +- .../logic/bibtex/comparator/MetaDataDiff.java | 2 +- .../bibtexkeypattern/BracketedPattern.java | 4 +- ...nerator.java => CitationKeyGenerator.java} | 50 +- ...ava => CitationKeyPatternPreferences.java} | 26 +- .../logic/exporter/BibDatabaseWriter.java | 16 +- .../logic/exporter/MetaDataSerializer.java | 20 +- .../logic/exporter/SavePreferences.java | 26 +- .../importer/ImportFormatPreferences.java | 14 +- .../importer/fileformat/BibtexParser.java | 6 +- .../importer/fileformat/EndnoteImporter.java | 4 +- ...eyChecker.java => CitationKeyChecker.java} | 4 +- ....java => CitationKeyDeviationChecker.java} | 16 +- ...ava => CitationKeyDuplicationChecker.java} | 6 +- .../logic/integrity/EntryLinkChecker.java | 4 +- .../jabref/logic/integrity/FieldCheckers.java | 4 +- .../logic/integrity/IntegrityCheck.java | 10 +- ...cker.java => ValidCitationKeyChecker.java} | 10 +- .../jabref/logic/openoffice/OOBibStyle.java | 2 +- .../jabref/logic/shared/DBMSSynchronizer.java | 8 +- ...r.java => CitationKeyBasedFileFinder.java} | 8 +- .../org/jabref/logic/util/io/FileFinders.java | 2 +- .../migrations/PreferencesMigrations.java | 16 +- ...n.java => AbstractCitationKeyPattern.java} | 24 +- .../DatabaseBibtexKeyPattern.java | 19 - .../DatabaseCitationKeyPattern.java | 19 + .../GlobalBibtexKeyPattern.java | 21 - .../GlobalCitationKeyPattern.java | 21 + .../jabref/model/database/BibDatabase.java | 2 +- .../java/org/jabref/model/entry/BibEntry.java | 4 +- .../org/jabref/model/metadata/MetaData.java | 14 +- .../jabref/preferences/JabRefPreferences.java | 82 +-- .../preferences/PreferencesService.java | 14 +- src/main/resources/l10n/JabRef_en.properties | 64 +-- .../gui/exporter/SaveDatabaseActionTest.java | 12 +- ...est.java => CitationKeyGeneratorTest.java} | 488 +++++++++--------- .../MakeLabelWithDatabaseTest.java | 140 ++--- .../MakeLabelWithoutDatabaseTest.java | 4 +- .../logic/cleanup/RenamePdfCleanupTest.java | 2 +- .../exporter/BibtexDatabaseWriterTest.java | 14 +- .../exporter/MetaDataSerializerTest.java | 6 +- .../importer/fileformat/BibtexParserTest.java | 18 +- ...rTest.java => CitationKeyCheckerTest.java} | 4 +- .../logic/integrity/IntegrityCheckTest.java | 24 +- .../logic/l10n/LocalizationParserTest.java | 2 +- .../logic/openoffice/OOBibStyleTest.java | 6 +- .../logic/shared/DBMSSynchronizerTest.java | 4 +- .../shared/SynchronizationTestSimulator.java | 4 +- ...va => CitationKeyBasedFileFinderTest.java} | 10 +- 88 files changed, 868 insertions(+), 860 deletions(-) rename src/main/java/org/jabref/gui/{bibtexkeypattern/BibtexKeyPatternAction.java => citationkeypattern/CitationKeyPatternAction.java} (57%) rename src/main/java/org/jabref/gui/{bibtexkeypattern/BibtexKeyPatternDialog.java => citationkeypattern/CitationKeyPatternDialog.java} (67%) rename src/main/java/org/jabref/gui/{bibtexkeypattern/BibtexKeyPatternPanel.java => citationkeypattern/CitationKeyPatternPanel.java} (86%) rename src/main/java/org/jabref/gui/{bibtexkeypattern/GenerateBibtexKeyAction.java => citationkeypattern/GenerateCitationKeyAction.java} (86%) rename src/main/java/org/jabref/gui/{bibtexkeypattern/GenerateBibtexKeySingleAction.java => citationkeypattern/GenerateCitationKeySingleAction.java} (60%) rename src/main/java/org/jabref/gui/commonfxcontrols/{BibtexKeyPatternPanel.fxml => CitationKeyPatternPanel.fxml} (90%) rename src/main/java/org/jabref/gui/commonfxcontrols/{BibtexKeyPatternPanel.java => CitationKeyPatternPanel.java} (70%) rename src/main/java/org/jabref/gui/commonfxcontrols/{BibtexKeyPatternPanelItemModel.java => CitationKeyPatternPanelItemModel.java} (90%) rename src/main/java/org/jabref/gui/commonfxcontrols/{BibtexKeyPatternPanelViewModel.java => CitationKeyPatternPanelViewModel.java} (71%) rename src/main/java/org/jabref/gui/fieldeditors/{BibtexKeyEditor.fxml => CitationKeyEditor.fxml} (84%) rename src/main/java/org/jabref/gui/fieldeditors/{BibtexKeyEditor.java => CitationKeyEditor.java} (74%) rename src/main/java/org/jabref/gui/fieldeditors/{BibtexKeyEditorViewModel.java => CitationKeyEditorViewModel.java} (63%) rename src/main/java/org/jabref/gui/preferences/{BibtexKeyPatternTab.fxml => CitationKeyPatternTab.fxml} (95%) rename src/main/java/org/jabref/gui/preferences/{BibtexKeyPatternTabView.java => CitationKeyPatternTabView.java} (83%) rename src/main/java/org/jabref/gui/preferences/{BibtexKeyPatternTabViewModel.java => CitationKeyPatternTabViewModel.java} (62%) rename src/main/java/org/jabref/logic/bibtexkeypattern/{BibtexKeyGenerator.java => CitationKeyGenerator.java} (76%) rename src/main/java/org/jabref/logic/bibtexkeypattern/{BibtexKeyPatternPreferences.java => CitationKeyPatternPreferences.java} (69%) rename src/main/java/org/jabref/logic/integrity/{BibtexKeyChecker.java => CitationKeyChecker.java} (86%) rename src/main/java/org/jabref/logic/integrity/{BibtexkeyDeviationChecker.java => CitationKeyDeviationChecker.java} (55%) rename src/main/java/org/jabref/logic/integrity/{BibtexKeyDuplicationChecker.java => CitationKeyDuplicationChecker.java} (83%) rename src/main/java/org/jabref/logic/integrity/{ValidBibtexKeyChecker.java => ValidCitationKeyChecker.java} (56%) rename src/main/java/org/jabref/logic/util/io/{CiteKeyBasedFileFinder.java => CitationKeyBasedFileFinder.java} (92%) rename src/main/java/org/jabref/model/bibtexkeypattern/{AbstractBibtexKeyPattern.java => AbstractCitationKeyPattern.java} (80%) delete mode 100644 src/main/java/org/jabref/model/bibtexkeypattern/DatabaseBibtexKeyPattern.java create mode 100644 src/main/java/org/jabref/model/bibtexkeypattern/DatabaseCitationKeyPattern.java delete mode 100644 src/main/java/org/jabref/model/bibtexkeypattern/GlobalBibtexKeyPattern.java create mode 100644 src/main/java/org/jabref/model/bibtexkeypattern/GlobalCitationKeyPattern.java rename src/test/java/org/jabref/logic/bibtexkeypattern/{BibtexKeyGeneratorTest.java => CitationKeyGeneratorTest.java} (59%) rename src/test/java/org/jabref/logic/integrity/{BibtexKeyCheckerTest.java => CitationKeyCheckerTest.java} (85%) rename src/test/java/org/jabref/logic/util/io/{CiteKeyBasedFileFinderTest.java => CitationKeyBasedFileFinderTest.java} (91%) diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java index 957a0fab500..2dafa9e35ab 100644 --- a/src/main/java/org/jabref/cli/ArgumentProcessor.java +++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java @@ -16,7 +16,7 @@ import org.jabref.gui.externalfiles.AutoSetFileLinksUtil; import org.jabref.gui.externalfiletype.ExternalFileTypes; import org.jabref.gui.undo.NamedCompound; -import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator; +import org.jabref.logic.bibtexkeypattern.CitationKeyGenerator; import org.jabref.logic.exporter.AtomicFileWriter; import org.jabref.logic.exporter.BibDatabaseWriter; import org.jabref.logic.exporter.BibtexDatabaseWriter; @@ -206,8 +206,8 @@ private List processArguments() { } } - if (cli.isGenerateBibtexKeys()) { - regenerateBibtexKeys(loaded); + if (cli.isGenerateCitationKeys()) { + regenerateCitationKeys(loaded); } if (cli.isAutomaticallySetFileLinks()) { @@ -500,13 +500,13 @@ private void automaticallySetFileLinks(List loaded) { } } - private void regenerateBibtexKeys(List loaded) { + private void regenerateCitationKeys(List loaded) { for (ParserResult parserResult : loaded) { BibDatabase database = parserResult.getDatabase(); - LOGGER.info(Localization.lang("Regenerating BibTeX keys according to metadata")); + LOGGER.info(Localization.lang("Regenerating citation keys according to metadata")); - BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(parserResult.getDatabaseContext(), Globals.prefs.getBibtexKeyPatternPreferences()); + CitationKeyGenerator keyGenerator = new CitationKeyGenerator(parserResult.getDatabaseContext(), Globals.prefs.getCitationKeyPatternPreferences()); for (BibEntry entry : database.getEntries()) { keyGenerator.generateAndSetKey(entry); } diff --git a/src/main/java/org/jabref/cli/JabRefCLI.java b/src/main/java/org/jabref/cli/JabRefCLI.java index 167875b322d..f9b0b4d4cbf 100644 --- a/src/main/java/org/jabref/cli/JabRefCLI.java +++ b/src/main/java/org/jabref/cli/JabRefCLI.java @@ -139,8 +139,8 @@ public String getExportMatches() { return cl.getOptionValue("exportMatches"); } - public boolean isGenerateBibtexKeys() { - return cl.hasOption("generateBibtexKeys"); + public boolean isGenerateCitationKeys() { + return cl.hasOption("generateCitationKeys"); } public boolean isAutomaticallySetFileLinks() { @@ -154,7 +154,7 @@ private static Options getOptions() { options.addOption("h", "help", false, Localization.lang("Display help on command line options")); options.addOption("n", "nogui", false, Localization.lang("No GUI. Only process command line options")); options.addOption("asfl", "automaticallySetFileLinks", false, Localization.lang("Automatically set file links")); - options.addOption("g", "generateBibtexKeys", false, Localization.lang("Regenerate all keys for the entries in a BibTeX file")); + options.addOption("g", "generateCitationKeys", false, Localization.lang("Regenerate all keys for the entries in a BibTeX file")); options.addOption("b", "blank", false, Localization.lang("Do not open any files at startup")); options.addOption("v", "version", false, Localization.lang("Display version")); options.addOption(null, "debug", false, Localization.lang("Show debug level messages")); diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java index 5d24dde230a..c69e0764d9a 100644 --- a/src/main/java/org/jabref/gui/EntryTypeViewModel.java +++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java @@ -17,7 +17,7 @@ import org.jabref.Globals; import org.jabref.gui.duplicationFinder.DuplicateResolverDialog; import org.jabref.logic.bibtex.DuplicateCheck; -import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator; +import org.jabref.logic.bibtexkeypattern.CitationKeyGenerator; import org.jabref.logic.importer.FetcherException; import org.jabref.logic.importer.IdBasedFetcher; import org.jabref.logic.importer.WebFetchers; @@ -166,7 +166,7 @@ public void runFetcherWorker() { } } else { // Regenerate CiteKey of imported BibEntry - new BibtexKeyGenerator(basePanel.getBibDatabaseContext(), prefs.getBibtexKeyPatternPreferences()).generateAndSetKey(entry); + new CitationKeyGenerator(basePanel.getBibDatabaseContext(), prefs.getCitationKeyPatternPreferences()).generateAndSetKey(entry); basePanel.insertEntry(entry); } searchSuccesfulProperty.set(true); diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index 3f9126fd63f..1a431189cf5 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -51,8 +51,8 @@ import org.jabref.gui.actions.StandardActions; import org.jabref.gui.auximport.NewSubLibraryAction; import org.jabref.gui.bibtexextractor.ExtractBibtexAction; -import org.jabref.gui.bibtexkeypattern.BibtexKeyPatternAction; -import org.jabref.gui.bibtexkeypattern.GenerateBibtexKeyAction; +import org.jabref.gui.citationkeypattern.CitationKeyPatternAction; +import org.jabref.gui.citationkeypattern.GenerateCitationKeyAction; import org.jabref.gui.cleanup.CleanupAction; import org.jabref.gui.contentselector.ManageContentSelectorAction; import org.jabref.gui.copyfiles.CopyFilesAction; @@ -528,7 +528,7 @@ private Node createToolbar() { factory.createIconButton(StandardActions.PASTE, new EditAction(StandardActions.PASTE, this, stateManager)), new Separator(Orientation.VERTICAL), pushToApplicationButton, - factory.createIconButton(StandardActions.GENERATE_CITE_KEYS, new GenerateBibtexKeyAction(this, dialogService, stateManager)), + factory.createIconButton(StandardActions.GENERATE_CITE_KEYS, new GenerateCitationKeyAction(this, dialogService, stateManager)), factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new CleanupAction(this, prefs, dialogService, stateManager)), new Separator(Orientation.VERTICAL), factory.createIconButton(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref")), @@ -761,7 +761,7 @@ private MenuBar createMenu() { new SeparatorMenuItem(), factory.createMenuItem(StandardActions.REPLACE_ALL, new ReplaceStringAction(this, stateManager)), - factory.createMenuItem(StandardActions.GENERATE_CITE_KEYS, new GenerateBibtexKeyAction(this, dialogService, stateManager)), + factory.createMenuItem(StandardActions.GENERATE_CITE_KEYS, new GenerateCitationKeyAction(this, dialogService, stateManager)), new SeparatorMenuItem(), @@ -794,7 +794,7 @@ private MenuBar createMenu() { factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(this, stateManager)), factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(stateManager, undoManager, this.getDialogService())), factory.createMenuItem(StandardActions.EDIT_STRINGS, new BibtexStringEditorAction(stateManager)), - factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this, stateManager)) + factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new CitationKeyPatternAction(this, stateManager)) ); quality.getItems().addAll( diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java index df87f1b7e04..43b53b6031e 100644 --- a/src/main/java/org/jabref/gui/actions/StandardActions.java +++ b/src/main/java/org/jabref/gui/actions/StandardActions.java @@ -12,10 +12,10 @@ public enum StandardActions implements Action { COPY_MORE(Localization.lang("Copy") + "..."), COPY_TITLE(Localization.lang("Copy title"), KeyBinding.COPY_TITLE), - COPY_KEY(Localization.lang("Copy BibTeX key"), KeyBinding.COPY_BIBTEX_KEY), - COPY_CITE_KEY(Localization.lang("Copy \\cite{BibTeX key}"), KeyBinding.COPY_CITE_BIBTEX_KEY), - COPY_KEY_AND_TITLE(Localization.lang("Copy BibTeX key and title"), KeyBinding.COPY_BIBTEX_KEY_AND_TITLE), - COPY_KEY_AND_LINK(Localization.lang("Copy BibTeX key and link"), KeyBinding.COPY_BIBTEX_KEY_AND_LINK), + COPY_KEY(Localization.lang("Copy citation key"), KeyBinding.COPY_BIBTEX_KEY), + COPY_CITE_KEY(Localization.lang("Copy \\cite{citation key}"), KeyBinding.COPY_CITE_BIBTEX_KEY), + COPY_KEY_AND_TITLE(Localization.lang("Copy citation key and title"), KeyBinding.COPY_BIBTEX_KEY_AND_TITLE), + COPY_KEY_AND_LINK(Localization.lang("Copy citation key and link"), KeyBinding.COPY_BIBTEX_KEY_AND_LINK), COPY_CITATION_HTML(Localization.lang("Copy citation") + " (HTML)", KeyBinding.COPY_PREVIEW), COPY_CITATION_MORE(Localization.lang("Copy citation") + "..."), COPY_CITATION_TEXT("Text"), @@ -106,12 +106,12 @@ public enum StandardActions implements Action { SETUP_GENERAL_FIELDS(Localization.lang("Set up general fields")), MANAGE_EXTERNAL_FILETYPES(Localization.lang("Manage external file types")), MANAGE_PROTECTED_TERMS(Localization.lang("Manage protected terms")), - BIBTEX_KEY_PATTERN(Localization.lang("BibTeX key patterns")), + BIBTEX_KEY_PATTERN(Localization.lang("Citation key patterns")), SHOW_PREFS(Localization.lang("Preferences")), MANAGE_JOURNALS(Localization.lang("Manage journal abbreviations")), CUSTOMIZE_KEYBINDING(Localization.lang("Customize key bindings"), IconTheme.JabRefIcons.KEY_BINDINGS), MANAGE_CONTENT_SELECTORS(Localization.lang("Manage content selectors"), IconTheme.JabRefIcons.PREFERENCES), - MANAGE_CITE_KEY_PATTERNS(Localization.lang("BibTeX key patterns")), + MANAGE_CITE_KEY_PATTERNS(Localization.lang("Citation key patterns")), EDIT_ENTRY(Localization.lang("Open entry editor"), IconTheme.JabRefIcons.EDIT_ENTRY, KeyBinding.EDIT_ENTRY), SHOW_PDF_VIEWER(Localization.lang("Open document viewer"), IconTheme.JabRefIcons.PDF_FILE), @@ -128,14 +128,14 @@ public enum StandardActions implements Action { FIND_DUPLICATES(Localization.lang("Find duplicates"), IconTheme.JabRefIcons.FIND_DUPLICATES), MERGE_ENTRIES(Localization.lang("Merge entries"), IconTheme.JabRefIcons.MERGE_ENTRIES), - RESOLVE_DUPLICATE_KEYS(Localization.lang("Resolve duplicate BibTeX keys"), Localization.lang("Find and remove duplicate BibTeX keys"), KeyBinding.RESOLVE_DUPLICATE_BIBTEX_KEYS), + RESOLVE_DUPLICATE_KEYS(Localization.lang("Resolve duplicate citation keys"), Localization.lang("Find and remove duplicate citation keys"), KeyBinding.RESOLVE_DUPLICATE_BIBTEX_KEYS), CHECK_INTEGRITY(Localization.lang("Check integrity"), KeyBinding.CHECK_INTEGRITY), FIND_UNLINKED_FILES(Localization.lang("Search for unlinked local files"), IconTheme.JabRefIcons.SEARCH, KeyBinding.FIND_UNLINKED_FILES), AUTO_LINK_FILES(Localization.lang("Automatically set file links"), IconTheme.JabRefIcons.AUTO_FILE_LINK, KeyBinding.AUTOMATICALLY_LINK_FILES), LOOKUP_DOC_IDENTIFIER(Localization.lang("Search document identifier online")), LOOKUP_FULLTEXT(Localization.lang("Search full text documents online"), IconTheme.JabRefIcons.FILE_SEARCH, KeyBinding.DOWNLOAD_FULL_TEXT), - GENERATE_CITE_KEY(Localization.lang("Generate BibTeX key"), IconTheme.JabRefIcons.MAKE_KEY, KeyBinding.AUTOGENERATE_BIBTEX_KEYS), - GENERATE_CITE_KEYS(Localization.lang("Generate BibTeX keys"), IconTheme.JabRefIcons.MAKE_KEY, KeyBinding.AUTOGENERATE_BIBTEX_KEYS), + GENERATE_CITE_KEY(Localization.lang("Generate citation key"), IconTheme.JabRefIcons.MAKE_KEY, KeyBinding.AUTOGENERATE_BIBTEX_KEYS), + GENERATE_CITE_KEYS(Localization.lang("Generate citation keys"), IconTheme.JabRefIcons.MAKE_KEY, KeyBinding.AUTOGENERATE_BIBTEX_KEYS), DOWNLOAD_FULL_TEXT(Localization.lang("Search full text documents online"), IconTheme.JabRefIcons.FILE_SEARCH, KeyBinding.DOWNLOAD_FULL_TEXT), CLEANUP_ENTRIES(Localization.lang("Cleanup entries"), IconTheme.JabRefIcons.CLEANUP_ENTRIES, KeyBinding.CLEANUP), SET_FILE_LINKS(Localization.lang("Automatically set file links"), KeyBinding.AUTOMATICALLY_LINK_FILES), diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternAction.java b/src/main/java/org/jabref/gui/citationkeypattern/CitationKeyPatternAction.java similarity index 57% rename from src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternAction.java rename to src/main/java/org/jabref/gui/citationkeypattern/CitationKeyPatternAction.java index 6875e350836..74f20a3b7b4 100644 --- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternAction.java +++ b/src/main/java/org/jabref/gui/citationkeypattern/CitationKeyPatternAction.java @@ -1,4 +1,4 @@ -package org.jabref.gui.bibtexkeypattern; +package org.jabref.gui.citationkeypattern; import org.jabref.gui.JabRefFrame; import org.jabref.gui.StateManager; @@ -6,11 +6,11 @@ import static org.jabref.gui.actions.ActionHelper.needsDatabase; -public class BibtexKeyPatternAction extends SimpleCommand { +public class CitationKeyPatternAction extends SimpleCommand { private final JabRefFrame frame; - public BibtexKeyPatternAction(JabRefFrame frame, StateManager stateManager) { + public CitationKeyPatternAction(JabRefFrame frame, StateManager stateManager) { this.frame = frame; this.executable.bind(needsDatabase(stateManager)); @@ -18,6 +18,6 @@ public BibtexKeyPatternAction(JabRefFrame frame, StateManager stateManager) { @Override public void execute() { - new BibtexKeyPatternDialog(frame.getCurrentBasePanel()).showAndWait(); + new CitationKeyPatternDialog(frame.getCurrentBasePanel()).showAndWait(); } } diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java b/src/main/java/org/jabref/gui/citationkeypattern/CitationKeyPatternDialog.java similarity index 67% rename from src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java rename to src/main/java/org/jabref/gui/citationkeypattern/CitationKeyPatternDialog.java index fcafab1638e..e051ff2dcbb 100644 --- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java +++ b/src/main/java/org/jabref/gui/citationkeypattern/CitationKeyPatternDialog.java @@ -1,4 +1,4 @@ -package org.jabref.gui.bibtexkeypattern; +package org.jabref.gui.citationkeypattern; import javafx.scene.control.ButtonType; @@ -6,34 +6,34 @@ import org.jabref.gui.BasePanel; import org.jabref.gui.util.BaseDialog; import org.jabref.logic.l10n.Localization; -import org.jabref.model.bibtexkeypattern.AbstractBibtexKeyPattern; +import org.jabref.model.bibtexkeypattern.AbstractCitationKeyPattern; import org.jabref.model.metadata.MetaData; -public class BibtexKeyPatternDialog extends BaseDialog { +public class CitationKeyPatternDialog extends BaseDialog { private final MetaData metaData; private final BasePanel panel; - private final BibtexKeyPatternPanel bibtexKeyPatternPanel; + private final CitationKeyPatternPanel citationKeyPatternPanel; - public BibtexKeyPatternDialog(BasePanel panel) { - this.bibtexKeyPatternPanel = new BibtexKeyPatternPanel(panel); + public CitationKeyPatternDialog(BasePanel panel) { + this.citationKeyPatternPanel = new CitationKeyPatternPanel(panel); this.panel = panel; this.metaData = panel.getBibDatabaseContext().getMetaData(); - AbstractBibtexKeyPattern keyPattern = metaData.getCiteKeyPattern(Globals.prefs.getGlobalBibtexKeyPattern()); - bibtexKeyPatternPanel.setValues(keyPattern); + AbstractCitationKeyPattern keyPattern = metaData.getCiteKeyPattern(Globals.prefs.getGlobalCitationKeyPattern()); + citationKeyPatternPanel.setValues(keyPattern); init(); } private void init() { - this.setTitle(Localization.lang("BibTeX key patterns")); + this.setTitle(Localization.lang("Citation key patterns")); - this.getDialogPane().setContent(bibtexKeyPatternPanel.getPanel()); + this.getDialogPane().setContent(citationKeyPatternPanel.getPanel()); this.getDialogPane().getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL); this.setResultConverter(button -> { if (button == ButtonType.APPLY) { - metaData.setCiteKeyPattern(bibtexKeyPatternPanel.getKeyPatternAsDatabaseBibtexKeyPattern()); + metaData.setCiteKeyPattern(citationKeyPatternPanel.getKeyPatternAsDatabaseKeyPattern()); panel.markNonUndoableBaseChanged(); } diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/citationkeypattern/CitationKeyPatternPanel.java similarity index 86% rename from src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java rename to src/main/java/org/jabref/gui/citationkeypattern/CitationKeyPatternPanel.java index 3d5356e5ef5..de60581adfe 100644 --- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java +++ b/src/main/java/org/jabref/gui/citationkeypattern/CitationKeyPatternPanel.java @@ -1,4 +1,4 @@ -package org.jabref.gui.bibtexkeypattern; +package org.jabref.gui.citationkeypattern; import java.util.HashMap; import java.util.Map; @@ -17,14 +17,14 @@ import org.jabref.gui.help.HelpAction; import org.jabref.logic.help.HelpFile; import org.jabref.logic.l10n.Localization; -import org.jabref.model.bibtexkeypattern.AbstractBibtexKeyPattern; -import org.jabref.model.bibtexkeypattern.DatabaseBibtexKeyPattern; +import org.jabref.model.bibtexkeypattern.AbstractCitationKeyPattern; +import org.jabref.model.bibtexkeypattern.DatabaseCitationKeyPattern; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntryType; import org.jabref.model.entry.types.EntryType; import org.jabref.preferences.JabRefPreferences; -public class BibtexKeyPatternPanel extends Pane { +public class CitationKeyPatternPanel extends Pane { // default pattern protected final TextField defaultPat = new TextField(); @@ -34,14 +34,14 @@ public class BibtexKeyPatternPanel extends Pane { private final BasePanel panel; private final GridPane gridPane = new GridPane(); - public BibtexKeyPatternPanel(BasePanel panel) { + public CitationKeyPatternPanel(BasePanel panel) { this.panel = panel; gridPane.setHgap(10); gridPane.setVgap(5); buildGUI(); } - private static void setValue(TextField tf, EntryType fieldName, AbstractBibtexKeyPattern keyPattern) { + private static void setValue(TextField tf, EntryType fieldName, AbstractCitationKeyPattern keyPattern) { if (keyPattern.isDefaultValue(fieldName)) { tf.setText(""); } else { @@ -117,8 +117,8 @@ private void buildGUI() { gridPane.add(btnDefaultAll1, 2, rowIndex); } - public DatabaseBibtexKeyPattern getKeyPatternAsDatabaseBibtexKeyPattern() { - DatabaseBibtexKeyPattern res = new DatabaseBibtexKeyPattern(Globals.prefs.getGlobalBibtexKeyPattern()); + public DatabaseCitationKeyPattern getKeyPatternAsDatabaseKeyPattern() { + DatabaseCitationKeyPattern res = new DatabaseCitationKeyPattern(Globals.prefs.getGlobalCitationKeyPattern()); fillPatternUsingPanelData(res); return res; } @@ -126,12 +126,12 @@ public DatabaseBibtexKeyPattern getKeyPatternAsDatabaseBibtexKeyPattern() { /** * fill the given LabelPattern by values generated from the text fields */ - private void fillPatternUsingPanelData(AbstractBibtexKeyPattern keypatterns) { + private void fillPatternUsingPanelData(AbstractCitationKeyPattern keypatterns) { // each entry type for (Map.Entry entry : textFields.entrySet()) { String text = entry.getValue().getText(); if (!text.trim().isEmpty()) { - keypatterns.addBibtexKeyPattern(entry.getKey(), text); + keypatterns.addCitationKeyPattern(entry.getKey(), text); } } @@ -145,9 +145,9 @@ private void fillPatternUsingPanelData(AbstractBibtexKeyPattern keypatterns) { /** * Fills the current values to the text fields * - * @param keyPattern the BibtexKeyPattern to use as initial value + * @param keyPattern the CitationKeyPattern to use as initial value */ - public void setValues(AbstractBibtexKeyPattern keyPattern) { + public void setValues(AbstractCitationKeyPattern keyPattern) { for (Map.Entry entry : textFields.entrySet()) { setValue(entry.getValue(), entry.getKey(), keyPattern); } diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeyAction.java b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java similarity index 86% rename from src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeyAction.java rename to src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java index 246d672650d..9d30a082c9d 100644 --- a/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeyAction.java +++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java @@ -1,4 +1,4 @@ -package org.jabref.gui.bibtexkeypattern; +package org.jabref.gui.citationkeypattern; import java.util.List; @@ -11,12 +11,12 @@ import org.jabref.gui.undo.NamedCompound; import org.jabref.gui.undo.UndoableKeyChange; import org.jabref.gui.util.BackgroundTask; -import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator; +import org.jabref.logic.bibtexkeypattern.CitationKeyGenerator; import org.jabref.logic.l10n.Localization; import org.jabref.model.entry.BibEntry; import org.jabref.preferences.JabRefPreferences; -public class GenerateBibtexKeyAction extends SimpleCommand { +public class GenerateCitationKeyAction extends SimpleCommand { private final JabRefFrame frame; private final DialogService dialogService; @@ -25,7 +25,7 @@ public class GenerateBibtexKeyAction extends SimpleCommand { private List entries; private boolean isCanceled; - public GenerateBibtexKeyAction(JabRefFrame frame, DialogService dialogService, StateManager stateManager) { + public GenerateCitationKeyAction(JabRefFrame frame, DialogService dialogService, StateManager stateManager) { this.frame = frame; this.dialogService = dialogService; this.stateManager = stateManager; @@ -38,11 +38,11 @@ public void execute() { entries = stateManager.getSelectedEntries(); if (entries.isEmpty()) { - dialogService.showWarningDialogAndWait(Localization.lang("Autogenerate BibTeX keys"), + dialogService.showWarningDialogAndWait(Localization.lang("Autogenerate citation keys"), Localization.lang("First select the entries you want keys to be generated for.")); return; } - dialogService.notify(formatOutputMessage(Localization.lang("Generating BibTeX key for"), entries.size())); + dialogService.notify(formatOutputMessage(Localization.lang("Generating citation key for"), entries.size())); checkOverwriteKeysChosen(); @@ -88,8 +88,9 @@ private void generateKeys() { stateManager.getActiveDatabase().ifPresent(databaseContext -> { // generate the new cite keys for each entry - final NamedCompound compound = new NamedCompound(Localization.lang("Autogenerate BibTeX keys")); - BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(databaseContext, Globals.prefs.getBibtexKeyPatternPreferences()); + final NamedCompound compound = new NamedCompound(Localization.lang("Autogenerate citation keys")); + CitationKeyGenerator keyGenerator = + new CitationKeyGenerator(databaseContext, Globals.prefs.getCitationKeyPatternPreferences()); for (BibEntry entry : entries) { keyGenerator.generateAndSetKey(entry) .ifPresent(fieldChange -> compound.addEdit(new UndoableKeyChange(fieldChange))); @@ -102,7 +103,7 @@ private void generateKeys() { } frame.getCurrentBasePanel().markBaseChanged(); - dialogService.notify(formatOutputMessage(Localization.lang("Generated BibTeX key for"), entries.size())); + dialogService.notify(formatOutputMessage(Localization.lang("Generated citation key for"), entries.size())); }); } diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java similarity index 60% rename from src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java rename to src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java index 7e8501dbcd8..0fad7fad19d 100644 --- a/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java +++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java @@ -1,16 +1,16 @@ -package org.jabref.gui.bibtexkeypattern; +package org.jabref.gui.citationkeypattern; import javax.swing.undo.UndoManager; import org.jabref.gui.DialogService; import org.jabref.gui.actions.SimpleCommand; import org.jabref.gui.undo.UndoableKeyChange; -import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator; +import org.jabref.logic.bibtexkeypattern.CitationKeyGenerator; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; import org.jabref.preferences.PreferencesService; -public class GenerateBibtexKeySingleAction extends SimpleCommand { +public class GenerateCitationKeySingleAction extends SimpleCommand { private final DialogService dialogService; private final BibDatabaseContext databaseContext; @@ -18,22 +18,22 @@ public class GenerateBibtexKeySingleAction extends SimpleCommand { private final BibEntry entry; private final UndoManager undoManager; - public GenerateBibtexKeySingleAction(BibEntry entry, BibDatabaseContext databaseContext, DialogService dialogService, PreferencesService preferencesService, UndoManager undoManager) { + public GenerateCitationKeySingleAction(BibEntry entry, BibDatabaseContext databaseContext, DialogService dialogService, PreferencesService preferencesService, UndoManager undoManager) { this.entry = entry; this.databaseContext = databaseContext; this.dialogService = dialogService; this.preferencesService = preferencesService; this.undoManager = undoManager; - if (preferencesService.getBibtexKeyPatternPreferences().shouldAvoidOverwriteCiteKey()) { + if (preferencesService.getCitationKeyPatternPreferences().shouldAvoidOverwriteCiteKey()) { this.executable.bind(entry.getCiteKeyBinding().isEmpty()); } } @Override public void execute() { - if (!entry.hasCiteKey() || GenerateBibtexKeyAction.confirmOverwriteKeys(dialogService)) { - new BibtexKeyGenerator(databaseContext, preferencesService.getBibtexKeyPatternPreferences()) + if (!entry.hasCiteKey() || GenerateCitationKeyAction.confirmOverwriteKeys(dialogService)) { + new CitationKeyGenerator(databaseContext, preferencesService.getCitationKeyPatternPreferences()) .generateAndSetKey(entry) .ifPresent(change -> undoManager.addEdit(new UndoableKeyChange(change))); } diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanel.fxml b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.fxml similarity index 90% rename from src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanel.fxml rename to src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.fxml index 861cec5714b..57936b93824 100644 --- a/src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanel.fxml +++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.fxml @@ -4,7 +4,7 @@ + fx:controller="org.jabref.gui.commonfxcontrols.CitationKeyPatternPanel"> diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java similarity index 70% rename from src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanel.java rename to src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java index b4c8db1605c..42b28084211 100644 --- a/src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanel.java +++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java @@ -14,28 +14,28 @@ import org.jabref.gui.icon.IconTheme; import org.jabref.gui.util.ValueTableCellFactory; import org.jabref.logic.l10n.Localization; -import org.jabref.model.bibtexkeypattern.AbstractBibtexKeyPattern; +import org.jabref.model.bibtexkeypattern.AbstractCitationKeyPattern; import org.jabref.model.entry.BibEntryType; import org.jabref.model.entry.types.EntryType; import org.jabref.preferences.JabRefPreferences; import com.airhacks.afterburner.views.ViewLoader; -public class BibtexKeyPatternPanel extends TableView { +public class CitationKeyPatternPanel extends TableView { - @FXML public TableColumn entryTypeColumn; - @FXML public TableColumn patternColumn; - @FXML public TableColumn actionsColumn; + @FXML public TableColumn entryTypeColumn; + @FXML public TableColumn patternColumn; + @FXML public TableColumn actionsColumn; - private BibtexKeyPatternPanelViewModel viewModel; + private CitationKeyPatternPanelViewModel viewModel; private long lastKeyPressTime; private String tableSearchTerm; - public BibtexKeyPatternPanel(JabRefPreferences preferences, Collection entryTypeList, AbstractBibtexKeyPattern keyPattern) { + public CitationKeyPatternPanel(JabRefPreferences preferences, Collection entryTypeList, AbstractCitationKeyPattern keyPattern) { super(); - viewModel = new BibtexKeyPatternPanelViewModel(preferences, entryTypeList, keyPattern); + viewModel = new CitationKeyPatternPanelViewModel(preferences, entryTypeList, keyPattern); ViewLoader.view(this) .root(this) @@ -49,11 +49,11 @@ private void initialize() { entryTypeColumn.setSortable(true); entryTypeColumn.setReorderable(false); entryTypeColumn.setCellValueFactory(cellData -> cellData.getValue().entryType()); - new ValueTableCellFactory() + new ValueTableCellFactory() .withText(EntryType::getDisplayName) .install(entryTypeColumn); this.setOnSort(event -> - viewModel.patternListProperty().sort(BibtexKeyPatternPanelViewModel.defaultOnTopComparator)); + viewModel.patternListProperty().sort(CitationKeyPatternPanelViewModel.defaultOnTopComparator)); patternColumn.setSortable(true); patternColumn.setReorderable(false); @@ -61,13 +61,13 @@ private void initialize() { patternColumn.setCellFactory(TextFieldTableCell.forTableColumn()); patternColumn.setEditable(true); patternColumn.setOnEditCommit( - (TableColumn.CellEditEvent event) -> + (TableColumn.CellEditEvent event) -> event.getRowValue().setPattern(event.getNewValue())); actionsColumn.setSortable(false); actionsColumn.setReorderable(false); actionsColumn.setCellValueFactory(cellData -> cellData.getValue().entryType()); - new ValueTableCellFactory() + new ValueTableCellFactory() .withGraphic(entryType -> IconTheme.JabRefIcons.REFRESH.getGraphicNode()) .withTooltip(entryType -> String.format(Localization.lang("Reset %s to default value"), entryType.getDisplayName())) @@ -88,11 +88,11 @@ public void resetAll() { viewModel.resetAll(); } - public ListProperty patternListProperty() { + public ListProperty patternListProperty() { return viewModel.patternListProperty(); } - public ObjectProperty defaultKeyPatternProperty() { + public ObjectProperty defaultKeyPatternProperty() { return viewModel.defaultKeyPatternProperty(); } @@ -113,15 +113,15 @@ private void jumpToSearchKey(KeyEvent keypressed) { .findFirst().ifPresent(this::scrollTo); } - private static class HighlightTableRow extends TableRow { + private static class HighlightTableRow extends TableRow { @Override - public void updateItem(BibtexKeyPatternPanelItemModel item, boolean empty) { + public void updateItem(CitationKeyPatternPanelItemModel item, boolean empty) { super.updateItem(item, empty); if (item == null || item.getEntryType() == null) { setStyle(""); } else if (isSelected()) { setStyle("-fx-background-color: -fx-selection-bar"); - } else if (item.getEntryType().getName().equals(BibtexKeyPatternPanelViewModel.ENTRY_TYPE_DEFAULT_NAME)) { + } else if (item.getEntryType().getName().equals(CitationKeyPatternPanelViewModel.ENTRY_TYPE_DEFAULT_NAME)) { setStyle("-fx-background-color: -fx-default-button"); } else { setStyle(""); diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanelItemModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelItemModel.java similarity index 90% rename from src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanelItemModel.java rename to src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelItemModel.java index 5e6777ef62f..61b7ce6a61c 100644 --- a/src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanelItemModel.java +++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelItemModel.java @@ -9,11 +9,11 @@ import org.jabref.model.entry.types.EntryType; -public class BibtexKeyPatternPanelItemModel { +public class CitationKeyPatternPanelItemModel { private final ObjectProperty entryType = new SimpleObjectProperty<>(); private final StringProperty pattern = new SimpleStringProperty(""); - public BibtexKeyPatternPanelItemModel(EntryType entryType, String pattern) { + public CitationKeyPatternPanelItemModel(EntryType entryType, String pattern) { Objects.requireNonNull(entryType); Objects.requireNonNull(pattern); this.entryType.setValue(entryType); diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java similarity index 71% rename from src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanelViewModel.java rename to src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java index 6e271e18f90..0fead94837e 100644 --- a/src/main/java/org/jabref/gui/commonfxcontrols/BibtexKeyPatternPanelViewModel.java +++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java @@ -10,16 +10,16 @@ import javafx.collections.FXCollections; import org.jabref.logic.l10n.Localization; -import org.jabref.model.bibtexkeypattern.AbstractBibtexKeyPattern; +import org.jabref.model.bibtexkeypattern.AbstractCitationKeyPattern; import org.jabref.model.entry.BibEntryType; import org.jabref.model.entry.types.EntryType; import org.jabref.preferences.JabRefPreferences; -public class BibtexKeyPatternPanelViewModel { +public class CitationKeyPatternPanelViewModel { public static final String ENTRY_TYPE_DEFAULT_NAME = "default"; - public static Comparator defaultOnTopComparator = (o1, o2) -> { + public static Comparator defaultOnTopComparator = (o1, o2) -> { String itemOneName = o1.getEntryType().getName(); String itemTwoName = o2.getEntryType().getName(); @@ -34,13 +34,13 @@ public class BibtexKeyPatternPanelViewModel { return 0; }; - private final ListProperty patternListProperty = new SimpleListProperty<>(); - private final ObjectProperty defaultItemProperty = new SimpleObjectProperty<>(); - private final AbstractBibtexKeyPattern initialKeyPattern; + private final ListProperty patternListProperty = new SimpleListProperty<>(); + private final ObjectProperty defaultItemProperty = new SimpleObjectProperty<>(); + private final AbstractCitationKeyPattern initialKeyPattern; private final Collection bibEntryTypeList; private final JabRefPreferences preferences; - public BibtexKeyPatternPanelViewModel(JabRefPreferences preferences, Collection entryTypeList, AbstractBibtexKeyPattern initialKeyPattern) { + public CitationKeyPatternPanelViewModel(JabRefPreferences preferences, Collection entryTypeList, AbstractCitationKeyPattern initialKeyPattern) { this.preferences = preferences; this.bibEntryTypeList = entryTypeList; this.initialKeyPattern = initialKeyPattern; @@ -54,7 +54,7 @@ public void setValues() { defaultPattern = initialKeyPattern.getDefaultValue().get(0); } - defaultItemProperty.setValue(new BibtexKeyPatternPanelItemModel(new DefaultEntryType(), defaultPattern)); + defaultItemProperty.setValue(new CitationKeyPatternPanelItemModel(new DefaultEntryType(), defaultPattern)); patternListProperty.setValue(FXCollections.observableArrayList()); patternListProperty.add(defaultItemProperty.getValue()); @@ -67,11 +67,11 @@ public void setValues() { } else { pattern = initialKeyPattern.getPatterns().get(entryType).get(0); } - patternListProperty.add(new BibtexKeyPatternPanelItemModel(entryType, pattern)); + patternListProperty.add(new CitationKeyPatternPanelItemModel(entryType, pattern)); }); } - public void setItemToDefaultPattern(BibtexKeyPatternPanelItemModel item) { + public void setItemToDefaultPattern(CitationKeyPatternPanelItemModel item) { item.setPattern((String) preferences.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)); } @@ -80,11 +80,11 @@ public void resetAll() { defaultItemProperty.getValue().setPattern((String) preferences.defaults.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN)); } - public ListProperty patternListProperty() { + public ListProperty patternListProperty() { return patternListProperty; } - public ObjectProperty defaultKeyPatternProperty() { + public ObjectProperty defaultKeyPatternProperty() { return defaultItemProperty; } diff --git a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java index 5a4869990c1..2420b61000f 100644 --- a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java +++ b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java @@ -8,7 +8,7 @@ import javafx.beans.property.StringProperty; import org.jabref.gui.DialogService; -import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator; +import org.jabref.logic.bibtexkeypattern.CitationKeyGenerator; import org.jabref.logic.l10n.Localization; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; @@ -58,7 +58,7 @@ public void saveFields() { return; } - String testString = BibtexKeyGenerator.cleanKey(parts[1], preferences.getUnwantedCharacters()); + String testString = CitationKeyGenerator.cleanKey(parts[1], preferences.getUnwantedCharacters()); if (!testString.equals(parts[1]) || (parts[1].indexOf('&') >= 0)) { dialogService.showInformationDialogAndWait( Localization.lang("Error"), diff --git a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java index b962d2f0c91..5f982b01da3 100644 --- a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java +++ b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java @@ -109,7 +109,7 @@ private void copyKey() { .collect(Collectors.toList()); if (keys.isEmpty()) { - dialogService.notify(Localization.lang("None of the selected entries have BibTeX keys.")); + dialogService.notify(Localization.lang("None of the selected entries have citation keys.")); return; } @@ -121,7 +121,7 @@ private void copyKey() { dialogService.notify(Localization.lang("Copied '%0' to clipboard.", JabRefDialogService.shortenDialogMessage(copiedKeys))); } else { - dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.", + dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined citation key.", Integer.toString(entries.size() - keys.size()), Integer.toString(entries.size()))); } } @@ -136,7 +136,7 @@ private void copyCiteKey() { .collect(Collectors.toList()); if (keys.isEmpty()) { - dialogService.notify(Localization.lang("None of the selected entries have BibTeX keys.")); + dialogService.notify(Localization.lang("None of the selected entries have citation keys.")); return; } @@ -152,7 +152,7 @@ private void copyCiteKey() { dialogService.notify(Localization.lang("Copied '%0' to clipboard.", JabRefDialogService.shortenDialogMessage(copiedCiteCommand))); } else { - dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.", + dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined citation key.", Integer.toString(entries.size() - keys.size()), Integer.toString(entries.size()))); } } @@ -182,7 +182,7 @@ private void copyKeyAndTitle() { } if (entriesWithKeys == 0) { - dialogService.notify(Localization.lang("None of the selected entries have BibTeX keys.")); + dialogService.notify(Localization.lang("None of the selected entries have citation keys.")); return; } @@ -193,15 +193,15 @@ private void copyKeyAndTitle() { dialogService.notify(Localization.lang("Copied '%0' to clipboard.", JabRefDialogService.shortenDialogMessage(keyAndTitle.toString()))); } else { - dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.", + dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined citation key.", Integer.toString(entries.size() - entriesWithKeys), Integer.toString(entries.size()))); } } /** - * This method will copy each selected entry's BibTeX key as a hyperlink to its url to the clipboard. In case an - * entry doesn't have a BibTeX key it will not be copied. In case an entry doesn't have an url this will only copy - * the BibTeX key. + * This method will copy each selected entry's citation key as a hyperlink to its url to the clipboard. In case an + * entry doesn't have a citation key it will not be copied. In case an entry doesn't have an url this will only copy + * the citation key. */ private void copyKeyAndLink() { List entries = stateManager.getSelectedEntries(); @@ -213,7 +213,7 @@ private void copyKeyAndLink() { .collect(Collectors.toList()); if (entriesWithKey.isEmpty()) { - dialogService.notify(Localization.lang("None of the selected entries have BibTeX keys.")); + dialogService.notify(Localization.lang("None of the selected entries have citation keys.")); return; } @@ -231,7 +231,7 @@ private void copyKeyAndLink() { dialogService.notify(Localization.lang("Copied '%0' to clipboard.", JabRefDialogService.shortenDialogMessage(keyAndLink.toString()))); } else { - dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined BibTeX key.", + dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined citation key.", Long.toString(entries.size() - entriesWithKey.size()), Integer.toString(entries.size()))); } } diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml index 35fb41daa74..ce73a6e782a 100644 --- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml +++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml @@ -45,7 +45,7 @@ - +