From ddae1e297fd226b5922aae5377e1637751b80d22 Mon Sep 17 00:00:00 2001 From: Andrin Fassbind Date: Fri, 13 May 2022 19:18:51 +0200 Subject: [PATCH] solve bug PlacesFormularController id name not valid --- .../LanguageConfigurator.java | 16 ++++++++------- .../PlacesFormularController.java | 18 +++-------------- .../placesAddFormular/PlacesFormular.fxml | 20 +++++++++++++------ 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/LanguageConfigurator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/LanguageConfigurator.java index c390f37..bcff8e3 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/LanguageConfigurator.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/LanguageConfigurator.java @@ -36,9 +36,9 @@ public class LanguageConfigurator { //Tournamentlist germanDictionary.put("tournamentListTitle","Bestehende Turniere"); englishDictionary.put("tournamentListTitle","Existing tournaments"); - germanDictionary.put("openBtn","Öffnen"); + germanDictionary.put("openBtn","Oeffnen"); englishDictionary.put("openBtn","Open"); - germanDictionary.put("deleteBtn","Löschen"); + germanDictionary.put("deleteBtn","Loeschen"); englishDictionary.put("deleteBtn","Delete"); germanDictionary.put("newTournamentFormularTitle","Neues Turnier erstellen"); englishDictionary.put("newTournamentFormularTitle","Create new tournament"); @@ -49,12 +49,14 @@ public class LanguageConfigurator { germanDictionary.put("createBtn","Erstellen"); englishDictionary.put("createBtn","Create"); //PlaceList - germanDictionary.put("placeListTitle","Hinzugefügt"); + germanDictionary.put("placeListTitle","Hinzugefuegt"); englishDictionary.put("placeListTitle","Added"); germanDictionary.put("saveBtn","Speichern"); englishDictionary.put("saveBtn","Save"); - germanDictionary.put("newplaceFormularTitle","Ort ändern/erstellen"); - englishDictionary.put("newplaceFormularTitle","Location change/create"); + germanDictionary.put("newPlaceTitle","Ort aendern/erstellen"); + englishDictionary.put("newPlaceTitle","Location change/create"); + germanDictionary.put("placeNameLabel","Ort:"); + englishDictionary.put("placeNameLabel","Location:"); //GameSchedule germanDictionary.put("treeView","Baumansicht"); englishDictionary.put("treeView","Treeview"); @@ -67,9 +69,9 @@ public class LanguageConfigurator { germanDictionary.put("closeTournamentBtn","Turnier schliessen"); englishDictionary.put("closeTournamentBtn","Close tournament"); //ParticipantFormular - germanDictionary.put("participantListTitle","Hinzugefügt"); + germanDictionary.put("participantListTitle","Hinzugefuegt"); englishDictionary.put("participantListTitle","Added"); - germanDictionary.put("newParticipantFormularTitle","Teilnehmer ändern/erstellen"); + germanDictionary.put("newParticipantFormularTitle","Teilnehmer aendern/erstellen"); englishDictionary.put("newParticipantFormularTitle","Participant change/create"); germanDictionary.put("participantNameLabel","Name:"); englishDictionary.put("participantNameLabel","Name:"); diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java index 15c1063..21e6847 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java @@ -11,22 +11,9 @@ import javafx.scene.control.Label; import javafx.scene.control.ListView; import javafx.scene.control.TextField; import javafx.scene.input.MouseEvent; -import javafx.scene.layout.GridPane; -import javafx.scene.layout.VBox; public class PlacesFormularController extends FXController { - @FXML - private Button addBtn; - - @FXML - private VBox changeBtn; - - @FXML - private GridPane grid; - - @FXML - private Label newPlaceFormularTitle; @FXML private Button closeBtn; @@ -34,6 +21,8 @@ public class PlacesFormularController extends FXController { @FXML private Button deleteBtn; + @FXML + private Label newPlaceTitle; @FXML private Label placeListTitle; @@ -53,13 +42,12 @@ public class PlacesFormularController extends FXController { @Override public void shareGUIElementWithLanguageConfigurator() { getLanguageConfigurator().recieveLabel(placeListTitle); - getLanguageConfigurator().recieveLabel(newPlaceFormularTitle); + getLanguageConfigurator().recieveLabel(newPlaceTitle); getLanguageConfigurator().recieveLabel(placeNameLabel); getLanguageConfigurator().recieveLabel(closeBtn); getLanguageConfigurator().recieveLabel(deleteBtn); getLanguageConfigurator().recieveLabel(saveBtn); - } @FXML diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml index c000eae..574c4da 100644 --- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml +++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml @@ -1,11 +1,19 @@ - - - - + + + + + + + + + + + + - + @@ -48,7 +56,7 @@ -