diff --git a/src/main/java/fr/univ_amu/iut/admin2/Controller.java b/src/main/java/fr/univ_amu/iut/admin2/Controller.java index 2a49c0e..35aa27c 100644 --- a/src/main/java/fr/univ_amu/iut/admin2/Controller.java +++ b/src/main/java/fr/univ_amu/iut/admin2/Controller.java @@ -101,8 +101,8 @@ public class Controller implements Initializable { public void initialize(URL url, ResourceBundle resourceBundle) { addActeurs.setOnAction(actionEvent -> addActeur()); addRessources.setOnAction(actionEvent -> addRessource()); - id1.setOnAction(actionEvent -> textMenuButton.setPromptText("Degrès 1")); - id2.setOnAction(actionEvent -> textMenuButton.setPromptText("Degrès 2")); - id3.setOnAction(actionEvent -> textMenuButton.setPromptText("Degrès +")); + id1.setOnAction(actionEvent -> textMenuButton.setPromptText("Degré 1")); + id2.setOnAction(actionEvent -> textMenuButton.setPromptText("Degré 2")); + id3.setOnAction(actionEvent -> textMenuButton.setPromptText("Degré +")); } } diff --git a/src/main/java/fr/univ_amu/iut/admin2/admin2.fxml b/src/main/java/fr/univ_amu/iut/admin2/admin2.fxml index 07e4ad0..1aa7c91 100644 --- a/src/main/java/fr/univ_amu/iut/admin2/admin2.fxml +++ b/src/main/java/fr/univ_amu/iut/admin2/admin2.fxml @@ -69,7 +69,7 @@ - + diff --git a/src/main/java/fr/univ_amu/iut/fp/Controller.java b/src/main/java/fr/univ_amu/iut/fp/Controller.java index 26003ee..bb152c2 100644 --- a/src/main/java/fr/univ_amu/iut/fp/Controller.java +++ b/src/main/java/fr/univ_amu/iut/fp/Controller.java @@ -194,7 +194,7 @@ public class Controller implements Initializable { rechercheTextuelle.setOnAction(handleRechercheTextuelle); - EventHandler handleRechercheCrieters = event ->{ + EventHandler handleRechercheCriterias = event ->{ Donnees.setUsagesObtenus(daoUsage.findByCriterias(Donnees.getThematiqueSelectionee(),Donnees.getDisciplineSelectionee(),Donnees.getAcademieSelectionee())); Stage resultats = new Stage(); try { @@ -204,12 +204,12 @@ public class Controller implements Initializable { e.printStackTrace(); } }; - recherche.setOnAction(handleRechercheCrieters); + recherche.setOnAction(handleRechercheCriterias); EventHandler loginPrompt = event ->{ Stage loginWindow = new Stage(); try { - loginWindow.setScene(new Scene(FXMLLoader.load(getClass().getResource("/fr/univ_amu/iut/loginPrompt/Code_acces.fxml")))); + loginWindow.setScene(new Scene(FXMLLoader.load(getClass().getResource("/fr/univ_amu/iut/loginPrompt/Code_accessa.fxml")))); loginWindow.show(); } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/fr/univ_amu/iut/loginPrompt/Code_acces.fxml b/src/main/java/fr/univ_amu/iut/loginPrompt/Code_access.fxml similarity index 100% rename from src/main/java/fr/univ_amu/iut/loginPrompt/Code_acces.fxml rename to src/main/java/fr/univ_amu/iut/loginPrompt/Code_access.fxml diff --git a/src/main/java/fr/univ_amu/iut/secret/LocalSecretProvider.java b/src/main/java/fr/univ_amu/iut/secret/LocalSecretProvider.java index 3614732..c3eb1c1 100644 --- a/src/main/java/fr/univ_amu/iut/secret/LocalSecretProvider.java +++ b/src/main/java/fr/univ_amu/iut/secret/LocalSecretProvider.java @@ -5,8 +5,8 @@ import de.mkammerer.argon2.Argon2Factory; public class LocalSecretProvider implements SecretProvider { - private static String ARGON_HASH = "$argon2id$v=19$m=16,t=2,p=1$Tms1dkJYWEZ5OTdJTndVTg$+iBsHiILEshy1JLZsTfZFQ"; - private static Argon2 argon2 = Argon2Factory.create(Argon2Factory.Argon2Types.ARGON2id); + private final static String ARGON_HASH = "$argon2id$v=19$m=16,t=2,p=1$Tms1dkJYWEZ5OTdJTndVTg$+iBsHiILEshy1JLZsTfZFQ"; + private final static Argon2 argon2 = Argon2Factory.create(Argon2Factory.Argon2Types.ARGON2id); @Override