fix: update according to Subhramit and Carl's suggestion

Author: Yubo-Cao

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

@@ -241,6 +241,7 @@ public class JabRefGuiPreferences extends JabRefCliPreferences implements GuiPre
     private KeyBindingRepository keyBindingRepository;
     private CopyToPreferences copyToPreferences;
     private NewEntryPreferences newEntryPreferences;
+    private DonationPreferences donationPreferences;
 
     private JabRefGuiPreferences() {
         super();
@@ -1203,10 +1204,14 @@ public NewEntryPreferences getNewEntryPreferences() {
     }
 
     public DonationPreferences getDonationPreferences() {
-        DonationPreferences dp = new DonationPreferences(getBoolean(DONATION_NEVER_SHOW), getInt(DONATION_LAST_SHOWN_EPOCH_DAY));
-        EasyBind.listen(dp.neverShowAgainProperty(), (_, _, nv) -> putBoolean(DONATION_NEVER_SHOW, nv));
-        EasyBind.listen(dp.lastShownEpochDayProperty(), (_, _, nv) -> putInt(DONATION_LAST_SHOWN_EPOCH_DAY, nv.intValue()));
-        return dp;
+        if (donationPreferences != null) {
+            return donationPreferences;
+        }
+
+        donationPreferences = new DonationPreferences(getBoolean(DONATION_NEVER_SHOW), getInt(DONATION_LAST_SHOWN_EPOCH_DAY));
+        EasyBind.listen(donationPreferences.neverShowAgainProperty(), (_, _, newValue) -> putBoolean(DONATION_NEVER_SHOW, newValue));
+        EasyBind.listen(donationPreferences.lastShownEpochDayProperty(), (_, _, newValue) -> putInt(DONATION_LAST_SHOWN_EPOCH_DAY, newValue.intValue()));
+        return donationPreferences;
     }
 
     /**

jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java

@@ -15,6 +15,7 @@
 import org.jabref.gui.fieldeditors.LinkedFilesEditor;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.maintable.MainTable;
+import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.preferences.PreferencesDialogView;
 import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.util.URLs;
@@ -49,11 +50,13 @@ public class WalkthroughAction extends SimpleCommand {
     private final LibraryTabContainer frame;
     private final StateManager stateManager;
     private final Stage stage;
+    private final GuiPreferences preferences;
 
-    public WalkthroughAction(Stage stage, LibraryTabContainer frame, StateManager stateManager, String name) {
+    public WalkthroughAction(Stage stage, LibraryTabContainer frame, StateManager stateManager, GuiPreferences preferences, String name) {
         this.stage = stage;
         this.frame = frame;
         this.stateManager = stateManager;
+        this.preferences = preferences;
         this.walkthrough = getWalkthrough(name);
     }
 
@@ -456,7 +459,7 @@ private Walkthrough createSearchWalkthrough() {
                                         .sideEffect(new OpenLibrarySideEffect(frame, "SearchExamples.bib")))
                 // Step 1b: Ensure initial search settings
                 .addStep(WalkthroughStep.sideEffect(Localization.lang("Prepare search settings"))
-                                        .sideEffect(new EnsureSearchSettingsSideEffect()))
+                                        .sideEffect(new EnsureSearchSettingsSideEffect(preferences.getSearchPreferences())))
                 // Step 2: Introduction
                 .addStep(WalkthroughStep
                         .panel(Localization.lang("Welcome to the search walkthrough"))

jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java

@@ -1,12 +1,11 @@
 package org.jabref.gui.walkthrough.declarative.sideeffect;
 
-import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.walkthrough.Walkthrough;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.search.SearchPreferences;
 import org.jabref.model.search.SearchDisplayMode;
 import org.jabref.model.search.SearchFlags;
 
-import com.airhacks.afterburner.injection.Injector;
 import org.jspecify.annotations.NonNull;
 
 /// Ensures the search bar starts with unfiltered mode and regex disabled, then restores
@@ -15,12 +14,13 @@ public class EnsureSearchSettingsSideEffect implements WalkthroughSideEffect {
     private final boolean previousRegex;
     private final boolean previousCaseSensitive;
     private final SearchDisplayMode previousDisplayMode;
+    private final SearchPreferences searchPreferences;
 
-    public EnsureSearchSettingsSideEffect() {
-        var preferences = Injector.instantiateModelOrService(GuiPreferences.class).getSearchPreferences();
-        this.previousRegex = preferences.isRegularExpression();
-        this.previousCaseSensitive = preferences.isCaseSensitive();
-        this.previousDisplayMode = preferences.getSearchDisplayMode();
+    public EnsureSearchSettingsSideEffect(SearchPreferences searchPreferences) {
+        this.searchPreferences = searchPreferences;
+        this.previousRegex = searchPreferences.isRegularExpression();
+        this.previousCaseSensitive = searchPreferences.isCaseSensitive();
+        this.previousDisplayMode = searchPreferences.getSearchDisplayMode();
     }
 
     @Override
@@ -30,19 +30,17 @@ public EnsureSearchSettingsSideEffect() {
 
     @Override
     public boolean forward(@NonNull Walkthrough walkthrough) {
-        var preferences = Injector.instantiateModelOrService(GuiPreferences.class).getSearchPreferences();
-        preferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, false);
-        preferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, false);
-        preferences.setSearchDisplayMode(SearchDisplayMode.FLOAT);
+        searchPreferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, false);
+        searchPreferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, false);
+        searchPreferences.setSearchDisplayMode(SearchDisplayMode.FLOAT);
         return true;
     }
 
     @Override
     public boolean backward(@NonNull Walkthrough walkthrough) {
-        var preferences = Injector.instantiateModelOrService(GuiPreferences.class).getSearchPreferences();
-        preferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, previousRegex);
-        preferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, previousCaseSensitive);
-        preferences.setSearchDisplayMode(previousDisplayMode);
+        searchPreferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, previousRegex);
+        searchPreferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, previousCaseSensitive);
+        searchPreferences.setSearchDisplayMode(previousDisplayMode);
         return true;
     }
 

jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java

@@ -178,7 +178,7 @@ private VBox createLeftColumn() {
 
     private VBox createRightColumn() {
         this.quickSettings = new QuickSettings(preferences, dialogService, taskExecutor, themeManager);
-        this.walkthroughs = new Walkthroughs(stage, tabContainer, stateManager);
+        this.walkthroughs = new Walkthroughs(stage, tabContainer, stateManager, preferences);
         VBox rightColumn = new VBox(quickSettings, walkthroughs);
         rightColumn.getStyleClass().add("welcome-content-column");
         VBox.setVgrow(quickSettings, Priority.ALWAYS);

jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java

@@ -9,21 +9,24 @@
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.walkthrough.WalkthroughAction;
 import org.jabref.logic.l10n.Localization;
 
 public class Walkthroughs extends VBox {
     private final Stage stage;
     private final LibraryTabContainer tabContainer;
     private final StateManager stateManager;
+    private final GuiPreferences preferences;
 
     private final Label header;
     private boolean isScrollEnabled = true;
 
-    public Walkthroughs(Stage stage, LibraryTabContainer tabContainer, StateManager stateManager) {
+    public Walkthroughs(Stage stage, LibraryTabContainer tabContainer, StateManager stateManager, GuiPreferences preferences) {
         this.stage = stage;
         this.tabContainer = tabContainer;
         this.stateManager = stateManager;
+        this.preferences = preferences;
 
         getStyleClass().add("welcome-section");
 
@@ -98,7 +101,7 @@ private Button createWalkthroughButton(String text, IconTheme.JabRefIcons icon,
         button.setGraphic(icon.getGraphicNode());
         button.getStyleClass().add("quick-settings-button");
         button.setMaxWidth(Double.MAX_VALUE);
-        button.setOnAction(_ -> new WalkthroughAction(stage, tabContainer, stateManager, walkthroughId).execute());
+        button.setOnAction(_ -> new WalkthroughAction(stage, tabContainer, stateManager, preferences, walkthroughId).execute());
         return button;
     }
 }