University-of-Basel-Studentprojects/Programmierprojekt
Archived
1
0
Fork 0
Code Issues 17 Pull Requests Actions Wiki Activity

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
Conversation 4 Commits 4 Files Changed 16
+4 -4
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 95fc53ec61 - Show all commits
src/main/resources/ui-structure/gameuicomponents/HighscoreView.fxml
+1 -1
View File
@@ -11,7 +11,7 @@
<VBox fx:id="highscoreRoot" <VBox fx:id="highscoreRoot"
xmlns="http://javafx.com/javafx/21" xmlns="http://javafx.com/javafx/21"
xmlns:fx="http://javafx.com/fxml/1" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.HighscoreViewController" fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.gameuicomponents.HighscoreViewController"
spacing="12" spacing="12"
styleClass="highscore-root" styleClass="highscore-root"
onMousePressed="#onPopupPressed" onMousePressed="#onPopupPressed"
src/main/resources/ui-structure/gameuicomponents/Playerstatus.fxml
+1 -1
View File
@@ -16,7 +16,7 @@ and status displays will be dynamically populated with real-time data from the s
<VBox fx:id="playerStatusBox" <VBox fx:id="playerStatusBox"
xmlns="http://javafx.com/javafx/21" xmlns="http://javafx.com/javafx/21"
xmlns:fx="http://javafx.com/fxml/1" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.PlayerStatusController" fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.gameuicomponents.PlayerStatusController"
styleClass="player-status-pane" styleClass="player-status-pane"
prefWidth="200" prefWidth="200"
spacing="5"> spacing="5">
src/main/resources/ui-structure/gameuicomponents/Taskbar.fxml
+1 -1
View File
@@ -6,7 +6,7 @@
<!-- movable taskbar --> <!-- movable taskbar -->
<HBox xmlns="http://javafx.com/javafx/21" <HBox xmlns="http://javafx.com/javafx/21"
xmlns:fx="http://javafx.com/fxml/1" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.TaskbarController" fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.gameuicomponents.TaskbarController"
fx:id="taskbar" fx:id="taskbar"
styleClass="taskbar" styleClass="taskbar"
spacing="15" spacing="15"
src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml
+1 -1
View File
@@ -20,7 +20,7 @@
<VBox xmlns="http://javafx.com/javafx/21" <VBox xmlns="http://javafx.com/javafx/21"
xmlns:fx="http://javafx.com/fxml/1" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.ChatViewController" fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatViewController"
alignment="CENTER" alignment="CENTER"
stylesheets="@chatui.css"> stylesheets="@chatui.css">