From 7884e602d76762a04519d30cbf04dc7441751157 Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Sat, 5 Dec 2020 23:18:17 +0100
Subject: [PATCH] Set scene in Dialogs

---
 .../java/ctbrec/ui/CamrecApplication.java     | 46 +++++++++++++------
 .../main/java/ctbrec/ui/controls/Dialogs.java | 26 +++++++----
 2 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/client/src/main/java/ctbrec/ui/CamrecApplication.java b/client/src/main/java/ctbrec/ui/CamrecApplication.java
index 14cc0833..9628b12c 100644
--- a/client/src/main/java/ctbrec/ui/CamrecApplication.java
+++ b/client/src/main/java/ctbrec/ui/CamrecApplication.java
@@ -1,10 +1,28 @@
 package ctbrec.ui;
 
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.google.common.eventbus.Subscribe;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 import com.squareup.moshi.Types;
+
 import ctbrec.Config;
 import ctbrec.Model;
 import ctbrec.StringUtil;
@@ -38,14 +56,24 @@ import ctbrec.sites.stripchat.Stripchat;
 import ctbrec.ui.controls.Dialogs;
 import ctbrec.ui.news.NewsTab;
 import ctbrec.ui.settings.SettingsTab;
-import ctbrec.ui.tabs.*;
+import ctbrec.ui.tabs.DonateTabFx;
+import ctbrec.ui.tabs.HelpTab;
+import ctbrec.ui.tabs.RecordedModelsTab;
+import ctbrec.ui.tabs.RecordingsTab;
+import ctbrec.ui.tabs.SiteTab;
+import ctbrec.ui.tabs.TabSelectionListener;
+import ctbrec.ui.tabs.UpdateTab;
 import ctbrec.ui.tabs.logging.LoggingTab;
 import javafx.application.Application;
 import javafx.application.HostServices;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
 import javafx.scene.Scene;
-import javafx.scene.control.*;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
 import javafx.scene.image.Image;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
@@ -54,17 +82,6 @@ import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 
 public class CamrecApplication extends Application {
 
@@ -160,6 +177,7 @@ public class CamrecApplication extends Application {
 
         Scene scene = new Scene(rootPane, windowWidth, windowHeight);
         primaryStage.setScene(scene);
+        Dialogs.setScene(scene);
         rootPane.setCenter(tabPane);
         rootPane.setBottom(statusBar);
         for (Site site : sites) {
@@ -196,7 +214,7 @@ public class CamrecApplication extends Application {
         .addListener((observable, oldVal, newVal) -> Config.getInstance().getSettings().windowHeight = newVal.intValue());
         primaryStage.setMaximized(Config.getInstance().getSettings().windowMaximized);
         primaryStage.maximizedProperty()
-                .addListener((observable, oldVal, newVal) -> Config.getInstance().getSettings().windowMaximized = newVal);
+        .addListener((observable, oldVal, newVal) -> Config.getInstance().getSettings().windowMaximized = newVal);
         Player.scene = primaryStage.getScene();
         primaryStage.setX(Config.getInstance().getSettings().windowX);
         primaryStage.setY(Config.getInstance().getSettings().windowY);
diff --git a/client/src/main/java/ctbrec/ui/controls/Dialogs.java b/client/src/main/java/ctbrec/ui/controls/Dialogs.java
index a1ac9d76..f9e3d78f 100644
--- a/client/src/main/java/ctbrec/ui/controls/Dialogs.java
+++ b/client/src/main/java/ctbrec/ui/controls/Dialogs.java
@@ -1,30 +1,38 @@
 package ctbrec.ui.controls;
 
+import static javafx.scene.control.ButtonType.*;
+
+import java.io.InputStream;
+import java.util.Optional;
+
 import ctbrec.ui.AutosizeAlert;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
 import javafx.scene.Scene;
-import javafx.scene.control.*;
+import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Dialog;
+import javafx.scene.control.TextArea;
 import javafx.scene.image.Image;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Region;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
-import java.io.InputStream;
-import java.util.Optional;
-
-import static javafx.scene.control.ButtonType.*;
-
 public class Dialogs {
 
     private Dialogs() {}
 
-    // TODO reduce calls to this method and use Dialogs.showError(Scene parent, String header, String text, Throwable t) instead
-    @Deprecated
+    private static Scene scene;
+
+    public static void setScene(Scene scene) {
+        Dialogs.scene = scene;
+    }
+
     public static void showError(String header, String text, Throwable t) {
-        showError(null, header, text, t);
+        showError(scene, header, text, t);
     }
 
     public static void showError(Scene parent, String header, String text, Throwable t) {