app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java

@@ -21,7 +21,7 @@ public class Factory {
     }
 
     public void setTournament(Tournament tournament) {
-        this.tournamentDecorator = tournamentDecorator;
+        this.tournamentDecorator.setTournament(tournament);
     }
 
     public BorderPane loadMainWindow(){
@@ -36,6 +36,7 @@ public class Factory {
     }
 
     public void loadTournamentList(BorderPane pane, FactoryDecorator factoryDecorator){
+        tournamentDecorator.setTournament(null);
         TournamentListController controller = (TournamentListController) setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"), factoryDecorator);
     }
 
@@ -45,6 +46,14 @@ public class Factory {
         setCenterOfBorderPane(pane, getClass().getResource("participantAddFormular/participantFormular.fxml"), factoryDecorator);
     }
 
+    public void loadPlacesFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
+        setCenterOfBorderPane(pane, getClass().getResource("placesAddFormular/PlacesFormular.fxml"), factoryDecorator);
+    }
+
+    public void loadGameScheduler(BorderPane pane, FactoryDecorator factoryDecorator) {
+        setCenterOfBorderPane(pane, getClass().getResource("gameScheduleView/GameSchedule.fxml"), factoryDecorator);
+    }
+
     private FXController setCenterOfBorderPane(BorderPane pane, URL location, FactoryDecorator factoryDecorator) {
         FXController controller = null;
         try {

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java

@@ -44,7 +44,7 @@ public class FactoryDecorator implements IsObservable{
     public void openTournament(FileIO.TournamentFile tournamentFile){
         try {
             factory.setTournament(fileIO.loadTournament(tournamentFile));
-            factory.loadParticipantFormular((BorderPane) pane, this); //TODO load TournamentView instead of ParticipantFormular?
+            factory.loadGameScheduler((BorderPane) pane, this);
             informListener();
         } catch (IOException e) {
             e.printStackTrace();
@@ -53,6 +53,13 @@ public class FactoryDecorator implements IsObservable{
         } //TODO handle and logging
     }
 
+    public void openParticipantFormular() {
+        factory.loadParticipantFormular((BorderPane) pane, this);
+    }
+
+    public void openPlacesFormular() {
+        factory.loadPlacesFormular((BorderPane) pane, this);
+    }
 
     public void informListener() {
         for(IsObserver observer : listener) {

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java

@@ -107,7 +107,7 @@ public class FileIO {
         ObjectOutputStream out = null;
 
         try {
-            newSave.createNewFile();
+            boolean newFile = newSave.createNewFile();
             out = new ObjectOutputStream(new FileOutputStream(newSave));
             out.writeObject(tournament);
             System.out.println("Save File" + tournament.getName() + ".txt being saved to " + saves.getAbsolutePath());

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java

@@ -1,6 +1,8 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public class Game {
+import java.io.Serializable;
+
+public class Game implements Serializable {
     private Participant participant1, Participant2;
     private int points1, points2;
     private Location location;

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/InvalidNameException.java

@@ -0,0 +1,12 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+public class InvalidNameException extends Exception {
+    public InvalidNameException() {
+        super();
+    }
+
+    public InvalidNameException(String errorMessage) {
+        super(errorMessage);
+    }
+
+}

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java

@@ -1,6 +1,9 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public interface Participant {
+import java.io.Serializable;
+
+public interface Participant extends Serializable {
     String getName();
     void setName(String name);
+    boolean equals(Participant participant);
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java

@@ -1,11 +1,23 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public class Person {
+import java.io.Serializable;
+
+public class Person implements Serializable {
+    private final String NAME_MATCHING_REGEX = "[a-zA-Z]{1,20}";
+    private final String PHONE_MATCHING_REGEX = "[\\+0-9]+";
+
     private String name;
     private String firstName;
     private String phoneNumber;
 
-    public Person(String firstName, String name, String phoneNumber){
+    public Person(String firstName, String name, String phoneNumber) throws InvalidNameException, InvalidPhoneNumberException {
+        if(!firstName.matches(NAME_MATCHING_REGEX)){
+            throw new InvalidNameException("The First name is Invalid.");
+        } else if(!name.matches(NAME_MATCHING_REGEX)){
+            throw new InvalidNameException("The Last name is Invalid");
+        } else if(!phoneNumber.matches(PHONE_MATCHING_REGEX)){
+            throw new InvalidPhoneNumberException("The entered Phone Number is invalid.");
+        }
         setFirstName(firstName);
         setName(name);
         setPhoneNumber(phoneNumber);
@@ -34,4 +46,21 @@ public class Person {
     public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
+
+    public class InvalidPhoneNumberException extends Exception {
+        public InvalidPhoneNumberException() {
+            super();
+        }
+
+        public InvalidPhoneNumberException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    @Override
+    public String toString(){
+        return firstName + " " + name;
+    }
+
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java

@@ -1,21 +1,27 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-import java.util.Date;
+import java.util.GregorianCalendar;
 
 public class Player extends Person implements Participant{
 
-    private Date dateOfBirth;
+    private GregorianCalendar dateOfBirth;
 
-    public Player(String firstName, String name, String phoneNumber, Date dateOfBirth){
+    public Player(String firstName, String name, String phoneNumber, String dateOfBirth) throws InvalidNameException, InvalidPhoneNumberException {
         super(firstName, name, phoneNumber);
         setDateOfBirth(dateOfBirth);
     }
 
-    public Date getDateOfBirth() {
+    public GregorianCalendar getDateOfBirth() {
         return dateOfBirth;
     }
 
-    public void setDateOfBirth(Date dateOfBirth) {
+    public void setDateOfBirth(String dateOfBirth) {
-        this.dateOfBirth = dateOfBirth;
+        String[] date = dateOfBirth.split("\\.");
+        this.dateOfBirth = new GregorianCalendar(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
+    }
+
+    @Override
+    public boolean equals(Participant participant) {
+        return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
     }
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java

@@ -27,6 +27,11 @@ public class Team implements Participant {
         this.name = name;
     }
 
+    @Override
+    public boolean equals(Participant participant) {
+        return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
+    }
+
     public Person getContactPerson() {
         return contactPerson;
     }
@@ -34,4 +39,9 @@ public class Team implements Participant {
     public void setContactPerson(Person contactPerson) {
         this.contactPerson = contactPerson;
     }
+
+    @Override
+    public String toString(){
+        return name;
+    }
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java

@@ -3,24 +3,50 @@ package ch.zhaw.projekt2.turnierverwaltung;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import java.io.File;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 public class Tournament implements Serializable {
     private String name;
     private Type type;
+    private List<Participant> participants;
 
 
 
     public Tournament(String name, Type type) throws InvalidNameException, InvalidTypeException {
         if(!name.matches("[\\w]{1,20}")){
-            throw new Tournament.InvalidNameException("Invalid Name entered"); //TODO handle en logging.
+            throw new InvalidNameException("Invalid Name entered"); //TODO handle en logging.
         } else if(!Arrays.asList(Type.values()).contains(type)){
             throw new InvalidTypeException("Invalid Type selected"); //TODO handle en logging.
         }
 
         setName(name);
         setType(type);
+        participants = new ArrayList<>();
+    }
+
+    public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
+        for(Participant participant : participants){
+            if(participant.equals(newParticipant)){
+                throw new ParticipantExistsException("A Participant with the same Name exists already.");
+            }
+        }
+        participants.add(newParticipant);
+    }
+
+    public void removeParticipant(Participant participant) throws ParticipantNotExistsException {
+        if(!participants.contains(participant)){
+            throw new ParticipantNotExistsException("The given Participant is not part of this Tournament");
+        }
+    }
+
+    public ObservableList<Participant> getParticipants() {
+        ObservableList<Participant> participantsObservable = FXCollections.observableArrayList();
+        participantsObservable.addAll(participants);
+        return participantsObservable;
     }
 
     public String getName() {
@@ -60,17 +86,6 @@ public class Tournament implements Serializable {
         }
     }
 
-    public class InvalidNameException extends Exception {
-        public InvalidNameException() {
-            super();
-        }
-
-        public InvalidNameException(String errorMessage) {
-            super(errorMessage);
-        }
-
-    }
-
     public class InvalidTypeException extends Exception {
         public InvalidTypeException() {
             super();
@@ -82,5 +97,27 @@ public class Tournament implements Serializable {
 
     }
 
+    public class ParticipantExistsException extends Exception {
+        public ParticipantExistsException() {
+            super();
+        }
+
+        public ParticipantExistsException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    public class ParticipantNotExistsException extends Exception {
+        public ParticipantNotExistsException() {
+            super();
+        }
+
+        public ParticipantNotExistsException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
 
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java

@@ -2,6 +2,7 @@ package ch.zhaw.projekt2.turnierverwaltung;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class TournamentDecorator implements IsObservable{
@@ -9,9 +10,16 @@ public class TournamentDecorator implements IsObservable{
     private FileIO fileIO;
     private List<IsObserver> listener = new ArrayList<>();
 
-    public TournamentDecorator(FileIO fileIO, Tournament tournament){
+    public TournamentDecorator(FileIO fileIO){
-        setTournament(tournament);
         setFileIO(fileIO);
+        addListener(new IsObserver() {
+            @Override
+            public void update() {
+                if(tournament != null){
+                    saveTournament();
+                }
+            }
+        });
     }
 
     public void setFileIO(FileIO fileIO) {
@@ -22,6 +30,10 @@ public class TournamentDecorator implements IsObservable{
         this.tournament = tournament;
     }
 
+    public Tournament getTournament() {
+        return tournament;
+    }
+
     @Override
     public void addListener(IsObserver observer) {
         listener.add(observer);
@@ -32,6 +44,14 @@ public class TournamentDecorator implements IsObservable{
         listener.remove(observer);
     }
 
+    public void saveTournament(){
+        try {
+            fileIO.saveTournament(tournament);
+        } catch (IOException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
     public void createTournament(String name, Tournament.Type type){
         if(fileIO.tournamentExists(name)){
             System.out.println("Tournament with same name exists already.");
@@ -41,7 +61,7 @@ public class TournamentDecorator implements IsObservable{
             Tournament tournament = new Tournament(name, type);
             fileIO.saveTournament(tournament);
             informListener();
-        } catch (Tournament.InvalidNameException e) {
+        } catch (InvalidNameException e) {
             e.printStackTrace(); //TODO handle and logging
         } catch (Tournament.InvalidTypeException e) {
             e.printStackTrace(); //TODO handle and logging
@@ -59,6 +79,18 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
+    public void addPlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
+        try {
+            tournament.addParticipant(new Player(firstName, name, phoneNumber, dateOfBirth));
+            informListener();
+        } catch (Tournament.ParticipantExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (InvalidNameException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (Person.InvalidPhoneNumberException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
 
     public void informListener() {
         for(IsObserver observer : listener) {

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java

@@ -16,7 +16,7 @@ import java.io.IOException;
 
 public class MainWindow extends Application {
     private FileIO fileIO = new FileIO(System.getProperty("user.dir") + "/tournierverwaltung_angrynerds");
-    private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO, null);
+    private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO);
     private Factory factory = new Factory(fileIO, tournamentDecorator); //TODO make it private!
     private FactoryDecorator factoryDecorator;
 

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java

@@ -0,0 +1,16 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.fxml.FXML;
+import javafx.scene.control.ChoiceBox;
+
+public class GameController extends FXController {
+
+    @FXML
+    private ChoiceBox<?> placesChoiceBox;
+
+    @Override
+    public void loadContent() {
+
+    }
+}

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java

@@ -0,0 +1,24 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+public class GameScheduleController extends FXController {
+
+    @FXML
+    void openPlacesFormular(ActionEvent event) {
+        getFactoryDecorator().openPlacesFormular();
+    }
+
+    @FXML
+    void openParticipantFormular(ActionEvent event) {
+        getFactoryDecorator().openParticipantFormular();
+    }
+
+    @Override
+    public void loadContent() {
+
+    }
+}
+

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java

@@ -1,6 +1,7 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.Participant;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -44,7 +45,7 @@ public class ParticipantFormularController extends FXController {
     private Label participantListTitle;
 
     @FXML
-    private ListView<?> participantListView;
+    private ListView<Participant> participantListView;
 
     @FXML
     private Label participantNameLabel;
@@ -63,7 +64,7 @@ public class ParticipantFormularController extends FXController {
 
     @FXML
     void addParticipant(ActionEvent event) {
-
+        getTournamentDecorator().addPlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText());
     }
 
     @FXML
@@ -78,6 +79,6 @@ public class ParticipantFormularController extends FXController {
 
     @Override
     public void loadContent() {
-
+        participantListView.setItems(getTournamentDecorator().getTournament().getParticipants());
     }
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java

@@ -0,0 +1,66 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+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;
+
+public class PlacesFormularController extends FXController {
+
+    @FXML
+    private Label AddListTitle;
+
+    @FXML
+    private Button closeBtn;
+
+    @FXML
+    private Button deleteBtn;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private ListView<?> locationListView;
+
+    @FXML
+    private Label locationNameLabel;
+
+    @FXML
+    private TextField locationNameTextField;
+
+    @FXML
+    private Label newLocationFormularTitle;
+
+    @FXML
+    private Button saveBtn;
+
+    @FXML
+    void changedSelection(MouseEvent event) {
+
+    }
+
+    @FXML
+    void closeFormular(ActionEvent event) {
+
+    }
+
+    @FXML
+    void deleteSelectedPlace(ActionEvent event) {
+
+    }
+
+    @FXML
+    void saveLocation(ActionEvent event) {
+
+    }
+
+    @Override
+    public void loadContent() {
+
+    }
+}

app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+
+<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="150.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GameContoller">
+   <children>
+      <Label fx:id="teamNameOne" text="Team One" />
+      <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+         <children>
+            <Label text="Points">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Label>
+            <TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.0" />
+         </children>
+      </HBox>
+      <Label fx:id="teamNameTwo" text="Team Two" />
+      <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+         <children>
+            <Label text="Points">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Label>
+            <TextField fx:id="pointsTeamTwo" prefHeight="25.0" prefWidth="50.0" />
+         </children>
+      </HBox>
+      <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+         <children>
+            <Label text="Ort">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Label>
+            <ChoiceBox fx:id="placesChoiceBox" prefWidth="150.0" />
+         </children>
+      </HBox>
+   </children>
+</VBox>

app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameScheduleController">
+   <top>
+      <HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+         <children>
+            <Button mnemonicParsing="false" onAction="#openParticipantFormular" text="Teilnehmer bearbeiten">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Button>
+            <Button mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten">
+               <HBox.margin>
+                  <Insets right="40.0" />
+               </HBox.margin>
+            </Button>
+         </children>
+      </HBox>
+   </top>
+</BorderPane>

app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml

@@ -4,12 +4,8 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TextField?>
-
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
@@ -17,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular.ParticipantFormularController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/17" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular.ParticipantFormularController">
    <children>
       <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
@@ -36,7 +32,7 @@
             </ListView>
             <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                <children>
-                  <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Save">
+                  <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Speichern">
                      <HBox.margin>
                         <Insets right="40.0" />
                      </HBox.margin>

app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="404.0" prefWidth="635.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular.PlacesFormularController">
+   <children>
+      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0">
+         <children>
+            <Label fx:id="AddListTitle" text="Hinzugefügt">
+               <font>
+                  <Font name="System Bold" size="21.0" />
+               </font>
+               <VBox.margin>
+                  <Insets bottom="20.0" />
+               </VBox.margin>
+            </Label>
+            <ListView fx:id="locationListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets left="10.0" right="10.0" />
+               </VBox.margin>
+               <opaqueInsets>
+                  <Insets />
+               </opaqueInsets>
+            </ListView>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+               <children>
+                  <Button fx:id="closeBtn" mnemonicParsing="false" onAction="#closeFormular" text="Schliessen">
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin>
+                  </Button>
+                  <Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#deleteSelectedPlace" text="Löschen" />
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+      <Separator orientation="VERTICAL" prefHeight="200.0" />
+      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0">
+         <children>
+            <Label fx:id="newLocationFormularTitle" text="Austragungsort bearbeiten/erstellen">
+               <font>
+                  <Font name="System Bold" size="21.0" />
+               </font>
+               <VBox.margin>
+                  <Insets bottom="40.0" />
+               </VBox.margin>
+            </Label>
+            <Separator prefWidth="200.0" />
+            <GridPane fx:id="grid" prefHeight="200.0">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <Label fx:id="locationNameLabel" styleClass="lableGrid" text="Austragungsort">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <TextField fx:id="locationNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </TextField>
+               </children>
+            </GridPane>
+            <Separator prefWidth="200.0" />
+            <Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#saveLocation" text="Speichern" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets bottom="10.0" top="30.0" />
+               </VBox.margin>
+            </Button>
+         </children>
+      </VBox>
+   </children>
+</HBox>

app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml

@@ -22,13 +22,19 @@
                         <Insets />
                     </VBox.margin>
                 </ListView>
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0">
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
                <VBox.margin>
                   <Insets bottom="20.0" top="40.0" />
                </VBox.margin>
                <children>
-                      <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournament" text="Öffnen" />
+                      <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournament" text="Öffnen">
-                  <Button fx:id="deleteBtn" layoutX="138.0" layoutY="28.0" mnemonicParsing="false" onAction="#deleteTournament" text="Löschen" />
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin></Button>
+                  <Button fx:id="deleteBtn" layoutX="138.0" layoutY="28.0" mnemonicParsing="false" onAction="#deleteTournament" text="Löschen">
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin></Button>
                </children>
             </HBox>
             </children>

app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java

@@ -108,7 +108,7 @@ class FileIOTest {
         }
 
         @Test
-        void saveTournament() throws IOException, Tournament.InvalidNameException, Tournament.InvalidTypeException {
+        void saveTournament() throws IOException, InvalidNameException, Tournament.InvalidTypeException {
             Tournament tournament = null;
             tournament = new Tournament("test1", Tournament.Type.KO);
             io.saveTournament(tournament);