From ebc0b64cb7630e6843f9dd91af645031a149854f Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 6 May 2022 13:34:22 +0200
Subject: [PATCH 01/23] Create gameList in Tournament Create method to calc
 gameList and create random first round Started to develope view of
 gameSchedule

---
 .../zhaw/projekt2/turnierverwaltung/Game.java | 11 ++-
 .../turnierverwaltung/Tournament.java         | 67 ++++++++++++++++---
 .../TournamentDecorator.java                  |  9 +++
 .../GameScheduleController.java               | 28 ++++++++
 .../main/tournamentList/AlertDelete.java      |  2 -
 .../gameScheduleView/Game.fxml                | 12 +++-
 .../gameScheduleView/GameSchedule.fxml        | 17 +++--
 7 files changed, 124 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
index 18e317b..487e50e 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
@@ -3,10 +3,15 @@ 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 Place place;
 
+    public Game(Participant participant1, Participant participant2) {
+        this.participant1 = participant1;
+        this.participant2 = participant2;
+    }
+
     public Place getLocation() {
         return place;
     }
@@ -40,10 +45,10 @@ public class Game implements Serializable {
     }
 
     public Participant getParticipant2() {
-        return Participant2;
+        return participant2;
     }
 
     public void setParticipant2(Participant participant2) {
-        Participant2 = participant2;
+        this.participant2 = participant2;
     }
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
index b4097d5..4041ee6 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -5,23 +5,20 @@ import javafx.collections.ObservableList;
 
 import java.io.File;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 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.
         }
 
@@ -29,6 +26,7 @@ public class Tournament implements Serializable {
         setType(type);
         participants = new ArrayList<>();
         places = new ArrayList<>();
+        gameList = new ArrayList<>();
     }
 
     public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
@@ -37,7 +35,7 @@ public class Tournament implements Serializable {
     }
 
     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);
