Merge branch 'creation_of_simple_classes' into FileIO
# Conflicts: # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
This commit is contained in:
commit
4b658b9ed9
|
@ -1,10 +1,21 @@
|
|||
package ch.zhaw.projekt2.turnierverwaltung;
|
||||
|
||||
public class Player extends Person{
|
||||
import java.util.Date;
|
||||
|
||||
public class Player extends Person implements Participant{
|
||||
|
||||
public Player(String firstName, String name, String phoneNumber){
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@ package ch.zhaw.projekt2.turnierverwaltung;
|
|||
|
||||
import java.io.Serializable;
|
||||
|
||||
public abstract class Tournament implements Serializable {
|
||||
public class Tournament implements Serializable {
|
||||
private String name;
|
||||
|
||||
public Tournament(String name){
|
||||
|
|
Loading…
Reference in New Issue