extend dictionary

Develop footer

app/build.gradle

@@ -26,6 +26,8 @@ dependencies {
     // Use JUnit Jupiter for testing.
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
 
+    testImplementation 'org.mockito:mockito-core:4.3.+'
+
     // This dependency is used by the application.
     implementation 'com.google.guava:guava:30.1.1-jre'
 
@@ -37,7 +39,9 @@ application {
     mainClass = 'ch.zhaw.projekt2.turnierverwaltung.App'
 }
 
-tasks.named('test') {
+test {
     // Use JUnit Platform for unit tests.
     useJUnitPlatform()
+
+
 }

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

@@ -6,8 +6,18 @@ package ch.zhaw.projekt2.turnierverwaltung;
 import ch.zhaw.projekt2.turnierverwaltung.main.MainWindow;
 import javafx.application.Application;
 
+import java.io.IOException;
+
 public class App {
     public static void main(String[] args) {
+        try {
+            new LogConfiguration(System.getProperty("user.dir") + System.getProperty("file.separator") + "tournierverwaltung_angrynerds",
+                    "ch" + System.getProperty("file.separator") + "zhaw" + System.getProperty("file.separator") + "projekt2" + System.getProperty("file.separator") +
+                    "turnierverwaltung" + System.getProperty("file.separator") + "logging" + System.getProperty("file.separator") + "log.properties");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
         Application.launch(MainWindow.class,args);
     }
 }

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

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

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

@@ -1,32 +1,42 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-import ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.TournamentListController;
+import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController;
+import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameDecorator;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.layout.BorderPane;
+import javafx.geometry.Insets;
+import javafx.scene.control.Label;
+import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
 
 import java.io.IOException;
-import java.net.URL;
 
 public class Factory {
-    private Tournament tournament;
+    private TournamentDecorator tournamentDecorator;
     private FileIO fileIO;
+    private static LanguageConfigurator languageConfigurator;
 
-    public Factory(FileIO fileIO){
+    public Factory(FileIO fileIO, TournamentDecorator tournamentDecorator, LanguageConfigurator languageConfigurator) {
         this.fileIO = fileIO;
+        this.tournamentDecorator = tournamentDecorator;
+        this.languageConfigurator = languageConfigurator;
     }
 
-    public Tournament getTournament() {
+    public TournamentDecorator getTournamentDecorator() {
-        return tournament;
+        return tournamentDecorator;
     }
 
     public void setTournament(Tournament tournament) {
-        this.tournament = tournament;
+        this.tournamentDecorator.setTournament(tournament);
     }
 
-    public BorderPane loadMainWindow(){
+    public BorderPane loadMainWindow() {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml"));
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("MainWindow.fxml"));
         try {
-            return loader.load();
+            BorderPane pane = loader.load();
+            FXController controller = loader.getController();
+            controller.setup(languageConfigurator);
+            return pane;
         } catch (IOException e) {
             e.printStackTrace();
             //TODO handle and logging
@@ -34,32 +44,124 @@ public class Factory {
         return null;
     }
 
-    public void loadTournamentList(BorderPane pane){
+    public void loadAllViews(FactoryDecorator factoryDecorator, BorderPane pane){
-        TournamentListController controller = (TournamentListController) setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"));
+        for(View view : View.values()){
+            try {
+                view.loadView(tournamentDecorator, fileIO, factoryDecorator, pane);
+            } catch (IOException e) {
+                e.printStackTrace();
+                //TODO Handle and logging.
+            }
+        }
+    }
+
+    public void showTournamentList(BorderPane pane, FactoryDecorator factoryDecorator) {
+        tournamentDecorator.setTournament(null);
+        setCenterOfBorderPane(pane, View.tournamentList);
     }
 
     //Can be used to Open new Scene in same Stage.
     //This way possible to later give object to Controller
-    public void loadParticipantFormular(BorderPane pane) {
+    public void showParticipantFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
-        setCenterOfBorderPane(pane, getClass().getResource("participantAddFormular/participantFormular.fxml"));
+        setCenterOfBorderPane(pane, View.participantFormular);
     }
 
-    private FXController setCenterOfBorderPane(BorderPane pane, URL location) {
+    public void showPlacesFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
+        setCenterOfBorderPane(pane, View.placesFormular);
+    }
+
+    public void showGameScheduler(BorderPane pane, FactoryDecorator factoryDecorator) {
+        setCenterOfBorderPane(pane, View.gameScheduler);
+    }
+
+    private void setCenterOfBorderPane(BorderPane pane, View view) {
         FXController controller = null;
+        pane.setCenter(view.getPane());
+        resetFooter(pane, true);
+    }
+
+
+    public GameController loadGameView(VBox box, GameDecorator gameDecorator, FactoryDecorator factoryDecorator) {
         try {
-            FXMLLoader loader = new FXMLLoader(location);
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("gameScheduleView/Game.fxml"));
-            pane.setCenter(loader.load());
+            box.getChildren().add(loader.load());
-            controller = loader.getController();
+            GameController controller = loader.getController();
-            controller.setup(tournament, fileIO, this, pane);
+            controller.setup(tournamentDecorator, fileIO, factoryDecorator, box, gameDecorator, languageConfigurator);
-            controller.loadContent();
+            return controller;
         } catch (IOException e) {
             e.printStackTrace();
-            //TODO handle and logging?
+            //TODO LOGGER
         }
-        return controller;
+        return null;
     }
 
+    public void printMessageToFooter(BorderPane pane, String msg, boolean error) {
+        VBox bottom = (VBox) pane.getBottom();
+        Label label = new Label();
+        VBox innerVbox;
+        label.setText(msg);
+
+        if (error) {
+            innerVbox = (VBox) bottom.getChildren().get(0);
+            resetFooter(pane, true);
+            label.setTextFill(Color.RED);
+            label.setFont(new Font(20));
+            innerVbox.setBorder(new Border(new BorderStroke(Color.valueOf("#FF0000"), BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
+            innerVbox.getChildren().add(label);
+
+        } else {
+            innerVbox = (VBox) bottom.getChildren().get(1);
+            resetFooter(pane,false);
+            label.setTextFill(Color.GREEN);
+            label.setFont(new Font(10));
+            label.setPadding(new Insets(0,10,0,0));
+            innerVbox.getChildren().add(label);
+
+        }
 
 
+    }
+
+    public void resetFooter(BorderPane pane,boolean error) {
+        VBox bottom = (VBox) pane.getBottom();
+        VBox vBox;
+        if (error) {
+            vBox = (VBox) bottom.getChildren().get(0);
+        } else {
+            vBox = (VBox) bottom.getChildren().get(1);
+        }
+        vBox.getChildren().clear();
+        vBox.setBorder(null);
+    }
+
+    public LanguageConfigurator getLanguageConfigurator() {
+        return languageConfigurator;
+    }
+
+    public enum View {
+        tournamentList("tournamentList/tournamentList.fxml"),
+        participantFormular("participantAddFormular/participantFormular.fxml"),
+        placesFormular("placesAddFormular/PlacesFormular.fxml"),
+        gameScheduler("gameScheduleView/GameSchedule.fxml");
+
+        private String fxmlFileName;
+        private Pane pane;
+
+        private View(String fxmlFileName) {
+            this.fxmlFileName = fxmlFileName;
+        }
+
+        public Pane getPane() {
+            return pane;
+        }
+
+        public void loadView(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, BorderPane borderPane) throws IOException {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(fxmlFileName));
+            this.pane = loader.load();
+            FXController controller = loader.getController();
+            controller.setup(tournamentDecorator, fileIO, factoryDecorator, borderPane, languageConfigurator);
+        }
+
+    }
 
 }

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

@@ -0,0 +1,182 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController;
+import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameDecorator;
+import javafx.geometry.Pos;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+import javafx.scene.shape.Line;
+
+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));
+            openScheduleView();
+            clearMessage(false);
+        } catch (IOException | ClassNotFoundException e) {
+            e.printStackTrace();
+            String msg = factory.getLanguageConfigurator().getSelectedLanguage("IOException");
+            printMessageToFooter(msg, true);
+        }  //TODO handle and logging
+    }
+
+    public void openTournamentList() {
+        factory.showTournamentList((BorderPane) pane, this);
+        informListener();
+    }
+
+    public void openParticipantFormular() {
+        factory.showParticipantFormular((BorderPane) pane, this);
+        informListener();
+    }
+
+    public void openPlacesFormular() {
+        factory.showPlacesFormular((BorderPane) pane, this);
+        informListener();
+    }
+
+    public void openScheduleView() {
+        factory.showGameScheduler((BorderPane) pane, this);
+        informListener();
+    }
+
+    public void loadGameList(HBox hBoxCenter, TournamentDecorator tournamentDecorator, boolean treeView) {
+        hBoxCenter.getChildren().clear();
+
+        if(tournamentDecorator.getTournament() == null){
+            return;
+        }
+
+        List<List<Game>> gameList = tournamentDecorator.getTournament().getGameList();
+
+        List<GameDecorator> gameDecoratorsList = new ArrayList<>();
+        double gameBoxHeight = 0;
+        double spacingFactor = 0;
+        for (int i = 0; i < gameList.size(); i++) {
+            List<GameDecorator> newGameDecoratorsList = new ArrayList<>();
+            VBox vBox = new VBox();
+            if(treeView){
+                vBox.setAlignment(Pos.CENTER);
+                vBox.setSpacing(gameBoxHeight * spacingFactor);
+            } else {
+                vBox.setAlignment(Pos.TOP_CENTER);
+            }
+            spacingFactor = spacingFactor * 2 + 1;
+            for (int j = 0; j < gameList.get(i).size(); j++) {
+                GameDecorator gameDecorator = new GameDecorator(gameList.get(i).get(j));
+                newGameDecoratorsList.add(gameDecorator);
+                GameController gameController = openGameView(vBox,gameDecorator);
+                if(i>0){
+                    gameController.addListener(gameDecoratorsList.get(j*2));
+                    gameController.addListener(gameDecoratorsList.get(j*2+1));
+                } else if(gameBoxHeight == 0) {
+                    gameBoxHeight = gameController.getGameBoxHeigth();
+                }
+                gameDecorator.addListener(new IsObserver() {
+                    @Override
+                    public void update() {
+                        tournamentDecorator.saveTournament();
+                    }
+                });
+                gameController.loadContent();
+            }
+            hBoxCenter.getChildren().add(vBox);
+            if(treeView){
+                if(i+1 < gameList.size())
+                hBoxCenter.getChildren().add(drawLines(vBox, gameBoxHeight, 30));
+            }
+            gameDecoratorsList = newGameDecoratorsList;
+        }
+    }
+
+    public VBox drawLines(VBox gameVBox, double gameBoxHeight, double lineLength){
+        VBox completeLineVBox = new VBox();
+        completeLineVBox.setAlignment(Pos.CENTER_LEFT);
+        double lineSpacing = gameVBox.getSpacing() + gameBoxHeight - 1;
+        completeLineVBox.setSpacing(lineSpacing);
+        for(int i = 0; i < gameVBox.getChildren().size(); i+=2){
+            HBox lineBox = new HBox();
+            lineBox.setAlignment(Pos.CENTER);
+
+            //add Lines from left Game to center
+            VBox vBox = new VBox();
+            vBox.setSpacing(lineSpacing);
+            vBox.getChildren().add(new Line(0,0,lineLength,0));
+            vBox.getChildren().add(new Line(0,0,lineLength,0));
+            lineBox.getChildren().add(vBox);
+
+
+            //add vertical line
+            lineBox.getChildren().add(new Line(0, 0, 0, lineSpacing));
+
+            //add line to right game
+            lineBox.getChildren().add(new Line(0, 0, lineLength, 0));
+
+            completeLineVBox.getChildren().add(lineBox);
+
+
+        }
+        return completeLineVBox;
+    }
+
+    public GameController openGameView(VBox vBox, GameDecorator gameDecorator) {
+        return factory.loadGameView(vBox ,gameDecorator, this);
+    }
+
+    public void printMessageToFooter(String msg, boolean error) {
+        factory.printMessageToFooter((BorderPane) pane,msg,error);
+    }
+
+    public void clearMessage(boolean error){
+        factory.resetFooter((BorderPane) pane, error);
+    }
+
+    public LanguageConfigurator getLanguageConfigurator() {
+        return factory.getLanguageConfigurator();
+    }
+
+    public void informListener() {
+        for(IsObserver observer : listener) {
+            observer.update();
+        }
+    }
+}

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

@@ -1,21 +1,27 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
 import java.io.*;
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.logging.Logger;
 
-
+/**
+ * Class in Charge of Reading and Writing files
+ */
 public class FileIO {
     private File mainDir;
     private File saves;
 
-    private static final Logger logger = Logger.getLogger(FileIO.class.getName());
+    private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
-
 
+    /**
+     * Constructor initiates the Directory and creates a save folder if not already existing.
+     *
+     * @param saveLocation the directory in which the save Files will be saved
+     */
     public FileIO(String saveLocation) {
         this.mainDir = new File(saveLocation);
         if (!mainDir.exists()) {
@@ -34,22 +40,48 @@ public class FileIO {
         }
     }
 
-    public List<TournamentFile> getList() {
+
+    /**
+     * Returns a list with all save Files that are located inside the save folder.
+     *
+     * @return List with all containing save Files
+     */
+    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()){
+        for (File tournament : saves.listFiles()) {
-            tournaments.add(new TournamentFile(tournament.toURI()));
+            tournamentFiles.add(new TournamentFile(tournament.toURI()));
         }
-        return tournaments;
+        return tournamentFiles;
     }
 
     /**
-     * @param tournamentFile
+     * Method to check if a tournament with the existing name already exists.
-     * @return
+     * @param name that is being checked
-     * @throws ClassNotFoundException
+     * @return true if the name exists already false if the name is unique
-     * @throws IOException            File not found or not readable.
      */
-    public Tournament loadTournament(File tournamentFile) throws IOException, ClassNotFoundException {
+    public boolean tournamentExists(String name) {
+        logger.finer("checking for duplicate name in tournament List");
+        for (TournamentFile file : getList()) {
+            if (file.toString().toLowerCase().equals(name.toLowerCase())) {
+                logger.fine(name + " is an already existing name in the list");
+                return true;
+            }
+        }
+        logger.fine(name + " is an unique name in the list");
+        return false;
+    }
+
+    /**
+     * Loads and returns a tournament from a given File which contains the serialiazed tournament.
+     *
+     * @param tournamentFile The tournament file where the data should be read from.
+     * @return Tournament that is returned when succefully being read from the file
+     * @throws ClassNotFoundException No definition for the class with the specified name could be found
+     * @throws IOException            File not readable
+     * @throws FileNotFoundException  File not found
+     */
+    public synchronized Tournament loadTournament(File tournamentFile) throws IOException, ClassNotFoundException, FileNotFoundException {
         if (tournamentFile == null) {
             logger.warning("Given tournament file is empty");
             throw new IllegalArgumentException("Tournament File is null");
@@ -64,52 +96,64 @@ public class FileIO {
             logger.finer("Starting to read tournament File");
             tournament = (Tournament) in.readObject();
         } catch (FileNotFoundException e) {
-            logger.severe("Could not find tournament File");
+            logger.severe("Could not find tournament File" + e);
             throw e;
         } catch (IOException e) {
             logger.severe("Failed to read File" + tournamentFile.getName());
-            throw new IOException("Error while reading File",e);
+            throw new IOException("Error while reading File", e);
         } catch (ClassNotFoundException e) {
-            logger.severe("No definition for the class with the specified name could be found");
+            logger.severe("No definition for the class with the specified name could be found" + e);
-            throw new ClassNotFoundException("No definition for the class with the specified name could be found",e);
+            throw new ClassNotFoundException("No definition for the class with the specified name could be found", e);
         } finally {
             if (in != null) {
                 try {
                     logger.finer("Trying to close input stream");
                     in.close();
                 } catch (IOException e) {
-                    logger.severe("Failed to close input stream");
+                    logger.severe("Failed to close input stream" + e);
-                    throw new IOException("Error while closing input stream",e);
+                    throw new IOException("Error while closing input stream", e);
                 }
             }
         }
         return tournament;
     }
 
-    public void saveTournament(Tournament tournament) {
+    /**
+     * Serializables and saves the receiving tournament file to a txt file.
+     *
+     * @param tournament the receiving tournament.
+     * @throws IOException           File not readable
+     * @throws FileNotFoundException File not found
+     */
+    public synchronized void saveTournament(Tournament tournament) throws IOException, FileNotFoundException {
         if (tournament == null) {
             logger.warning("Given tournament file is empty");
             throw new IllegalArgumentException("Null tournament received");
         }
+        logger.fine("Creates the Object for the path of the save file");
         File newSave = new File(saves, tournament.getName() + ".txt");
         ObjectOutputStream out = null;
 
         try {
+            logger.fine("creates or overwrites the new save FILE");
             newSave.createNewFile();
             out = new ObjectOutputStream(new FileOutputStream(newSave));
             out.writeObject(tournament);
-            System.out.println("Save File" + tournament.getName() + ".txt being saved to " + saves.getAbsolutePath());
+            System.out.println("Save File " + tournament.getName() + ".txt being saved to " + saves.getAbsolutePath());
 
         } catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
+            logger.severe("Could not find tournament File" + e);
+            throw e;
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            logger.severe("Failed to write File " + tournament.getName() + e);
+            throw new IOException("Error while writing File", e);
         } finally {
             if (out != null) {
                 try {
                     out.close();
                 } catch (IOException e) {
-                    throw new RuntimeException(e);
+                    logger.severe("Failed to close output stream" + e);
+                    throw new IOException("Error while closing output stream", e);
                 }
             }
 
@@ -117,16 +161,49 @@ public class FileIO {
 
     }
 
-    public class TournamentFile extends File{
+    /**
+     * Deletes the requested File in the directory
+     *
+     * @param tournamentFile the file that should be deleted
+     * @throws FileNotFoundException    File could not be deleted
+     * @throws IllegalArgumentException File is null
+     */
+    public void deleteTournament(File tournamentFile) throws FileNotFoundException {
+        if (tournamentFile == null) {
+            throw new IllegalArgumentException("Receiving file is null");
+        }
+        if (tournamentFile.delete()) {
+            logger.fine("deleted requested File");
+        } else {
+            logger.warning("Failed to delete requested File");
+            throw new FileNotFoundException("File deletion unsuccessful");
+        }
+    }
 
+    /**
+     * TournamentFile Class is in use to add missing functionality that is
+     */
+    public class TournamentFile extends File {
+
+        /**
+         * Only job the constructor got is to initialize it via its superclass. See java.io.File Documentation for more info.
+         *
+         * @param uri abstract pathname needed for its superclass to intialize the file accordingly.
+         */
         public TournamentFile(URI uri) {
             super(uri);
         }
 
-        public String toString(){
+        /**
-            String name = getName();
+         * Method overrides toString to return the names of the tournaments without having .txt endings.
-            return name.split("\\.")[0];
+         *
+         * @return String without a txt ending
+         */
+        @Override
+        public String toString() {
+            return getName().split("\\.")[0];
         }
 
     }
+
 }

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

@@ -1,16 +1,22 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public class Game {
+import java.io.Serializable;
-    private Participant participant1, Participant2;
-    private int points1, points2;
-    private Location location;
 
-    public Location getLocation() {
+public class Game implements Serializable {
-        return location;
+    private Participant participant1, participant2;
+    private int points1, points2;
+    private Place place;
+    private Game previousGame1, previousGame2;
+
+
+    public Game(Participant participant1, Participant participant2) {
+        this.participant1 = participant1;
+        this.participant2 = participant2;
     }
 
-    public void setLocation(Location location) {
+    public Game(Game previousGame1, Game previousGame2){
-        this.location = location;
+        this.previousGame1 = previousGame1;
+        this.previousGame2 = previousGame2;
     }
 
     public int getPoints1() {
@@ -37,11 +43,35 @@ public class Game {
         this.participant1 = participant1;
     }
 
-    public Participant getParticipant2() {
+    public void setParticipant2(Participant participant2) {
-        return Participant2;
+        this.participant2 = participant2;
     }
 
-    public void setParticipant2(Participant participant2) {
+    public Participant getParticipant2() {
-        Participant2 = participant2;
+        return participant2;
     }
+
+    public void setPlace(Place place) {
+        this.place = place;
+    }
+
+    public Place getPlace() {
+        return place;
+    }
+
+    public Participant getWinner(){
+        if(points1 > points2){
+            return participant1;
+        } else if(points2 > points1){
+            return participant2;
+        } else {
+            return null;
+        }
+    }
+
+    public void refreshParticipants(){
+        participant1 = previousGame1.getWinner();
+        participant2 = previousGame2.getWinner();
+    }
+
 }

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

@@ -0,0 +1,196 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import javafx.scene.control.Labeled;
+import javafx.scene.control.MenuItem;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class LanguageConfigurator {
+
+    private Language selectedLanguage;
+    private Map<String,String> germanDictionary;
+    private Map<String,String> englishDictionary;
+    private List<Labeled> labelList;
+    private List<MenuItem> menuItemList;
+
+    public LanguageConfigurator() {
+        selectedLanguage = Language.GERMAN;
+        labelList = new ArrayList<>();
+        menuItemList = new ArrayList<>();
+        germanDictionary = new HashMap<>();
+        englishDictionary = new HashMap<>();
+        setUpDictionaries();
+    }
+
+    private void setUpDictionaries() {
+        //Main
+        germanDictionary.put("menuItemLanguage","Sprache");
+        englishDictionary.put("menuItemLanguage","Language");
+        germanDictionary.put("closeBtn","Beenden");
+        englishDictionary.put("closeBtn","Close");
+        germanDictionary.put("mainTitle","Turnier Manager");
+        englishDictionary.put("mainTitle","Tournament Manager");
+        //Tournamentlist
+        germanDictionary.put("tournamentListTitle","Bestehende Turniere");
+        englishDictionary.put("tournamentListTitle","Existing tournaments");
+        germanDictionary.put("openBtn","Oeffnen");
+        englishDictionary.put("openBtn","Open");
+        germanDictionary.put("deleteBtn","Loeschen");
+        englishDictionary.put("deleteBtn","Delete");
+        germanDictionary.put("newTournamentFormularTitle","Neues Turnier erstellen");
+        englishDictionary.put("newTournamentFormularTitle","Create new tournament");
+        germanDictionary.put("tournamentNameLabel","Turnier Name:");
+        englishDictionary.put("tournamentNameLabel","Tournament Name:");
+        germanDictionary.put("tournamentModLabel","Turnier Modus:");
+        englishDictionary.put("tournamentModLabel","Tournament Mode:");
+        germanDictionary.put("createBtn","Erstellen");
+        englishDictionary.put("createBtn","Create");
+        //PlaceList
+        germanDictionary.put("placeListTitle","Hinzugefuegt");
+        englishDictionary.put("placeListTitle","Added");
+        germanDictionary.put("saveBtn","Speichern");
+        englishDictionary.put("saveBtn","Save");
+        germanDictionary.put("newPlaceTitle","Ort aendern/erstellen");
+        englishDictionary.put("newPlaceTitle","Create/Change Location");
+        germanDictionary.put("placeNameLabel","Ort:");
+        englishDictionary.put("placeNameLabel","Location:");
+        //GameSchedule
+        germanDictionary.put("treeView","Baumansicht");
+        englishDictionary.put("treeView","Treeview");
+        germanDictionary.put("createScheduleBtn","Spielplan erstellen");
+        englishDictionary.put("createScheduleBtn","Create game schedule");
+        germanDictionary.put("editParticipantBtn","Teilnehmer bearbeiten");
+        englishDictionary.put("editParticipantBtn","Edit Participants");
+        germanDictionary.put("editLocBtn","Orte bearbeiten");
+        englishDictionary.put("editLocBtn","Edit Locations");
+        germanDictionary.put("closeTournamentBtn","Turnier schliessen");
+        englishDictionary.put("closeTournamentBtn","Close tournament");
+        //ParticipantFormular
+        germanDictionary.put("participantListTitle","Hinzugefuegt");
+        englishDictionary.put("participantListTitle","Added");
+        germanDictionary.put("newParticipantFormularTitle","Teilnehmer aendern/erstellen");
+        englishDictionary.put("newParticipantFormularTitle","Change/Create Participant");
+        germanDictionary.put("participantNameLabel","Name:");
+        englishDictionary.put("participantNameLabel","Name:");
+        germanDictionary.put("firstNameLabel","Vorname:");
+        englishDictionary.put("firstNameLabel","First Name:");
+        germanDictionary.put("phoneNumberLabel","Telefon:");
+        englishDictionary.put("phoneNumberLabel","Phone:");
+        germanDictionary.put("birthDateLabel","Geb. Datum:");
+        englishDictionary.put("birthDateLabel","Birthdate:");
+        //Game
+        germanDictionary.put("locationLabel","Ort:");
+        englishDictionary.put("locationLabel","Location:");
+        //Error
+        germanDictionary.put("IOException","Fehler beim lesen der Datei");
+        englishDictionary.put("IOException","Could not read file");
+        germanDictionary.put("tournamentExists","Turniername vergeben");
+        englishDictionary.put("tournamentExists","Tournament exists already");
+        germanDictionary.put("invalidName","Name nicht gueltig");
+        englishDictionary.put("invalidName","Name not valid");
+        germanDictionary.put("invalidMode","Modus nicht gueltig");
+        englishDictionary.put("invalidMode","Mode not valid");
+        germanDictionary.put("numberParticipant","Anzahl Spieler muss mindestens 4 sein und eine Potenz von 2");
+        englishDictionary.put("numberParticipant","Number of players must be greater than 3 and power of 2");
+        germanDictionary.put("invalidPhone","Telefonnummer nicht gueltig");
+        englishDictionary.put("invalidPhone","Phonenumber not valid");
+        germanDictionary.put("invalidDate","Geburtsdatum nicht gueltig");
+        englishDictionary.put("invalidDate","Birthdate not valid");
+        germanDictionary.put("participantNotExist","Teilnehmer existiert nicht");
+        englishDictionary.put("participantNotExist","Participant does not exist");
+        germanDictionary.put("placeNotExist","Teilnehmer existiert nicht");
+        englishDictionary.put("placeNotExist","Participant does not exist");
+
+        //SaveMsg
+        germanDictionary.put("save","Zuletzt gespeichert: ");
+        englishDictionary.put("save","Last saved: ");
+
+        //Alert
+        germanDictionary.put("yes","Ja");
+        englishDictionary.put("yes","Yes");
+        germanDictionary.put("no","Nein");
+        englishDictionary.put("no","No");
+        germanDictionary.put("titleDelete","Entfernen");
+        englishDictionary.put("titleDelete","Remove");
+        germanDictionary.put("headerDelete","Turnier entfernen?");
+        englishDictionary.put("headerDelete","Delete Tournament?");
+        germanDictionary.put("contentDelete","Sind Sie sicher, dass sie das Turnier entfernen wollen?\nNach diesem Vorgang kann es nicht wiederhergestellt werden.");
+        englishDictionary.put("contentDelete","Are you shure you want to delete the tournament?\nAfter that there is no way to restore.");
+
+        germanDictionary.put("titleSchedule","Neu erstellen");
+        englishDictionary.put("titleSchedule","Create new");
+        germanDictionary.put("headerSchedule","Spielplan neu erstellen?");
+        englishDictionary.put("headerSchedule","Create new Schedule?");
+        germanDictionary.put("contentSchedule","Sind Sie sicher, dass Sie den Spielplan neu erstellen moechten?\nAlle Spielfortschritte gehen daraufhin verloren!");
+        englishDictionary.put("contentSchedule","Are you shure you want to create a new game schedule?\nAll results will be lost!");
+    }
+
+    public void translateGUI() {
+        String word = "";
+        for (Labeled label : labelList) {
+            switch (selectedLanguage) {
+                case GERMAN -> {
+                    word = germanDictionary.get(label.getId());
+                }
+                case ENGLISH -> {
+                    word = englishDictionary.get(label.getId());
+                }
+            }
+            if(word != null) {
+                label.setText(word);
+            } else {
+                //TODO LOG
+            }
+        }
+
+        for (MenuItem item : menuItemList) {
+            switch (selectedLanguage) {
+                case GERMAN -> {
+                    word = germanDictionary.get(item.getId());
+                }
+                case ENGLISH -> {
+                    word = englishDictionary.get(item.getId());
+                }
+            }
+            if(word != null) {
+                item.setText(word);
+            } else {
+                //TODO LOG
+            }
+        }
+    }
+
+    public void recieveLabel(Labeled label) {
+        if (label != null) {
+            labelList.add(label);
+        }
+    }
+
+    public void recieveMenuItem(MenuItem item) {
+        menuItemList.add(item);
+    }
+
+    public void changeLanguage(Language language) {
+        this.selectedLanguage = language;
+        translateGUI();
+    }
+
+    public String getSelectedLanguage(String getMsg) {
+        String word = "";
+        switch (selectedLanguage) {
+            case GERMAN -> word = germanDictionary.getOrDefault(getMsg,"check Logs");
+            case ENGLISH -> word = englishDictionary.getOrDefault(getMsg,"check Logs");
+        }
+        if (word.equals("check Logs")) {
+            //TODO Log
+        }
+        return word;
+    }
+
+    public enum Language {
+        ENGLISH,GERMAN
+    }
+}

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

@@ -1,17 +0,0 @@
-package ch.zhaw.projekt2.turnierverwaltung;
-
-public class Location {
-    private String name;
-
-    public Location(String name){
-        setName(name);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

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

@@ -0,0 +1,41 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.*;
+
+
+public class LogConfiguration {
+    private static final Logger logger = Logger.getLogger(LogConfiguration.class.getCanonicalName());
+    private final File mainDir;
+
+    public LogConfiguration(String saveLocation, String logFileLocation) throws IOException {
+        logger.fine("Starts setting up a main directory in which a folder with the log files will be placed, if not already exists");
+        this.mainDir = new File(saveLocation);
+        if (!mainDir.exists()) {
+            logger.fine("Creating main directory for log ordner in given path" + saveLocation);
+            mainDir.mkdir();
+        } else {
+            logger.finer("main directory for log folder already exists");
+        }
+
+        File saves = new File(mainDir, "log_files");
+        if (!saves.exists()) {
+            saves.mkdir();
+            logger.fine("Creating log save directory");
+        } else {
+            logger.finer("log save directory already exists");
+        }
+
+        String propertiesPath = "ch" + System.getProperty("file.separator") + "zhaw" + System.getProperty("file.separator") + "projekt2" + System.getProperty("file.separator") +
+                "turnierverwaltung" + System.getProperty("file.separator") + "logging" + System.getProperty("file.separator") + "log.properties";
+
+        logger.fine("Getting and reading logconfig file from " + propertiesPath);
+        InputStream logConfig = this.getClass().getClassLoader().getResourceAsStream(propertiesPath);
+        LogManager.getLogManager().readConfiguration(logConfig);
+
+
+        Logger.getLogger(LogConfiguration.class.getPackageName());
+    }
+}

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

@@ -1,6 +1,39 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public interface Participant {
+import java.io.Serializable;
+
+/**
+ * Interface that defines the common functionality of a Participant, used by Players and Teams
+ */
+public interface Participant extends Serializable {
+    /**
+     * Method that will be used to get
+     *
+     * @return the name
+     */
     String getName();
-    void setName(String name);
+
+    /**
+     * Method to set a participants name
+     *
+     * @param name to be set
+     * @throws InvalidNameException if the name does not follow the correct format
+     */
+    void setName(String name) throws InvalidNameException;
+
+    /**
+     * Method to compare two participants with each other
+     *
+     * @param participant to be compared to the current instance
+     * @return true if equal, false if not
+     */
+    boolean equals(Participant participant);
+
+    /**
+     * Method to  change out participants
+     *
+     * @param participant to be exchanged
+     * @throws Person.InvalidPhoneNumberException if phone number does not follow the correct formatting
+     */
+    void change(Participant participant) throws Person.InvalidPhoneNumberException;
 }

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

@@ -1,37 +1,128 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public class Person {
+import java.io.Serializable;
+import java.util.logging.Logger;
+
+/**
+ * Class that represents a person and holds its attributes
+ */
+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){
+    private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
+
+
+    /**
+     * Constructor to initialize a person, also in charge of checking if name and phone number follow a valid format
+     *
+     * @param firstName   of the new person
+     * @param name        of the new person
+     * @param phoneNumber of the new person
+     * @throws InvalidNameException        thrown when the name or firstname does not follow the valid format
+     * @throws InvalidPhoneNumberException thrown when the number does not follow a valid format
+     */
+    public Person(String firstName, String name, String phoneNumber) throws InvalidNameException, InvalidPhoneNumberException {
+        logger.finer("Trying to initialize a new person with name: " + name + ", first name: "
+                + firstName + ", Phone number: " + phoneNumber);
+
         setFirstName(firstName);
         setName(name);
         setPhoneNumber(phoneNumber);
+        logger.fine("Successfully created a new Person with Name: " + name + ", Firstname: "
+                + firstName + ", Phone number: " + phoneNumber);
     }
 
+    /**
+     * Method to return the name of a Person
+     *
+     * @return the name as String
+     */
     public String getName() {
+        logger.fine("Returning name of:" + name);
         return name;
     }
 
-    public void setName(String name) {
+    /**
+     * Method to set the name of a Person
+     *
+     * @param name of the person to be set
+     */
+    public void setName(String name) throws InvalidNameException {
+        if (!name.matches(NAME_MATCHING_REGEX)) {
+            logger.warning("Name: " + name + ", is not in a valid format");
+            throw new InvalidNameException("The Last name is Invalid");
+        }
+        logger.fine("Setting new name of " + this + " with: " + name);
         this.name = name;
     }
 
     public String getFirstName() {
+        logger.fine("Returning firstname of " + this + "that is: " + firstName);
         return firstName;
     }
 
-    public void setFirstName(String firstName) {
+    /**
+     * Method to set the first name of a Person
+     *
+     * @param firstName the person to be set
+     */
+    public void setFirstName(String firstName) throws InvalidNameException {
+        if (!firstName.matches(NAME_MATCHING_REGEX)) {
+            logger.warning("First name: " + firstName + ", is not in a valid format");
+            throw new InvalidNameException("The First name is Invalid.");
+        }
+        logger.fine("Setting new first name of " + this + " with: " + firstName);
         this.firstName = firstName;
     }
 
+    /**
+     * Method used to get the Phone number of a Person
+     *
+     * @return phone number of the person
+     */
     public String getPhoneNumber() {
+        logger.fine("returning phone number of " + this + "that is: " + phoneNumber);
         return phoneNumber;
     }
 
-    public void setPhoneNumber(String phoneNumber) {
+    /**
+     * Method used to set the Phone number of a Person
+     *
+     * @param phoneNumber to be set
+     */
+    public void setPhoneNumber(String phoneNumber) throws InvalidPhoneNumberException {
+        if (!phoneNumber.matches(PHONE_MATCHING_REGEX)) {
+            logger.warning("Phone number: " + phoneNumber + ", is not in a valid format");
+            throw new InvalidPhoneNumberException("The entered Phone Number is invalid.");
+        }
+        logger.fine("Setting new phone number of " + this + " with: " + phoneNumber);
         this.phoneNumber = phoneNumber;
     }
+
+    /**
+     * Exception, that is used when a Phone number is in an invalid format.
+     */
+    public static class InvalidPhoneNumberException extends Exception {
+
+        public InvalidPhoneNumberException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    /**
+     * Overridden toString method to be Return the name in Format "Firstname Name".
+     *
+     * @return Returning the Name in format "Firstname Name" as String
+     */
+    @Override
+    public String toString() {
+        return firstName + " " + name;
+    }
+
 }

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

@@ -0,0 +1,78 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import java.io.Serializable;
+import java.util.logging.Logger;
+
+/**
+ * Class Representing a place that can be set for a game
+ */
+public class Place implements Serializable {
+    private final String NAME_MATCHING_REGEX = "[a-zA-Z0-9]{1,20}";
+    private String name;
+
+    private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
+
+    /**
+     * Constructor of a place initializes it and checks if name is in valid format
+     *
+     * @param name to be set
+     * @throws InvalidNameException If name is invalid
+     */
+    public Place(String name) throws InvalidNameException {
+        if (!name.matches(NAME_MATCHING_REGEX)) {
+            logger.warning("Name: " + name + " does not follow the valid format");
+            throw new InvalidNameException("The Name: " + name + " is in an invalid Format");
+        }
+        logger.fine("Name: " + name + " is valid and will be set for the Place");
+        setName(name);
+    }
+
+    /**
+     * Method to get the Name of the Place as String
+     *
+     * @return name of place as String
+     */
+    public String getName() {
+        logger.finer("returning the name: " + name);
+        return name;
+    }
+
+    /**
+     * Method to set the name of a place
+     *
+     * @param name the name to be set
+     */
+    private void setName(String name) {
+        logger.finer("Setting " + name + " as name of place");
+        this.name = name;
+    }
+
+    /**
+     * Override of toString to return the name as String when needed
+     *
+     * @return the name of the place as String
+     */
+    @Override
+    public String toString() {
+        return name;
+    }
+
+    /**
+     * Override of equals tom compare places with each other
+     *
+     * @param place to be compared with this instance
+     * @return true if equals and false if not equal
+     */
+    public boolean equals(Place place) {
+        logger.fine("Comparing " + place + " with " + this);
+        return name.equals(place.getName());
+    }
+
+    /**
+     *  Functionality to save more details than the name about a place is not implemented in this prototype,
+     *  so no functionality is set yet to change the place.
+     * @param place to be changed
+     */
+    public void change(Place place) {
+    }
+}

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

@@ -1,21 +1,131 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-import java.util.Date;
 
-public class Player extends Person implements Participant{
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.logging.Logger;
 
-    private Date dateOfBirth;
+/**
+ * Class Representing a single Player
+ */
+public class Player extends Person implements Participant {
+
+    private LocalDate dateOfBirth;
+
+    private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
+
+    /**
+     * Constructor of player initializes a new player setting sever attributes like firstname, name birthdate usw.
+     * and checking if the format is valid
+     *
+     * @param firstName   the firstname of the player
+     * @param name        the name of the player
+     * @param phoneNumber the phone number of the player
+     * @param dateOfBirth the birthdate of the player
+     * @throws InvalidNameException        thrown when the name or firstname are not in a valid format
+     * @throws InvalidPhoneNumberException thrown when the phone number is not in a valid format
+     */
+    public Player(String firstName, String name, String phoneNumber, String dateOfBirth) throws InvalidNameException, InvalidPhoneNumberException, InvalidDateException {
 
-    public Player(String firstName, String name, String phoneNumber, Date dateOfBirth){
         super(firstName, name, phoneNumber);
+        logger.fine("initialized super of Player with firstname, name and phone number");
+        logger.finer("Setting the date of birth as:" + dateOfBirth);
         setDateOfBirth(dateOfBirth);
+        logger.finer("finished initializing the Player:" + name);
     }
 
-    public Date getDateOfBirth() {
+    /**
+     * Method to get the birthday of a player
+     *
+     * @return the birthday of a player
+     */
+    public LocalDate getDateOfBirth() {
+        logger.fine("returning the birthday of " + getName());
         return dateOfBirth;
     }
 
-    public void setDateOfBirth(Date dateOfBirth) {
+    /**
+     * Method that returns the date of birth formatted in eu way dd.MM.YYYY and as String
+     *
+     * @return String of formatted date
+     */
+    public String getFormattedDateOfBirth() {
+        logger.finer("Trying to get the formatted date");
+        try {
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy");
+            logger.fine("Returning the formatted birthdate of player: " + getName());
+            return dateOfBirth.format(formatter);
+        } catch (Exception e) {
+            logger.warning("Failed to get formatted date for player " + getName() + "Error: " + e);
+            //TODO handle
+            return "";
+        }
+    }
+
+
+    /**
+     * Method to set the date of Birth with a String provided.
+     *
+     * @param dateOfBirth to be as a String
+     */
+    public void setDateOfBirth(String dateOfBirth) throws InvalidDateException {
+        logger.finer("Trying to set of birth with the String " + dateOfBirth + " provided");
+        if (dateOfBirth.length() > 0) {
+            String[] date = dateOfBirth.split("\\.");
+            try {
+                this.dateOfBirth = LocalDate.of(Integer.parseInt(date[2]), Integer.parseInt(date[1]), Integer.parseInt(date[0]));
+                logger.fine("Date of birth of" + getName() + " has been set to " + dateOfBirth);
+            } catch (NumberFormatException | IndexOutOfBoundsException e) {
+                e.printStackTrace();
+                logger.warning("Date of birth of " + getName() + " could not be set, leaving at null");
+                throw new InvalidDateException("Date invalid");
+            }
+        } else {
+            logger.warning("Date of birth of " + getName() + " could not be set, leaving at null");
+        }
+    }
+
+    /**
+     * Method that sets date of Birth with a LocalDate provided
+     *
+     * @param dateOfBirth parameter given as LocalDate
+     */
+    public void setDateOfBirth(LocalDate dateOfBirth) {
+        logger.fine("Setting date of birth of" + getName() + "with provided LocalDate: " + dateOfBirth);
         this.dateOfBirth = dateOfBirth;
     }
+
+    /**
+     * Override of equals method to compare participants against each other
+     *
+     * @param participant to be compared with this instance
+     * @return true if equals, false if not
+     */
+    @Override
+    public boolean equals(Participant participant) {
+        logger.fine("Comparing " + participant + " with " + this);
+        return getClass().equals(participant.getClass()) && toString().equalsIgnoreCase(participant.toString());
+    }
+
+    /**
+     * Override of the change method to change a Participant with a new one
+     *
+     * @param participant the new participant to be added
+     */
+    @Override
+    public void change(Participant participant) throws InvalidPhoneNumberException {
+        logger.fine("changing the current Player " + this + "with " + participant.getName());
+        Player player = (Player) participant;
+
+        setDateOfBirth(player.getDateOfBirth());
+        setPhoneNumber(player.getPhoneNumber());
+    }
+
+    public static class InvalidDateException extends Exception {
+        public InvalidDateException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
 }

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

@@ -2,36 +2,129 @@ package ch.zhaw.projekt2.turnierverwaltung;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
+
+/**
+ * Class Team represents a team that can be added to a tournament
+ * (in the prototype there is no functionality for the team)
+ */
 public class Team implements Participant {
     private String name;
     private List<Player> players;
     private Person contactPerson;
 
-    public Team(String name){
+    private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
+
+    /**
+     * Constructor to initiate a team, sets its name
+     *
+     * @param name the new name to be set
+     */
+    public Team(String name) {
+        logger.fine("Setting the new  name of the team as: " + name);
         setName(name);
         players = new ArrayList<>();
     }
 
-    public void addPlayer(Player player){
+    /**
+     * Method to add a new player to a team
+     *
+     * @param player new player to be added to a team
+     */
+    public void addPlayer(Player player) {
+        logger.fine("Adding new Player named: " + player + "into the team");
         players.add(player);
     }
 
+    /**
+     * Method to return the name of the team
+     *
+     * @return the name of the team
+     */
     @Override
     public String getName() {
+        logger.fine("Returning the name of the team:" + name);
         return name;
     }
 
+    /**
+     * Method to set the name of a team
+     *
+     * @param name of the team
+     */
     @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    /**
+     * Method that sets a complete List of all players as players of the team
+     *
+     * @param players List of Players to be set
+     */
+    public void setPlayers(List<Player> players) {
+        logger.fine("Inserts Player");
+        this.players = players;
+    }
+
+    /**
+     * Method to get the List of all Players in a team
+     *
+     * @return List of all players in team
+     */
+    public List<Player> getPlayers() {
+        logger.fine("Returning List of all players in " + getName());
+        return players;
+    }
+
+    /**
+     * Override of equals Method to compare teams with each other
+     *
+     * @param participant to be compared with this instance
+     * @return true if teams are the same false if not.
+     */
+    @Override
+    public boolean equals(Participant participant) {
+        return getClass().equals(participant.getClass()) && toString().equalsIgnoreCase(participant.toString());
+    }
+
+    /**
+     * Functionality to save a team is not implemented in this prototype, so no functionality is set yet to change the team
+     *
+     * @param participant date object containing new data
+     */
+    @Override
+    public void change(Participant participant) {
+    }
+
+    /**
+     * Method to get the current contact person of a team
+     *
+     * @return the current contact person
+     */
     public Person getContactPerson() {
+        logger.fine("Returning contact Person of team " + getName());
         return contactPerson;
     }
 
+    /**
+     * Method to set a Person as a contact person of a team
+     *
+     * @param contactPerson to be set
+     */
     public void setContactPerson(Person contactPerson) {
+        logger.fine("Setting " + contactPerson + " as a contact Person for team " + getName());
         this.contactPerson = contactPerson;
     }
+
+    /**
+     * Override of toString method, that returns the current name
+     *
+     * @return name in form of a String
+     */
+    @Override
+    public String toString() {
+        return name;
+    }
 }

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

@@ -1,19 +1,322 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-import java.io.Serializable;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Logger;
+
+
+/**
+ * Class used to represent a single tournament, participants place and games are placed in it
+ * For saving purposes it implements Serializable.
+ */
 public class Tournament implements Serializable {
     private String name;
+    private Type type;
+    private final List<Participant> participants;
+    private final List<Place> places;
+    private List<List<Game>> gameList;
 
-    public Tournament(String name){
+    private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
+
+
+    /**
+     * Constructor that initializes tournament with the needed parameters name and types, also checks if those
+     * parameters are valid and throws errors if not
+     *
+     * @param name name of the tournament
+     * @param type type of the Tournament, for example KO or Groupphase
+     * @throws InvalidNameException If name contains invalid characters
+     * @throws InvalidTypeException If the Type does not exist
+     */
+    public Tournament(String name, Type type) throws InvalidNameException, InvalidTypeException {
+        if (!name.matches("[\\w]{1,20}")) {
+            logger.warning("The entered name is incorrect, Entered name: " + name);
+            throw new InvalidNameException("Invalid Name entered");
+        } else if (!Arrays.asList(Type.values()).contains(type)) {
+            logger.warning("The given Type is invalid and does not exist, Given Type: " + type);
+            throw new InvalidTypeException("Invalid Type selected");
+        }
+
+        logger.fine("Setting up Tournament with name " + name + " and Type " + type);
         setName(name);
+        setType(type);
+        logger.fine("Creating needed Lists for participants, places and games");
+        participants = new ArrayList<>();
+        places = new ArrayList<>();
+        gameList = new ArrayList<>();
+        logger.fine("Successfully initialized tournament");
     }
 
+    /**
+     * Method used to save new Participant into the tournament, checking if participant already exists and if yes will
+     * edit the already existing participant
+     *
+     * @param newParticipant the Participant to be saved or edited
+     */
+    public void saveParticipant(Participant newParticipant) throws Person.InvalidPhoneNumberException {
+        logger.fine("Trying to add " + newParticipant + " into the tournament");
+        for (Participant participant : participants) {
+            if (participant.equals(newParticipant)) {
+                logger.fine("matching participant: " + newParticipant +
+                        "found and instead of creating new one this one will be edited");
+                participant.change(newParticipant);
+                return;
+            }
+        }
+        logger.fine("Participant " + newParticipant + " being added to tournament.");
+        participants.add(newParticipant);
+    }
+
+    /**
+     * Method to remove an existing participant throws error if participant could not be found
+     *
+     * @param participant to be removed
+     * @throws ParticipantNotExistsException thrown when the participant could not be found
+     */
+    public void removeParticipant(Participant participant) throws ParticipantNotExistsException {
+        logger.finer("Trying to remove " + participant + " from participants List");
+        if (!participants.contains(participant)) {
+            logger.warning("Participant: " + participant + " could not be found");
+            throw new ParticipantNotExistsException("The given Participant (" + participant
+                    + ")is not part of this Tournament");
+        }
+        logger.fine("Matching Participant could be found and is removed, participant name: " + participant);
+        participants.remove(participant);
+    }
+
+    /**
+     * Method to return an Observable List of all current participants
+     *
+     * @return ObservableList containing all current participants
+     */
+    public ObservableList<Participant> getParticipants() {
+        logger.finer("Creates Observable list for participants");
+        ObservableList<Participant> participantsObservable = FXCollections.observableArrayList();
+        logger.finer("Fills Observable List with all participants");
+        participantsObservable.addAll(participants);
+        logger.fine("Returning Observable List containing all participants");
+        return participantsObservable;
+    }
+
+    /**
+     * Method to add a new Place, also checks if place does already exist.
+     *
+     * @param newPlace to be added in the list of all places
+     */
+    public void savePlace(Place newPlace) {
+        for (Place place : places) {
+            if (place.equals(newPlace)) {
+                place.change(newPlace);
+                return;
+            }
+        }
+        places.add(newPlace);
+    }
+
+    /**
+     * Method that removes a place from the List, also checks if place is in the list
+     * @param place to be removed
+     * @throws PlaceNotExistsException thrown when the place could not be found
+     */
+    public void removePlace(Place place) throws PlaceNotExistsException {
+        if (!places.contains(place)) {
+            throw new PlaceNotExistsException("The given Place is not part of this Tournament");
+        }
+        logger.fine("removing " + place + "from places");
+        places.remove(place);
+    }
+
+    /**
+     * Method returns an Observable list of all places
+     *
+     * @return a list of all places
+     */
+    public ObservableList<Place> getPlaces() {
+        ObservableList<Place> placesObservable = FXCollections.observableArrayList();
+        placesObservable.addAll(places);
+        return placesObservable;
+    }
+
+
+    /*
+    Method creates a completely new GameSchedule
+     */
+    public void createGameSchedule() throws NumberOfParticipantInvalidException {
+        gameList = new ArrayList<>();
+        if (type == Type.KO) {
+            if (numberOfParticipantValid()) {
+                logger.fine("initiates a new calculation of the game schedule");
+                calcGameSchedule();
+            } else {
+                logger.warning("Invalid number of participants only participants 2^n allowed");
+                throw new NumberOfParticipantInvalidException("Can not Create Game Schedule for KO Modus");
+            }
+        } else {
+            logger.warning("In the prototype the only accessible game schedule is the ko modus");
+        }
+    }
+
+    /**
+     * Method to check if the number of participants is valid, returns true if yes and false if not
+     *
+     * @return boolean that returns if participant is valid
+     */
+    private boolean numberOfParticipantValid() {
+        double res = Math.log(participants.size()) / Math.log(2);
+        logger.fine("checks if value is 2^n and returns true if yes");
+        return (res * 10) % 10 == 0 && participants.size() >= 4;
+    }
+
+    /**
+     * Method that calculates a new game schedule
+     */
+    private void calcGameSchedule() {
+        logger.finer("uses shuffle of Collections to bring all participants in a random order");
+        Collections.shuffle(participants);
+
+        for (int i = 0; i < (Math.log(participants.size()) / Math.log(2)); i++) {
+            List<Game> gameRound = new ArrayList<>();
+            if (i == 0) {
+                for (int j = 0; j < participants.size() - 1; j += 2) {
+                    gameRound.add(new Game(participants.get(j), participants.get(j + 1)));
+                }
+            } else {
+                for (int j = 0; j < (gameList.get(i - 1).size() / 2); j++) {
+                    gameRound.add(new Game(gameList.get(i - 1).get(j * 2), gameList.get(i - 1).get(j * 2 + 1)));
+                }
+            }
+            logger.fine("Created new game tree");
+            gameList.add(gameRound);
+        }
+
+    }
+
+    /**
+     * Getter Method to return the name of the tournament
+     *
+     * @return the name of the tournament
+     */
     public String getName() {
+        logger.fine("Returning the name of the tournament, Name: " + name);
         return name;
     }
 
+    /**
+     * Setter method for the name of the tournament
+     *
+     * @param name the new name that should be set
+     */
     public void setName(String name) {
         this.name = name;
     }
+
+    /**
+     * Getter method to get the type of the tournament
+     *
+     * @return the type of the tournament
+     */
+    public Type getType() {
+        logger.fine("Returning the type of the tournament");
+        return type;
+    }
+
+    /**
+     * Setter Method to set the type of the tournament
+     *
+     * @param type the type to be set
+     */
+    public void setType(Type type) {
+        logger.fine("Setting the type of the tournament to: " + type);
+        this.type = type;
+    }
+
+    /**
+     * Getter method to get the Complete GameList
+     *
+     * @return the complete GameList
+     */
+    public List<List<Game>> getGameList() {
+        logger.fine("Returns the complete gameList");
+        return gameList;
+    }
+
+    /**
+     * Enum for all types of Tournaments
+     * (In the Prototype only the KO-System has full functionality
+     */
+    public enum Type {
+        KO("KO-System"); //GROUPS("Gruppenspiele"); //Type GROUPS is not implemented in this prototype.
+
+        private final String name;
+
+        Type(String name) {
+            this.name = name;
+        }
+
+        /**
+         * Overridden toString method to return the name
+         * @return the name of the type
+         */
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        /**
+         * Method to return an Observable List containing all types
+         *
+         * @return the Observable list with all types
+         */
+        public static ObservableList<Type> getObservableList() {
+            ObservableList<Type> items = FXCollections.observableArrayList();
+            items.addAll(values());
+            return items;
+        }
+    }
+
+    /**
+     * Custom exception thrown when an invalid file is chosen
+     */
+    public static class InvalidTypeException extends Exception {
+        public InvalidTypeException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    /**
+     * Custom Exception thrown when a Participant does not exist
+     */
+    public static class ParticipantNotExistsException extends Exception {
+        public ParticipantNotExistsException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    /**
+     * Custom Exception thrown when a Place does not exist
+     */
+    public static class PlaceNotExistsException extends Exception {
+        public PlaceNotExistsException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    /**
+     * Custom Exception thrown when the number of participants is not valid
+     */
+    public static class NumberOfParticipantInvalidException extends Exception {
+        public NumberOfParticipantInvalidException(String msg) {
+            super(msg);
+        }
+    }
+
 }

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

@@ -0,0 +1,212 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import javafx.application.Platform;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class TournamentDecorator implements IsObservable{
+    private Tournament tournament;
+    private FileIO fileIO;
+    private List<IsObserver> listener = new ArrayList<>();
+    private ExecutorService executorService;
+    private FactoryDecorator factoryDecorator;
+
+    public TournamentDecorator(FileIO fileIO){
+        setFileIO(fileIO);
+        addListener(new IsObserver() {
+            @Override
+            public void update() {
+                if(tournament != null){
+
+                    saveTournament();
+                }
+            }
+        });
+        executorService = Executors.newFixedThreadPool(1);
+    }
+
+    public void setFactoryDecorator(FactoryDecorator factoryDecorator) {
+        this.factoryDecorator = factoryDecorator;
+    }
+
+    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(){
+        executorService.execute(new saveTask());
+        factoryDecorator.clearMessage(false);
+        String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("save");
+        factoryDecorator.printMessageToFooter(msg + new Date().toString(),false);
+    }
+
+
+
+    public void createTournament(String name, Tournament.Type type){
+
+        try {
+            if(fileIO.tournamentExists(name)){
+                //TODO:Logger
+                String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("tournamentExists");
+                factoryDecorator.printMessageToFooter(msg, true);
+                return;
+            }
+            Tournament tournament = new Tournament(name, type);
+            fileIO.saveTournament(tournament);
+            factoryDecorator.clearMessage(true);
+            informListener();
+        } catch (InvalidNameException e) {
+            e.printStackTrace();
+            //TODO: Logger
+            String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidName");
+            factoryDecorator.printMessageToFooter(msg, true);
+        } catch (Tournament.InvalidTypeException e) {
+            e.printStackTrace();
+            //TODO: Logger
+            String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidMode");
+            factoryDecorator.printMessageToFooter(msg, true);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            //TODO: Logger
+            String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("IOException");
+            factoryDecorator.printMessageToFooter(msg, true);
+        }
+
+    }
+
+    public void deleteTournament(FileIO.TournamentFile tournamentFile){
+        try {
+            fileIO.deleteTournament(tournamentFile);
+            factoryDecorator.clearMessage(true);
+            informListener();
+        } catch (IOException e) {
+            e.printStackTrace();  //TODO handle and logging
+            String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("IOException");
+            factoryDecorator.printMessageToFooter(msg, true);
+        }
+    }
+
+    public void createNewGameSchedule() {
+        //TODO: logging
+        try {
+            tournament.createGameSchedule();
+            factoryDecorator.clearMessage(true);
+        } catch (Tournament.NumberOfParticipantInvalidException e) {
+            e.printStackTrace();
+            String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("numberParticipant");
+            factoryDecorator.printMessageToFooter(msg, true);
+        }
+        informListener();
+    }
+
+    public void savePlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
+        try {
+            tournament.saveParticipant(new Player(firstName, name, phoneNumber, dateOfBirth));
+            factoryDecorator.clearMessage(true);
+            informListener();
+        } catch (InvalidNameException e) {
+            e.printStackTrace(); //TODO handle and logging
+            String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidName");
+            factoryDecorator.printMessageToFooter(msg, true);
+        } catch (Person.InvalidPhoneNumberException e) {
+            e.printStackTrace(); //TODO handle and logging
+            String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidPhone");
+            factoryDecorator.printMessageToFooter(msg, true);
+        } catch (Player.InvalidDateException e) {
+            e.printStackTrace();
+            String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidDate");
+            factoryDecorator.printMessageToFooter(msg, true);
+        }
+    }
+
+    public void deleteParticipant(Participant participant){
+        try {
+            tournament.removeParticipant(participant);
+            factoryDecorator.clearMessage(true);
+            informListener();
+        } catch (Tournament.ParticipantNotExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+            String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("participantNotExist");
+            factoryDecorator.printMessageToFooter(msg, true);
+        }
+    }
+
+    public void savePlace(String name){
+        try {
+            tournament.savePlace(new Place(name));
+            factoryDecorator.clearMessage(true);
+            informListener();
+        } catch (InvalidNameException e) {
+            e.printStackTrace(); //TODO handle and logging
+            String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidName");
+            factoryDecorator.printMessageToFooter(msg, true);
+        }
+    }
+
+    public void deletePlace(Place place){
+        try {
+            tournament.removePlace(place);
+            factoryDecorator.clearMessage(true);
+            informListener();
+        } catch (Tournament.PlaceNotExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+            String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("placeNotExist");
+            factoryDecorator.printMessageToFooter(msg, true);
+        }
+    }
+
+
+    public void informListener() {
+        for(IsObserver observer : listener) {
+            observer.update();
+        }
+    }
+
+    public void closeApplication() throws InterruptedException {
+        executorService.shutdown();
+        executorService.awaitTermination(2000, TimeUnit.MILLISECONDS);
+    }
+
+    private class saveTask implements Runnable {
+
+        @Override
+        public void run() {
+            try {
+                fileIO.saveTournament(tournament);
+            } catch (IOException e) {
+                e.printStackTrace();
+                Platform.runLater(() -> {
+                    String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("IOException");
+                    factoryDecorator.printMessageToFooter(msg, true);
+                });
+            }
+        }
+    }
+
+}

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

@@ -1,35 +1,51 @@
 package ch.zhaw.projekt2.turnierverwaltung.main;
 
-import ch.zhaw.projekt2.turnierverwaltung.Factory;
+import ch.zhaw.projekt2.turnierverwaltung.*;
-import ch.zhaw.projekt2.turnierverwaltung.FileIO;
 import javafx.application.Application;
+import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
+
+import java.util.logging.Logger;
 
-import java.awt.*;
-import java.io.IOException;
 
 public class MainWindow extends Application {
-    private FileIO fileIO = new FileIO(System.getProperty("user.dir") + "/tournierverwaltung_angrynerds");
+    private FileIO fileIO = new FileIO(System.getProperty("user.dir") + System.getProperty("file.separator") + "tournierverwaltung_angrynerds");
-    private Factory factory = new Factory(fileIO); //TODO make it private!
+    private FactoryDecorator factoryDecorator;
+    private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO);
+    private LanguageConfigurator languageConfigurator = new LanguageConfigurator();
+    private Factory factory = new Factory(fileIO, tournamentDecorator, languageConfigurator);
+    private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
 
     @Override
     public void start(Stage primaryStage) throws Exception {
-
         BorderPane pane = factory.loadMainWindow();
-        factory.loadTournamentList(pane);
+        factoryDecorator = new FactoryDecorator(fileIO, factory, pane);
-
+        factory.loadAllViews(factoryDecorator, pane);
+        tournamentDecorator.setFactoryDecorator(factoryDecorator);
+        factoryDecorator.openTournamentList();
+        languageConfigurator.translateGUI();
 
         Scene scene = new Scene(pane);
         primaryStage.setScene(scene);
+        primaryStage.setMinHeight(600);
+        primaryStage.setMinWidth(800);
         primaryStage.setMaximized(true);
-        primaryStage.setResizable(false);
+        primaryStage.setResizable(true);
         primaryStage.setFullScreen(false);
         primaryStage.show();
     }
 
-
+    @Override
+    public void stop() {
+        try {
+            super.stop();
+            tournamentDecorator.closeApplication();
+        } catch (Exception e) {
+            logger.warning("Exception while closing application");
+        }
+    }
 }

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

@@ -1,21 +1,49 @@
 package ch.zhaw.projekt2.turnierverwaltung.main;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.LanguageConfigurator;
+import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuItem;
 
 public class MainWindowController extends FXController {
 
     @FXML
-    void changeLangToGerman(ActionEvent event) {
+    private MenuItem closeBtn;
 
+    @FXML
+    private Label mainTitle;
+
+    @FXML
+    private Menu menuItemLanguage;
+
+    @FXML
+    void changeLangToGerman(ActionEvent event) {
+        getLanguageConfigurator().changeLanguage(LanguageConfigurator.Language.GERMAN);
+    }
+
+    @FXML
+    void changeLangToEnglish(ActionEvent event) {
+        getLanguageConfigurator().changeLanguage(LanguageConfigurator.Language.ENGLISH);
     }
 
     @FXML
     void closeApplication(ActionEvent event) {
-
+        Platform.exit();
     }
 
+    @Override
+    public void shareGUIElementWithLanguageConfigurator() {
+        getLanguageConfigurator().recieveLabel(mainTitle);
+        getLanguageConfigurator().recieveMenuItem(closeBtn);
+        getLanguageConfigurator().recieveMenuItem(menuItemLanguage);
+    }
+
+
+
     @Override
     public void loadContent() {
 

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

@@ -0,0 +1,39 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
+
+import ch.zhaw.projekt2.turnierverwaltung.LanguageConfigurator;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
+
+public class AlertNewSchedule extends Alert {
+    private ButtonType yesButton;
+    private ButtonType noButton;
+    private Boolean result;
+    private String yes;
+    private String no;
+    private String titleDelete;
+    private String headerDelete;
+    private String contentDelete;
+
+    public AlertNewSchedule(LanguageConfigurator languageConfigurator){
+        super(Alert.AlertType.WARNING);
+        yes = languageConfigurator.getSelectedLanguage("yes");
+        no = languageConfigurator.getSelectedLanguage("no");
+        titleDelete = languageConfigurator.getSelectedLanguage("titleSchedule");
+        headerDelete = languageConfigurator.getSelectedLanguage("headerSchedule");
+        contentDelete = languageConfigurator.getSelectedLanguage("contentSchedule");
+        yesButton = new ButtonType(yes, ButtonBar.ButtonData.YES);
+        noButton = new ButtonType(no, ButtonBar.ButtonData.NO);
+        setTitle(titleDelete);
+        setHeaderText(headerDelete);
+        setContentText(contentDelete);
+        getButtonTypes().setAll(yesButton, noButton);
+    }
+
+    public boolean showAndGetResult() {
+        showAndWait().ifPresent(input -> {
+            result = input == yesButton;
+        });
+        return result;
+    }
+}

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

@@ -0,0 +1,90 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
+
+import ch.zhaw.projekt2.turnierverwaltung.*;
+import javafx.beans.value.ObservableValue;
+import javafx.event.Event;
+import javafx.fxml.FXML;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+
+public class GameController extends FXController{
+
+    private GameDecorator gameDecorator;
+
+    @FXML
+    private VBox mainVBox;
+
+    @FXML
+    private Label participantNameOne;
+
+    @FXML
+    private Label participantNameTwo;
+
+    @FXML
+    private ChoiceBox<Place> placesChoiceBox;
+
+    @FXML
+    private TextField pointsTeamOne;
+
+    @FXML
+    private TextField pointsTeamTwo;
+
+    @FXML
+    private Label locationLabel;
+
+    @Override
+    public void shareGUIElementWithLanguageConfigurator() {
+        getLanguageConfigurator().recieveLabel(locationLabel);
+    }
+
+    @FXML
+    void saveGameResult(Event event) {
+        gameDecorator.saveGameResult(pointsTeamOne.getText(), pointsTeamTwo.getText());
+    }
+
+
+    private void saveGamePlace(Place newPlace) {
+        gameDecorator.saveGamePlace(newPlace);
+    }
+
+    public double getGameBoxHeigth(){
+        return mainVBox.getPrefHeight();
+    }
+
+    @Override
+    public void loadContent() {
+        getLanguageConfigurator().translateGUI();
+        participantNameOne.setText(gameDecorator.getParticipantOne());
+        participantNameTwo.setText(gameDecorator.getParticipantTwo());
+        pointsTeamOne.setText(String.valueOf(gameDecorator.getPoints1()));
+        pointsTeamTwo.setText(String.valueOf(gameDecorator.getPoints2()));
+        placesChoiceBox.setItems(getTournamentDecorator().getTournament().getPlaces());
+        placesChoiceBox.setValue(gameDecorator.getPlace());
+    }
+
+    public void refreshParticipants(){
+        gameDecorator.refreshParticipants();
+    }
+
+    public void addListener(GameDecorator gameDecorator){
+        gameDecorator.addListener(new IsObserver() {
+            @Override
+            public void update() {
+                refreshParticipants();
+                loadContent();
+            }
+        });
+    }
+
+
+    public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane, GameDecorator gameDecorator,LanguageConfigurator languageConfigurator) {
+        setTournamentDecorator(tournamentDecorator);
+        this.gameDecorator = gameDecorator;
+        setup(languageConfigurator);
+        placesChoiceBox.getSelectionModel().selectedItemProperty().addListener((ObservableValue<? extends Place> observable, Place oldValue, Place newValue) -> saveGamePlace(newValue == null ? oldValue : newValue));
+    }
+
+}

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

@@ -0,0 +1,82 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
+
+import ch.zhaw.projekt2.turnierverwaltung.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GameDecorator implements IsObservable{
+    private Game game;
+    private List<IsObserver> listener = new ArrayList<>();
+
+    public GameDecorator (Game game) {
+        this.game = game;
+    }
+
+    @Override
+    public void addListener(IsObserver observer) {
+        listener.add(observer);
+    }
+
+    @Override
+    public void removeListener(IsObserver observer) {
+        listener.remove(observer);
+    }
+
+    public void saveGameResult(String points1, String points2){
+        if(points1.length() > 0){
+            game.setPoints1(Integer.parseInt(points1));
+        } else {
+            game.setPoints1(0);
+        }
+        if(points2.length() > 0) {
+            game.setPoints2(Integer.parseInt(points2));
+        } else {
+            game.setPoints2(0);
+        }
+        informListener();
+    }
+
+    public void saveGamePlace(Place place){
+        game.setPlace(place);
+        informListener();
+    }
+
+    public String getPoints1() {
+       return String.valueOf(game.getPoints1());
+    }
+
+    public String getPoints2() {
+        return String.valueOf(game.getPoints2());
+    }
+
+    public String getParticipantOne() {
+        if (game.getParticipant1() != null) {
+            return game.getParticipant1().toString();
+        }
+        return "1";
+    }
+
+    public String getParticipantTwo() {
+        if (game.getParticipant2() != null) {
+            return game.getParticipant2().toString();
+        }
+        return "2";
+    }
+
+    public void refreshParticipants(){
+        game.refreshParticipants();
+        informListener();
+    }
+
+    public Place getPlace() {
+        return game.getPlace();
+    }
+
+    public void informListener() {
+        for(IsObserver observer : listener) {
+            observer.update();
+        }
+    }
+}

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

@@ -0,0 +1,77 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Labeled;
+import javafx.scene.layout.HBox;
+
+public class GameScheduleController extends FXController {
+    
+    @FXML
+    private Button createScheduleBtn;
+
+    @FXML
+    private Button editLocBtn;
+
+    @FXML
+    private Button editParticipantBtn;
+
+    @FXML
+    private Button closeTournamentBtn;
+
+    @FXML
+    private HBox hBoxCenter;
+
+    @FXML
+    private CheckBox treeView;
+
+    @Override
+    public void shareGUIElementWithLanguageConfigurator() {
+        getLanguageConfigurator().recieveLabel(treeView);
+        getLanguageConfigurator().recieveLabel(createScheduleBtn);
+        getLanguageConfigurator().recieveLabel(editParticipantBtn);
+        getLanguageConfigurator().recieveLabel(editLocBtn);
+        getLanguageConfigurator().recieveLabel(closeTournamentBtn);
+    }
+
+    @FXML
+    void createNewSchedule(ActionEvent event) {
+        if (getTournamentDecorator().getTournament().getGameList().size() > 0) {
+            AlertNewSchedule alert = new AlertNewSchedule(getLanguageConfigurator());
+            if (alert.showAndGetResult()) {
+                getTournamentDecorator().createNewGameSchedule();
+            }
+        } else {
+            getTournamentDecorator().createNewGameSchedule();
+        }
+    }
+
+    @FXML
+    void openPlacesFormular(ActionEvent event) {
+        getFactoryDecorator().openPlacesFormular();
+    }
+
+    @FXML
+    void openParticipantFormular(ActionEvent event) {
+        getFactoryDecorator().openParticipantFormular();
+    }
+
+    @FXML
+    void closeTournament(ActionEvent event) {
+        getFactoryDecorator().openTournamentList();
+    }
+
+    @FXML
+    void changeView(ActionEvent event) {
+        loadContent();
+    }
+
+    @Override
+    public void loadContent() {
+        getFactoryDecorator().loadGameList(hBoxCenter, getTournamentDecorator(), treeView.isSelected());
+    }
+}
+

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

@@ -0,0 +1,126 @@
+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 ch.zhaw.projekt2.turnierverwaltung.Tournament;
+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;
+import javafx.scene.layout.VBox;
+
+public class ParticipantFormularController extends FXController {
+
+    @FXML
+    private Button addBtn;
+
+    @FXML
+    private Label birthDateLabel;
+
+    @FXML
+    private TextField birthDateTextField;
+
+    @FXML
+    private VBox changeBtn;
+
+    @FXML
+    private Label firstNameLabel;
+
+    @FXML
+    private TextField firstNameTextField;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private Label newParticipantFormularTitle;
+
+    @FXML
+    private Button closeBtn;
+
+    @FXML
+    private Button deleteBtn;
+
+
+    @FXML
+    private Label participantListTitle;
+
+    @FXML
+    private ListView<Participant> participantListView;
+
+    @FXML
+    private Label participantNameLabel;
+
+    @FXML
+    private TextField participantNameTextField;
+
+    @FXML
+    private Label phoneNumberLabel;
+
+    @FXML
+    private TextField phoneNumberTextField;
+
+    @FXML
+    private Button saveBtn;
+
+    @Override
+    public void shareGUIElementWithLanguageConfigurator() {
+        getLanguageConfigurator().recieveLabel(participantListTitle);
+        getLanguageConfigurator().recieveLabel(closeBtn);
+        getLanguageConfigurator().recieveLabel(deleteBtn);
+        getLanguageConfigurator().recieveLabel(newParticipantFormularTitle);
+        getLanguageConfigurator().recieveLabel(participantNameLabel);
+        getLanguageConfigurator().recieveLabel(firstNameLabel);
+        getLanguageConfigurator().recieveLabel(phoneNumberLabel);
+        getLanguageConfigurator().recieveLabel(birthDateLabel);
+        getLanguageConfigurator().recieveLabel(saveBtn);
+    }
+
+    @FXML
+    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.getFormattedDateOfBirth());
+    }
+
+    @FXML
+    void saveParticipant(ActionEvent event) {
+        getTournamentDecorator().savePlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText());
+        clearFormular();
+    }
+
+    private void clearFormular() {
+        firstNameTextField.clear();
+        participantNameTextField.clear();
+        phoneNumberTextField.clear();
+        birthDateTextField.clear();
+    }
+
+    @FXML
+    void delete(ActionEvent event) {
+        Participant participant = participantListView.getSelectionModel().getSelectedItems().get(0);
+        getTournamentDecorator().deleteParticipant(participant);
+    }
+
+    @FXML
+    void close(ActionEvent event) {
+        getFactoryDecorator().openScheduleView();
+    }
+
+    @Override
+    public void loadContent() {
+        Tournament tournament = getTournamentDecorator().getTournament();
+        if(tournament != null){
+            participantListView.setItems(tournament.getParticipants());
+        } else {
+            participantListView.getItems().clear();
+        }
+    }
+}

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

@@ -1,83 +0,0 @@
-package ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular;
-
-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;
-import javafx.scene.layout.VBox;
-
-public class ParticipantFormularController extends FXController {
-
-    @FXML
-    private Button addBtn;
-
-    @FXML
-    private Label birthDateLabel;
-
-    @FXML
-    private TextField birthDateTextField;
-
-    @FXML
-    private VBox changeBtn;
-
-    @FXML
-    private Label firstNameLabel;
-
-    @FXML
-    private TextField firstNameTextField;
-
-    @FXML
-    private GridPane grid;
-
-    @FXML
-    private Label newParticipantFormularTitle;
-
-    @FXML
-    private Button openBtn;
-
-    @FXML
-    private Label participantListTitle;
-
-    @FXML
-    private ListView<?> participantListView;
-
-    @FXML
-    private Label participantNameLabel;
-
-    @FXML
-    private TextField participantNameTextField;
-
-    @FXML
-    private Label phoneNumberLabel;
-
-    @FXML
-    private TextField phoneNumberTextField;
-
-    @FXML
-    private Button saveBtn;
-
-    @FXML
-    void addParticipant(ActionEvent event) {
-
-    }
-
-    @FXML
-    void changeParticipant(MouseEvent event) {
-
-    }
-
-    @FXML
-    void save(ActionEvent event) {
-
-    }
-
-    @Override
-    public void loadContent() {
-
-    }
-}

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

@@ -0,0 +1,89 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.Place;
+import ch.zhaw.projekt2.turnierverwaltung.Player;
+import ch.zhaw.projekt2.turnierverwaltung.Tournament;
+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;
+
+public class PlacesFormularController extends FXController {
+
+
+    @FXML
+    private Button closeBtn;
+
+    @FXML
+    private Button deleteBtn;
+
+    @FXML
+    private Label newPlaceTitle;
+
+    @FXML
+    private Label placeListTitle;
+
+    @FXML
+    private ListView<Place> placeListView;
+
+    @FXML
+    private Label placeNameLabel;
+
+    @FXML
+    private TextField placeNameTextField;
+
+    @FXML
+    private Button saveBtn;
+
+    @Override
+    public void shareGUIElementWithLanguageConfigurator() {
+        getLanguageConfigurator().recieveLabel(placeListTitle);
+        getLanguageConfigurator().recieveLabel(newPlaceTitle);
+        getLanguageConfigurator().recieveLabel(placeNameLabel);
+        getLanguageConfigurator().recieveLabel(closeBtn);
+        getLanguageConfigurator().recieveLabel(deleteBtn);
+        getLanguageConfigurator().recieveLabel(saveBtn);
+
+    }
+
+    @FXML
+    void changedSelection(MouseEvent event){
+        Place place = placeListView.getSelectionModel().getSelectedItems().get(0);
+        placeNameTextField.setText(place.getName());
+    }
+
+    @FXML
+    void savePlace(ActionEvent event) {
+        getTournamentDecorator().savePlace(placeNameTextField.getText());
+        clearFormular();
+    }
+
+    private void clearFormular() {
+        placeNameTextField.clear();
+    }
+
+    @FXML
+    void delete(ActionEvent event) {
+        Place place = placeListView.getSelectionModel().getSelectedItems().get(0);
+        getTournamentDecorator().deletePlace(place);
+    }
+
+    @FXML
+    void close(ActionEvent event) {
+        getFactoryDecorator().openScheduleView();
+    }
+
+    @Override
+    public void loadContent() {
+        Tournament tournament = getTournamentDecorator().getTournament();
+        if(tournament != null){
+            placeListView.setItems(tournament.getPlaces());
+        } else {
+            placeListView.getItems().clear();
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
+
+import ch.zhaw.projekt2.turnierverwaltung.LanguageConfigurator;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
+
+public class AlertDelete extends Alert {
+    ButtonType yesButton;
+    ButtonType noButton;
+    Boolean result;
+    String yes;
+    String no;
+    String titleDelete;
+    String headerDelete;
+    String contentDelete;
+
+    public AlertDelete(LanguageConfigurator languageConfigurator){
+        super(Alert.AlertType.WARNING);
+        yes = languageConfigurator.getSelectedLanguage("yes");
+        no = languageConfigurator.getSelectedLanguage("no");
+        titleDelete = languageConfigurator.getSelectedLanguage("titleDelete");
+        headerDelete = languageConfigurator.getSelectedLanguage("headerDelete");
+        contentDelete = languageConfigurator.getSelectedLanguage("contentDelete");
+        yesButton = new ButtonType(yes, ButtonBar.ButtonData.YES);
+        noButton = new ButtonType(no, ButtonBar.ButtonData.NO);
+        setTitle(titleDelete);
+        setHeaderText(headerDelete);
+        setContentText(contentDelete);
+        getButtonTypes().setAll(yesButton, noButton);
+    }
+
+    public boolean showAndGetResult() {
+        result = false;
+        showAndWait().ifPresent(type -> {
+            result = type == yesButton;
+        });
+        return result;
+    }
+
+
+}

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

@@ -0,0 +1,93 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.FileIO;
+import ch.zhaw.projekt2.turnierverwaltung.InvalidNameException;
+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 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;
+
+    @Override
+    public void shareGUIElementWithLanguageConfigurator() {
+        getLanguageConfigurator().recieveLabel(createBtn);
+        getLanguageConfigurator().recieveLabel(newTournamentFormularTitle);
+        getLanguageConfigurator().recieveLabel(openBtn);
+        getLanguageConfigurator().recieveLabel(deleteBtn);
+        getLanguageConfigurator().recieveLabel(tournamentListTitle);
+        getLanguageConfigurator().recieveLabel(tournamentModLabel);
+        getLanguageConfigurator().recieveLabel(tournamentNameLabel);
+    }
+
+    @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(getLanguageConfigurator());
+        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/MainWindow.fxml

@@ -8,7 +8,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<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.MainWindowController">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
    <top>
       <VBox alignment="TOP_CENTER" prefHeight="86.0" prefWidth="600.0" BorderPane.alignment="CENTER">
          <children>
@@ -16,17 +16,18 @@
                <menus>
                   <Menu mnemonicParsing="false" text="Start">
                      <items>
-                        <Menu mnemonicParsing="false" text="Sprache">
+                        <Menu fx:id="menuItemLanguage" mnemonicParsing="false" text="Sprache">
                            <items>
                               <MenuItem mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
+                              <MenuItem mnemonicParsing="false" onAction="#changeLangToEnglish" text="English" />
                            </items>
                         </Menu>
-                        <MenuItem mnemonicParsing="false" onAction="#closeApplication" text="Close" />
+                        <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
                      </items>
                   </Menu>
                </menus>
             </MenuBar>
-            <Label text="Turnier Manager">
+            <Label fx:id="mainTitle" text="Turnier Manager">
                <font>
                   <Font name="System Bold" size="40.0" />
                </font>
@@ -34,4 +35,12 @@
          </children>
       </VBox>
    </top>
+   <bottom>
+      <VBox prefHeight="49.0" prefWidth="600.0" BorderPane.alignment="CENTER">
+         <children>
+            <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" />
+            <VBox alignment="CENTER_RIGHT" prefHeight="200.0" prefWidth="100.0" />
+         </children>
+      </VBox>
+   </bottom>
 </BorderPane>

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

@@ -0,0 +1,59 @@
+<?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="90.0" prefWidth="450.0" style="-fx-border-color: black; -fx-border-insets: 2; -fx-border-width: 3;" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController">
+   <children>
+      <VBox fx:id="mainVBox" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="90.0">
+         <children>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <Label fx:id="participantNameOne" style="-fx-font-weight: bold;" text="Participant One">
+                     <HBox.margin>
+                        <Insets right="20.0" />
+                     </HBox.margin>
+                  </Label>
+                  <TextField fx:id="pointsTeamOne" alignment="CENTER" onKeyTyped="#saveGameResult" prefHeight="25.0" prefWidth="50.0">
+                     <HBox.margin>
+                        <Insets right="20.0" />
+                     </HBox.margin>
+                  </TextField>
+                  <Label text=":">
+                     <HBox.margin>
+                        <Insets right="20.0" />
+                     </HBox.margin>
+                  </Label>
+                  <TextField fx:id="pointsTeamTwo" alignment="CENTER" onKeyTyped="#saveGameResult" prefHeight="25.0" prefWidth="50.0">
+                     <HBox.margin>
+                        <Insets right="20.0" />
+                     </HBox.margin>
+                  </TextField>
+                  <Label fx:id="participantNameTwo" style="-fx-font-weight: bold;" text="Participant Two">
+                     <HBox.margin>
+                        <Insets right="20.0" />
+                     </HBox.margin>
+                  </Label>
+               </children>
+            </HBox>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <Label fx:id="locationLabel" text="Ort">
+                     <HBox.margin>
+                        <Insets right="20.0" />
+                     </HBox.margin>
+                  </Label>
+                  <ChoiceBox fx:id="placesChoiceBox" prefWidth="150.0" />
+               </children>
+               <VBox.margin>
+                  <Insets top="10.0" />
+               </VBox.margin>
+            </HBox>
+         </children>
+      </VBox>
+   </children>
+</VBox>

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

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+
+<BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameScheduleController">
+   <center>
+      <ScrollPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+         <content>
+            <HBox fx:id="hBoxCenter" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="324.0" prefWidth="600.0" />
+         </content>
+      </ScrollPane>
+   </center>
+   <top>
+      <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+         <children>
+            <CheckBox fx:id="treeView" minWidth="100.0" mnemonicParsing="false" onAction="#changeView" selected="true" text="Baumansicht" textOverrun="WORD_ELLIPSIS" wrapText="true">
+               <HBox.margin>
+                  <Insets left="20.0" right="20.0" />
+               </HBox.margin>
+            </CheckBox>
+            <Button fx:id="createScheduleBtn" mnemonicParsing="false" onAction="#createNewSchedule" text="Spielplan neu erstellen">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Button>
+            <Button fx:id="editParticipantBtn" mnemonicParsing="false" onAction="#openParticipantFormular" text="Teilnehmer bearbeiten">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Button>
+            <Button fx:id="editLocBtn" mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Button>
+            <Button fx:id="closeTournamentBtn" mnemonicParsing="false" onAction="#closeTournament" text="Close Tournament">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Button>
+         </children>
+      </HBox>
+   </top>
+</BorderPane>

app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/logging/log.properties

@@ -0,0 +1,33 @@
+## configures handlers
+java.util.logging.ConsoleHandler.level = ALL
+
+## File handler configuration
+## see https://docs.oracle.com/en/java/javase/11/docs/api/java.logging/java/util/logging/FileHandler.html
+java.util.logging.FileHandler.level = ALL
+# %g = generation number, %u = unique number to resolve conflicts
+java.util.logging.FileHandler.pattern = tournierverwaltung_angrynerds/log_files/log-%g-%u.log
+# use SimpleFormatter instead of default XMLFormatter
+java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
+java.util.logging.FileHandler.encoding = UTF-8
+# max log file size in byte before switching to next generation (=1kB); 0=unlimited
+java.util.logging.FileHandler.limit = 2048
+# max number of generations (%g) before overwriting (5 -> 0..4)
+java.util.logging.FileHandler.count=10
+java.util.logging.FileHandler.append=true
+
+## configures Formatter
+java.util.logging.SimpleFormatter.format = [%1$tc] %4$s: %5$s {%2$s}%6$s%n
+
+## configures default log level (for all loggers, if not overwritten below)
+.level = INFO
+
+## configure root logger ""
+handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
+level = FINE
+
+
+
+#ch.zhaw.prog2.turnierverwaltung.useParentHandlers = false
+
+# logger level for individual classes
+ch.zhaw.projekt2.turnierverwaltung.FileIO.level = FINEST

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>
@@ -54,9 +53,9 @@
             <Insets left="10.0" right="10.0" />
          </HBox.margin>
       </Separator>
-      <VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+      <VBox fx:id="changeBtn" alignment="TOP_CENTER" 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,104 @@
+<?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 alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/18" 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" HBox.hgrow="ALWAYS">
+         <children>
+            <Label fx:id="placeListTitle" text="Hinzugefügt">
+               <font>
+                  <Font name="System Bold" size="21.0" />
+               </font>
+               <VBox.margin>
+                  <Insets bottom="20.0" />
+               </VBox.margin>
+            </Label>
+            <ListView fx:id="placeListView" 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="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>
+               </children>
+            </HBox>
+         </children>
+         <HBox.margin>
+            <Insets left="40.0" />
+         </HBox.margin>
+      </VBox>
+      <Separator orientation="VERTICAL" prefHeight="200.0">
+         <HBox.margin>
+            <Insets left="10.0" right="10.0" />
+         </HBox.margin>
+      </Separator>
+      <VBox fx:id="changeBtn" alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+         <children>
+            <Label fx:id="newPlaceTitle" text="Ort ändern/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 minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <Label fx:id="placeNameLabel" styleClass="lableGrid" text="Name">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <TextField fx:id="placeNameTextField" 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="#savePlace" text="Speichern" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets bottom="10.0" top="30.0" />
+               </VBox.margin>
+            </Button>
+         </children>
+         <HBox.margin>
+            <Insets right="40.0" />
+         </HBox.margin>
+      </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.geometry.*?>
-<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.*?>
-<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.layout.*?>
-<?import javafx.scene.control.Label?>
+<?import javafx.scene.text.*?>
-<?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 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">
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
-                    <VBox.margin>
+               <VBox.margin>
-                        <Insets bottom="20.0" top="40.0" />
+                  <Insets bottom="20.0" top="40.0" />
-                    </VBox.margin>
+               </VBox.margin>
-                </Button>
+               <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);
+            File file = new File("Not-existing-File");
-            assertThrows(FileNotFoundException.class, () -> io.loadTournament(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 {
+        void saveTournament() throws IOException, InvalidNameException, Tournament.InvalidTypeException {
-            Tournament tournament = new Tournament("test1");
+            Tournament tournament = null;
+            tournament = new Tournament("test1", Tournament.Type.KO);
             io.saveTournament(tournament);
             File file = new File(mainDir + "/saves/test1.txt");
-            if(file.exists()){
+            assertTrue(file.exists());
-                file.delete();
+            assertTrue(file.delete());
-            } else {
+            assertFalse(file.exists());
-                fail();
-            }
         }
 
         @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));
+        }
+    }
 }

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

@@ -0,0 +1,147 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@DisplayName("TournamentTest")
+public class TournamentTest {
+
+    @Nested
+    @DisplayName("KOMode")
+    public class KOMode {
+        private Tournament tournament;
+
+        @BeforeEach
+        void setup() {
+            try {
+                tournament = new Tournament("Name", Tournament.Type.KO);
+            } catch (InvalidNameException e) {
+                e.printStackTrace();
+                fail();
+            } catch (Tournament.InvalidTypeException e) {
+                e.printStackTrace();
+                fail();
+            }
+        }
+
+        @Test
+        @DisplayName("Test invalid instance")
+        void makeInvalidInstance() {
+            assertThrows(InvalidNameException.class, () -> new Tournament(".", Tournament.Type.KO));
+        }
+
+        @Test
+        @DisplayName("Save Participant")
+        void saveParticipantTest() {
+            //Checks if one Participant gets added
+            Participant participantOne = Mockito.mock(Player.class);
+            when(participantOne.equals(any(Participant.class))).thenReturn(false);
+
+            assertEquals(0, tournament.getParticipants().size());
+            tournament.saveParticipant(participantOne);
+            assertEquals(1, tournament.getParticipants().size());
+
+            //Checks if a second Participant gets added
+            Participant participantTwo = Mockito.mock(Player.class);
+            tournament.saveParticipant(participantTwo);
+            assertEquals(2, tournament.getParticipants().size());
+
+            //Checks if a allready added Particpant does not get added
+            when(participantOne.equals(any(Participant.class))).thenReturn(true);
+            tournament.saveParticipant(participantTwo);
+            assertEquals(2, tournament.getParticipants().size());
+
+        }
+
+        @Test
+        @DisplayName("Remove Participant")
+        void removeParticipantTest() {
+            Participant participant = Mockito.mock(Player.class);
+
+            //Checks if Error is thrown if Participant not in list
+            assertThrows(Tournament.ParticipantNotExistsException.class, () -> tournament.removeParticipant(participant));
+
+            //Checks if participant gets removed
+            tournament.saveParticipant(participant);
+            assertEquals(1, tournament.getParticipants().size());
+            try {
+                tournament.removeParticipant(participant);
+                assertEquals(0, tournament.getParticipants().size());
+            } catch (Tournament.ParticipantNotExistsException e) {
+                fail();
+            }
+        }
+
+        @Test
+        @DisplayName("Add Place")
+        void addPlaceTest() {
+            Place place = mock(Place.class);
+            when(place.equals(any(Place.class))).thenReturn(false).thenReturn(true);
+
+            assertEquals(0, tournament.getPlaces().size());
+            tournament.savePlace(place);
+            assertEquals(1, tournament.getPlaces().size());
+            tournament.savePlace(place);
+            assertEquals(2, tournament.getPlaces().size());
+            tournament.savePlace(place);
+            assertEquals(2, tournament.getPlaces().size());
+        }
+
+        @Test
+        @DisplayName("Remove Place")
+        void removePlaceTest() {
+            Place place = mock(Place.class);
+
+            assertThrows(Tournament.PlaceNotExistsException.class, () -> tournament.removePlace(place));
+
+            tournament.savePlace(place);
+            assertEquals(1, tournament.getPlaces().size());
+            try {
+                tournament.removePlace(place);
+                assertEquals(0, tournament.getPlaces().size());
+            } catch (Tournament.PlaceNotExistsException e) {
+                fail();
+            }
+        }
+
+        @Test
+        @DisplayName("Test gameschedule calculation")
+        void calcGameSchedule() {
+            Participant participant = mock(Player.class);
+            when(participant.equals(any(Participant.class))).thenReturn(false);
+
+            //Checks if invalid number of Participants throws error
+            assertThrows(Tournament.NumberOfParticipantInvalidException.class, () -> tournament.createGameSchedule());
+            for (int i = 0; i < 8; i++) {
+                if (i % 4 == 0 && i > 0) {
+                    try {
+                        tournament.createGameSchedule();
+                        assertEquals(2, tournament.getGameList().size());
+                        tournament.saveParticipant(participant);
+                    } catch (Tournament.NumberOfParticipantInvalidException e) {
+                        fail();
+                    }
+
+                } else {
+                    assertThrows(Tournament.NumberOfParticipantInvalidException.class, () -> tournament.createGameSchedule());
+                    tournament.saveParticipant(participant);
+                }
+            }
+            try {
+                tournament.createGameSchedule();
+            } catch (Tournament.NumberOfParticipantInvalidException e) {
+                fail();
+            }
+            assertEquals(3, tournament.getGameList().size());
+        }
+
+    }
+}

gradlew.bat

@@ -46,7 +46,7 @@ echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo place of your Java installation.
 
 goto fail
 
@@ -60,7 +60,7 @@ echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo place of your Java installation.
 
 goto fail