From 7e068dd28105b3020b775290c3b22c6e211952f6 Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Mon, 25 Apr 2022 20:11:28 +0200
Subject: [PATCH 01/35] added resources dir

---
 .gradle/7.4/checksums/checksums.lock          | Bin 0 -> 17 bytes
 .gradle/7.4/checksums/md5-checksums.bin       | Bin 0 -> 19197 bytes
 .gradle/7.4/checksums/sha1-checksums.bin      | Bin 0 -> 19955 bytes
 .../dependencies-accessors.lock               | Bin 0 -> 17 bytes
 .../7.4/dependencies-accessors/gc.properties  |   0
 .gradle/7.4/fileChanges/last-build.bin        | Bin 0 -> 1 bytes
 .gradle/7.4/fileHashes/fileHashes.lock        | Bin 0 -> 17 bytes
 .gradle/7.4/gc.properties                     |   0
 .../buildOutputCleanup.lock                   | Bin 0 -> 17 bytes
 .gradle/buildOutputCleanup/cache.properties   |   2 +
 .gradle/vcs-1/gc.properties                   |   0
 .idea/.gitignore                              |   8 +++
 .idea/.name                                   |   1 +
 .idea/compiler.xml                            |   6 ++
 .idea/gradle.xml                              |  18 +++++
 .idea/jarRepositories.xml                     |  20 ++++++
 .idea/libraries-with-intellij-classes.xml     |  65 ++++++++++++++++++
 .idea/misc.xml                                |   5 ++
 .idea/vcs.xml                                 |   6 ++
 19 files changed, 131 insertions(+)
 create mode 100644 .gradle/7.4/checksums/checksums.lock
 create mode 100644 .gradle/7.4/checksums/md5-checksums.bin
 create mode 100644 .gradle/7.4/checksums/sha1-checksums.bin
 create mode 100644 .gradle/7.4/dependencies-accessors/dependencies-accessors.lock
 create mode 100644 .gradle/7.4/dependencies-accessors/gc.properties
 create mode 100644 .gradle/7.4/fileChanges/last-build.bin
 create mode 100644 .gradle/7.4/fileHashes/fileHashes.lock
 create mode 100644 .gradle/7.4/gc.properties
 create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock
 create mode 100644 .gradle/buildOutputCleanup/cache.properties
 create mode 100644 .gradle/vcs-1/gc.properties
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/.name
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/gradle.xml
 create mode 100644 .idea/jarRepositories.xml
 create mode 100644 .idea/libraries-with-intellij-classes.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock
