Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[master]
- Fix for bug 958: ArrayIndexOutOfBoundsException on "Content Selector Dialog"
- Fix for bug 949: Exception properly logged
- Fix for bug 950: NullPointerException on "Manage custom imports"
- Feature 850: Keyboard shortcut for 'Cleanup entries' (by eduardogreco)
Expand Down
18 changes: 15 additions & 3 deletions src/main/java/net/sf/jabref/ContentSelectorDialog2.java
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,14 @@ public void actionPerformed(ActionEvent e) {

ok.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
applyChanges();
dispose();
try {
applyChanges();
dispose();
}
catch (Exception ex) {
Globals.logger("Could not apply changes in \"Setup selectors\"");
JOptionPane.showMessageDialog(frame, Globals.lang("Could not apply changes."));
}
}
});

Expand All @@ -262,7 +268,13 @@ public void actionPerformed(ActionEvent e) {
if (!wordEditField.getText().equals("")) {
wordEditFieldListener.actionPerformed(null);
}
applyChanges();
try {
applyChanges();
}
catch (Exception ex) {
Globals.logger("Could not apply changes in \"Setup selectors\"");
JOptionPane.showMessageDialog(frame, Globals.lang("Could not apply changes."));
}
}
});

Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/help/About.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ <h2>Contributions from:</h2>
Waluyo Adi Siswanto,
Eduardo Roberto Greco,
Thiago Gomes Toledo,
Renato Massao Maeda da Silva</p>
Renato Massao Maeda da Silva
Luciana de Melo e Abud</p>

<h2>Thanks to:</h2>

Expand Down