summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpolo <ordipolo@gmx.fr>2026-07-12 18:08:54 +0200
committerpolo <ordipolo@gmx.fr>2026-07-12 18:08:54 +0200
commitdd82df9348efbfe0a27eeabacbf96b0d3275add2 (patch)
tree3f81ee69f0e79b38d89d2c392aebe7003d7917b0
parente10af06f9ea3b0fbbe94ddf7c4404f9bc7309f67 (diff)
downloadppe_javafx-dd82df9348efbfe0a27eeabacbf96b0d3275add2.tar.gz
ppe_javafx-dd82df9348efbfe0a27eeabacbf96b0d3275add2.tar.bz2
ppe_javafx-dd82df9348efbfe0a27eeabacbf96b0d3275add2.zip
petit nettoyage, encodage utf-8
-rw-r--r--.settings/org.eclipse.core.resources.prefs2
-rw-r--r--src/main/java/controlleur/BDD.java5
-rw-r--r--src/main/java/controlleur/ControllerAdmin.java16
-rw-r--r--src/main/java/controlleur/ControllerTopMenu.java1
-rw-r--r--src/main/java/controlleur/EvenementController.java7
-rw-r--r--src/main/java/vue/AfficheAccueil.java8
-rw-r--r--src/main/java/vue/AfficheAdmin.java12
-rw-r--r--src/main/java/vue/AfficheEvenement.java1
-rw-r--r--src/main/java/vue/AfficheGestionCompte.java3
-rw-r--r--src/main/java/vue/AfficheTopMenu.java1
-rw-r--r--src/main/java/vue/GestionListe/AfficheModificationListe.java3
-rw-r--r--src/main/java/vue/simulation/SimHistogramme.java3
12 files changed, 5 insertions, 57 deletions
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
1eclipse.preferences.version=1
2encoding/<project>=UTF-8
diff --git a/src/main/java/controlleur/BDD.java b/src/main/java/controlleur/BDD.java
index de2f159..d2cbaeb 100644
--- a/src/main/java/controlleur/BDD.java
+++ b/src/main/java/controlleur/BDD.java
@@ -1,7 +1,6 @@
1package controlleur; 1package controlleur;
2 2
3import java.sql.Connection; 3import java.sql.Connection;
4import java.sql.Date;
5import java.sql.DriverManager; 4import java.sql.DriverManager;
6import java.sql.PreparedStatement; 5import java.sql.PreparedStatement;
7import java.sql.ResultSet; 6import java.sql.ResultSet;
@@ -9,12 +8,8 @@ import java.sql.ResultSetMetaData;
9import java.sql.SQLException; 8import java.sql.SQLException;
10import java.sql.Statement; 9import java.sql.Statement;
11import java.util.ArrayList; 10import java.util.ArrayList;
12import java.util.List;
13
14import javafx.scene.layout.VBox;
15import modele.Arme; 11import modele.Arme;
16import modele.ArmeeListe; 12import modele.ArmeeListe;
17import modele.Evenement;
18import modele.Unit; 13import modele.Unit;
19import modele.User; 14import modele.User;
20 15
diff --git a/src/main/java/controlleur/ControllerAdmin.java b/src/main/java/controlleur/ControllerAdmin.java
index a12f01c..15b412c 100644
--- a/src/main/java/controlleur/ControllerAdmin.java
+++ b/src/main/java/controlleur/ControllerAdmin.java
@@ -3,30 +3,14 @@ package controlleur;
3import java.io.File; 3import java.io.File;
4import java.io.IOException; 4import java.io.IOException;
5import java.nio.file.Files; 5import java.nio.file.Files;
6import java.sql.PreparedStatement;
7import java.sql.ResultSet;
8import java.sql.SQLException;
9import java.time.LocalDate;
10import java.util.ArrayList;
11import java.util.Date;
12import java.util.List;
13
14import javafx.geometry.Pos; 6import javafx.geometry.Pos;
15import javafx.scene.control.Alert; 7import javafx.scene.control.Alert;
16import javafx.scene.control.Button;
17import javafx.scene.control.Label;
18import javafx.scene.image.Image; 8import javafx.scene.image.Image;
19import javafx.scene.image.ImageView; 9import javafx.scene.image.ImageView;
20import javafx.scene.layout.HBox;
21import javafx.scene.layout.VBox; 10import javafx.scene.layout.VBox;
22import javafx.scene.text.Text;
23import javafx.stage.FileChooser; 11import javafx.stage.FileChooser;
24import javafx.stage.Stage; 12import javafx.stage.Stage;
25import vue.AfficheAccueil;
26import vue.AfficheAdmin;
27import vue.AfficheConnexionFailed;
28import modele.Evenement; 13import modele.Evenement;
29import modele.User;
30 14
31public class ControllerAdmin { 15public class ControllerAdmin {
32 private static String destinationDir; 16 private static String destinationDir;
diff --git a/src/main/java/controlleur/ControllerTopMenu.java b/src/main/java/controlleur/ControllerTopMenu.java
index baef8df..ee84db1 100644
--- a/src/main/java/controlleur/ControllerTopMenu.java
+++ b/src/main/java/controlleur/ControllerTopMenu.java
@@ -2,7 +2,6 @@ package controlleur;
2 2
3import application.Battle; 3import application.Battle;
4import javafx.stage.Stage; 4import javafx.stage.Stage;
5import modele.Evenement;
6import modele.User; 5import modele.User;
7import vue.AfficheAccueil; 6import vue.AfficheAccueil;
8import vue.AfficheAdmin; 7import vue.AfficheAdmin;
diff --git a/src/main/java/controlleur/EvenementController.java b/src/main/java/controlleur/EvenementController.java
index ad21353..e6581a0 100644
--- a/src/main/java/controlleur/EvenementController.java
+++ b/src/main/java/controlleur/EvenementController.java
@@ -7,10 +7,7 @@ import java.sql.PreparedStatement;
7import java.sql.ResultSet; 7import java.sql.ResultSet;
8import java.sql.SQLException; 8import java.sql.SQLException;
9import java.util.ArrayList; 9import java.util.ArrayList;
10import java.io.IOException;
11import java.nio.file.Files;
12import java.nio.file.Path; 10import java.nio.file.Path;
13import java.nio.file.Paths;
14import javafx.geometry.Pos; 11import javafx.geometry.Pos;
15import javafx.scene.control.Button; 12import javafx.scene.control.Button;
16import javafx.scene.control.Label; 13import javafx.scene.control.Label;
@@ -75,7 +72,7 @@ public class EvenementController {
75 72
76 // Traiter les résultats 73 // Traiter les résultats
77 while (rs.next()) { 74 while (rs.next()) {
78 int i=0; 75 //int i=0;
79 nbrEvt = getNbrEvt() + 1; 76 nbrEvt = getNbrEvt() + 1;
80 77
81 String nom_evt = rs.getString("nom_evenement"); 78 String nom_evt = rs.getString("nom_evenement");
@@ -93,7 +90,7 @@ public class EvenementController {
93 System.out.println("Événement : " + nom_evt); 90 System.out.println("Événement : " + nom_evt);
94 System.out.println("Description : " + desc_evt); 91 System.out.println("Description : " + desc_evt);
95 System.out.println("Date : " + date_evt); 92 System.out.println("Date : " + date_evt);
96 i++; 93 //i++;
97 } 94 }
98 } catch (SQLException e) { 95 } catch (SQLException e) {
99 System.err.println("Erreur lors de l'accès à la base de données : " + e.getMessage()); 96 System.err.println("Erreur lors de l'accès à la base de données : " + e.getMessage());
diff --git a/src/main/java/vue/AfficheAccueil.java b/src/main/java/vue/AfficheAccueil.java
index 957a249..ef48a99 100644
--- a/src/main/java/vue/AfficheAccueil.java
+++ b/src/main/java/vue/AfficheAccueil.java
@@ -1,21 +1,13 @@
1package vue; 1package vue;
2 2
3import java.util.ArrayList;
4
5import controlleur.Connexion;
6import controlleur.EvenementController;
7import javafx.geometry.Pos; 3import javafx.geometry.Pos;
8import javafx.scene.Scene; 4import javafx.scene.Scene;
9import javafx.scene.control.Button; 5import javafx.scene.control.Button;
10import javafx.scene.control.Label; 6import javafx.scene.control.Label;
11import javafx.scene.image.Image;
12import javafx.scene.image.ImageView;
13import javafx.scene.layout.HBox; 7import javafx.scene.layout.HBox;
14import javafx.scene.layout.Priority;
15import javafx.scene.layout.VBox; 8import javafx.scene.layout.VBox;
16import javafx.scene.text.Font; 9import javafx.scene.text.Font;
17import javafx.stage.Stage; 10import javafx.stage.Stage;
18import modele.Evenement;
19import modele.User; 11import modele.User;
20 12
21public class AfficheAccueil { 13public class AfficheAccueil {
diff --git a/src/main/java/vue/AfficheAdmin.java b/src/main/java/vue/AfficheAdmin.java
index 565a18a..e82c91e 100644
--- a/src/main/java/vue/AfficheAdmin.java
+++ b/src/main/java/vue/AfficheAdmin.java
@@ -5,29 +5,17 @@ import javafx.scene.Scene;
5import javafx.scene.control.Alert; 5import javafx.scene.control.Alert;
6import javafx.scene.control.Button; 6import javafx.scene.control.Button;
7import javafx.scene.control.DatePicker; 7import javafx.scene.control.DatePicker;
8import javafx.scene.image.Image;
9import javafx.scene.image.ImageView; 8import javafx.scene.image.ImageView;
10import javafx.scene.layout.HBox; 9import javafx.scene.layout.HBox;
11import javafx.scene.layout.VBox; 10import javafx.scene.layout.VBox;
12import javafx.scene.paint.Color; 11import javafx.scene.paint.Color;
13import javafx.scene.text.Font; 12import javafx.scene.text.Font;
14import javafx.scene.text.Text; 13import javafx.scene.text.Text;
15import javafx.stage.FileChooser;
16import javafx.stage.Stage; 14import javafx.stage.Stage;
17import modele.Evenement;
18import modele.User; 15import modele.User;
19import javafx.scene.control.TextField; 16import javafx.scene.control.TextField;
20//import java.awt.TextArea;
21import java.io.File;
22import java.io.IOException;
23import java.nio.file.Files;
24import java.nio.file.Paths;
25import java.time.LocalDate; 17import java.time.LocalDate;
26import java.time.ZoneId;
27import java.time.format.DateTimeFormatter; 18import java.time.format.DateTimeFormatter;
28import java.util.Date;
29
30import controlleur.BDD;
31import controlleur.ControllerAdmin; 19import controlleur.ControllerAdmin;
32import controlleur.EvenementController; 20import controlleur.EvenementController;
33 21
diff --git a/src/main/java/vue/AfficheEvenement.java b/src/main/java/vue/AfficheEvenement.java
index c751683..df2e434 100644
--- a/src/main/java/vue/AfficheEvenement.java
+++ b/src/main/java/vue/AfficheEvenement.java
@@ -2,7 +2,6 @@ package vue;
2 2
3import application.Main; 3import application.Main;
4import controlleur.Connexion; 4import controlleur.Connexion;
5import controlleur.EvenementController;
6import javafx.scene.control.Button; 5import javafx.scene.control.Button;
7import javafx.scene.control.Label; 6import javafx.scene.control.Label;
8import javafx.scene.image.Image; 7import javafx.scene.image.Image;
diff --git a/src/main/java/vue/AfficheGestionCompte.java b/src/main/java/vue/AfficheGestionCompte.java
index 829ec99..fa42cf1 100644
--- a/src/main/java/vue/AfficheGestionCompte.java
+++ b/src/main/java/vue/AfficheGestionCompte.java
@@ -15,7 +15,6 @@ import javafx.scene.control.Alert.AlertType;
15import javafx.scene.layout.VBox; 15import javafx.scene.layout.VBox;
16import javafx.scene.text.Font; 16import javafx.scene.text.Font;
17import javafx.stage.Stage; 17import javafx.stage.Stage;
18import modele.Evenement;
19import modele.User; 18import modele.User;
20 19
21public class AfficheGestionCompte { 20public class AfficheGestionCompte {
@@ -49,7 +48,7 @@ public static void affiche(Stage primaryStage,User session) {
49 48
50 VBox vbox2 = new VBox(); 49 VBox vbox2 = new VBox();
51 50
52 VBox vboxL = new VBox(); 51 //VBox vboxL = new VBox();
53 52
54 vbox2.getChildren().add(etiquette2); 53 vbox2.getChildren().add(etiquette2);
55 vbox2.getChildren().add(texte2); 54 vbox2.getChildren().add(texte2);
diff --git a/src/main/java/vue/AfficheTopMenu.java b/src/main/java/vue/AfficheTopMenu.java
index 6abcdf5..1d29b3c 100644
--- a/src/main/java/vue/AfficheTopMenu.java
+++ b/src/main/java/vue/AfficheTopMenu.java
@@ -10,7 +10,6 @@ import javafx.scene.layout.Pane;
10import javafx.scene.layout.Priority; 10import javafx.scene.layout.Priority;
11import javafx.scene.paint.Color; 11import javafx.scene.paint.Color;
12import javafx.stage.Stage; 12import javafx.stage.Stage;
13import modele.Evenement;
14import modele.User; 13import modele.User;
15 14
16public class AfficheTopMenu extends HBox 15public class AfficheTopMenu extends HBox
diff --git a/src/main/java/vue/GestionListe/AfficheModificationListe.java b/src/main/java/vue/GestionListe/AfficheModificationListe.java
index e8e6a8f..76bcf88 100644
--- a/src/main/java/vue/GestionListe/AfficheModificationListe.java
+++ b/src/main/java/vue/GestionListe/AfficheModificationListe.java
@@ -4,13 +4,10 @@ import javafx.scene.layout.VBox;
4import javafx.scene.paint.Color; 4import javafx.scene.paint.Color;
5import javafx.stage.Stage; 5import javafx.stage.Stage;
6import modele.ArmeeListe; 6import modele.ArmeeListe;
7import modele.Evenement;
8import modele.Figurine; 7import modele.Figurine;
9import modele.User; 8import modele.User;
10import vue.AfficheTopMenu; 9import vue.AfficheTopMenu;
11
12import java.util.ArrayList; 10import java.util.ArrayList;
13
14import controlleur.ModificationListe; 11import controlleur.ModificationListe;
15import javafx.geometry.Insets; 12import javafx.geometry.Insets;
16import javafx.scene.Scene; 13import javafx.scene.Scene;
diff --git a/src/main/java/vue/simulation/SimHistogramme.java b/src/main/java/vue/simulation/SimHistogramme.java
index 519c90b..ca90bee 100644
--- a/src/main/java/vue/simulation/SimHistogramme.java
+++ b/src/main/java/vue/simulation/SimHistogramme.java
@@ -1,6 +1,4 @@
1package vue.simulation; 1package vue.simulation;
2import javafx.application.Application;
3import javafx.scene.Scene;
4import javafx.scene.chart.Axis; 2import javafx.scene.chart.Axis;
5import javafx.scene.chart.BarChart; 3import javafx.scene.chart.BarChart;
6import javafx.scene.chart.CategoryAxis; 4import javafx.scene.chart.CategoryAxis;
@@ -9,7 +7,6 @@ import javafx.scene.chart.XYChart;
9import javafx.scene.layout.Pane; 7import javafx.scene.layout.Pane;
10import javafx.scene.layout.Priority; 8import javafx.scene.layout.Priority;
11import javafx.scene.layout.VBox; 9import javafx.scene.layout.VBox;
12import javafx.stage.Stage;
13 10
14public class SimHistogramme extends Pane{ 11public class SimHistogramme extends Pane{
15 private Pane p; 12 private Pane p;