Implement reset for Name Display Preferences

jabgui/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java

@@ -22,6 +22,22 @@ public NameDisplayPreferences(DisplayStyle displayStyle,
         this.abbreviationStyle.set(abbreviationStyle);
     }
 
+    private NameDisplayPreferences() {
+        this(
+                DisplayStyle.NATBIB,
+                AbbreviationStyle.FULL
+        );
+    }
+
+    public static NameDisplayPreferences getDefault() {
+        return new NameDisplayPreferences();
+    }
+
+    public void setAll(NameDisplayPreferences preferences) {
+        this.displayStyle.set(preferences.displayStyle.get());
+        this.abbreviationStyle.set(preferences.abbreviationStyle.get());
+    }
+
     public DisplayStyle getDisplayStyle() {
         return displayStyle.get();
     }

jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java

@@ -287,14 +287,6 @@ private JabRefGuiPreferences() {
                         "</font>__NEWLINE__");
         // endregion
 
-        // region NameDisplayPreferences
-        defaults.put(NAMES_AS_IS, Boolean.FALSE); // "Show names unchanged"
-        defaults.put(NAMES_FIRST_LAST, Boolean.FALSE); // "Show 'Firstname Lastname'"
-        defaults.put(NAMES_NATBIB, Boolean.TRUE); // "Natbib style"
-        defaults.put(ABBR_AUTHOR_NAMES, Boolean.TRUE); // "Abbreviate names"
-        defaults.put(NAMES_LAST_ONLY, Boolean.TRUE); // "Show last names only"
-        // endregion
-
         // By default disable "Fit table horizontally on the screen"
         defaults.put(AUTO_RESIZE_MODE, Boolean.FALSE);
 
@@ -352,6 +344,7 @@ public void clear() throws BackingStoreException {
         getWorkspacePreferences().setAll(WorkspacePreferences.getDefault());
         getAutoCompletePreferences().setAll(AutoCompletePreferences.getDefault());
         getSidePanePreferences().setAll(SidePanePreferences.getDefault());
+        getNameDisplayPreferences().setAll(NameDisplayPreferences.getDefault());
     }
 
     @Override
@@ -375,6 +368,7 @@ public void importPreferences(Path path) throws JabRefException {
         getWorkspacePreferences().setAll(getWorkspacePreferencesFromBackingStore(getWorkspacePreferences()));
         getAutoCompletePreferences().setAll(getAutoCompletePreferencesFromBackingStore(getAutoCompletePreferences()));
         getSidePanePreferences().setAll(getSidePanePreferencesFromBackingStore(getSidePanePreferences()));
+        getNameDisplayPreferences().setAll(getNameDisplayPreferencesFromBackingStore(getNameDisplayPreferences()));
     }
 
     // region EntryEditorPreferences
@@ -936,45 +930,65 @@ public NameDisplayPreferences getNameDisplayPreferences() {
             return nameDisplayPreferences;
         }
 
-        nameDisplayPreferences = new NameDisplayPreferences(
-                getNameDisplayStyle(),
-                getNameAbbreviationStyle());
+        nameDisplayPreferences = getNameDisplayPreferencesFromBackingStore(NameDisplayPreferences.getDefault());
 
         EasyBind.listen(nameDisplayPreferences.displayStyleProperty(), (obs, oldValue, newValue) -> {
             putBoolean(NAMES_NATBIB, newValue == NameDisplayPreferences.DisplayStyle.NATBIB);
+            System.out.println(NAMES_NATBIB + ": " + newValue);
             putBoolean(NAMES_AS_IS, newValue == NameDisplayPreferences.DisplayStyle.AS_IS);
+            System.out.println(NAMES_AS_IS + ": " + newValue);
             putBoolean(NAMES_FIRST_LAST, newValue == NameDisplayPreferences.DisplayStyle.FIRSTNAME_LASTNAME);
+            System.out.println(NAMES_FIRST_LAST + ": " + newValue);
         });
         EasyBind.listen(nameDisplayPreferences.abbreviationStyleProperty(), (obs, oldValue, newValue) -> {
             putBoolean(ABBR_AUTHOR_NAMES, newValue == NameDisplayPreferences.AbbreviationStyle.FULL);
+            System.out.println(ABBR_AUTHOR_NAMES + ": " + newValue);
             putBoolean(NAMES_LAST_ONLY, newValue == NameDisplayPreferences.AbbreviationStyle.LASTNAME_ONLY);
+            System.out.println(NAMES_LAST_ONLY + ": " + newValue);
         });
 
         return nameDisplayPreferences;
     }
 
