fixed places are deleted.

solved #45

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

@@ -7,40 +7,60 @@ public abstract class FXController {
     FactoryDecorator factoryDecorator;
     FileIO fileIO;
     Pane pane;
+    IsObserver listener;
+
+    public FXController(){
+        listener = new IsObserver() {
+            @Override
+            public void update() {
+                loadContent();
+            }
+        };
+    }
 
     public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane){
         this.tournamentDecorator = tournamentDecorator;
         this.fileIO = fileIO;
         this.factoryDecorator = factoryDecorator;
         this.pane = pane;
-        tournamentDecorator.addListener(new IsObserver() {
+        addListener();
-            @Override
-            public void update() {
-                loadContent();
-            }
-        });
-        factoryDecorator.addListener(new IsObserver() {
-            @Override
-            public void update() {
-                loadContent();
-            }
-        });
     }
 
     public abstract void loadContent();
 
+    protected void setTournamentDecorator(TournamentDecorator tournamentDecorator) {
+        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 void setPane(Pane pane) {
+        this.pane = pane;
+    }
+
     protected Pane getPane() {
         return pane;
     }

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

@@ -1,19 +1,24 @@
 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 TournamentDecorator tournamentDecorator;
     private FileIO fileIO;
 
-    public Factory(FileIO fileIO, TournamentDecorator tournamentDecorator){
+    public Factory(FileIO fileIO, TournamentDecorator tournamentDecorator) {
         this.fileIO = fileIO;
         this.tournamentDecorator = tournamentDecorator;
+
     }
 
     public TournamentDecorator getTournamentDecorator() {
@@ -24,7 +29,7 @@ public class Factory {
         this.tournamentDecorator.setTournament(tournament);
     }
 
-    public BorderPane loadMainWindow(){
+    public BorderPane loadMainWindow() {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml"));
         try {
             return loader.load();
@@ -35,41 +40,120 @@ public class Factory {
         return null;
     }
 
-    public void loadTournamentList(BorderPane pane, FactoryDecorator factoryDecorator){
+    public void loadAllViews(FactoryDecorator factoryDecorator, BorderPane pane){
+        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);
-        TournamentListController controller = (TournamentListController) setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"), factoryDecorator);
+        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, FactoryDecorator factoryDecorator) {
+    public void showParticipantFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
-        setCenterOfBorderPane(pane, getClass().getResource("participantAddFormular/participantFormular.fxml"), factoryDecorator);
+        setCenterOfBorderPane(pane, View.participantFormular);
     }
 
-    public void loadPlacesFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
+    public void showPlacesFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
-        setCenterOfBorderPane(pane, getClass().getResource("placesAddFormular/PlacesFormular.fxml"), factoryDecorator);
+        setCenterOfBorderPane(pane, View.placesFormular);
     }
 
-    public void loadGameScheduler(BorderPane pane, FactoryDecorator factoryDecorator) {
+    public void showGameScheduler(BorderPane pane, FactoryDecorator factoryDecorator) {
-        setCenterOfBorderPane(pane, getClass().getResource("gameScheduleView/GameSchedule.fxml"), factoryDecorator);
+        setCenterOfBorderPane(pane, View.gameScheduler);
     }
 
-    private FXController setCenterOfBorderPane(BorderPane pane, URL location, FactoryDecorator factoryDecorator) {
+    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(tournamentDecorator, fileIO, factoryDecorator, pane);
+            controller.setup(tournamentDecorator, fileIO, factoryDecorator, box, gameDecorator);
-            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 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);
+        }
+
+    }
 
 }

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

@@ -1,7 +1,13 @@
 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;
@@ -44,21 +50,123 @@ public class FactoryDecorator implements IsObservable{
     public void openTournament(FileIO.TournamentFile tournamentFile){
         try {
             factory.setTournament(fileIO.loadTournament(tournamentFile));
-            factory.loadGameScheduler((BorderPane) pane, this);
+            openScheduleView();
-            informListener();
+            clearMessage(false);
-        } catch (IOException e) {
+        } catch (IOException | ClassNotFoundException e) {
             e.printStackTrace();
-        } catch (ClassNotFoundException e) {
+            printMessageToFooter("Fehler beim lesen der Datei.", true);
-            e.printStackTrace();
+        }  //TODO handle and logging
-        } //TODO handle and logging
+    }
+
+    public void openTournamentList() {
+        factory.showTournamentList((BorderPane) pane, this);
+        informListener();
     }
 
     public void openParticipantFormular() {
-        factory.loadParticipantFormular((BorderPane) pane, this);
+        factory.showParticipantFormular((BorderPane) pane, this);
+        informListener();
     }
 
     public void openPlacesFormular() {
-        factory.loadPlacesFormular((BorderPane) pane, this);
+        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 void informListener() {

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

@@ -6,9 +6,6 @@ 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;
 
 /**
@@ -18,7 +15,7 @@ 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.
@@ -43,6 +40,7 @@ public class FileIO {
         }
     }
 
+
     /**
      * Returns a list with all save Files that are located inside the save folder.
      *
@@ -51,18 +49,26 @@ public class FileIO {
     public ObservableList<TournamentFile> getList() {
         logger.fine("Creating a List out of all Files in the save directory and returning it");
         ObservableList<TournamentFile> tournamentFiles = FXCollections.observableArrayList();
-        for(File tournament : saves.listFiles()){
+        for (File tournament : saves.listFiles()) {
             tournamentFiles.add(new TournamentFile(tournament.toURI()));
         }
         return tournamentFiles;
     }
 
-    public boolean tournamentExists(String name){
+    /**
-        for(TournamentFile file : getList()) {
+     * Method to check if a tournament with the existing name already exists.
-            if(file.toString().toLowerCase().equals(name.toLowerCase())){
+     * @param name that is being checked
+     * @return true if the name exists already false if the name is unique
+     */
+    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;
     }
 
@@ -75,7 +81,7 @@ public class FileIO {
      * @throws IOException            File not readable
      * @throws FileNotFoundException  File not found
      */
-    public Tournament loadTournament(File tournamentFile) throws IOException, ClassNotFoundException, FileNotFoundException {
+    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");
@@ -90,13 +96,13 @@ 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);
         } 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);
         } finally {
             if (in != null) {
@@ -104,7 +110,7 @@ public class FileIO {
                     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);
                 }
             }
@@ -119,7 +125,7 @@ public class FileIO {
      * @throws IOException           File not readable
      * @throws FileNotFoundException File not found
      */
-    public void saveTournament(Tournament tournament) throws IOException, FileNotFoundException {
+    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");
@@ -133,20 +139,20 @@ public class FileIO {
             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) {
-            logger.severe("Could not find tournament File");
+            logger.severe("Could not find tournament File" + e);
             throw e;
         } catch (IOException e) {
-            logger.severe("Failed to write File" + tournament.getName());
+            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) {
-                    logger.severe("Failed to close output stream");
+                    logger.severe("Failed to close output stream" + e);
                     throw new IOException("Error while closing output stream", e);
                 }
             }
@@ -172,14 +178,29 @@ public class FileIO {
             logger.warning("Failed to delete requested File");
             throw new FileNotFoundException("File deletion unsuccessful");
         }
+    }
 
-    public class TournamentFile extends File{
+    /**
+     * 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(){
+        /**
+         * Method overrides toString to return the names of the tournaments without having .txt endings.
+         *
+         * @return String without a txt ending
+         */
+        @Override
+        public String toString() {
             return getName().split("\\.")[0];
         }
 

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

@@ -3,16 +3,20 @@ package ch.zhaw.projekt2.turnierverwaltung;
 import java.io.Serializable;
 
 public class Game implements Serializable {
-    private Participant participant1, Participant2;
+    private Participant participant1, participant2;
     private int points1, points2;
-    private Location location;
+    private Place place;
+    private Game previousGame1, previousGame2;
 
-    public Location getLocation() {
+
-        return location;
+    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() {
@@ -39,11 +43,35 @@ public class Game implements Serializable {
         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/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

@@ -6,4 +6,5 @@ public interface Participant extends Serializable {
     String getName();
     void setName(String name);
     boolean equals(Participant participant);
+    void change(Participant participant);
 }

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

@@ -4,7 +4,7 @@ import java.io.Serializable;
 
 public class Person implements Serializable {
     private final String NAME_MATCHING_REGEX = "[a-zA-Z]{1,20}";
-    private final String PHONE_MATCHING_REGEX = "[\\+0-9]+";
+    private final String PHONE_MATCHING_REGEX = "[\\+]?[0-9]*";
 
     private String name;
     private String firstName;

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

@@ -0,0 +1,36 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import java.io.Serializable;
+
+public class Place implements Serializable {
+    private final String NAME_MATCHING_REGEX = "[a-zA-Z0-9]{1,20}";
+    private String name;
+
+    public Place(String name) throws InvalidNameException {
+        if(!name.matches(NAME_MATCHING_REGEX)){
+            throw new InvalidNameException("The Name is Invalid.");
+        }
+        setName(name);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString(){
+        return name;
+    }
+
+    public boolean equals(Place place){
+        return name.equals(place.getName());
+    }
+
+    public void change(Place place) {
+        //TODO: If Place gets more developed in future releases
+    }
+}

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

@@ -9,7 +9,7 @@ public class Player extends Person implements Participant{
 
     private LocalDate dateOfBirth;
 
-    public Player(String firstName, String name, String phoneNumber, String dateOfBirth) throws InvalidNameException, InvalidPhoneNumberException {
+    public Player(String firstName, String name, String phoneNumber, String dateOfBirth) throws InvalidNameException, InvalidPhoneNumberException, InvalidDateException {
         super(firstName, name, phoneNumber);
         setDateOfBirth(dateOfBirth);
     }
@@ -28,13 +28,46 @@ public class Player extends Person implements Participant{
         }
     }
 
-    public void setDateOfBirth(String dateOfBirth) {
+    public void setDateOfBirth(String dateOfBirth) throws InvalidDateException {
-        String[] date = dateOfBirth.split("\\.");
+        if(dateOfBirth.length() > 0) {
-        this.dateOfBirth = LocalDate.of(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
+            String[] date = dateOfBirth.split("\\.");
+            try{
+                this.dateOfBirth = LocalDate.of(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
+            } catch (NumberFormatException | IndexOutOfBoundsException e) {
+                e.printStackTrace();
+                throw new InvalidDateException("Date invalid");
+            }
+
+        } else {
+            dateOfBirth = null;
+        }
+    }
+
+    public void setDateOfBirth(LocalDate dateOfBirth) {
+        this.dateOfBirth = dateOfBirth;
     }
 
     @Override
     public boolean equals(Participant participant) {
         return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
     }
+
+    @Override
+    public void change(Participant participant) {
+        Player player = (Player) participant;
+        setDateOfBirth(player.getDateOfBirth());
+        setPhoneNumber(player.getPhoneNumber());
+    }
+
+    public class InvalidDateException extends Exception {
+        public InvalidDateException() {
+            super();
+        }
+
+        public InvalidDateException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
 }

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

@@ -27,11 +27,24 @@ public class Team implements Participant {
         this.name = name;
     }
 
+    public void setPlayers(List<Player> players) {
+        this.players = players;
+    }
+
+    public List<Player> getPlayers() {
+        return players;
+    }
+
     @Override
     public boolean equals(Participant participant) {
         return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
     }
 
+    @Override
+    public void change(Participant participant) {
+        return;
+    }
+
     public Person getContactPerson() {
         return contactPerson;
     }

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

@@ -3,69 +3,254 @@ package ch.zhaw.projekt2.turnierverwaltung;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.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 List<Participant> participants;
+    private final List<Participant> participants;
+    private final List<Place> places;
+    private List<List<Game>> gameList;
 
+    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}")){
+        if (!name.matches("[\\w]{1,20}")) {
-            throw new InvalidNameException("Invalid Name entered"); //TODO handle en logging.
+            logger.warning("The entered name is incorrect, Entered name: " + name);
-        } else if(!Arrays.asList(Type.values()).contains(type)){
+            throw new InvalidNameException("Invalid Name entered");
-            throw new InvalidTypeException("Invalid Type selected"); //TODO handle en logging.
+        } 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");
     }
 
-    public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
+    /**
-        for(Participant participant : participants){
+     * Method used to save new Participant into the tournament, checking if participant already exists and if yes will
-            if(participant.equals(newParticipant)){
+     * edit the already existing participant
-                participants.remove(participant);
+     *
+     * @param newParticipant the Participant to be saved or edited
+     */
+    public void saveParticipant(Participant newParticipant) {
+        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
+     * @throws ParticipantNotExistsException
+     */
     public void removeParticipant(Participant participant) throws ParticipantNotExistsException {
-        if(!participants.contains(participant)){
+        logger.finer("Trying to remove " + participant + " from participants List");
-            throw new ParticipantNotExistsException("The given Participant is not part of this Tournament");
+        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);
+    }
+
+    /**
+     * @param place
+     * @throws PlaceNotExistsException
+     */
+    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;
     }
 
+    /**
+     * Settermethod for the name of the tournament
+     *
+     * @param name the new name that should be set
+     */
     public void setName(String name) {
         this.name = name;
     }
 
+    /**
+     * Gettermethod 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
+     */
     public void setType(Type type) {
+        logger.fine("Setting the type of the tournament to: " + type);
         this.type = type;
     }
 
+    /**
+     * Gettermethod 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");
 
@@ -80,13 +265,16 @@ public class Tournament implements Serializable {
             return name;
         }
 
-        public static ObservableList<Type> getObservableList(){
+        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 class InvalidTypeException extends Exception {
         public InvalidTypeException() {
             super();
@@ -98,17 +286,9 @@ public class Tournament implements Serializable {
 
     }
 
-    public class ParticipantExistsException extends Exception {
+    /**
-        public ParticipantExistsException() {
+     * Custom Expeption thrown when a Participant does not exist
-            super();
+     */
-        }
-
-        public ParticipantExistsException(String errorMessage) {
-            super(errorMessage);
-        }
-
-    }
-
     public class ParticipantNotExistsException extends Exception {
         public ParticipantNotExistsException() {
             super();
@@ -120,5 +300,31 @@ public class Tournament implements Serializable {
 
     }
 
+    /**
+     * Custom Exception thrown when a Place does not exist
+     */
+    public class PlaceNotExistsException extends Exception {
+        public PlaceNotExistsException() {
+            super();
+        }
+
+        public PlaceNotExistsException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    /**
+     * Custom Exception thrown when the number of participants is not valid
+     */
+    public class NumberOfParticipantInvalidException extends Exception {
+        public NumberOfParticipantInvalidException() {
+            super();
+        }
+
+        public NumberOfParticipantInvalidException(String msg) {
+            super(msg);
+        }
+    }
 
 }

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

@@ -1,14 +1,20 @@
 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;
 
 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);
@@ -16,10 +22,16 @@ public class TournamentDecorator implements IsObservable{
             @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) {
@@ -44,66 +56,138 @@ public class TournamentDecorator implements IsObservable{
         listener.remove(observer);
     }
 
+
     public void saveTournament(){
-        try {
+        executorService.execute(new saveTask());
-            fileIO.saveTournament(tournament);
+        factoryDecorator.clearMessage(false);
-        } catch (IOException e) {
+        factoryDecorator.printMessageToFooter("Zuletzt gespeichert: " + new Date().toString(),false);
-            e.printStackTrace(); //TODO handle and logging
-        }
     }
 
+
+
     public void createTournament(String name, Tournament.Type type){
-        if(fileIO.tournamentExists(name)){
+
-            System.out.println("Tournament with same name exists already.");
-            return; //TODO handle and logging
-        }
         try {
+            if(fileIO.tournamentExists(name)){
+                //TODO:Logger
+                factoryDecorator.printMessageToFooter("Turniername existiert bereits",true);
+                return;
+            }
             Tournament tournament = new Tournament(name, type);
             fileIO.saveTournament(tournament);
+            factoryDecorator.clearMessage(true);
             informListener();
         } catch (InvalidNameException e) {
-            e.printStackTrace(); //TODO handle and logging
+            e.printStackTrace();
+            //TODO: Logger
+            factoryDecorator.printMessageToFooter("Invalider Turniername",true);
         } catch (Tournament.InvalidTypeException e) {
-            e.printStackTrace(); //TODO handle and logging
+            e.printStackTrace();
+            //TODO: Logger
+            factoryDecorator.printMessageToFooter("Turniermodus nicht möglich",true);
+
         } catch (IOException e) {
-            e.printStackTrace(); //TODO handle and logging
+            e.printStackTrace();
+            //TODO: Logger
+            factoryDecorator.printMessageToFooter("Fehler bei Dateizugriff",true);
         }
+
     }
 
     public void deleteTournament(FileIO.TournamentFile tournamentFile){
         try {
             fileIO.deleteTournament(tournamentFile);
+            factoryDecorator.clearMessage(true);
             informListener();
         } catch (IOException e) {
             e.printStackTrace();  //TODO handle and logging
+            factoryDecorator.printMessageToFooter("Fehler bei Dateizugriff",true);
         }
     }
 
+    public void createNewGameSchedule() {
+        //TODO: logging
+        try {
+            tournament.createGameSchedule();
+            factoryDecorator.clearMessage(true);
+        } catch (Tournament.NumberOfParticipantInvalidException e) {
+            e.printStackTrace();
+            factoryDecorator.printMessageToFooter("Anzahl Teilnehmer nicht vielfaches von 2",true);
+        }
+        informListener();
+    }
+
     public void savePlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
         try {
-            tournament.addParticipant(new Player(firstName, name, phoneNumber, dateOfBirth));
+            tournament.saveParticipant(new Player(firstName, name, phoneNumber, dateOfBirth));
+            factoryDecorator.clearMessage(true);
             informListener();
-        } catch (Tournament.ParticipantExistsException e) {
-            e.printStackTrace(); //TODO handle and logging
         } catch (InvalidNameException e) {
             e.printStackTrace(); //TODO handle and logging
+            factoryDecorator.printMessageToFooter("Invalider Teilnehmername",true);
         } catch (Person.InvalidPhoneNumberException e) {
             e.printStackTrace(); //TODO handle and logging
+            factoryDecorator.printMessageToFooter("Invalide Telefonnummer",true);
+        } catch (Player.InvalidDateException e) {
+            e.printStackTrace();
+            factoryDecorator.printMessageToFooter("Ungültiges Geburtsdatum", true);
         }
     }
 
     public void deleteParticipant(Participant participant){
         try {
             tournament.removeParticipant(participant);
+            factoryDecorator.clearMessage(true);
             informListener();
         } catch (Tournament.ParticipantNotExistsException e) {
             e.printStackTrace(); //TODO handle and logging
+            factoryDecorator.printMessageToFooter("Teilnehmer existiert nicht",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
+            factoryDecorator.printMessageToFooter("Invalider Ortsname",true);
+        }
+    }
+
+    public void deletePlace(Place place){
+        try {
+            tournament.removePlace(place);
+            factoryDecorator.clearMessage(true);
+            informListener();
+        } catch (Tournament.PlaceNotExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+            factoryDecorator.printMessageToFooter("Ort existiert nicht",true);
+        }
+    }
+
+
     public void informListener() {
         for(IsObserver observer : listener) {
             observer.update();
         }
     }
+
+    private class saveTask implements Runnable {
+
+        @Override
+        public void run() {
+            try {
+                fileIO.saveTournament(tournament);
+            } catch (IOException e) {
+                e.printStackTrace();
+                Platform.runLater(() -> {
+                    factoryDecorator.printMessageToFooter("Datenzugriff nicht moeglich",true);
+                });
+            }
+        }
+    }
+
 }

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

@@ -8,30 +8,29 @@ import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
-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 FactoryDecorator factoryDecorator;
     private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO);
     private Factory factory = new Factory(fileIO, tournamentDecorator); //TODO make it private!
-    private FactoryDecorator factoryDecorator;
 
     @Override
     public void start(Stage primaryStage) throws Exception {
 
         BorderPane pane = factory.loadMainWindow();
         factoryDecorator = new FactoryDecorator(fileIO, factory, pane);
-        factory.loadTournamentList(pane, factoryDecorator);
+        factory.loadAllViews(factoryDecorator, pane);
+        tournamentDecorator.setFactoryDecorator(factoryDecorator);
+        factoryDecorator.openTournamentList();
 
 
         Scene scene = new Scene(pane);
         primaryStage.setScene(scene);
         primaryStage.setMaximized(true);
-        primaryStage.setResizable(false);
+        primaryStage.setResizable(true);
         primaryStage.setFullScreen(false);
         primaryStage.show();
     }

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

@@ -1,16 +1,80 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
 
-import ch.zhaw.projekt2.turnierverwaltung.FXController;
+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 {
+public class GameController extends FXController{
+
+    private GameDecorator gameDecorator;
 
     @FXML
-    private ChoiceBox<?> placesChoiceBox;
+    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
+    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() {
-
+        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) {
+        setTournamentDecorator(tournamentDecorator);
+        this.gameDecorator = gameDecorator;
+        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

@@ -1,11 +1,38 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.Tournament;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+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;
+
+    @FXML
+    void createNewSchedule(ActionEvent event) {
+        getTournamentDecorator().createNewGameSchedule();
+    }
+
     @FXML
     void openPlacesFormular(ActionEvent event) {
         getFactoryDecorator().openPlacesFormular();
@@ -16,9 +43,19 @@ public class GameScheduleController extends FXController {
         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

@@ -3,6 +3,7 @@ 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;
@@ -76,31 +77,37 @@ public class ParticipantFormularController extends FXController {
         birthDateTextField.setText(participant.getFormatedDateOfBirth());
     }
 
-    @FXML
-    void changeParticipant(MouseEvent event) {
-
-    }
-
     @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) {
-        System.out.println("delete");
         Participant participant = participantListView.getSelectionModel().getSelectedItems().get(0);
         getTournamentDecorator().deleteParticipant(participant);
     }
 
     @FXML
     void close(ActionEvent event) {
-
+        getFactoryDecorator().openScheduleView();
     }
 
     @Override
     public void loadContent() {
-        participantListView.setItems(getTournamentDecorator().getTournament().getParticipants());
+        Tournament tournament = getTournamentDecorator().getTournament();
+        if(tournament != null){
+            participantListView.setItems(tournament.getParticipants());
+        } else {
+            participantListView.getItems().clear();
+        }
     }
 }

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

@@ -1,6 +1,9 @@
 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;
@@ -9,11 +12,21 @@ import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
 
 public class PlacesFormularController extends FXController {
 
     @FXML
-    private Label AddListTitle;
+    private Button addBtn;
+
+    @FXML
+    private VBox changeBtn;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private Label newPlaceFormularTitle;
 
     @FXML
     private Button closeBtn;
@@ -21,46 +34,56 @@ public class PlacesFormularController extends FXController {
     @FXML
     private Button deleteBtn;
 
-    @FXML
-    private GridPane grid;
 
     @FXML
-    private ListView<?> locationListView;
+    private Label placeListTitle;
 
     @FXML
-    private Label locationNameLabel;
+    private ListView<Place> placeListView;
 
     @FXML
-    private TextField locationNameTextField;
+    private Label placeNameLabel;
 
     @FXML
-    private Label newLocationFormularTitle;
+    private TextField placeNameTextField;
 
     @FXML
     private Button saveBtn;
 
     @FXML
-    void changedSelection(MouseEvent event) {
+    void changedSelection(MouseEvent event){
-
+        Place place = placeListView.getSelectionModel().getSelectedItems().get(0);
+        placeNameTextField.setText(place.getName());
     }
 
     @FXML
-    void closeFormular(ActionEvent event) {
+    void savePlace(ActionEvent event) {
+        getTournamentDecorator().savePlace(placeNameTextField.getText());
+        clearFormular();
+    }
 
+    private void clearFormular() {
+        placeNameTextField.clear();
     }
 
     @FXML
-    void deleteSelectedPlace(ActionEvent event) {
+    void delete(ActionEvent event) {
-
+        Place place = placeListView.getSelectionModel().getSelectedItems().get(0);
+        getTournamentDecorator().deletePlace(place);
     }
 
     @FXML
-    void saveLocation(ActionEvent event) {
+    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

@@ -4,8 +4,6 @@ import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
 
-import java.io.IOException;
-
 public class AlertDelete extends Alert {
     ButtonType yesButton = new ButtonType("Ja", ButtonBar.ButtonData.YES);
     ButtonType noButton = new ButtonType("Nein", ButtonBar.ButtonData.NO);

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

@@ -2,6 +2,7 @@ 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;

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>
@@ -34,4 +34,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

@@ -7,40 +7,53 @@
 <?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">
-<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="150.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GameContoller">
    <children>
-      <Label fx:id="teamNameOne" text="Team One" />
+      <VBox fx:id="mainVBox" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="90.0">
-      <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
          <children>
-            <Label text="Points">
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
-               <HBox.margin>
+               <children>
-                  <Insets right="20.0" />
+                  <Label fx:id="participantNameOne" style="-fx-font-weight: bold;" text="Participant One">
-               </HBox.margin>
+                     <HBox.margin>
-            </Label>
+                        <Insets right="20.0" />
-            <TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.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 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>
-      </HBox>
+      </VBox>
-      <Label fx:id="teamNameTwo" text="Team Two" />
-      <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
-         <children>
-            <Label text="Points">
-               <HBox.margin>
-                  <Insets right="20.0" />
-               </HBox.margin>
-            </Label>
-            <TextField fx:id="pointsTeamTwo" prefHeight="25.0" prefWidth="50.0" />
-         </children>
-      </HBox>
-      <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
-         <children>
-            <Label text="Ort">
-               <HBox.margin>
-                  <Insets right="20.0" />
-               </HBox.margin>
-            </Label>
-            <ChoiceBox fx:id="placesChoiceBox" prefWidth="150.0" />
-         </children>
-      </HBox>
    </children>
 </VBox>

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

@@ -1,26 +1,41 @@
 <?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.layout.BorderPane?>
+<?import javafx.scene.layout.*?>
-<?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/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameScheduleController">
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameScheduleController">
    <top>
-      <HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+      <HBox alignment="TOP_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
          <children>
-            <Button mnemonicParsing="false" onAction="#openParticipantFormular" text="Teilnehmer bearbeiten">
+            <CheckBox fx:id="treeView" mnemonicParsing="false" onAction="#changeView" selected="true" text="Baumansicht" />
+            <Button fx:id="createScheduleBtn" mnemonicParsing="false" onAction="#createNewSchedule" text="Create New Game Schedule">
                <HBox.margin>
                   <Insets right="20.0" />
                </HBox.margin>
             </Button>
-            <Button mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten">
+            <Button fx:id="editParticipantBtn" mnemonicParsing="false" onAction="#openParticipantFormular" text="Teilnehmer bearbeiten">
                <HBox.margin>
-                  <Insets right="40.0" />
+                  <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" layoutX="470.0" layoutY="10.0" mnemonicParsing="false" onAction="#closeTournament" text="Close Tournament">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin></Button>
          </children>
       </HBox>
    </top>
+   <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>
 </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

@@ -53,7 +53,7 @@
             <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="Teilnehmer ändern/erstellen">
                <font>

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

@@ -1,23 +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.Label?>
+<?import javafx.scene.layout.*?>
-<?import javafx.scene.control.ListView?>
+<?import javafx.scene.text.*?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
 
-<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="404.0" prefWidth="635.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular.PlacesFormularController">
+<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.placesAddFormular.PlacesFormularController">
    <children>
-      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0">
+      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
-            <Label fx:id="AddListTitle" text="Hinzugefügt">
+            <Label fx:id="placeListTitle" text="Hinzugefügt">
                <font>
                   <Font name="System Bold" size="21.0" />
                </font>
@@ -25,30 +17,38 @@
                   <Insets bottom="20.0" />
                </VBox.margin>
             </Label>
-            <ListView fx:id="locationListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+            <ListView fx:id="placeListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                <VBox.margin>
-                  <Insets left="10.0" right="10.0" />
-               </VBox.margin>
-               <opaqueInsets>
                   <Insets />
-               </opaqueInsets>
+               </VBox.margin>
             </ListView>
             <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                <children>
-                  <Button fx:id="closeBtn" mnemonicParsing="false" onAction="#closeFormular" text="Schliessen">
+                  <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="deleteBtn" mnemonicParsing="false" onAction="#deleteSelectedPlace" text="Löschen" />
                </children>
             </HBox>
          </children>
+         <HBox.margin>
+            <Insets left="40.0" />
+         </HBox.margin>
       </VBox>
-      <Separator orientation="VERTICAL" prefHeight="200.0" />
+      <Separator orientation="VERTICAL" prefHeight="200.0">
-      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.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="newLocationFormularTitle" text="Austragungsort bearbeiten/erstellen">
+            <Label fx:id="newplaceFormularTitle" text="Ort ändern/erstellen">
                <font>
                   <Font name="System Bold" size="21.0" />
                </font>
@@ -64,14 +64,17 @@
                </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="locationNameLabel" styleClass="lableGrid" text="Austragungsort">
+                  <Label fx:id="placeNameLabel" styleClass="lableGrid" text="Name">
                      <GridPane.margin>
                         <Insets />
                      </GridPane.margin>
                   </Label>
-                  <TextField fx:id="locationNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
+                  <TextField fx:id="placeNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
                      <GridPane.margin>
                         <Insets />
                      </GridPane.margin>
@@ -79,12 +82,15 @@
                </children>
             </GridPane>
             <Separator prefWidth="200.0" />
-            <Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#saveLocation" text="Speichern" VBox.vgrow="ALWAYS">
+            <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/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