From 948a7093b92cd6fe834cdbb5dff6709364db9da9 Mon Sep 17 00:00:00 2001
From: Peter <pt033@hdm-stuttgart.de>
Date: Thu, 4 Jan 2024 14:14:02 +0100
Subject: [PATCH] refactor(Controller): move helper classes to utility package

---
 .../battlearena/Controller/CommunityMapController.java        | 1 +
 .../battlearena/Controller/CreditsController.java             | 2 ++
 .../hdm_stuttgart/battlearena/Controller/IntroController.java | 1 +
 .../battlearena/Controller/LocalCreateController.java         | 1 +
 .../battlearena/Controller/MainMenuController.java            | 1 +
 .../battlearena/Controller/MapForgeController.java            | 2 ++
 .../battlearena/Controller/MenuBorderPaneController.java      | 3 +++
 .../battlearena/Controller/MultiplayerController.java         | 1 +
 .../battlearena/Controller/MultiplayerCreateController.java   | 1 +
 .../battlearena/Controller/MultiplayerJoinController.java     | 1 +
 .../hdm_stuttgart/battlearena/Controller/PlayController.java  | 1 +
 .../battlearena/Controller/PlayerCreateController.java        | 1 +
 .../battlearena/Controller/SettingsController.java            | 2 ++
 .../battlearena/Controller/SkinSelectionController.java       | 1 +
 .../battlearena/Controller/StatisticsController.java          | 1 +
 .../Controller/{ => Utilities}/ButtonTransition.java          | 2 +-
 .../Controller/{ => Utilities}/CreateMediaPlayer.java         | 2 +-
 .../Controller/{ => Utilities}/MusicPlayerSingleton.java      | 2 +-
 .../battlearena/Controller/{ => Utilities}/SceneLoader.java   | 2 +-
 .../Controller/{ => Utilities}/ToggleButtonTransition.java    | 2 +-
 src/main/resources/styles/style.css                           | 4 ++--
 21 files changed, 27 insertions(+), 7 deletions(-)
 rename src/main/java/de/hdm_stuttgart/battlearena/Controller/{ => Utilities}/ButtonTransition.java (94%)
 rename src/main/java/de/hdm_stuttgart/battlearena/Controller/{ => Utilities}/CreateMediaPlayer.java (93%)
 rename src/main/java/de/hdm_stuttgart/battlearena/Controller/{ => Utilities}/MusicPlayerSingleton.java (90%)
 rename src/main/java/de/hdm_stuttgart/battlearena/Controller/{ => Utilities}/SceneLoader.java (93%)
 rename src/main/java/de/hdm_stuttgart/battlearena/Controller/{ => Utilities}/ToggleButtonTransition.java (96%)

diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java
index bd6eefe7..3dc79401 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java
@@ -1,5 +1,6 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java
index 2e6f99aa..bd8d67fc 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java
@@ -1,5 +1,7 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.CreateMediaPlayer;
+import de.hdm_stuttgart.battlearena.Controller.Utilities.MusicPlayerSingleton;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java
index e75dbd98..2c447210 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java
@@ -1,5 +1,6 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.CreateMediaPlayer;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
index 6fde6329..69b2cb5b 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
@@ -1,5 +1,6 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.TitledPane;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java
index 21fb0595..c71e7fc4 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java
@@ -1,5 +1,6 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Button;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java
index 8bd1c893..7f57a6dd 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java
@@ -1,5 +1,7 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.MusicPlayerSingleton;
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.layout.VBox;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
index 236b82f5..47fa1988 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
@@ -1,5 +1,8 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.CreateMediaPlayer;
+import de.hdm_stuttgart.battlearena.Controller.Utilities.MusicPlayerSingleton;
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.geometry.Rectangle2D;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java
index 7c4d231b..181688fe 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java
@@ -1,5 +1,6 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.fxml.FXML;
 import javafx.scene.layout.VBox;
 
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java
index b0f80278..6db97dfe 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java
@@ -1,5 +1,6 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.fxml.FXML;
 import javafx.scene.layout.VBox;
 
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java
index f9879317..0aefd100 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java
@@ -1,5 +1,6 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.fxml.FXML;
 import javafx.scene.layout.VBox;
 
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
index 15904da7..eae49e62 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
@@ -1,5 +1,6 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.fxml.FXML;
 import javafx.scene.layout.VBox;
 
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayerCreateController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayerCreateController.java
index 60715d6f..68dfd402 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayerCreateController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayerCreateController.java
@@ -1,5 +1,6 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.CreateMediaPlayer;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
index 0004cc21..a3c75266 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
@@ -1,5 +1,7 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.MusicPlayerSingleton;
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
index 1f3eb7b8..226c5573 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
@@ -1,5 +1,6 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java
index e5a6196a..009c8a94 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java
@@ -1,5 +1,6 @@
 package de.hdm_stuttgart.battlearena.Controller;
 