-    private NameDisplayPreferences.AbbreviationStyle getNameAbbreviationStyle() {
-        NameDisplayPreferences.AbbreviationStyle abbreviationStyle = NameDisplayPreferences.AbbreviationStyle.NONE; // default
-        if (getBoolean(ABBR_AUTHOR_NAMES)) {
-            abbreviationStyle = NameDisplayPreferences.AbbreviationStyle.FULL;
-        } else if (getBoolean(NAMES_LAST_ONLY)) {
-            abbreviationStyle = NameDisplayPreferences.AbbreviationStyle.LASTNAME_ONLY;
-        }
-        return abbreviationStyle;
+    private NameDisplayPreferences getNameDisplayPreferencesFromBackingStore(NameDisplayPreferences defaults) {
+        return new NameDisplayPreferences(
+                getNameDisplayStyleFromBackingStore(defaults),
+                getNameAbbreviationStyleFromBackingStore(defaults)
+        );
     }
 
-    private NameDisplayPreferences.DisplayStyle getNameDisplayStyle() {
-        NameDisplayPreferences.DisplayStyle displayStyle = NameDisplayPreferences.DisplayStyle.LASTNAME_FIRSTNAME; // default
-        if (getBoolean(NAMES_NATBIB)) {
-            displayStyle = NameDisplayPreferences.DisplayStyle.NATBIB;
-        } else if (getBoolean(NAMES_AS_IS)) {
-            displayStyle = NameDisplayPreferences.DisplayStyle.AS_IS;
-        } else if (getBoolean(NAMES_FIRST_LAST)) {
-            displayStyle = NameDisplayPreferences.DisplayStyle.FIRSTNAME_LASTNAME;
+    private NameDisplayPreferences.DisplayStyle getNameDisplayStyleFromBackingStore(NameDisplayPreferences defaults) {
+        if (!hasKey(NAMES_NATBIB) && !hasKey(NAMES_AS_IS) && !hasKey(NAMES_FIRST_LAST)) {
+            return defaults.getDisplayStyle();
+        }
+
+        if (getBoolean(NAMES_NATBIB, false)) {
+            return NameDisplayPreferences.DisplayStyle.NATBIB;
+        }
+        if (getBoolean(NAMES_AS_IS, false)) {
+            return NameDisplayPreferences.DisplayStyle.AS_IS;
+        }
+        if (getBoolean(NAMES_FIRST_LAST, false)) {
+            return NameDisplayPreferences.DisplayStyle.FIRSTNAME_LASTNAME;
         }
-        return displayStyle;
+
+        return NameDisplayPreferences.DisplayStyle.LASTNAME_FIRSTNAME;
     }
 
+    private NameDisplayPreferences.AbbreviationStyle getNameAbbreviationStyleFromBackingStore(NameDisplayPreferences defaults) {
+        if (!hasKey(ABBR_AUTHOR_NAMES) && !hasKey(NAMES_LAST_ONLY)) {
+            return defaults.getAbbreviationStyle();
+        }
+
+        if (getBoolean(ABBR_AUTHOR_NAMES, false)) {
+            return NameDisplayPreferences.AbbreviationStyle.FULL;
+        }
+        if (getBoolean(NAMES_LAST_ONLY, false)) {
+            return NameDisplayPreferences.AbbreviationStyle.LASTNAME_ONLY;
+        }
+
+        return NameDisplayPreferences.AbbreviationStyle.NONE;
+    }
     // endregion
 
     // region: Main table, main table column, and search dialog column preferences