Skip to content

Fix error when setting unset field in source panel #19

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

Merged
koppor merged 1 commit into from
Aug 29, 2014
Merged

Fix error when setting unset field in source panel #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[master]
- Make (un)abbreviating journal titles also work on the journaltitle field
- Change default behaviour to be more non-invasive: timestamps and owners are NOT set by default per entry.
- "Open Folder" works again
- newline separator can now be configured globally
Expand All @@ -13,6 +12,8 @@
- Fixes bug 880 "PubMed Import broken" (pull request #11 by vegeziel)
- Fixes bug #959 "StringIndexOutOfBoundsException with invalid Preview text" (pull request #13 by IngvarJackal)
- Fixes bug #960 "FileNotFoundException in Journal abbreviations window" (pull request #13 by IngvarJackal)
- Make (un)abbreviating journal titles also work on the journaltitle field
- Fix error when setting a previously unset field via the source panel of the entry editor
2.10
- Made IEEEXploreFetcher author parsing work again.
- Added a few more characters in the HTML/Unicode to LaTeX conversion.
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/net/sf/jabref/EntryEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,15 +840,14 @@ public boolean storeSource(boolean showError) {

// Then set all fields that have been set by the user.
for (String field : nu.getAllFields()){
if (!entry.getField(field).equals(nu.getField(field))) {
String toSet = nu.getField(field);

String oldValue = entry.getField(field);
String newValue = nu.getField(field);
if (oldValue == null || !oldValue.equals(newValue)) {
// Test if the field is legally set.
(new LatexFieldFormatter()).format(toSet, field);
(new LatexFieldFormatter()).format(newValue, field);

compound.addEdit(new UndoableFieldChange(entry, field, entry
.getField(field), toSet));
entry.setField(field, toSet);
compound.addEdit(new UndoableFieldChange(entry, field, oldValue, newValue));
entry.setField(field, newValue);
anyChanged = true;
}
}
Expand Down