From 534fefe878109afcb92db55d8556cf9c55976c58 Mon Sep 17 00:00:00 2001
From: Houssem Nasri <housi.housi2015@gmail.com>
Date: Thu, 30 Jun 2022 12:22:46 +0100
Subject: [PATCH 1/6] Remove installCss(dialogScene) from dialogs because
 JavaFX already handle that

- If we update dialog stylesheet ourselves than we're breaking the binding made by JavaFX and thus unexpected behaviours may/will happen
---
 src/main/java/org/jabref/gui/JabRefDialogService.java | 10 ----------
 src/main/java/org/jabref/gui/util/BaseDialog.java     |  4 ----
 2 files changed, 14 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefDialogService.java b/src/main/java/org/jabref/gui/JabRefDialogService.java
index 3f50cfd8616..d21e0b3b9d9 100644
--- a/src/main/java/org/jabref/gui/JabRefDialogService.java
+++ b/src/main/java/org/jabref/gui/JabRefDialogService.java
@@ -80,7 +80,6 @@ public JabRefDialogService(Window mainWindow, Pane mainPane, ThemeManager themeM
 
     private FXDialog createDialog(AlertType type, String title, String content) {
         FXDialog alert = new FXDialog(type, title, true);
-        themeManager.installCss(alert.getDialogPane().getScene());
         alert.setHeaderText(null);
         alert.setContentText(content);
         alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
@@ -113,7 +112,6 @@ protected Node createDetailsButton() {
 
         // Reset the dialog graphic using the default style
         alert.getDialogPane().setGraphic(graphic);
-        themeManager.installCss(alert.getDialogPane().getScene());
         alert.setHeaderText(null);
         alert.setContentText(content);
         alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
@@ -138,7 +136,6 @@ public <T> Optional<T> showChoiceDialogAndWait(String title, String content, Str
         choiceDialog.setTitle(title);
         choiceDialog.setContentText(content);
         choiceDialog.initOwner(mainWindow);
-        themeManager.installCss(choiceDialog.getDialogPane().getScene());
         return choiceDialog.showAndWait();
     }
 
@@ -148,7 +145,6 @@ public Optional<String> showInputDialogAndWait(String title, String content) {
         inputDialog.setHeaderText(title);
         inputDialog.setContentText(content);
         inputDialog.initOwner(mainWindow);
-        themeManager.installCss(inputDialog.getDialogPane().getScene());
         return inputDialog.showAndWait();
     }
 
@@ -158,7 +154,6 @@ public Optional<String> showInputDialogWithDefaultAndWait(String title, String c
         inputDialog.setHeaderText(title);
         inputDialog.setContentText(content);
         inputDialog.initOwner(mainWindow);
-        themeManager.installCss(inputDialog.getDialogPane().getScene());
         return inputDialog.showAndWait();
     }
 
@@ -186,7 +181,6 @@ public void showErrorDialogAndWait(String message, Throwable exception) {
         exceptionDialog.getDialogPane().setMaxWidth(mainWindow.getWidth() / 2);
         exceptionDialog.setHeaderText(message);
         exceptionDialog.initOwner(mainWindow);
-        themeManager.installCss(exceptionDialog.getDialogPane().getScene());
         exceptionDialog.showAndWait();
     }
 
@@ -196,7 +190,6 @@ public void showErrorDialogAndWait(String title, String content, Throwable excep
         exceptionDialog.setHeaderText(title);
         exceptionDialog.setContentText(content);
         exceptionDialog.initOwner(mainWindow);
-        themeManager.installCss(exceptionDialog.getDialogPane().getScene());
         exceptionDialog.showAndWait();
     }
 
@@ -266,7 +259,6 @@ public Optional<ButtonType> showCustomDialogAndWait(String title, DialogPane con
         alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
         alert.setResizable(true);
         alert.initOwner(mainWindow);
-        themeManager.installCss(alert.getDialogPane().getScene());
         return alert.showAndWait();
     }
 
@@ -294,7 +286,6 @@ public <V> void showProgressDialog(String title, String content, Task<V> task) {
             task.cancel();
             progressDialog.close();
         });
-        themeManager.installCss(progressDialog.getDialogPane().getScene());
         progressDialog.initOwner(mainWindow);
         progressDialog.show();
     }
@@ -319,7 +310,6 @@ public <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(String title
         alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
         alert.setResizable(true);
         alert.initOwner(mainWindow);
-        themeManager.installCss(alert.getDialogPane().getScene());
 
         stateManager.getAnyTasksThatWillNotBeRecoveredRunning().addListener((observable, oldValue, newValue) -> {
             if (!newValue) {
diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index 8879f9b7f5c..28952d94e58 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -39,10 +39,6 @@ protected BaseDialog() {
 
         setDialogIcon(IconTheme.getJabRefImage());
         setResizable(true);
-
-        EasyBind.wrapNullable(dialogPaneProperty())
-                .mapObservable(Node::sceneProperty)
-                .subscribeToValues(scene -> Globals.getThemeManager().installCss(scene));
     }
 
     private Optional<Button> getDefaultButton() {

From 34f04652053446f95d4febb82f58366878759ce5 Mon Sep 17 00:00:00 2001
From: Houssem Nasri <housi.housi2015@gmail.com>
Date: Thu, 30 Jun 2022 13:09:33 +0100
Subject: [PATCH 2/6] Use only main window scene in ThemeManager

---
 .../org/jabref/gui/theme/ThemeManager.java    | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/jabref/gui/theme/ThemeManager.java b/src/main/java/org/jabref/gui/theme/ThemeManager.java
index f317891282e..b8fca76262d 100644
--- a/src/main/java/org/jabref/gui/theme/ThemeManager.java
+++ b/src/main/java/org/jabref/gui/theme/ThemeManager.java
@@ -6,6 +6,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.function.Consumer;
@@ -46,7 +47,7 @@ public class ThemeManager {
     private final StyleSheet baseStyleSheet;
     private Theme theme;
 
-    private final Set<Scene> scenes = Collections.newSetFromMap(new WeakHashMap<>());
+    private Scene mainWindowScene;
     private final Set<WebEngine> webEngines = Collections.newSetFromMap(new WeakHashMap<>());
 
     public ThemeManager(AppearancePreferences appearancePreferences,
@@ -88,8 +89,7 @@ private void updateThemeSettings() {
     }
 
     private void updateFontSettings() {
-        DefaultTaskExecutor.runInJavaFXThread(() ->
-                updateRunner.accept(() -> scenes.forEach(this::updateFontStyle)));
+        DefaultTaskExecutor.runInJavaFXThread(() -> updateRunner.accept(() -> getMainWindowScene().ifPresent(this::updateFontStyle)));
     }
 
     private void removeStylesheetFromWatchList(StyleSheet styleSheet) {
@@ -117,12 +117,10 @@ private void baseCssLiveUpdate() {
         if (baseStyleSheet.getSceneStylesheet() == null) {
             LOGGER.error("Base stylesheet does not exist.");
         } else {
-            LOGGER.debug("Updating base CSS for {} scenes", scenes.size());
+            LOGGER.debug("Updating base CSS for main window scene");
         }
 
-        DefaultTaskExecutor.runInJavaFXThread(() ->
-                updateRunner.accept(() -> scenes.forEach(this::updateBaseCss))
-        );
+        DefaultTaskExecutor.runInJavaFXThread(() -> updateRunner.accept(() -> getMainWindowScene().ifPresent(this::updateBaseCss)));
     }
 
     private void additionalCssLiveUpdate() {
@@ -131,11 +129,11 @@ private void additionalCssLiveUpdate() {
             return styleSheet.getWebEngineStylesheet();
         }).orElse("");
 
-        LOGGER.debug("Updating additional CSS for {} scenes and {} web engines", scenes.size(), webEngines.size());
+        LOGGER.debug("Updating additional CSS for main window scene and {} web engines", webEngines.size());
 
         DefaultTaskExecutor.runInJavaFXThread(() ->
                 updateRunner.accept(() -> {
-                    scenes.forEach(this::updateAdditionalCss);
+                    getMainWindowScene().ifPresent(this::updateAdditionalCss);
 
                     webEngines.forEach(webEngine -> {
                         // force refresh by unloading style sheet, if the location hasn't changed
@@ -149,6 +147,7 @@ private void additionalCssLiveUpdate() {
     }
 
     private void updateBaseCss(Scene scene) {
+        Objects.requireNonNull(scene, "install css for main window scene before updating base css");
         List<String> stylesheets = scene.getStylesheets();
         if (!stylesheets.isEmpty()) {
             stylesheets.remove(0);
@@ -158,6 +157,7 @@ private void updateBaseCss(Scene scene) {
     }
 
     private void updateAdditionalCss(Scene scene) {
+        Objects.requireNonNull(scene, "install css for main window scene before updating additional css");
         scene.getStylesheets().setAll(List.of(
                 baseStyleSheet.getSceneStylesheet().toExternalForm(),
                 appearancePreferences.getTheme()
@@ -177,14 +177,14 @@ private void updateAdditionalCss(Scene scene) {
      * Installs the base css file as a stylesheet in the given scene. Changes in the css file lead to a redraw of the
      * scene using the new css file.
      *
-     * @param scene the scene to install the css into
+     * @param mainWindowScene the scene to install the css into
      */
-    public void installCss(Scene scene) {
+    public void installCss(Scene mainWindowScene) {
+        Objects.requireNonNull(mainWindowScene, "scene is required");
         updateRunner.accept(() -> {
-            if (this.scenes.add(scene)) {
-                updateBaseCss(scene);
-                updateAdditionalCss(scene);
-            }
+            this.mainWindowScene = mainWindowScene;
+            updateBaseCss(mainWindowScene);
+            updateAdditionalCss(mainWindowScene);
         });
     }
 
@@ -223,4 +223,8 @@ public void updateFontStyle(Scene scene) {
     public Theme getActiveTheme() {
         return this.theme;
     }
+
+    public Optional<Scene> getMainWindowScene() {
+        return mainWindowScene == null ? Optional.empty() : Optional.of(mainWindowScene);
+    }
 }

From 8d46f6d09aa1cee54d8ac1543ee9e2c087fa7483 Mon Sep 17 00:00:00 2001
From: Houssem Nasri <housi.housi2015@gmail.com>
Date: Thu, 30 Jun 2022 13:10:31 +0100
Subject: [PATCH 3/6] Checkstyle

---
 src/main/java/org/jabref/gui/util/BaseDialog.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index 28952d94e58..721fcb377cf 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
@@ -15,8 +14,6 @@
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class BaseDialog<T> extends Dialog<T> implements org.jabref.gui.Dialog<T> {
 
     protected BaseDialog() {

From ab9cb005d9e71e17e0a8c38a93c7d0db556a5188 Mon Sep 17 00:00:00 2001
From: Houssem Nasri <housi.housi2015@gmail.com>
Date: Thu, 30 Jun 2022 13:15:51 +0100
Subject: [PATCH 4/6] Refactor code

---
 .../org/jabref/gui/theme/ThemeManager.java    | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/jabref/gui/theme/ThemeManager.java b/src/main/java/org/jabref/gui/theme/ThemeManager.java
index b8fca76262d..6f657337523 100644
--- a/src/main/java/org/jabref/gui/theme/ThemeManager.java
+++ b/src/main/java/org/jabref/gui/theme/ThemeManager.java
@@ -120,7 +120,7 @@ private void baseCssLiveUpdate() {
             LOGGER.debug("Updating base CSS for main window scene");
         }
 
-        DefaultTaskExecutor.runInJavaFXThread(() -> updateRunner.accept(() -> getMainWindowScene().ifPresent(this::updateBaseCss)));
+        DefaultTaskExecutor.runInJavaFXThread(() -> updateRunner.accept(this::updateBaseCss));
     }
 
     private void additionalCssLiveUpdate() {
@@ -133,7 +133,7 @@ private void additionalCssLiveUpdate() {
 
         DefaultTaskExecutor.runInJavaFXThread(() ->
                 updateRunner.accept(() -> {
-                    getMainWindowScene().ifPresent(this::updateAdditionalCss);
+                    updateAdditionalCss();
 
                     webEngines.forEach(webEngine -> {
                         // force refresh by unloading style sheet, if the location hasn't changed
@@ -146,19 +146,19 @@ private void additionalCssLiveUpdate() {
         );
     }
 
-    private void updateBaseCss(Scene scene) {
-        Objects.requireNonNull(scene, "install css for main window scene before updating base css");
-        List<String> stylesheets = scene.getStylesheets();
-        if (!stylesheets.isEmpty()) {
-            stylesheets.remove(0);
-        }
+    private void updateBaseCss() {
+        getMainWindowScene().ifPresent(scene -> {
+            List<String> stylesheets = scene.getStylesheets();
+            if (!stylesheets.isEmpty()) {
+                stylesheets.remove(0);
+            }
 
-        stylesheets.add(0, baseStyleSheet.getSceneStylesheet().toExternalForm());
+            stylesheets.add(0, baseStyleSheet.getSceneStylesheet().toExternalForm());
+        });
     }
 
-    private void updateAdditionalCss(Scene scene) {
-        Objects.requireNonNull(scene, "install css for main window scene before updating additional css");
-        scene.getStylesheets().setAll(List.of(
+    private void updateAdditionalCss() {
+        getMainWindowScene().ifPresent(scene -> scene.getStylesheets().setAll(List.of(
                 baseStyleSheet.getSceneStylesheet().toExternalForm(),
                 appearancePreferences.getTheme()
                                      .getAdditionalStylesheet().map(styleSheet -> {
@@ -170,7 +170,7 @@ private void updateAdditionalCss(Scene scene) {
                                          }
                                      })
                                      .orElse("")
-        ));
+        )));
     }
 
     /**
@@ -183,8 +183,8 @@ public void installCss(Scene mainWindowScene) {
         Objects.requireNonNull(mainWindowScene, "scene is required");
         updateRunner.accept(() -> {
             this.mainWindowScene = mainWindowScene;
-            updateBaseCss(mainWindowScene);
-            updateAdditionalCss(mainWindowScene);
+            updateBaseCss();
+            updateAdditionalCss();
         });
     }
 

From 699238a2d3a2cd14d1562a53cc52945569c29975 Mon Sep 17 00:00:00 2001
From: Houssem Nasri <housi.housi2015@gmail.com>
Date: Thu, 30 Jun 2022 13:26:04 +0100
Subject: [PATCH 5/6] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bad6edb909..ca5281f9383 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where the exception that there are invalid characters in filename. [#8786](https://github.com/JabRef/jabref/issues/8786)
 - When the proxy configuration removed the proxy user/password, this change is applied immediately.
 - We fixed an issue where removing several groups deletes only one of them. [#8390](https://github.com/JabRef/jabref/issues/8390)
+- We fixed a bug where switching between themes will cause an error/exception. [#8939](https://github.com/JabRef/jabref/pull/8939)
 
 ### Removed
 

From dca4d57b740f69c6baa169b26c526d5d2379f292 Mon Sep 17 00:00:00 2001
From: Houssem Nasri <housi.housi2015@gmail.com>
Date: Thu, 30 Jun 2022 20:11:07 +0100
Subject: [PATCH 6/6] Use Optional.ofNullable for returning the main window
 scene

---
 src/main/java/org/jabref/gui/theme/ThemeManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/theme/ThemeManager.java b/src/main/java/org/jabref/gui/theme/ThemeManager.java
index 6f657337523..de6a9f197fa 100644
--- a/src/main/java/org/jabref/gui/theme/ThemeManager.java
+++ b/src/main/java/org/jabref/gui/theme/ThemeManager.java
@@ -225,6 +225,6 @@ public Theme getActiveTheme() {
     }
 
     public Optional<Scene> getMainWindowScene() {
-        return mainWindowScene == null ? Optional.empty() : Optional.of(mainWindowScene);
+        return Optional.ofNullable(mainWindowScene);
     }
 }