Skip to content

Added Backingstore, setAll and getAll methods, modified Helper Method… #14941

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

Closed
aaryyya wants to merge 3 commits into from
Closed

Added Backingstore, setAll and getAll methods, modified Helper Method… #14941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3193a17
Added Backingstore, setAll and getAll methods, modified Helper Method…
aaryyya Jan 27, 2026
f6499a7
Merge branch 'main' into fix_NameDisplayPreferences
aaryyya Jan 27, 2026
c5fc2e3
Merge branch 'main' into fix_NameDisplayPreferences
aaryyya Jan 27, 2026
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
18 changes: 18 additions & 0 deletions jabgui/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,24 @@ public NameDisplayPreferences(DisplayStyle displayStyle,
this.abbreviationStyle.set(abbreviationStyle);
}

private NameDisplayPreferences() {
this(
DisplayStyle.NATBIB, //displayStyle: use Natbib-style name formatting
AbbreviationStyle.LASTNAME_ONLY //abbreviationStyle: abbreviate names to last names only
);
}

public static NameDisplayPreferences getDefault() {
return new NameDisplayPreferences();
}

public void setAll(NameDisplayPreferences other) {
setDisplayStyle(other.getDisplayStyle());
setAbbreviationStyle(other.getAbbreviationStyle());
}



public DisplayStyle getDisplayStyle() {
return displayStyle.get();
}
Expand Down
36 changes: 11 additions & 25 deletions jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,12 +286,7 @@ private JabRefGuiPreferences() {
// 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
//
Copy link
Member

@calixtus calixtus Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?


// By default disable "Fit table horizontally on the screen"
defaults.put(AUTO_RESIZE_MODE, Boolean.FALSE);
Expand Down Expand Up @@ -350,6 +345,7 @@ public void clear() throws BackingStoreException {
getWorkspacePreferences().setAll(WorkspacePreferences.getDefault());
getAutoCompletePreferences().setAll(AutoCompletePreferences.getDefault());
getSidePanePreferences().setAll(SidePanePreferences.getDefault());
getNameDisplayPreferences().setAll(NameDisplayPreferences.getDefault());
}

@Override
Expand All @@ -373,6 +369,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
Expand Down Expand Up @@ -933,9 +930,7 @@ 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);
Expand All @@ -951,25 +946,16 @@ public NameDisplayPreferences getNameDisplayPreferences() {
}

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;
return NameDisplayPreferences.getDefault().getAbbreviationStyle();
Comment on lines -954 to +949
Copy link
Member

@calixtus calixtus Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So you basically ignore what is stored in the preferences and just always use the 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;
}
return displayStyle;
return NameDisplayPreferences.getDefault().getDisplayStyle();
Comment on lines -964 to +953
Copy link
Member

@calixtus calixtus Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope

}

private NameDisplayPreferences getNameDisplayPreferencesFromBackingStore(
NameDisplayPreferences defaults) {
return new NameDisplayPreferences(getNameDisplayStyle(), getNameAbbreviationStyle());
}

// endregion
Expand Down
Loading