From fd2e775c94578eb9bc93e15338cf17dd25ddf075 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 30 Apr 2022 18:22:06 +0200
Subject: [PATCH 01/12] cleanCode fixes.

---
 .../TournamentListController.java               | 17 ++++++-----------
 .../tournamentList/tournamentList.fxml          |  6 +++---
 2 files changed, 9 insertions(+), 14 deletions(-)

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 37c5c7b..70ad12f 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
@@ -1,11 +1,6 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
-import ch.zhaw.projekt2.turnierverwaltung.Factory;
-import ch.zhaw.projekt2.turnierverwaltung.FileIO;
-import ch.zhaw.projekt2.turnierverwaltung.Tournament;
-import ch.zhaw.projekt2.turnierverwaltung.main.MainWindow;
-import javafx.beans.Observable;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
@@ -38,16 +33,16 @@ public class TournamentListController extends FXController {
     private Button openBtn;
 
     @FXML
-    private Label tournierListTitle;
+    private Label tournamentListTitle;
 
     @FXML
-    private ListView<File> tournierListView;
+    private ListView<File> tournamentListView;
 
     @FXML
-    private Label tournierModLabel;
+    private Label tournamentModLabel;
 
     @FXML
-    private Label turnierNameLabel;
+    private Label tournamentNameLabel;
 
     @FXML
     void createTournament(ActionEvent event) {
@@ -57,7 +52,7 @@ public class TournamentListController extends FXController {
     @FXML
     void openTournament(ActionEvent event) {
         try {
-            File tournamentFile = tournierListView.getSelectionModel().getSelectedItems().get(0);
+            File tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
             getFactory().setTournament(getFileIO().loadTournament(tournamentFile));
             getFactory().loadParticipantFormular((BorderPane) getPane());
         } catch (IOException e) {
@@ -73,7 +68,7 @@ public class TournamentListController extends FXController {
         for(File tournament : getFileIO().getList()){
             tournamentFiles.add(tournament);
         }
-        tournierListView.setItems(tournamentFiles);
+        tournamentListView.setItems(tournamentFiles);
     }
 }
 
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
index 74c2bf2..9dbbfeb 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
@@ -18,7 +18,7 @@
     <children>
         <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
             <children>
-                <Label fx:id="tournierListTitle" text="Bestehende Turniere">
+                <Label fx:id="tournamentListTitle" text="Bestehende Turniere">
                     <font>
                         <Font name="System Bold" size="21.0" />
                     </font>
@@ -26,7 +26,7 @@
                         <Insets bottom="20.0" />
                     </VBox.margin>
                 </Label>
-                <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                <ListView fx:id="tournamentListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                     <VBox.margin>
                         <Insets />
                     </VBox.margin>
@@ -76,7 +76,7 @@
                                 <Insets />
                             </GridPane.margin>
                         </TextField>
-                        <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
+                        <Label fx:id="tournamentModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
                             <GridPane.margin>
                                 <Insets />
                             </GridPane.margin>
-- 
2.40.1


From 171cf7ef4e866c867b0d7571aac317e64408fe44 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 10:27:21 +0200
Subject: [PATCH 02/12] implemented functionality to add new Tournament

---
 .../projekt2/turnierverwaltung/FileIO.java    |  13 +++--
 .../turnierverwaltung/Tournament.java         |  54 +++++++++++++++++-
 .../TournamentListController.java             |  44 +++++++++-----
 .../tournamentList/tournamentList.fxml        |  23 +++-----
 .../turnierverwaltung/FileIOTest.java         |   7 ++-
 .../FileIORead/saves/test1.txt                | Bin 102 -> 265 bytes
 6 files changed, 105 insertions(+), 36 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 9b9365d..fd46713 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
@@ -1,6 +1,9 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
 import java.io.*;
 import java.net.URI;
 import java.util.ArrayList;
@@ -34,13 +37,13 @@ public class FileIO {
         }
     }
 
-    public List<TournamentFile> getList() {
+    public ObservableList<TournamentFile> getList() {
         logger.fine("Creating a List out of all Files in the save directory and returning it");
-        List<TournamentFile> tournaments = new ArrayList<>();
+        ObservableList<TournamentFile> tournamentFiles = FXCollections.observableArrayList();
         for(File tournament : saves.listFiles()){
-            tournaments.add(new TournamentFile(tournament.toURI()));
+            tournamentFiles.add(new TournamentFile(tournament.toURI()));
         }
-        return tournaments;
+        return tournamentFiles;
     }
 
     /**
@@ -86,7 +89,7 @@ public class FileIO {
         return tournament;
     }
 
-    public void saveTournament(Tournament tournament) {
+    public void saveTournament(Tournament tournament) throws IOException {
         if (tournament == null) {
             logger.warning("Given tournament file is empty");
             throw new IllegalArgumentException("Null tournament received");
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 0da286d..2966009 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -1,12 +1,22 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
 import java.io.Serializable;
 
 public class Tournament implements Serializable {
     private String name;
+    private Type type;
 
-    public Tournament(String name){
+
+
+    public Tournament(String name, Type type) throws InvalidNameException {
+        if(!name.matches("[\\w]{1,20}")){
+            throw new Tournament.InvalidNameException("Invalid Name entered"); //TODO handle en logging.
+        }
         setName(name);
+        setType(type);
     }
 
     public String getName() {
@@ -16,4 +26,46 @@ public class Tournament implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public enum Type {
+        KO("KO-System"), GROUPS("Gruppenspiele");
+
+        private String name;
+
+        private Type(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        public static ObservableList<Type> getObservableList(){
+            ObservableList<Type> items = FXCollections.observableArrayList();
+            items.addAll(values());
+            return items;
+        }
+    }
+
+    public class InvalidNameException extends Exception {
+        public InvalidNameException() {
+            super();
+        }
+
+        public InvalidNameException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+
 }
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 70ad12f..1547ab1 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
@@ -1,14 +1,13 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.FileIO;
+import ch.zhaw.projekt2.turnierverwaltung.Tournament;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListView;
+import javafx.scene.control.*;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.GridPane;
 
@@ -17,6 +16,11 @@ import java.io.IOException;
 
 public class TournamentListController extends FXController {
 
+    @FXML
+    public void initialize(){
+        modusChoiceBox.setItems(Tournament.Type.getObservableList());
+    }
+
     @FXML
     private Button createBtn;
 
@@ -24,7 +28,7 @@ public class TournamentListController extends FXController {
     private GridPane grid;
 
     @FXML
-    private ChoiceBox<?> modusChoiceBox;
+    private ChoiceBox<Tournament.Type> modusChoiceBox;
 
     @FXML
     private Label newTournamentFormularTitle;
@@ -36,7 +40,7 @@ public class TournamentListController extends FXController {
     private Label tournamentListTitle;
 
     @FXML
-    private ListView<File> tournamentListView;
+    private ListView<FileIO.TournamentFile> tournamentListView;
 
     @FXML
     private Label tournamentModLabel;
@@ -44,8 +48,26 @@ public class TournamentListController extends FXController {
     @FXML
     private Label tournamentNameLabel;
 
+    @FXML
+    private TextField tournamentNameField;
+
     @FXML
     void createTournament(ActionEvent event) {
+        for(FileIO.TournamentFile file : getFileIO().getList()) {
+            if(file.toString().equals(tournamentNameField.getText())){
+                return; //TODO handle and logging
+                // Tournament with same name exists already.
+            }
+        }
+        try {
+            Tournament tournament = new Tournament(tournamentNameField.getText(), modusChoiceBox.getValue());
+            getFileIO().saveTournament(tournament);
+            loadContent();
+        } catch (Tournament.InvalidNameException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (IOException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
 
     }
 
@@ -54,21 +76,17 @@ public class TournamentListController extends FXController {
         try {
             File tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
             getFactory().setTournament(getFileIO().loadTournament(tournamentFile));
-            getFactory().loadParticipantFormular((BorderPane) getPane());
+            getFactory().loadParticipantFormular((BorderPane) getPane()); //TODO load TournamentView instead of ParticipantFormular?
         } catch (IOException e) {
             e.printStackTrace();
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
-        }
+        } //TODO handle and logging
     }
 
     @Override
     public void loadContent() {
-        ObservableList<File> tournamentFiles = FXCollections.observableArrayList();
-        for(File tournament : getFileIO().getList()){
-            tournamentFiles.add(tournament);
-        }
-        tournamentListView.setItems(tournamentFiles);
+        tournamentListView.setItems(getFileIO().getList());
     }
 }
 
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
index 9dbbfeb..3648fdf 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ChoiceBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.TournamentListController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.TournamentListController">
     <children>
         <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
             <children>
@@ -66,12 +57,12 @@
                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                     </rowConstraints>
                     <children>
-                        <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
+                        <Label fx:id="tournamentNameLabel" styleClass="lableGrid" text="Turnier Name:">
                             <GridPane.margin>
                                 <Insets />
                             </GridPane.margin>
                         </Label>
-                        <TextField styleClass="inputGrid" GridPane.columnIndex="1">
+                        <TextField fx:id="tournamentNameField" styleClass="inputGrid" GridPane.columnIndex="1">
                             <GridPane.margin>
                                 <Insets />
                             </GridPane.margin>
diff --git a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java b/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
index fd68e22..ea868cc 100644
--- a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
+++ b/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
@@ -109,7 +109,12 @@ class FileIOTest {
 
         @Test
         void saveTournament() throws IOException {
-            Tournament tournament = new Tournament("test1");
+            Tournament tournament = null;
+            try {
+                tournament = new Tournament("test1", Tournament.Type.KO);
+            } catch (Tournament.InvalidNameException e) {
+                e.printStackTrace();
+            }
             io.saveTournament(tournament);
             File file = new File(mainDir + "/saves/test1.txt");
             if(file.exists()){
diff --git a/app/src/test/resources/ch/zhaw/projekt2/turnierverwaltung/FileIORead/saves/test1.txt b/app/src/test/resources/ch/zhaw/projekt2/turnierverwaltung/FileIORead/saves/test1.txt
index 1053e937a68251e2a9071865be37ff6720565f46..0e0f438ab7b5e23df4c0ea7f2e40a21ee8366adb 100644
GIT binary patch
delta 153
zcmYf6WSU^gZMes7>Qw)CIZO;p6CGrHd>B|tDhpCe7)*SUGxV!663g`qit@8kvrCNh
zOG=CKGE<AnQj5wHb4p6{()B~~fkKJ7sd*(TAwXT$6$K>>tR<<%C5ClH3`P?<bWOnG
j3{W7%z)(@dz?YR+mZ+DLn3t~Snpc{OED6-k<n0dtNBb>!

delta 31
mcmeBVN}FKH{axwNjs@J(NlXlk6CGr@Dhf&%SW8liOAG<22np!`

-- 
2.40.1


From e8e64d435ce77c51afc5e08a4e3471fa4302254f Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 10:49:29 +0200
Subject: [PATCH 03/12] added Method deleteTournament but not implemented yet
 in FileIO.java added Test Methods for deleteTournament.

---
 .../projekt2/turnierverwaltung/FileIO.java    |  5 +++
 .../turnierverwaltung/FileIOTest.java         | 36 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

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 d072da5..801b6e0 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
@@ -110,4 +110,9 @@ public class FileIO {
         }
 
     }
+
+    public void deleteTournament(File tournamentFile) throws IOException {
+        throw new UnsupportedOperationException("Method deleteTournament not implemented yet.");
+    }
+
 }
diff --git a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java b/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
index ad0b9e8..aeeddf4 100644
--- a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
+++ b/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
@@ -83,7 +83,10 @@ class FileIOTest {
         @Test
         void loadTournamentNotExisting(){
             io = new FileIO(mainDir);
-            assertThrows(FileNotFoundException.class, () -> io.loadTournament(new File("Not-existing-File")));
+            File file = new File("Not-existing-File");
+            assertFalse(file.exists());
+            assertThrows(FileNotFoundException.class, () -> io.loadTournament(file));
+            assertFalse(file.exists());
         }
 
         @Test
@@ -124,4 +127,35 @@ class FileIOTest {
             assertThrows(IllegalArgumentException.class, () -> io.saveTournament(null));
         }
     }
+
+    @Nested
+    class Delete{
+        @BeforeEach
+        void setup(){
+            mainDir = RESOURCES_DIR + "FileIODelete";
+            io = new FileIO(mainDir);
+        }
+
+        @Test
+        void deleteTournament() throws IOException {
+            File file = new File(mainDir + "/saves/test1.txt");
+            file.createNewFile();
+            assertTrue(file.exists());
+            io.deleteTournament(file);
+            assertFalse(file.exists());
+        }
+
+        @Test
+        void deleteTournamentNotExisting() throws IOException {
+            File file = new File("Not-existing-File");
+            assertFalse(file.exists());
+            assertThrows(FileNotFoundException.class, () -> io.deleteTournament(file));
+            assertFalse(file.exists());
+        }
+
+        @Test
+        void deleteTournamentNull(){
+            assertThrows(IllegalArgumentException.class, () -> io.deleteTournament(null));
+        }
+    }
 }
\ No newline at end of file
-- 
2.40.1


From 672ad409ce754004fc31185923aa74d5f136750e Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 10:54:21 +0200
Subject: [PATCH 04/12] refactoring in FileIOTest.java

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

diff --git a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java b/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
index aeeddf4..8abeecd 100644
--- a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
+++ b/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
@@ -82,7 +82,6 @@ class FileIOTest {
 
         @Test
         void loadTournamentNotExisting(){
-            io = new FileIO(mainDir);
             File file = new File("Not-existing-File");
             assertFalse(file.exists());
             assertThrows(FileNotFoundException.class, () -> io.loadTournament(file));
@@ -91,13 +90,11 @@ class FileIOTest {
 
         @Test
         void loadTournamentEmpty(){
-            io = new FileIO(mainDir);
             assertThrows(IOException.class, () -> io.loadTournament(new File(mainDir + "/saves/empty.txt")));
         }
 
         @Test
         void loadTournamentFileNull(){
-            io = new FileIO(mainDir);
             assertThrows(IllegalArgumentException.class, () -> io.loadTournament(null));
         }
     }
-- 
2.40.1


From 5034203409023de06e6363d5bd2a038cf8f721be Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 11:10:21 +0200
Subject: [PATCH 05/12] extracted Method tournamentExists to FileIO.java

---
 .../java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java  | 9 +++++++++
 .../main/tournamentList/TournamentListController.java    | 8 +++-----
 2 files changed, 12 insertions(+), 5 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 9a9aa23..2fbcf20 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
@@ -46,6 +46,15 @@ public class FileIO {
         return tournamentFiles;
     }
 
+    public boolean tournamentExists(String name){
+        for(TournamentFile file : getList()) {
+            if(file.toString().toLowerCase().equals(name.toLowerCase())){
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * @param tournamentFile
      * @return
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 1547ab1..f06fe19 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
@@ -53,11 +53,9 @@ public class TournamentListController extends FXController {
 
     @FXML
     void createTournament(ActionEvent event) {
-        for(FileIO.TournamentFile file : getFileIO().getList()) {
-            if(file.toString().equals(tournamentNameField.getText())){
-                return; //TODO handle and logging
-                // Tournament with same name exists already.
-            }
+        if(getFileIO().tournamentExists(tournamentNameField.getText())){
+            System.out.println("Tournament with same name exists already.");
+            return; //TODO handle and logging
         }
         try {
             Tournament tournament = new Tournament(tournamentNameField.getText(), modusChoiceBox.getValue());
-- 
2.40.1


From a3bd20761043f0ebecf2cc4ec07eeeab8659c9e2 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 11:17:18 +0200
Subject: [PATCH 06/12] refactored toString Method of class TournamentFile

---
 .../main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java   | 3 +--
 1 file changed, 1 insertion(+), 2 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 2fbcf20..98b6d8b 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
@@ -136,8 +136,7 @@ public class FileIO {
         }
 
         public String toString(){
-            String name = getName();
-            return name.split("\\.")[0];
+            return getName().split("\\.")[0];
         }
 
     }
-- 
2.40.1


From 58b16921818e1f8ff0b739f0358d95dbf00a1b7b Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 11:27:54 +0200
Subject: [PATCH 07/12] implemented Button and Method deleteTournament in
 Tournament List

---
 .../tournamentList/TournamentListController.java   | 14 ++++++++++++++
 .../tournamentList/tournamentList.fxml             | 14 +++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

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 f06fe19..bf8b2c5 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
@@ -36,6 +36,9 @@ public class TournamentListController extends FXController {
     @FXML
     private Button openBtn;
 
+    @FXML
+    private Button deleteBtn;
+
     @FXML
     private Label tournamentListTitle;
 
@@ -82,6 +85,17 @@ public class TournamentListController extends FXController {
         } //TODO handle and logging
     }
 
+    @FXML
+    void deleteTournament(ActionEvent event) {
+        //TODO Ask first to delete?
+        File tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
+        try {
+            getFileIO().deleteTournament(tournamentFile);
+        } catch (IOException e) {
+            e.printStackTrace();  //TODO handle and logging
+        }
+    }
+
     @Override
     public void loadContent() {
         tournamentListView.setItems(getFileIO().getList());
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
index 3648fdf..24c2e89 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
@@ -22,11 +22,15 @@
                         <Insets />
                     </VBox.margin>
                 </ListView>
-                <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournament" text="Öffnen">
-                    <VBox.margin>
-                        <Insets bottom="20.0" top="40.0" />
-                    </VBox.margin>
-                </Button>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0">
+               <VBox.margin>
+                  <Insets bottom="20.0" top="40.0" />
+               </VBox.margin>
+               <children>
+                      <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournament" text="Öffnen" />
+                  <Button fx:id="deleteBtn" layoutX="138.0" layoutY="28.0" mnemonicParsing="false" onAction="#deleteTournament" text="Löschen" />
+               </children>
+            </HBox>
             </children>
             <HBox.margin>
                 <Insets left="40.0" />
-- 
2.40.1


From 80005d214d519f4fd35c7682b3a2308413cba5e1 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 12:19:22 +0200
Subject: [PATCH 08/12] created Class AlertDelete.java

---
 .../main/tournamentList/AlertDelete.java      | 34 +++++++++++++++++++
 .../TournamentListController.java             | 12 ++++---
 2 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/AlertDelete.java

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
new file mode 100644
index 0000000..e440807
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/AlertDelete.java
@@ -0,0 +1,34 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
+
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
+
+import java.io.IOException;
+
+public class AlertDelete extends Alert {
+    ButtonType yesButton = new ButtonType("Ja", ButtonBar.ButtonData.YES);
+    ButtonType noButton = new ButtonType("Nein", ButtonBar.ButtonData.NO);
+    Boolean result;
+
+    public AlertDelete(String name){
+        super(Alert.AlertType.WARNING);
+        setTitle("Entfernen");
+        setHeaderText("Turnier entfernen?");
+        setContentText("Sind Sie sicher, dass sie das Turnier " + name + " entfernen wollen?\n" +
+                "Nach diesem Vorgang kann es nicht wiederhergestellt werden.");
+        getButtonTypes().setAll(yesButton, noButton);
+    }
+
+    public boolean showAndGetResult() {
+        result = false;
+        showAndWait().ifPresent(type -> {
+            if (type == yesButton) {
+                result = true;
+            }
+        });
+        return result;
+    }
+
+
+}
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 bf8b2c5..3ce4cef 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
@@ -87,12 +87,14 @@ public class TournamentListController extends FXController {
 
     @FXML
     void deleteTournament(ActionEvent event) {
-        //TODO Ask first to delete?
         File tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
-        try {
-            getFileIO().deleteTournament(tournamentFile);
-        } catch (IOException e) {
-            e.printStackTrace();  //TODO handle and logging
+        AlertDelete alert = new AlertDelete(tournamentFile.toString());
+        if(alert.showAndGetResult()){
+            try {
+                getFileIO().deleteTournament(tournamentFile);
+            } catch (IOException e) {
+                e.printStackTrace();  //TODO handle and logging
+            }
         }
     }
 
-- 
2.40.1


From 50f98b4ac10f37f31ecbb0d89c8de7637091af30 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 12:33:14 +0200
Subject: [PATCH 09/12] added Type checking in Tournament.java

---
 .../projekt2/turnierverwaltung/Tournament.java  | 17 ++++++++++++++++-
 .../TournamentListController.java               |  4 ++++
 .../projekt2/turnierverwaltung/FileIOTest.java  | 16 +++++-----------
 3 files changed, 25 insertions(+), 12 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 2966009..e46f505 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -4,6 +4,7 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
 import java.io.Serializable;
+import java.util.Arrays;
 
 public class Tournament implements Serializable {
     private String name;
@@ -11,10 +12,13 @@ public class Tournament implements Serializable {
 
 
 
-    public Tournament(String name, Type type) throws InvalidNameException {
+    public Tournament(String name, Type type) throws InvalidNameException, InvalidTypeException {
         if(!name.matches("[\\w]{1,20}")){
             throw new Tournament.InvalidNameException("Invalid Name entered"); //TODO handle en logging.
+        } else if(!Arrays.asList(Type.values()).contains(type)){
+            throw new InvalidTypeException("Invalid Type selected"); //TODO handle en logging.
         }
+
         setName(name);
         setType(type);
     }
@@ -67,5 +71,16 @@ public class Tournament implements Serializable {
 
     }
 
+    public class InvalidTypeException extends Exception {
+        public InvalidTypeException() {
+            super();
+        }
+
+        public InvalidTypeException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
 
 }
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 3ce4cef..433ab41 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
@@ -64,8 +64,11 @@ public class TournamentListController extends FXController {
             Tournament tournament = new Tournament(tournamentNameField.getText(), modusChoiceBox.getValue());
             getFileIO().saveTournament(tournament);
             loadContent();
+            tournamentNameField.clear();
         } catch (Tournament.InvalidNameException e) {
             e.printStackTrace(); //TODO handle and logging
+        } catch (Tournament.InvalidTypeException e) {
+            e.printStackTrace(); //TODO handle and logging
         } catch (IOException e) {
             e.printStackTrace(); //TODO handle and logging
         }
@@ -92,6 +95,7 @@ public class TournamentListController extends FXController {
         if(alert.showAndGetResult()){
             try {
                 getFileIO().deleteTournament(tournamentFile);
+                loadContent();
             } catch (IOException e) {
                 e.printStackTrace();  //TODO handle and logging
             }
diff --git a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java b/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
index 27912a8..c8b8060 100644
--- a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
+++ b/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
@@ -108,20 +108,14 @@ class FileIOTest {
         }
 
         @Test
-        void saveTournament() throws IOException {
+        void saveTournament() throws IOException, Tournament.InvalidNameException, Tournament.InvalidTypeException {
             Tournament tournament = null;
-            try {
-                tournament = new Tournament("test1", Tournament.Type.KO);
-            } catch (Tournament.InvalidNameException e) {
-                e.printStackTrace();
-            }
+            tournament = new Tournament("test1", Tournament.Type.KO);
             io.saveTournament(tournament);
             File file = new File(mainDir + "/saves/test1.txt");
-            if(file.exists()){
-                file.delete();
-            } else {
-                fail();
-            }
+            assertTrue(file.exists());
+            assertTrue(file.delete());
+            assertFalse(file.exists());
         }
 
         @Test
-- 
2.40.1


From 9f005281af25bde0d01142b38de8156eabd7d4ec Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 13:10:20 +0200
Subject: [PATCH 10/12] created Class TournamentDecorator.java

---
 .../turnierverwaltung/FXController.java       | 19 +++++-
 .../turnierverwaltung/IsObservable.java       | 19 ++++++
 .../turnierverwaltung/IsObserver.java         | 14 +++++
 .../TournamentDecorator.java                  | 59 +++++++++++++++++++
 .../TournamentListController.java             | 21 +------
 5 files changed, 111 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/IsObservable.java
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/IsObserver.java
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java

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 2e51f0d..f8c1570 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
@@ -4,21 +4,34 @@ import javafx.scene.layout.Pane;
 
 public abstract class FXController {
     Tournament tournament;
+    TournamentDecorator tournamentDecorator;
     Factory factory;
     FileIO fileIO;
     Pane pane;
 
     public void setup(Tournament tournament, FileIO fileIO, Factory factory, Pane pane){
-        this.tournament = tournament;
+        setTournament(tournament);
         this.fileIO = fileIO;
         this.factory = factory;
         this.pane = pane;
+        tournamentDecorator = new TournamentDecorator(fileIO, tournament);
+        tournamentDecorator.addListener(new IsObserver() {
+            @Override
+            public void update() {
+                loadContent();
+            }
+        });
     }
 
     public abstract void loadContent();
 
-    protected Tournament getTournament() {
-        return tournament;
+    public void setTournament(Tournament tournament) {
+        this.tournament = tournament;
+        tournamentDecorator.setTournament(tournament);
+    }
+
+    protected TournamentDecorator getTournamentDecorator() {
+        return tournamentDecorator;
     }
 
     protected FileIO getFileIO() {
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/IsObservable.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/IsObservable.java
new file mode 100644
index 0000000..a627e78
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/IsObservable.java
@@ -0,0 +1,19 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+/**
+ * Most basic interface for observing an object
+ * @author bles
+ *
+ */
+public interface IsObservable {
+    /**
+     * Add an observer that listens for updates
+     * @param observer
+     */
+    void addListener(IsObserver observer);
+    /**
+     * Remove an observer from the list
+     * @param observer
+     */
+    void removeListener(IsObserver observer);
+}
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/IsObserver.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/IsObserver.java
new file mode 100644
index 0000000..4501482
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/IsObserver.java
@@ -0,0 +1,14 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+/**
+ * Most basic interface for beeing an observer
+ * @author bles
+ *
+ */
+public interface IsObserver {
+    /**
+     * This method is always called when an observed object
+     * changes
+     */
+    void update();
+}
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
new file mode 100644
index 0000000..0177d05
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
@@ -0,0 +1,59 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TournamentDecorator implements IsObservable{
+    private Tournament tournament;
+    private FileIO fileIO;
+    private List<IsObserver> listener = new ArrayList<>();
+
+    public TournamentDecorator(FileIO fileIO, Tournament tournament){
+        setTournament(tournament);
+        setFileIO(fileIO);
+    }
+
+    public void setFileIO(FileIO fileIO) {
+        this.fileIO = fileIO;
+    }
+
+    public void setTournament(Tournament tournament) {
+        this.tournament = tournament;
+    }
+
+    @Override
+    public void addListener(IsObserver observer) {
+        listener.add(observer);
+    }
+
+    @Override
+    public void removeListener(IsObserver observer) {
+        listener.remove(observer);
+    }
+
+    public void createTournament(String name, Tournament.Type type){
+        if(fileIO.tournamentExists(name)){
+            System.out.println("Tournament with same name exists already.");
+            return; //TODO handle and logging
+        }
+        try {
+            Tournament tournament = new Tournament(name, type);
+            fileIO.saveTournament(tournament);
+            informListener();
+        } catch (Tournament.InvalidNameException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (Tournament.InvalidTypeException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (IOException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
+
+    public void informListener() {
+        for(IsObserver observer : listener) {
+            observer.update();
+        }
+    }
+}
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 433ab41..003422e 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
@@ -56,29 +56,13 @@ public class TournamentListController extends FXController {
 
     @FXML
     void createTournament(ActionEvent event) {
-        if(getFileIO().tournamentExists(tournamentNameField.getText())){
-            System.out.println("Tournament with same name exists already.");
-            return; //TODO handle and logging
-        }
-        try {
-            Tournament tournament = new Tournament(tournamentNameField.getText(), modusChoiceBox.getValue());
-            getFileIO().saveTournament(tournament);
-            loadContent();
-            tournamentNameField.clear();
-        } catch (Tournament.InvalidNameException e) {
-            e.printStackTrace(); //TODO handle and logging
-        } catch (Tournament.InvalidTypeException e) {
-            e.printStackTrace(); //TODO handle and logging
-        } catch (IOException e) {
-            e.printStackTrace(); //TODO handle and logging
-        }
-
+        getTournamentDecorator().createTournament(tournamentNameField.getText(), modusChoiceBox.getValue());
     }
 
     @FXML
     void openTournament(ActionEvent event) {
+        File tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
         try {
-            File tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
             getFactory().setTournament(getFileIO().loadTournament(tournamentFile));
             getFactory().loadParticipantFormular((BorderPane) getPane()); //TODO load TournamentView instead of ParticipantFormular?
         } catch (IOException e) {
@@ -105,6 +89,7 @@ public class TournamentListController extends FXController {
     @Override
     public void loadContent() {
         tournamentListView.setItems(getFileIO().getList());
+        tournamentNameField.clear();
     }
 }
 
-- 
2.40.1


From 61b943b09179e4bbdf1718c669fdef3780c5cb53 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 13:39:54 +0200
Subject: [PATCH 11/12] extracted Method open Tournament to Class
 FactoryDecorator.java

---
 .../turnierverwaltung/FXController.java       | 29 +++++----
 .../projekt2/turnierverwaltung/Factory.java   | 23 +++----
 .../turnierverwaltung/FactoryDecorator.java   | 62 +++++++++++++++++++
 .../turnierverwaltung/main/MainWindow.java    |  9 ++-
 .../TournamentListController.java             | 11 +---
 5 files changed, 97 insertions(+), 37 deletions(-)
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java

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 f8c1570..0f3826d 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
@@ -3,45 +3,44 @@ package ch.zhaw.projekt2.turnierverwaltung;
 import javafx.scene.layout.Pane;
 
 public abstract class FXController {
-    Tournament tournament;
     TournamentDecorator tournamentDecorator;
-    Factory factory;
+    FactoryDecorator factoryDecorator;
     FileIO fileIO;
     Pane pane;
 
-    public void setup(Tournament tournament, FileIO fileIO, Factory factory, Pane pane){
-        setTournament(tournament);
+    public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane){
+        this.tournamentDecorator = tournamentDecorator;
         this.fileIO = fileIO;
-        this.factory = factory;
+        this.factoryDecorator = factoryDecorator;
         this.pane = pane;
-        tournamentDecorator = new TournamentDecorator(fileIO, tournament);
         tournamentDecorator.addListener(new IsObserver() {
             @Override
             public void update() {
                 loadContent();
             }
         });
+        factoryDecorator.addListener(new IsObserver() {
+            @Override
+            public void update() {
+                loadContent();
+            }
+        });
     }
 
     public abstract void loadContent();
 
-    public void setTournament(Tournament tournament) {
-        this.tournament = tournament;
-        tournamentDecorator.setTournament(tournament);
-    }
-
     protected TournamentDecorator getTournamentDecorator() {
         return tournamentDecorator;
     }
 
+    protected FactoryDecorator getFactoryDecorator() {
+        return factoryDecorator;
+    }
+
     protected FileIO getFileIO() {
         return fileIO;
     }
 
-    protected Factory getFactory() {
-        return factory;
-    }
-
     protected Pane getPane() {
         return pane;
     }
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 06ca006..c05347b 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
@@ -8,19 +8,20 @@ import java.io.IOException;
 import java.net.URL;
 
 public class Factory {
-    private Tournament tournament;
+    private TournamentDecorator tournamentDecorator;
     private FileIO fileIO;
 
-    public Factory(FileIO fileIO){
+    public Factory(FileIO fileIO, TournamentDecorator tournamentDecorator){
         this.fileIO = fileIO;
+        this.tournamentDecorator = tournamentDecorator;
     }
 
-    public Tournament getTournament() {
-        return tournament;
+    public TournamentDecorator getTournamentDecorator() {
+        return tournamentDecorator;
     }
 
     public void setTournament(Tournament tournament) {
-        this.tournament = tournament;
+        this.tournamentDecorator = tournamentDecorator;
     }
 
     public BorderPane loadMainWindow(){
@@ -34,23 +35,23 @@ public class Factory {
         return null;
     }
 
-    public void loadTournamentList(BorderPane pane){
-        TournamentListController controller = (TournamentListController) setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"));
+    public void loadTournamentList(BorderPane pane, FactoryDecorator factoryDecorator){
+        TournamentListController controller = (TournamentListController) setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"), factoryDecorator);
     }
 
     //Can be used to Open new Scene in same Stage.
     //This way possible to later give object to Controller
-    public void loadParticipantFormular(BorderPane pane) {
-        setCenterOfBorderPane(pane, getClass().getResource("participantAddFormular/participantFormular.fxml"));
+    public void loadParticipantFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
+        setCenterOfBorderPane(pane, getClass().getResource("participantAddFormular/participantFormular.fxml"), factoryDecorator);
     }
 
-    private FXController setCenterOfBorderPane(BorderPane pane, URL location) {
+    private FXController setCenterOfBorderPane(BorderPane pane, URL location, FactoryDecorator factoryDecorator) {
         FXController controller = null;
         try {
             FXMLLoader loader = new FXMLLoader(location);
             pane.setCenter(loader.load());
             controller = loader.getController();
-            controller.setup(tournament, fileIO, this, pane);
+            controller.setup(tournamentDecorator, fileIO, factoryDecorator, pane);
             controller.loadContent();
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
new file mode 100644
index 0000000..6278f10
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -0,0 +1,62 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Pane;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FactoryDecorator implements IsObservable{
+    private Factory factory;
+    private FileIO fileIO;
+    private Pane pane;
+    private List<IsObserver> listener = new ArrayList<>();
+
+    public FactoryDecorator(FileIO fileIO, Factory factory, Pane pane){
+        setFactory(factory);
+        setFileIO(fileIO);
+        setPane(pane);
+    }
+
+    public void setFileIO(FileIO fileIO) {
+        this.fileIO = fileIO;
+    }
+
+    public void setFactory(Factory factory) {
+        this.factory = factory;
+    }
+
+    public void setPane(Pane pane) {
+        this.pane = pane;
+    }
+
+    @Override
+    public void addListener(IsObserver observer) {
+        listener.add(observer);
+    }
+
+    @Override
+    public void removeListener(IsObserver observer) {
+        listener.remove(observer);
+    }
+
+    public void openTournament(FileIO.TournamentFile tournamentFile){
+        try {
+            factory.setTournament(fileIO.loadTournament(tournamentFile));
+            factory.loadParticipantFormular((BorderPane) pane, this); //TODO load TournamentView instead of ParticipantFormular?
+            informListener();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        } //TODO handle and logging
+    }
+
+
+    public void informListener() {
+        for(IsObserver observer : listener) {
+            observer.update();
+        }
+    }
+}
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 4602c5d..14348bd 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
@@ -1,7 +1,9 @@
 package ch.zhaw.projekt2.turnierverwaltung.main;
 
 import ch.zhaw.projekt2.turnierverwaltung.Factory;
+import ch.zhaw.projekt2.turnierverwaltung.FactoryDecorator;
 import ch.zhaw.projekt2.turnierverwaltung.FileIO;
+import ch.zhaw.projekt2.turnierverwaltung.TournamentDecorator;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
@@ -14,13 +16,16 @@ import java.io.IOException;
 
 public class MainWindow extends Application {
     private FileIO fileIO = new FileIO(System.getProperty("user.dir") + "/tournierverwaltung_angrynerds");
-    private Factory factory = new Factory(fileIO); //TODO make it private!
+    private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO, null);
+    private Factory factory = new Factory(fileIO, tournamentDecorator); //TODO make it private!
+    private FactoryDecorator factoryDecorator;
 
     @Override
     public void start(Stage primaryStage) throws Exception {
 
         BorderPane pane = factory.loadMainWindow();
-        factory.loadTournamentList(pane);
+        factoryDecorator = new FactoryDecorator(fileIO, factory, pane);
+        factory.loadTournamentList(pane, factoryDecorator);
 
 
         Scene scene = new Scene(pane);
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 003422e..fcb26c0 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,15 +61,8 @@ public class TournamentListController extends FXController {
 
     @FXML
     void openTournament(ActionEvent event) {
-        File tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
-        try {
-            getFactory().setTournament(getFileIO().loadTournament(tournamentFile));
-            getFactory().loadParticipantFormular((BorderPane) getPane()); //TODO load TournamentView instead of ParticipantFormular?
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } //TODO handle and logging
+        FileIO.TournamentFile tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
+        getFactoryDecorator().openTournament(tournamentFile);
     }
 
     @FXML
-- 
2.40.1


From 678060ecc07ed12a19508ee8ab8e1f7895206d23 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 13:46:20 +0200
Subject: [PATCH 12/12] extracted Method delete Tournament in
 TournamentDecorator.java

---
 .../projekt2/turnierverwaltung/TournamentDecorator.java  | 9 +++++++++
 .../main/tournamentList/TournamentListController.java    | 9 ++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

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 0177d05..a848a4a 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
@@ -50,6 +50,15 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
+    public void deleteTournament(FileIO.TournamentFile tournamentFile){
+        try {
+            fileIO.deleteTournament(tournamentFile);
+            informListener();
+        } catch (IOException e) {
+            e.printStackTrace();  //TODO handle and logging
+        }
+    }
+
 
     public void informListener() {
         for(IsObserver observer : listener) {
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 fcb26c0..bcc1109 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
@@ -67,15 +67,10 @@ public class TournamentListController extends FXController {
 
     @FXML
     void deleteTournament(ActionEvent event) {
-        File tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
+        FileIO.TournamentFile tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
         AlertDelete alert = new AlertDelete(tournamentFile.toString());
         if(alert.showAndGetResult()){
-            try {
-                getFileIO().deleteTournament(tournamentFile);
-                loadContent();
-            } catch (IOException e) {
-                e.printStackTrace();  //TODO handle and logging
-            }
+           getTournamentDecorator().deleteTournament(tournamentFile);
         }
     }
 
-- 
2.40.1