From 8d80fcef1d4fb1b388c438c7a57817760ae95872 Mon Sep 17 00:00:00 2001
From: Sami Zouari <sami.zouari@univ-lorraine.fr>
Date: Thu, 27 Jan 2022 15:41:10 +0100
Subject: [PATCH] question 8 finie
---
.../java/com/example/testig/Ecouteur.java | 98 ++++---------------
.../com/example/testig/HelloApplication.java | 2 +-
2 files changed, 22 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/example/testig/Ecouteur.java b/src/main/java/com/example/testig/Ecouteur.java
index d47792e..395811b 100644
--- a/src/main/java/com/example/testig/Ecouteur.java
+++ b/src/main/java/com/example/testig/Ecouteur.java
@@ -73,87 +73,31 @@ public class Ecouteur implements EventHandler<ActionEvent> {
ImageView de5_3 = new ImageView(de_face5);
ImageView de6_3 = new ImageView(de_face6);
- switch(n){
-
- case 1:
- label1.setGraphic(de1_1);
- break;
-
- case 2:
- label1.setGraphic(de2_1);
- break;
-
- case 3:
- label1.setGraphic(de3_1);
- break;
-
- case 4:
- label1.setGraphic(de4_1);
- break;
-
- case 5:
- label1.setGraphic(de5_1);
- break;
-
- case 6:
- label1.setGraphic(de6_1);
- break;
+ switch (n) {
+ case 1 -> label1.setGraphic(de1_1);
+ case 2 -> label1.setGraphic(de2_1);
+ case 3 -> label1.setGraphic(de3_1);
+ case 4 -> label1.setGraphic(de4_1);
+ case 5 -> label1.setGraphic(de5_1);
+ case 6 -> label1.setGraphic(de6_1);
}
- switch(x){
-
- case 1:
- label2.setGraphic(de1_2);
- break;
-
- case 2:
- label2.setGraphic(de2_2);
- break;
-
- case 3:
- label2.setGraphic(de3_2);
- break;
-
- case 4:
- label2.setGraphic(de4_2);
- break;
-
- case 5:
- label2.setGraphic(de5_2);
- break;
-
- case 6:
- label2.setGraphic(de6_2);
- break;
-
+ switch (x) {
+ case 1 -> label2.setGraphic(de1_2);
+ case 2 -> label2.setGraphic(de2_2);
+ case 3 -> label2.setGraphic(de3_2);
+ case 4 -> label2.setGraphic(de4_2);
+ case 5 -> label2.setGraphic(de5_2);
+ case 6 -> label2.setGraphic(de6_2);
}
- switch(y){
-
- case 1:
- label3.setGraphic(de1_3);
- break;
-
- case 2:
- label3.setGraphic(de2_3);
- break;
-
- case 3:
- label3.setGraphic(de3_3);
- break;
-
- case 4:
- label3.setGraphic(de4_3);
- break;
-
- case 5:
- label3.setGraphic(de5_3);
- break;
-
- case 6:
- label3.setGraphic(de6_3);
- break;
-
+ switch (y) {
+ case 1 -> label3.setGraphic(de1_3);
+ case 2 -> label3.setGraphic(de2_3);
+ case 3 -> label3.setGraphic(de3_3);
+ case 4 -> label3.setGraphic(de4_3);
+ case 5 -> label3.setGraphic(de5_3);
+ case 6 -> label3.setGraphic(de6_3);
}
diff --git a/src/main/java/com/example/testig/HelloApplication.java b/src/main/java/com/example/testig/HelloApplication.java
index 6a5628b..62f9f75 100644
--- a/src/main/java/com/example/testig/HelloApplication.java
+++ b/src/main/java/com/example/testig/HelloApplication.java
@@ -55,7 +55,7 @@ public class HelloApplication extends Application {
//Question 7 et 8
- Image exit = new Image("exit_picture.png");
+ Image exit;
exit = new Image(getClass().getResourceAsStream("/exit_picture.png"), 36, 36, true, true);
ImageView iconExit = new ImageView(exit);
boutonQuitter.setGraphic(iconExit);
--
GitLab