Skip to content

New fix/new entry preferences #14427

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

Merged
merged 17 commits into from
Dec 1, 2025
+58 −33
Merged

New fix/new entry preferences #14427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fe22fcb
Refactor: Extract NewEntryPreferences from JabRefPreferences
Nov 25, 2025
ed7dd21
Refactor: Extract NewEntryPreferences from JabRefPreferences
Nov 25, 2025
2222759
Formatting done
Nov 25, 2025
2863314
Fix Checkstyle errors
Nov 25, 2025
44e0ed8
fixed-comments
Nov 26, 2025
086f955
Addressed_the_comments_usage_of_constatants
Nov 27, 2025
6c1a4dd
Merge remote-tracking branch 'origin/main' into new-fix/new_entry_pre…
Nov 27, 2025
8c661a1
solving-comments
Nov 28, 2025
f70b95e
Merge branch 'main' into new-fix/new_entry_preferences
Nov 28, 2025
3dd3ab7
Merge branch 'main' into new-fix/new_entry_preferences
rahulkarru Nov 28, 2025
14e4476
Fix order
calixtus Nov 28, 2025
88876b7
Fix order for consistency with other preferences objects
calixtus Nov 28, 2025
0c469d0
whitespaces
calixtus Nov 28, 2025
ecf357e
added_defaults
Nov 29, 2025
ff0b6d6
Merge remote-tracking branch 'origin/new-fix/new_entry_preferences' i…
Nov 29, 2025
5d03256
removed comments and adjusted the default values
Dec 1, 2025
dfcc685
Remove newline
calixtus Dec 1, 2025
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
31 changes: 31 additions & 0 deletions jabgui/src/main/java/org/jabref/gui/newentry/NewEntryPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;

import org.jabref.logic.importer.fetcher.DoiFetcher;
import org.jabref.logic.importer.plaincitation.PlainCitationParserChoice;
import org.jabref.model.entry.types.EntryType;
import org.jabref.model.entry.types.StandardEntryType;