new file mode 100644
index 0000000000000000000000000000000000000000..c0e1e0c225d4fb59fea6e2d2bbe5d140a29de459
GIT binary patch
literal 17
UcmZQpJ$0r_G~m)-1_;mv05(PhssI20

literal 0
HcmV?d00001

diff --git a/.gradle/7.4/checksums/md5-checksums.bin b/.gradle/7.4/checksums/md5-checksums.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2df228dcf4793117dbb1290c4a1a0518a02f651d
GIT binary patch
literal 19197
zcmeI(TS!x300;0>5urOd=Vp0H%<w^RshEbT51WeGG%t~ukd>FRi>n6%Gcbqg%+kn=
zu%VkxGrK&vL?R3?U>B3TK+cF^YM7ExQfUcVozwRn#I47k;(y@meEiS%KOg7E-nK8A
zVO$)4(SunzoL7bzK>z{}fB*y_009U<00Izz00bZa0SG_<0uX=z1R(Ig2&8f^VozSi
zMZT6Fhzl4dkmUvr+Ra*%#F#24w^i$e-w&=2d=6`t<v%2O+^CS(wj@MM?<#Ykxl+h=
zQ9)BledXI}ep|@vJgQ_fS&{Vlarr{tq+9$E)b+KOt{Wocoh{2RoWva$NWObm$a@|?
zt1_Pui|PEELOyrvL&GWk76YBH7IJUL{pnp>51gU%`-NP-H)Uc<qPa)s+X=a1vUMpy
zlvzP@gODrr{T7#&oKN&Qxk9ck_PBay<I7e$KU~O#E5oeGB=_(M0SG_<0uX=z1Rwwb
z2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5cszO
zJGjUBa;F!6Ix52S=8_I&k?+B=>Yf3qiTg*pCUg2^HCfa7CwKK<-I!Rc=(QMCtaF^3
zt7~%9KHBIe4R?MIfK`JTmXG$;IL!vX)3+_29nYo>x{H9-*fu<ar?f`VoWblBJzKYA
zX{L>NvW7Ivw$a;Ope+q&9@Y9a1`dy>*ONw`H))8vY#WDk8QJGE3Ij^hz8smE8{~FO
z@Nb@{A`Mn;+sJLxF(K~9;@w;4i~LlI(bbJj3fo3|5}VWHb2%pT?fYvr<qO>Qj6Z7}
zCu_*~EgM!=Z<3Rk$i4@SgXRR&hCO9=w4o;r5x+CSs-bP@81g9?N?ZHfY>4p+5z$5`
zX-N1jAy$o)*HuRSa>TZ8-G!HKoC^pg4Yias*kaqp$U@>_OUhV%qUp)^%8{Mi*N1-(
zwURVsCAJMux4ZR6V<xWz=VioKHawNk2Hh>e{-t5O&&2lIufG^>(wu%3TltYTv}6q_
HFW~<hJK}25

literal 0
HcmV?d00001

diff --git a/.gradle/7.4/checksums/sha1-checksums.bin b/.gradle/7.4/checksums/sha1-checksums.bin
new file mode 100644
index 0000000000000000000000000000000000000000..1bc5c79626c36fc62959ed0a8378ba7296fda2a8
GIT binary patch
literal 19955
zcmeI3ZA?>F7=Uj}p&;eUf>u;?fUsyq1eJo5k3bYl#i>K)5FAWo3|h1k0i9AsDH=o!
z3Njr|(ZQI)tQwh0p=QD12Z&XWsT4m^r^XH?5QpyGo^xXC-Tv(7^4_GEo9Eu=oO_<8
zzsQN8D3Rk^d{FNWmv@(N1qGl06o3Ly017|>C;$bZ02F`%Pyh-*0Vn_kpa2wr0#E=7
z{9g*h&<h!c79$dKnG1(3it-iE7o&H{q!%c0wJ*9Id6fMBU{AH|qu#(R_L$!z{D84i
zUwnjj0&!^x;isC5#=0awW5%S9$S}g2mRo&)q*R2TkIW)m_jGnqe&k*QdR|KK+rbIJ
zWg#}w{fN(NAUCYE#SQ!1cs__nr4eptZ&OupsAV|fvT(vjROMI>h`RdmIBLROb#`}B
zu7-*bpKB!CZS2!)Cv&EZ!{bjU-2I}HV3{th2S2}saIt34CtljaM_k%M_|(^%m2pAq
zXCf}MBYfIfFNeB6vr`a{>LgrR(9zxQp8Ode{|w=a?llXOvZa-H{CL7YaVhVgyW)?B
zh|e2Mcnt4nt!szM5sx#U@c83l*%Jhd9%DX=@T6^>_m!>5t%ye*AUySagOzLTwgEi;
z0>U#jVN>-3(e;SS>Ih$Rz3%$@kkg|ve?a(#whsAap5<D^rQU?+hG*Zl(Ph-)=W_@r
ze<_Mvj_$!33P1rU00p1`6o3Ly017|>C;$bZ02F`%Pyh-*0Vn_kpa2wr0#E=7KmjNK
z1)u;FfC5ke3P1rU00p1`6o3Ly017|>C;$cit$;s$V>11jz<ity#@m;@3^!UQMeC<n
z2fJl#_e%VoqByF=-ZbVR`Vgq-li&N+x%2(i_dAqf>X9*=!S0woPGrLiZ0%$migI~F
zpUkXG*)5~x48vXT-RD*~4*oS?f6Vt8wwf4+-l!m^PiEGCo9nPcMa1?3t1q8hTns1~
zw>a)lTYM>=>y>FLN|?l+E3>rgLXF?X)Ni6!UY@Kl&N&&IE<;wjC$elC*_Nxv(_e>O
z`^j#6)v?f2nQw1w`1pO;k|IkWXIoP*o_B0L`lxW{4(Z~}c18Tv6IJo=TO&f*)`h(8
z;=qaW6J54TgcZ(b76>FMH?Wn8=5l5>f|xbD@ytK<VfuqLeyaTawMiBEHErJX9uDSP
zPOm_gtpnQ{Q_@#A_P3_?1+hbWtp{>;2?vx$Y-y3@#B4Y*o2w_zH#^EVkKdf&lJ}^s
zc1Q1#-ImCb3y~$rWm^`th7Ffel7_X+%ARHjP6?>gedUI&Fl0GzVq4O;HCr@Mhc$UU
zk`Zfog#rAYm-NmTW?k|`Jl8*1&1HqpUw!&<IH&8|5QX^E+N(nm^bQY`m5(eTQ^jmu
z%dU*^7kVbu94}saDyrRP?W&+(T#==?imZ{B*j7ggbvHf8*tzHBaKndJKKBo{^i(1%
z!`ozW><Zad<(-ge2M^_HnmQ#*6BPFO9-~6(^)PRkk#4fMH;34kBrQ=b*Uz$lA#vKO
z*WKI|(^a|zTQz7dFXkICTi4eIMQvQYJX(FGv}{PrS3RDTrpH#3$)ZGEY)e>oGd@hF
zEg#n!++V-EJF8{+JbJeW^M)%UOqO+vf^8*B>Wk_d3!KibQ@ma{dtkaQ!S)TdzA#zb
zzT0eza+@L6${pO}tWsk06FdTyF{?LYYpcoP6fm~gx}K=t%*yof49s2CH%IN0Q@t;-
ziifOKlaSSWnr(fjev-3fQ-JePRnU)aR-#6C;Yl&Fl<Q3vmrw7iGN0>%dWCh(U8QX!
zC(B|*d8D?qT|$4WObz8(lV!1y*?VR7h7X%(4i?`k_+jC?=#G(^;5ob<{2px4zcc#a
KUf0lPzrO(?N8-l-

literal 0
HcmV?d00001

diff --git a/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock
new file mode 100644
index 0000000000000000000000000000000000000000..5a44c733e9a9159e2af807f0c8443cb6603820b9
GIT binary patch
literal 17
TcmZQpUL`ysZ2AUY1}FdkDBc5J

literal 0
HcmV?d00001

diff --git a/.gradle/7.4/dependencies-accessors/gc.properties b/.gradle/7.4/dependencies-accessors/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/.gradle/7.4/fileChanges/last-build.bin b/.gradle/7.4/fileChanges/last-build.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d
GIT binary patch
literal 1
IcmZPo000310RR91

literal 0
HcmV?d00001

diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
new file mode 100644
index 0000000000000000000000000000000000000000..00ae1778f64ba036d6da625f725dd4fdb0a6096b
GIT binary patch
literal 17
TcmZRcx~p9LshesS0~7!NFfjwW

literal 0
HcmV?d00001

diff --git a/.gradle/7.4/gc.properties b/.gradle/7.4/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
new file mode 100644
index 0000000000000000000000000000000000000000..0041aacb126d4d3474eb13f10b41609569a1d8a5
GIT binary patch
literal 17
UcmZQBJ^h>gkcECJ0|YPv05bvu<p2Nx

literal 0
HcmV?d00001

diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
new file mode 100644
index 0000000..07b3692
--- /dev/null
+++ b/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Mon Apr 25 20:06:35 CEST 2022
+gradle.version=7.4
diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..73f69e0
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..1b960e6
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+turnierverwaltung
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..b73660a
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="15" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..ccf41b5
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../ProgramData/chocolatey/lib/gradle/tools/gradle-7.3.3" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..fdc392f
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries-with-intellij-classes.xml b/.idea/libraries-with-intellij-classes.xml
new file mode 100644
index 0000000..9fa3156
--- /dev/null
+++ b/.idea/libraries-with-intellij-classes.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="libraries-with-intellij-classes">
+    <option name="intellijApiContainingLibraries">
+      <list>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="ideaIU" />
+          <option name="groupId" value="com.jetbrains.intellij.idea" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="ideaIU" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="ideaIC" />
+          <option name="groupId" value="com.jetbrains.intellij.idea" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="ideaIC" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="pycharmPY" />
+          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="pycharmPY" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="pycharmPC" />
+          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="pycharmPC" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="clion" />
+          <option name="groupId" value="com.jetbrains.intellij.clion" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="clion" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="riderRD" />
+          <option name="groupId" value="com.jetbrains.intellij.rider" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="riderRD" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="goland" />
+          <option name="groupId" value="com.jetbrains.intellij.goland" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="goland" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..f09f125
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" project-jdk-name="17 (2)" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From d641d2f2ea210d2a660cf1de72de79e3a53aa077 Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Thu, 28 Apr 2022 19:43:42 +0200
Subject: [PATCH 02/35] created GUI

---
 .gitignore                                    |   3 +
 .gradle/7.4/fileHashes/fileHashes.lock        | Bin 17 -> 17 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .idea/.gitignore                              |   3 +
 .idea/compiler.xml                            |   2 +-
 .idea/cssdialects.xml                         |   6 +
 .idea/git_toolbox_prj.xml                     |  15 ++
 .idea/gradle.xml                              |   1 +
 .idea/misc.xml                                |   5 +-
 .idea/uiDesigner.xml                          | 124 ++++++++++++++++
 app/build.gradle                              |   8 +
 .../turnierverwaltung/main/MainWindow.fxml    | 128 ++++++++++++++++
 .../projekt2/turnierverwaltung/main/Style.css |  10 ++
 .../tournamentList/tournamentList.fxml        |  14 ++
 .../compileJava/previous-compilation-data.bin | Bin 0 -> 20975 bytes
 .../zhaw/projekt2/turnierverwaltung/App.java  |   9 +-
 .../turnierverwaltung/main/MainWindow.java    |  39 +++++
 .../main/MainWindowController.java            |  69 +++++++++
 .../participantFormularController.java        |  97 ++++++++++++
 .../tournamentListController.java             |   4 +
 .../turnierverwaltung/main/MainWindow.fxml    | 128 ++++++++++++++++
 .../projekt2/turnierverwaltung/main/Style.css |  10 ++
 .../participandFormular.fxml                  | 140 ++++++++++++++++++
 .../tournamentList/tournamentList.fxml        |  14 ++
 24 files changed, 822 insertions(+), 7 deletions(-)
 create mode 100644 .idea/cssdialects.xml
 create mode 100644 .idea/git_toolbox_prj.xml
 create mode 100644 .idea/uiDesigner.xml
 create mode 100644 app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
 create mode 100644 app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/Style.css
 create mode 100644 app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
 create mode 100644 app/build/tmp/compileJava/previous-compilation-data.bin
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java
 create mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
 create mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/Style.css
 create mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
 create mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml

diff --git a/.gitignore b/.gitignore
index a1c2a23..c25f212 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,6 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+.gradle
+.idea
diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
index 00ae1778f64ba036d6da625f725dd4fdb0a6096b..f90d1f6ef300d9003e5562ccdf55481c550c68a4 100644
GIT binary patch
literal 17
VcmZRcx~p9LshesS0~j#Y0st_u1UUcz

literal 17
TcmZRcx~p9LshesS0~7!NFfjwW

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 0041aacb126d4d3474eb13f10b41609569a1d8a5..46c3158f912dca0ffbe8f4cc82a675e5685ce001 100644
GIT binary patch
literal 17
UcmZQBJ^h>gkcECJ0|cB005i}8vj6}9

literal 17
UcmZQBJ^h>gkcECJ0|YPv05bvu<p2Nx

diff --git a/.idea/.gitignore b/.idea/.gitignore
index 73f69e0..25434b2 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -6,3 +6,6 @@
 /dataSources.local.xml
 # Editor-based HTTP Client requests
 /httpRequests/
+
+../gradle
+../.idea
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b73660a..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="15" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/cssdialects.xml b/.idea/cssdialects.xml
new file mode 100644
index 0000000..75ec9f0
--- /dev/null
+++ b/.idea/cssdialects.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CssDialectMappings">
+    <file url="file://$PROJECT_DIR$/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/Style.css" dialect="JavaFX" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
new file mode 100644
index 0000000..02b915b
--- /dev/null
+++ b/.idea/git_toolbox_prj.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ccf41b5..33984e8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f09f125..dea5310 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" project-jdk-name="17 (2)" project-jdk-type="JavaSDK" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="17 (2)" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 24699f1..dfbf65f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,6 +9,12 @@
 plugins {
     // Apply the application plugin to add support for building a CLI application in Java.
     id 'application'
+    id 'org.openjfx.javafxplugin' version '0.0.12'
+}
+
+javafx {
+    version = '17.0.1'
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
 
 repositories {
@@ -22,6 +28,8 @@ dependencies {
 
     // This dependency is used by the application.
     implementation 'com.google.guava:guava:30.1.1-jre'
+
+
 }
 
 application {
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
new file mode 100644
index 0000000..cd4c4cd
--- /dev/null
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
@@ -0,0 +1,128 @@
+<?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.Menu?>
+<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?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?>
+
+<AnchorPane prefHeight="518.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
+   <children>
+      <VBox fx:id="mainContainer" alignment="CENTER" prefHeight="200.0" prefWidth="100.0" stylesheets="@Style.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <MenuBar>
+              <menus>
+                <Menu mnemonicParsing="false" text="Start">
+                  <items>
+                        <MenuItem fx:id="setLan" mnemonicParsing="false" text="Sprache wählen" />
+                    <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
+                  </items>
+                </Menu>
+              </menus>
+            </MenuBar>
+            <Label fx:id="mainTitle" text="Turnier Manager" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets bottom="40.0" />
+               </VBox.margin>
+               <font>
+                  <Font name="System Bold" size="47.0" />
+               </font>
+            </Label>
+            <HBox alignment="CENTER" prefHeight="407.0" prefWidth="600.0" VBox.vgrow="ALWAYS">
+               <children>
+                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                     <children>
+                        <Label fx:id="tournierListTitle" text="Bestehende Turniere">
+                           <font>
+                              <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                              <Insets bottom="20.0" />
+                           </VBox.margin>
+                        </Label>
+                        <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                              <Insets />
+                           </VBox.margin>
+                        </ListView>
+                        <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
+                           <VBox.margin>
+                              <Insets bottom="20.0" top="40.0" />
+                           </VBox.margin>
+                        </Button>
+                     </children>
+                     <HBox.margin>
+                        <Insets left="40.0" />
+                     </HBox.margin>
+                  </VBox>
+                  <Separator orientation="VERTICAL" prefHeight="200.0">
+                     <HBox.margin>
+                        <Insets left="10.0" right="10.0" />
+                     </HBox.margin>
+                  </Separator>
+                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                     <children>
+                        <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
+                           <font>
+                              <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                              <Insets bottom="40.0" />
+                           </VBox.margin></Label>
+                        <Separator prefWidth="200.0" />
+                        <GridPane fx:id="grid" prefHeight="200.0">
+                          <columnConstraints>
+                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                          </columnConstraints>
+                          <rowConstraints>
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                          </rowConstraints>
+                           <children>
+                              <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </Label>
+                              <TextField styleClass="inputGrid" GridPane.columnIndex="1">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </TextField>
+                              <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </Label>
+                              <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                           </children>
+                        </GridPane>
+                        <Separator prefWidth="200.0" />
+                        <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                              <Insets top="40.0" />
+                           </VBox.margin></Button>
+                     </children>
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin>
+                  </VBox>
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+   </children>
+</AnchorPane>
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/Style.css b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/Style.css
new file mode 100644
index 0000000..d69b698
--- /dev/null
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/Style.css
@@ -0,0 +1,10 @@
+#mainContainer {
+    -fx-min-height: 100%;
+    -fx-min-width: 100%;
+    -fx-background-color: #f8f8f8;
+
+}
+
+/*
+Formular Right Side
+ */
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
new file mode 100644
index 0000000..2372a7f
--- /dev/null
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="ch.zhaw.projekt2.turnierverwaltung.tournamentList.tournamentListController"
+            prefHeight="400.0" prefWidth="600.0">
+
+</AnchorPane>
diff --git a/app/build/tmp/compileJava/previous-compilation-data.bin b/app/build/tmp/compileJava/previous-compilation-data.bin
new file mode 100644
index 0000000000000000000000000000000000000000..840f5c6796c7465c0a95063ce875f0685824a9be
GIT binary patch
literal 20975
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
KzTiQ^pZ^DPMth(D

literal 0
HcmV?d00001

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java
index e06a54c..2099098 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java
@@ -3,12 +3,11 @@
  */
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public class App {
-    public String getGreeting() {
-        return "Hello World!";
-    }
+import ch.zhaw.projekt2.turnierverwaltung.main.MainWindow;
+import javafx.application.Application;
 
+public class App {
     public static void main(String[] args) {
-        System.out.println(new App().getGreeting());
+        Application.launch(MainWindow.class,args);
     }
 }
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
new file mode 100644
index 0000000..29a8990
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
@@ -0,0 +1,39 @@
+package ch.zhaw.projekt2.turnierverwaltung.main;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.layout.Pane;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+public class MainWindow extends Application {
+    @Override
+    public void start(Stage primaryStage) throws Exception {
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml"));
+        Pane pane = loader.load();
+        Scene scene = new Scene(pane);
+        primaryStage.setScene(scene);
+        primaryStage.setFullScreen(true);
+        primaryStage.setResizable(false);
+        primaryStage.show();
+    }
+
+    //Can be used to Open new Scene in same Stage.
+    //This way possible to later give object to Controller
+    public void startParticipand(Stage stage) {
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("..\\participandAddFormular\\participandFormular.fxml"));
+        try {
+            Pane pane = loader.load();
+            Scene scene = new Scene(pane);
+            stage.setScene(scene);
+            stage.setFullScreen(true);
+            stage.setResizable(false);
+            stage.show();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+}
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
new file mode 100644
index 0000000..992b4f4
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
@@ -0,0 +1,69 @@
+package ch.zhaw.projekt2.turnierverwaltung.main;
+
+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.MenuItem;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+
+public class MainWindowController {
+
+    @FXML
+    private MenuItem closeBtn;
+
+    @FXML
+    private Button createBtn;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private VBox mainContainer;
+
+    @FXML
+    private Label mainTitle;
+
+    @FXML
+    private ChoiceBox<?> modusChoiceBox;
+
+    @FXML
+    private Label newTournamentFormularTitle;
+
+    @FXML
+    private Button openBtn;
+
+    @FXML
+    private MenuItem setLan;
+
+    @FXML
+    private Label tournierListTitle;
+
+    @FXML
+    private ListView<?> tournierListView;
+
+    @FXML
+    private Label tournierModLabel;
+
+    @FXML
+    private Label turnierNameLabel;
+
+    @FXML
+    void closeApplication(ActionEvent event) {
+
+    }
+
+    @FXML
+    void createTournament(ActionEvent event) {
+
+    }
+
+    @FXML
+    void openTournier(ActionEvent event) {
+
+    }
+
+}
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java
new file mode 100644
index 0000000..47f7acc
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java
@@ -0,0 +1,97 @@
+package ch.zhaw.projekt2.turnierverwaltung.participandAddFormular;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.TextField;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+
+public class participantFormularController {
+
+    @FXML
+    private Button addBtn;
+
+    @FXML
+    private Label birthDateLabel;
+
+    @FXML
+    private TextField birthDateTextField;
+
+    @FXML
+    private VBox changeBtn;
+
+    @FXML
+    private MenuItem closeBtn;
+
+    @FXML
+    private Label firstNameLabel;
+
+    @FXML
+    private TextField firstNameTextField;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private VBox mainContainer;
+
+    @FXML
+    private Label mainTitle;
+
+    @FXML
+    private Label newParticipantFormularTitle;
+
+    @FXML
+    private Button openBtn;
+
+    @FXML
+    private Label participantListTitle;
+
+    @FXML
+    private ListView<?> participantListView;
+
+    @FXML
+    private Label participantNameLabel;
+
+    @FXML
+    private TextField participantNameTextField;
+
+    @FXML
+    private Label phoneNumberLabel;
+
+    @FXML
+    private TextField phoneNumberTextField;
+
+    @FXML
+    private Button saveBtn;
+
+    @FXML
+    private MenuItem setLan;
+
+    @FXML
+    void addParticipant(ActionEvent event) {
+
+    }
+
+    @FXML
+    void changeParticipant(MouseEvent event) {
+
+    }
+
+    @FXML
+    void closeApplication(ActionEvent event) {
+
+    }
+
+    @FXML
+    void save(ActionEvent event) {
+
+    }
+
+}
+
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java
new file mode 100644
index 0000000..adbfb59
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java
@@ -0,0 +1,4 @@
+package ch.zhaw.projekt2.turnierverwaltung.tournamentList;
+
+public class tournamentListController {
+}
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
new file mode 100644
index 0000000..cd4c4cd
--- /dev/null
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
@@ -0,0 +1,128 @@
+<?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.Menu?>
+<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?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?>
+
+<AnchorPane prefHeight="518.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
+   <children>
+      <VBox fx:id="mainContainer" alignment="CENTER" prefHeight="200.0" prefWidth="100.0" stylesheets="@Style.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <MenuBar>
+              <menus>
+                <Menu mnemonicParsing="false" text="Start">
+                  <items>
+                        <MenuItem fx:id="setLan" mnemonicParsing="false" text="Sprache wählen" />
+                    <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
+                  </items>
+                </Menu>
+              </menus>
+            </MenuBar>
+            <Label fx:id="mainTitle" text="Turnier Manager" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets bottom="40.0" />
+               </VBox.margin>
+               <font>
+                  <Font name="System Bold" size="47.0" />
+               </font>
+            </Label>
+            <HBox alignment="CENTER" prefHeight="407.0" prefWidth="600.0" VBox.vgrow="ALWAYS">
+               <children>
+                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                     <children>
+                        <Label fx:id="tournierListTitle" text="Bestehende Turniere">
+                           <font>
+                              <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                              <Insets bottom="20.0" />
+                           </VBox.margin>
+                        </Label>
+                        <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                              <Insets />
+                           </VBox.margin>
+                        </ListView>
+                        <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
+                           <VBox.margin>
+                              <Insets bottom="20.0" top="40.0" />
+                           </VBox.margin>
+                        </Button>
+                     </children>
+                     <HBox.margin>
+                        <Insets left="40.0" />
+                     </HBox.margin>
+                  </VBox>
+                  <Separator orientation="VERTICAL" prefHeight="200.0">
+                     <HBox.margin>
+                        <Insets left="10.0" right="10.0" />
+                     </HBox.margin>
+                  </Separator>
+                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                     <children>
+                        <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
+                           <font>
+                              <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                              <Insets bottom="40.0" />
+                           </VBox.margin></Label>
+                        <Separator prefWidth="200.0" />
+                        <GridPane fx:id="grid" prefHeight="200.0">
+                          <columnConstraints>
+                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                          </columnConstraints>
+                          <rowConstraints>
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                          </rowConstraints>
+                           <children>
+                              <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </Label>
+                              <TextField styleClass="inputGrid" GridPane.columnIndex="1">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </TextField>
+                              <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </Label>
+                              <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                           </children>
+                        </GridPane>
+                        <Separator prefWidth="200.0" />
+                        <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                              <Insets top="40.0" />
+                           </VBox.margin></Button>
+                     </children>
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin>
+                  </VBox>
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+   </children>
+</AnchorPane>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/Style.css b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/Style.css
new file mode 100644
index 0000000..d69b698
--- /dev/null
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/Style.css
@@ -0,0 +1,10 @@
+#mainContainer {
+    -fx-min-height: 100%;
+    -fx-min-width: 100%;
+    -fx-background-color: #f8f8f8;
+
+}
+
+/*
+Formular Right Side
+ */
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
new file mode 100644
index 0000000..c70f0ca
--- /dev/null
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.Menu?>
+<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?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?>
+
+<AnchorPane 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.participandAddFormular.participantFormularController">
+   <children>
+      <VBox fx:id="mainContainer" alignment="CENTER" layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="100.0" stylesheets="@../main/Style.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <MenuBar>
+               <menus>
+                  <Menu mnemonicParsing="false" text="Start">
+                     <items>
+                        <MenuItem fx:id="setLan" mnemonicParsing="false" text="Sprache wählen" />
+                        <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
+                     </items>
+                  </Menu>
+               </menus>
+            </MenuBar>
+            <Label fx:id="mainTitle" text="Turnier Manager" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets bottom="40.0" />
+               </VBox.margin>
+               <font>
+                  <Font name="System Bold" size="47.0" />
+               </font>
+            </Label>
+            <HBox alignment="CENTER" VBox.vgrow="ALWAYS">
+               <children>
+                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                     <children>
+                        <Label fx:id="participantListTitle" text="Hinzugefügt">
+                           <font>
+                              <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                              <Insets bottom="20.0" />
+                           </VBox.margin>
+                        </Label>
+                        <ListView fx:id="participantListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                              <Insets />
+                           </VBox.margin>
+                        </ListView>
+                        <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                           <children>
+                              <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Save">
+                                 <HBox.margin>
+                                    <Insets right="40.0" />
+                                 </HBox.margin>
+                              </Button>
+                              <Button fx:id="openBtn" mnemonicParsing="false" text="Bearbeiten" />
+                           </children>
+                        </HBox>
+                     </children>
+                     <HBox.margin>
+                        <Insets left="40.0" />
+                     </HBox.margin>
+                  </VBox>
+                  <Separator orientation="VERTICAL" prefHeight="200.0">
+                     <HBox.margin>
+                        <Insets left="10.0" right="10.0" />
+                     </HBox.margin>
+                  </Separator>
+                  <VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                     <children>
+                        <Label fx:id="newParticipantFormularTitle" text="Neuer Teilnehmer">
+                           <font>
+                              <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                              <Insets bottom="40.0" />
+                           </VBox.margin>
+                        </Label>
+                        <Separator prefWidth="200.0" />
+                        <GridPane fx:id="grid" prefHeight="200.0">
+                           <columnConstraints>
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                           </columnConstraints>
+                           <rowConstraints>
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                           </rowConstraints>
+                           <children>
+                              <Label fx:id="participantNameLabel" styleClass="lableGrid" text="Name">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </Label>
+                              <TextField fx:id="participantNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </TextField>
+                              <Label fx:id="firstNameLabel" styleClass="lableGrid" text="Vorname" GridPane.rowIndex="1">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </Label>
+                              <TextField fx:id="firstNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                              <TextField fx:id="phoneNumberTextField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                              <TextField fx:id="birthDateTextField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                              <Label fx:id="phoneNumberLabel" text="Telefonnummer" GridPane.rowIndex="2" />
+                              <Label fx:id="birthDateLabel" text="Geb. Datum" GridPane.rowIndex="3" />
+                           </children>
+                        </GridPane>
+                        <Separator prefWidth="200.0" />
+                        <Button fx:id="addBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#addParticipant" text="Erstellen" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                              <Insets bottom="10.0" top="30.0" />
+                           </VBox.margin>
+                        </Button>
+                     </children>
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin>
+                  </VBox>
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+   </children>
+</AnchorPane>
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
new file mode 100644
index 0000000..2372a7f
--- /dev/null
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="ch.zhaw.projekt2.turnierverwaltung.tournamentList.tournamentListController"
+            prefHeight="400.0" prefWidth="600.0">
+
+</AnchorPane>

From 2245568edf763342c4410bc6a889f25680629b03 Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 29 Apr 2022 10:39:37 +0200
Subject: [PATCH 03/35] created GUI Main and AddParticipant

---
 .../projekt2/turnierverwaltung/main/MainWindow.java   |  1 -
 .../turnierverwaltung/main/MainWindowController.java  | 11 ++++++++---
 .../participantFormularController.java                | 10 +++++++---
 .../projekt2/turnierverwaltung/main/MainWindow.fxml   |  6 +++++-
 .../participandAddFormular/participandFormular.fxml   |  6 +++++-
 5 files changed, 25 insertions(+), 9 deletions(-)

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 29a8990..f7e9d27 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
@@ -34,6 +34,5 @@ public class MainWindow extends Application {
         } catch (IOException e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
index 992b4f4..84c410d 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
@@ -18,6 +18,9 @@ public class MainWindowController {
     @FXML
     private Button createBtn;
 
+    @FXML
+    private MenuItem germanSelect;
+
     @FXML
     private GridPane grid;
 
@@ -36,9 +39,6 @@ public class MainWindowController {
     @FXML
     private Button openBtn;
 
-    @FXML
-    private MenuItem setLan;
-
     @FXML
     private Label tournierListTitle;
 
@@ -51,6 +51,11 @@ public class MainWindowController {
     @FXML
     private Label turnierNameLabel;
 
+    @FXML
+    void changeLangToGerman(ActionEvent event) {
+
+    }
+
     @FXML
     void closeApplication(ActionEvent event) {
 
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java
index 47f7acc..a80622b 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java
@@ -34,6 +34,9 @@ public class participantFormularController {
     @FXML
     private TextField firstNameTextField;
 
+    @FXML
+    private MenuItem germanSelect;
+
     @FXML
     private GridPane grid;
 
@@ -71,10 +74,12 @@ public class participantFormularController {
     private Button saveBtn;
 
     @FXML
-    private MenuItem setLan;
+    void addParticipant(ActionEvent event) {
+
+    }
 
     @FXML
-    void addParticipant(ActionEvent event) {
+    void changeLangToGerman(ActionEvent event) {
 
     }
 
@@ -94,4 +99,3 @@ public class participantFormularController {
     }
 
 }
-
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
index cd4c4cd..6e78fd9 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
@@ -26,7 +26,11 @@
               <menus>
                 <Menu mnemonicParsing="false" text="Start">
                   <items>
-                        <MenuItem fx:id="setLan" mnemonicParsing="false" text="Sprache wählen" />
+                        <Menu mnemonicParsing="false" text="Sprache wählen">
+                          <items>
+                            <MenuItem fx:id="germanSelect" mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
+                          </items>
+                        </Menu>
                     <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
                   </items>
                 </Menu>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
index c70f0ca..ae0a799 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
@@ -25,7 +25,11 @@
                <menus>
                   <Menu mnemonicParsing="false" text="Start">
                      <items>
-                        <MenuItem fx:id="setLan" mnemonicParsing="false" text="Sprache wählen" />
+                        <Menu mnemonicParsing="false" text="Sprache wählen">
+                           <items>
+                              <MenuItem fx:id="germanSelect" mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
+                           </items>
+                        </Menu>
                         <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
                      </items>
                   </Menu>

From f78731951de28e86a84e2b1a4462794d7701e937 Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 29 Apr 2022 10:39:50 +0200
Subject: [PATCH 04/35] created GUI Main and AddParticipant

---
 .../participandFormular.fxml                  | 144 ++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml

diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
new file mode 100644
index 0000000..ae0a799
--- /dev/null
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.Menu?>
+<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?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?>
+
+<AnchorPane 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.participandAddFormular.participantFormularController">
+   <children>
+      <VBox fx:id="mainContainer" alignment="CENTER" layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="100.0" stylesheets="@../main/Style.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <MenuBar>
+               <menus>
+                  <Menu mnemonicParsing="false" text="Start">
+                     <items>
+                        <Menu mnemonicParsing="false" text="Sprache wählen">
+                           <items>
+                              <MenuItem fx:id="germanSelect" mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
+                           </items>
+                        </Menu>
+                        <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
+                     </items>
+                  </Menu>
+               </menus>
+            </MenuBar>
+            <Label fx:id="mainTitle" text="Turnier Manager" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets bottom="40.0" />
+               </VBox.margin>
+               <font>
+                  <Font name="System Bold" size="47.0" />
+               </font>
+            </Label>
+            <HBox alignment="CENTER" VBox.vgrow="ALWAYS">
+               <children>
+                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                     <children>
+                        <Label fx:id="participantListTitle" text="Hinzugefügt">
+                           <font>
+                              <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                              <Insets bottom="20.0" />
+                           </VBox.margin>
+                        </Label>
+                        <ListView fx:id="participantListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                              <Insets />
+                           </VBox.margin>
+                        </ListView>
+                        <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                           <children>
+                              <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Save">
+                                 <HBox.margin>
+                                    <Insets right="40.0" />
+                                 </HBox.margin>
+                              </Button>
+                              <Button fx:id="openBtn" mnemonicParsing="false" text="Bearbeiten" />
+                           </children>
+                        </HBox>
+                     </children>
+                     <HBox.margin>
+                        <Insets left="40.0" />
+                     </HBox.margin>
+                  </VBox>
+                  <Separator orientation="VERTICAL" prefHeight="200.0">
+                     <HBox.margin>
+                        <Insets left="10.0" right="10.0" />
+                     </HBox.margin>
+                  </Separator>
+                  <VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                     <children>
+                        <Label fx:id="newParticipantFormularTitle" text="Neuer Teilnehmer">
+                           <font>
+                              <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                              <Insets bottom="40.0" />
+                           </VBox.margin>
+                        </Label>
+                        <Separator prefWidth="200.0" />
+                        <GridPane fx:id="grid" prefHeight="200.0">
+                           <columnConstraints>
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                           </columnConstraints>
+                           <rowConstraints>
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                           </rowConstraints>
+                           <children>
+                              <Label fx:id="participantNameLabel" styleClass="lableGrid" text="Name">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </Label>
+                              <TextField fx:id="participantNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </TextField>
+                              <Label fx:id="firstNameLabel" styleClass="lableGrid" text="Vorname" GridPane.rowIndex="1">
+                                 <GridPane.margin>
+                                    <Insets />
+                                 </GridPane.margin>
+                              </Label>
+                              <TextField fx:id="firstNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                              <TextField fx:id="phoneNumberTextField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                              <TextField fx:id="birthDateTextField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                              <Label fx:id="phoneNumberLabel" text="Telefonnummer" GridPane.rowIndex="2" />
+                              <Label fx:id="birthDateLabel" text="Geb. Datum" GridPane.rowIndex="3" />
+                           </children>
+                        </GridPane>
+                        <Separator prefWidth="200.0" />
+                        <Button fx:id="addBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#addParticipant" text="Erstellen" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                              <Insets bottom="10.0" top="30.0" />
+                           </VBox.margin>
+                        </Button>
+                     </children>
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin>
+                  </VBox>
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+   </children>
+</AnchorPane>

From 96fedc3f65b17717c9b8580e7f6746811aa39efc Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 29 Apr 2022 10:39:59 +0200
Subject: [PATCH 05/35] created GUI Main and AddParticipant

---
 .../ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
index cd4c4cd..6e78fd9 100644
--- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
@@ -26,7 +26,11 @@
               <menus>
                 <Menu mnemonicParsing="false" text="Start">
                   <items>
-                        <MenuItem fx:id="setLan" mnemonicParsing="false" text="Sprache wählen" />
+                        <Menu mnemonicParsing="false" text="Sprache wählen">
+                          <items>
+                            <MenuItem fx:id="germanSelect" mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
+                          </items>
+                        </Menu>
                     <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
                   </items>
                 </Menu>

From 3ec776e64f9cd8d11d869bdd789993608b162f2e Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 29 Apr 2022 11:47:27 +0200
Subject: [PATCH 06/35] created GUI Main and AddParticipant

---
 .../participandFormular.fxml                  | 194 +++++++---------
 .../turnierverwaltung/main/MainWindow.fxml    | 207 +++++++++---------
 .../participandFormular.fxml                  | 194 +++++++---------
 3 files changed, 267 insertions(+), 328 deletions(-)

diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
index ae0a799..c64bf07 100644
--- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
+
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
@@ -17,128 +17,98 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane 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.participandAddFormular.participantFormularController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.participandAddFormular.participantFormularController">
    <children>
-      <VBox fx:id="mainContainer" alignment="CENTER" layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="100.0" stylesheets="@../main/Style.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
-            <MenuBar>
-               <menus>
-                  <Menu mnemonicParsing="false" text="Start">
-                     <items>
-                        <Menu mnemonicParsing="false" text="Sprache wählen">
-                           <items>
-                              <MenuItem fx:id="germanSelect" mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
-                           </items>
-                        </Menu>
-                        <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
-                     </items>
-                  </Menu>
-               </menus>
-            </MenuBar>
-            <Label fx:id="mainTitle" text="Turnier Manager" VBox.vgrow="ALWAYS">
-               <VBox.margin>
-                  <Insets bottom="40.0" />
-               </VBox.margin>
+            <Label fx:id="participantListTitle" text="Hinzugefügt">
                <font>
-                  <Font name="System Bold" size="47.0" />
+                  <Font name="System Bold" size="21.0" />
                </font>
+               <VBox.margin>
+                  <Insets bottom="20.0" />
+               </VBox.margin>
             </Label>
-            <HBox alignment="CENTER" VBox.vgrow="ALWAYS">
+            <ListView fx:id="participantListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </ListView>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                <children>
-                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                     <children>
-                        <Label fx:id="participantListTitle" text="Hinzugefügt">
-                           <font>
-                              <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                              <Insets bottom="20.0" />
-                           </VBox.margin>
-                        </Label>
-                        <ListView fx:id="participantListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                        </ListView>
-                        <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                           <children>
-                              <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Save">
-                                 <HBox.margin>
-                                    <Insets right="40.0" />
-                                 </HBox.margin>
-                              </Button>
-                              <Button fx:id="openBtn" mnemonicParsing="false" text="Bearbeiten" />
-                           </children>
-                        </HBox>
-                     </children>
-                     <HBox.margin>
-                        <Insets left="40.0" />
-                     </HBox.margin>
-                  </VBox>
-                  <Separator orientation="VERTICAL" prefHeight="200.0">
-                     <HBox.margin>
-                        <Insets left="10.0" right="10.0" />
-                     </HBox.margin>
-                  </Separator>
-                  <VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                     <children>
-                        <Label fx:id="newParticipantFormularTitle" text="Neuer Teilnehmer">
-                           <font>
-                              <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                              <Insets bottom="40.0" />
-                           </VBox.margin>
-                        </Label>
-                        <Separator prefWidth="200.0" />
-                        <GridPane fx:id="grid" prefHeight="200.0">
-                           <columnConstraints>
-                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                           </columnConstraints>
-                           <rowConstraints>
-                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                           </rowConstraints>
-                           <children>
-                              <Label fx:id="participantNameLabel" styleClass="lableGrid" text="Name">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </Label>
-                              <TextField fx:id="participantNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </TextField>
-                              <Label fx:id="firstNameLabel" styleClass="lableGrid" text="Vorname" GridPane.rowIndex="1">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </Label>
-                              <TextField fx:id="firstNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                              <TextField fx:id="phoneNumberTextField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                              <TextField fx:id="birthDateTextField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                              <Label fx:id="phoneNumberLabel" text="Telefonnummer" GridPane.rowIndex="2" />
-                              <Label fx:id="birthDateLabel" text="Geb. Datum" GridPane.rowIndex="3" />
-                           </children>
-                        </GridPane>
-                        <Separator prefWidth="200.0" />
-                        <Button fx:id="addBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#addParticipant" text="Erstellen" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                              <Insets bottom="10.0" top="30.0" />
-                           </VBox.margin>
-                        </Button>
-                     </children>
+                  <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Save">
                      <HBox.margin>
                         <Insets right="40.0" />
                      </HBox.margin>
-                  </VBox>
+                  </Button>
+                  <Button fx:id="openBtn" mnemonicParsing="false" text="Bearbeiten" />
                </children>
             </HBox>
          </children>
+         <HBox.margin>
+            <Insets left="40.0" />
+         </HBox.margin>
+      </VBox>
+      <Separator orientation="VERTICAL" prefHeight="200.0">
+         <HBox.margin>
+            <Insets left="10.0" right="10.0" />
+         </HBox.margin>
+      </Separator>
+      <VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+         <children>
+            <Label fx:id="newParticipantFormularTitle" text="Neuer Teilnehmer">
+               <font>
+                  <Font name="System Bold" size="21.0" />
+               </font>
+               <VBox.margin>
+                  <Insets bottom="40.0" />
+               </VBox.margin>
+            </Label>
+            <Separator prefWidth="200.0" />
+            <GridPane fx:id="grid" prefHeight="200.0">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <Label fx:id="participantNameLabel" styleClass="lableGrid" text="Name">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <TextField fx:id="participantNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </TextField>
+                  <Label fx:id="firstNameLabel" styleClass="lableGrid" text="Vorname" GridPane.rowIndex="1">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <TextField fx:id="firstNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <TextField fx:id="phoneNumberTextField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                  <TextField fx:id="birthDateTextField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <Label fx:id="phoneNumberLabel" text="Telefonnummer" GridPane.rowIndex="2" />
+                  <Label fx:id="birthDateLabel" text="Geb. Datum" GridPane.rowIndex="3" />
+               </children>
+            </GridPane>
+            <Separator prefWidth="200.0" />
+            <Button fx:id="addBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#addParticipant" text="Erstellen" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets bottom="10.0" top="30.0" />
+               </VBox.margin>
+            </Button>
+         </children>
+         <HBox.margin>
+            <Insets right="40.0" />
+         </HBox.margin>
       </VBox>
    </children>
-</AnchorPane>
+</HBox>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
index 6e78fd9..831d491 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
@@ -18,115 +18,114 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="518.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
-   <children>
-      <VBox fx:id="mainContainer" alignment="CENTER" prefHeight="200.0" prefWidth="100.0" stylesheets="@Style.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
+   <center>
+       <HBox alignment="CENTER" prefHeight="407.0" prefWidth="600.0" VBox.vgrow="ALWAYS">
+           <children>
+               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                   <children>
+                       <Label fx:id="tournierListTitle" text="Bestehende Turniere">
+                           <font>
+                               <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                               <Insets bottom="20.0" />
+                           </VBox.margin>
+                       </Label>
+                       <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                               <Insets />
+                           </VBox.margin>
+                       </ListView>
+                       <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
+                           <VBox.margin>
+                               <Insets bottom="20.0" top="40.0" />
+                           </VBox.margin>
+                       </Button>
+                   </children>
+                   <HBox.margin>
+                       <Insets left="40.0" />
+                   </HBox.margin>
+               </VBox>
+               <Separator orientation="VERTICAL" prefHeight="200.0">
+                   <HBox.margin>
+                       <Insets left="10.0" right="10.0" />
+                   </HBox.margin>
+               </Separator>
+               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                   <children>
+                       <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
+                           <font>
+                               <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                               <Insets bottom="40.0" />
+                           </VBox.margin></Label>
+                       <Separator prefWidth="200.0" />
+                       <GridPane fx:id="grid" prefHeight="200.0">
+                           <columnConstraints>
+                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                           </columnConstraints>
+                           <rowConstraints>
+                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                           </rowConstraints>
+                           <children>
+                               <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
+                                   <GridPane.margin>
+                                       <Insets />
+                                   </GridPane.margin>
+                               </Label>
+                               <TextField styleClass="inputGrid" GridPane.columnIndex="1">
+                                   <GridPane.margin>
+                                       <Insets />
+                                   </GridPane.margin>
+                               </TextField>
+                               <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
+                                   <GridPane.margin>
+                                       <Insets />
+                                   </GridPane.margin>
+                               </Label>
+                               <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                           </children>
+                       </GridPane>
+                       <Separator prefWidth="200.0" />
+                       <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                               <Insets bottom="20.0" top="40.0" />
+                           </VBox.margin></Button>
+                   </children>
+                   <HBox.margin>
+                       <Insets right="40.0" />
+                   </HBox.margin>
+               </VBox>
+           </children>
+       </HBox>
+   </center>
+   <top>
+      <VBox alignment="TOP_CENTER" prefHeight="86.0" prefWidth="600.0" BorderPane.alignment="CENTER">
          <children>
             <MenuBar>
-              <menus>
-                <Menu mnemonicParsing="false" text="Start">
-                  <items>
-                        <Menu mnemonicParsing="false" text="Sprache wählen">
-                          <items>
-                            <MenuItem fx:id="germanSelect" mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
-                          </items>
+               <menus>
+                  <Menu mnemonicParsing="false" text="Start">
+                     <items>
+                        <Menu mnemonicParsing="false" text="Sprache">
+                           <items>
+                              <MenuItem mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
+                           </items>
                         </Menu>
-                    <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
-                  </items>
-                </Menu>
-              </menus>
+                        <MenuItem mnemonicParsing="false" onAction="#closeApplication" text="Close" />
+                     </items>
+                  </Menu>
+               </menus>
             </MenuBar>
-            <Label fx:id="mainTitle" text="Turnier Manager" VBox.vgrow="ALWAYS">
-               <VBox.margin>
-                  <Insets bottom="40.0" />
-               </VBox.margin>
+            <Label text="Turnier Manager">
                <font>
-                  <Font name="System Bold" size="47.0" />
+                  <Font name="System Bold" size="40.0" />
                </font>
             </Label>
-            <HBox alignment="CENTER" prefHeight="407.0" prefWidth="600.0" VBox.vgrow="ALWAYS">
-               <children>
-                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                     <children>
-                        <Label fx:id="tournierListTitle" text="Bestehende Turniere">
-                           <font>
-                              <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                              <Insets bottom="20.0" />
-                           </VBox.margin>
-                        </Label>
-                        <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                        </ListView>
-                        <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
-                           <VBox.margin>
-                              <Insets bottom="20.0" top="40.0" />
-                           </VBox.margin>
-                        </Button>
-                     </children>
-                     <HBox.margin>
-                        <Insets left="40.0" />
-                     </HBox.margin>
-                  </VBox>
-                  <Separator orientation="VERTICAL" prefHeight="200.0">
-                     <HBox.margin>
-                        <Insets left="10.0" right="10.0" />
-                     </HBox.margin>
-                  </Separator>
-                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                     <children>
-                        <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
-                           <font>
-                              <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                              <Insets bottom="40.0" />
-                           </VBox.margin></Label>
-                        <Separator prefWidth="200.0" />
-                        <GridPane fx:id="grid" prefHeight="200.0">
-                          <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                          </columnConstraints>
-                          <rowConstraints>
-                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                          </rowConstraints>
-                           <children>
-                              <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </Label>
-                              <TextField styleClass="inputGrid" GridPane.columnIndex="1">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </TextField>
-                              <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </Label>
-                              <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                           </children>
-                        </GridPane>
-                        <Separator prefWidth="200.0" />
-                        <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                              <Insets top="40.0" />
-                           </VBox.margin></Button>
-                     </children>
-                     <HBox.margin>
-                        <Insets right="40.0" />
-                     </HBox.margin>
-                  </VBox>
-               </children>
-            </HBox>
          </children>
       </VBox>
-   </children>
-</AnchorPane>
+   </top>
+</BorderPane>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
index ae0a799..c64bf07 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
+
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
@@ -17,128 +17,98 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane 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.participandAddFormular.participantFormularController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.participandAddFormular.participantFormularController">
    <children>
-      <VBox fx:id="mainContainer" alignment="CENTER" layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="100.0" stylesheets="@../main/Style.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
-            <MenuBar>
-               <menus>
-                  <Menu mnemonicParsing="false" text="Start">
-                     <items>
-                        <Menu mnemonicParsing="false" text="Sprache wählen">
-                           <items>
-                              <MenuItem fx:id="germanSelect" mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
-                           </items>
-                        </Menu>
-                        <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
-                     </items>
-                  </Menu>
-               </menus>
-            </MenuBar>
-            <Label fx:id="mainTitle" text="Turnier Manager" VBox.vgrow="ALWAYS">
-               <VBox.margin>
-                  <Insets bottom="40.0" />
-               </VBox.margin>
+            <Label fx:id="participantListTitle" text="Hinzugefügt">
                <font>
-                  <Font name="System Bold" size="47.0" />
+                  <Font name="System Bold" size="21.0" />
                </font>
+               <VBox.margin>
+                  <Insets bottom="20.0" />
+               </VBox.margin>
             </Label>
-            <HBox alignment="CENTER" VBox.vgrow="ALWAYS">
+            <ListView fx:id="participantListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </ListView>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                <children>
-                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                     <children>
-                        <Label fx:id="participantListTitle" text="Hinzugefügt">
-                           <font>
-                              <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                              <Insets bottom="20.0" />
-                           </VBox.margin>
-                        </Label>
-                        <ListView fx:id="participantListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                        </ListView>
-                        <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                           <children>
-                              <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Save">
-                                 <HBox.margin>
-                                    <Insets right="40.0" />
-                                 </HBox.margin>
-                              </Button>
-                              <Button fx:id="openBtn" mnemonicParsing="false" text="Bearbeiten" />
-                           </children>
-                        </HBox>
-                     </children>
-                     <HBox.margin>
-                        <Insets left="40.0" />
-                     </HBox.margin>
-                  </VBox>
-                  <Separator orientation="VERTICAL" prefHeight="200.0">
-                     <HBox.margin>
-                        <Insets left="10.0" right="10.0" />
-                     </HBox.margin>
-                  </Separator>
-                  <VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                     <children>
-                        <Label fx:id="newParticipantFormularTitle" text="Neuer Teilnehmer">
-                           <font>
-                              <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                              <Insets bottom="40.0" />
-                           </VBox.margin>
-                        </Label>
-                        <Separator prefWidth="200.0" />
-                        <GridPane fx:id="grid" prefHeight="200.0">
-                           <columnConstraints>
-                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                           </columnConstraints>
-                           <rowConstraints>
-                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                           </rowConstraints>
-                           <children>
-                              <Label fx:id="participantNameLabel" styleClass="lableGrid" text="Name">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </Label>
-                              <TextField fx:id="participantNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </TextField>
-                              <Label fx:id="firstNameLabel" styleClass="lableGrid" text="Vorname" GridPane.rowIndex="1">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </Label>
-                              <TextField fx:id="firstNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                              <TextField fx:id="phoneNumberTextField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                              <TextField fx:id="birthDateTextField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                              <Label fx:id="phoneNumberLabel" text="Telefonnummer" GridPane.rowIndex="2" />
-                              <Label fx:id="birthDateLabel" text="Geb. Datum" GridPane.rowIndex="3" />
-                           </children>
-                        </GridPane>
-                        <Separator prefWidth="200.0" />
-                        <Button fx:id="addBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#addParticipant" text="Erstellen" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                              <Insets bottom="10.0" top="30.0" />
-                           </VBox.margin>
-                        </Button>
-                     </children>
+                  <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Save">
                      <HBox.margin>
                         <Insets right="40.0" />
                      </HBox.margin>
-                  </VBox>
+                  </Button>
+                  <Button fx:id="openBtn" mnemonicParsing="false" text="Bearbeiten" />
                </children>
             </HBox>
          </children>
+         <HBox.margin>
+            <Insets left="40.0" />
+         </HBox.margin>
+      </VBox>
+      <Separator orientation="VERTICAL" prefHeight="200.0">
+         <HBox.margin>
+            <Insets left="10.0" right="10.0" />
+         </HBox.margin>
+      </Separator>
+      <VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+         <children>
+            <Label fx:id="newParticipantFormularTitle" text="Neuer Teilnehmer">
+               <font>
+                  <Font name="System Bold" size="21.0" />
+               </font>
+               <VBox.margin>
+                  <Insets bottom="40.0" />
+               </VBox.margin>
+            </Label>
+            <Separator prefWidth="200.0" />
+            <GridPane fx:id="grid" prefHeight="200.0">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <Label fx:id="participantNameLabel" styleClass="lableGrid" text="Name">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <TextField fx:id="participantNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </TextField>
+                  <Label fx:id="firstNameLabel" styleClass="lableGrid" text="Vorname" GridPane.rowIndex="1">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <TextField fx:id="firstNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <TextField fx:id="phoneNumberTextField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                  <TextField fx:id="birthDateTextField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <Label fx:id="phoneNumberLabel" text="Telefonnummer" GridPane.rowIndex="2" />
+                  <Label fx:id="birthDateLabel" text="Geb. Datum" GridPane.rowIndex="3" />
+               </children>
+            </GridPane>
+            <Separator prefWidth="200.0" />
+            <Button fx:id="addBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#addParticipant" text="Erstellen" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets bottom="10.0" top="30.0" />
+               </VBox.margin>
+            </Button>
+         </children>
+         <HBox.margin>
+            <Insets right="40.0" />
+         </HBox.margin>
       </VBox>
    </children>
-</AnchorPane>
+</HBox>

From 0974af77b6e1af41500b542ea36db9d45d395b34 Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 29 Apr 2022 11:48:20 +0200
Subject: [PATCH 07/35] created GUI Main and AddParticipant

---
 .../turnierverwaltung/main/MainWindow.fxml    | 207 +++++++++---------
 1 file changed, 103 insertions(+), 104 deletions(-)

diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
index 6e78fd9..831d491 100644
--- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
@@ -18,115 +18,114 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="518.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
-   <children>
-      <VBox fx:id="mainContainer" alignment="CENTER" prefHeight="200.0" prefWidth="100.0" stylesheets="@Style.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
+   <center>
+       <HBox alignment="CENTER" prefHeight="407.0" prefWidth="600.0" VBox.vgrow="ALWAYS">
+           <children>
+               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                   <children>
+                       <Label fx:id="tournierListTitle" text="Bestehende Turniere">
+                           <font>
+                               <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                               <Insets bottom="20.0" />
+                           </VBox.margin>
+                       </Label>
+                       <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                               <Insets />
+                           </VBox.margin>
+                       </ListView>
+                       <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
+                           <VBox.margin>
+                               <Insets bottom="20.0" top="40.0" />
+                           </VBox.margin>
+                       </Button>
+                   </children>
+                   <HBox.margin>
+                       <Insets left="40.0" />
+                   </HBox.margin>
+               </VBox>
+               <Separator orientation="VERTICAL" prefHeight="200.0">
+                   <HBox.margin>
+                       <Insets left="10.0" right="10.0" />
+                   </HBox.margin>
+               </Separator>
+               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+                   <children>
+                       <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
+                           <font>
+                               <Font name="System Bold" size="21.0" />
+                           </font>
+                           <VBox.margin>
+                               <Insets bottom="40.0" />
+                           </VBox.margin></Label>
+                       <Separator prefWidth="200.0" />
+                       <GridPane fx:id="grid" prefHeight="200.0">
+                           <columnConstraints>
+                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                           </columnConstraints>
+                           <rowConstraints>
+                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                           </rowConstraints>
+                           <children>
+                               <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
+                                   <GridPane.margin>
+                                       <Insets />
+                                   </GridPane.margin>
+                               </Label>
+                               <TextField styleClass="inputGrid" GridPane.columnIndex="1">
+                                   <GridPane.margin>
+                                       <Insets />
+                                   </GridPane.margin>
+                               </TextField>
+                               <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
+                                   <GridPane.margin>
+                                       <Insets />
+                                   </GridPane.margin>
+                               </Label>
+                               <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                           </children>
+                       </GridPane>
+                       <Separator prefWidth="200.0" />
+                       <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
+                           <VBox.margin>
+                               <Insets bottom="20.0" top="40.0" />
+                           </VBox.margin></Button>
+                   </children>
+                   <HBox.margin>
+                       <Insets right="40.0" />
+                   </HBox.margin>
+               </VBox>
+           </children>
+       </HBox>
+   </center>
+   <top>
+      <VBox alignment="TOP_CENTER" prefHeight="86.0" prefWidth="600.0" BorderPane.alignment="CENTER">
          <children>
             <MenuBar>
-              <menus>
-                <Menu mnemonicParsing="false" text="Start">
-                  <items>
-                        <Menu mnemonicParsing="false" text="Sprache wählen">
-                          <items>
-                            <MenuItem fx:id="germanSelect" mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
-                          </items>
+               <menus>
+                  <Menu mnemonicParsing="false" text="Start">
+                     <items>
+                        <Menu mnemonicParsing="false" text="Sprache">
+                           <items>
+                              <MenuItem mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
+                           </items>
                         </Menu>
-                    <MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
-                  </items>
-                </Menu>
-              </menus>
+                        <MenuItem mnemonicParsing="false" onAction="#closeApplication" text="Close" />
+                     </items>
+                  </Menu>
+               </menus>
             </MenuBar>
-            <Label fx:id="mainTitle" text="Turnier Manager" VBox.vgrow="ALWAYS">
-               <VBox.margin>
-                  <Insets bottom="40.0" />
-               </VBox.margin>
+            <Label text="Turnier Manager">
                <font>
-                  <Font name="System Bold" size="47.0" />
+                  <Font name="System Bold" size="40.0" />
                </font>
             </Label>
-            <HBox alignment="CENTER" prefHeight="407.0" prefWidth="600.0" VBox.vgrow="ALWAYS">
-               <children>
-                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                     <children>
-                        <Label fx:id="tournierListTitle" text="Bestehende Turniere">
-                           <font>
-                              <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                              <Insets bottom="20.0" />
-                           </VBox.margin>
-                        </Label>
-                        <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                        </ListView>
-                        <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
-                           <VBox.margin>
-                              <Insets bottom="20.0" top="40.0" />
-                           </VBox.margin>
-                        </Button>
-                     </children>
-                     <HBox.margin>
-                        <Insets left="40.0" />
-                     </HBox.margin>
-                  </VBox>
-                  <Separator orientation="VERTICAL" prefHeight="200.0">
-                     <HBox.margin>
-                        <Insets left="10.0" right="10.0" />
-                     </HBox.margin>
-                  </Separator>
-                  <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                     <children>
-                        <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
-                           <font>
-                              <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                              <Insets bottom="40.0" />
-                           </VBox.margin></Label>
-                        <Separator prefWidth="200.0" />
-                        <GridPane fx:id="grid" prefHeight="200.0">
-                          <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                          </columnConstraints>
-                          <rowConstraints>
-                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                          </rowConstraints>
-                           <children>
-                              <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </Label>
-                              <TextField styleClass="inputGrid" GridPane.columnIndex="1">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </TextField>
-                              <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
-                                 <GridPane.margin>
-                                    <Insets />
-                                 </GridPane.margin>
-                              </Label>
-                              <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                           </children>
-                        </GridPane>
-                        <Separator prefWidth="200.0" />
-                        <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                              <Insets top="40.0" />
-                           </VBox.margin></Button>
-                     </children>
-                     <HBox.margin>
-                        <Insets right="40.0" />
-                     </HBox.margin>
-                  </VBox>
-               </children>
-            </HBox>
          </children>
       </VBox>
-   </children>
-</AnchorPane>
+   </top>
+</BorderPane>

From 89b7ac2268d0651ac03f6f25dce93d0bc7d72ab5 Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 29 Apr 2022 11:48:37 +0200
Subject: [PATCH 08/35] created GUI Main and AddParticipant

---
 .../ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 f7e9d27..f3e735c 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
@@ -9,6 +9,9 @@ import javafx.stage.Stage;
 import java.io.IOException;
 
 public class MainWindow extends Application {
+
+
+
     @Override
     public void start(Stage primaryStage) throws Exception {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml"));
@@ -23,7 +26,7 @@ public class MainWindow extends Application {
     //Can be used to Open new Scene in same Stage.
     //This way possible to later give object to Controller
     public void startParticipand(Stage stage) {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("..\\participandAddFormular\\participandFormular.fxml"));
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("../participandAddFormular/participandFormular.fxml"));
         try {
             Pane pane = loader.load();
             Scene scene = new Scene(pane);

From 2413e4f8e02ee398db5cf4e4ac496f8391806dfc Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 29 Apr 2022 12:27:22 +0200
Subject: [PATCH 09/35] refactored GUI to be able to just switch between
 diffrent pane in center

refactored dictionary hirarchy
---
 .gitignore                                    |   4 +
 .gradle/7.4/fileHashes/fileHashes.lock        | Bin 17 -> 17 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .../turnierverwaltung/main/MainWindow.fxml    |  94 ----------------
 .../participandFormular.fxml                  |   2 +-
 .../main/tournamentList/tournamentList.fxml   | 100 ++++++++++++++++++
 .../tournamentList/tournamentList.fxml        |  14 ---
 .../compileJava/previous-compilation-data.bin | Bin 20975 -> 21079 bytes
 .../turnierverwaltung/main/MainWindow.java    |  15 ++-
 .../main/MainWindowController.java            |  57 ----------
 .../participantFormularController.java        |  25 +----
 .../tournamentListController.java             |  51 +++++++++
 .../tournamentListController.java             |   4 -
 .../turnierverwaltung/main/MainWindow.fxml    |  94 ----------------
 .../participandFormular.fxml                  |   2 +-
 .../main/tournamentList/tournamentList.fxml   | 100 ++++++++++++++++++
 .../tournamentList/tournamentList.fxml        |  14 ---
 17 files changed, 268 insertions(+), 308 deletions(-)
 rename app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/{ => main}/participandAddFormular/participandFormular.fxml (98%)
 create mode 100644 app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
 delete mode 100644 app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
 rename app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/{ => main}/participandAddFormular/participantFormularController.java (76%)
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentListController.java
 delete mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java
 rename app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/{ => main}/participandAddFormular/participandFormular.fxml (98%)
 create mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
 delete mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml

diff --git a/.gitignore b/.gitignore
index c25f212..f3e80ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,7 @@ hs_err_pid*
 
 .gradle
 .idea
+/app/build/tmp/compileJava/previous-compilation-data.bin
+/.gradle/7.4/fileHashes/fileHashes.lock
+/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+
diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
index f90d1f6ef300d9003e5562ccdf55481c550c68a4..45a4b0d383b500974c9077d200d937e69195696d 100644
GIT binary patch
literal 17
VcmZRcx~p9LshesS0~j#=0st{B1hxPG

literal 17
VcmZRcx~p9LshesS0~j#Y0st_u1UUcz

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 46c3158f912dca0ffbe8f4cc82a675e5685ce001..0a00c1c795fcaf0ed811071101e382768fbab381 100644
GIT binary patch
literal 17
VcmZQBJ^h>gkcECJ0~j#!0RS@*1M>g?

literal 17
UcmZQBJ^h>gkcECJ0|cB005i}8vj6}9

diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
index 831d491..af04e72 100644
--- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
@@ -1,108 +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.ListView?>
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
-<?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?>
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
-   <center>
-       <HBox alignment="CENTER" prefHeight="407.0" prefWidth="600.0" VBox.vgrow="ALWAYS">
-           <children>
-               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                   <children>
-                       <Label fx:id="tournierListTitle" text="Bestehende Turniere">
-                           <font>
-                               <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                               <Insets bottom="20.0" />
-                           </VBox.margin>
-                       </Label>
-                       <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                               <Insets />
-                           </VBox.margin>
-                       </ListView>
-                       <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
-                           <VBox.margin>
-                               <Insets bottom="20.0" top="40.0" />
-                           </VBox.margin>
-                       </Button>
-                   </children>
-                   <HBox.margin>
-                       <Insets left="40.0" />
-                   </HBox.margin>
-               </VBox>
-               <Separator orientation="VERTICAL" prefHeight="200.0">
-                   <HBox.margin>
-                       <Insets left="10.0" right="10.0" />
-                   </HBox.margin>
-               </Separator>
-               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                   <children>
-                       <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
-                           <font>
-                               <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                               <Insets bottom="40.0" />
-                           </VBox.margin></Label>
-                       <Separator prefWidth="200.0" />
-                       <GridPane fx:id="grid" prefHeight="200.0">
-                           <columnConstraints>
-                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                           </columnConstraints>
-                           <rowConstraints>
-                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                           </rowConstraints>
-                           <children>
-                               <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </Label>
-                               <TextField styleClass="inputGrid" GridPane.columnIndex="1">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </TextField>
-                               <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </Label>
-                               <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                           </children>
-                       </GridPane>
-                       <Separator prefWidth="200.0" />
-                       <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                               <Insets bottom="20.0" top="40.0" />
-                           </VBox.margin></Button>
-                   </children>
-                   <HBox.margin>
-                       <Insets right="40.0" />
-                   </HBox.margin>
-               </VBox>
-           </children>
-       </HBox>
-   </center>
    <top>
       <VBox alignment="TOP_CENTER" prefHeight="86.0" prefWidth="600.0" BorderPane.alignment="CENTER">
          <children>
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
similarity index 98%
rename from app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
rename to app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
index c64bf07..df5040e 100644
--- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
@@ -17,7 +17,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.participandAddFormular.participantFormularController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participandAddFormular.participantFormularController">
    <children>
       <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
new file mode 100644
index 0000000..9a52479
--- /dev/null
+++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
@@ -0,0 +1,100 @@
+<?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?>
+
+<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">
+    <children>
+        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+            <children>
+                <Label fx:id="tournierListTitle" text="Bestehende Turniere">
+                    <font>
+                        <Font name="System Bold" size="21.0" />
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="20.0" />
+                    </VBox.margin>
+                </Label>
+                <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                    <VBox.margin>
+                        <Insets />
+                    </VBox.margin>
+                </ListView>
+                <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
+                    <VBox.margin>
+                        <Insets bottom="20.0" top="40.0" />
+                    </VBox.margin>
+                </Button>
+            </children>
+            <HBox.margin>
+                <Insets left="40.0" />
+            </HBox.margin>
+        </VBox>
+        <Separator orientation="VERTICAL" prefHeight="200.0">
+            <HBox.margin>
+                <Insets left="10.0" right="10.0" />
+            </HBox.margin>
+        </Separator>
+        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+            <children>
+                <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
+                    <font>
+                        <Font name="System Bold" size="21.0" />
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="40.0" />
+                    </VBox.margin></Label>
+                <Separator prefWidth="200.0" />
+                <GridPane fx:id="grid" prefHeight="200.0">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
+                    <children>
+                        <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </Label>
+                        <TextField styleClass="inputGrid" GridPane.columnIndex="1">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </TextField>
+                        <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </Label>
+                        <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                    </children>
+                </GridPane>
+                <Separator prefWidth="200.0" />
+                <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
+                    <VBox.margin>
+                        <Insets bottom="20.0" top="40.0" />
+                    </VBox.margin></Button>
+            </children>
+            <HBox.margin>
+                <Insets right="40.0" />
+            </HBox.margin>
+        </VBox>
+    </children>
+
+
+</HBox>
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
deleted file mode 100644
index 2372a7f..0000000
--- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
-            fx:controller="ch.zhaw.projekt2.turnierverwaltung.tournamentList.tournamentListController"
-            prefHeight="400.0" prefWidth="600.0">
-
-</AnchorPane>
diff --git a/app/build/tmp/compileJava/previous-compilation-data.bin b/app/build/tmp/compileJava/previous-compilation-data.bin
index 840f5c6796c7465c0a95063ce875f0685824a9be..611f7c9c3177b4dfc7159dacea1dc5134fdf899b 100644
GIT binary patch
delta 15736
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
Ri|TOg|5Xu8Pamrl{XZ1m^<Mx0

delta 15464
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
MB|qCjS_A+74|HmfNdN!<

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 f3e735c..c124308 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
@@ -3,22 +3,27 @@ package ch.zhaw.projekt2.turnierverwaltung.main;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
+import java.awt.*;
 import java.io.IOException;
 
 public class MainWindow extends Application {
 
-
-
     @Override
     public void start(Stage primaryStage) throws Exception {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml"));
-        Pane pane = loader.load();
+        BorderPane pane = loader.load();
+
+        //test add center pane
+        loader = new FXMLLoader(getClass().getResource("tournamentList/tournamentList.fxml"));
+        pane.setCenter(loader.load());
+
         Scene scene = new Scene(pane);
         primaryStage.setScene(scene);
-        primaryStage.setFullScreen(true);
+        primaryStage.setMaximized(true);
         primaryStage.setResizable(false);
         primaryStage.show();
     }
@@ -26,7 +31,7 @@ public class MainWindow extends Application {
     //Can be used to Open new Scene in same Stage.
     //This way possible to later give object to Controller
     public void startParticipand(Stage stage) {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("../participandAddFormular/participandFormular.fxml"));
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("participandAddFormular/participandFormular.fxml"));
         try {
             Pane pane = loader.load();
             Scene scene = new Scene(pane);
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
index 84c410d..577a538 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
@@ -2,55 +2,9 @@ package ch.zhaw.projekt2.turnierverwaltung.main;
 
 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.MenuItem;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.VBox;
 
 public class MainWindowController {
 
-    @FXML
-    private MenuItem closeBtn;
-
-    @FXML
-    private Button createBtn;
-
-    @FXML
-    private MenuItem germanSelect;
-
-    @FXML
-    private GridPane grid;
-
-    @FXML
-    private VBox mainContainer;
-
-    @FXML
-    private Label mainTitle;
-
-    @FXML
-    private ChoiceBox<?> modusChoiceBox;
-
-    @FXML
-    private Label newTournamentFormularTitle;
-
-    @FXML
-    private Button openBtn;
-
-    @FXML
-    private Label tournierListTitle;
-
-    @FXML
-    private ListView<?> tournierListView;
-
-    @FXML
-    private Label tournierModLabel;
-
-    @FXML
-    private Label turnierNameLabel;
-
     @FXML
     void changeLangToGerman(ActionEvent event) {
 
@@ -60,15 +14,4 @@ public class MainWindowController {
     void closeApplication(ActionEvent event) {
 
     }
-
-    @FXML
-    void createTournament(ActionEvent event) {
-
-    }
-
-    @FXML
-    void openTournier(ActionEvent event) {
-
-    }
-
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java
similarity index 76%
rename from app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java
rename to app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java
index a80622b..adc2c20 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java
@@ -1,11 +1,10 @@
-package ch.zhaw.projekt2.turnierverwaltung.participandAddFormular;
+package ch.zhaw.projekt2.turnierverwaltung.main.participandAddFormular;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
-import javafx.scene.control.MenuItem;
 import javafx.scene.control.TextField;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.GridPane;
@@ -25,27 +24,15 @@ public class participantFormularController {
     @FXML
     private VBox changeBtn;
 
-    @FXML
-    private MenuItem closeBtn;
-
     @FXML
     private Label firstNameLabel;
 
     @FXML
     private TextField firstNameTextField;
 
-    @FXML
-    private MenuItem germanSelect;
-
     @FXML
     private GridPane grid;
 
-    @FXML
-    private VBox mainContainer;
-
-    @FXML
-    private Label mainTitle;
-
     @FXML
     private Label newParticipantFormularTitle;
 
@@ -78,21 +65,11 @@ public class participantFormularController {
 
     }
 
-    @FXML
-    void changeLangToGerman(ActionEvent event) {
-
-    }
-
     @FXML
     void changeParticipant(MouseEvent event) {
 
     }
 
-    @FXML
-    void closeApplication(ActionEvent event) {
-
-    }
-
     @FXML
     void save(ActionEvent event) {
 
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
new file mode 100644
index 0000000..916b5d6
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentListController.java
@@ -0,0 +1,51 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.GridPane;
+
+public class tournamentListController {
+
+    @FXML
+    private Button createBtn;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private ChoiceBox<?> modusChoiceBox;
+
+    @FXML
+    private Label newTournamentFormularTitle;
+
+    @FXML
+    private Button openBtn;
+
+    @FXML
+    private Label tournierListTitle;
+
+    @FXML
+    private ListView<?> tournierListView;
+
+    @FXML
+    private Label tournierModLabel;
+
+    @FXML
+    private Label turnierNameLabel;
+
+    @FXML
+    void createTournament(ActionEvent event) {
+
+    }
+
+    @FXML
+    void openTournier(ActionEvent event) {
+
+    }
+
+}
+
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java
deleted file mode 100644
index adbfb59..0000000
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package ch.zhaw.projekt2.turnierverwaltung.tournamentList;
-
-public class tournamentListController {
-}
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
index 831d491..af04e72 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
@@ -1,108 +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.ListView?>
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
-<?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?>
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
-   <center>
-       <HBox alignment="CENTER" prefHeight="407.0" prefWidth="600.0" VBox.vgrow="ALWAYS">
-           <children>
-               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                   <children>
-                       <Label fx:id="tournierListTitle" text="Bestehende Turniere">
-                           <font>
-                               <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                               <Insets bottom="20.0" />
-                           </VBox.margin>
-                       </Label>
-                       <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                               <Insets />
-                           </VBox.margin>
-                       </ListView>
-                       <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
-                           <VBox.margin>
-                               <Insets bottom="20.0" top="40.0" />
-                           </VBox.margin>
-                       </Button>
-                   </children>
-                   <HBox.margin>
-                       <Insets left="40.0" />
-                   </HBox.margin>
-               </VBox>
-               <Separator orientation="VERTICAL" prefHeight="200.0">
-                   <HBox.margin>
-                       <Insets left="10.0" right="10.0" />
-                   </HBox.margin>
-               </Separator>
-               <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-                   <children>
-                       <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
-                           <font>
-                               <Font name="System Bold" size="21.0" />
-                           </font>
-                           <VBox.margin>
-                               <Insets bottom="40.0" />
-                           </VBox.margin></Label>
-                       <Separator prefWidth="200.0" />
-                       <GridPane fx:id="grid" prefHeight="200.0">
-                           <columnConstraints>
-                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                           </columnConstraints>
-                           <rowConstraints>
-                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                           </rowConstraints>
-                           <children>
-                               <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </Label>
-                               <TextField styleClass="inputGrid" GridPane.columnIndex="1">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </TextField>
-                               <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
-                                   <GridPane.margin>
-                                       <Insets />
-                                   </GridPane.margin>
-                               </Label>
-                               <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                           </children>
-                       </GridPane>
-                       <Separator prefWidth="200.0" />
-                       <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
-                           <VBox.margin>
-                               <Insets bottom="20.0" top="40.0" />
-                           </VBox.margin></Button>
-                   </children>
-                   <HBox.margin>
-                       <Insets right="40.0" />
-                   </HBox.margin>
-               </VBox>
-           </children>
-       </HBox>
-   </center>
    <top>
       <VBox alignment="TOP_CENTER" prefHeight="86.0" prefWidth="600.0" BorderPane.alignment="CENTER">
          <children>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
similarity index 98%
rename from app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
rename to app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
index c64bf07..df5040e 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
@@ -17,7 +17,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.participandAddFormular.participantFormularController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participandAddFormular.participantFormularController">
    <children>
       <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
new file mode 100644
index 0000000..9a52479
--- /dev/null
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
@@ -0,0 +1,100 @@
+<?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?>
+
+<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">
+    <children>
+        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+            <children>
+                <Label fx:id="tournierListTitle" text="Bestehende Turniere">
+                    <font>
+                        <Font name="System Bold" size="21.0" />
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="20.0" />
+                    </VBox.margin>
+                </Label>
+                <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                    <VBox.margin>
+                        <Insets />
+                    </VBox.margin>
+                </ListView>
+                <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
+                    <VBox.margin>
+                        <Insets bottom="20.0" top="40.0" />
+                    </VBox.margin>
+                </Button>
+            </children>
+            <HBox.margin>
+                <Insets left="40.0" />
+            </HBox.margin>
+        </VBox>
+        <Separator orientation="VERTICAL" prefHeight="200.0">
+            <HBox.margin>
+                <Insets left="10.0" right="10.0" />
+            </HBox.margin>
+        </Separator>
+        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+            <children>
+                <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
+                    <font>
+                        <Font name="System Bold" size="21.0" />
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="40.0" />
+                    </VBox.margin></Label>
+                <Separator prefWidth="200.0" />
+                <GridPane fx:id="grid" prefHeight="200.0">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
+                    <children>
+                        <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </Label>
+                        <TextField styleClass="inputGrid" GridPane.columnIndex="1">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </TextField>
+                        <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </Label>
+                        <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                    </children>
+                </GridPane>
+                <Separator prefWidth="200.0" />
+                <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
+                    <VBox.margin>
+                        <Insets bottom="20.0" top="40.0" />
+                    </VBox.margin></Button>
+            </children>
+            <HBox.margin>
+                <Insets right="40.0" />
+            </HBox.margin>
+        </VBox>
+    </children>
+
+
+</HBox>
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
deleted file mode 100644
index 2372a7f..0000000
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
-            fx:controller="ch.zhaw.projekt2.turnierverwaltung.tournamentList.tournamentListController"
-            prefHeight="400.0" prefWidth="600.0">
-
-</AnchorPane>

From 9c7d62b26091f3e8b969520b7f240cf865b9f606 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Fri, 29 Apr 2022 17:11:50 +0200
Subject: [PATCH 10/35] created Class Factory and refactoring of
 MainWindow.java

---
 .../projekt2/turnierverwaltung/Factory.java   |  63 ++++++++++
 .../turnierverwaltung/main/MainWindow.java    |  26 +---
 .../participantFormularController.java        |   2 +-
 .../tournamentListController.java             |   3 +-
 .../turnierverwaltung}/MainWindow.fxml        |   0
 .../projekt2/turnierverwaltung}/Style.css     |   0
 .../turnierverwaltung/main/MainWindow.fxml    |  37 ------
 .../projekt2/turnierverwaltung/main/Style.css |  10 --
 .../participandFormular.fxml                  | 114 ------------------
 .../participantFormular.fxml}                 |   2 +-
 .../tournamentList/tournamentList.fxml        |   2 +-
 11 files changed, 74 insertions(+), 185 deletions(-)
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
 rename app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/{participandAddFormular => participantAddFormular}/participantFormularController.java (95%)
 rename app/{build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main => src/main/resources/ch/zhaw/projekt2/turnierverwaltung}/MainWindow.fxml (100%)
 rename app/{build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main => src/main/resources/ch/zhaw/projekt2/turnierverwaltung}/Style.css (100%)
 delete mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
 delete mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/Style.css
 delete mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
 rename app/{build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml => src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml} (98%)
 rename app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/{main => }/tournamentList/tournamentList.fxml (99%)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
new file mode 100644
index 0000000..2b671d1
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
@@ -0,0 +1,63 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.layout.Border;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Pane;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.net.URL;
+
+public class Factory {
+    private Tournament tournament;
+
+
+    public Factory(){
+
+    }
+
+    public Tournament getTournament() {
+        return tournament;
+    }
+
+    public void setTournament(Tournament tournament) {
+        this.tournament = tournament;
+    }
+
+    public BorderPane loadMainWindow(){
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml"));
+        try {
+            return loader.load();
+        } catch (IOException e) {
+            e.printStackTrace();
+            //TODO handle and logging
+        }
+        return null;
+    }
+
+    public void loadTournamentList(BorderPane pane){
+        setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"));
+    }
+
+    //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"));
+    }
+
+    private void setCenterOfBorderPane(BorderPane pane, URL location) {
+        try {
+            FXMLLoader loader = new FXMLLoader(location);
+            pane.setCenter(loader.load());
+        } catch (IOException e) {
+            e.printStackTrace();
+            //TODO handle and logging?
+        }
+    }
+
+
+
+
+}
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 c124308..c0f80f4 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,5 +1,6 @@
 package ch.zhaw.projekt2.turnierverwaltung.main;
 
+import ch.zhaw.projekt2.turnierverwaltung.Factory;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
@@ -11,36 +12,21 @@ import java.awt.*;
 import java.io.IOException;
 
 public class MainWindow extends Application {
+    private Factory factory = new Factory(); //TODO make it private!
 
     @Override
     public void start(Stage primaryStage) throws Exception {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml"));
-        BorderPane pane = loader.load();
+        BorderPane pane = factory.loadMainWindow();
+        factory.loadTournamentList(pane);
 
-        //test add center pane
-        loader = new FXMLLoader(getClass().getResource("tournamentList/tournamentList.fxml"));
-        pane.setCenter(loader.load());
 
         Scene scene = new Scene(pane);
         primaryStage.setScene(scene);
         primaryStage.setMaximized(true);
         primaryStage.setResizable(false);
+        primaryStage.setFullScreen(false);
         primaryStage.show();
     }
 
-    //Can be used to Open new Scene in same Stage.
-    //This way possible to later give object to Controller
-    public void startParticipand(Stage stage) {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("participandAddFormular/participandFormular.fxml"));
-        try {
-            Pane pane = loader.load();
-            Scene scene = new Scene(pane);
-            stage.setScene(scene);
-            stage.setFullScreen(true);
-            stage.setResizable(false);
-            stage.show();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
+
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/participantFormularController.java
similarity index 95%
rename from app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java
rename to app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/participantFormularController.java
index adc2c20..8056644 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/participantFormularController.java
@@ -1,4 +1,4 @@
-package ch.zhaw.projekt2.turnierverwaltung.main.participandAddFormular;
+package ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
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 916b5d6..cb8799f 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,5 +1,6 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
 
+import ch.zhaw.projekt2.turnierverwaltung.main.MainWindow;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -43,7 +44,7 @@ public class tournamentListController {
     }
 
     @FXML
-    void openTournier(ActionEvent event) {
+    void openTournament(ActionEvent event) {
 
     }
 
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/MainWindow.fxml
similarity index 100%
rename from app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
rename to app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/MainWindow.fxml
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/Style.css b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/Style.css
similarity index 100%
rename from app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/Style.css
rename to app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/Style.css
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
deleted file mode 100644
index af04e72..0000000
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
-   <top>
-      <VBox alignment="TOP_CENTER" prefHeight="86.0" prefWidth="600.0" BorderPane.alignment="CENTER">
-         <children>
-            <MenuBar>
-               <menus>
-                  <Menu mnemonicParsing="false" text="Start">
-                     <items>
-                        <Menu mnemonicParsing="false" text="Sprache">
-                           <items>
-                              <MenuItem mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
-                           </items>
-                        </Menu>
-                        <MenuItem mnemonicParsing="false" onAction="#closeApplication" text="Close" />
-                     </items>
-                  </Menu>
-               </menus>
-            </MenuBar>
-            <Label text="Turnier Manager">
-               <font>
-                  <Font name="System Bold" size="40.0" />
-               </font>
-            </Label>
-         </children>
-      </VBox>
-   </top>
-</BorderPane>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/Style.css b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/Style.css
deleted file mode 100644
index d69b698..0000000
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/Style.css
+++ /dev/null
@@ -1,10 +0,0 @@
-#mainContainer {
-    -fx-min-height: 100%;
-    -fx-min-width: 100%;
-    -fx-background-color: #f8f8f8;
-
-}
-
-/*
-Formular Right Side
- */
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
deleted file mode 100644
index df5040e..0000000
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.TextField?>
-
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participandAddFormular.participantFormularController">
-   <children>
-      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-         <children>
-            <Label fx:id="participantListTitle" text="Hinzugefügt">
-               <font>
-                  <Font name="System Bold" size="21.0" />
-               </font>
-               <VBox.margin>
-                  <Insets bottom="20.0" />
-               </VBox.margin>
-            </Label>
-            <ListView fx:id="participantListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-               <VBox.margin>
-                  <Insets />
-               </VBox.margin>
-            </ListView>
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-               <children>
-                  <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Save">
-                     <HBox.margin>
-                        <Insets right="40.0" />
-                     </HBox.margin>
-                  </Button>
-                  <Button fx:id="openBtn" mnemonicParsing="false" text="Bearbeiten" />
-               </children>
-            </HBox>
-         </children>
-         <HBox.margin>
-            <Insets left="40.0" />
-         </HBox.margin>
-      </VBox>
-      <Separator orientation="VERTICAL" prefHeight="200.0">
-         <HBox.margin>
-            <Insets left="10.0" right="10.0" />
-         </HBox.margin>
-      </Separator>
-      <VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-         <children>
-            <Label fx:id="newParticipantFormularTitle" text="Neuer Teilnehmer">
-               <font>
-                  <Font name="System Bold" size="21.0" />
-               </font>
-               <VBox.margin>
-                  <Insets bottom="40.0" />
-               </VBox.margin>
-            </Label>
-            <Separator prefWidth="200.0" />
-            <GridPane fx:id="grid" prefHeight="200.0">
-               <columnConstraints>
-                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-               </columnConstraints>
-               <rowConstraints>
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-               </rowConstraints>
-               <children>
-                  <Label fx:id="participantNameLabel" styleClass="lableGrid" text="Name">
-                     <GridPane.margin>
-                        <Insets />
-                     </GridPane.margin>
-                  </Label>
-                  <TextField fx:id="participantNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
-                     <GridPane.margin>
-                        <Insets />
-                     </GridPane.margin>
-                  </TextField>
-                  <Label fx:id="firstNameLabel" styleClass="lableGrid" text="Vorname" GridPane.rowIndex="1">
-                     <GridPane.margin>
-                        <Insets />
-                     </GridPane.margin>
-                  </Label>
-                  <TextField fx:id="firstNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                  <TextField fx:id="phoneNumberTextField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                  <TextField fx:id="birthDateTextField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                  <Label fx:id="phoneNumberLabel" text="Telefonnummer" GridPane.rowIndex="2" />
-                  <Label fx:id="birthDateLabel" text="Geb. Datum" GridPane.rowIndex="3" />
-               </children>
-            </GridPane>
-            <Separator prefWidth="200.0" />
-            <Button fx:id="addBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#addParticipant" text="Erstellen" VBox.vgrow="ALWAYS">
-               <VBox.margin>
-                  <Insets bottom="10.0" top="30.0" />
-               </VBox.margin>
-            </Button>
-         </children>
-         <HBox.margin>
-            <Insets right="40.0" />
-         </HBox.margin>
-      </VBox>
-   </children>
-</HBox>
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
similarity index 98%
rename from app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
rename to app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
index df5040e..0441e61 100644
--- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
@@ -17,7 +17,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participandAddFormular.participantFormularController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular.participantFormularController">
    <children>
       <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
similarity index 99%
rename from app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
rename to app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
index 9a52479..5f5aac6 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml
@@ -31,7 +31,7 @@
                         <Insets />
                     </VBox.margin>
                 </ListView>
-                <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
+                <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournament" text="Öffnen">
                     <VBox.margin>
                         <Insets bottom="20.0" top="40.0" />
                     </VBox.margin>

From 7af48449e0d973829dbd2fd25b7eb3a49779f0d2 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Fri, 29 Apr 2022 17:30:26 +0200
Subject: [PATCH 11/35] created Abstract Class FXController.java

---
 .../turnierverwaltung/FXController.java       | 19 +++++++++++++++++++
 .../projekt2/turnierverwaltung/Factory.java   |  2 ++
 .../main/MainWindowController.java            |  3 ++-
 .../participantFormularController.java        |  3 ++-
 .../tournamentListController.java             |  3 ++-
 5 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.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
new file mode 100644
index 0000000..5c5c545
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
@@ -0,0 +1,19 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+public abstract class FXController {
+    Tournament tournament;
+    Factory factory;
+
+    public void setup(Tournament tournament, Factory factory){
+        this.tournament = tournament;
+        this.factory = factory;
+    }
+
+    protected Tournament getTournament() {
+        return tournament;
+    }
+
+    protected Factory getFactory() {
+        return factory;
+    }
+}
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 2b671d1..5e851fa 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
@@ -51,6 +51,8 @@ public class Factory {
         try {
             FXMLLoader loader = new FXMLLoader(location);
             pane.setCenter(loader.load());
+            FXController controller = loader.getController();
+            controller.setup(tournament, this);
         } catch (IOException e) {
             e.printStackTrace();
             //TODO handle and logging?
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
index 577a538..f33fb69 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
@@ -1,9 +1,10 @@
 package ch.zhaw.projekt2.turnierverwaltung.main;
 
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 
-public class MainWindowController {
+public class MainWindowController extends FXController {
 
     @FXML
     void changeLangToGerman(ActionEvent event) {
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 8056644..6991216 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
@@ -1,5 +1,6 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular;
 
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -10,7 +11,7 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.VBox;
 
-public class participantFormularController {
+public class participantFormularController extends FXController {
 
     @FXML
     private Button addBtn;
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 cb8799f..cc399e7 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,5 +1,6 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
 
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
 import ch.zhaw.projekt2.turnierverwaltung.main.MainWindow;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -9,7 +10,7 @@ import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
 import javafx.scene.layout.GridPane;
 
-public class tournamentListController {
+public class tournamentListController extends FXController {
 
     @FXML
     private Button createBtn;

From 6d5dd700a054a062b3349b4ae859e1ddcf9c8dd2 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 30 Apr 2022 17:09:01 +0200
Subject: [PATCH 12/35] implemented functionality to show existing Tournaments.

---
 .../main/tournamentList/tournamentList.fxml   | 100 ------------------
 .../turnierverwaltung/FXController.java       |  10 +-
 .../projekt2/turnierverwaltung/Factory.java   |  22 ++--
 .../projekt2/turnierverwaltung/FileIO.java    |  23 +++-
 .../turnierverwaltung/main/MainWindow.java    |   5 +-
 .../main/MainWindowController.java            |   5 +
 .../tournamentListController.java             |  18 +++-
 .../participantFormular.fxml                  |   2 +-
 .../tournamentList/tournamentList.fxml        |   2 +-
 .../projekt2/turnierverwaltung/AppTest.java   |  14 ---
 .../turnierverwaltung/FileIOTest.java         |   2 +-
 11 files changed, 69 insertions(+), 134 deletions(-)
 delete mode 100644 app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
 delete mode 100644 app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/AppTest.java

diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
deleted file mode 100644
index 9a52479..0000000
--- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?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?>
-
-<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">
-    <children>
-        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-            <children>
-                <Label fx:id="tournierListTitle" text="Bestehende Turniere">
-                    <font>
-                        <Font name="System Bold" size="21.0" />
-                    </font>
-                    <VBox.margin>
-                        <Insets bottom="20.0" />
-                    </VBox.margin>
-                </Label>
-                <ListView fx:id="tournierListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                    <VBox.margin>
-                        <Insets />
-                    </VBox.margin>
-                </ListView>
-                <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournier" text="Öffnen">
-                    <VBox.margin>
-                        <Insets bottom="20.0" top="40.0" />
-                    </VBox.margin>
-                </Button>
-            </children>
-            <HBox.margin>
-                <Insets left="40.0" />
-            </HBox.margin>
-        </VBox>
-        <Separator orientation="VERTICAL" prefHeight="200.0">
-            <HBox.margin>
-                <Insets left="10.0" right="10.0" />
-            </HBox.margin>
-        </Separator>
-        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
-            <children>
-                <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
-                    <font>
-                        <Font name="System Bold" size="21.0" />
-                    </font>
-                    <VBox.margin>
-                        <Insets bottom="40.0" />
-                    </VBox.margin></Label>
-                <Separator prefWidth="200.0" />
-                <GridPane fx:id="grid" prefHeight="200.0">
-                    <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                    </columnConstraints>
-                    <rowConstraints>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                    </rowConstraints>
-                    <children>
-                        <Label fx:id="turnierNameLabel" styleClass="lableGrid" text="Turnier Name:">
-                            <GridPane.margin>
-                                <Insets />
-                            </GridPane.margin>
-                        </Label>
-                        <TextField styleClass="inputGrid" GridPane.columnIndex="1">
-                            <GridPane.margin>
-                                <Insets />
-                            </GridPane.margin>
-                        </TextField>
-                        <Label fx:id="tournierModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
-                            <GridPane.margin>
-                                <Insets />
-                            </GridPane.margin>
-                        </Label>
-                        <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                    </children>
-                </GridPane>
-                <Separator prefWidth="200.0" />
-                <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
-                    <VBox.margin>
-                        <Insets bottom="20.0" top="40.0" />
-                    </VBox.margin></Button>
-            </children>
-            <HBox.margin>
-                <Insets right="40.0" />
-            </HBox.margin>
-        </VBox>
-    </children>
-
-
-</HBox>
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 5c5c545..babea73 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
@@ -3,16 +3,24 @@ package ch.zhaw.projekt2.turnierverwaltung;
 public abstract class FXController {
     Tournament tournament;
     Factory factory;
+    FileIO fileIO;
 
-    public void setup(Tournament tournament, Factory factory){
+    public void setup(Tournament tournament, FileIO fileIO, Factory factory){
         this.tournament = tournament;
+        this.fileIO = fileIO;
         this.factory = factory;
     }
 
+    public abstract void loadContent();
+
     protected Tournament getTournament() {
         return tournament;
     }
 
+    protected FileIO getFileIO() {
+        return fileIO;
+    }
+
     protected Factory getFactory() {
         return factory;
     }
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 5e851fa..a272b0e 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
@@ -1,21 +1,18 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
+import ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.TournamentListController;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.Scene;
-import javafx.scene.layout.Border;
 import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.Pane;
-import javafx.stage.Stage;
 
 import java.io.IOException;
 import java.net.URL;
 
 public class Factory {
     private Tournament tournament;
+    private FileIO fileIO;
 
-
-    public Factory(){
-
+    public Factory(FileIO fileIO){
+        this.fileIO = fileIO;
     }
 
     public Tournament getTournament() {
@@ -38,7 +35,7 @@ public class Factory {
     }
 
     public void loadTournamentList(BorderPane pane){
-        setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"));
+        TournamentListController controller = (TournamentListController) setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"));
     }
 
     //Can be used to Open new Scene in same Stage.
@@ -47,16 +44,19 @@ public class Factory {
         setCenterOfBorderPane(pane, getClass().getResource("participantAddFormular/participantFormular.fxml"));
     }
 
-    private void setCenterOfBorderPane(BorderPane pane, URL location) {
+    private FXController setCenterOfBorderPane(BorderPane pane, URL location) {
+        FXController controller = null;
         try {
             FXMLLoader loader = new FXMLLoader(location);
             pane.setCenter(loader.load());
-            FXController controller = loader.getController();
-            controller.setup(tournament, this);
+            controller = loader.getController();
+            controller.setup(tournament, fileIO, this);
+            controller.loadContent();
         } catch (IOException e) {
             e.printStackTrace();
             //TODO handle and logging?
         }
+        return controller;
     }
 
 
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..9b9365d 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
@@ -2,6 +2,8 @@ package ch.zhaw.projekt2.turnierverwaltung;
 
 
 import java.io.*;
+import java.net.URI;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
@@ -32,9 +34,13 @@ public class FileIO {
         }
     }
 
-    public List<File> getList() {
+    public List<TournamentFile> getList() {
         logger.fine("Creating a List out of all Files in the save directory and returning it");
-        return Arrays.asList(saves.listFiles());
+        List<TournamentFile> tournaments = new ArrayList<>();
+        for(File tournament : saves.listFiles()){
+            tournaments.add(new TournamentFile(tournament.toURI()));
+        }
+        return tournaments;
     }
 
     /**
@@ -110,4 +116,17 @@ public class FileIO {
         }
 
     }
+
+    public class TournamentFile extends File{
+
+        public TournamentFile(URI uri) {
+            super(uri);
+        }
+
+        public String toString(){
+            String name = getName();
+            return name.split("\\.")[0];
+        }
+
+    }
 }
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 c0f80f4..4602c5d 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,6 +1,7 @@
 package ch.zhaw.projekt2.turnierverwaltung.main;
 
 import ch.zhaw.projekt2.turnierverwaltung.Factory;
+import ch.zhaw.projekt2.turnierverwaltung.FileIO;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
@@ -12,10 +13,12 @@ import java.awt.*;
 import java.io.IOException;
 
 public class MainWindow extends Application {
-    private Factory factory = new Factory(); //TODO make it private!
+    private FileIO fileIO = new FileIO(System.getProperty("user.dir") + "/tournierverwaltung_angrynerds");
+    private Factory factory = new Factory(fileIO); //TODO make it private!
 
     @Override
     public void start(Stage primaryStage) throws Exception {
+
         BorderPane pane = factory.loadMainWindow();
         factory.loadTournamentList(pane);
 
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
index f33fb69..ef5e1d6 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
@@ -15,4 +15,9 @@ public class MainWindowController extends FXController {
     void closeApplication(ActionEvent event) {
 
     }
+
+    @Override
+    public void loadContent() {
+
+    }
 }
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 cc399e7..cb9a548 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,7 +1,11 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.FileIO;
 import ch.zhaw.projekt2.turnierverwaltung.main.MainWindow;
+import javafx.beans.Observable;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -10,7 +14,9 @@ import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
 import javafx.scene.layout.GridPane;
 
-public class tournamentListController extends FXController {
+import java.io.File;
+
+public class TournamentListController extends FXController {
 
     @FXML
     private Button createBtn;
@@ -31,7 +37,7 @@ public class tournamentListController extends FXController {
     private Label tournierListTitle;
 
     @FXML
-    private ListView<?> tournierListView;
+    private ListView<File> tournierListView;
 
     @FXML
     private Label tournierModLabel;
@@ -49,5 +55,13 @@ public class tournamentListController extends FXController {
 
     }
 
+    @Override
+    public void loadContent() {
+        ObservableList<File> tournamentFiles = FXCollections.observableArrayList();
+        for(File tournament : getFileIO().getList()){
+            tournamentFiles.add(tournament);
+        }
+        tournierListView.setItems(tournamentFiles);
+    }
 }
 
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
index 0441e61..caa919e 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
@@ -17,7 +17,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular.participantFormularController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular.ParticipantFormularController">
    <children>
       <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
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 5f5aac6..74c2bf2 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
@@ -14,7 +14,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.tournamentListController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/17" 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>
diff --git a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/AppTest.java b/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/AppTest.java
deleted file mode 100644
index 252063c..0000000
--- a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/AppTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * This Java source file was generated by the Gradle 'init' task.
- */
-package ch.zhaw.projekt2.turnierverwaltung;
-
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
-class AppTest {
-    @Test void appHasAGreeting() {
-        App classUnderTest = new App();
-        assertNotNull(classUnderTest.getGreeting(), "app should have a greeting");
-    }
-}
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..fd68e22 100644
--- a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
+++ b/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
@@ -60,7 +60,7 @@ class FileIOTest {
 
         @Test
         void getList() {
-            List<File> tournaments = io.getList();
+            List<FileIO.TournamentFile> tournaments = io.getList();
             assertEquals("empty.txt", tournaments.get(0).getName());
             assertEquals("test1.txt", tournaments.get(1).getName());
         }

From c58fae060a46ef2b00a24e3efa362793461f8ca6 Mon Sep 17 00:00:00 2001
From: Roman Schenk <schrom01@students.zhaw.ch>
Date: Sat, 30 Apr 2022 17:56:40 +0200
Subject: [PATCH 13/35] Delete .idea directory

---
 .idea/.gitignore                          |  8 ---
 .idea/.name                               |  1 -
 .idea/compiler.xml                        |  6 ---
 .idea/gradle.xml                          | 18 -------
 .idea/jarRepositories.xml                 | 20 -------
 .idea/libraries-with-intellij-classes.xml | 65 -----------------------
 .idea/misc.xml                            |  5 --
 .idea/vcs.xml                             |  6 ---
 8 files changed, 129 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/gradle.xml
 delete mode 100644 .idea/jarRepositories.xml
 delete mode 100644 .idea/libraries-with-intellij-classes.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 73f69e0..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 1b960e6..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-turnierverwaltung
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index b73660a..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="15" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index ccf41b5..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$PROJECT_DIR$/../../../../ProgramData/chocolatey/lib/gradle/tools/gradle-7.3.3" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index fdc392f..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/libraries-with-intellij-classes.xml b/.idea/libraries-with-intellij-classes.xml
deleted file mode 100644
index 9fa3156..0000000
--- a/.idea/libraries-with-intellij-classes.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="libraries-with-intellij-classes">
-    <option name="intellijApiContainingLibraries">
-      <list>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIU" />
-          <option name="groupId" value="com.jetbrains.intellij.idea" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIU" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIC" />
-          <option name="groupId" value="com.jetbrains.intellij.idea" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIC" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPY" />
-          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPY" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPC" />
-          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPC" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="clion" />
-          <option name="groupId" value="com.jetbrains.intellij.clion" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="clion" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="riderRD" />
-          <option name="groupId" value="com.jetbrains.intellij.rider" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="riderRD" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="goland" />
-          <option name="groupId" value="com.jetbrains.intellij.goland" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="goland" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index f09f125..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" project-jdk-name="17 (2)" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

From 5660f851653739e75076b7e530bbc00822fd0bd3 Mon Sep 17 00:00:00 2001
From: Roman Schenk <schrom01@students.zhaw.ch>
Date: Sat, 30 Apr 2022 17:57:29 +0200
Subject: [PATCH 14/35] Delete .gradle directory

---
 .gradle/7.4/checksums/checksums.lock            | Bin 17 -> 0 bytes
 .gradle/7.4/checksums/md5-checksums.bin         | Bin 19197 -> 0 bytes
 .gradle/7.4/checksums/sha1-checksums.bin        | Bin 19955 -> 0 bytes
 .../dependencies-accessors.lock                 | Bin 17 -> 0 bytes
 .../7.4/dependencies-accessors/gc.properties    |   0
 .gradle/7.4/fileChanges/last-build.bin          | Bin 1 -> 0 bytes
 .gradle/7.4/fileHashes/fileHashes.lock          | Bin 17 -> 0 bytes
 .gradle/7.4/gc.properties                       |   0
 .../buildOutputCleanup/buildOutputCleanup.lock  | Bin 17 -> 0 bytes
 .gradle/buildOutputCleanup/cache.properties     |   2 --
 .gradle/vcs-1/gc.properties                     |   0
 11 files changed, 2 deletions(-)
 delete mode 100644 .gradle/7.4/checksums/checksums.lock
 delete mode 100644 .gradle/7.4/checksums/md5-checksums.bin
 delete mode 100644 .gradle/7.4/checksums/sha1-checksums.bin
 delete mode 100644 .gradle/7.4/dependencies-accessors/dependencies-accessors.lock
 delete mode 100644 .gradle/7.4/dependencies-accessors/gc.properties
 delete mode 100644 .gradle/7.4/fileChanges/last-build.bin
 delete mode 100644 .gradle/7.4/fileHashes/fileHashes.lock
 delete mode 100644 .gradle/7.4/gc.properties
 delete mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock
 delete mode 100644 .gradle/buildOutputCleanup/cache.properties
 delete mode 100644 .gradle/vcs-1/gc.properties

diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock
deleted file mode 100644
index c0e1e0c225d4fb59fea6e2d2bbe5d140a29de459..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
UcmZQpJ$0r_G~m)-1_;mv05(PhssI20

diff --git a/.gradle/7.4/checksums/md5-checksums.bin b/.gradle/7.4/checksums/md5-checksums.bin
deleted file mode 100644
index 2df228dcf4793117dbb1290c4a1a0518a02f651d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19197
zcmeI(TS!x300;0>5urOd=Vp0H%<w^RshEbT51WeGG%t~ukd>FRi>n6%Gcbqg%+kn=
zu%VkxGrK&vL?R3?U>B3TK+cF^YM7ExQfUcVozwRn#I47k;(y@meEiS%KOg7E-nK8A
zVO$)4(SunzoL7bzK>z{}fB*y_009U<00Izz00bZa0SG_<0uX=z1R(Ig2&8f^VozSi
zMZT6Fhzl4dkmUvr+Ra*%#F#24w^i$e-w&=2d=6`t<v%2O+^CS(wj@MM?<#Ykxl+h=
zQ9)BledXI}ep|@vJgQ_fS&{Vlarr{tq+9$E)b+KOt{Wocoh{2RoWva$NWObm$a@|?
zt1_Pui|PEELOyrvL&GWk76YBH7IJUL{pnp>51gU%`-NP-H)Uc<qPa)s+X=a1vUMpy
zlvzP@gODrr{T7#&oKN&Qxk9ck_PBay<I7e$KU~O#E5oeGB=_(M0SG_<0uX=z1Rwwb
z2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5cszO
zJGjUBa;F!6Ix52S=8_I&k?+B=>Yf3qiTg*pCUg2^HCfa7CwKK<-I!Rc=(QMCtaF^3
zt7~%9KHBIe4R?MIfK`JTmXG$;IL!vX)3+_29nYo>x{H9-*fu<ar?f`VoWblBJzKYA
zX{L>NvW7Ivw$a;Ope+q&9@Y9a1`dy>*ONw`H))8vY#WDk8QJGE3Ij^hz8smE8{~FO
z@Nb@{A`Mn;+sJLxF(K~9;@w;4i~LlI(bbJj3fo3|5}VWHb2%pT?fYvr<qO>Qj6Z7}
zCu_*~EgM!=Z<3Rk$i4@SgXRR&hCO9=w4o;r5x+CSs-bP@81g9?N?ZHfY>4p+5z$5`
zX-N1jAy$o)*HuRSa>TZ8-G!HKoC^pg4Yias*kaqp$U@>_OUhV%qUp)^%8{Mi*N1-(
zwURVsCAJMux4ZR6V<xWz=VioKHawNk2Hh>e{-t5O&&2lIufG^>(wu%3TltYTv}6q_
HFW~<hJK}25

diff --git a/.gradle/7.4/checksums/sha1-checksums.bin b/.gradle/7.4/checksums/sha1-checksums.bin
deleted file mode 100644
index 1bc5c79626c36fc62959ed0a8378ba7296fda2a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19955
zcmeI3ZA?>F7=Uj}p&;eUf>u;?fUsyq1eJo5k3bYl#i>K)5FAWo3|h1k0i9AsDH=o!
z3Njr|(ZQI)tQwh0p=QD12Z&XWsT4m^r^XH?5QpyGo^xXC-Tv(7^4_GEo9Eu=oO_<8
zzsQN8D3Rk^d{FNWmv@(N1qGl06o3Ly017|>C;$bZ02F`%Pyh-*0Vn_kpa2wr0#E=7
z{9g*h&<h!c79$dKnG1(3it-iE7o&H{q!%c0wJ*9Id6fMBU{AH|qu#(R_L$!z{D84i
zUwnjj0&!^x;isC5#=0awW5%S9$S}g2mRo&)q*R2TkIW)m_jGnqe&k*QdR|KK+rbIJ
zWg#}w{fN(NAUCYE#SQ!1cs__nr4eptZ&OupsAV|fvT(vjROMI>h`RdmIBLROb#`}B
zu7-*bpKB!CZS2!)Cv&EZ!{bjU-2I}HV3{th2S2}saIt34CtljaM_k%M_|(^%m2pAq
zXCf}MBYfIfFNeB6vr`a{>LgrR(9zxQp8Ode{|w=a?llXOvZa-H{CL7YaVhVgyW)?B
zh|e2Mcnt4nt!szM5sx#U@c83l*%Jhd9%DX=@T6^>_m!>5t%ye*AUySagOzLTwgEi;
z0>U#jVN>-3(e;SS>Ih$Rz3%$@kkg|ve?a(#whsAap5<D^rQU?+hG*Zl(Ph-)=W_@r
ze<_Mvj_$!33P1rU00p1`6o3Ly017|>C;$bZ02F`%Pyh-*0Vn_kpa2wr0#E=7KmjNK
z1)u;FfC5ke3P1rU00p1`6o3Ly017|>C;$cit$;s$V>11jz<ity#@m;@3^!UQMeC<n
z2fJl#_e%VoqByF=-ZbVR`Vgq-li&N+x%2(i_dAqf>X9*=!S0woPGrLiZ0%$migI~F
zpUkXG*)5~x48vXT-RD*~4*oS?f6Vt8wwf4+-l!m^PiEGCo9nPcMa1?3t1q8hTns1~
zw>a)lTYM>=>y>FLN|?l+E3>rgLXF?X)Ni6!UY@Kl&N&&IE<;wjC$elC*_Nxv(_e>O
z`^j#6)v?f2nQw1w`1pO;k|IkWXIoP*o_B0L`lxW{4(Z~}c18Tv6IJo=TO&f*)`h(8
z;=qaW6J54TgcZ(b76>FMH?Wn8=5l5>f|xbD@ytK<VfuqLeyaTawMiBEHErJX9uDSP
zPOm_gtpnQ{Q_@#A_P3_?1+hbWtp{>;2?vx$Y-y3@#B4Y*o2w_zH#^EVkKdf&lJ}^s
zc1Q1#-ImCb3y~$rWm^`th7Ffel7_X+%ARHjP6?>gedUI&Fl0GzVq4O;HCr@Mhc$UU
zk`Zfog#rAYm-NmTW?k|`Jl8*1&1HqpUw!&<IH&8|5QX^E+N(nm^bQY`m5(eTQ^jmu
z%dU*^7kVbu94}saDyrRP?W&+(T#==?imZ{B*j7ggbvHf8*tzHBaKndJKKBo{^i(1%
z!`ozW><Zad<(-ge2M^_HnmQ#*6BPFO9-~6(^)PRkk#4fMH;34kBrQ=b*Uz$lA#vKO
z*WKI|(^a|zTQz7dFXkICTi4eIMQvQYJX(FGv}{PrS3RDTrpH#3$)ZGEY)e>oGd@hF
zEg#n!++V-EJF8{+JbJeW^M)%UOqO+vf^8*B>Wk_d3!KibQ@ma{dtkaQ!S)TdzA#zb
zzT0eza+@L6${pO}tWsk06FdTyF{?LYYpcoP6fm~gx}K=t%*yof49s2CH%IN0Q@t;-
ziifOKlaSSWnr(fjev-3fQ-JePRnU)aR-#6C;Yl&Fl<Q3vmrw7iGN0>%dWCh(U8QX!
zC(B|*d8D?qT|$4WObz8(lV!1y*?VR7h7X%(4i?`k_+jC?=#G(^;5ob<{2px4zcc#a
KUf0lPzrO(?N8-l-

diff --git a/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock
deleted file mode 100644
index 5a44c733e9a9159e2af807f0c8443cb6603820b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
TcmZQpUL`ysZ2AUY1}FdkDBc5J

diff --git a/.gradle/7.4/dependencies-accessors/gc.properties b/.gradle/7.4/dependencies-accessors/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/.gradle/7.4/fileChanges/last-build.bin b/.gradle/7.4/fileChanges/last-build.bin
deleted file mode 100644
index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1
IcmZPo000310RR91

diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
deleted file mode 100644
index 00ae1778f64ba036d6da625f725dd4fdb0a6096b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
TcmZRcx~p9LshesS0~7!NFfjwW

diff --git a/.gradle/7.4/gc.properties b/.gradle/7.4/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index 0041aacb126d4d3474eb13f10b41609569a1d8a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
UcmZQBJ^h>gkcECJ0|YPv05bvu<p2Nx

diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
deleted file mode 100644
index 07b3692..0000000
--- a/.gradle/buildOutputCleanup/cache.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Mon Apr 25 20:06:35 CEST 2022
-gradle.version=7.4
diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties
deleted file mode 100644
index e69de29..0000000

From f8bf63a1d957d907a8fb2e0a75a8d1d6dab643f0 Mon Sep 17 00:00:00 2001
From: Roman Schenk <schrom01@students.zhaw.ch>
Date: Sat, 30 Apr 2022 17:58:39 +0200
Subject: [PATCH 15/35] Delete .gradle directory

---
 .gradle/7.4/checksums/checksums.lock            | Bin 17 -> 0 bytes
 .gradle/7.4/checksums/md5-checksums.bin         | Bin 19197 -> 0 bytes
 .gradle/7.4/checksums/sha1-checksums.bin        | Bin 19955 -> 0 bytes
 .../dependencies-accessors.lock                 | Bin 17 -> 0 bytes
 .../7.4/dependencies-accessors/gc.properties    |   0
 .gradle/7.4/fileChanges/last-build.bin          | Bin 1 -> 0 bytes
 .gradle/7.4/fileHashes/fileHashes.lock          | Bin 17 -> 0 bytes
 .gradle/7.4/gc.properties                       |   0
 .../buildOutputCleanup/buildOutputCleanup.lock  | Bin 17 -> 0 bytes
 .gradle/buildOutputCleanup/cache.properties     |   2 --
 .gradle/vcs-1/gc.properties                     |   0
 11 files changed, 2 deletions(-)
 delete mode 100644 .gradle/7.4/checksums/checksums.lock
 delete mode 100644 .gradle/7.4/checksums/md5-checksums.bin
 delete mode 100644 .gradle/7.4/checksums/sha1-checksums.bin
 delete mode 100644 .gradle/7.4/dependencies-accessors/dependencies-accessors.lock
 delete mode 100644 .gradle/7.4/dependencies-accessors/gc.properties
 delete mode 100644 .gradle/7.4/fileChanges/last-build.bin
 delete mode 100644 .gradle/7.4/fileHashes/fileHashes.lock
 delete mode 100644 .gradle/7.4/gc.properties
 delete mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock
 delete mode 100644 .gradle/buildOutputCleanup/cache.properties
 delete mode 100644 .gradle/vcs-1/gc.properties

diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock
deleted file mode 100644
index c0e1e0c225d4fb59fea6e2d2bbe5d140a29de459..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
UcmZQpJ$0r_G~m)-1_;mv05(PhssI20

diff --git a/.gradle/7.4/checksums/md5-checksums.bin b/.gradle/7.4/checksums/md5-checksums.bin
deleted file mode 100644
index 2df228dcf4793117dbb1290c4a1a0518a02f651d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19197
zcmeI(TS!x300;0>5urOd=Vp0H%<w^RshEbT51WeGG%t~ukd>FRi>n6%Gcbqg%+kn=
zu%VkxGrK&vL?R3?U>B3TK+cF^YM7ExQfUcVozwRn#I47k;(y@meEiS%KOg7E-nK8A
zVO$)4(SunzoL7bzK>z{}fB*y_009U<00Izz00bZa0SG_<0uX=z1R(Ig2&8f^VozSi
zMZT6Fhzl4dkmUvr+Ra*%#F#24w^i$e-w&=2d=6`t<v%2O+^CS(wj@MM?<#Ykxl+h=
zQ9)BledXI}ep|@vJgQ_fS&{Vlarr{tq+9$E)b+KOt{Wocoh{2RoWva$NWObm$a@|?
zt1_Pui|PEELOyrvL&GWk76YBH7IJUL{pnp>51gU%`-NP-H)Uc<qPa)s+X=a1vUMpy
zlvzP@gODrr{T7#&oKN&Qxk9ck_PBay<I7e$KU~O#E5oeGB=_(M0SG_<0uX=z1Rwwb
z2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5cszO
zJGjUBa;F!6Ix52S=8_I&k?+B=>Yf3qiTg*pCUg2^HCfa7CwKK<-I!Rc=(QMCtaF^3
zt7~%9KHBIe4R?MIfK`JTmXG$;IL!vX)3+_29nYo>x{H9-*fu<ar?f`VoWblBJzKYA
zX{L>NvW7Ivw$a;Ope+q&9@Y9a1`dy>*ONw`H))8vY#WDk8QJGE3Ij^hz8smE8{~FO
z@Nb@{A`Mn;+sJLxF(K~9;@w;4i~LlI(bbJj3fo3|5}VWHb2%pT?fYvr<qO>Qj6Z7}
zCu_*~EgM!=Z<3Rk$i4@SgXRR&hCO9=w4o;r5x+CSs-bP@81g9?N?ZHfY>4p+5z$5`
zX-N1jAy$o)*HuRSa>TZ8-G!HKoC^pg4Yias*kaqp$U@>_OUhV%qUp)^%8{Mi*N1-(
zwURVsCAJMux4ZR6V<xWz=VioKHawNk2Hh>e{-t5O&&2lIufG^>(wu%3TltYTv}6q_
HFW~<hJK}25

diff --git a/.gradle/7.4/checksums/sha1-checksums.bin b/.gradle/7.4/checksums/sha1-checksums.bin
deleted file mode 100644
index 1bc5c79626c36fc62959ed0a8378ba7296fda2a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19955
zcmeI3ZA?>F7=Uj}p&;eUf>u;?fUsyq1eJo5k3bYl#i>K)5FAWo3|h1k0i9AsDH=o!
z3Njr|(ZQI)tQwh0p=QD12Z&XWsT4m^r^XH?5QpyGo^xXC-Tv(7^4_GEo9Eu=oO_<8
zzsQN8D3Rk^d{FNWmv@(N1qGl06o3Ly017|>C;$bZ02F`%Pyh-*0Vn_kpa2wr0#E=7
z{9g*h&<h!c79$dKnG1(3it-iE7o&H{q!%c0wJ*9Id6fMBU{AH|qu#(R_L$!z{D84i
zUwnjj0&!^x;isC5#=0awW5%S9$S}g2mRo&)q*R2TkIW)m_jGnqe&k*QdR|KK+rbIJ
zWg#}w{fN(NAUCYE#SQ!1cs__nr4eptZ&OupsAV|fvT(vjROMI>h`RdmIBLROb#`}B
zu7-*bpKB!CZS2!)Cv&EZ!{bjU-2I}HV3{th2S2}saIt34CtljaM_k%M_|(^%m2pAq
zXCf}MBYfIfFNeB6vr`a{>LgrR(9zxQp8Ode{|w=a?llXOvZa-H{CL7YaVhVgyW)?B
zh|e2Mcnt4nt!szM5sx#U@c83l*%Jhd9%DX=@T6^>_m!>5t%ye*AUySagOzLTwgEi;
z0>U#jVN>-3(e;SS>Ih$Rz3%$@kkg|ve?a(#whsAap5<D^rQU?+hG*Zl(Ph-)=W_@r
ze<_Mvj_$!33P1rU00p1`6o3Ly017|>C;$bZ02F`%Pyh-*0Vn_kpa2wr0#E=7KmjNK
z1)u;FfC5ke3P1rU00p1`6o3Ly017|>C;$cit$;s$V>11jz<ity#@m;@3^!UQMeC<n
z2fJl#_e%VoqByF=-ZbVR`Vgq-li&N+x%2(i_dAqf>X9*=!S0woPGrLiZ0%$migI~F
zpUkXG*)5~x48vXT-RD*~4*oS?f6Vt8wwf4+-l!m^PiEGCo9nPcMa1?3t1q8hTns1~
zw>a)lTYM>=>y>FLN|?l+E3>rgLXF?X)Ni6!UY@Kl&N&&IE<;wjC$elC*_Nxv(_e>O
z`^j#6)v?f2nQw1w`1pO;k|IkWXIoP*o_B0L`lxW{4(Z~}c18Tv6IJo=TO&f*)`h(8
z;=qaW6J54TgcZ(b76>FMH?Wn8=5l5>f|xbD@ytK<VfuqLeyaTawMiBEHErJX9uDSP
zPOm_gtpnQ{Q_@#A_P3_?1+hbWtp{>;2?vx$Y-y3@#B4Y*o2w_zH#^EVkKdf&lJ}^s
zc1Q1#-ImCb3y~$rWm^`th7Ffel7_X+%ARHjP6?>gedUI&Fl0GzVq4O;HCr@Mhc$UU
zk`Zfog#rAYm-NmTW?k|`Jl8*1&1HqpUw!&<IH&8|5QX^E+N(nm^bQY`m5(eTQ^jmu
z%dU*^7kVbu94}saDyrRP?W&+(T#==?imZ{B*j7ggbvHf8*tzHBaKndJKKBo{^i(1%
z!`ozW><Zad<(-ge2M^_HnmQ#*6BPFO9-~6(^)PRkk#4fMH;34kBrQ=b*Uz$lA#vKO
z*WKI|(^a|zTQz7dFXkICTi4eIMQvQYJX(FGv}{PrS3RDTrpH#3$)ZGEY)e>oGd@hF
zEg#n!++V-EJF8{+JbJeW^M)%UOqO+vf^8*B>Wk_d3!KibQ@ma{dtkaQ!S)TdzA#zb
zzT0eza+@L6${pO}tWsk06FdTyF{?LYYpcoP6fm~gx}K=t%*yof49s2CH%IN0Q@t;-
ziifOKlaSSWnr(fjev-3fQ-JePRnU)aR-#6C;Yl&Fl<Q3vmrw7iGN0>%dWCh(U8QX!
zC(B|*d8D?qT|$4WObz8(lV!1y*?VR7h7X%(4i?`k_+jC?=#G(^;5ob<{2px4zcc#a
KUf0lPzrO(?N8-l-

diff --git a/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock
deleted file mode 100644
index 5a44c733e9a9159e2af807f0c8443cb6603820b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
TcmZQpUL`ysZ2AUY1}FdkDBc5J

diff --git a/.gradle/7.4/dependencies-accessors/gc.properties b/.gradle/7.4/dependencies-accessors/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/.gradle/7.4/fileChanges/last-build.bin b/.gradle/7.4/fileChanges/last-build.bin
deleted file mode 100644
index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1
IcmZPo000310RR91

diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
deleted file mode 100644
index 45a4b0d383b500974c9077d200d937e69195696d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
VcmZRcx~p9LshesS0~j#=0st{B1hxPG

diff --git a/.gradle/7.4/gc.properties b/.gradle/7.4/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index 0a00c1c795fcaf0ed811071101e382768fbab381..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
VcmZQBJ^h>gkcECJ0~j#!0RS@*1M>g?

diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
deleted file mode 100644
index 07b3692..0000000
--- a/.gradle/buildOutputCleanup/cache.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Mon Apr 25 20:06:35 CEST 2022
-gradle.version=7.4
diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties
deleted file mode 100644
index e69de29..0000000

From 563c70a0789ce2b1142233c8c2d1023cb7e68aca Mon Sep 17 00:00:00 2001
From: Roman Schenk <schrom01@students.zhaw.ch>
Date: Sat, 30 Apr 2022 17:59:33 +0200
Subject: [PATCH 16/35] Delete .idea directory

---
 .idea/.gitignore                          |  11 --
 .idea/.name                               |   1 -
 .idea/compiler.xml                        |   6 --
 .idea/cssdialects.xml                     |   6 --
 .idea/git_toolbox_prj.xml                 |  15 ---
 .idea/gradle.xml                          |  19 ----
 .idea/jarRepositories.xml                 |  20 ----
 .idea/libraries-with-intellij-classes.xml |  65 ------------
 .idea/misc.xml                            |   8 --
 .idea/uiDesigner.xml                      | 124 ----------------------
 .idea/vcs.xml                             |   6 --
 11 files changed, 281 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/cssdialects.xml
 delete mode 100644 .idea/git_toolbox_prj.xml
 delete mode 100644 .idea/gradle.xml
 delete mode 100644 .idea/jarRepositories.xml
 delete mode 100644 .idea/libraries-with-intellij-classes.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/uiDesigner.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 25434b2..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-
-../gradle
-../.idea
\ No newline at end of file
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 1b960e6..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-turnierverwaltung
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index b589d56..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/cssdialects.xml b/.idea/cssdialects.xml
deleted file mode 100644
index 75ec9f0..0000000
--- a/.idea/cssdialects.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CssDialectMappings">
-    <file url="file://$PROJECT_DIR$/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/Style.css" dialect="JavaFX" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
deleted file mode 100644
index 02b915b..0000000
--- a/.idea/git_toolbox_prj.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GitToolBoxProjectSettings">
-    <option name="commitMessageIssueKeyValidationOverride">
-      <BoolValueOverride>
-        <option name="enabled" value="true" />
-      </BoolValueOverride>
-    </option>
-    <option name="commitMessageValidationEnabledOverride">
-      <BoolValueOverride>
-        <option name="enabled" value="true" />
-      </BoolValueOverride>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 33984e8..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$PROJECT_DIR$/../../../../ProgramData/chocolatey/lib/gradle/tools/gradle-7.3.3" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index fdc392f..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/libraries-with-intellij-classes.xml b/.idea/libraries-with-intellij-classes.xml
deleted file mode 100644
index 9fa3156..0000000
--- a/.idea/libraries-with-intellij-classes.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="libraries-with-intellij-classes">
-    <option name="intellijApiContainingLibraries">
-      <list>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIU" />
-          <option name="groupId" value="com.jetbrains.intellij.idea" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIU" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIC" />
-          <option name="groupId" value="com.jetbrains.intellij.idea" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIC" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPY" />
-          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPY" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPC" />
-          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPC" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="clion" />
-          <option name="groupId" value="com.jetbrains.intellij.clion" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="clion" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="riderRD" />
-          <option name="groupId" value="com.jetbrains.intellij.rider" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="riderRD" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="goland" />
-          <option name="groupId" value="com.jetbrains.intellij.goland" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="goland" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index dea5310..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="17 (2)" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

From a103174739aa5dd1ec0a894cec51282809e660e5 Mon Sep 17 00:00:00 2001
From: Roman Schenk <schrom01@students.zhaw.ch>
Date: Sat, 30 Apr 2022 18:01:35 +0200
Subject: [PATCH 17/35] Delete app/build/tmp/compileJava directory

---
 .../compileJava/previous-compilation-data.bin   | Bin 21079 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/build/tmp/compileJava/previous-compilation-data.bin

diff --git a/app/build/tmp/compileJava/previous-compilation-data.bin b/app/build/tmp/compileJava/previous-compilation-data.bin
deleted file mode 100644
index 611f7c9c3177b4dfc7159dacea1dc5134fdf899b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21079
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
SMa%0@@Bb1Aup5eqiv2(6&w}y*


From 6245e32f7394320699b767b4a6540d871b8d60c8 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 30 Apr 2022 18:03:11 +0200
Subject: [PATCH 18/35] added pane to FXController.java

---
 .../projekt2/turnierverwaltung/FXController.java   | 10 +++++++++-
 .../zhaw/projekt2/turnierverwaltung/Factory.java   |  2 +-
 .../participantFormularController.java             |  6 +++++-
 .../tournamentList/tournamentListController.java   | 14 +++++++++++++-
 4 files changed, 28 insertions(+), 4 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 babea73..2e51f0d 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
@@ -1,14 +1,18 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
+import javafx.scene.layout.Pane;
+
 public abstract class FXController {
     Tournament tournament;
     Factory factory;
     FileIO fileIO;
+    Pane pane;
 
-    public void setup(Tournament tournament, FileIO fileIO, Factory factory){
+    public void setup(Tournament tournament, FileIO fileIO, Factory factory, Pane pane){
         this.tournament = tournament;
         this.fileIO = fileIO;
         this.factory = factory;
+        this.pane = pane;
     }
 
     public abstract void loadContent();
@@ -24,4 +28,8 @@ public abstract class FXController {
     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 a272b0e..06ca006 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
@@ -50,7 +50,7 @@ public class Factory {
             FXMLLoader loader = new FXMLLoader(location);
             pane.setCenter(loader.load());
             controller = loader.getController();
-            controller.setup(tournament, fileIO, this);
+            controller.setup(tournament, fileIO, this, pane);
             controller.loadContent();
         } catch (IOException e) {
             e.printStackTrace();
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 6991216..08877c1 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
@@ -11,7 +11,7 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.VBox;
 
-public class participantFormularController extends FXController {
+public class ParticipantFormularController extends FXController {
 
     @FXML
     private Button addBtn;
@@ -76,4 +76,8 @@ public class participantFormularController extends FXController {
 
     }
 
+    @Override
+    public void loadContent() {
+
+    }
 }
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 cb9a548..37c5c7b 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,7 +1,9 @@
 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;
@@ -12,9 +14,11 @@ import javafx.scene.control.Button;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.GridPane;
 
 import java.io.File;
+import java.io.IOException;
 
 public class TournamentListController extends FXController {
 
@@ -52,7 +56,15 @@ public class TournamentListController extends FXController {
 
     @FXML
     void openTournament(ActionEvent event) {
-
+        try {
+            File tournamentFile = tournierListView.getSelectionModel().getSelectedItems().get(0);
+            getFactory().setTournament(getFileIO().loadTournament(tournamentFile));
+            getFactory().loadParticipantFormular((BorderPane) getPane());
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     @Override

From 71d13314f494f63dc9595f87b43c7aac6961793d Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sat, 30 Apr 2022 18:17:01 +0200
Subject: [PATCH 19/35] Solved Problems with Filenames
 ParticipantFormularController.java and TournamentListController.java

---
 ...FormularController.java => ParticipantFormularController.java} | 0
 ...ournamentListController.java => TournamentListController.java} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/{participantFormularController.java => ParticipantFormularController.java} (100%)
 rename app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/{tournamentListController.java => TournamentListController.java} (100%)

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
similarity index 100%
rename from app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/participantFormularController.java
rename to app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java
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
similarity index 100%
rename from app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentListController.java
rename to app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/TournamentListController.java

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 20/35] 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>

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 21/35] 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!`


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 22/35] 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());

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 23/35] 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];
         }
 
     }

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 24/35] 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" />

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 25/35] 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
+            }
         }
     }
 

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 26/35] 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

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 27/35] 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();
     }
 }
 

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 28/35] 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

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 29/35] 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);
         }
     }
 

From b09929da190d745f2c15efd03e8f6a141ebcd663 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 14:22:01 +0200
Subject: [PATCH 30/35] added Participant List to Tournament.java

---
 .../turnierverwaltung/Participant.java        |  1 +
 .../projekt2/turnierverwaltung/Player.java    |  6 +++
 .../zhaw/projekt2/turnierverwaltung/Team.java |  5 +++
 .../turnierverwaltung/Tournament.java         | 41 +++++++++++++++++++
 4 files changed, 53 insertions(+)

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 e48f3a1..31c2a39 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java
@@ -3,4 +3,5 @@ package ch.zhaw.projekt2.turnierverwaltung;
 public interface Participant {
     String getName();
     void setName(String name);
+    boolean equals(Participant participant);
 }
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 4273fd1..f922512 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java
@@ -18,4 +18,10 @@ public class Player extends Person implements Participant{
     public void setDateOfBirth(Date dateOfBirth) {
         this.dateOfBirth = dateOfBirth;
     }
+
+    @Override
+    public boolean equals(Participant participant) {
+        return getClass().equals(participant.getClass()) && getName().equals(participant.getName()) &&
+                getFirstName().equals(((Player) participant).getFirstName());
+    }
 }
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 880cc13..23ca660 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java
@@ -27,6 +27,11 @@ public class Team implements Participant {
         this.name = name;
     }
 
+    @Override
+    public boolean equals(Participant participant) {
+        return getClass().equals(participant.getClass()) && name.equals(participant.getName());
+    }
+
     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 e46f505..878985f 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -4,11 +4,14 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 public class Tournament implements Serializable {
     private String name;
     private Type type;
+    private List<Participant> participants;
 
 
 
@@ -21,6 +24,22 @@ public class Tournament implements Serializable {
 
         setName(name);
         setType(type);
+        participants = new ArrayList<>();
+    }
+
+    public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
+        for(Participant participant : participants){
+            if(participant.equals(newParticipant)){
+                throw new ParticipantExistsException("A Participant with the same Name exists already.");
+            }
+        }
+        participants.add(newParticipant);
+    }
+
+    public void removeParticipant(Participant participant) throws ParticipantNotExistsException {
+        if(!participants.contains(participant)){
+            throw new ParticipantNotExistsException("The given Participant is not part of this Tournament");
+        }
     }
 
     public String getName() {
@@ -82,5 +101,27 @@ public class Tournament implements Serializable {
 
     }
 
+    public class ParticipantExistsException extends Exception {
+        public ParticipantExistsException() {
+            super();
+        }
+
+        public ParticipantExistsException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    public class ParticipantNotExistsException extends Exception {
+        public ParticipantNotExistsException() {
+            super();
+        }
+
+        public ParticipantNotExistsException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
 
 }

From ff6f2bd94edc662015b0b09e820b0e696fedf2fa Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 15:18:30 +0200
Subject: [PATCH 31/35] created Methods to show and add Players.

---
 .../projekt2/turnierverwaltung/Factory.java   |  2 +-
 .../zhaw/projekt2/turnierverwaltung/Game.java |  4 ++-
 .../InvalidNameException.java                 | 12 +++++++++
 .../turnierverwaltung/Participant.java        |  4 ++-
 .../projekt2/turnierverwaltung/Person.java    | 25 +++++++++++++++++--
 .../projekt2/turnierverwaltung/Player.java    | 13 +++++-----
 .../turnierverwaltung/Tournament.java         | 20 ++++++---------
 .../TournamentDecorator.java                  | 20 ++++++++++++++-
 .../ParticipantFormularController.java        |  7 +++---
 .../turnierverwaltung/FileIOTest.java         |  2 +-
 10 files changed, 81 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/InvalidNameException.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 c05347b..e59d7d5 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
@@ -21,7 +21,7 @@ public class Factory {
     }
 
     public void setTournament(Tournament tournament) {
-        this.tournamentDecorator = tournamentDecorator;
+        this.tournamentDecorator.setTournament(tournament);
     }
 
     public BorderPane loadMainWindow(){
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 bab3390..3df9735 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
@@ -1,6 +1,8 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public class Game {
+import java.io.Serializable;
+
+public class Game implements Serializable {
     private Participant participant1, Participant2;
     private int points1, points2;
     private Location location;
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/InvalidNameException.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/InvalidNameException.java
new file mode 100644
index 0000000..d3be2ec
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/InvalidNameException.java
@@ -0,0 +1,12 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+public class InvalidNameException extends Exception {
+    public InvalidNameException() {
+        super();
+    }
+
+    public InvalidNameException(String errorMessage) {
+        super(errorMessage);
+    }
+
+}
\ No newline at end of file
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 31c2a39..6f85290 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java
@@ -1,6 +1,8 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public interface Participant {
+import java.io.Serializable;
+
+public interface Participant extends Serializable {
     String getName();
     void setName(String name);
     boolean equals(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 1165e7d..ec70ee9 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java
@@ -1,11 +1,20 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public class Person {
+import java.io.Serializable;
+
+public class Person implements Serializable {
     private String name;
     private String firstName;
     private String phoneNumber;
 
-    public Person(String firstName, String name, String phoneNumber){
+    public Person(String firstName, String name, String phoneNumber) throws InvalidNameException, InvalidPhoneNumberException {
+        if(!firstName.matches("^[a-zA-Z][a-zA-Z][-',.][a-zA-Z]{1,20}$")){
+            throw new InvalidNameException("The First name is Invalid.");
+        } else if(!name.matches("^[a-zA-Z][a-zA-Z][-',.][a-zA-Z]{1,20}$")){
+            throw new InvalidNameException("The Last name is Invalid");
+        } else if(!phoneNumber.matches("[\\+0-9]+")){
+            throw new InvalidPhoneNumberException("The entered Phone Number is invalid.");
+        }
         setFirstName(firstName);
         setName(name);
         setPhoneNumber(phoneNumber);
@@ -34,4 +43,16 @@ public class Person {
     public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
+
+    public class InvalidPhoneNumberException extends Exception {
+        public InvalidPhoneNumberException() {
+            super();
+        }
+
+        public InvalidPhoneNumberException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
 }
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 f922512..6f78215 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java
@@ -1,22 +1,23 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-import java.util.Date;
+import java.util.GregorianCalendar;
 
 public class Player extends Person implements Participant{
 
-    private Date dateOfBirth;
+    private GregorianCalendar dateOfBirth;
 
-    public Player(String firstName, String name, String phoneNumber, Date dateOfBirth){
+    public Player(String firstName, String name, String phoneNumber, String dateOfBirth) throws InvalidNameException, InvalidPhoneNumberException {
         super(firstName, name, phoneNumber);
         setDateOfBirth(dateOfBirth);
     }
 
-    public Date getDateOfBirth() {
+    public GregorianCalendar getDateOfBirth() {
         return dateOfBirth;
     }
 
-    public void setDateOfBirth(Date dateOfBirth) {
-        this.dateOfBirth = dateOfBirth;
+    public void setDateOfBirth(String dateOfBirth) {
+        String[] date = dateOfBirth.split("\\.");
+        this.dateOfBirth = new GregorianCalendar(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
     }
 
     @Override
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 878985f..d684b1f 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -3,6 +3,7 @@ package ch.zhaw.projekt2.turnierverwaltung;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17,7 +18,7 @@ public class Tournament implements Serializable {
 
     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.
+            throw new 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.
         }
@@ -42,6 +43,12 @@ public class Tournament implements Serializable {
         }
     }
 
+    public ObservableList<Participant> getParticipants() {
+        ObservableList<Participant> participantsObservable = FXCollections.observableArrayList();
+        participantsObservable.addAll(participants);
+        return participantsObservable;
+    }
+
     public String getName() {
         return name;
     }
@@ -79,17 +86,6 @@ public class Tournament implements Serializable {
         }
     }
 
-    public class InvalidNameException extends Exception {
-        public InvalidNameException() {
-            super();
-        }
-
-        public InvalidNameException(String errorMessage) {
-            super(errorMessage);
-        }
-
-    }
-
     public class InvalidTypeException extends Exception {
         public InvalidTypeException() {
             super();
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 a848a4a..b9a1f24 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
@@ -2,6 +2,7 @@ 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{
@@ -22,6 +23,10 @@ public class TournamentDecorator implements IsObservable{
         this.tournament = tournament;
     }
 
+    public Tournament getTournament() {
+        return tournament;
+    }
+
     @Override
     public void addListener(IsObserver observer) {
         listener.add(observer);
@@ -41,7 +46,7 @@ public class TournamentDecorator implements IsObservable{
             Tournament tournament = new Tournament(name, type);
             fileIO.saveTournament(tournament);
             informListener();
-        } catch (Tournament.InvalidNameException e) {
+        } catch (InvalidNameException e) {
             e.printStackTrace(); //TODO handle and logging
         } catch (Tournament.InvalidTypeException e) {
             e.printStackTrace(); //TODO handle and logging
@@ -59,6 +64,19 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
+    public void addPlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
+        try {
+            tournament.addParticipant(new Player(firstName, name, phoneNumber, dateOfBirth));
+            informListener();
+        } catch (Tournament.ParticipantExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (InvalidNameException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (Person.InvalidPhoneNumberException 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/participantAddFormular/ParticipantFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java
index 08877c1..a6e2c4f 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
@@ -1,6 +1,7 @@
 package ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.Participant;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -44,7 +45,7 @@ public class ParticipantFormularController extends FXController {
     private Label participantListTitle;
 
     @FXML
-    private ListView<?> participantListView;
+    private ListView<Participant> participantListView;
 
     @FXML
     private Label participantNameLabel;
@@ -63,7 +64,7 @@ public class ParticipantFormularController extends FXController {
 
     @FXML
     void addParticipant(ActionEvent event) {
-
+        getTournamentDecorator().addPlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText());
     }
 
     @FXML
@@ -78,6 +79,6 @@ public class ParticipantFormularController extends FXController {
 
     @Override
     public void loadContent() {
-
+        participantListView.setItems(getTournamentDecorator().getTournament().getParticipants());
     }
 }
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 c8b8060..09eeef6 100644
--- a/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
+++ b/app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java
@@ -108,7 +108,7 @@ class FileIOTest {
         }
 
         @Test
-        void saveTournament() throws IOException, Tournament.InvalidNameException, Tournament.InvalidTypeException {
+        void saveTournament() throws IOException, InvalidNameException, Tournament.InvalidTypeException {
             Tournament tournament = null;
             tournament = new Tournament("test1", Tournament.Type.KO);
             io.saveTournament(tournament);

From 4cb743a21aef931f31c35b4c5821f85ed7e41dc0 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 17:00:09 +0200
Subject: [PATCH 32/35] implemented functionality to save participants also in
 file.

---
 .../projekt2/turnierverwaltung/Factory.java   |  1 +
 .../projekt2/turnierverwaltung/Person.java    | 14 ++++++++++---
 .../projekt2/turnierverwaltung/Player.java    |  3 +--
 .../zhaw/projekt2/turnierverwaltung/Team.java |  7 ++++++-
 .../TournamentDecorator.java                  | 20 ++++++++++++++++---
 .../turnierverwaltung/main/MainWindow.java    |  2 +-
 6 files changed, 37 insertions(+), 10 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 e59d7d5..7b329f4 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
@@ -36,6 +36,7 @@ public class Factory {
     }
 
     public void loadTournamentList(BorderPane pane, FactoryDecorator factoryDecorator){
+        tournamentDecorator.setTournament(null);
         TournamentListController controller = (TournamentListController) setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"), factoryDecorator);
     }
 
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 ec70ee9..9cf624f 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java
@@ -3,16 +3,19 @@ package ch.zhaw.projekt2.turnierverwaltung;
 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 String name;
     private String firstName;
     private String phoneNumber;
 
     public Person(String firstName, String name, String phoneNumber) throws InvalidNameException, InvalidPhoneNumberException {
-        if(!firstName.matches("^[a-zA-Z][a-zA-Z][-',.][a-zA-Z]{1,20}$")){
+        if(!firstName.matches(NAME_MATCHING_REGEX)){
             throw new InvalidNameException("The First name is Invalid.");
-        } else if(!name.matches("^[a-zA-Z][a-zA-Z][-',.][a-zA-Z]{1,20}$")){
+        } else if(!name.matches(NAME_MATCHING_REGEX)){
             throw new InvalidNameException("The Last name is Invalid");
-        } else if(!phoneNumber.matches("[\\+0-9]+")){
+        } else if(!phoneNumber.matches(PHONE_MATCHING_REGEX)){
             throw new InvalidPhoneNumberException("The entered Phone Number is invalid.");
         }
         setFirstName(firstName);
@@ -55,4 +58,9 @@ public class Person implements Serializable {
 
     }
 
+    @Override
+    public String toString(){
+        return firstName + " " + name;
+    }
+
 }
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 6f78215..e1573a9 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java
@@ -22,7 +22,6 @@ public class Player extends Person implements Participant{
 
     @Override
     public boolean equals(Participant participant) {
-        return getClass().equals(participant.getClass()) && getName().equals(participant.getName()) &&
-                getFirstName().equals(((Player) participant).getFirstName());
+        return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
     }
 }
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 23ca660..e815a16 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java
@@ -29,7 +29,7 @@ public class Team implements Participant {
 
     @Override
     public boolean equals(Participant participant) {
-        return getClass().equals(participant.getClass()) && name.equals(participant.getName());
+        return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
     }
 
     public Person getContactPerson() {
@@ -39,4 +39,9 @@ public class Team implements Participant {
     public void setContactPerson(Person contactPerson) {
         this.contactPerson = contactPerson;
     }
+
+    @Override
+    public String toString(){
+        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 b9a1f24..47708ca 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
@@ -10,9 +10,16 @@ public class TournamentDecorator implements IsObservable{
     private FileIO fileIO;
     private List<IsObserver> listener = new ArrayList<>();
 
-    public TournamentDecorator(FileIO fileIO, Tournament tournament){
-        setTournament(tournament);
+    public TournamentDecorator(FileIO fileIO){
         setFileIO(fileIO);
+        addListener(new IsObserver() {
+            @Override
+            public void update() {
+                if(tournament != null){
+                    saveTournament();
+                }
+            }
+        });
     }
 
     public void setFileIO(FileIO fileIO) {
@@ -37,6 +44,14 @@ public class TournamentDecorator implements IsObservable{
         listener.remove(observer);
     }
 
+    public void saveTournament(){
+        try {
+            fileIO.saveTournament(tournament);
+        } catch (IOException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
     public void createTournament(String name, Tournament.Type type){
         if(fileIO.tournamentExists(name)){
             System.out.println("Tournament with same name exists already.");
@@ -77,7 +92,6 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
-
     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 14348bd..290b1e6 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
@@ -16,7 +16,7 @@ import java.io.IOException;
 
 public class MainWindow extends Application {
     private FileIO fileIO = new FileIO(System.getProperty("user.dir") + "/tournierverwaltung_angrynerds");
-    private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO, null);
+    private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO);
     private Factory factory = new Factory(fileIO, tournamentDecorator); //TODO make it private!
     private FactoryDecorator factoryDecorator;
 

From 90fa3a9183b7061505b3709c661b931132ed5902 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 18:06:25 +0200
Subject: [PATCH 33/35] changed position of button.

---
 .../tournamentList/tournamentList.fxml               | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 24c2e89..40bffeb 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,13 +22,19 @@
                         <Insets />
                     </VBox.margin>
                 </ListView>
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0">
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.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" />
+                      <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournament" text="Öffnen">
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin></Button>
+                  <Button fx:id="deleteBtn" layoutX="138.0" layoutY="28.0" mnemonicParsing="false" onAction="#deleteTournament" text="Löschen">
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin></Button>
                </children>
             </HBox>
             </children>

From 0db169a77102b6bc3b398195eb139f72cc39677d Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Sun, 1 May 2022 20:26:33 +0200
Subject: [PATCH 34/35] Added GameSchedule View

when open tournament GameSchedule.fxml gets loaded
---
 .../projekt2/turnierverwaltung/Factory.java   |  8 ++
 .../turnierverwaltung/FactoryDecorator.java   |  9 +-
 .../projekt2/turnierverwaltung/FileIO.java    |  2 +-
 .../main/gameScheduleView/GameController.java | 16 ++++
 .../GameScheduleController.java               | 24 +++++
 .../PlacesFormularController.java             | 66 ++++++++++++++
 .../gameScheduleView/Game.fxml                | 46 ++++++++++
 .../gameScheduleView/GameSchedule.fxml        | 26 ++++++
 .../participantFormular.fxml                  |  8 +-
 .../placesAddFormular/PlacesFormular.fxml     | 90 +++++++++++++++++++
 10 files changed, 287 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
 create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
 create mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
 create mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
 create mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml

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 7b329f4..c89ff8a 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
@@ -46,6 +46,14 @@ public class Factory {
         setCenterOfBorderPane(pane, getClass().getResource("participantAddFormular/participantFormular.fxml"), factoryDecorator);
     }
 
+    public void loadPlacesFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
+        setCenterOfBorderPane(pane, getClass().getResource("placesAddFormular/PlacesFormular.fxml"), factoryDecorator);
+    }
+
+    public void loadGameScheduler(BorderPane pane, FactoryDecorator factoryDecorator) {
+        setCenterOfBorderPane(pane, getClass().getResource("gameScheduleView/GameSchedule.fxml"), factoryDecorator);
+    }
+
     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 6278f10..9364f64 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -44,7 +44,7 @@ public class FactoryDecorator implements IsObservable{
     public void openTournament(FileIO.TournamentFile tournamentFile){
         try {
             factory.setTournament(fileIO.loadTournament(tournamentFile));
-            factory.loadParticipantFormular((BorderPane) pane, this); //TODO load TournamentView instead of ParticipantFormular?
+            factory.loadGameScheduler((BorderPane) pane, this);
             informListener();
         } catch (IOException e) {
             e.printStackTrace();
@@ -53,6 +53,13 @@ public class FactoryDecorator implements IsObservable{
         } //TODO handle and logging
     }
 
+    public void openParticipantFormular() {
+        factory.loadParticipantFormular((BorderPane) pane, this);
+    }
+
+    public void openPlacesFormular() {
+        factory.loadPlacesFormular((BorderPane) pane, this);
+    }
 
     public void informListener() {
         for(IsObserver observer : listener) {
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 98b6d8b..f708a77 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
@@ -107,7 +107,7 @@ public class FileIO {
         ObjectOutputStream out = null;
 
         try {
-            newSave.createNewFile();
+            boolean newFile = newSave.createNewFile();
             out = new ObjectOutputStream(new FileOutputStream(newSave));
             out.writeObject(tournament);
             System.out.println("Save File" + tournament.getName() + ".txt being saved to " + saves.getAbsolutePath());
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
new file mode 100644
index 0000000..836c784
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
@@ -0,0 +1,16 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.fxml.FXML;
+import javafx.scene.control.ChoiceBox;
+
+public class GameController extends FXController {
+
+    @FXML
+    private ChoiceBox<?> placesChoiceBox;
+
+    @Override
+    public void loadContent() {
+
+    }
+}
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
new file mode 100644
index 0000000..ab82179
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
@@ -0,0 +1,24 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+public class GameScheduleController extends FXController {
+
+    @FXML
+    void openPlacesFormular(ActionEvent event) {
+        getFactoryDecorator().openPlacesFormular();
+    }
+
+    @FXML
+    void openParticipantFormular(ActionEvent event) {
+        getFactoryDecorator().openParticipantFormular();
+    }
+
+    @Override
+    public void loadContent() {
+
+    }
+}
+
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
new file mode 100644
index 0000000..5edac10
--- /dev/null
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
@@ -0,0 +1,66 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TextField;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.GridPane;
+
+public class PlacesFormularController extends FXController {
+
+    @FXML
+    private Label AddListTitle;
+
+    @FXML
+    private Button closeBtn;
+
+    @FXML
+    private Button deleteBtn;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private ListView<?> locationListView;
+
+    @FXML
+    private Label locationNameLabel;
+
+    @FXML
+    private TextField locationNameTextField;
+
+    @FXML
+    private Label newLocationFormularTitle;
+
+    @FXML
+    private Button saveBtn;
+
+    @FXML
+    void changedSelection(MouseEvent event) {
+
+    }
+
+    @FXML
+    void closeFormular(ActionEvent event) {
+
+    }
+
+    @FXML
+    void deleteSelectedPlace(ActionEvent event) {
+
+    }
+
+    @FXML
+    void saveLocation(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
new file mode 100644
index 0000000..83fcb91
--- /dev/null
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+
+<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="150.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GameContoller">
+   <children>
+      <Label fx:id="teamNameOne" text="Team One" />
+      <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="teamNameTwo" text="Team Two" />
+      <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+         <children>
+            <Label text="Points">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Label>
+            <TextField fx:id="pointsTeamTwo" prefHeight="25.0" prefWidth="50.0" />
+         </children>
+      </HBox>
+      <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+         <children>
+            <Label text="Ort">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Label>
+            <ChoiceBox fx:id="placesChoiceBox" prefWidth="150.0" />
+         </children>
+      </HBox>
+   </children>
+</VBox>
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
new file mode 100644
index 0000000..cd88c6a
--- /dev/null
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
@@ -0,0 +1,26 @@
+<?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?>
+
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameScheduleController">
+   <top>
+      <HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+         <children>
+            <Button mnemonicParsing="false" onAction="#openParticipantFormular" text="Teilnehmer bearbeiten">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Button>
+            <Button mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten">
+               <HBox.margin>
+                  <Insets right="40.0" />
+               </HBox.margin>
+            </Button>
+         </children>
+      </HBox>
+   </top>
+</BorderPane>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
index caa919e..0de5bb7 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
@@ -4,12 +4,8 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TextField?>
-
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
@@ -17,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular.ParticipantFormularController">
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/17" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular.ParticipantFormularController">
    <children>
       <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
@@ -36,7 +32,7 @@
             </ListView>
             <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                <children>
-                  <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Save">
+                  <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Speichern">
                      <HBox.margin>
                         <Insets right="40.0" />
                      </HBox.margin>
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml
new file mode 100644
index 0000000..a0f3acf
--- /dev/null
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="404.0" prefWidth="635.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular.PlacesFormularController">
+   <children>
+      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0">
+         <children>
+            <Label fx:id="AddListTitle" text="Hinzugefügt">
+               <font>
+                  <Font name="System Bold" size="21.0" />
+               </font>
+               <VBox.margin>
+                  <Insets bottom="20.0" />
+               </VBox.margin>
+            </Label>
+            <ListView fx:id="locationListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets left="10.0" right="10.0" />
+               </VBox.margin>
+               <opaqueInsets>
+                  <Insets />
+               </opaqueInsets>
+            </ListView>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+               <children>
+                  <Button fx:id="closeBtn" mnemonicParsing="false" onAction="#closeFormular" text="Schliessen">
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin>
+                  </Button>
+                  <Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#deleteSelectedPlace" text="Löschen" />
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+      <Separator orientation="VERTICAL" prefHeight="200.0" />
+      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0">
+         <children>
+            <Label fx:id="newLocationFormularTitle" text="Austragungsort bearbeiten/erstellen">
+               <font>
+                  <Font name="System Bold" size="21.0" />
+               </font>
+               <VBox.margin>
+                  <Insets bottom="40.0" />
+               </VBox.margin>
+            </Label>
+            <Separator prefWidth="200.0" />
+            <GridPane fx:id="grid" prefHeight="200.0">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <Label fx:id="locationNameLabel" styleClass="lableGrid" text="Austragungsort">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <TextField fx:id="locationNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </TextField>
+               </children>
+            </GridPane>
+            <Separator prefWidth="200.0" />
+            <Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#saveLocation" text="Speichern" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets bottom="10.0" top="30.0" />
+               </VBox.margin>
+            </Button>
+         </children>
+      </VBox>
+   </children>
+</HBox>

From 0d482bfcac7170e3cff52266599d903a7f7eb124 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 21:26:32 +0200
Subject: [PATCH 35/35] implemented Functionality to save, edit and delete
 participants.

---
 .../projekt2/turnierverwaltung/Player.java    | 21 ++++++++---
 .../turnierverwaltung/Tournament.java         |  3 +-
 .../TournamentDecorator.java                  | 11 +++++-
 .../ParticipantFormularController.java        | 30 +++++++++++++---
 .../participantFormular.fxml                  | 36 ++++++++-----------
 5 files changed, 69 insertions(+), 32 deletions(-)

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 e1573a9..3165364 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java
@@ -1,23 +1,36 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-import java.util.GregorianCalendar;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 public class Player extends Person implements Participant{
 
-    private GregorianCalendar dateOfBirth;
+    private LocalDate dateOfBirth;
 
     public Player(String firstName, String name, String phoneNumber, String dateOfBirth) throws InvalidNameException, InvalidPhoneNumberException {
         super(firstName, name, phoneNumber);
         setDateOfBirth(dateOfBirth);
     }
 
-    public GregorianCalendar getDateOfBirth() {
+    public LocalDate getDateOfBirth() {
         return dateOfBirth;
     }
 
+    public String getFormatedDateOfBirth(){
+        try{
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy");
+            return dateOfBirth.format(formatter);
+        } catch (Exception e) {
+           //todo handle and logging
+            return "";
+        }
+    }
+
     public void setDateOfBirth(String dateOfBirth) {
         String[] date = dateOfBirth.split("\\.");
-        this.dateOfBirth = new GregorianCalendar(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
+        this.dateOfBirth = LocalDate.of(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
     }
 
     @Override
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 d684b1f..744ba05 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -31,7 +31,7 @@ public class Tournament implements Serializable {
     public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
         for(Participant participant : participants){
             if(participant.equals(newParticipant)){
-                throw new ParticipantExistsException("A Participant with the same Name exists already.");
+                participants.remove(participant);
             }
         }
         participants.add(newParticipant);
@@ -41,6 +41,7 @@ public class Tournament implements Serializable {
         if(!participants.contains(participant)){
             throw new ParticipantNotExistsException("The given Participant is not part of this Tournament");
         }
+        participants.remove(participant);
     }
 
     public ObservableList<Participant> getParticipants() {
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 47708ca..d284219 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
@@ -79,7 +79,7 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
-    public void addPlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
+    public void savePlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
         try {
             tournament.addParticipant(new Player(firstName, name, phoneNumber, dateOfBirth));
             informListener();
@@ -92,6 +92,15 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
+    public void deleteParticipant(Participant participant){
+        try {
+            tournament.removeParticipant(participant);
+            informListener();
+        } catch (Tournament.ParticipantNotExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
     public void informListener() {
         for(IsObserver observer : listener) {
             observer.update();
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 a6e2c4f..521334f 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
@@ -2,6 +2,7 @@ package ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
 import ch.zhaw.projekt2.turnierverwaltung.Participant;
+import ch.zhaw.projekt2.turnierverwaltung.Player;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -39,7 +40,11 @@ public class ParticipantFormularController extends FXController {
     private Label newParticipantFormularTitle;
 
     @FXML
-    private Button openBtn;
+    private Button closeBtn;
+
+    @FXML
+    private Button deleteBtn;
+
 
     @FXML
     private Label participantListTitle;
@@ -63,8 +68,12 @@ public class ParticipantFormularController extends FXController {
     private Button saveBtn;
 
     @FXML
-    void addParticipant(ActionEvent event) {
-        getTournamentDecorator().addPlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText());
+    void changedSelection(MouseEvent event){
+        Player participant = (Player) participantListView.getSelectionModel().getSelectedItems().get(0);
+        participantNameTextField.setText(participant.getName());
+        firstNameTextField.setText(participant.getFirstName());
+        phoneNumberTextField.setText(participant.getPhoneNumber());
+        birthDateTextField.setText(participant.getFormatedDateOfBirth());
     }
 
     @FXML
@@ -73,7 +82,20 @@ public class ParticipantFormularController extends FXController {
     }
 
     @FXML
-    void save(ActionEvent event) {
+    void saveParticipant(ActionEvent event) {
+        getTournamentDecorator().savePlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText());
+    }
+
+
+    @FXML
+    void delete(ActionEvent event) {
+        System.out.println("delete");
+        Participant participant = participantListView.getSelectionModel().getSelectedItems().get(0);
+        getTournamentDecorator().deleteParticipant(participant);
+    }
+
+    @FXML
+    void close(ActionEvent event) {
 
     }
 
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
index caa919e..c925573 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
@@ -1,23 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.TextField?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-
-<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular.ParticipantFormularController">
+<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.participantAddFormular.ParticipantFormularController">
    <children>
       <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
@@ -29,19 +17,23 @@
                   <Insets bottom="20.0" />
                </VBox.margin>
             </Label>
-            <ListView fx:id="participantListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+            <ListView fx:id="participantListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                <VBox.margin>
                   <Insets />
                </VBox.margin>
             </ListView>
             <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                <children>
-                  <Button fx:id="saveBtn" mnemonicParsing="false" onAction="#save" text="Save">
+                  <Button fx:id="closeBtn" mnemonicParsing="false" onAction="#close" text="Schliessen">
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin>
+                  </Button>
+                  <Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#delete" text="Löschen">
                      <HBox.margin>
                         <Insets right="40.0" />
                      </HBox.margin>
                   </Button>
-                  <Button fx:id="openBtn" mnemonicParsing="false" text="Bearbeiten" />
                </children>
             </HBox>
          </children>
@@ -56,7 +48,7 @@
       </Separator>
       <VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
-            <Label fx:id="newParticipantFormularTitle" text="Neuer Teilnehmer">
+            <Label fx:id="newParticipantFormularTitle" text="Teilnehmer ändern/erstellen">
                <font>
                   <Font name="System Bold" size="21.0" />
                </font>
@@ -100,7 +92,7 @@
                </children>
             </GridPane>
             <Separator prefWidth="200.0" />
-            <Button fx:id="addBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#addParticipant" text="Erstellen" VBox.vgrow="ALWAYS">
+            <Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#saveParticipant" text="Speichern" VBox.vgrow="ALWAYS">
                <VBox.margin>
                   <Insets bottom="10.0" top="30.0" />
                </VBox.margin>