Skip to content

Commit 75198fb

Browse files
committed
Pass the ThemeLoader object and JabRefPreferences object into ShowPreferencesAction constructor rather than using Globals
1 parent 9af83f4 commit 75198fb

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/main/java/org/jabref/gui/JabRefFrame.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ private MenuBar createMenu() {
863863
});
864864

865865
options.getItems().addAll(
866-
factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this, Globals.TASK_EXECUTOR)),
866+
factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this, Globals.TASK_EXECUTOR, themeLoader, prefs)),
867867

868868
new SeparatorMenuItem(),
869869

src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
package org.jabref.gui.preferences;
22

3-
import org.jabref.Globals;
43
import org.jabref.gui.JabRefFrame;
54
import org.jabref.gui.actions.SimpleCommand;
65
import org.jabref.gui.util.TaskExecutor;
6+
import org.jabref.gui.util.ThemeLoader;
7+
import org.jabref.preferences.JabRefPreferences;
78

89
public class ShowPreferencesAction extends SimpleCommand {
910

1011
private final JabRefFrame jabRefFrame;
1112
private final TaskExecutor taskExecutor;
13+
private final ThemeLoader themeLoader;
14+
private final JabRefPreferences prefs;
1215

13-
public ShowPreferencesAction(JabRefFrame jabRefFrame, TaskExecutor taskExecutor) {
16+
public ShowPreferencesAction(JabRefFrame jabRefFrame, TaskExecutor taskExecutor, ThemeLoader themeLoader, JabRefPreferences prefs) {
1417
this.jabRefFrame = jabRefFrame;
1518
this.taskExecutor = taskExecutor;
19+
this.themeLoader = themeLoader;
20+
this.prefs = prefs;
1621
}
1722

1823
@Override
@@ -21,7 +26,7 @@ public void execute() {
2126
preferencesDialogView.show();
2227
for (PreferencesTab tab: preferencesDialogView.getPreferenceTabList().getItems()) {
2328
if (tab.getBuilder().getScene() != null) {
24-
Globals.getThemeLoader().installCss(tab.getBuilder().getScene(), Globals.prefs);
29+
this.themeLoader.installCss(tab.getBuilder().getScene(), this.prefs);
2530
}
2631
}
2732
}

0 commit comments

Comments
 (0)