Skip to content

Commit

Permalink
fix issue JabRef#3562 (inline 2)
Browse files Browse the repository at this point in the history
  • Loading branch information
PJozeph committed Dec 29, 2017
1 parent 515728d commit 96b082b
Showing 1 changed file with 2 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,13 @@ private boolean propertiesChanged() {
.orElse(Globals.prefs.getDefaultEncoding());
Charset newEncoding = (Charset) encoding.getSelectedItem();
boolean saveActionsChanged = fieldFormatterCleanupsPanel.hasChanged();
boolean saveOrderConfigChanged = newAndOldOrderConfigIsSame(getNewSaveOrderConfig(), oldSaveOrderConfig);
boolean saveOrderConfigChanged = !getNewSaveOrderConfig().equals(oldSaveOrderConfig);
boolean changed = saveOrderConfigChanged || !newEncoding.equals(oldEncoding)
|| !oldFileVal.equals(fileDir.getText()) || !oldFileIndvVal.equals(fileDirIndv.getText())
|| (oldProtectVal != protect.isSelected()) || saveActionsChanged;
return changed;
}

private boolean newAndOldOrderConfigIsSame(SaveOrderConfig newSaveOrderConfig, SaveOrderConfig oldSaveOrderConfig) {
return !newSaveOrderConfig.equals(oldSaveOrderConfig);
}

private SaveOrderConfig getNewSaveOrderConfig() {
SaveOrderConfig saveOrderConfig = null;
Expand Down Expand Up @@ -302,7 +299,7 @@ private void storeSettings() {
SaveOrderConfig newSaveOrderConfig = getNewSaveOrderConfig();

// See if any of the values have been modified:
boolean saveOrderConfigChanged = newAndOldOrderConfigIsSame(getNewSaveOrderConfig(), oldSaveOrderConfig);
boolean saveOrderConfigChanged = !getNewSaveOrderConfig().equals(oldSaveOrderConfig);;

if (saveOrderConfigChanged) {
if (newSaveOrderConfig.equals(SaveOrderConfig.getDefaultSaveOrder())) {
Expand Down

0 comments on commit 96b082b

Please sign in to comment.