Merge branch 'main' into Participant_List

Game schedule

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

@@ -3,32 +3,44 @@ package ch.zhaw.projekt2.turnierverwaltung;
 import javafx.scene.layout.Pane;
 
 public abstract class FXController {
-    Tournament tournament;
-    Factory factory;
+    TournamentDecorator tournamentDecorator;
+    FactoryDecorator factoryDecorator;
     FileIO fileIO;
     Pane pane;
 
-    public void setup(Tournament tournament, FileIO fileIO, Factory factory, Pane pane){
-        this.tournament = tournament;
+    public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane){
+        this.tournamentDecorator = tournamentDecorator;
         this.fileIO = fileIO;
-        this.factory = factory;
+        this.factoryDecorator = factoryDecorator;
         this.pane = pane;
+        tournamentDecorator.addListener(new IsObserver() {
+            @Override
+            public void update() {
+                loadContent();
+            }
+        });
+        factoryDecorator.addListener(new IsObserver() {
+            @Override
+            public void update() {
+                loadContent();
+            }
+        });
     }
 
     public abstract void loadContent();
 
-    protected Tournament getTournament() {
-        return tournament;
+    protected TournamentDecorator getTournamentDecorator() {
+        return tournamentDecorator;
+    }
+
+    protected FactoryDecorator getFactoryDecorator() {
+        return factoryDecorator;
     }
 
     protected FileIO getFileIO() {
         return fileIO;
     }
 
-    protected Factory getFactory() {
-        return factory;
-    }
-
     protected Pane getPane() {
         return pane;
     }

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

@@ -8,19 +8,20 @@ import java.io.IOException;
 import java.net.URL;
 
 public class Factory {
-    private Tournament tournament;
+    private TournamentDecorator tournamentDecorator;
     private FileIO fileIO;
 
-    public Factory(FileIO fileIO){
+    public Factory(FileIO fileIO, TournamentDecorator tournamentDecorator){
         this.fileIO = fileIO;
+        this.tournamentDecorator = tournamentDecorator;
     }
 
-    public Tournament getTournament() {
-        return tournament;
+    public TournamentDecorator getTournamentDecorator() {
+        return tournamentDecorator;
     }
 
     public void setTournament(Tournament tournament) {
-        this.tournament = tournament;
+        this.tournamentDecorator.setTournament(tournament);
     }
 
     public BorderPane loadMainWindow(){
@@ -34,23 +35,32 @@ public class Factory {
         return null;
     }
 
-    public void loadTournamentList(BorderPane pane){
-        TournamentListController controller = (TournamentListController) setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"));
+    public void loadTournamentList(BorderPane pane, FactoryDecorator factoryDecorator){
+        tournamentDecorator.setTournament(null);
+        TournamentListController controller = (TournamentListController) setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"), factoryDecorator);
     }
 
     //Can be used to Open new Scene in same Stage.
     //This way possible to later give object to Controller
-    public void loadParticipantFormular(BorderPane pane) {
-        setCenterOfBorderPane(pane, getClass().getResource("participantAddFormular/participantFormular.fxml"));
+    public void loadParticipantFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
+        setCenterOfBorderPane(pane, getClass().getResource("participantAddFormular/participantFormular.fxml"), factoryDecorator);
     }
 
-    private FXController setCenterOfBorderPane(BorderPane pane, URL location) {
+    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 {
             FXMLLoader loader = new FXMLLoader(location);
             pane.setCenter(loader.load());
             controller = loader.getController();
-            controller.setup(tournament, fileIO, this, pane);
+            controller.setup(tournamentDecorator, fileIO, factoryDecorator, pane);
             controller.loadContent();
         } catch (IOException e) {
             e.printStackTrace();

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

@@ -0,0 +1,69 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Pane;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FactoryDecorator implements IsObservable{
+    private Factory factory;
+    private FileIO fileIO;
+    private Pane pane;
+    private List<IsObserver> listener = new ArrayList<>();
+
+    public FactoryDecorator(FileIO fileIO, Factory factory, Pane pane){
+        setFactory(factory);
+        setFileIO(fileIO);
+        setPane(pane);
+    }
+
+    public void setFileIO(FileIO fileIO) {
+        this.fileIO = fileIO;
+    }
+
+    public void setFactory(Factory factory) {
+        this.factory = factory;
+    }
+
+    public void setPane(Pane pane) {
+        this.pane = pane;
+    }
+
+    @Override
+    public void addListener(IsObserver observer) {
+        listener.add(observer);
+    }
+
+    @Override
+    public void removeListener(IsObserver observer) {
+        listener.remove(observer);
+    }
+
+    public void openTournament(FileIO.TournamentFile tournamentFile){
+        try {
+            factory.setTournament(fileIO.loadTournament(tournamentFile));
+            factory.loadGameScheduler((BorderPane) pane, this);
+            informListener();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        } //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) {
+            observer.update();
+        }
+    }
+}

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

@@ -1,6 +1,9 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
 import java.io.*;
 import java.net.URI;
 import java.util.ArrayList;
@@ -34,13 +37,22 @@ public class FileIO {
         }
     }
 
-    public List<TournamentFile> getList() {
+    public ObservableList<TournamentFile> getList() {
         logger.fine("Creating a List out of all Files in the save directory and returning it");
-        List<TournamentFile> tournaments = new ArrayList<>();
+        ObservableList<TournamentFile> tournamentFiles = FXCollections.observableArrayList();
         for(File tournament : saves.listFiles()){
-            tournaments.add(new TournamentFile(tournament.toURI()));
+            tournamentFiles.add(new TournamentFile(tournament.toURI()));
         }
-        return tournaments;
+        return tournamentFiles;
+    }
+
+    public boolean tournamentExists(String name){
+        for(TournamentFile file : getList()) {
+            if(file.toString().toLowerCase().equals(name.toLowerCase())){
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -86,7 +98,7 @@ public class FileIO {
         return tournament;
     }
 
-    public void saveTournament(Tournament tournament) {
+    public void saveTournament(Tournament tournament) throws IOException {
         if (tournament == null) {
             logger.warning("Given tournament file is empty");
             throw new IllegalArgumentException("Null tournament received");
@@ -95,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());
@@ -124,9 +136,13 @@ public class FileIO {
         }
 
         public String toString(){
-            String name = getName();
-            return name.split("\\.")[0];
+            return getName().split("\\.")[0];
         }
 
     }
+
+    public void deleteTournament(File tournamentFile) throws IOException {
+        throw new UnsupportedOperationException("Method deleteTournament not implemented yet.");
+    }
+
 }

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/IsObservable.java

@@ -0,0 +1,19 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+/**
+ * Most basic interface for observing an object
+ * @author bles
+ *
+ */
+public interface IsObservable {
+    /**
+     * Add an observer that listens for updates
+     * @param observer
+     */
+    void addListener(IsObserver observer);
+    /**
+     * Remove an observer from the list
+     * @param observer
+     */
+    void removeListener(IsObserver observer);
+}

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

@@ -0,0 +1,14 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+/**
+ * Most basic interface for beeing an observer
+ * @author bles
+ *
+ */
+public interface IsObserver {
+    /**
+     * This method is always called when an observed object
+     * changes
+     */
+    void update();
+}

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,40 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-import java.util.Date;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 public class Player extends Person implements Participant{
 
-    private Date dateOfBirth;
+    private LocalDate 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 LocalDate getDateOfBirth() {
         return dateOfBirth;
     }
 
-    public void setDateOfBirth(Date dateOfBirth) {
-        this.dateOfBirth = dateOfBirth;
+    public String getFormatedDateOfBirth(){
+        try{
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy");
+            return dateOfBirth.format(formatter);
+        } catch (Exception e) {
+           //todo handle and logging
+            return "";
+        }
+    }
+
+    public void setDateOfBirth(String dateOfBirth) {
+        String[] date = dateOfBirth.split("\\.");
+        this.dateOfBirth = LocalDate.of(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

@@ -1,12 +1,53 @@
 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 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.
+        }
 
-    public Tournament(String name){
         setName(name);
+        setType(type);
+        participants = new ArrayList<>();
+    }
+
+    public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
+        for(Participant participant : participants){
+            if(participant.equals(newParticipant)){
+                participants.remove(participant);
+            }
+        }
+        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");
+        }
+        participants.remove(participant);
+    }
+
+    public ObservableList<Participant> getParticipants() {
+        ObservableList<Participant> participantsObservable = FXCollections.observableArrayList();
+        participantsObservable.addAll(participants);
+        return participantsObservable;
     }
 
     public String getName() {
@@ -16,4 +57,68 @@ public class Tournament implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public enum Type {
+        KO("KO-System"), GROUPS("Gruppenspiele");
+
+        private String name;
+
+        private Type(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        public static ObservableList<Type> getObservableList(){
+            ObservableList<Type> items = FXCollections.observableArrayList();
+            items.addAll(values());
+            return items;
+        }
+    }
+
+    public class InvalidTypeException extends Exception {
+        public InvalidTypeException() {
+            super();
+        }
+
+        public InvalidTypeException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    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

@@ -0,0 +1,109 @@
+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{
+    private Tournament tournament;
+    private FileIO fileIO;
+    private List<IsObserver> listener = new ArrayList<>();
+
+    public TournamentDecorator(FileIO fileIO){
+        setFileIO(fileIO);
+        addListener(new IsObserver() {
+            @Override
+            public void update() {
+                if(tournament != null){
+                    saveTournament();
+                }
+            }
+        });
+    }
+
+    public void setFileIO(FileIO fileIO) {
+        this.fileIO = fileIO;
+    }
+
+    public void setTournament(Tournament tournament) {
+        this.tournament = tournament;
+    }
+
+    public Tournament getTournament() {
+        return tournament;
+    }
+
+    @Override
+    public void addListener(IsObserver observer) {
+        listener.add(observer);
+    }
+
+    @Override
+    public void removeListener(IsObserver observer) {
+        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.");
+            return; //TODO handle and logging
+        }
+        try {
+            Tournament tournament = new Tournament(name, type);
+            fileIO.saveTournament(tournament);
+            informListener();
+        } catch (InvalidNameException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (Tournament.InvalidTypeException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (IOException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
+    public void deleteTournament(FileIO.TournamentFile tournamentFile){
+        try {
+            fileIO.deleteTournament(tournamentFile);
+            informListener();
+        } catch (IOException e) {
+            e.printStackTrace();  //TODO handle and logging
+        }
+    }
+
+    public void savePlayer(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 deleteParticipant(Participant participant){
+        try {
+            tournament.removeParticipant(participant);
+            informListener();
+        } catch (Tournament.ParticipantNotExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
+    public void informListener() {
+        for(IsObserver observer : listener) {
+            observer.update();
+        }
+    }
+}

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

@@ -1,7 +1,9 @@
 package ch.zhaw.projekt2.turnierverwaltung.main;
 
 import ch.zhaw.projekt2.turnierverwaltung.Factory;
+import ch.zhaw.projekt2.turnierverwaltung.FactoryDecorator;
 import ch.zhaw.projekt2.turnierverwaltung.FileIO;
+import ch.zhaw.projekt2.turnierverwaltung.TournamentDecorator;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
@@ -14,13 +16,16 @@ import java.io.IOException;
 
 public class MainWindow extends Application {
     private FileIO fileIO = new FileIO(System.getProperty("user.dir") + "/tournierverwaltung_angrynerds");
-    private Factory factory = new Factory(fileIO); //TODO make it private!
+    private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO);
+    private Factory factory = new Factory(fileIO, tournamentDecorator); //TODO make it private!
+    private FactoryDecorator factoryDecorator;
 
     @Override
     public void start(Stage primaryStage) throws Exception {
 
         BorderPane pane = factory.loadMainWindow();
-        factory.loadTournamentList(pane);
+        factoryDecorator = new FactoryDecorator(fileIO, factory, pane);
+        factory.loadTournamentList(pane, factoryDecorator);
 
 
         Scene scene = new Scene(pane);

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,8 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.Participant;
+import ch.zhaw.projekt2.turnierverwaltung.Player;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -38,13 +40,17 @@ public class ParticipantFormularController extends FXController {
     private Label newParticipantFormularTitle;
 
     @FXML
-    private Button openBtn;
+    private Button closeBtn;
+
+    @FXML
+    private Button deleteBtn;
+
 
     @FXML
     private Label participantListTitle;
 
     @FXML
-    private ListView<?> participantListView;
+    private ListView<Participant> participantListView;
 
     @FXML
     private Label participantNameLabel;
@@ -62,8 +68,12 @@ public class ParticipantFormularController extends FXController {
     private Button saveBtn;
 
     @FXML
-    void addParticipant(ActionEvent event) {
-
+    void changedSelection(MouseEvent event){
+        Player participant = (Player) participantListView.getSelectionModel().getSelectedItems().get(0);
+        participantNameTextField.setText(participant.getName());
+        firstNameTextField.setText(participant.getFirstName());
+        phoneNumberTextField.setText(participant.getPhoneNumber());
+        birthDateTextField.setText(participant.getFormatedDateOfBirth());
     }
 
     @FXML
@@ -72,12 +82,25 @@ public class ParticipantFormularController extends FXController {
     }
 
     @FXML
-    void save(ActionEvent event) {
+    void saveParticipant(ActionEvent event) {
+        getTournamentDecorator().savePlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText());
+    }
+
+
+    @FXML
+    void delete(ActionEvent event) {
+        System.out.println("delete");
+        Participant participant = participantListView.getSelectionModel().getSelectedItems().get(0);
+        getTournamentDecorator().deleteParticipant(participant);
+    }
+
+    @FXML
+    void close(ActionEvent event) {
 
     }
 
     @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/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/AlertDelete.java

@@ -0,0 +1,34 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
+
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
+
+import java.io.IOException;
+
+public class AlertDelete extends Alert {
+    ButtonType yesButton = new ButtonType("Ja", ButtonBar.ButtonData.YES);
+    ButtonType noButton = new ButtonType("Nein", ButtonBar.ButtonData.NO);
+    Boolean result;
+
+    public AlertDelete(String name){
+        super(Alert.AlertType.WARNING);
+        setTitle("Entfernen");
+        setHeaderText("Turnier entfernen?");
+        setContentText("Sind Sie sicher, dass sie das Turnier " + name + " entfernen wollen?\n" +
+                "Nach diesem Vorgang kann es nicht wiederhergestellt werden.");
+        getButtonTypes().setAll(yesButton, noButton);
+    }
+
+    public boolean showAndGetResult() {
+        result = false;
+        showAndWait().ifPresent(type -> {
+            if (type == yesButton) {
+                result = true;
+            }
+        });
+        return result;
+    }
+
+
+}

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/TournamentListController.java

@@ -0,0 +1,83 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.FileIO;
+import ch.zhaw.projekt2.turnierverwaltung.Tournament;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.GridPane;
+
+import java.io.File;
+import java.io.IOException;
+
+public class TournamentListController extends FXController {
+
+    @FXML
+    public void initialize(){
+        modusChoiceBox.setItems(Tournament.Type.getObservableList());
+    }
+
+    @FXML
+    private Button createBtn;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private ChoiceBox<Tournament.Type> modusChoiceBox;
+
+    @FXML
+    private Label newTournamentFormularTitle;
+
+    @FXML
+    private Button openBtn;
+
+    @FXML
+    private Button deleteBtn;
+
+    @FXML
+    private Label tournamentListTitle;
+
+    @FXML
+    private ListView<FileIO.TournamentFile> tournamentListView;
+
+    @FXML
+    private Label tournamentModLabel;
+
+    @FXML
+    private Label tournamentNameLabel;
+
+    @FXML
+    private TextField tournamentNameField;
+
+    @FXML
+    void createTournament(ActionEvent event) {
+        getTournamentDecorator().createTournament(tournamentNameField.getText(), modusChoiceBox.getValue());
+    }
+
+    @FXML
+    void openTournament(ActionEvent event) {
+        FileIO.TournamentFile tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
+        getFactoryDecorator().openTournament(tournamentFile);
+    }
+
+    @FXML
+    void deleteTournament(ActionEvent event) {
+        FileIO.TournamentFile tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
+        AlertDelete alert = new AlertDelete(tournamentFile.toString());
+        if(alert.showAndGetResult()){
+           getTournamentDecorator().deleteTournament(tournamentFile);
+        }
+    }
+
+    @Override
+    public void loadContent() {
+        tournamentListView.setItems(getFileIO().getList());
+        tournamentNameField.clear();
+    }
+}
+

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentListController.java

@@ -1,79 +0,0 @@
-package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
-
-import ch.zhaw.projekt2.turnierverwaltung.FXController;
-import ch.zhaw.projekt2.turnierverwaltung.Factory;
-import ch.zhaw.projekt2.turnierverwaltung.FileIO;
-import ch.zhaw.projekt2.turnierverwaltung.Tournament;
-import ch.zhaw.projekt2.turnierverwaltung.main.MainWindow;
-import javafx.beans.Observable;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListView;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.GridPane;
-
-import java.io.File;
-import java.io.IOException;
-
-public class TournamentListController extends FXController {
-
-    @FXML
-    private Button createBtn;
-
-    @FXML
-    private GridPane grid;
-
-    @FXML
-    private ChoiceBox<?> modusChoiceBox;
-
-    @FXML
-    private Label newTournamentFormularTitle;
-
-    @FXML
-    private Button openBtn;
-
-    @FXML
-    private Label tournierListTitle;
-
-    @FXML
-    private ListView<File> tournierListView;
-
-    @FXML
-    private Label tournierModLabel;
-
-    @FXML
-    private Label turnierNameLabel;
-
-    @FXML
-    void createTournament(ActionEvent event) {
-
-    }
-
-    @FXML
-    void openTournament(ActionEvent event) {
-        try {
-            File tournamentFile = tournierListView.getSelectionModel().getSelectedItems().get(0);
-            getFactory().setTournament(getFileIO().loadTournament(tournamentFile));
-            getFactory().loadParticipantFormular((BorderPane) getPane());
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void loadContent() {
-        ObservableList<File> tournamentFiles = FXCollections.observableArrayList();
-        for(File tournament : getFileIO().getList()){
-            tournamentFiles.add(tournament);
-        }
-        tournierListView.setItems(tournamentFiles);
-    }
-}
-

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

@@ -1,15 +1,10 @@
 <?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.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 +12,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>
@@ -29,19 +24,23 @@
                   <Insets bottom="20.0" />
                </VBox.margin>
             </Label>
-            <ListView fx:id="participantListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+            <ListView fx:id="participantListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                <VBox.margin>
                   <Insets />
                </VBox.margin>
             </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="closeBtn" mnemonicParsing="false" onAction="#close" text="Schliessen">
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin>
+                  </Button>
+                  <Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#delete" text="Löschen">
                      <HBox.margin>
                         <Insets right="40.0" />
                      </HBox.margin>
                   </Button>
-                  <Button fx:id="openBtn" mnemonicParsing="false" text="Bearbeiten" />
                </children>
             </HBox>
          </children>
@@ -56,7 +55,7 @@
       </Separator>
       <VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
-            <Label fx:id="newParticipantFormularTitle" text="Neuer Teilnehmer">
+            <Label fx:id="newParticipantFormularTitle" text="Teilnehmer ändern/erstellen">
                <font>
                   <Font name="System Bold" size="21.0" />
                </font>
@@ -100,7 +99,7 @@
                </children>
             </GridPane>
             <Separator prefWidth="200.0" />
-            <Button fx:id="addBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#addParticipant" text="Erstellen" VBox.vgrow="ALWAYS">
+            <Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#saveParticipant" text="Speichern" VBox.vgrow="ALWAYS">
                <VBox.margin>
                   <Insets bottom="10.0" top="30.0" />
                </VBox.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

@@ -1,24 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ChoiceBox?>
-<?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?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.TournamentListController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.TournamentListController">
     <children>
         <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
             <children>
-                <Label fx:id="tournierListTitle" text="Bestehende Turniere">
+                <Label fx:id="tournamentListTitle" text="Bestehende Turniere">
                     <font>
                         <Font name="System Bold" size="21.0" />
                     </font>
@@ -26,16 +17,26 @@
                         <Insets bottom="20.0" />
                     </VBox.margin>
                 </Label>
-                <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                <ListView fx:id="tournamentListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                     <VBox.margin>
                         <Insets />
                     </VBox.margin>
                 </ListView>
-                <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournament" text="Öffnen">
-                    <VBox.margin>
-                        <Insets bottom="20.0" top="40.0" />
-                    </VBox.margin>
-                </Button>
+            <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">
+                     <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>
             <HBox.margin>
                 <Insets left="40.0" />
@@ -66,17 +67,17 @@
                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                     </rowConstraints>
                     <children>
-                        <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
+                        <Label fx:id="tournamentNameLabel" styleClass="lableGrid" text="Turnier Name:">
                             <GridPane.margin>
                                 <Insets />
                             </GridPane.margin>
                         </Label>
-                        <TextField styleClass="inputGrid" GridPane.columnIndex="1">
+                        <TextField fx:id="tournamentNameField" styleClass="inputGrid" GridPane.columnIndex="1">
                             <GridPane.margin>
                                 <Insets />
                             </GridPane.margin>
                         </TextField>
-                        <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
+                        <Label fx:id="tournamentModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
                             <GridPane.margin>
                                 <Insets />
                             </GridPane.margin>

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

@@ -82,19 +82,19 @@ class FileIOTest {
 
         @Test
         void loadTournamentNotExisting(){
-            io = new FileIO(mainDir);
-            assertThrows(FileNotFoundException.class, () -> io.loadTournament(new File("Not-existing-File")));
+            File file = new File("Not-existing-File");
+            assertFalse(file.exists());
+            assertThrows(FileNotFoundException.class, () -> io.loadTournament(file));
+            assertFalse(file.exists());
         }
 
         @Test
         void loadTournamentEmpty(){
-            io = new FileIO(mainDir);
             assertThrows(IOException.class, () -> io.loadTournament(new File(mainDir + "/saves/empty.txt")));
         }
 
         @Test
         void loadTournamentFileNull(){
-            io = new FileIO(mainDir);
             assertThrows(IllegalArgumentException.class, () -> io.loadTournament(null));
         }
     }
@@ -108,15 +108,14 @@ class FileIOTest {
         }
 
         @Test
-        void saveTournament() throws IOException {
-            Tournament tournament = new Tournament("test1");
+        void saveTournament() throws IOException, InvalidNameException, Tournament.InvalidTypeException {
+            Tournament tournament = null;
+            tournament = new Tournament("test1", Tournament.Type.KO);
             io.saveTournament(tournament);
             File file = new File(mainDir + "/saves/test1.txt");
-            if(file.exists()){
-                file.delete();
-            } else {
-                fail();
-            }
+            assertTrue(file.exists());
+            assertTrue(file.delete());
+            assertFalse(file.exists());
         }
 
         @Test
@@ -124,4 +123,35 @@ class FileIOTest {
             assertThrows(IllegalArgumentException.class, () -> io.saveTournament(null));
         }
     }
+
+    @Nested
+    class Delete{
+        @BeforeEach
+        void setup(){
+            mainDir = RESOURCES_DIR + "FileIODelete";
+            io = new FileIO(mainDir);
+        }
+
+        @Test
+        void deleteTournament() throws IOException {
+            File file = new File(mainDir + "/saves/test1.txt");
+            file.createNewFile();
+            assertTrue(file.exists());
+            io.deleteTournament(file);
+            assertFalse(file.exists());
+        }
+
+        @Test
+        void deleteTournamentNotExisting() throws IOException {
+            File file = new File("Not-existing-File");
+            assertFalse(file.exists());
+            assertThrows(FileNotFoundException.class, () -> io.deleteTournament(file));
+            assertFalse(file.exists());
+        }
+
+        @Test
+        void deleteTournamentNull(){
+            assertThrows(IllegalArgumentException.class, () -> io.deleteTournament(null));
+        }
+    }
 }