Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Throw BibEntryNotFound exception in case entry is no longer present #4935

Merged
merged 5 commits into from
May 1, 2019
Merged

Throw BibEntryNotFound exception in case entry is no longer present #4935

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72145a8
improve oo Logging
Siedlerchr May 1, 2019
4e20d14
fix typos
Siedlerchr May 1, 2019
6ac549f
Throw BibEntryNotFound exception in case entry is no longer present
Siedlerchr May 1, 2019
9a1daae
add changelog
Siedlerchr May 1, 2019
835ed39
fix wording and move nonNullRequire to the top
Siedlerchr May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
- We fixed an issue where ranking an entry would generate an IllegalArgumentException. [#4754](https://github.com/JabRef/jabref/issues/4754)
- We fixed an issue where special characters where removed from non label key generation pattern parts [#4767](https://github.com/JabRef/jabref/issues/4767)
- We fixed an issue where the RIS import would overwite the article date with the value of the acessed date [#4816](https://github.com/JabRef/jabref/issues/4816)
- We fixed an issue where an NullPointer exception was thrown when a referenced entry in an Open/Libre Office was no longer present in the library. Now an error message with the reference marker of the missing entry is shown. [#4932](https://github.com/JabRef/jabref/issues/4932)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... in an Open/Libre Office document was...




Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/jabref/gui/openoffice/OOBibBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,8 @@ private List<String> refreshCiteMarkersInternal(List<BibDatabase> databases, OOB
} else {
LOGGER.info("BibTeX key not found: '" + keys[j] + '\'');
LOGGER.info("Problem with reference mark: '" + names.get(i) + '\'');
cEntries[j] = new UndefinedBibtexEntry(keys[j]);
throw new BibEntryNotFoundException(names.get(i), Localization
.lang("Could not resolve BibTeX entry for citation marker '%0'.", names.get(i)));
}
}

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/jabref/logic/openoffice/OOBibStyle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,9 @@ private String getCitationMarkerField(BibEntry entry, BibDatabase database, Stri
String authorField = getStringCitProperty(AUTHOR_FIELD);
String[] fields = field.split(FieldName.FIELD_SEPARATOR);
for (String s : fields) {

Objects.requireNonNull(entry, "Entry cannot be null");
Objects.requireNonNull(database, "database cannot be null");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be moved to the beginning of the method.

Optional<String> content = entry.getResolvedFieldOrAlias(s, database);

if ((content.isPresent()) && !content.get().trim().isEmpty()) {
Expand Down