From 50652d104b38b23c2a80a9454b5dcd454b44353b Mon Sep 17 00:00:00 2001 From: "maxence.antoine.etu" <maxence.antoine.etu@univ-lille.fr> Date: Tue, 26 Nov 2024 10:34:52 +0100 Subject: [PATCH] =?UTF-8?q?Ajout=20choix=20du=20type=20de=20donn=C3=A9es?= =?UTF-8?q?=20lors=20du=20chargement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sae/classification/controller/LoadDataController.java | 4 +++- .../fr/univlille/sae/classification/view/LoadDataView.java | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java b/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java index 03fbc1c..014af78 100644 --- a/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java +++ b/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java @@ -51,13 +51,15 @@ public class LoadDataController { } - DataType typeChoisi = fileType.getSelectionModel().getSelectedItem(); /** * Valide le fichier sélectionné au préalable */ public void validate(){ + DataType typeChoisi = fileType.getValue(); + + if (file == null || file.isDirectory() || !file.exists() || fileType.getValue() == null) { Alert alert = new Alert(Alert.AlertType.ERROR); alert.setTitle("Erreur de chargement du fichier"); diff --git a/src/main/java/fr/univlille/sae/classification/view/LoadDataView.java b/src/main/java/fr/univlille/sae/classification/view/LoadDataView.java index 572612d..e7961d5 100644 --- a/src/main/java/fr/univlille/sae/classification/view/LoadDataView.java +++ b/src/main/java/fr/univlille/sae/classification/view/LoadDataView.java @@ -50,8 +50,6 @@ public class LoadDataView { root.initOwner(owner); root.initModality(Modality.APPLICATION_MODAL); root.setTitle("Chargement des données"); - LoadDataController controller = loader.getController(); - controller.setFileType(); root.showAndWait(); } catch (IOException e) { -- GitLab