test performance with separete thread to save and load file

changed to variable names

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,65 @@ 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 void removeListener(){
+        tournamentDecorator.removeListener(listener);
+        factoryDecorator.removeListener(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,8 +1,11 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
+import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController;
+import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameDecorator;
 import ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.TournamentListController;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.VBox;
 
 import java.io.IOException;
 import java.net.URL;
@@ -10,6 +13,7 @@ import java.net.URL;
 public class Factory {
     private TournamentDecorator tournamentDecorator;
     private FileIO fileIO;
+    //TODO save views instead of recreate them.
 
     public Factory(FileIO fileIO, TournamentDecorator tournamentDecorator){
         this.fileIO = fileIO;
@@ -54,6 +58,20 @@ public class Factory {
         setCenterOfBorderPane(pane, getClass().getResource("gameScheduleView/GameSchedule.fxml"), factoryDecorator);
     }
 
+    public GameController loadGameView(VBox box, GameDecorator gameDecorator, FactoryDecorator factoryDecorator) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("gameScheduleView/Game.fxml"));
+            box.getChildren().add(loader.load());
+            GameController controller = loader.getController();
+            controller.setup(tournamentDecorator, fileIO, factoryDecorator, box, gameDecorator);
+            return controller;
+        } catch (IOException e) {
+            e.printStackTrace();
+            //TODO LOGGER
+        }
+        return null;
+    }
+
     private FXController setCenterOfBorderPane(BorderPane pane, URL location, FactoryDecorator factoryDecorator) {
         FXController controller = null;
         try {
@@ -61,7 +79,6 @@ public class Factory {
             pane.setCenter(loader.load());
             controller = loader.getController();
             controller.setup(tournamentDecorator, fileIO, factoryDecorator, pane);
-            controller.loadContent();
         } catch (IOException e) {
             e.printStackTrace();
             //TODO handle and logging?

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

@@ -1,7 +1,14 @@
 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.Node;
 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,8 +51,7 @@ public class FactoryDecorator implements IsObservable{
     public void openTournament(FileIO.TournamentFile tournamentFile){
         try {
             factory.setTournament(fileIO.loadTournament(tournamentFile));
-            factory.loadGameScheduler((BorderPane) pane, this);
+            openScheduleView();
-            informListener();
         } catch (IOException e) {
             e.printStackTrace();
         } catch (ClassNotFoundException e) {
@@ -53,14 +59,106 @@ public class FactoryDecorator implements IsObservable{
         } //TODO handle and logging
     }
 
+    public void openTournamentList() {
+        factory.loadTournamentList((BorderPane) pane, this);
+        informListener();
+    }
+
     public void openParticipantFormular() {
         factory.loadParticipantFormular((BorderPane) pane, this);
+        informListener();
     }
 
     public void openPlacesFormular() {
         factory.loadPlacesFormular((BorderPane) pane, this);
+        informListener();
     }
 
+    public void openScheduleView() {
+        factory.loadGameScheduler((BorderPane) pane, this);
+        informListener();
+    }
+
+    public void loadGameList(HBox hBoxCenter, TournamentDecorator tournamentDecorator, boolean treeView) {
+        hBoxCenter.getChildren().clear();
+
+        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 informListener() {
         for(IsObserver observer : listener) {
             observer.update();

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

@@ -6,19 +6,22 @@ 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()) {
@@ -37,31 +40,48 @@ public class FileIO {
         }
     }
 
+
+    /**
+     * 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");
         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;
     }
 
     /**
-     * @param tournamentFile
+     * Loads and returns a tournament from a given File which contains the serialiazed tournament.
-     * @return
+     *
-     * @throws ClassNotFoundException
+     * @param tournamentFile The tournament file where the data should be read from.
-     * @throws IOException            File not found or not readable.
+     * @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 Tournament loadTournament(File tournamentFile) throws IOException, ClassNotFoundException {
+    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");
@@ -76,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) throws IOException {
+    /**
+     * 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 {
-            boolean newFile = newSave.createNewFile();
+            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);
                 }
             }
 
@@ -129,20 +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(){
+        /**
+         * 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];
         }
 
     }
 
-    public void deleteTournament(File tournamentFile) throws IOException {
-        throw new UnsupportedOperationException("Method deleteTournament not implemented yet.");
-    }
-
 }

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

@@ -3,16 +3,28 @@ 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 Place getLocation() {
+        return place;
+    }
+
+    public void setLocation(Place place) {
+        this.place = place;
     }
 
     public int getPoints1() {
@@ -39,11 +51,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/Place.java

@@ -0,0 +1,32 @@
+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());
+    }
+}

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

@@ -1,23 +1,36 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-import java.util.GregorianCalendar;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 public class Player extends Person implements Participant{
 
-    private GregorianCalendar dateOfBirth;
+    private LocalDate dateOfBirth;
 
     public Player(String firstName, String name, String phoneNumber, String dateOfBirth) throws InvalidNameException, InvalidPhoneNumberException {
         super(firstName, name, phoneNumber);
         setDateOfBirth(dateOfBirth);
     }
 
-    public GregorianCalendar getDateOfBirth() {
+    public LocalDate getDateOfBirth() {
         return dateOfBirth;
     }
 
+    public String getFormatedDateOfBirth(){
+        try{
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy");
+            return dateOfBirth.format(formatter);
+        } catch (Exception e) {
+           //todo handle and logging
+            return "";
+        }
+    }
+
     public void setDateOfBirth(String dateOfBirth) {
         String[] date = dateOfBirth.split("\\.");
-        this.dateOfBirth = new GregorianCalendar(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
+        this.dateOfBirth = LocalDate.of(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
     }
 
     @Override

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

@@ -5,42 +5,40 @@ import javafx.collections.ObservableList;
 
 import java.io.File;
 import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.List;
 
 public class Tournament implements Serializable {
     private String name;
     private Type type;
     private List<Participant> participants;
-
+    private List<Place> places;
+    private List<List<Game>> gameList;
 
 
     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.
-        } else if(!Arrays.asList(Type.values()).contains(type)){
+        } else if (!Arrays.asList(Type.values()).contains(type)) {
             throw new InvalidTypeException("Invalid Type selected"); //TODO handle en logging.
         }
 
         setName(name);
         setType(type);
         participants = new ArrayList<>();
+        places = new ArrayList<>();
+        gameList = new ArrayList<>();
     }
 
     public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
-        for(Participant participant : participants){
+        participants.removeIf(participant -> participant.equals(newParticipant));
-            if(participant.equals(newParticipant)){
-                throw new ParticipantExistsException("A Participant with the same Name exists already.");
-            }
-        }
         participants.add(newParticipant);
     }
 
     public void removeParticipant(Participant participant) throws ParticipantNotExistsException {
-        if(!participants.contains(participant)){
+        if (!participants.contains(participant)) {
             throw new ParticipantNotExistsException("The given Participant is not part of this Tournament");
         }
+        participants.remove(participant);
     }
 
     public ObservableList<Participant> getParticipants() {
@@ -49,6 +47,70 @@ public class Tournament implements Serializable {
         return participantsObservable;
     }
 
+    public void addPlace(Place newPlace) throws PlaceExistsException {
+        places.removeIf(place -> place.equals(newPlace));
+        places.add(newPlace);
+    }
+
+    public void removePlace(Place place) throws PlaceNotExistsException {
+        if (!places.contains(place)) {
+            throw new PlaceNotExistsException("The given Place is not part of this Tournament");
+        }
+        places.remove(place);
+    }
+
+    public ObservableList<Place> getPlaces() {
+        ObservableList<Place> placesObservable = FXCollections.observableArrayList();
+        placesObservable.addAll(places);
+        return placesObservable;
+    }
+
+
+    /*
+    creates a complete new GameSchedule
+     */
+    public void createGameSchedule() throws NumberOfParticipantInvalidException {
+        gameList = new ArrayList<>();
+        if (type == Type.KO) {
+            if (numberOfParticipantValid()) {
+                calcGameSchedule();
+                //TODO Logging
+            } else {
+                throw new NumberOfParticipantInvalidException("Can not Create Game Schedule for KO Modus");
+                //TODO Logging
+            }
+
+
+        } else {
+            //TODO for Type Group
+        }
+    }
+
+    private boolean numberOfParticipantValid() {
+        double res = Math.log(participants.size()) / Math.log(2);
+        return (res * 10) % 10 == 0 && participants.size() >=4;
+    }
+
+    private void calcGameSchedule() {
+        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)));
+                }
+            }
+            gameList.add(gameRound);
+        }
+
+    }
+
+
     public String getName() {
         return name;
     }
@@ -65,6 +127,10 @@ public class Tournament implements Serializable {
         this.type = type;
     }
 
+    public List<List<Game>> getGameList() {
+        return gameList;
+    }
+
     public enum Type {
         KO("KO-System"), GROUPS("Gruppenspiele");
 
@@ -79,7 +145,7 @@ 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;
@@ -119,5 +185,36 @@ public class Tournament implements Serializable {
 
     }
 
+    public class PlaceExistsException extends Exception {
+        public PlaceExistsException() {
+            super();
+        }
+
+        public PlaceExistsException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    public class PlaceNotExistsException extends Exception {
+        public PlaceNotExistsException() {
+            super();
+        }
+
+        public PlaceNotExistsException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    public class NumberOfParticipantInvalidException extends Exception {
+        public NumberOfParticipantInvalidException() {
+            super();
+        }
+
+        public NumberOfParticipantInvalidException(String msg) {
+            super(msg);
+        }
+    }
 
 }

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

@@ -4,11 +4,14 @@ 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;
 
     public TournamentDecorator(FileIO fileIO){
         setFileIO(fileIO);
@@ -16,10 +19,12 @@ public class TournamentDecorator implements IsObservable{
             @Override
             public void update() {
                 if(tournament != null){
+
                     saveTournament();
                 }
             }
         });
+        executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
     }
 
     public void setFileIO(FileIO fileIO) {
@@ -44,14 +49,13 @@ public class TournamentDecorator implements IsObservable{
         listener.remove(observer);
     }
 
+
     public void saveTournament(){
-        try {
+        executorService.execute(new saveTask());
-            fileIO.saveTournament(tournament);
-        } catch (IOException e) {
-            e.printStackTrace(); //TODO handle and logging
-        }
     }
 
+
+
     public void createTournament(String name, Tournament.Type type){
         if(fileIO.tournamentExists(name)){
             System.out.println("Tournament with same name exists already.");
@@ -79,7 +83,12 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
-    public void addPlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
+    public void createNewGameSchedule() throws Tournament.NumberOfParticipantInvalidException {
+        tournament.createGameSchedule();
+        informListener();
+    }
+
+    public void savePlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
         try {
             tournament.addParticipant(new Player(firstName, name, phoneNumber, dateOfBirth));
             informListener();
@@ -92,9 +101,52 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
+    public void deleteParticipant(Participant participant){
+        try {
+            tournament.removeParticipant(participant);
+            informListener();
+        } catch (Tournament.ParticipantNotExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
+    public void savePlace(String name){
+        try {
+            tournament.addPlace(new Place(name));
+            informListener();
+        } catch (Tournament.PlaceExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (InvalidNameException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
+    public void deletePlace(Place place){
+        try {
+            tournament.removePlace(place);
+            informListener();
+        } catch (Tournament.PlaceNotExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
+
     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(); //TODO handle and logging
+            }
+        }
+    }
+
 }

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

@@ -15,7 +15,7 @@ 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 TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO);
     private Factory factory = new Factory(fileIO, tournamentDecorator); //TODO make it private!
     private FactoryDecorator factoryDecorator;
@@ -25,13 +25,13 @@ public class MainWindow extends Application {
 
         BorderPane pane = factory.loadMainWindow();
         factoryDecorator = new FactoryDecorator(fileIO, factory, pane);
-        factory.loadTournamentList(pane, 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));
+    }
+
+}

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,24 +1,69 @@
 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) {
+        try {
+            getTournamentDecorator().createNewGameSchedule();
+        } catch (Tournament.NumberOfParticipantInvalidException e) {
+            //TODO Method in FactoryDecorater to show msg
+            e.printStackTrace();
+        }
+    }
 
     @FXML
     void openPlacesFormular(ActionEvent event) {
+        removeListener();
         getFactoryDecorator().openPlacesFormular();
     }
 
     @FXML
     void openParticipantFormular(ActionEvent event) {
+        removeListener();
         getFactoryDecorator().openParticipantFormular();
     }
 
+    @FXML
+    void closeTournament(ActionEvent event) {
+        removeListener();
+        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

@@ -2,6 +2,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 javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -39,7 +40,11 @@ public class ParticipantFormularController extends FXController {
     private Label newParticipantFormularTitle;
 
     @FXML
-    private Button openBtn;
+    private Button closeBtn;
+
+    @FXML
+    private Button deleteBtn;
+
 
     @FXML
     private Label participantListTitle;
@@ -63,18 +68,29 @@ public class ParticipantFormularController extends FXController {
     private Button saveBtn;
 
     @FXML
-    void addParticipant(ActionEvent event) {
+    void changedSelection(MouseEvent event){
-        getTournamentDecorator().addPlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText());
+        Player participant = (Player) participantListView.getSelectionModel().getSelectedItems().get(0);
+        participantNameTextField.setText(participant.getName());
+        firstNameTextField.setText(participant.getFirstName());
+        phoneNumberTextField.setText(participant.getPhoneNumber());
+        birthDateTextField.setText(participant.getFormatedDateOfBirth());
     }
 
     @FXML
-    void changeParticipant(MouseEvent event) {
+    void saveParticipant(ActionEvent event) {
-
+        getTournamentDecorator().savePlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText());
     }
 
     @FXML
-    void save(ActionEvent event) {
+    void delete(ActionEvent event) {
+        Participant participant = participantListView.getSelectionModel().getSelectedItems().get(0);
+        getTournamentDecorator().deleteParticipant(participant);
+    }
 
+    @FXML
+    void close(ActionEvent event) {
+        removeListener();
+        getFactoryDecorator().openScheduleView();
     }
 
     @Override

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

@@ -1,6 +1,8 @@
 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 javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -9,11 +11,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 +33,47 @@ 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());
     }
 
     @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) {
-
+        removeListener();
+        getFactoryDecorator().openScheduleView();
     }
 
     @Override
     public void loadContent() {
-
+        placeListView.setItems(getTournamentDecorator().getTournament().getPlaces());
     }
 }

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

@@ -61,6 +61,7 @@ public class TournamentListController extends FXController {
 
     @FXML
     void openTournament(ActionEvent event) {
+        removeListener();
         FileIO.TournamentFile tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
         getFactoryDecorator().openTournament(tournamentFile);
     }

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

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
@@ -25,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="Speichern">
+                  <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>
@@ -50,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>
@@ -96,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

@@ -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>

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