From e24b7f41a89bde62944751316ba4eefcc7bd2dce Mon Sep 17 00:00:00 2001
From: Yanis OUALAN <oualanyanis01@gmail.com>
Date: Fri, 29 Nov 2024 11:21:01 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20possibilit=C3=A9=20de=20chang?=
=?UTF-8?q?er=20de=20mode=20via=20un=20argument?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/app/SimulatorApplication.java | 14 +++++++++-----
src/main/java/app/SimulatorMain.java | 3 ---
src/main/java/controller/Controller.java | 5 ++++-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/app/SimulatorApplication.java b/src/main/java/app/SimulatorApplication.java
index 2411a42..9f65df1 100644
--- a/src/main/java/app/SimulatorApplication.java
+++ b/src/main/java/app/SimulatorApplication.java
@@ -31,7 +31,7 @@ public class SimulatorApplication extends javafx.application.Application {
public static final int PATIENT_COUNT = 70;
public static final int VIRUS_COUNT = 6;
-
+ public static String[] arguments;
private Stage primaryStage;
private Parent view;
@@ -56,18 +56,21 @@ public class SimulatorApplication extends javafx.application.Application {
loader.setLocation(location);
view = loader.load();
Controller controller = loader.getController();
- if(SimulatorMain.arguments == null){
- SimulatorMain.arguments = new String[1];
- SimulatorMain.arguments[0] = "firefighter";
+ if(SimulatorApplication.arguments == null){
+ SimulatorApplication.arguments = new String[1];
+ SimulatorApplication.arguments[0] = "firefighter";
System.out.println("No argument were provided, starting firefighter");
}
- switch(SimulatorMain.arguments[0]){
+ switch(SimulatorApplication.arguments[0]){
case "pfc":
controller.initializePfc();
+ break;
case "firefighter":
controller.initializeFireFighter();
+ break;
case "doctor":
controller.initializeDoctor();
+ break;
}
}
@@ -79,6 +82,7 @@ public class SimulatorApplication extends javafx.application.Application {
}
public static void main(String[] args) {
+ arguments = args;
launch(args);
}
}
diff --git a/src/main/java/app/SimulatorMain.java b/src/main/java/app/SimulatorMain.java
index 15019a6..f2e49f2 100644
--- a/src/main/java/app/SimulatorMain.java
+++ b/src/main/java/app/SimulatorMain.java
@@ -1,10 +1,7 @@
package app;
public class SimulatorMain {
- public static String[] arguments;
public static void main(String[] args){
SimulatorApplication.main(args);
- arguments = args;
-
}
}
diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index c65b038..be8e27a 100644
--- a/src/main/java/controller/Controller.java
+++ b/src/main/java/controller/Controller.java
@@ -132,6 +132,7 @@ public class Controller {
}
public void initializeDoctor() {
+ System.out.println("Initializing doctor virus patient");
int columnCount = SimulatorApplication.COLUMN_COUNT;
int rowCount = SimulatorApplication.ROW_COUNT;
int squareWidth = SimulatorApplication.BOX_WIDTH;
@@ -150,6 +151,7 @@ public class Controller {
repaintGrid();
}
public void initializePfc() {
+ System.out.println("Initializing rock paper cisor");
int columnCount = SimulatorApplication.COLUMN_COUNT;
int rowCount = SimulatorApplication.ROW_COUNT;
int squareWidth = SimulatorApplication.BOX_WIDTH;
@@ -163,11 +165,12 @@ public class Controller {
entityCounts.put((pos, b) -> new model.rockpapercisor.Paper(pos), SimulatorApplication.PAPER_COUNT);
entityCounts.put((pos, b) -> new model.rockpapercisor.Cisor(pos), SimulatorApplication.CISOR_COUNT);
- Model model = new model.doctorviruspatient.DoctorVirusPatientScenario(SimulatorApplication.COLUMN_COUNT, SimulatorApplication.ROW_COUNT, entityCounts);
+ Model model = new model.rockpapercisor.RockPaperCisorScenario(SimulatorApplication.COLUMN_COUNT, SimulatorApplication.ROW_COUNT, entityCounts);
this.setModel(model);
repaintGrid();
}
public void initializeFireFighter() {
+ System.out.println("Initializing firefighters");
int columnCount = SimulatorApplication.COLUMN_COUNT;
int rowCount = SimulatorApplication.ROW_COUNT;
int squareWidth = SimulatorApplication.BOX_WIDTH;
--
GitLab