public class NewEntryPreferences {
private final ObjectProperty<NewEntryDialogTab> latestApproach;
Expand Down Expand Up @@ -37,6 +40,34 @@ public NewEntryPreferences(NewEntryDialogTab approach,
this.latestInterpretParserName = new SimpleStringProperty(interpretParserName);
}

private NewEntryPreferences() {
this(
NewEntryDialogTab.CHOOSE_ENTRY_TYPE, // Default latest approach
true, // Default expanded recommended
false, // Default expanded other
true, // Default expanded custom
StandardEntryType.Article, // Default immediate type
true, // Default Id lookup guessing
DoiFetcher.NAME, // Default fetcher
PlainCitationParserChoice.RULE_BASED_GENERAL.getLocalizedName() // Default parser
);
}

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

public void setAll(NewEntryPreferences other) {
this.latestApproach.set(other.getLatestApproach());
this.typesRecommendedExpanded.set(other.getTypesRecommendedExpanded());
this.typesOtherExpanded.set(other.getTypesOtherExpanded());
this.typesCustomExpanded.set(other.getTypesCustomExpanded());
this.latestImmediateType.set(other.getLatestImmediateType());
this.idLookupGuessing.set(other.getIdLookupGuessing());
this.latestIdFetcherName.set(other.getLatestIdFetcher());
this.latestInterpretParserName.set(other.getLatestInterpretParser());
}

public NewEntryDialogTab getLatestApproach() {
return latestApproach.get();
}
Expand Down
60 changes: 27 additions & 33 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 @@ -55,8 +55,6 @@
import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
import org.jabref.logic.externalfiles.DateRange;
import org.jabref.logic.externalfiles.ExternalFileSorter;
import org.jabref.logic.importer.fetcher.DoiFetcher;
import org.jabref.logic.importer.plaincitation.PlainCitationParserChoice;
import org.jabref.logic.journals.JournalAbbreviationRepository;
import org.jabref.logic.l10n.Localization;
import org.jabref.logic.layout.TextBasedPreviewLayout;
Expand Down Expand Up @@ -362,17 +360,6 @@ private JabRefGuiPreferences() {

defaults.put(ASK_FOR_INCLUDING_CROSS_REFERENCES, Boolean.TRUE);
defaults.put(INCLUDE_CROSS_REFERENCES, Boolean.FALSE);

// region NewEntryUnifierPreferences
defaults.put(CREATE_ENTRY_APPROACH, List.of(NewEntryDialogTab.values()).indexOf(NewEntryDialogTab.CHOOSE_ENTRY_TYPE));
defaults.put(CREATE_ENTRY_EXPAND_RECOMMENDED, true);
defaults.put(CREATE_ENTRY_EXPAND_OTHER, false);
defaults.put(CREATE_ENTRY_EXPAND_CUSTOM, true);
defaults.put(CREATE_ENTRY_IMMEDIATE_TYPE, StandardEntryType.Article.getDisplayName());
defaults.put(CREATE_ENTRY_ID_LOOKUP_GUESSING, true);
defaults.put(CREATE_ENTRY_ID_FETCHER_NAME, DoiFetcher.NAME);
defaults.put(CREATE_ENTRY_INTERPRET_PARSER_NAME, PlainCitationParserChoice.RULE_BASED_GENERAL.getLocalizedName());
// endregion
}

/**
Expand Down Expand Up @@ -410,6 +397,7 @@ public void clear() throws BackingStoreException {
getWorkspacePreferences().setAll(WorkspacePreferences.getDefault());
getGuiPreferences().setAll(CoreGuiPreferences.getDefault());
getDonationPreferences().setAll(DonationPreferences.getDefault());
getNewEntryPreferences().setAll(NewEntryPreferences.getDefault());
}

@Override
Expand All @@ -420,6 +408,7 @@ public void importPreferences(Path file) throws JabRefException {
getWorkspacePreferences().setAll(getWorkspacePreferencesFromBackingStore(getWorkspacePreferences()));
getGuiPreferences().setAll(getCoreGuiPreferencesFromBackingStore(getGuiPreferences()));
getDonationPreferences().setAll(getDonationPreferencesFromBackingStore(getDonationPreferences()));
getNewEntryPreferences().setAll(getNewEntryPreferencesFromBackingStore(getNewEntryPreferences()));
}

// region EntryEditorPreferences
Expand Down Expand Up @@ -1173,12 +1162,27 @@ public NewEntryPreferences getNewEntryPreferences() {
return newEntryPreferences;
}

final int approachIndex = getInt(CREATE_ENTRY_APPROACH);
newEntryPreferences = getNewEntryPreferencesFromBackingStore(NewEntryPreferences.getDefault());

EasyBind.listen(newEntryPreferences.latestApproachProperty(), (_, _, newValue) -> putInt(CREATE_ENTRY_APPROACH, List.of(NewEntryDialogTab.values()).indexOf(newValue)));
EasyBind.listen(newEntryPreferences.typesRecommendedExpandedProperty(), (_, _, newValue) -> putBoolean(CREATE_ENTRY_EXPAND_RECOMMENDED, newValue));
EasyBind.listen(newEntryPreferences.typesOtherExpandedProperty(), (_, _, newValue) -> putBoolean(CREATE_ENTRY_EXPAND_OTHER, newValue));
EasyBind.listen(newEntryPreferences.typesCustomExpandedProperty(), (_, _, newValue) -> putBoolean(CREATE_ENTRY_EXPAND_CUSTOM, newValue));
EasyBind.listen(newEntryPreferences.latestImmediateTypeProperty(), (_, _, newValue) -> put(CREATE_ENTRY_IMMEDIATE_TYPE, newValue.getDisplayName()));
EasyBind.listen(newEntryPreferences.idLookupGuessingProperty(), (_, _, newValue) -> putBoolean(CREATE_ENTRY_ID_LOOKUP_GUESSING, newValue));
EasyBind.listen(newEntryPreferences.latestIdFetcherProperty(), (_, _, newValue) -> put(CREATE_ENTRY_ID_FETCHER_NAME, newValue));
EasyBind.listen(newEntryPreferences.latestInterpretParserProperty(), (_, _, newValue) -> put(CREATE_ENTRY_INTERPRET_PARSER_NAME, newValue));

return newEntryPreferences;
}

private NewEntryPreferences getNewEntryPreferencesFromBackingStore(NewEntryPreferences defaults) {
final int approachIndex = getInt(CREATE_ENTRY_APPROACH, List.of(NewEntryDialogTab.values()).indexOf(defaults.getLatestApproach()));
NewEntryDialogTab approach = NewEntryDialogTab.values().length > approachIndex
? NewEntryDialogTab.values()[approachIndex]
: NewEntryDialogTab.values()[0];

final String immediateTypeName = get(CREATE_ENTRY_IMMEDIATE_TYPE);
final String immediateTypeName = get(CREATE_ENTRY_IMMEDIATE_TYPE, defaults.getLatestImmediateType().getDisplayName());
EntryType immediateType = StandardEntryType.Article;
for (StandardEntryType type : StandardEntryType.values()) {
if (type.getDisplayName().equals(immediateTypeName)) {
Expand All @@ -1187,26 +1191,16 @@ public NewEntryPreferences getNewEntryPreferences() {
}
}

newEntryPreferences = new NewEntryPreferences(
return new NewEntryPreferences(
approach,
getBoolean(CREATE_ENTRY_EXPAND_RECOMMENDED),
getBoolean(CREATE_ENTRY_EXPAND_OTHER),
getBoolean(CREATE_ENTRY_EXPAND_CUSTOM),
getBoolean(CREATE_ENTRY_EXPAND_RECOMMENDED, defaults.getTypesRecommendedExpanded()),
getBoolean(CREATE_ENTRY_EXPAND_OTHER, defaults.getTypesOtherExpanded()),
getBoolean(CREATE_ENTRY_EXPAND_CUSTOM, defaults.getTypesCustomExpanded()),
immediateType,
getBoolean(CREATE_ENTRY_ID_LOOKUP_GUESSING),
get(CREATE_ENTRY_ID_FETCHER_NAME),
get(CREATE_ENTRY_INTERPRET_PARSER_NAME));

EasyBind.listen(newEntryPreferences.latestApproachProperty(), (_, _, newValue) -> putInt(CREATE_ENTRY_APPROACH, List.of(NewEntryDialogTab.values()).indexOf(newValue)));
EasyBind.listen(newEntryPreferences.typesRecommendedExpandedProperty(), (_, _, newValue) -> putBoolean(CREATE_ENTRY_EXPAND_RECOMMENDED, newValue));
EasyBind.listen(newEntryPreferences.typesOtherExpandedProperty(), (_, _, newValue) -> putBoolean(CREATE_ENTRY_EXPAND_OTHER, newValue));
EasyBind.listen(newEntryPreferences.typesCustomExpandedProperty(), (_, _, newValue) -> putBoolean(CREATE_ENTRY_EXPAND_CUSTOM, newValue));
EasyBind.listen(newEntryPreferences.latestImmediateTypeProperty(), (_, _, newValue) -> put(CREATE_ENTRY_IMMEDIATE_TYPE, newValue.getDisplayName()));
EasyBind.listen(newEntryPreferences.idLookupGuessingProperty(), (_, _, newValue) -> putBoolean(CREATE_ENTRY_ID_LOOKUP_GUESSING, newValue));
EasyBind.listen(newEntryPreferences.latestIdFetcherProperty(), (_, _, newValue) -> put(CREATE_ENTRY_ID_FETCHER_NAME, newValue));
EasyBind.listen(newEntryPreferences.latestInterpretParserProperty(), (_, _, newValue) -> put(CREATE_ENTRY_INTERPRET_PARSER_NAME, newValue));

return newEntryPreferences;
getBoolean(CREATE_ENTRY_ID_LOOKUP_GUESSING, defaults.getIdLookupGuessing()),
get(CREATE_ENTRY_ID_FETCHER_NAME, defaults.getLatestIdFetcher()),
get(CREATE_ENTRY_INTERPRET_PARSER_NAME, defaults.getLatestInterpretParser())
);
}

// region Donation preferences
Expand Down