From ffbfd2dee4bc6583fa68a248c037d5792fd31c6f Mon Sep 17 00:00:00 2001
From: Jona Walpert <jona.walpert@stud.unibas.ch>
Date: Wed, 22 Apr 2026 17:51:35 +0200
Subject: [PATCH] Fix: Correct fxml imports and restore branch state"

Co-authored-by: Copilot <copilot@github.com>
---
 src/main/resources/ui-structure/Casinogameui.fxml             | 4 ++--
 src/main/resources/ui-structure/Casinomainui.fxml             | 3 +--
 .../ui-structure/gameuicomponents/HighscoreView.fxml          | 4 ++--
 .../resources/ui-structure/gameuicomponents/Playerstatus.fxml | 3 +--
 src/main/resources/ui-structure/gameuicomponents/Taskbar.fxml | 3 +--
 .../ui-structure/gameuicomponents/chatui/chatbox.fxml         | 4 ++--
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/ui-structure/Casinogameui.fxml b/src/main/resources/ui-structure/Casinogameui.fxml
index 5e1df0b..a5d5514 100644
--- a/src/main/resources/ui-structure/Casinogameui.fxml
+++ b/src/main/resources/ui-structure/Casinogameui.fxml
@@ -4,12 +4,12 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.image.*?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameController?>
+
 
 <!-- Main container: Links the UI to the CasinoGameController and loads Casinogameui.css -->
 <AnchorPane xmlns="http://javafx.com/javafx/21"
             xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="CasinoGameController"
+            fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameController"
             styleClass="background"
             stylesheets="@Casinogameui.css">
 
diff --git a/src/main/resources/ui-structure/Casinomainui.fxml b/src/main/resources/ui-structure/Casinomainui.fxml
index 017710c..b5df10b 100644
--- a/src/main/resources/ui-structure/Casinomainui.fxml
+++ b/src/main/resources/ui-structure/Casinomainui.fxml
@@ -3,11 +3,10 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui.CasinomainuiController?>
 
 <AnchorPane xmlns="http://javafx.com"
             xmlns:fx="http://javafx.com"
-            fx:controller="CasinomainuiController"
+            fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui.CasinomainuiController"
             styleClass="anchor-pane-bg"
             stylesheets="@Casinomainui.css">
 
diff --git a/src/main/resources/ui-structure/gameuicomponents/HighscoreView.fxml b/src/main/resources/ui-structure/gameuicomponents/HighscoreView.fxml
index ca8eda1..a6e7ddd 100644
--- a/src/main/resources/ui-structure/gameuicomponents/HighscoreView.fxml
+++ b/src/main/resources/ui-structure/gameuicomponents/HighscoreView.fxml
@@ -6,12 +6,12 @@
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.HighscoreViewController?>
+
 
 <VBox fx:id="highscoreRoot"
     xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="HighscoreViewController"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.HighscoreViewController"
       spacing="12"
       styleClass="highscore-root"
     onMousePressed="#onPopupPressed"
diff --git a/src/main/resources/ui-structure/gameuicomponents/Playerstatus.fxml b/src/main/resources/ui-structure/gameuicomponents/Playerstatus.fxml
index ca5c5a2..6079b70 100644
--- a/src/main/resources/ui-structure/gameuicomponents/Playerstatus.fxml
+++ b/src/main/resources/ui-structure/gameuicomponents/Playerstatus.fxml
@@ -4,7 +4,6 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.geometry.Insets?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.PlayerStatusController?>
 
 <!--
 TODO: Main placeholder for player status & input.
@@ -17,7 +16,7 @@ and status displays will be dynamically populated with real-time data from the s
 <VBox fx:id="playerStatusBox"
       xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="PlayerStatusController"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.PlayerStatusController"
       styleClass="player-status-pane"
       prefWidth="200"
       spacing="5">
diff --git a/src/main/resources/ui-structure/gameuicomponents/Taskbar.fxml b/src/main/resources/ui-structure/gameuicomponents/Taskbar.fxml
index a946d8f..6fe123f 100644
--- a/src/main/resources/ui-structure/gameuicomponents/Taskbar.fxml
+++ b/src/main/resources/ui-structure/gameuicomponents/Taskbar.fxml
@@ -3,11 +3,10 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.TaskbarController?>
 <!-- movable taskbar -->
 <HBox xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="TaskbarController"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.TaskbarController"
       fx:id="taskbar"
       styleClass="taskbar"
       spacing="15"
diff --git a/src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml b/src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml
index f4adf11..9bf3193 100644
--- a/src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml
+++ b/src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml
@@ -3,7 +3,7 @@
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.ChatViewController?>
+
 
 <!--
     Dieses Fenster wird später mit den Serveranfragen verknüpft,
@@ -20,7 +20,7 @@
 
 <VBox xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="ChatViewController"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.ChatViewController"
       alignment="CENTER"
       stylesheets="@chatui.css">
 
-- 
2.52.0