From 96b082b7f07965e18db6f8d63ad5db4533d3ab09 Mon Sep 17 00:00:00 2001 From: pjozeph Date: Fri, 29 Dec 2017 12:08:06 +0100 Subject: [PATCH] fix issue #3562 (inline 2) --- .../jabref/gui/dbproperties/DatabasePropertiesDialog.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java index f2b7b2745ca..b19d13934ee 100644 --- a/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java +++ b/src/main/java/org/jabref/gui/dbproperties/DatabasePropertiesDialog.java @@ -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; @@ -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())) {