diff --git a/.gitignore b/.gitignore index a1c2a23..47af25b 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,9 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* + +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock deleted file mode 100644 index c0e1e0c..0000000 Binary files a/.gradle/7.4/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/7.4/checksums/md5-checksums.bin b/.gradle/7.4/checksums/md5-checksums.bin deleted file mode 100644 index 2df228d..0000000 Binary files a/.gradle/7.4/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/7.4/checksums/sha1-checksums.bin b/.gradle/7.4/checksums/sha1-checksums.bin deleted file mode 100644 index 1bc5c79..0000000 Binary files a/.gradle/7.4/checksums/sha1-checksums.bin and /dev/null differ 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 5a44c73..0000000 Binary files a/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock and /dev/null differ 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 f76dd23..0000000 Binary files a/.gradle/7.4/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock deleted file mode 100644 index 00ae177..0000000 Binary files a/.gradle/7.4/fileHashes/fileHashes.lock and /dev/null differ 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 0041aac..0000000 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ 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 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 @@ - - - - - - \ 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 @@ - - - - - - \ 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 @@ - - - - - - - - - - - \ 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 @@ - - - - - - \ 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 @@ - - - - - \ 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 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java new file mode 100644 index 0000000..bab3390 --- /dev/null +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java @@ -0,0 +1,47 @@ +package ch.zhaw.projekt2.turnierverwaltung; + +public class Game { + private Participant participant1, Participant2; + private int points1, points2; + private Location location; + + public Location getLocation() { + return location; + } + + public void setLocation(Location location) { + this.location = location; + } + + public int getPoints1() { + return points1; + } + + public void setPoints1(int points1) { + this.points1 = points1; + } + + public int getPoints2() { + return points2; + } + + public void setPoints2(int points2) { + this.points2 = points2; + } + + public Participant getParticipant1() { + return participant1; + } + + public void setParticipant1(Participant participant1) { + this.participant1 = participant1; + } + + public Participant getParticipant2() { + return Participant2; + } + + public void setParticipant2(Participant participant2) { + Participant2 = participant2; + } +} diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Location.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Location.java new file mode 100644 index 0000000..448ae67 --- /dev/null +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Location.java @@ -0,0 +1,17 @@ +package ch.zhaw.projekt2.turnierverwaltung; + +public class Location { + private String name; + + public Location(String name){ + setName(name); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java new file mode 100644 index 0000000..e48f3a1 --- /dev/null +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java @@ -0,0 +1,6 @@ +package ch.zhaw.projekt2.turnierverwaltung; + +public interface Participant { + String getName(); + void setName(String name); +} diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java new file mode 100644 index 0000000..1165e7d --- /dev/null +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java @@ -0,0 +1,37 @@ +package ch.zhaw.projekt2.turnierverwaltung; + +public class Person { + private String name; + private String firstName; + private String phoneNumber; + + public Person(String firstName, String name, String phoneNumber){ + setFirstName(firstName); + setName(name); + setPhoneNumber(phoneNumber); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } +} diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java new file mode 100644 index 0000000..4273fd1 --- /dev/null +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java @@ -0,0 +1,21 @@ +package ch.zhaw.projekt2.turnierverwaltung; + +import java.util.Date; + +public class Player extends Person implements Participant{ + + private Date dateOfBirth; + + public Player(String firstName, String name, String phoneNumber, Date dateOfBirth){ + super(firstName, name, phoneNumber); + setDateOfBirth(dateOfBirth); + } + + public Date getDateOfBirth() { + return dateOfBirth; + } + + public void setDateOfBirth(Date dateOfBirth) { + this.dateOfBirth = dateOfBirth; + } +} diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java new file mode 100644 index 0000000..880cc13 --- /dev/null +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java @@ -0,0 +1,37 @@ +package ch.zhaw.projekt2.turnierverwaltung; + +import java.util.ArrayList; +import java.util.List; + +public class Team implements Participant { + private String name; + private List players; + private Person contactPerson; + + public Team(String name){ + setName(name); + players = new ArrayList<>(); + } + + public void addPlayer(Player player){ + players.add(player); + } + + @Override + public String getName() { + return name; + } + + @Override + public void setName(String name) { + this.name = name; + } + + public Person getContactPerson() { + return contactPerson; + } + + public void setContactPerson(Person contactPerson) { + this.contactPerson = 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 new file mode 100644 index 0000000..5845a12 --- /dev/null +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java @@ -0,0 +1,17 @@ +package ch.zhaw.projekt2.turnierverwaltung; + +public class Tournament { + private String name; + + public Tournament(String name){ + setName(name); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +}