diff --git a/.mailmap b/.mailmap index a755a5d1806..b03046749ac 100644 --- a/.mailmap +++ b/.mailmap @@ -47,6 +47,7 @@ Frédéric Darboux Frédéric Darboux Frédéric Darboux Frédéric Darboux +Frédéric Darboux Florian Straßer Gregor Herrmann Hakan Duran hakova diff --git a/.markdownlint.yml b/.markdownlint.yml index 3ed5b253fa6..0ada157fae9 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -13,6 +13,9 @@ MD013: false MD026: punctuation: ".,;:!" +# not supported by gitbook +MD031: false + MD033: # we have tags with ids and superscript allowed_elements: ['a', 'sup'] diff --git a/CHANGELOG.md b/CHANGELOG.md index 7444c09ad15..ac4b929ca22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,11 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - JabRef now offers journal lists from . JabRef the lists which use a dot inside the abbreviations. [#5749](https://github.com/JabRef/jabref/pull/5749) - We removed two useless preferences in the groups preferences dialog. [#6836](https://github.com/JabRef/jabref/pull/6836) - Synchronization of SpecialFields to keywords is now disabled by default. [#6621](https://github.com/JabRef/jabref/issues/6621) -- JabRef no longer opens the entry editor with the first entry on startup [6855](https://github.com/JabRef/jabref/issues/6855) +- JabRef no longer opens the entry editor with the first entry on startup [#6855](https://github.com/JabRef/jabref/issues/6855) +- We completed the rebranding of `bibtexkey` as `citationkey` which was started in JabRef 5.1. +- JabRef no longer opens the entry editor with the first entry on startup [#6855](https://github.com/JabRef/jabref/issues/6855) +- Fetch by ID: (long) "SAO/NASA Astrophysics Data System" replaced by (short) "SAO/NASA ADS" [#6876](https://github.com/JabRef/jabref/pull/6876) +- We changed the title of the window "Manage field names and content": to have the same title as the corresponding menu item [#6895](https://github.com/JabRef/jabref/pull/6895) ### Fixed @@ -30,10 +34,10 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We fixed an issue where the `.sav` file was not deleted upon exiting JabRef. [#6109](https://github.com/JabRef/jabref/issues/6109) - We fixed a linked identifier icon inconsistency. [#6705](https://github.com/JabRef/jabref/issues/6705) - We fixed the wrong behavior that font size changes are not reflected in dialogs. [#6039](https://github.com/JabRef/jabref/issues/6039) +- We fixed an issue where the sort order of the entry table was reset after a restart of JabRef [#6898](https://github.com/JabRef/jabref/pull/6898) ### Removed - ## [5.1] – 2020-08-30 ### Added diff --git a/build.gradle b/build.gradle index de33bc5e96c..eeb02422810 100644 --- a/build.gradle +++ b/build.gradle @@ -13,10 +13,10 @@ plugins { id 'application' id "com.simonharrer.modernizer" version '2.1.0-1' id 'me.champeau.gradle.jmh' version '0.5.1' - id 'com.github.ben-manes.versions' version '0.29.0' + id 'com.github.ben-manes.versions' version '0.30.0' id 'org.javamodularity.moduleplugin' version '1.7.0' id 'org.openjfx.javafxplugin' version '0.0.9' - id 'org.beryx.jlink' version '2.21.3' + id 'org.beryx.jlink' version '2.21.4' // nicer test outputs during running and completion // Homepage: https://github.com/radarsh/gradle-test-logger-plugin @@ -105,8 +105,8 @@ dependencies { // Include all jar-files in the 'lib' folder as dependencies implementation fileTree(dir: 'lib', includes: ['*.jar']) - implementation 'org.apache.pdfbox:pdfbox:2.0.20' - implementation 'org.apache.pdfbox:fontbox:2.0.20' + implementation 'org.apache.pdfbox:pdfbox:2.0.21' + implementation 'org.apache.pdfbox:fontbox:2.0.21' implementation 'org.apache.pdfbox:xmpbox:2.0.20' implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.8' @@ -137,7 +137,7 @@ dependencies { antlr4 'org.antlr:antlr4:4.8-1' implementation 'org.antlr:antlr4-runtime:4.8-1' - implementation (group: 'org.apache.lucene', name: 'lucene-queryparser', version: '8.6.1') { + implementation (group: 'org.apache.lucene', name: 'lucene-queryparser', version: '8.6.2') { exclude group: 'org.apache.lucene', module: 'lucene-sandbox' } @@ -207,7 +207,7 @@ dependencies { testImplementation 'net.bytebuddy:byte-buddy-parent:1.10.14' testRuntime group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT' testRuntime group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT' - testImplementation 'org.mockito:mockito-core:3.5.7' + testImplementation 'org.mockito:mockito-core:3.5.10' testImplementation 'org.xmlunit:xmlunit-core:2.7.0' testImplementation 'org.xmlunit:xmlunit-matchers:2.7.0' testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.14.1' diff --git a/docs/adr.md b/docs/adr.md index b7d31167a4c..3907e985781 100644 --- a/docs/adr.md +++ b/docs/adr.md @@ -1,8 +1,27 @@ # Architectural Decisions -This directory contains the architectural decisions for JabRef. +Architectural decisions for JabRef: +* [ADR-0000](https://github.com/JabRef/jabref/tree/docs/adr/0000-use-markdown-architectural-decision-records.md) - Use Markdown Architectural Decision Records +* [ADR-0001](https://github.com/JabRef/jabref/tree/docs/adr/0001-use-crowdin-for-translations.md) - Use Crowdin for translations +* [ADR-0002](https://github.com/JabRef/jabref/tree/docs/adr/0002-use-slf4j-for-logging.md) - Use slf4j together with log4j2 for logging +* [ADR-0003](https://github.com/JabRef/jabref/tree/docs/adr/0003-use-gradle-as-build-tool.md) - Use Gradle as build tool +* [ADR-0004](https://github.com/JabRef/jabref/tree/docs/adr/0004-use-mariadb-connector.md) - Use MariaDB Connector +* [ADR-0005](https://github.com/JabRef/jabref/tree/docs/adr/0005-fully-support-utf8-only-for-latex-files.md) - Fully Support UTF-8 Only For LaTeX Files +* [ADR-0006](https://github.com/JabRef/jabref/tree/docs/adr/0006-only-translated-strings-in-language-file.md) - Only translated strings in language file +* [ADR-0007](https://github.com/JabRef/jabref/tree/docs/adr/0007-human-readable-changelog.md) - Provide a human-readable changelog +* [ADR-0008](https://github.com/JabRef/jabref/tree/docs/adr/0008-use-public-final-instead-of-getters.md) - Use public final instead of getters to offer access to immutable variables +* [ADR-0009](https://github.com/JabRef/jabref/tree/docs/adr/0009-use-plain-junit5-for-testing.md) - Use Plain JUnit5 for advanced test assertions +* [ADR-0010](https://github.com/JabRef/jabref/tree/docs/adr/0010-use-h2-as-internal-database.md) - Use H2 as Internal SQL Database +* [ADR-0011](https://github.com/JabRef/jabref/tree/docs/adr/0011-test-external-links-in-documentation.md) - Test external links in documentation +* [ADR-0012](https://github.com/JabRef/jabref/tree/docs/adr/0012-handle-different-bibEntry-formats-of-fetchers.md) - Handle different bibentry formats of fetchers by adding a layer +* [ADR-0013](https://github.com/JabRef/jabref/tree/docs/adr/0013-add-native-support-biblatex-software.md) - Add Native Support for BibLatex-Sotware +fix checkstyle in adr +* [ADR-0014](https://github.com/JabRef/jabref/tree/docs/adr/0014-separate-URL-creation-to-enable-proper-logging.md) - Separate URL creation to enable proper logging +* [ADR-0015](https://github.com/JabRef/jabref/tree/docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md) - Query syntax design +* [ADR-0016](https://github.com/JabRef/jabref/tree/docs/adr/0016-mutable-preferences-objects.md) - Mutable preferences objects +* [ADR-0017](https://github.com/JabRef/jabref/tree/docs/adr/0017-allow-model-access-logic.md) - Allow org.jabref.model to access org.jabref.logic -For new ADRs, please use [template.md](https://github.com/JabRef/jabref/tree/98e9fc3ddc7b59ca35101c7f37b183ca2e69d8a0/docs/adr/template.md) as basis. More information on the used format is available at [https://adr.github.io/madr/](https://adr.github.io/madr/). General information about architectural decision records is available at [https://adr.github.io/](https://adr.github.io/). +For new ADRs, please use [template.md](https://github.com/JabRef/jabref/tree/98e9fc3ddc7b59ca35101c7f37b183ca2e69d8a0/docs/adr/template.md) as basis. More information on the used format is available at [https://adr.github.io/madr/](https://adr.github.io/madr/). General information about architectural decision records is available at [https://adr.github.io/](https://adr.github.io/). Then add them to the above list. diff --git a/docs/adr/0015-allow-model-access-logic.md b/docs/adr/0017-allow-model-access-logic.md similarity index 100% rename from docs/adr/0015-allow-model-access-logic.md rename to docs/adr/0017-allow-model-access-logic.md diff --git a/docs/getting-into-the-code/high-level-documentation.md b/docs/getting-into-the-code/high-level-documentation.md index eb4d80521db..84e5295ae70 100644 --- a/docs/getting-into-the-code/high-level-documentation.md +++ b/docs/getting-into-the-code/high-level-documentation.md @@ -35,5 +35,5 @@ All packages and classes which are currently not part of these packages \(we are ## Most Important Classes and their Relation -Both GUI and CLI are started via the `JabRefMain` which will in turn call `JabRef` which then decides whether the GUI \(`JabRefFrame`\) or the CLI \(`JabRefCLI` and a lot of code in `JabRef`\) will be started. The `JabRefFrame` represents the Window which contains a `SidePane` on the left used for the fetchers/groups Each tab is a `BasePanel` which has a `SearchBar` at the top, a `MainTable` at the center and a `PreviewPanel` or an `EntryEditor` at the bottom. Any right click on the `MainTable` is handled by the `RightClickMenu`. Each `BasePanel` holds a `BibDatabaseContext` consisting of a `BibDatabase` and the `MetaData`, which are the only relevant data of the currently shown database. A `BibDatabase` has a list of `BibEntries`. Each `BibEntry` has a key, a bibtex key and a key/value store for the fields with their values. Interpreted data \(such as the type or the file field\) is stored in the `TypedBibentry` type. The user can change the `JabRefPreferences` through the `PreferencesDialog`. +Both GUI and CLI are started via the `JabRefMain` which will in turn call `JabRef` which then decides whether the GUI \(`JabRefFrame`\) or the CLI \(`JabRefCLI` and a lot of code in `JabRef`\) will be started. The `JabRefFrame` represents the Window which contains a `SidePane` on the left used for the fetchers/groups Each tab is a `BasePanel` which has a `SearchBar` at the top, a `MainTable` at the center and a `PreviewPanel` or an `EntryEditor` at the bottom. Any right click on the `MainTable` is handled by the `RightClickMenu`. Each `BasePanel` holds a `BibDatabaseContext` consisting of a `BibDatabase` and the `MetaData`, which are the only relevant data of the currently shown database. A `BibDatabase` has a list of `BibEntries`. Each `BibEntry` has an ID, a citation key and a key/value store for the fields with their values. Interpreted data \(such as the type or the file field\) is stored in the `TypedBibentry` type. The user can change the `JabRefPreferences` through the `PreferencesDialog`. diff --git a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java index b1826b20acb..31935438c71 100644 --- a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java +++ b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java @@ -55,7 +55,7 @@ public void init() throws Exception { Random randomizer = new Random(); for (int i = 0; i < 1000; i++) { BibEntry entry = new BibEntry(); - entry.setCiteKey("id" + i); + entry.setCitationKey("id" + i); entry.setField(StandardField.TITLE, "This is my title " + i); entry.setField(StandardField.AUTHOR, "Firstname Lastname and FirstnameA LastnameA and FirstnameB LastnameB" + i); entry.setField(StandardField.JOURNAL, "Journal Title " + i); diff --git a/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java index 3cf297c71c1..a69b8a3b1c1 100644 --- a/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java +++ b/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java @@ -13,7 +13,7 @@ import org.controlsfx.control.textfield.AutoCompletionBinding; /** - * Delivers possible completions as a list of {@link BibEntry} based on their cite key. + * Delivers possible completions as a list of {@link BibEntry} based on their citation key. */ public class BibEntrySuggestionProvider extends SuggestionProvider { @@ -25,7 +25,7 @@ public BibEntrySuggestionProvider(BibDatabase database) { @Override protected Equivalence getEquivalence() { - return Equivalence.equals().onResultOf(BibEntry::getCiteKeyOptional); + return Equivalence.equals().onResultOf(BibEntry::getCitationKey); } @Override @@ -36,7 +36,7 @@ protected Comparator getComparator() { @Override protected boolean isMatch(BibEntry entry, AutoCompletionBinding.ISuggestionRequest request) { String userText = request.getUserText(); - return entry.getCiteKeyOptional() + return entry.getCitationKey() .map(key -> StringUtil.containsIgnoreCase(key, userText)) .orElse(false); } diff --git a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java index e7dae493860..4173db5cc65 100644 --- a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java +++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java @@ -68,15 +68,14 @@ public static boolean confirmOverwriteKeys(DialogService dialogService) { private void checkOverwriteKeysChosen() { // We don't want to generate keys for entries which already have one thus remove the entries if (Globals.prefs.getBoolean(JabRefPreferences.AVOID_OVERWRITING_KEY)) { - entries.removeIf(BibEntry::hasCiteKey); - // if we're going to override some cite keys warn the user about it - } else if (entries.parallelStream().anyMatch(BibEntry::hasCiteKey)) { + entries.removeIf(BibEntry::hasCitationKey); + // if we're going to override some citation keys warn the user about it + } else if (entries.parallelStream().anyMatch(BibEntry::hasCitationKey)) { boolean overwriteKeys = confirmOverwriteKeys(dialogService); - // The user doesn't want to override cite keys + // The user doesn't want to override citation keys if (!overwriteKeys) { isCanceled = true; - return; } } } @@ -87,7 +86,7 @@ private void generateKeys() { } stateManager.getActiveDatabase().ifPresent(databaseContext -> { - // generate the new cite keys for each entry + // generate the new citation keys for each entry final NamedCompound compound = new NamedCompound(Localization.lang("Autogenerate citation keys")); CitationKeyGenerator keyGenerator = new CitationKeyGenerator(databaseContext, Globals.prefs.getCitationKeyPatternPreferences()); @@ -97,7 +96,7 @@ private void generateKeys() { } compound.end(); - // register the undo event only if new cite keys were generated + // register the undo event only if new citation keys were generated if (compound.hasEdits()) { frame.getUndoManager().addEdit(compound); } diff --git a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java index 43e2acbe1ef..b66beef36be 100644 --- a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java +++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java @@ -32,7 +32,7 @@ public GenerateCitationKeySingleAction(BibEntry entry, BibDatabaseContext databa @Override public void execute() { - if (!entry.hasCiteKey() || GenerateCitationKeyAction.confirmOverwriteKeys(dialogService)) { + if (!entry.hasCitationKey() || 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/collab/EntryAddChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java index ccd41b1b74d..6e5e0d8b456 100644 --- a/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java +++ b/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java @@ -17,7 +17,7 @@ class EntryAddChangeViewModel extends DatabaseChangeViewModel { public EntryAddChangeViewModel(BibEntry entry) { super(); - this.name = entry.getCiteKeyOptional() + this.name = entry.getCitationKey() .map(key -> Localization.lang("Added entry") + ": '" + key + '\'') .orElse(Localization.lang("Added entry")); this.entry = entry; diff --git a/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java index cc303b27178..bbb006da2cc 100644 --- a/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java +++ b/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java @@ -25,7 +25,7 @@ public EntryChangeViewModel(BibEntry entry, BibEntry newEntry) { this.oldEntry = entry; this.newEntry = newEntry; - name = entry.getCiteKeyOptional() + name = entry.getCitationKey() .map(key -> Localization.lang("Modified entry") + ": '" + key + '\'') .orElse(Localization.lang("Modified entry")); } diff --git a/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java index 5bc4f01fcf5..ff6adfd3fce 100644 --- a/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java +++ b/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java @@ -22,7 +22,7 @@ class EntryDeleteChangeViewModel extends DatabaseChangeViewModel { public EntryDeleteChangeViewModel(BibEntry entry) { super(Localization.lang("Deleted entry")); - this.name = entry.getCiteKeyOptional() + this.name = entry.getCitationKey() .map(key -> Localization.lang("Deleted entry") + ": '" + key + '\'') .orElse(Localization.lang("Deleted entry")); this.entry = entry; diff --git a/src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypeDialogViewModel.java b/src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypeDialogViewModel.java index 2e91b67a4b7..14addc7ea20 100644 --- a/src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypeDialogViewModel.java +++ b/src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypeDialogViewModel.java @@ -50,7 +50,7 @@ public Field fromString(String string) { } }; - private final ObservableList fieldsForAdding = FXCollections.observableArrayList(FieldFactory.getStandardFielsdsWithBibTexKey()); + private final ObservableList fieldsForAdding = FXCollections.observableArrayList(FieldFactory.getStandardFieldsWithCitationKey()); private final ObjectProperty selectedEntryType = new SimpleObjectProperty<>(); private final ObjectProperty selectedFieldToAdd = new SimpleObjectProperty<>(); private final StringProperty entryTypeToAdd = new SimpleStringProperty(""); diff --git a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java index 0d87538efb9..ac138cf5a85 100644 --- a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java +++ b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java @@ -104,8 +104,8 @@ private void copyKey() { // Collect all non-null keys. List keys = entries.stream() - .filter(entry -> entry.getCiteKeyOptional().isPresent()) - .map(entry -> entry.getCiteKeyOptional().get()) + .filter(entry -> entry.getCitationKey().isPresent()) + .map(entry -> entry.getCitationKey().get()) .collect(Collectors.toList()); if (keys.isEmpty()) { @@ -131,8 +131,8 @@ private void copyCiteKey() { // Collect all non-null keys. List keys = entries.stream() - .filter(entry -> entry.getCiteKeyOptional().isPresent()) - .map(entry -> entry.getCiteKeyOptional().get()) + .filter(entry -> entry.getCitationKey().isPresent()) + .map(entry -> entry.getCitationKey().get()) .collect(Collectors.toList()); if (keys.isEmpty()) { @@ -161,7 +161,7 @@ private void copyKeyAndTitle() { List entries = stateManager.getSelectedEntries(); // ToDo: this string should be configurable to allow arbitrary exports - StringReader layoutString = new StringReader("\\bibtexkey - \\begin{title}\\format[RemoveBrackets]{\\title}\\end{title}\n"); + StringReader layoutString = new StringReader("\\citationkey - \\begin{title}\\format[RemoveBrackets]{\\title}\\end{title}\n"); Layout layout; try { layout = new LayoutHelper(layoutString, preferencesService.getLayoutFormatterPreferences(Globals.journalAbbreviationRepository)).getLayoutFromText(); @@ -175,7 +175,7 @@ private void copyKeyAndTitle() { int entriesWithKeys = 0; // Collect all non-null keys. for (BibEntry entry : entries) { - if (entry.hasCiteKey()) { + if (entry.hasCitationKey()) { entriesWithKeys++; keyAndTitle.append(layout.doLayout(entry, stateManager.getActiveDatabase().get().getDatabase())); } @@ -209,7 +209,7 @@ private void copyKeyAndLink() { StringBuilder keyAndLink = new StringBuilder(); List entriesWithKey = entries.stream() - .filter(BibEntry::hasCiteKey) + .filter(BibEntry::hasCitationKey) .collect(Collectors.toList()); if (entriesWithKey.isEmpty()) { @@ -218,7 +218,7 @@ private void copyKeyAndLink() { } for (BibEntry entry : entriesWithKey) { - String key = entry.getCiteKeyOptional().get(); + String key = entry.getCitationKey().get(); String url = entry.getField(StandardField.URL).orElse(""); keyAndLink.append(url.isEmpty() ? key : String.format("%s", url, key)); keyAndLink.append(OS.NEWLINE); diff --git a/src/main/java/org/jabref/gui/edit/MassSetFieldsDialog.java b/src/main/java/org/jabref/gui/edit/MassSetFieldsDialog.java index 496c9f648c6..785b571ceb3 100644 --- a/src/main/java/org/jabref/gui/edit/MassSetFieldsDialog.java +++ b/src/main/java/org/jabref/gui/edit/MassSetFieldsDialog.java @@ -62,7 +62,7 @@ public class MassSetFieldsDialog extends BaseDialog { this.undoManager = undoManager; init(); - this.setTitle("Set/clear/append/rename fields"); + this.setTitle(Localization.lang("Manage field names & content")); this.getDialogPane().getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL); this.setResultConverter(button -> { if (button == ButtonType.OK) { diff --git a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java index 760ad6edf80..03dc9fa06ab 100644 --- a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java +++ b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java @@ -76,7 +76,7 @@ public void init(BibEntry entry) { cancelSearch(); currentEntry = entry; - Optional citeKey = entry.getCiteKeyOptional(); + Optional citeKey = entry.getCitationKey(); if (citeKey.isPresent()) { startSearch(citeKey.get()); diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java index d413eb07bfc..aba1aca5363 100644 --- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java +++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java @@ -278,10 +278,10 @@ private void storeSource(BibEntry outOfFocusEntry, String text) { NamedCompound compound = new NamedCompound(Localization.lang("source edit")); BibEntry newEntry = database.getEntries().get(0); - String newKey = newEntry.getCiteKeyOptional().orElse(null); + String newKey = newEntry.getCitationKey().orElse(null); if (newKey != null) { - outOfFocusEntry.setCiteKey(newKey); + outOfFocusEntry.setCitationKey(newKey); } else { outOfFocusEntry.clearCiteKey(); } diff --git a/src/main/java/org/jabref/gui/exporter/WriteXMPAction.java b/src/main/java/org/jabref/gui/exporter/WriteXMPAction.java index 0ac0918fb09..51570c8fdfa 100644 --- a/src/main/java/org/jabref/gui/exporter/WriteXMPAction.java +++ b/src/main/java/org/jabref/gui/exporter/WriteXMPAction.java @@ -117,7 +117,7 @@ private void writeXMP() { .collect(Collectors.toList()); Platform.runLater(() -> optionsDialog.getProgressArea() - .appendText(entry.getCiteKeyOptional().orElse(Localization.lang("undefined")) + "\n")); + .appendText(entry.getCitationKey().orElse(Localization.lang("undefined")) + "\n")); if (files.isEmpty()) { skipped++; diff --git a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java index 1ec8ca2ee1c..019678e7d84 100644 --- a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java +++ b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java @@ -126,7 +126,7 @@ private void downloadFullTexts(Map> downloads, BibDataba addLinkedFileFromURL(databaseContext, result.get(), entry, dir.get()); } else { dialogService.notify(Localization.lang("No full text document found for entry %0.", - entry.getCiteKeyOptional().orElse(Localization.lang("undefined")))); + entry.getCitationKey().orElse(Localization.lang("undefined")))); } } } @@ -164,11 +164,11 @@ private void addLinkedFileFromURL(BibDatabaseContext databaseContext, URL url, B ExternalFileTypes.getInstance()); entry.addFile(downloadedFile); dialogService.notify(Localization.lang("Finished downloading full text document for entry %0.", - entry.getCiteKeyOptional().orElse(Localization.lang("undefined")))); + entry.getCitationKey().orElse(Localization.lang("undefined")))); }); downloadTask.titleProperty().set(Localization.lang("Downloading")); downloadTask.messageProperty().set( - Localization.lang("Fulltext for") + ": " + entry.getCiteKeyOptional().orElse(Localization.lang("New entry"))); + Localization.lang("Fulltext for") + ": " + entry.getCitationKey().orElse(Localization.lang("New entry"))); downloadTask.showToUser(true); Globals.TASK_EXECUTOR.execute(downloadTask); } catch (MalformedURLException exception) { @@ -176,7 +176,7 @@ private void addLinkedFileFromURL(BibDatabaseContext databaseContext, URL url, B } } else { dialogService.notify(Localization.lang("Full text document for entry %0 already linked.", - entry.getCiteKeyOptional().orElse(Localization.lang("undefined")))); + entry.getCitationKey().orElse(Localization.lang("undefined")))); } } } diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java index ccb21e3b936..dcb570a82cd 100644 --- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java +++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java @@ -117,7 +117,7 @@ public void importEntries(List entries) { preferencesService.getOwnerPreferences(), preferencesService.getTimestampPreferences()); - // Generate bibtex keys + // Generate citation keys generateKeys(entries); // Add to group diff --git a/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.fxml index 5e38d8c98ab..fcb4b34414c 100644 --- a/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.fxml +++ b/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.fxml @@ -6,5 +6,5 @@ -