diff --git a/res/stages/add-data-stage.fxml b/res/stages/add-data-stage.fxml
index 9b58157236839645fcb24b3b5a8a5422cdc7a7dc..b069f1fa96fe67c6115b5f261b26513cf2bc8451 100644
--- a/res/stages/add-data-stage.fxml
+++ b/res/stages/add-data-stage.fxml
@@ -6,7 +6,7 @@
<?import javafx.scene.text.*?>
<?import javafx.stage.*?>
-<Stage fx:id="stage" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.univlille.sae.classification.controller.AddDataController">
+<Stage fx:id="stage" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.univlille.sae.classification.controller.AddDataController">
<scene>
<Scene>
<AnchorPane prefHeight="406.0" prefWidth="385.0">
@@ -18,7 +18,7 @@
<Font name="System Bold" size="13.0" />
</font></Button>
</children></VBox>
- <VBox fx:id="entries" layoutY="16.0" prefHeight="366.0" prefWidth="385.0" spacing="10.0" />
+ <VBox fx:id="entries" layoutY="16.0" prefHeight="366.0" prefWidth="385.0" spacing="10.0" stylesheets="@../css/style.css" />
</children></AnchorPane>
</Scene>
</scene>
diff --git a/res/stages/axes-settings-stage.fxml b/res/stages/axes-settings-stage.fxml
index e19aa3020780237261a7602394e6b241b1913e23..f5bcb1d57a7fb0017b0b0086b7f40d2405cde7c3 100644
--- a/res/stages/axes-settings-stage.fxml
+++ b/res/stages/axes-settings-stage.fxml
@@ -84,11 +84,6 @@
</children></AnchorPane>
</content>
</Tab>
- <Tab text="Couleurs des données">
- <content>
- <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
- </content>
- </Tab>
</tabs>
</TabPane>
</children></AnchorPane>
diff --git a/res/stages/choose-attributes.fxml b/res/stages/choose-attributes.fxml
index e16bafd0057ed87a9f7b09cfc503c9e7f610a4e7..b046d8b6bc710a876fb1681854c3cdb24c1431ef 100644
--- a/res/stages/choose-attributes.fxml
+++ b/res/stages/choose-attributes.fxml
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.scene.Scene?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ChoiceBox?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Text?>
-<?import javafx.stage.Stage?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.stage.*?>
-<Stage fx:id="stage" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.univlille.sae.classification.controller.ChooseAttributesController">
+<Stage fx:id="stage" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.univlille.sae.classification.controller.ChooseAttributesController">
<scene>
<Scene>
<AnchorPane prefHeight="175.0" prefWidth="317.0">
@@ -17,7 +15,10 @@
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Veuillez selectionner l'attribut sur lequel vous souhaitez classifier les données" textAlignment="CENTER" wrappingWidth="254.06924438476562" />
<ChoiceBox fx:id="choice" prefWidth="150.0" stylesheets="@../css/style.css" />
- <Button mnemonicParsing="false" onAction="#validate" stylesheets="@../css/style.css" text="Valider" textFill="WHITE" />
+ <Button mnemonicParsing="false" onAction="#validate" stylesheets="@../css/style.css" text="Valider" textFill="WHITE">
+ <font>
+ <Font name="System Bold" size="13.0" />
+ </font></Button>
</children>
</VBox>
</children></AnchorPane>
diff --git a/res/stages/k-NN-stage.fxml b/res/stages/k-NN-stage.fxml
index d85e37816d2a07190893f8454bbc57f4dc5c0871..0098c9719114f20d296fe1ef34c6d6b8666f3301 100644
--- a/res/stages/k-NN-stage.fxml
+++ b/res/stages/k-NN-stage.fxml
@@ -36,7 +36,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="36.0" prefWidth="364.0" spacing="20.0">
<children>
- <Spinner fx:id="kEntry" />
+ <Spinner fx:id="kEntry" stylesheets="@../css/style.css" />
<Button fx:id="autoK" mnemonicParsing="false" onAction="#bestK" stylesheets="@../css/style.css" text="Attribution auto" textFill="WHITE">
<font>
<Font name="System Bold" size="13.0" />
@@ -46,7 +46,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="59.0" prefWidth="364.0">
<children>
- <Button fx:id="confirmK" onAction="#validate" mnemonicParsing="false" stylesheets="@../css/style.css" text="Valider" textFill="WHITE">
+ <Button fx:id="confirmK" mnemonicParsing="false" onAction="#validate" stylesheets="@../css/style.css" text="Valider" textFill="WHITE">
<font>
<Font name="System Bold" size="14.0" />
</font></Button>
diff --git a/res/stages/load-data-stage.fxml b/res/stages/load-data-stage.fxml
index 6c6f3fc9506adec0621557c674947a76c68e0ef8..026abc2aa9d7e6991c65b0d8924e9a4b797d6c48 100644
--- a/res/stages/load-data-stage.fxml
+++ b/res/stages/load-data-stage.fxml
@@ -29,7 +29,10 @@
</HBox>
<HBox alignment="CENTER" prefHeight="76.0" prefWidth="310.0">
<children>
- <Button fx:id="confirmDataSelection" mnemonicParsing="false" onAction="#validate" stylesheets="@../css/style.css" text="Valider" textFill="WHITE" />
+ <Button fx:id="confirmDataSelection" mnemonicParsing="false" onAction="#validate" stylesheets="@../css/style.css" text="Valider" textFill="WHITE">
+ <font>
+ <Font name="System Bold" size="13.0" />
+ </font></Button>
</children>
</HBox>
</children>
diff --git a/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java b/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java
index 4d38f1f0d7b078b7a5511cae8186bc47f2b122cf..d43cf728c2ede7f6b8d12c3fb539138ce2dae351 100644
--- a/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java
+++ b/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java
@@ -13,10 +13,7 @@ import javafx.stage.Stage;
import java.io.IOException;
import java.lang.reflect.Array;
import java.time.temporal.Temporal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Controlleur pour le FXML add-data-stage, pour ajouter une nouvelle donnée