From 7b23bd26a19f560162ad660b3720e7b3b7030b4a Mon Sep 17 00:00:00 2001
From: Peter <pt033@hdm-stuttgart.de>
Date: Wed, 13 Dec 2023 16:20:20 +0100
Subject: [PATCH] refactor(controller): change FXML variables to private #14
---
.../Controller/CreditsController.java | 4 +-
.../Controller/IntroController.java | 4 +-
.../Controller/LocalCreateController.java | 15 +++----
.../Controller/MainMenuController.java | 5 ++-
.../Controller/MenuBorderPaneController.java | 7 ++--
.../Controller/MultiplayerController.java | 3 +-
.../MultiplayerCreateController.java | 3 +-
.../Controller/MultiplayerJoinController.java | 3 +-
.../Controller/OptionsController.java | 18 +++++----
.../Controller/PlayController.java | 3 +-
.../Controller/SkinSelectionController.java | 9 +++--
.../Controller/StatisticsController.java | 40 ++++++++++---------
src/main/resources/fxml/MenuBorderPane.fxml | 2 +-
13 files changed, 63 insertions(+), 53 deletions(-)
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 a6e47b9d..c6305002 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java
@@ -16,9 +16,9 @@ import java.util.ResourceBundle;
public class CreditsController implements Initializable {
@FXML
- public BorderPane parent;
+ private BorderPane parent;
@FXML
- public MediaView mediaView;
+ private MediaView mediaView;
private MediaPlayer mediaPlayer;
private final File file = new File("src/main/resources/videos/credits.mp4");
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 7a77864c..7b54d0d4 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java
@@ -17,9 +17,9 @@ import java.util.ResourceBundle;
public class IntroController implements Initializable {
@FXML
- public MediaView mediaView;
+ private MediaView mediaView;
@FXML
- public BorderPane introParent;
+ private BorderPane introParent;
private final String fileName = "src/main/resources/videos/";
// nextVideo() will iterate through this array so the next video will be played TODO: change the videos to non memes lmao
private final String[] videos = {"sony.mp4", "gamecube.mp4", "gameboy.mp4", "monke.mp4"};
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 a7e1f040..100c7ff1 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
@@ -1,25 +1,22 @@
package de.hdm_stuttgart.battlearena.Controller;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
import javafx.scene.control.TitledPane;
-import javafx.scene.control.Toggle;
import javafx.scene.control.ToggleButton;
import javafx.scene.control.ToggleGroup;
import javafx.scene.layout.VBox;
-import java.io.IOException;
import java.net.URL;
-import java.util.Objects;
import java.util.ResourceBundle;
public class LocalCreateController implements Initializable {
- @FXML public VBox parent;
- @FXML public TitledPane roundsTitledPane;
- @FXML public ToggleGroup rounds;
+ @FXML
+ private VBox parent;
+ @FXML
+ private TitledPane roundsTitledPane;
+ @FXML
+ private ToggleGroup rounds;
private final SceneLoader sceneLoader = new SceneLoader();
@Override
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 5a8c9dea..7d5a926f 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java
@@ -7,15 +7,16 @@ import javafx.stage.Stage;
public class MainMenuController {
@FXML
- public VBox parent;
+ private VBox parent;
@FXML
- public Button exitButton;
+ private Button exitButton;
private final SceneLoader sceneLoader = new SceneLoader();
private void switchScene(String name) {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene(name));
}
+
public void playScene() {
switchScene("Play");
}
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 6f980d52..48ecfb26 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
@@ -8,7 +8,6 @@ import javafx.scene.image.ImageView;
import javafx.scene.layout.BorderPane;
import javafx.scene.media.Media;
import javafx.scene.media.MediaPlayer;
-import javafx.scene.media.MediaView;
import javafx.stage.Screen;
import java.io.File;
@@ -18,11 +17,11 @@ import java.util.ResourceBundle;
public class MenuBorderPaneController implements Initializable {
// TODO: change FXML variables to private. Don't know why it's not working when they're private
@FXML
- public BorderPane parent;
+ private BorderPane parent;
@FXML
- public Button btnRight;
+ private Button btnRight, btnLeft;
@FXML
- public ImageView imgLeft, imgRight;
+ private ImageView imgLeft, imgRight;
private int counter = 1;
private final SceneLoader sceneLoader = new SceneLoader();
MediaPlayer musicPlayer;
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 c0398758..50587cc2 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java
@@ -4,7 +4,8 @@ import javafx.fxml.FXML;
import javafx.scene.layout.VBox;
public class MultiplayerController {
- @FXML public VBox parent;
+ @FXML
+ private VBox parent;
private final SceneLoader sceneLoader = new SceneLoader();
public void multiplayerCreateScene() {
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 3791d1b6..1e8a58b7 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java
@@ -4,7 +4,8 @@ import javafx.fxml.FXML;
import javafx.scene.layout.VBox;
public class MultiplayerCreateController {
- @FXML public VBox parent;
+ @FXML
+ private VBox parent;
private final SceneLoader sceneLoader = new SceneLoader();
public void multiplayerScene() {
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 e6acf0f9..0e155a51 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java
@@ -4,7 +4,8 @@ import javafx.fxml.FXML;
import javafx.scene.layout.VBox;
public class MultiplayerJoinController {
- @FXML public VBox parent;
+ @FXML
+ private VBox parent;
private final SceneLoader sceneLoader = new SceneLoader();
public void multiplayerScene() {
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/OptionsController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/OptionsController.java
index 6cba2a46..800f776b 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/OptionsController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/OptionsController.java
@@ -12,8 +12,10 @@ import java.util.Objects;
import java.util.ResourceBundle;
public class OptionsController implements Initializable {
- @FXML public VBox parent;
- @FXML public Slider volumeSlider;
+ @FXML
+ private VBox parent;
+ @FXML
+ private Slider volumeSlider;
SceneLoader sceneLoader = new SceneLoader();
public double volume;
MusicPlayerSingleton musicPlayer = MusicPlayerSingleton.getInstance();
@@ -35,11 +37,11 @@ public class OptionsController implements Initializable {
private void setVolume() {
// need a runtime database to save volume
- volumeSlider.valueProperty().addListener((observableValue, oldValue, newValue) -> {
- musicPlayer.getMediaPlayer().setVolume(volume);
- volume = newValue.doubleValue() / 100;
- musicPlayer.getMediaPlayer().setVolume(volume);
- System.out.println(volume);
- });
+ volumeSlider.valueProperty().addListener((observableValue, oldValue, newValue) -> {
+ musicPlayer.getMediaPlayer().setVolume(volume);
+ volume = newValue.doubleValue() / 100;
+ musicPlayer.getMediaPlayer().setVolume(volume);
+ System.out.println(volume);
+ });
}
}
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 0b094a0e..96585537 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
@@ -4,7 +4,8 @@ import javafx.fxml.FXML;
import javafx.scene.layout.VBox;
public class PlayController {
- @FXML public VBox parent;
+ @FXML
+ private VBox parent;
private final SceneLoader sceneLoader = new SceneLoader();
public void mainMenuScene() {
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 2cfa5711..65f7da43 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
@@ -16,9 +16,12 @@ import java.util.Objects;
import java.util.ResourceBundle;
public class SkinSelectionController implements Initializable {
- @FXML public VBox parent;
- @FXML public ToggleGroup selectionButton;
- @FXML public ImageView selection1, selection2, selection3;
+ @FXML
+ private VBox parent;
+ @FXML
+ private ToggleGroup selectionButton;
+ @FXML
+ private ImageView selection1, selection2, selection3;
@Override
public void initialize(URL url, ResourceBundle resourceBundle) {
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 f591bfa1..e50fbec7 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java
@@ -14,9 +14,12 @@ import java.util.ResourceBundle;
public class StatisticsController implements Initializable {
- @FXML public Text blocks, deaths, gameTime, gamesLost, gamesWon, kills;
- @FXML public VBox parent;
- @FXML public PieChart kd, wl;
+ @FXML
+ private Text blocks, deaths, gameTime, gamesLost, gamesWon, kills;
+ @FXML
+ private VBox parent;
+ @FXML
+ private PieChart kd, wl;
SceneLoader sceneLoader = new SceneLoader();
public void mainMenuScene() {
@@ -24,7 +27,7 @@ public class StatisticsController implements Initializable {
parent.getChildren().add(sceneLoader.loadScene("MainMenu"));
}
- public void initialize(URL url, ResourceBundle resourceBundle){
+ public void initialize(URL url, ResourceBundle resourceBundle) {
iniPieChartkd();
iniPieChartwl();
}
@@ -32,28 +35,29 @@ public class StatisticsController implements Initializable {
public void iniPieChartkd() {
ObservableList<PieChart.Data> pieChartData =
FXCollections.observableArrayList(
- new PieChart.Data("Kills",20),
- new PieChart.Data("Deaths",12));
-
- pieChartData.forEach(data ->
- data.nameProperty().bind(
- Bindings.concat(
- data.getName(),": ", data.pieValueProperty()
- )
- )
- );
- kd.getData().addAll(pieChartData);
+ new PieChart.Data("Kills", 20),
+ new PieChart.Data("Deaths", 12));
+
+ pieChartData.forEach(data ->
+ data.nameProperty().bind(
+ Bindings.concat(
+ data.getName(), ": ", data.pieValueProperty()
+ )
+ )
+ );
+ kd.getData().addAll(pieChartData);
}
+
public void iniPieChartwl() {
ObservableList<PieChart.Data> pieChartData =
FXCollections.observableArrayList(
- new PieChart.Data("Wins",3),
- new PieChart.Data("Losses",5));
+ new PieChart.Data("Wins", 3),
+ new PieChart.Data("Losses", 5));
pieChartData.forEach(data ->
data.nameProperty().bind(
Bindings.concat(
- data.getName(),": ", data.pieValueProperty()
+ data.getName(), ": ", data.pieValueProperty()
)
)
);
diff --git a/src/main/resources/fxml/MenuBorderPane.fxml b/src/main/resources/fxml/MenuBorderPane.fxml
index 3d57e01f..cc6e6e72 100644
--- a/src/main/resources/fxml/MenuBorderPane.fxml
+++ b/src/main/resources/fxml/MenuBorderPane.fxml
@@ -18,7 +18,7 @@
</Button>
</right>
<left>
- <Button mnemonicParsing="false" BorderPane.alignment="BOTTOM_CENTER">
+ <Button fx:id="btnLeft" mnemonicParsing="false" BorderPane.alignment="BOTTOM_CENTER">
<graphic>
<ImageView fx:id="imgLeft" fitHeight="904.0" fitWidth="856.0" pickOnBounds="true" preserveRatio="true">
<image>
--
GitLab