From 8fc483b7e539ad92c35f145d219a20459c878c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Autin?= Date: Thu, 10 Jun 2021 15:41:39 +0200 Subject: [PATCH 1/2] Deleted configuration package. Relocated configuration.Config to launcher.Config. --- src/{configuration => launcher}/Config.java | 2 +- src/launcher/Launcher.java | 2 ++ src/launcher/Settings.java | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) rename src/{configuration => launcher}/Config.java (99%) diff --git a/src/configuration/Config.java b/src/launcher/Config.java similarity index 99% rename from src/configuration/Config.java rename to src/launcher/Config.java index b400758..36c336c 100644 --- a/src/configuration/Config.java +++ b/src/launcher/Config.java @@ -1,4 +1,4 @@ -package configuration; +package launcher; import java.io.*; import org.json.simple.*; diff --git a/src/launcher/Launcher.java b/src/launcher/Launcher.java index 2f1f61c..aad7b73 100644 --- a/src/launcher/Launcher.java +++ b/src/launcher/Launcher.java @@ -45,6 +45,7 @@ public class Launcher extends Application { * Start method is used by Launcher as an implementation of the Application class to create a JavaFX thread to display the GUI window */ + @SuppressWarnings("unchecked") public void start(Stage primaryStage) throws Exception { FXMLLoader loader = new FXMLLoader(getClass().getResource("launcher.fxml")); @@ -80,6 +81,7 @@ public class Launcher extends Application { } + @SuppressWarnings("unchecked") @FXML public void runGame() { try { diff --git a/src/launcher/Settings.java b/src/launcher/Settings.java index f919f35..c243a90 100644 --- a/src/launcher/Settings.java +++ b/src/launcher/Settings.java @@ -1,12 +1,7 @@ package launcher; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.util.HashMap; -import configuration.*; - public class Settings { private Config config; From 6e4a81a15945d7459e3efa0693e9d59f7bbdc935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Autin?= Date: Thu, 10 Jun 2021 15:43:11 +0200 Subject: [PATCH 2/2] Now ignores game.set --- .gitignore | 1 + game.set | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 game.set diff --git a/.gitignore b/.gitignore index 227bffe..6463a21 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /bin/ /.idea/ /jeu-de-combat.iml +/game.set \ No newline at end of file diff --git a/game.set b/game.set deleted file mode 100644 index 61921ba..0000000 --- a/game.set +++ /dev/null @@ -1 +0,0 @@ -{"game":[{"character2":"ken","character1":"ryu","fullscreen":"true","stage":"default","width":"1920","rounds":"5","height":"1080"}]} \ No newline at end of file