Added exit button for better development,

Fixed autofocus flickering

build.gradle

@@ -2,18 +2,38 @@ plugins {
     id 'java'
     id 'application'
     id 'org.openjfx.javafxplugin' version '0.1.0'
+    id "com.diffplug.spotless" version "6.25.0"
+    id 'org.beryx.jlink' version '2.25.0'
 }
 
 group = 'at.rziha'
 version = '1.0-SNAPSHOT'
 
 javafx {
     version = "22.0.1"
-    modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
+    modules = [ 'javafx.controls', 'javafx.web', 'javafx.swing' ]
 }
 
-sourceCompatibility = '21'
-targetCompatibility = '21'
+spotless {
+    java {
+        target('**/*.java')
+        removeUnusedImports();
+    }
+}
+
+jlink {
+    options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
+    launcher {
+        name = "JSaveExam"
+    }
+}
+
+jlinkZip {
+    group = 'distribution'
+}
+
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 task preBuild {
     println("Running Prebuild")
@@ -26,6 +46,8 @@ task addLicense(type: Exec) {
 
 build.dependsOn preBuild
 preBuild.dependsOn addLicense
+preBuild.dependsOn spotlessApply
+preBuild.dependsOn spotlessCheck
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'

src/main/java/at/rziha/jsaveexam/JSaveExam.java

@@ -14,6 +14,7 @@
  */
 package at.rziha.jsaveexam;
 
+import at.rziha.jsaveexam.border.RoundedBorder;
 import at.rziha.jsaveexam.webpage.BlackedOutWindow;
 import at.rziha.jsaveexam.webpage.WebPageLoader;
 
@@ -62,6 +63,7 @@ public JSaveExam(String url) {
         SwingUtilities.invokeLater(() -> {
             WebPageLoader webPageLoader = new WebPageLoader(finalUrl);
             webPageLoader.setVisible(true);
+            addCloseButton(webPageLoader);
             defaultGraphicsDefault.setFullScreenWindow(webPageLoader);
         });
 
@@ -74,9 +76,25 @@ public JSaveExam(String url) {
                     blackedOutWindow.setLocationByPlatform(true);
                     blackedOutWindow.setLocation(bounds.x, bounds.y);
                     d.setFullScreenWindow(blackedOutWindow);
+
+                    addCloseButton(blackedOutWindow);
+
                     blackedOutWindow.setVisible(true);
                 });
             });
         }
     }
+
+    private static void addCloseButton(JFrame frame) {
+        JButton closeButton = new JButton("Close");
+        closeButton.addActionListener(e -> System.exit(0));
+        closeButton.setMargin(new Insets(5, 5, 5, 5));
+        closeButton.setBackground(new Color(220, 220, 220));
+        closeButton.setBorder(new RoundedBorder(5));
+
+        JPanel topBar = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
+        topBar.setBackground(new Color(220, 220, 220));
+        topBar.add(closeButton);
+        frame.add(topBar, BorderLayout.NORTH);
+    }
 }

src/main/java/at/rziha/jsaveexam/border/RoundedBorder.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024, Alexander Rziha
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package at.rziha.jsaveexam.border;
+
+import javax.swing.border.AbstractBorder;
+import java.awt.*;
+
+public class RoundedBorder extends AbstractBorder {
+    private int radius;
+
+    public RoundedBorder(int radius) {
+        this.radius = radius;
+    }
+
+    @Override
+    public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+        g.setColor(c.getBackground());
+        g.drawRoundRect(x, y, width - 1, height - 1, radius, radius);
+    }
+}

src/main/java/at/rziha/jsaveexam/webpage/BlackedOutWindow.java

@@ -1,11 +1,21 @@
+/*
+ * Copyright (c) 2024, Alexander Rziha
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package at.rziha.jsaveexam.webpage;
 
-import com.sun.webkit.WebPage;
-
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowFocusListener;
 
 public class BlackedOutWindow extends JFrame {
     public BlackedOutWindow() {
@@ -14,18 +24,8 @@ public BlackedOutWindow() {
         setUndecorated(true);
         setExtendedState(JFrame.MAXIMIZED_BOTH);
 
-        getContentPane().setBackground(Color.BLACK);
-
-        addWindowFocusListener((new WindowFocusListener() {
-            @Override
-            public void windowGainedFocus(WindowEvent e) {
+        setAutoRequestFocus(true);
 
-            }
-
-            @Override
-            public void windowLostFocus(WindowEvent e) {
-                requestFocus();
-            }
-        }));
+        getContentPane().setBackground(Color.BLACK);
     }
 }

src/main/java/at/rziha/jsaveexam/webpage/WebPageLoader.java

@@ -20,8 +20,6 @@
 import javafx.scene.web.WebView;
 
 import javax.swing.*;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowFocusListener;
 
 public class WebPageLoader extends JFrame {
 
@@ -31,6 +29,8 @@ public WebPageLoader(String url) {
         setUndecorated(true);
         setExtendedState(JFrame.MAXIMIZED_BOTH);
 
+        setAutoRequestFocus(true);
+
         JFXPanel fxPanel = new JFXPanel();
 
         Platform.runLater(() -> {
@@ -43,18 +43,6 @@ public WebPageLoader(String url) {
 
         add(fxPanel);
 
-        addWindowFocusListener((new WindowFocusListener() {
-            @Override
-            public void windowGainedFocus(WindowEvent e) {
-
-            }
-
-            @Override
-            public void windowLostFocus(WindowEvent e) {
-                requestFocus();
-            }
-        }));
-
         Platform.runLater(() -> {
             pack();
         });