Fix: Correct fxml imports and restore branch state #300

Merged
jona.walpert merged 4 commits from chore/122-fix-long-file-imports into main 2026-04-22 18:33:48 +02:00
6 changed files with 9 additions and 12 deletions
Showing only changes of commit ffbfd2dee4 - Show all commits
@@ -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">
@@ -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">
@@ -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"
@@ -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">
@@ -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"
@@ -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">