diff options
| author | polo <ordipolo@gmx.fr> | 2026-07-12 18:08:54 +0200 |
|---|---|---|
| committer | polo <ordipolo@gmx.fr> | 2026-07-12 18:08:54 +0200 |
| commit | dd82df9348efbfe0a27eeabacbf96b0d3275add2 (patch) | |
| tree | 3f81ee69f0e79b38d89d2c392aebe7003d7917b0 | |
| parent | e10af06f9ea3b0fbbe94ddf7c4404f9bc7309f67 (diff) | |
| download | ppe_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.prefs | 2 | ||||
| -rw-r--r-- | src/main/java/controlleur/BDD.java | 5 | ||||
| -rw-r--r-- | src/main/java/controlleur/ControllerAdmin.java | 16 | ||||
| -rw-r--r-- | src/main/java/controlleur/ControllerTopMenu.java | 1 | ||||
| -rw-r--r-- | src/main/java/controlleur/EvenementController.java | 7 | ||||
| -rw-r--r-- | src/main/java/vue/AfficheAccueil.java | 8 | ||||
| -rw-r--r-- | src/main/java/vue/AfficheAdmin.java | 12 | ||||
| -rw-r--r-- | src/main/java/vue/AfficheEvenement.java | 1 | ||||
| -rw-r--r-- | src/main/java/vue/AfficheGestionCompte.java | 3 | ||||
| -rw-r--r-- | src/main/java/vue/AfficheTopMenu.java | 1 | ||||
| -rw-r--r-- | src/main/java/vue/GestionListe/AfficheModificationListe.java | 3 | ||||
| -rw-r--r-- | src/main/java/vue/simulation/SimHistogramme.java | 3 |
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 @@ | |||
| 1 | eclipse.preferences.version=1 | ||
| 2 | encoding/<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 @@ | |||
| 1 | package controlleur; | 1 | package controlleur; |
| 2 | 2 | ||
| 3 | import java.sql.Connection; | 3 | import java.sql.Connection; |
| 4 | import java.sql.Date; | ||
| 5 | import java.sql.DriverManager; | 4 | import java.sql.DriverManager; |
| 6 | import java.sql.PreparedStatement; | 5 | import java.sql.PreparedStatement; |
| 7 | import java.sql.ResultSet; | 6 | import java.sql.ResultSet; |
| @@ -9,12 +8,8 @@ import java.sql.ResultSetMetaData; | |||
| 9 | import java.sql.SQLException; | 8 | import java.sql.SQLException; |
| 10 | import java.sql.Statement; | 9 | import java.sql.Statement; |
| 11 | import java.util.ArrayList; | 10 | import java.util.ArrayList; |
| 12 | import java.util.List; | ||
| 13 | |||
| 14 | import javafx.scene.layout.VBox; | ||
| 15 | import modele.Arme; | 11 | import modele.Arme; |
| 16 | import modele.ArmeeListe; | 12 | import modele.ArmeeListe; |
| 17 | import modele.Evenement; | ||
| 18 | import modele.Unit; | 13 | import modele.Unit; |
| 19 | import modele.User; | 14 | import 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; | |||
| 3 | import java.io.File; | 3 | import java.io.File; |
| 4 | import java.io.IOException; | 4 | import java.io.IOException; |
| 5 | import java.nio.file.Files; | 5 | import java.nio.file.Files; |
| 6 | import java.sql.PreparedStatement; | ||
| 7 | import java.sql.ResultSet; | ||
| 8 | import java.sql.SQLException; | ||
| 9 | import java.time.LocalDate; | ||
| 10 | import java.util.ArrayList; | ||
| 11 | import java.util.Date; | ||
| 12 | import java.util.List; | ||
| 13 | |||
| 14 | import javafx.geometry.Pos; | 6 | import javafx.geometry.Pos; |
| 15 | import javafx.scene.control.Alert; | 7 | import javafx.scene.control.Alert; |
| 16 | import javafx.scene.control.Button; | ||
| 17 | import javafx.scene.control.Label; | ||
| 18 | import javafx.scene.image.Image; | 8 | import javafx.scene.image.Image; |
| 19 | import javafx.scene.image.ImageView; | 9 | import javafx.scene.image.ImageView; |
| 20 | import javafx.scene.layout.HBox; | ||
| 21 | import javafx.scene.layout.VBox; | 10 | import javafx.scene.layout.VBox; |
| 22 | import javafx.scene.text.Text; | ||
| 23 | import javafx.stage.FileChooser; | 11 | import javafx.stage.FileChooser; |
| 24 | import javafx.stage.Stage; | 12 | import javafx.stage.Stage; |
| 25 | import vue.AfficheAccueil; | ||
| 26 | import vue.AfficheAdmin; | ||
| 27 | import vue.AfficheConnexionFailed; | ||
| 28 | import modele.Evenement; | 13 | import modele.Evenement; |
| 29 | import modele.User; | ||
| 30 | 14 | ||
| 31 | public class ControllerAdmin { | 15 | public 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 | ||
| 3 | import application.Battle; | 3 | import application.Battle; |
| 4 | import javafx.stage.Stage; | 4 | import javafx.stage.Stage; |
| 5 | import modele.Evenement; | ||
| 6 | import modele.User; | 5 | import modele.User; |
| 7 | import vue.AfficheAccueil; | 6 | import vue.AfficheAccueil; |
| 8 | import vue.AfficheAdmin; | 7 | import 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; | |||
| 7 | import java.sql.ResultSet; | 7 | import java.sql.ResultSet; |
| 8 | import java.sql.SQLException; | 8 | import java.sql.SQLException; |
| 9 | import java.util.ArrayList; | 9 | import java.util.ArrayList; |
| 10 | import java.io.IOException; | ||
| 11 | import java.nio.file.Files; | ||
| 12 | import java.nio.file.Path; | 10 | import java.nio.file.Path; |
| 13 | import java.nio.file.Paths; | ||
| 14 | import javafx.geometry.Pos; | 11 | import javafx.geometry.Pos; |
| 15 | import javafx.scene.control.Button; | 12 | import javafx.scene.control.Button; |
| 16 | import javafx.scene.control.Label; | 13 | import 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 @@ | |||
| 1 | package vue; | 1 | package vue; |
| 2 | 2 | ||
| 3 | import java.util.ArrayList; | ||
| 4 | |||
| 5 | import controlleur.Connexion; | ||
| 6 | import controlleur.EvenementController; | ||
| 7 | import javafx.geometry.Pos; | 3 | import javafx.geometry.Pos; |
| 8 | import javafx.scene.Scene; | 4 | import javafx.scene.Scene; |
| 9 | import javafx.scene.control.Button; | 5 | import javafx.scene.control.Button; |
| 10 | import javafx.scene.control.Label; | 6 | import javafx.scene.control.Label; |
| 11 | import javafx.scene.image.Image; | ||
| 12 | import javafx.scene.image.ImageView; | ||
| 13 | import javafx.scene.layout.HBox; | 7 | import javafx.scene.layout.HBox; |
| 14 | import javafx.scene.layout.Priority; | ||
| 15 | import javafx.scene.layout.VBox; | 8 | import javafx.scene.layout.VBox; |
| 16 | import javafx.scene.text.Font; | 9 | import javafx.scene.text.Font; |
| 17 | import javafx.stage.Stage; | 10 | import javafx.stage.Stage; |
| 18 | import modele.Evenement; | ||
| 19 | import modele.User; | 11 | import modele.User; |
| 20 | 12 | ||
| 21 | public class AfficheAccueil { | 13 | public 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; | |||
| 5 | import javafx.scene.control.Alert; | 5 | import javafx.scene.control.Alert; |
| 6 | import javafx.scene.control.Button; | 6 | import javafx.scene.control.Button; |
| 7 | import javafx.scene.control.DatePicker; | 7 | import javafx.scene.control.DatePicker; |
| 8 | import javafx.scene.image.Image; | ||
| 9 | import javafx.scene.image.ImageView; | 8 | import javafx.scene.image.ImageView; |
| 10 | import javafx.scene.layout.HBox; | 9 | import javafx.scene.layout.HBox; |
| 11 | import javafx.scene.layout.VBox; | 10 | import javafx.scene.layout.VBox; |
| 12 | import javafx.scene.paint.Color; | 11 | import javafx.scene.paint.Color; |
| 13 | import javafx.scene.text.Font; | 12 | import javafx.scene.text.Font; |
| 14 | import javafx.scene.text.Text; | 13 | import javafx.scene.text.Text; |
| 15 | import javafx.stage.FileChooser; | ||
| 16 | import javafx.stage.Stage; | 14 | import javafx.stage.Stage; |
| 17 | import modele.Evenement; | ||
| 18 | import modele.User; | 15 | import modele.User; |
| 19 | import javafx.scene.control.TextField; | 16 | import javafx.scene.control.TextField; |
| 20 | //import java.awt.TextArea; | ||
| 21 | import java.io.File; | ||
| 22 | import java.io.IOException; | ||
| 23 | import java.nio.file.Files; | ||
| 24 | import java.nio.file.Paths; | ||
| 25 | import java.time.LocalDate; | 17 | import java.time.LocalDate; |
| 26 | import java.time.ZoneId; | ||
| 27 | import java.time.format.DateTimeFormatter; | 18 | import java.time.format.DateTimeFormatter; |
| 28 | import java.util.Date; | ||
| 29 | |||
| 30 | import controlleur.BDD; | ||
| 31 | import controlleur.ControllerAdmin; | 19 | import controlleur.ControllerAdmin; |
| 32 | import controlleur.EvenementController; | 20 | import 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 | ||
| 3 | import application.Main; | 3 | import application.Main; |
| 4 | import controlleur.Connexion; | 4 | import controlleur.Connexion; |
| 5 | import controlleur.EvenementController; | ||
| 6 | import javafx.scene.control.Button; | 5 | import javafx.scene.control.Button; |
| 7 | import javafx.scene.control.Label; | 6 | import javafx.scene.control.Label; |
| 8 | import javafx.scene.image.Image; | 7 | import 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; | |||
| 15 | import javafx.scene.layout.VBox; | 15 | import javafx.scene.layout.VBox; |
| 16 | import javafx.scene.text.Font; | 16 | import javafx.scene.text.Font; |
| 17 | import javafx.stage.Stage; | 17 | import javafx.stage.Stage; |
| 18 | import modele.Evenement; | ||
| 19 | import modele.User; | 18 | import modele.User; |
| 20 | 19 | ||
| 21 | public class AfficheGestionCompte { | 20 | public 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; | |||
| 10 | import javafx.scene.layout.Priority; | 10 | import javafx.scene.layout.Priority; |
| 11 | import javafx.scene.paint.Color; | 11 | import javafx.scene.paint.Color; |
| 12 | import javafx.stage.Stage; | 12 | import javafx.stage.Stage; |
| 13 | import modele.Evenement; | ||
| 14 | import modele.User; | 13 | import modele.User; |
| 15 | 14 | ||
| 16 | public class AfficheTopMenu extends HBox | 15 | public 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; | |||
| 4 | import javafx.scene.paint.Color; | 4 | import javafx.scene.paint.Color; |
| 5 | import javafx.stage.Stage; | 5 | import javafx.stage.Stage; |
| 6 | import modele.ArmeeListe; | 6 | import modele.ArmeeListe; |
| 7 | import modele.Evenement; | ||
| 8 | import modele.Figurine; | 7 | import modele.Figurine; |
| 9 | import modele.User; | 8 | import modele.User; |
| 10 | import vue.AfficheTopMenu; | 9 | import vue.AfficheTopMenu; |
| 11 | |||
| 12 | import java.util.ArrayList; | 10 | import java.util.ArrayList; |
| 13 | |||
| 14 | import controlleur.ModificationListe; | 11 | import controlleur.ModificationListe; |
| 15 | import javafx.geometry.Insets; | 12 | import javafx.geometry.Insets; |
| 16 | import javafx.scene.Scene; | 13 | import 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 @@ | |||
| 1 | package vue.simulation; | 1 | package vue.simulation; |
| 2 | import javafx.application.Application; | ||
| 3 | import javafx.scene.Scene; | ||
| 4 | import javafx.scene.chart.Axis; | 2 | import javafx.scene.chart.Axis; |
| 5 | import javafx.scene.chart.BarChart; | 3 | import javafx.scene.chart.BarChart; |
| 6 | import javafx.scene.chart.CategoryAxis; | 4 | import javafx.scene.chart.CategoryAxis; |
| @@ -9,7 +7,6 @@ import javafx.scene.chart.XYChart; | |||
| 9 | import javafx.scene.layout.Pane; | 7 | import javafx.scene.layout.Pane; |
| 10 | import javafx.scene.layout.Priority; | 8 | import javafx.scene.layout.Priority; |
| 11 | import javafx.scene.layout.VBox; | 9 | import javafx.scene.layout.VBox; |
| 12 | import javafx.stage.Stage; | ||
| 13 | 10 | ||
| 14 | public class SimHistogramme extends Pane{ | 11 | public class SimHistogramme extends Pane{ |
| 15 | private Pane p; | 12 | private Pane p; |
