Pass the ThemeLoader object and JabRefPreferences object into ShowPre…

…ferencesAction constructor rather than using Globals
JabRef · May 6, 2020 · 75198fb · 75198fb
1 parent 9af83f4
commit 75198fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -863,7 +863,7 @@ private MenuBar createMenu() {
         });
 
         options.getItems().addAll(
-                factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this, Globals.TASK_EXECUTOR)),
+                factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this, Globals.TASK_EXECUTOR, themeLoader, prefs)),
 
                 new SeparatorMenuItem(),
 

diff --git a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
@@ -1,18 +1,23 @@
 package org.jabref.gui.preferences;
 
-import org.jabref.Globals;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.gui.util.ThemeLoader;
+import org.jabref.preferences.JabRefPreferences;
 
 public class ShowPreferencesAction extends SimpleCommand {
 
     private final JabRefFrame jabRefFrame;
     private final TaskExecutor taskExecutor;
+    private final ThemeLoader themeLoader;
+    private final JabRefPreferences prefs;
 
-    public ShowPreferencesAction(JabRefFrame jabRefFrame, TaskExecutor taskExecutor) {
+    public ShowPreferencesAction(JabRefFrame jabRefFrame, TaskExecutor taskExecutor, ThemeLoader themeLoader, JabRefPreferences prefs) {
         this.jabRefFrame = jabRefFrame;
         this.taskExecutor = taskExecutor;
+        this.themeLoader = themeLoader;
+        this.prefs = prefs;
     }
 
     @Override
@@ -21,7 +26,7 @@ public void execute() {
         preferencesDialogView.show();
         for (PreferencesTab tab: preferencesDialogView.getPreferenceTabList().getItems()) {
             if (tab.getBuilder().getScene() != null) {
-                Globals.getThemeLoader().installCss(tab.getBuilder().getScene(), Globals.prefs);
+                this.themeLoader.installCss(tab.getBuilder().getScene(), this.prefs);
             }
         }
     }