diff --git a/Lab2/src/main/java/org/lumijiez/base/Faculty.java b/Lab2/src/main/java/org/lumijiez/base/Faculty.java index cb53228..64152f1 100644 --- a/Lab2/src/main/java/org/lumijiez/base/Faculty.java +++ b/Lab2/src/main/java/org/lumijiez/base/Faculty.java @@ -16,17 +16,7 @@ public class Faculty implements Serializable { this.name = name; this.abbreviation = abbreviation; this.field = field; -// this.uuid = UUID.randomUUID().toString(); } -// private String uuid; - -// public String getUuid() { -// return uuid; -// } -// -// public void setUuid(String uuid) { -// this.uuid = uuid; -// } public void addGroup(Group group) { groups.add(group); diff --git a/Lab2/src/main/java/org/lumijiez/base/Group.java b/Lab2/src/main/java/org/lumijiez/base/Group.java index 50c4de1..8502317 100644 --- a/Lab2/src/main/java/org/lumijiez/base/Group.java +++ b/Lab2/src/main/java/org/lumijiez/base/Group.java @@ -8,12 +8,10 @@ public class Group implements Serializable { private final List students = new ArrayList<>(); private String name; - // private String uuid; private Faculty faculty; public Group(String name) { this.name = name; -// this.uuid = UUID.randomUUID().toString(); } public Faculty getFaculty() { @@ -49,11 +47,4 @@ public class Group implements Serializable { return name; } -// public String getUuid() { -// return uuid; -// } -// -// public void setUuid(String uuid) { -// this.uuid = uuid; -// } } diff --git a/Lab2/src/main/java/org/lumijiez/base/Student.java b/Lab2/src/main/java/org/lumijiez/base/Student.java index adeb4a4..63d5275 100644 --- a/Lab2/src/main/java/org/lumijiez/base/Student.java +++ b/Lab2/src/main/java/org/lumijiez/base/Student.java @@ -26,8 +26,6 @@ public class Student implements Serializable { private Group group; -// private String uuid; - public Student(String name, String surname, String email, Group group, Faculty faculty, Date birth, Date enrol) { this.name = name; this.surname = surname; @@ -37,7 +35,6 @@ public class Student implements Serializable { this.faculty = faculty; this.dateOfBirth = birth; this.enrollmentDate = enrol; -// this.uuid = UUID.randomUUID().toString(); } public Faculty getFaculty() {