@@ -55,7 +53,7 @@ public class Tournament implements Serializable {
     }
 
     public void removePlace(Place place) throws PlaceNotExistsException {
-        if(!places.contains(place)){
+        if (!places.contains(place)) {
             throw new PlaceNotExistsException("The given Place is not part of this Tournament");
         }
         places.remove(place);
@@ -67,6 +65,42 @@ public class Tournament implements Serializable {
         return placesObservable;
     }
 
+
+    /*
+    creates a complete new GameSchedule
+     */
+    public void createGameSchedule() throws NumberOfParticipantInvalidException {
+        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;
+
+        //TODO min 4
+    }
+
+    private void calcGameSchedule() {
+        Collections.shuffle(participants);
+        List<Game> firstGameRound = new ArrayList<>();
+        for (int i = 0; i < participants.size() - 1; i += 2) {
+            firstGameRound.add(new Game(participants.get(i), participants.get(i+1)));
+        }
+        gameList.add(firstGameRound);
+    }
+
     public String getName() {
         return name;
     }
@@ -83,6 +117,10 @@ public class Tournament implements Serializable {
         this.type = type;
     }
 
+    public List<List<Game>> getGameList() {
+        return gameList;
+    }
+
     public enum Type {
         KO("KO-System"), GROUPS("Gruppenspiele");
 
@@ -97,7 +135,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;
@@ -159,5 +197,14 @@ public class Tournament implements Serializable {
 
     }
 
+    public class NumberOfParticipantInvalidException extends Exception {
+        public NumberOfParticipantInvalidException() {
+            super();
+        }
+
+        public NumberOfParticipantInvalidException(String msg) {
+            super(msg);
+        }
+    }
 
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
index dcb3112..219cd73 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
@@ -79,6 +79,15 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
+    public void createNewGameSchedule() {
+        try {
+            tournament.createGameSchedule();
+            informListener();
+        } catch (Tournament.NumberOfParticipantInvalidException e) {
+            e.printStackTrace();
+        }
+    }
+
     public void savePlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
         try {
             tournament.addParticipant(new Player(firstName, name, phoneNumber, dateOfBirth));
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
index ab82179..c1bb5b1 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
@@ -1,10 +1,32 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.Game;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.layout.HBox;
+
+import java.util.List;
 
 public class GameScheduleController extends FXController {
+    
+    @FXML
+    private Button createScheduleBtn;
+
+    @FXML
+    private Button editLocBtn;
+
+    @FXML
+    private Button editParticipantBtn;
+
+    @FXML
+    private HBox hBoxCenter;
+
+    @FXML
+    void createNewSchedule(ActionEvent event) {
+        getTournamentDecorator().createNewGameSchedule();
+    }
 
     @FXML
     void openPlacesFormular(ActionEvent event) {
@@ -19,6 +41,12 @@ public class GameScheduleController extends FXController {
     @Override
     public void loadContent() {
 
+        List<List<Game>> gameList = getTournamentDecorator().getTournament().getGameList();
+
+        for (int i = 0; i < gameList.size(); i++) {
+            //hBoxCenter.
+        }
+
     }
 }
 
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/AlertDelete.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/AlertDelete.java
index e440807..6c400dd 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/AlertDelete.java
+++ b/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);
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
index 83fcb91..815b2db 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ChoiceBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-
-<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="150.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GameContoller">
+<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GameContoller">
    <children>
       <Label fx:id="teamNameOne" text="Team One" />
       <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
@@ -41,6 +41,14 @@
             </Label>
             <ChoiceBox fx:id="placesChoiceBox" prefWidth="150.0" />
          </children>
+         <VBox.margin>
+            <Insets top="10.0" />
+         </VBox.margin>
       </HBox>
+      <Button mnemonicParsing="false" text="Speichern">
+         <VBox.margin>
+            <Insets bottom="10.0" top="10.0" />
+         </VBox.margin>
+      </Button>
    </children>
 </VBox>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
index cd88c6a..6c824a7 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
@@ -5,17 +5,21 @@
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
 
-
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameScheduleController">
+<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.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">
+            <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="20.0" />
+               </HBox.margin>
+            </Button>
+            <Button fx:id="editLocBtn" mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten">
                <HBox.margin>
                   <Insets right="40.0" />
                </HBox.margin>
@@ -23,4 +27,7 @@
          </children>
       </HBox>
    </top>
+   <center>
+      <HBox fx:id="hBoxCenter" prefHeight="324.0" prefWidth="600.0" BorderPane.alignment="CENTER" />
+   </center>
 </BorderPane>
-- 
2.40.1


From 4ef9f62124603457ac34dd71b8654ae95432b1a8 Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 6 May 2022 13:36:49 +0200
Subject: [PATCH 02/23] update game with new id and new button to mark game as
 played

---
 .../main/gameScheduleView/GameController.java | 20 +++++++++++++++++++
 .../gameScheduleView/Game.fxml                |  6 +++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
index 836c784..f3d3ed5 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
@@ -1,14 +1,34 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
 
 public class GameController extends FXController {
 
+    @FXML
+    private Label participantNameOne;
+
+    @FXML
+    private Label participantNameTwo;
+
     @FXML
     private ChoiceBox<?> placesChoiceBox;
 
+    @FXML
+    private TextField pointsTeamOne;
+
+    @FXML
+    private TextField pointsTeamTwo;
+
+    @FXML
+    void saveGamerResult(ActionEvent event) {
+
+    }
+
     @Override
     public void loadContent() {
 
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
index 815b2db..0a66d61 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
@@ -10,7 +10,7 @@
 
 <VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GameContoller">
    <children>
-      <Label fx:id="teamNameOne" text="Team One" />
+      <Label fx:id="participantNameOne" text="Participant One" />
       <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
          <children>
             <Label text="Points">
@@ -21,7 +21,7 @@
             <TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.0" />
          </children>
       </HBox>
-      <Label fx:id="teamNameTwo" text="Team Two" />
+      <Label fx:id="participantNameTwo" text="Participant Two" />
       <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
          <children>
             <Label text="Points">
@@ -45,7 +45,7 @@
             <Insets top="10.0" />
          </VBox.margin>
       </HBox>
-      <Button mnemonicParsing="false" text="Speichern">
+      <Button mnemonicParsing="false" onAction="#saveGamerResult" text="Speichern">
          <VBox.margin>
             <Insets bottom="10.0" top="10.0" />
          </VBox.margin>
-- 
2.40.1


From 593bcdc872df8363ef7e33b14c02b595e098753b Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Fri, 6 May 2022 14:04:35 +0200
Subject: [PATCH 03/23] added indexes to Game.java

---
 .../zhaw/projekt2/turnierverwaltung/Game.java | 32 ++++++++++++++++++-
 .../turnierverwaltung/Tournament.java         | 17 +++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
index 487e50e..77f7854 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
@@ -6,10 +6,14 @@ public class Game implements Serializable {
     private Participant participant1, participant2;
     private int points1, points2;
     private Place place;
+    private int index1, index2;
 
-    public Game(Participant participant1, Participant participant2) {
+
+    public Game(Participant participant1, Participant participant2, int index1, int index2) {
         this.participant1 = participant1;
         this.participant2 = participant2;
+        this.index1 = index1;
+        this.index2 = index2;
     }
 
     public Place getLocation() {
@@ -48,6 +52,32 @@ public class Game implements Serializable {
         return participant2;
     }
 
+    public void setPlace(Place place) {
+        this.place = place;
+    }
+
+    public Place getPlace() {
+        return place;
+    }
+
+    public int getIndex1() {
+        return index1;
+    }
+
+    public int getIndex2() {
+        return index2;
+    }
+
+    public Participant getWinner(){
+        if(points1 > points2){
+            return participant1;
+        } else if(points2 > points1){
+            return participant2;
+        } else {
+            return null;
+        }
+    }
+
     public void setParticipant2(Participant participant2) {
         this.participant2 = participant2;
     }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
index 4041ee6..d074d02 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -96,11 +96,26 @@ public class Tournament implements Serializable {
         Collections.shuffle(participants);
         List<Game> firstGameRound = new ArrayList<>();
         for (int i = 0; i < participants.size() - 1; i += 2) {
-            firstGameRound.add(new Game(participants.get(i), participants.get(i+1)));
+            firstGameRound.add(new Game(participants.get(i), participants.get(i+1), 0, i));
         }
         gameList.add(firstGameRound);
     }
 
+    public void refreshGameParticipants(){
+        for(int i = 1; i < gameList.size(); i++){
+            for(int j = 0; j/2 < gameList.get(i).size(); j ++){
+                Participant winner = gameList.get(i-1).get(j).getWinner();
+                if(winner != null){
+                    if(j % 2 == 0){
+                        gameList.get(i).get(j/2).setParticipant1(winner);
+                    } else{
+                        gameList.get(i).get(j/2).setParticipant2(winner);
+                    }
+                }
+            }
+        }
+    }
+
     public String getName() {
         return name;
     }
-- 
2.40.1


From 9a3a9f3b5321b65046fb404676246b9f5f06724c Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Fri, 6 May 2022 14:07:55 +0200
Subject: [PATCH 04/23] removed Indexes from Game.java

---
 .../java/ch/zhaw/projekt2/turnierverwaltung/Game.java  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
index 77f7854..4c0a5ee 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
@@ -12,8 +12,6 @@ public class Game implements Serializable {
     public Game(Participant participant1, Participant participant2, int index1, int index2) {
         this.participant1 = participant1;
         this.participant2 = participant2;
-        this.index1 = index1;
-        this.index2 = index2;
     }
 
     public Place getLocation() {
@@ -60,14 +58,6 @@ public class Game implements Serializable {
         return place;
     }
 
-    public int getIndex1() {
-        return index1;
-    }
-
-    public int getIndex2() {
-        return index2;
-    }
-
     public Participant getWinner(){
         if(points1 > points2){
             return participant1;
-- 
2.40.1


From 4dc7db7590661419630292e84df84cca51710996 Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 6 May 2022 18:40:13 +0200
Subject: [PATCH 05/23] made GameScheduleController and GameDecorator

first gameround gets loaded in gamescheduleview
---
 .../projekt2/turnierverwaltung/Factory.java   | 16 ++++++
 .../turnierverwaltung/FactoryDecorator.java   |  6 ++
 .../turnierverwaltung/Tournament.java         | 10 +++-
 .../TournamentDecorator.java                  | 10 +---
 .../main/gameScheduleView/GameController.java | 30 +++++++---
 .../main/gameScheduleView/GameDecorator.java  | 55 +++++++++++++++++++
 .../GameScheduleController.java               | 20 ++++++-
 .../gameScheduleView/Game.fxml                |  2 +-
 8 files changed, 129 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
index c89ff8a..c743000 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
+++ b/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;
@@ -54,6 +57,19 @@ public class Factory {
         setCenterOfBorderPane(pane, getClass().getResource("gameScheduleView/GameSchedule.fxml"), factoryDecorator);
     }
 
+    public void loadGameView(VBox box, Game game, FactoryDecorator factoryDecorator) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("gameScheduleView/Game.fxml"));
+            box.getChildren().add(loader.load());
+            GameController controller = loader.getController();
+            controller.setup(new GameDecorator(game, tournamentDecorator));
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            //TODO LOGGER
+        }
+    }
+
     private FXController setCenterOfBorderPane(BorderPane pane, URL location, FactoryDecorator factoryDecorator) {
         FXController controller = null;
         try {
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
index 95a4648..1677489 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -1,7 +1,9 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
+import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameDecorator;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -65,6 +67,10 @@ public class FactoryDecorator implements IsObservable{
         factory.loadGameScheduler((BorderPane) pane, this);
     }
 
+    public void openGameView(VBox vBox, Game game) {
+        factory.loadGameView(vBox ,game, this);
+    }
+
     public void informListener() {
         for(IsObserver observer : listener) {
             observer.update();
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
index d074d02..d412b0b 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -70,6 +70,7 @@ public class Tournament implements Serializable {
     creates a complete new GameSchedule
      */
     public void createGameSchedule() throws NumberOfParticipantInvalidException {
+        gameList = new ArrayList<>();
         if (type == Type.KO) {
             if (numberOfParticipantValid()) {
                 calcGameSchedule();
@@ -87,9 +88,7 @@ public class Tournament implements Serializable {
 
     private boolean numberOfParticipantValid() {
         double res = Math.log(participants.size()) / Math.log(2);
-        return (res * 10) % 10 == 0;
-
-        //TODO min 4
+        return (res * 10) % 10 == 0 && participants.size() >=4;
     }
 
     private void calcGameSchedule() {
@@ -97,6 +96,10 @@ public class Tournament implements Serializable {
         List<Game> firstGameRound = new ArrayList<>();
         for (int i = 0; i < participants.size() - 1; i += 2) {
             firstGameRound.add(new Game(participants.get(i), participants.get(i+1), 0, i));
+
+            //TODO PRINT
+            System.out.println("I: " + i + " " + participants.get(i).getName() +" vs " +participants.get(i+1).getName());
+
         }
         gameList.add(firstGameRound);
     }
@@ -114,6 +117,7 @@ public class Tournament implements Serializable {
                 }
             }
         }
+
     }
 
     public String getName() {
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
index 219cd73..8622137 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
@@ -79,13 +79,9 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
-    public void createNewGameSchedule() {
-        try {
-            tournament.createGameSchedule();
-            informListener();
-        } catch (Tournament.NumberOfParticipantInvalidException e) {
-            e.printStackTrace();
-        }
+    public void createNewGameSchedule() throws Tournament.NumberOfParticipantInvalidException {
+        tournament.createGameSchedule();
+        informListener();
     }
 
     public void savePlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
index f3d3ed5..ac12946 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
@@ -1,13 +1,15 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
 
-import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.*;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 
-public class GameController extends FXController {
+public class GameController {
+
+    private GameDecorator gameDecorator;
 
     @FXML
     private Label participantNameOne;
@@ -16,7 +18,7 @@ public class GameController extends FXController {
     private Label participantNameTwo;
 
     @FXML
-    private ChoiceBox<?> placesChoiceBox;
+    private ChoiceBox<Place> placesChoiceBox;
 
     @FXML
     private TextField pointsTeamOne;
@@ -24,13 +26,27 @@ public class GameController extends FXController {
     @FXML
     private TextField pointsTeamTwo;
 
+
     @FXML
     void saveGamerResult(ActionEvent event) {
-
+        gameDecorator.setPoints1(Integer.parseInt(pointsTeamOne.getText()));
+        gameDecorator.setPoints2(Integer.parseInt(pointsTeamTwo.getText()));
+        gameDecorator.setLocation(placesChoiceBox.getValue());
+        gameDecorator.getTournamentDecorator().getTournament().refreshGameParticipants();
+        loadContent();
     }
 
-    @Override
+
     public void loadContent() {
-
+        participantNameOne.setText(gameDecorator.getParticipantOne());
+        participantNameTwo.setText(gameDecorator.getParticipantTwo());
+        pointsTeamOne.setText(String.valueOf(gameDecorator.getPoints1()));
+        pointsTeamTwo.setText(String.valueOf(gameDecorator.getPoints2()));
     }
-}
+
+    public void setup(GameDecorator gameDecorator) {
+        this.gameDecorator = gameDecorator;
+        loadContent();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
new file mode 100644
index 0000000..cbca67a
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
@@ -0,0 +1,55 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
+
+import ch.zhaw.projekt2.turnierverwaltung.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GameDecorator {
+    private Game game;
+    private TournamentDecorator tournamentDecorator;
+    private List<IsObserver> listener = new ArrayList<>();
+
+    public GameDecorator (Game game, TournamentDecorator tournamentDecorator) {
+        this.game = game;
+        this.tournamentDecorator = tournamentDecorator;
+    }
+
+    public TournamentDecorator getTournamentDecorator() {
+        return tournamentDecorator;
+    }
+
+    public void setPoints1(int points1) {
+        game.setPoints1(points1);
+    }
+
+    public void setPoints2(int points2) {
+        game.setPoints2(points2);
+    }
+
+    public String getPoints1() {
+       return String.valueOf(game.getPoints1());
+    }
+
+    public String getPoints2() {
+        return String.valueOf(game.getPoints2());
+    }
+
+    public String getParticipantOne() {
+        return game.getParticipant1().getName();
+    }
+
+    public String getParticipantTwo() {
+        return game.getParticipant2().getName();
+    }
+
+    public Place getLocation() {
+        return game.getPlace();
+    }
+
+    public void setLocation(Place place) {
+        game.setLocation(place);
+    }
+
+}
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
index c1bb5b1..d7e25f8 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
@@ -2,11 +2,17 @@ package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
 import ch.zhaw.projekt2.turnierverwaltung.Game;
+import ch.zhaw.projekt2.turnierverwaltung.Tournament;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Button;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+import org.checkerframework.checker.units.qual.C;
 
+import java.io.IOException;
 import java.util.List;
 
 public class GameScheduleController extends FXController {
@@ -25,7 +31,12 @@ public class GameScheduleController extends FXController {
 
     @FXML
     void createNewSchedule(ActionEvent event) {
-        getTournamentDecorator().createNewGameSchedule();
+        try {
+            getTournamentDecorator().createNewGameSchedule();
+        } catch (Tournament.NumberOfParticipantInvalidException e) {
+            //TODO Method in FactoryDecorater to show msg
+            e.printStackTrace();
+        }
     }
 
     @FXML
@@ -40,11 +51,16 @@ public class GameScheduleController extends FXController {
 
     @Override
     public void loadContent() {
+        hBoxCenter.getChildren().clear();
 
         List<List<Game>> gameList = getTournamentDecorator().getTournament().getGameList();
 
         for (int i = 0; i < gameList.size(); i++) {
-            //hBoxCenter.
+            VBox vBox = new VBox();
+            for (int j = 0; j < gameList.get(i).size(); j++) {
+                getFactoryDecorator().openGameView(vBox,gameList.get(i).get(j));
+            }
+            hBoxCenter.getChildren().add(vBox);
         }
 
     }
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
index 0a66d61..be704e2 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
@@ -8,7 +8,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GameContoller">
+<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController">
    <children>
       <Label fx:id="participantNameOne" text="Participant One" />
       <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
-- 
2.40.1


From e5dc6a913a0e084c9945707e65e8a1926d4c9737 Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 6 May 2022 19:12:14 +0200
Subject: [PATCH 06/23] make createTournament create all future games with null
 object for participant

---
 .../zhaw/projekt2/turnierverwaltung/Game.java |  3 +--
 .../turnierverwaltung/Tournament.java         | 21 ++++++++++++-------
 .../TournamentDecorator.java                  |  6 ++++++
 .../main/gameScheduleView/GameController.java |  2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
index 4c0a5ee..c294e05 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
@@ -6,10 +6,9 @@ public class Game implements Serializable {
     private Participant participant1, participant2;
     private int points1, points2;
     private Place place;
-    private int index1, index2;
 
 
-    public Game(Participant participant1, Participant participant2, int index1, int index2) {
+    public Game(Participant participant1, Participant participant2) {
         this.participant1 = participant1;
         this.participant2 = participant2;
     }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
index d412b0b..bd7c92b 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -93,15 +93,21 @@ public class Tournament implements Serializable {
 
     private void calcGameSchedule() {
         Collections.shuffle(participants);
-        List<Game> firstGameRound = new ArrayList<>();
-        for (int i = 0; i < participants.size() - 1; i += 2) {
-            firstGameRound.add(new Game(participants.get(i), participants.get(i+1), 0, i));
-
-            //TODO PRINT
-            System.out.println("I: " + i + " " + participants.get(i).getName() +" vs " +participants.get(i+1).getName());
 
+        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)));
+                }
+                gameList.add(gameRound);
+            } else {
+                for (int j = 0; j < (participants.size() / Math.pow(2,i)); j++) {
+                    gameRound.add(new Game(null,null));
+                }
+            }
         }
-        gameList.add(firstGameRound);
+
     }
 
     public void refreshGameParticipants(){
@@ -117,7 +123,6 @@ public class Tournament implements Serializable {
                 }
             }
         }
-
     }
 
     public String getName() {
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
index 8622137..9ba380f 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
@@ -126,9 +126,15 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
+    public void refreshGameParticipants() {
+        getTournament().refreshGameParticipants();
+        informListener();
+    }
+
     public void informListener() {
         for(IsObserver observer : listener) {
             observer.update();
         }
     }
+
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
index ac12946..0bb6f35 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
@@ -32,7 +32,7 @@ public class GameController {
         gameDecorator.setPoints1(Integer.parseInt(pointsTeamOne.getText()));
         gameDecorator.setPoints2(Integer.parseInt(pointsTeamTwo.getText()));
         gameDecorator.setLocation(placesChoiceBox.getValue());
-        gameDecorator.getTournamentDecorator().getTournament().refreshGameParticipants();
+        gameDecorator.getTournamentDecorator().refreshGameParticipants();
         loadContent();
     }
 
-- 
2.40.1


From de728745f6ed8195d3725e6b59ec3035895d1d8a Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 6 May 2022 19:26:34 +0200
Subject: [PATCH 07/23] list all games in gameschedule prevent nullpointer
 exception for empty games

---
 .../ch/zhaw/projekt2/turnierverwaltung/Tournament.java |  4 ++--
 .../main/gameScheduleView/GameDecorator.java           | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
index bd7c92b..2d499a2 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -94,18 +94,18 @@ public class Tournament implements Serializable {
     private void calcGameSchedule() {
         Collections.shuffle(participants);
 
-        for (int i = 0; i < (Math.log(participants.size()) / Math.log(2)); i++) {
+        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)));
                 }
-                gameList.add(gameRound);
             } else {
                 for (int j = 0; j < (participants.size() / Math.pow(2,i)); j++) {
                     gameRound.add(new Game(null,null));
                 }
             }
+            gameList.add(gameRound);
         }
 
     }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
index cbca67a..a53e43d 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
@@ -37,11 +37,17 @@ public class GameDecorator {
     }
 
     public String getParticipantOne() {
-        return game.getParticipant1().getName();
+        if (game.getParticipant1() != null) {
+            return game.getParticipant1().getName();
+        }
+        return "1";
     }
 
     public String getParticipantTwo() {
-        return game.getParticipant2().getName();
+        if (game.getParticipant2() != null) {
+            return game.getParticipant2().getName();
+        }
+        return "2";
     }
 
     public Place getLocation() {
-- 
2.40.1


From 3d13dbcb453decf8540699d8d8ff41168888d0df Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 7 May 2022 11:53:10 +0200
Subject: [PATCH 08/23] changed ParticipantFormular to change existing objects
 and don't replace them. changed ParticipantFormular and PlacesFormular to
 clear textfields after saving. solved #19

---
 .../turnierverwaltung/Participant.java        |  1 +
 .../projekt2/turnierverwaltung/Person.java    |  2 +-
 .../projekt2/turnierverwaltung/Player.java    | 19 +++++++++++++++++--
 .../zhaw/projekt2/turnierverwaltung/Team.java | 13 +++++++++++++
 .../turnierverwaltung/Tournament.java         |  9 +++++++--
 .../TournamentDecorator.java                  |  3 +--
 .../ParticipantFormularController.java        |  8 ++++++++
 .../PlacesFormularController.java             |  5 +++++
 8 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java
index 6f85290..31300f5 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java
+++ b/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);
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java
index 9cf624f..73e598b 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java
+++ b/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;
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java
index 3165364..29bb2c6 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java
@@ -29,12 +29,27 @@ public class Player extends Person implements Participant{
     }
 
     public void setDateOfBirth(String dateOfBirth) {
-        String[] date = dateOfBirth.split("\\.");
-        this.dateOfBirth = LocalDate.of(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
+        if(dateOfBirth.length() > 0) {
+            String[] date = dateOfBirth.split("\\.");
+            this.dateOfBirth = LocalDate.of(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
+        } 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());
+    }
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java
index e815a16..8a2a0ba 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java
+++ b/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;
     }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
index b4097d5..21c9a5e 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -31,8 +31,13 @@ public class Tournament implements Serializable {
         places = new ArrayList<>();
     }
 
-    public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
-        participants.removeIf(participant -> participant.equals(newParticipant));
+    public void saveParticipant(Participant newParticipant) throws ParticipantExistsException {
+        for(Participant participant: participants){
+            if(participant.equals(newParticipant)){
+                participant.change(newParticipant);
+                return;
+            }
+        }
         participants.add(newParticipant);
     }
 
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
index dcb3112..6f28efd 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
@@ -2,7 +2,6 @@ package ch.zhaw.projekt2.turnierverwaltung;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 public class TournamentDecorator implements IsObservable{
@@ -81,7 +80,7 @@ public class TournamentDecorator implements IsObservable{
 
     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));
             informListener();
         } catch (Tournament.ParticipantExistsException e) {
             e.printStackTrace(); //TODO handle and logging
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java
index 0528301..8492fdd 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java
@@ -79,6 +79,14 @@ public class ParticipantFormularController extends FXController {
     @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
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
index c5534e5..036fb4f 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
@@ -58,6 +58,11 @@ public class PlacesFormularController extends FXController {
     @FXML
     void savePlace(ActionEvent event) {
         getTournamentDecorator().savePlace(placeNameTextField.getText());
+        clearFormular();
+    }
+
+    private void clearFormular() {
+        placeNameTextField.clear();
     }
 
     @FXML
-- 
2.40.1


From 4d193abb64feefca316f1c634b958de1cc27ff99 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 7 May 2022 12:17:50 +0200
Subject: [PATCH 09/23] changed GameDecorator.java to show full name of
 players.

---
 .../main/gameScheduleView/GameDecorator.java                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
index a53e43d..fcde13d 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
@@ -38,14 +38,14 @@ public class GameDecorator {
 
     public String getParticipantOne() {
         if (game.getParticipant1() != null) {
-            return game.getParticipant1().getName();
+            return game.getParticipant1().toString();
         }
         return "1";
     }
 
     public String getParticipantTwo() {
         if (game.getParticipant2() != null) {
-            return game.getParticipant2().getName();
+            return game.getParticipant2().toString();
         }
         return "2";
     }
-- 
2.40.1


From ecde0e634559d3d21d791208b1323ad026619bcc Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 7 May 2022 12:32:18 +0200
Subject: [PATCH 10/23] fixed Number of Games. #21

---
 .../java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java   | 4 ++--
 .../main/gameScheduleView/GameController.java                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
index 2d499a2..2d4a204 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -94,14 +94,14 @@ public class Tournament implements Serializable {
     private void calcGameSchedule() {
         Collections.shuffle(participants);
 
-        for (int i = 0; i <= (Math.log(participants.size()) / Math.log(2)); i++) {
+        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 < (participants.size() / Math.pow(2,i)); j++) {
+                for (int j = 0; j < (gameList.get(i-1).size()/2); j++) {
                     gameRound.add(new Game(null,null));
                 }
             }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
index 0bb6f35..e050d2f 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
@@ -7,7 +7,7 @@ import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 
-public class GameController {
+public class GameController extends FXController{
 
     private GameDecorator gameDecorator;
 
@@ -36,7 +36,7 @@ public class GameController {
         loadContent();
     }
 
-
+    @Override
     public void loadContent() {
         participantNameOne.setText(gameDecorator.getParticipantOne());
         participantNameTwo.setText(gameDecorator.getParticipantTwo());
-- 
2.40.1


From 62df1db34bb328c2b333f0f72769bf8d622967d6 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 7 May 2022 12:51:14 +0200
Subject: [PATCH 11/23] refactoring of GameController.java to do it the same
 way as the other controllers.

---
 .../projekt2/turnierverwaltung/Factory.java   |  4 ++--
 .../zhaw/projekt2/turnierverwaltung/Game.java |  7 +++---
 .../main/gameScheduleView/GameController.java | 11 ++++-----
 .../main/gameScheduleView/GameDecorator.java  | 23 ++++---------------
 4 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
index c743000..c3cc6e6 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
@@ -62,8 +62,8 @@ public class Factory {
             FXMLLoader loader = new FXMLLoader(getClass().getResource("gameScheduleView/Game.fxml"));
             box.getChildren().add(loader.load());
             GameController controller = loader.getController();
-            controller.setup(new GameDecorator(game, tournamentDecorator));
-
+            controller.setup(tournamentDecorator, fileIO, factoryDecorator, box, new GameDecorator(game));
+            controller.loadContent();
         } catch (IOException e) {
             e.printStackTrace();
             //TODO LOGGER
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
index c294e05..8ca7041 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
@@ -45,6 +45,10 @@ public class Game implements Serializable {
         this.participant1 = participant1;
     }
 
+    public void setParticipant2(Participant participant2) {
+        this.participant2 = participant2;
+    }
+
     public Participant getParticipant2() {
         return participant2;
     }
@@ -67,7 +71,4 @@ public class Game implements Serializable {
         }
     }
 
-    public void setParticipant2(Participant participant2) {
-        this.participant2 = participant2;
-    }
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
index e050d2f..8d566b6 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
@@ -6,6 +6,7 @@ import javafx.fxml.FXML;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
+import javafx.scene.layout.Pane;
 
 public class GameController extends FXController{
 
@@ -29,10 +30,8 @@ public class GameController extends FXController{
 
     @FXML
     void saveGamerResult(ActionEvent event) {
-        gameDecorator.setPoints1(Integer.parseInt(pointsTeamOne.getText()));
-        gameDecorator.setPoints2(Integer.parseInt(pointsTeamTwo.getText()));
-        gameDecorator.setLocation(placesChoiceBox.getValue());
-        gameDecorator.getTournamentDecorator().refreshGameParticipants();
+        gameDecorator.saveGame(pointsTeamOne.getText(), pointsTeamTwo.getText(), placesChoiceBox.getValue());
+        getTournamentDecorator().refreshGameParticipants();
         loadContent();
     }
 
@@ -44,9 +43,9 @@ public class GameController extends FXController{
         pointsTeamTwo.setText(String.valueOf(gameDecorator.getPoints2()));
     }
 
-    public void setup(GameDecorator gameDecorator) {
+    public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane, GameDecorator gameDecorator) {
+        super.setup(tournamentDecorator, fileIO, factoryDecorator, pane);
         this.gameDecorator = gameDecorator;
-        loadContent();
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
index fcde13d..ef7ed94 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
@@ -8,24 +8,16 @@ import java.util.List;
 
 public class GameDecorator {
     private Game game;
-    private TournamentDecorator tournamentDecorator;
     private List<IsObserver> listener = new ArrayList<>();
 
-    public GameDecorator (Game game, TournamentDecorator tournamentDecorator) {
+    public GameDecorator (Game game) {
         this.game = game;
-        this.tournamentDecorator = tournamentDecorator;
     }
 
-    public TournamentDecorator getTournamentDecorator() {
-        return tournamentDecorator;
-    }
-
-    public void setPoints1(int points1) {
-        game.setPoints1(points1);
-    }
-
-    public void setPoints2(int points2) {
-        game.setPoints2(points2);
+    public void saveGame(String points1, String points2, Place place){
+        game.setPoints1(Integer.parseInt(points1));
+        game.setPoints2(Integer.parseInt(points2));
+        game.setPlace(place);
     }
 
     public String getPoints1() {
@@ -53,9 +45,4 @@ public class GameDecorator {
     public Place getLocation() {
         return game.getPlace();
     }
-
-    public void setLocation(Place place) {
-        game.setLocation(place);
-    }
-
 }
-- 
2.40.1


From 923be52610009cbd8fa5d15c44416b950b776851 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 7 May 2022 15:23:26 +0200
Subject: [PATCH 12/23] refactoring of GameController.java to load content only
 if previous games are edited.

---
 .../turnierverwaltung/FXController.java       | 16 +++++++++++++
 .../projekt2/turnierverwaltung/Factory.java   |  9 ++++----
 .../turnierverwaltung/FactoryDecorator.java   | 16 +++++++++----
 .../zhaw/projekt2/turnierverwaltung/Game.java | 11 +++++++++
 .../turnierverwaltung/Tournament.java         | 16 +------------
 .../TournamentDecorator.java                  |  4 ----
 .../turnierverwaltung/main/MainWindow.java    |  2 +-
 .../main/gameScheduleView/GameController.java | 19 ++++++++++++---
 .../main/gameScheduleView/GameDecorator.java  | 23 ++++++++++++++++++-
 .../GameScheduleController.java               | 13 ++++++++++-
 10 files changed, 96 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
index 0f3826d..bb07387 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
@@ -29,18 +29,34 @@ public abstract class FXController {
 
     public abstract void loadContent();
 
+    protected void setTournamentDecorator(TournamentDecorator tournamentDecorator) {
+        this.tournamentDecorator = tournamentDecorator;
+    }
+
     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;
     }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
index c3cc6e6..1492c0e 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
@@ -13,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;
@@ -57,17 +58,18 @@ public class Factory {
         setCenterOfBorderPane(pane, getClass().getResource("gameScheduleView/GameSchedule.fxml"), factoryDecorator);
     }
 
-    public void loadGameView(VBox box, Game game, FactoryDecorator 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, new GameDecorator(game));
-            controller.loadContent();
+            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) {
@@ -77,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?
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
index 1677489..a186616 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -1,5 +1,6 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
+import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController;
 import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameDecorator;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Pane;
@@ -46,8 +47,7 @@ public class FactoryDecorator implements IsObservable{
     public void openTournament(FileIO.TournamentFile tournamentFile){
         try {
             factory.setTournament(fileIO.loadTournament(tournamentFile));
-            factory.loadGameScheduler((BorderPane) pane, this);
-            informListener();
+            openScheduleView();
         } catch (IOException e) {
             e.printStackTrace();
         } catch (ClassNotFoundException e) {
@@ -55,20 +55,28 @@ 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 openGameView(VBox vBox, Game game) {
-        factory.loadGameView(vBox ,game, this);
+    public GameController openGameView(VBox vBox, GameDecorator gameDecorator) {
+        return factory.loadGameView(vBox ,gameDecorator, this);
     }
 
     public void informListener() {
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
index 8ca7041..51bbded 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
@@ -6,6 +6,7 @@ public class Game implements Serializable {
     private Participant participant1, participant2;
     private int points1, points2;
     private Place place;
+    private Game previousGame1, previousGame2;
 
 
     public Game(Participant participant1, Participant participant2) {
@@ -13,6 +14,11 @@ public class Game implements Serializable {
         this.participant2 = participant2;
     }
 
+    public Game(Game previousGame1, Game previousGame2){
+        this.previousGame1 = previousGame1;
+        this.previousGame2 = previousGame2;
+    }
+
     public Place getLocation() {
         return place;
     }
@@ -71,4 +77,9 @@ public class Game implements Serializable {
         }
     }
 
+    public void refreshParticipants(){
+        participant1 = previousGame1.getWinner();
+        participant2 = previousGame2.getWinner();
+    }
+
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
index 2d4a204..15f701a 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -102,7 +102,7 @@ public class Tournament implements Serializable {
                 }
             } else {
                 for (int j = 0; j < (gameList.get(i-1).size()/2); j++) {
-                    gameRound.add(new Game(null,null));
+                    gameRound.add(new Game(gameList.get(i-1).get(j*2),gameList.get(i-1).get(j*2+1)));
                 }
             }
             gameList.add(gameRound);
@@ -110,20 +110,6 @@ public class Tournament implements Serializable {
 
     }
 
-    public void refreshGameParticipants(){
-        for(int i = 1; i < gameList.size(); i++){
-            for(int j = 0; j/2 < gameList.get(i).size(); j ++){
-                Participant winner = gameList.get(i-1).get(j).getWinner();
-                if(winner != null){
-                    if(j % 2 == 0){
-                        gameList.get(i).get(j/2).setParticipant1(winner);
-                    } else{
-                        gameList.get(i).get(j/2).setParticipant2(winner);
-                    }
-                }
-            }
-        }
-    }
 
     public String getName() {
         return name;
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
index 9ba380f..b0c6393 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
@@ -126,10 +126,6 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
-    public void refreshGameParticipants() {
-        getTournament().refreshGameParticipants();
-        informListener();
-    }
 
     public void informListener() {
         for(IsObserver observer : listener) {
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
index c1f059e..f970bee 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
@@ -25,7 +25,7 @@ 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);
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
index 8d566b6..e1fe378 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
@@ -31,8 +31,6 @@ public class GameController extends FXController{
     @FXML
     void saveGamerResult(ActionEvent event) {
         gameDecorator.saveGame(pointsTeamOne.getText(), pointsTeamTwo.getText(), placesChoiceBox.getValue());
-        getTournamentDecorator().refreshGameParticipants();
-        loadContent();
     }
 
     @Override
@@ -43,8 +41,23 @@ public class GameController extends FXController{
         pointsTeamTwo.setText(String.valueOf(gameDecorator.getPoints2()));
     }
 
+    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) {
-        super.setup(tournamentDecorator, fileIO, factoryDecorator, pane);
+        setTournamentDecorator(tournamentDecorator);
         this.gameDecorator = gameDecorator;
     }
 
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
index ef7ed94..0b339b4 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public class GameDecorator {
+public class GameDecorator implements IsObservable{
     private Game game;
     private List<IsObserver> listener = new ArrayList<>();
 
@@ -14,10 +14,21 @@ public class GameDecorator {
         this.game = game;
     }
 
+    @Override
+    public void addListener(IsObserver observer) {
+        listener.add(observer);
+    }
+
+    @Override
+    public void removeListener(IsObserver observer) {
+        listener.remove(observer);
+    }
+
     public void saveGame(String points1, String points2, Place place){
         game.setPoints1(Integer.parseInt(points1));
         game.setPoints2(Integer.parseInt(points2));
         game.setPlace(place);
+        informListener();
     }
 
     public String getPoints1() {
@@ -42,7 +53,17 @@ public class GameDecorator {
         return "2";
     }
 
+    public void refreshParticipants(){
+        game.refreshParticipants();
+    }
+
     public Place getLocation() {
         return game.getPlace();
     }
+
+    public void informListener() {
+        for(IsObserver observer : listener) {
+            observer.update();
+        }
+    }
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
index d7e25f8..075a1e8 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
@@ -13,6 +13,7 @@ import javafx.scene.layout.VBox;
 import org.checkerframework.checker.units.qual.C;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 public class GameScheduleController extends FXController {
@@ -55,12 +56,22 @@ public class GameScheduleController extends FXController {
 
         List<List<Game>> gameList = getTournamentDecorator().getTournament().getGameList();
 
+        List<GameDecorator> gameDecorators = new ArrayList<>();
         for (int i = 0; i < gameList.size(); i++) {
+            List<GameDecorator> newGameDecorators = new ArrayList<>();
             VBox vBox = new VBox();
             for (int j = 0; j < gameList.get(i).size(); j++) {
-                getFactoryDecorator().openGameView(vBox,gameList.get(i).get(j));
+                GameDecorator gameDecorator = new GameDecorator(gameList.get(i).get(j));
+                newGameDecorators.add(gameDecorator);
+                GameController controller = getFactoryDecorator().openGameView(vBox,gameDecorator);
+                if(i>0){
+                    controller.addListener(gameDecorators.get(j*2));
+                    controller.addListener(gameDecorators.get(j*2+1));
+                }
+                controller.loadContent();
             }
             hBoxCenter.getChildren().add(vBox);
+            gameDecorators = newGameDecorators;
         }
 
     }
-- 
2.40.1


From 5e88960c8a9cf437b98f7c7c0f9b8a35fef8a4ce Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 7 May 2022 15:34:08 +0200
Subject: [PATCH 13/23] extracted Method loadGameTree to FactoryDecorator.java

---
 .../turnierverwaltung/FactoryDecorator.java   | 26 +++++++++++++++
 .../GameScheduleController.java               | 32 +------------------
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
index a186616..739f7ff 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -3,6 +3,7 @@ package ch.zhaw.projekt2.turnierverwaltung;
 import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController;
 import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameDecorator;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 
@@ -75,10 +76,35 @@ public class FactoryDecorator implements IsObservable{
         informListener();
     }
 
+    public void loadGameTree(HBox hBoxCenter, TournamentDecorator tournamentDecorator) {
+        hBoxCenter.getChildren().clear();
+
+        List<List<Game>> gameList = tournamentDecorator.getTournament().getGameList();
+
+        List<GameDecorator> gameDecorators = new ArrayList<>();
+        for (int i = 0; i < gameList.size(); i++) {
+            List<GameDecorator> newGameDecorators = new ArrayList<>();
+            VBox vBox = new VBox();
+            for (int j = 0; j < gameList.get(i).size(); j++) {
+                GameDecorator gameDecorator = new GameDecorator(gameList.get(i).get(j));
+                newGameDecorators.add(gameDecorator);
+                GameController controller = openGameView(vBox,gameDecorator);
+                if(i>0){
+                    controller.addListener(gameDecorators.get(j*2));
+                    controller.addListener(gameDecorators.get(j*2+1));
+                }
+                controller.loadContent();
+            }
+            hBoxCenter.getChildren().add(vBox);
+            gameDecorators = newGameDecorators;
+        }
+    }
+
     public GameController openGameView(VBox vBox, GameDecorator gameDecorator) {
         return factory.loadGameView(vBox ,gameDecorator, this);
     }
 
+
     public void informListener() {
         for(IsObserver observer : listener) {
             observer.update();
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
index 075a1e8..f0dab5e 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
@@ -1,20 +1,11 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
-import ch.zhaw.projekt2.turnierverwaltung.Game;
 import ch.zhaw.projekt2.turnierverwaltung.Tournament;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Button;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.VBox;
-import org.checkerframework.checker.units.qual.C;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 public class GameScheduleController extends FXController {
     
@@ -52,28 +43,7 @@ public class GameScheduleController extends FXController {
 
     @Override
     public void loadContent() {
-        hBoxCenter.getChildren().clear();
-
-        List<List<Game>> gameList = getTournamentDecorator().getTournament().getGameList();
-
-        List<GameDecorator> gameDecorators = new ArrayList<>();
-        for (int i = 0; i < gameList.size(); i++) {
-            List<GameDecorator> newGameDecorators = new ArrayList<>();
-            VBox vBox = new VBox();
-            for (int j = 0; j < gameList.get(i).size(); j++) {
-                GameDecorator gameDecorator = new GameDecorator(gameList.get(i).get(j));
-                newGameDecorators.add(gameDecorator);
-                GameController controller = getFactoryDecorator().openGameView(vBox,gameDecorator);
-                if(i>0){
-                    controller.addListener(gameDecorators.get(j*2));
-                    controller.addListener(gameDecorators.get(j*2+1));
-                }
-                controller.loadContent();
-            }
-            hBoxCenter.getChildren().add(vBox);
-            gameDecorators = newGameDecorators;
-        }
-
+        getFactoryDecorator().loadGameTree(hBoxCenter, getTournamentDecorator());
     }
 }
 
-- 
2.40.1


From 89e72a15927d09786893fa6be8a4313dc82ea234 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 7 May 2022 15:45:43 +0200
Subject: [PATCH 14/23] solved Problem "points and places of games are not
 saved in file."

---
 .../zhaw/projekt2/turnierverwaltung/FactoryDecorator.java   | 6 ++++++
 .../main/gameScheduleView/GameController.java               | 2 ++
 .../main/gameScheduleView/GameDecorator.java                | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
index 739f7ff..81672e7 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -93,6 +93,12 @@ public class FactoryDecorator implements IsObservable{
                     controller.addListener(gameDecorators.get(j*2));
                     controller.addListener(gameDecorators.get(j*2+1));
                 }
+                gameDecorator.addListener(new IsObserver() {
+                    @Override
+                    public void update() {
+                        tournamentDecorator.saveTournament();
+                    }
+                });
                 controller.loadContent();
             }
             hBoxCenter.getChildren().add(vBox);
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
index e1fe378..671458c 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
@@ -39,6 +39,8 @@ public class GameController extends FXController{
         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(){
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
index 0b339b4..31322e4 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
@@ -57,7 +57,7 @@ public class GameDecorator implements IsObservable{
         game.refreshParticipants();
     }
 
-    public Place getLocation() {
+    public Place getPlace() {
         return game.getPlace();
     }
 
-- 
2.40.1


From afab6dbee306a2e624e7c2f9c8acaa324fcca37c Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 7 May 2022 16:43:46 +0200
Subject: [PATCH 15/23] refactoring of GameSchedule and button "close
 Tournament" added. added "informListener()" to method refreshParticipants in
 GameDecorator.java to be sure the new participants are saved in file.

---
 .../turnierverwaltung/FXController.java       | 33 ++++++++++++-------
 .../main/gameScheduleView/GameDecorator.java  |  1 +
 .../GameScheduleController.java               | 11 +++++++
 .../ParticipantFormularController.java        |  1 +
 .../PlacesFormularController.java             |  1 +
 .../TournamentListController.java             |  1 +
 .../gameScheduleView/GameSchedule.fxml        | 10 +++---
 7 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
index bb07387..68a86b6 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
@@ -7,24 +7,23 @@ 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() {
-            @Override
-            public void update() {
-                loadContent();
-            }
-        });
-        factoryDecorator.addListener(new IsObserver() {
-            @Override
-            public void update() {
-                loadContent();
-            }
-        });
+        addListener();
     }
 
     public abstract void loadContent();
@@ -33,6 +32,16 @@ public abstract class FXController {
         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;
     }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
index 31322e4..29d93f2 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
@@ -55,6 +55,7 @@ public class GameDecorator implements IsObservable{
 
     public void refreshParticipants(){
         game.refreshParticipants();
+        informListener();
     }
 
     public Place getPlace() {
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
index f0dab5e..675806b 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
@@ -18,6 +18,9 @@ public class GameScheduleController extends FXController {
     @FXML
     private Button editParticipantBtn;
 
+    @FXML
+    private Button closeTournamentBtn;
+
     @FXML
     private HBox hBoxCenter;
 
@@ -33,14 +36,22 @@ public class GameScheduleController extends FXController {
 
     @FXML
     void openPlacesFormular(ActionEvent event) {
+        removeListener();
         getFactoryDecorator().openPlacesFormular();
     }
 
     @FXML
     void openParticipantFormular(ActionEvent event) {
+        removeListener();
         getFactoryDecorator().openParticipantFormular();
     }
 
+    @FXML
+    void closeTournament(ActionEvent event) {
+        removeListener();
+        getFactoryDecorator().openTournamentList();
+    }
+
     @Override
     public void loadContent() {
         getFactoryDecorator().loadGameTree(hBoxCenter, getTournamentDecorator());
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java
index 0528301..b677ce5 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java
@@ -89,6 +89,7 @@ public class ParticipantFormularController extends FXController {
 
     @FXML
     void close(ActionEvent event) {
+        removeListener();
         getFactoryDecorator().openScheduleView();
     }
 
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
index c5534e5..6a2de96 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
@@ -68,6 +68,7 @@ public class PlacesFormularController extends FXController {
 
     @FXML
     void close(ActionEvent event) {
+        removeListener();
         getFactoryDecorator().openScheduleView();
     }
 
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/TournamentListController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/TournamentListController.java
index bcc1109..b70630a 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/TournamentListController.java
+++ b/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);
     }
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
index 6c824a7..8e77213 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.HBox?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 
-<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.gameScheduleView.GameScheduleController">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" 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">
    <top>
       <HBox alignment="TOP_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
          <children>
@@ -24,6 +23,7 @@
                   <Insets right="40.0" />
                </HBox.margin>
             </Button>
+            <Button fx:id="closeTournamentBtn" layoutX="470.0" layoutY="10.0" mnemonicParsing="false" onAction="#closeTournament" text="Close Tournament" />
          </children>
       </HBox>
    </top>
-- 
2.40.1


From 38d1708a2574b7325b8207b5342c3e7b4fef224f Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 8 May 2022 17:28:41 +0200
Subject: [PATCH 16/23] changed Alignment of VBox to center in
 TournamentSchedule

---
 .../ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java    | 2 ++
 .../ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
index 81672e7..f6d29cb 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -2,6 +2,7 @@ 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;
@@ -85,6 +86,7 @@ public class FactoryDecorator implements IsObservable{
         for (int i = 0; i < gameList.size(); i++) {
             List<GameDecorator> newGameDecorators = new ArrayList<>();
             VBox vBox = new VBox();
+            vBox.setAlignment(Pos.CENTER);
             for (int j = 0; j < gameList.get(i).size(); j++) {
                 GameDecorator gameDecorator = new GameDecorator(gameList.get(i).get(j));
                 newGameDecorators.add(gameDecorator);
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
index f970bee..9ff754e 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
@@ -31,7 +31,7 @@ public class MainWindow extends Application {
         Scene scene = new Scene(pane);
         primaryStage.setScene(scene);
         primaryStage.setMaximized(true);
-        primaryStage.setResizable(false);
+        primaryStage.setResizable(true);
         primaryStage.setFullScreen(false);
         primaryStage.show();
     }
-- 
2.40.1


From a44227b3f69875c20e645e0a2a9452e5511b0ac7 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 8 May 2022 20:20:41 +0200
Subject: [PATCH 17/23] fixed spacing between games in GameSchedule

---
 .../turnierverwaltung/FactoryDecorator.java   |  6 ++
 .../main/gameScheduleView/GameController.java |  9 +-
 .../gameScheduleView/Game.fxml                | 82 ++++++++++---------
 .../gameScheduleView/GameSchedule.fxml        |  8 +-
 4 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
index f6d29cb..f57df70 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -83,10 +83,14 @@ public class FactoryDecorator implements IsObservable{
         List<List<Game>> gameList = tournamentDecorator.getTournament().getGameList();
 
         List<GameDecorator> gameDecorators = new ArrayList<>();
+        double gameBoxHeight = 0;
+        double spacingFactor = 0;
         for (int i = 0; i < gameList.size(); i++) {
             List<GameDecorator> newGameDecorators = new ArrayList<>();
             VBox vBox = new VBox();
             vBox.setAlignment(Pos.CENTER);
+            vBox.setSpacing(gameBoxHeight * spacingFactor);
+            spacingFactor = spacingFactor * 2 + 1;
             for (int j = 0; j < gameList.get(i).size(); j++) {
                 GameDecorator gameDecorator = new GameDecorator(gameList.get(i).get(j));
                 newGameDecorators.add(gameDecorator);
@@ -94,6 +98,8 @@ public class FactoryDecorator implements IsObservable{
                 if(i>0){
                     controller.addListener(gameDecorators.get(j*2));
                     controller.addListener(gameDecorators.get(j*2+1));
+                } else if(gameBoxHeight == 0) {
+                    gameBoxHeight = controller.getGameBoxHeigth();
                 }
                 gameDecorator.addListener(new IsObserver() {
                     @Override
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
index 671458c..0618db0 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
@@ -7,11 +7,15 @@ import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
 
 public class GameController extends FXController{
 
     private GameDecorator gameDecorator;
 
+    @FXML
+    private VBox mainVBox;
+
     @FXML
     private Label participantNameOne;
 
@@ -27,12 +31,15 @@ public class GameController extends FXController{
     @FXML
     private TextField pointsTeamTwo;
 
-
     @FXML
     void saveGamerResult(ActionEvent event) {
         gameDecorator.saveGame(pointsTeamOne.getText(), pointsTeamTwo.getText(), placesChoiceBox.getValue());
     }
 
+    public double getGameBoxHeigth(){
+        return mainVBox.getPrefHeight();
+    }
+
     @Override
     public void loadContent() {
         participantNameOne.setText(gameDecorator.getParticipantOne());
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
index be704e2..b740265 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
@@ -8,47 +8,51 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" 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="200.0" prefWidth="200.0" style="-fx-border-color: black; -fx-border-insets: 2; -fx-border-width: 3;" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController">
    <children>
-      <Label fx:id="participantNameOne" text="Participant One" />
-      <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+      <VBox fx:id="mainVBox" alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
          <children>
-            <Label text="Points">
-               <HBox.margin>
-                  <Insets right="20.0" />
-               </HBox.margin>
-            </Label>
-            <TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.0" />
+            <Label fx:id="participantNameOne" text="Participant One" />
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <Label text="Points">
+                     <HBox.margin>
+                        <Insets right="20.0" />
+                     </HBox.margin>
+                  </Label>
+                  <TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.0" />
+               </children>
+            </HBox>
+            <Label fx:id="participantNameTwo" text="Participant 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>
+               <VBox.margin>
+                  <Insets top="10.0" />
+               </VBox.margin>
+            </HBox>
+            <Button mnemonicParsing="false" onAction="#saveGamerResult" text="Speichern">
+               <VBox.margin>
+                  <Insets bottom="10.0" top="10.0" />
+               </VBox.margin>
+            </Button>
          </children>
-      </HBox>
-      <Label fx:id="participantNameTwo" text="Participant 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>
-         <VBox.margin>
-            <Insets top="10.0" />
-         </VBox.margin>
-      </HBox>
-      <Button mnemonicParsing="false" onAction="#saveGamerResult" text="Speichern">
-         <VBox.margin>
-            <Insets bottom="10.0" top="10.0" />
-         </VBox.margin>
-      </Button>
+      </VBox>
    </children>
 </VBox>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
index 8e77213..34f2257 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" 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="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">
    <top>
       <HBox alignment="TOP_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
          <children>
@@ -28,6 +28,10 @@
       </HBox>
    </top>
    <center>
-      <HBox fx:id="hBoxCenter" prefHeight="324.0" prefWidth="600.0" BorderPane.alignment="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" spacing="100.0" />
+         </content>
+      </ScrollPane>
    </center>
 </BorderPane>
-- 
2.40.1


From 53ffa90c6953a819590ca88127ec6c24c8ccbc79 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 8 May 2022 20:32:23 +0200
Subject: [PATCH 18/23] changed height of games.

---
 .../turnierverwaltung/gameScheduleView/Game.fxml       | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
index b740265..ad1ac25 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
@@ -8,14 +8,13 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.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" style="-fx-border-color: black; -fx-border-insets: 2; -fx-border-width: 3;" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController">
    <children>
-      <VBox fx:id="mainVBox" alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
+      <VBox fx:id="mainVBox" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="150.0">
          <children>
-            <Label fx:id="participantNameOne" text="Participant One" />
             <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <Label text="Points">
+                  <Label fx:id="participantNameOne" text="Participant One">
                      <HBox.margin>
                         <Insets right="20.0" />
                      </HBox.margin>
@@ -23,10 +22,9 @@
                   <TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.0" />
                </children>
             </HBox>
-            <Label fx:id="participantNameTwo" text="Participant Two" />
             <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <Label text="Points">
+                  <Label fx:id="participantNameTwo" text="Participant Two">
                      <HBox.margin>
                         <Insets right="20.0" />
                      </HBox.margin>
-- 
2.40.1


From b51a585167973231955f79cd8c3e5b2c07ac2968 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 8 May 2022 22:13:03 +0200
Subject: [PATCH 19/23] added functionality to autosave result and place if
 changed.

---
 .../main/gameScheduleView/GameController.java      | 13 ++++++++++---
 .../main/gameScheduleView/GameDecorator.java       | 14 +++++++++++---
 .../gameScheduleView/GameSchedule.fxml             |  7 +++++--
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
index 0618db0..c8f5761 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
@@ -1,7 +1,8 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
 
 import ch.zhaw.projekt2.turnierverwaltung.*;
-import javafx.event.ActionEvent;
+import javafx.beans.value.ObservableValue;
+import javafx.event.Event;
 import javafx.fxml.FXML;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
@@ -32,8 +33,13 @@ public class GameController extends FXController{
     private TextField pointsTeamTwo;
 
     @FXML
-    void saveGamerResult(ActionEvent event) {
-        gameDecorator.saveGame(pointsTeamOne.getText(), pointsTeamTwo.getText(), placesChoiceBox.getValue());
+    void saveGameResult(Event event) {
+        gameDecorator.saveGameResult(pointsTeamOne.getText(), pointsTeamTwo.getText());
+    }
+
+
+    private void saveGamePlace(Place newPlace) {
+        gameDecorator.saveGamePlace(newPlace);
     }
 
     public double getGameBoxHeigth(){
@@ -68,6 +74,7 @@ public class GameController extends FXController{
     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));
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
index 29d93f2..6a87104 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
@@ -24,9 +24,17 @@ public class GameDecorator implements IsObservable{
         listener.remove(observer);
     }
 
-    public void saveGame(String points1, String points2, Place place){
-        game.setPoints1(Integer.parseInt(points1));
-        game.setPoints2(Integer.parseInt(points2));
+    public void saveGameResult(String points1, String points2){
+        if(points1.length() > 0){
+            game.setPoints1(Integer.parseInt(points1));
+        }
+        if(points2.length() > 0) {
+            game.setPoints2(Integer.parseInt(points2));
+        }
+        informListener();
+    }
+
+    public void saveGamePlace(Place place){
         game.setPlace(place);
         informListener();
     }
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
index 34f2257..c9bd568 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
@@ -20,10 +20,13 @@
             </Button>
             <Button fx:id="editLocBtn" mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten">
                <HBox.margin>
-                  <Insets right="40.0" />
+                  <Insets right="20.0" />
                </HBox.margin>
             </Button>
-            <Button fx:id="closeTournamentBtn" layoutX="470.0" layoutY="10.0" mnemonicParsing="false" onAction="#closeTournament" text="Close Tournament" />
+            <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>
-- 
2.40.1


From 7f723fd7636a75ac86802c0557e87e96de8f2df6 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Wed, 11 May 2022 16:21:38 +0200
Subject: [PATCH 20/23] implemented functionality to activate treeview

---
 .../turnierverwaltung/FactoryDecorator.java   | 10 ++++--
 .../GameScheduleController.java               | 11 +++++-
 .../gameScheduleView/Game.fxml                | 35 ++++++++++---------
 .../gameScheduleView/GameSchedule.fxml        |  1 +
 4 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
index f57df70..0584c3c 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -77,7 +77,7 @@ public class FactoryDecorator implements IsObservable{
         informListener();
     }
 
-    public void loadGameTree(HBox hBoxCenter, TournamentDecorator tournamentDecorator) {
+    public void loadGameList(HBox hBoxCenter, TournamentDecorator tournamentDecorator, boolean treeView) {
         hBoxCenter.getChildren().clear();
 
         List<List<Game>> gameList = tournamentDecorator.getTournament().getGameList();
@@ -88,8 +88,12 @@ public class FactoryDecorator implements IsObservable{
         for (int i = 0; i < gameList.size(); i++) {
             List<GameDecorator> newGameDecorators = new ArrayList<>();
             VBox vBox = new VBox();
-            vBox.setAlignment(Pos.CENTER);
-            vBox.setSpacing(gameBoxHeight * spacingFactor);
+            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));
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
index 675806b..4d4410c 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
@@ -5,6 +5,7 @@ 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 {
@@ -24,6 +25,9 @@ public class GameScheduleController extends FXController {
     @FXML
     private HBox hBoxCenter;
 
+    @FXML
+    private CheckBox treeView;
+
     @FXML
     void createNewSchedule(ActionEvent event) {
         try {
@@ -52,9 +56,14 @@ public class GameScheduleController extends FXController {
         getFactoryDecorator().openTournamentList();
     }
 
+    @FXML
+    void changeView(ActionEvent event) {
+        loadContent();
+    }
+
     @Override
     public void loadContent() {
-        getFactoryDecorator().loadGameTree(hBoxCenter, getTournamentDecorator());
+        getFactoryDecorator().loadGameList(hBoxCenter, getTournamentDecorator(), treeView.isSelected());
     }
 }
 
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
index ad1ac25..e335cc5 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
@@ -1,35 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ChoiceBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="150.0" 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="90.0" prefWidth="450.0" style="-fx-border-color: black; -fx-border-insets: 2; -fx-border-width: 3;" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController">
    <children>
-      <VBox fx:id="mainVBox" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="150.0">
+      <VBox fx:id="mainVBox" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="90.0">
          <children>
             <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <Label fx:id="participantNameOne" text="Participant One">
+                  <Label fx:id="participantNameOne" style="-fx-font-weight: bold;" text="Participant One">
                      <HBox.margin>
                         <Insets right="20.0" />
                      </HBox.margin>
                   </Label>
-                  <TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.0" />
-               </children>
-            </HBox>
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
-               <children>
-                  <Label fx:id="participantNameTwo" text="Participant Two">
+                  <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>
-                  <TextField fx:id="pointsTeamTwo" prefHeight="25.0" prefWidth="50.0" />
                </children>
             </HBox>
             <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
@@ -45,11 +53,6 @@
                   <Insets top="10.0" />
                </VBox.margin>
             </HBox>
-            <Button mnemonicParsing="false" onAction="#saveGamerResult" text="Speichern">
-               <VBox.margin>
-                  <Insets bottom="10.0" top="10.0" />
-               </VBox.margin>
-            </Button>
          </children>
       </VBox>
    </children>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
index c9bd568..65e74f4 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
@@ -8,6 +8,7 @@
    <top>
       <HBox alignment="TOP_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
          <children>
+            <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" />
-- 
2.40.1


From db51f2f3cd5930fe5a3df966dc5af3a57603ad3b Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Wed, 11 May 2022 17:42:36 +0200
Subject: [PATCH 21/23] implemented functionality to drawLines

---
 .../turnierverwaltung/FactoryDecorator.java   | 36 +++++++++++++++++++
 .../gameScheduleView/GameSchedule.fxml        |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
index 0584c3c..1a93f8c 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -3,10 +3,12 @@ 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;
@@ -114,10 +116,44 @@ public class FactoryDecorator implements IsObservable{
                 controller.loadContent();
             }
             hBoxCenter.getChildren().add(vBox);
+            if(treeView){
+                if(i+1 < gameList.size())
+                hBoxCenter.getChildren().add(drawLines(vBox, gameBoxHeight, 30));
+            }
             gameDecorators = newGameDecorators;
         }
     }
 
+    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);
     }
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
index 65e74f4..f3f9207 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
@@ -34,7 +34,7 @@
    <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" spacing="100.0" />
+            <HBox fx:id="hBoxCenter" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="324.0" prefWidth="600.0" />
          </content>
       </ScrollPane>
    </center>
-- 
2.40.1


From d3a4b4cc876ffd13b7f1e788dae6dee8df248dd5 Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Thu, 12 May 2022 13:23:15 +0200
Subject: [PATCH 22/23] if game points empty default value is 0

changed to variable names
---
 .../turnierverwaltung/FactoryDecorator.java    | 18 +++++++++---------
 .../main/gameScheduleView/GameDecorator.java   |  4 ++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
index 1a93f8c..a03d878 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -84,11 +84,11 @@ public class FactoryDecorator implements IsObservable{
 
         List<List<Game>> gameList = tournamentDecorator.getTournament().getGameList();
 
-        List<GameDecorator> gameDecorators = new ArrayList<>();
+        List<GameDecorator> gameDecoratorsList = new ArrayList<>();
         double gameBoxHeight = 0;
         double spacingFactor = 0;
         for (int i = 0; i < gameList.size(); i++) {
-            List<GameDecorator> newGameDecorators = new ArrayList<>();
+            List<GameDecorator> newGameDecoratorsList = new ArrayList<>();
             VBox vBox = new VBox();
             if(treeView){
                 vBox.setAlignment(Pos.CENTER);
@@ -99,13 +99,13 @@ public class FactoryDecorator implements IsObservable{
             spacingFactor = spacingFactor * 2 + 1;
             for (int j = 0; j < gameList.get(i).size(); j++) {
                 GameDecorator gameDecorator = new GameDecorator(gameList.get(i).get(j));
-                newGameDecorators.add(gameDecorator);
-                GameController controller = openGameView(vBox,gameDecorator);
+                newGameDecoratorsList.add(gameDecorator);
+                GameController gameController = openGameView(vBox,gameDecorator);
                 if(i>0){
-                    controller.addListener(gameDecorators.get(j*2));
-                    controller.addListener(gameDecorators.get(j*2+1));
+                    gameController.addListener(gameDecoratorsList.get(j*2));
+                    gameController.addListener(gameDecoratorsList.get(j*2+1));
                 } else if(gameBoxHeight == 0) {
-                    gameBoxHeight = controller.getGameBoxHeigth();
+                    gameBoxHeight = gameController.getGameBoxHeigth();
                 }
                 gameDecorator.addListener(new IsObserver() {
                     @Override
@@ -113,14 +113,14 @@ public class FactoryDecorator implements IsObservable{
                         tournamentDecorator.saveTournament();
                     }
                 });
-                controller.loadContent();
+                gameController.loadContent();
             }
             hBoxCenter.getChildren().add(vBox);
             if(treeView){
                 if(i+1 < gameList.size())
                 hBoxCenter.getChildren().add(drawLines(vBox, gameBoxHeight, 30));
             }
-            gameDecorators = newGameDecorators;
+            gameDecoratorsList = newGameDecoratorsList;
         }
     }
 
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
index 6a87104..6be0905 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
@@ -27,9 +27,13 @@ public class GameDecorator implements IsObservable{
     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();
     }
-- 
2.40.1


From 84b5f2464de2cdaf8c178a8bce53bfb86cf15ead Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Thu, 12 May 2022 13:38:53 +0200
Subject: [PATCH 23/23] test performance with separete thread to save and load
 file

---
 .../projekt2/turnierverwaltung/FileIO.java    |  4 +--
 .../TournamentDecorator.java                  | 26 +++++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
index 14b76f0..8549e8a 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
@@ -81,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");
@@ -125,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");
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
index b0c6393..25e5bd2 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
+++ b/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 {
-            fileIO.saveTournament(tournament);
-        } catch (IOException e) {
-            e.printStackTrace(); //TODO handle and logging
-        }
+        executorService.execute(new saveTask());
     }
 
+
+
     public void createTournament(String name, Tournament.Type type){
         if(fileIO.tournamentExists(name)){
             System.out.println("Tournament with same name exists already.");
@@ -133,4 +137,16 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
+    private class saveTask implements Runnable {
+
+        @Override
+        public void run() {
+            try {
+                fileIO.saveTournament(tournament);
+            } catch (IOException e) {
+                e.printStackTrace(); //TODO handle and logging
+            }
+        }
+    }
+
 }
-- 
2.40.1