+import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
 import javafx.beans.binding.Bindings;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/ButtonTransition.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ButtonTransition.java
similarity index 94%
rename from src/main/java/de/hdm_stuttgart/battlearena/Controller/ButtonTransition.java
rename to src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ButtonTransition.java
index 2af6c6d6..b129d469 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/ButtonTransition.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ButtonTransition.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.battlearena.Controller;
+package de.hdm_stuttgart.battlearena.Controller.Utilities;
 
 import javafx.animation.ScaleTransition;
 import javafx.scene.control.Button;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreateMediaPlayer.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/CreateMediaPlayer.java
similarity index 93%
rename from src/main/java/de/hdm_stuttgart/battlearena/Controller/CreateMediaPlayer.java
rename to src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/CreateMediaPlayer.java
index f924d633..4bf6c165 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreateMediaPlayer.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/CreateMediaPlayer.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.battlearena.Controller;
+package de.hdm_stuttgart.battlearena.Controller.Utilities;
 
 import javafx.scene.layout.BorderPane;
 import javafx.scene.media.Media;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MusicPlayerSingleton.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/MusicPlayerSingleton.java
similarity index 90%
rename from src/main/java/de/hdm_stuttgart/battlearena/Controller/MusicPlayerSingleton.java
rename to src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/MusicPlayerSingleton.java
index 5653a7c8..df899198 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MusicPlayerSingleton.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/MusicPlayerSingleton.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.battlearena.Controller;
+package de.hdm_stuttgart.battlearena.Controller.Utilities;
 import javafx.scene.media.MediaPlayer;
 
 public class MusicPlayerSingleton {
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SceneLoader.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/SceneLoader.java
similarity index 93%
rename from src/main/java/de/hdm_stuttgart/battlearena/Controller/SceneLoader.java
rename to src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/SceneLoader.java
index 0d5a04ef..8c0e8b4a 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SceneLoader.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/SceneLoader.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.battlearena.Controller;
+package de.hdm_stuttgart.battlearena.Controller.Utilities;
 
 import javafx.fxml.FXMLLoader;
 import javafx.scene.layout.Pane;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/ToggleButtonTransition.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ToggleButtonTransition.java
similarity index 96%
rename from src/main/java/de/hdm_stuttgart/battlearena/Controller/ToggleButtonTransition.java
rename to src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ToggleButtonTransition.java
index 6ee839dd..94d51e4b 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/ToggleButtonTransition.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ToggleButtonTransition.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.battlearena.Controller;
+package de.hdm_stuttgart.battlearena.Controller.Utilities;
 
 import javafx.animation.FadeTransition;
 import javafx.scene.control.ToggleButton;
diff --git a/src/main/resources/styles/style.css b/src/main/resources/styles/style.css
index c93623dc..1f2a2030 100644
--- a/src/main/resources/styles/style.css
+++ b/src/main/resources/styles/style.css
@@ -30,7 +30,7 @@
 .button {
     -fx-text-fill: -fx-brown;
     -fx-background-color: none;
-    -fx-skin: "de.hdm_stuttgart.battlearena.Controller.ButtonTransition";
+    -fx-skin: "de.hdm_stuttgart.battlearena.Controller.Utilities.ButtonTransition";
 }
 
 #btnLeft {
@@ -129,7 +129,7 @@
 }
 
 .toggle-button {
-    -fx-skin: "de.hdm_stuttgart.battlearena.Controller.ToggleButtonTransition";
+    -fx-skin: "de.hdm_stuttgart.battlearena.Controller.Utilities.ToggleButtonTransition";
     -fx-background-color: none;
 }
 
-- 
GitLab