From 1bfff5374bde067c8a5e18210ee6c8c2041d9459 Mon Sep 17 00:00:00 2001
From: Peter <pt033@hdm-stuttgart.de>
Date: Sun, 24 Dec 2023 23:51:02 +0100
Subject: [PATCH] refactor(controller): change some method names
---
.../battlearena/Controller/CommunityMapController.java | 2 +-
.../battlearena/Controller/LocalCreateController.java | 2 +-
.../battlearena/Controller/MapForgeController.java | 2 +-
.../battlearena/Controller/MultiplayerController.java | 2 +-
.../battlearena/Controller/MultiplayerCreateController.java | 2 +-
.../battlearena/Controller/MultiplayerJoinController.java | 2 +-
.../hdm_stuttgart/battlearena/Controller/PlayController.java | 2 +-
.../battlearena/Controller/SettingsController.java | 2 +-
.../battlearena/Controller/SkinSelectionController.java | 2 +-
src/main/resources/fxml/CommunityMaps.fxml | 3 +--
src/main/resources/fxml/LocalCreate.fxml | 2 +-
src/main/resources/fxml/MapForge.fxml | 2 +-
src/main/resources/fxml/Multiplayer.fxml | 2 +-
src/main/resources/fxml/MultiplayerCreate.fxml | 3 +--
src/main/resources/fxml/MultiplayerJoin.fxml | 3 +--
src/main/resources/fxml/Play.fxml | 3 +--
src/main/resources/fxml/Settings.fxml | 2 +-
src/main/resources/fxml/SkinSelection.fxml | 2 +-
18 files changed, 18 insertions(+), 22 deletions(-)
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 5c55a372..bd6eefe7 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java
@@ -48,7 +48,7 @@ public class CommunityMapController implements Initializable {
// TODO: create map preview
@FXML
- private void back() {
+ private void backButton() { // for some reason compiler doesn't recognize method usage when 'back' is used as method name. Any other method name works however
parent.getChildren().clear();
parent.getChildren().add(new SceneLoader().loadScene("MapForge"));
}
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 ded22cff..6fde6329 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
@@ -29,7 +29,7 @@ public class LocalCreateController implements Initializable {
});
}
@FXML
- private void playScene() {
+ private void backButton() {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene("Play"));
}
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 db5ef303..8bd1c893 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java
@@ -38,7 +38,7 @@ public class MapForgeController {
}
@FXML
- private void back() {
+ private void backButton() {
switchScene("MainMenu");
}
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 529c90c4..7c4d231b 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java
@@ -19,7 +19,7 @@ public class MultiplayerController {
}
@FXML
- private void playScene() {
+ private void backButton() {
switchScene("Play");
}
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 36432bb3..b0f80278 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java
@@ -9,7 +9,7 @@ public class MultiplayerCreateController {
private final SceneLoader sceneLoader = new SceneLoader();
@FXML
- private void multiplayerScene() {
+ private void backButton() {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene("Multiplayer"));
}
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 d5492991..f9879317 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java
@@ -9,7 +9,7 @@ public class MultiplayerJoinController {
private final SceneLoader sceneLoader = new SceneLoader();
@FXML
- private void multiplayerScene() {
+ private void backButton() {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene("Multiplayer"));
}
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 24356b5c..15904da7 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
@@ -9,7 +9,7 @@ public class PlayController {
private final SceneLoader sceneLoader = new SceneLoader();
@FXML
- private void mainMenuScene() {
+ private void backButton() {
switchScene("MainMenu");
}
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 d394ddc1..0004cc21 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
@@ -32,7 +32,7 @@ public class SettingsController implements Initializable {
}
@FXML
- private void mainMenuScene() {
+ private void backButton() {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene("MainMenu"));
}
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 e753abdd..77023968 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
@@ -45,7 +45,7 @@ public class SkinSelectionController implements Initializable {
}
@FXML
- private void back() {
+ private void backButton() {
parent.getChildren().clear();
parent.getChildren().add(new SceneLoader().loadScene("LocalCreate"));
}
diff --git a/src/main/resources/fxml/CommunityMaps.fxml b/src/main/resources/fxml/CommunityMaps.fxml
index d1fcad13..4c421873 100644
--- a/src/main/resources/fxml/CommunityMaps.fxml
+++ b/src/main/resources/fxml/CommunityMaps.fxml
@@ -6,7 +6,6 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
-
<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" stylesheets="@../styles/style.css" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.CommunityMapController">
<children>
<TableView fx:id="tableView" editable="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" VBox.vgrow="ALWAYS">
@@ -23,7 +22,7 @@
</TableView>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0" VBox.vgrow="ALWAYS">
<children>
- <Button mnemonicParsing="false" onAction="#back" text="Back" />
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back" />
<Button mnemonicParsing="false" text="Load" />
</children>
</HBox>
diff --git a/src/main/resources/fxml/LocalCreate.fxml b/src/main/resources/fxml/LocalCreate.fxml
index 775687f3..f100d9b6 100644
--- a/src/main/resources/fxml/LocalCreate.fxml
+++ b/src/main/resources/fxml/LocalCreate.fxml
@@ -111,7 +111,7 @@
</children>
</HBox>
<Button mnemonicParsing="false" onAction="#skinSelectionScene" text="Start" />
- <Button mnemonicParsing="false" onAction="#playScene" text="Back">
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back">
<VBox.margin>
<Insets bottom="50.0" />
</VBox.margin>
diff --git a/src/main/resources/fxml/MapForge.fxml b/src/main/resources/fxml/MapForge.fxml
index 7c807443..3c5265a0 100644
--- a/src/main/resources/fxml/MapForge.fxml
+++ b/src/main/resources/fxml/MapForge.fxml
@@ -10,7 +10,7 @@
<Button mnemonicParsing="false" onAction="#mapEditorScene" text="Map Editor" />
<Button mnemonicParsing="false" onAction="#communityMapScene" text="Community Maps" />
<Button mnemonicParsing="false" onAction="#updateMapScene" text="Update Core Maps" />
- <Button mnemonicParsing="false" onAction="#back" text="Back" />
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back" />
<Pane VBox.vgrow="ALWAYS" />
<Pane VBox.vgrow="ALWAYS" />
</children>
diff --git a/src/main/resources/fxml/Multiplayer.fxml b/src/main/resources/fxml/Multiplayer.fxml
index 58084aaf..6746b480 100644
--- a/src/main/resources/fxml/Multiplayer.fxml
+++ b/src/main/resources/fxml/Multiplayer.fxml
@@ -18,7 +18,7 @@
<Insets />
</VBox.margin>
</Button>
- <Button alignment="CENTER" mnemonicParsing="false" onAction="#playScene" text="Back">
+ <Button alignment="CENTER" mnemonicParsing="false" onAction="#backButton" text="Back">
<VBox.margin>
<Insets />
</VBox.margin>
diff --git a/src/main/resources/fxml/MultiplayerCreate.fxml b/src/main/resources/fxml/MultiplayerCreate.fxml
index b0909c00..3cf21a91 100644
--- a/src/main/resources/fxml/MultiplayerCreate.fxml
+++ b/src/main/resources/fxml/MultiplayerCreate.fxml
@@ -10,7 +10,6 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?>
-
<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MultiplayerCreateController">
<children>
<Pane VBox.vgrow="ALWAYS" />
@@ -49,7 +48,7 @@
</VBox.margin>
</AnchorPane>
<Button mnemonicParsing="false" text="Start" />
- <Button mnemonicParsing="false" onAction="#multiplayerScene" text="Back" />
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back" />
<Pane VBox.vgrow="ALWAYS" />
<Pane VBox.vgrow="ALWAYS" />
</children>
diff --git a/src/main/resources/fxml/MultiplayerJoin.fxml b/src/main/resources/fxml/MultiplayerJoin.fxml
index e8a48e62..117cf38c 100644
--- a/src/main/resources/fxml/MultiplayerJoin.fxml
+++ b/src/main/resources/fxml/MultiplayerJoin.fxml
@@ -6,7 +6,6 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?>
-
<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="50.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MultiplayerJoinController">
<children>
<Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" />
@@ -15,7 +14,7 @@
<Button mnemonicParsing="false" text="Connect" VBox.vgrow="ALWAYS" />
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="[Error Message]" />
<Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" />
- <Button alignment="CENTER" mnemonicParsing="false" onAction="#multiplayerScene" text="Back" />
+ <Button alignment="CENTER" mnemonicParsing="false" onAction="#backButton" text="Back" />
<Pane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="20.0" VBox.vgrow="ALWAYS" />
</children>
</VBox>
diff --git a/src/main/resources/fxml/Play.fxml b/src/main/resources/fxml/Play.fxml
index 1cdd69e3..a4cbce23 100644
--- a/src/main/resources/fxml/Play.fxml
+++ b/src/main/resources/fxml/Play.fxml
@@ -4,13 +4,12 @@
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
-
<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.PlayController">
<children>
<Pane VBox.vgrow="ALWAYS" />
<Button mnemonicParsing="false" onAction="#localScene" text="Local" />
<Button mnemonicParsing="false" onAction="#multiplayerScene" text="Multiplayer" />
- <Button alignment="CENTER" mnemonicParsing="false" onAction="#mainMenuScene" text="Back" />
+ <Button alignment="CENTER" mnemonicParsing="false" onAction="#backButton" text="Back" />
<Pane VBox.vgrow="ALWAYS" />
<Pane VBox.vgrow="ALWAYS" />
</children>
diff --git a/src/main/resources/fxml/Settings.fxml b/src/main/resources/fxml/Settings.fxml
index 83c4b187..6cab6585 100644
--- a/src/main/resources/fxml/Settings.fxml
+++ b/src/main/resources/fxml/Settings.fxml
@@ -29,6 +29,6 @@
</children>
</HBox>
<Button mnemonicParsing="false" onAction="#creditScene" text="Credits" />
- <Button mnemonicParsing="false" onAction="#mainMenuScene" text="Back" />
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back" />
</children>
</VBox>
diff --git a/src/main/resources/fxml/SkinSelection.fxml b/src/main/resources/fxml/SkinSelection.fxml
index 9e6db7b5..b98b91af 100644
--- a/src/main/resources/fxml/SkinSelection.fxml
+++ b/src/main/resources/fxml/SkinSelection.fxml
@@ -45,6 +45,6 @@
</children>
</HBox>
<Button mnemonicParsing="false" onAction="#gameScene" text="Start" />
- <Button mnemonicParsing="false" onAction="#back" text="Back" />
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back" />
</children>
</VBox>
--
GitLab