Debug window improvements

Author: airsquared

src/main/java/airsquared/blobsaver/app/DebugWindow.java

@@ -29,10 +29,7 @@
 
 class DebugWindow {
 
-    private static final PrintStream sysOut = System.out;
-    private static final PrintStream sysErr = System.err;
     private static final Stage debugStage = new Stage();
-    private static final PrintStream myPrintStream;
 
     static {
         var vBox = new VBox();
@@ -45,41 +42,31 @@ class DebugWindow {
         vBox.getChildren().add(textArea);
         debugStage.setTitle("Debug Log");
         debugStage.setScene(new Scene(vBox));
-        debugStage.setOnCloseRequest((event) -> {
-            hide();
-            event.consume();
+        final PrintStream sysOut = System.out;
+        final PrintStream sysErr = System.err;
+        debugStage.setOnHiding(_ -> {
+            System.setOut(sysOut);
+            System.setErr(sysErr);
         });
 
-        myPrintStream = new PrintStream(new OutputStream() {
+        final var myPrintStream = new PrintStream(new OutputStream() {
             @Override
             public void write(int b) {
                 sysOut.write(b);
-                Utils.runSafe(() -> textArea.appendText(String.valueOf((char) b)));
+                Utils.runSafe(() -> textArea.appendText(Character.toString(b)));
             }
         });
-    }
-
-    static void show() {
-        debugStage.show();
-        System.setOut(myPrintStream);
-        System.setErr(myPrintStream);
-    }
-
-    static void hide() {
-        debugStage.hide();
-        System.setOut(sysOut);
-        System.setErr(sysErr);
-    }
-
-    static boolean isShowing() {
-        return debugStage.isShowing();
+        debugStage.setOnShowing(_ -> {
+            System.setOut(myPrintStream);
+            System.setErr(myPrintStream);
+        });
     }
 
     static void toggleShowing() {
-        if (isShowing()) {
-            hide();
+        if (debugStage.isShowing()) {
+            debugStage.hide();
         } else {
-            show();
+            debugStage.show();
         }
     }
 

src/main/java/airsquared/blobsaver/app/Devices.java

@@ -195,6 +195,6 @@ public Object put(Object key, Object value) {
         loader.load("devicemodels/iPhones.properties", iPhones::add);
         loader.load("devicemodels/iPads.properties", iPads::add);
         loader.load("devicemodels/iBridges.properties", iBridgeList::add);
-        loader.load("devicemodels/others.properties", o -> {});
+        loader.load("devicemodels/others.properties", _ -> {});
     }
 }