From d85f9a61320be683acc5fe0cf568a9ee1927ca0e Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 30 Sep 2023 00:14:07 +0300 Subject: [PATCH] Tiny code clean-ups --- .../main/java/org/lumijiez/base/Faculty.java | 5 +--- .../main/java/org/lumijiez/base/Grade.java | 1 + .../lumijiez/gui/StudentManagementGUI.java | 4 --- .../gui/forms/faculty/EditFacultyForm.java | 8 ++---- .../gui/forms/faculty/RemoveFacultyForm.java | 7 +---- .../gui/forms/faculty/ShowFacultyForm.java | 6 +---- .../gui/forms/group/AddGroupForm.java | 6 +---- .../gui/forms/group/DeleteGroupForm.java | 5 ---- .../gui/forms/group/EditGroupForm.java | 7 +---- .../gui/forms/group/ShowGroupForm.java | 7 +---- .../gui/forms/student/AddStudentForm.java | 6 +---- .../gui/forms/student/DeleteStudentForm.java | 8 ++---- .../gui/forms/student/EditStudentForm.java | 4 --- .../gui/forms/student/GradeStudentForm.java | 4 --- .../forms/student/GraduateStudentForm.java | 5 ---- .../gui/forms/student/ShowStudentForm.java | 4 --- .../forms/student/ShowStudentGradesForm.java | 4 --- .../org/lumijiez/gui/util/FilePicker.java | 26 +++++++++---------- 18 files changed, 25 insertions(+), 92 deletions(-) diff --git a/Lab2/src/main/java/org/lumijiez/base/Faculty.java b/Lab2/src/main/java/org/lumijiez/base/Faculty.java index b428b4d..f8ee14a 100644 --- a/Lab2/src/main/java/org/lumijiez/base/Faculty.java +++ b/Lab2/src/main/java/org/lumijiez/base/Faculty.java @@ -15,11 +15,8 @@ public class Faculty implements Serializable { } private String name; - private String abbreviation; - - private List groups = new ArrayList<>(); - + private final List groups = new ArrayList<>(); private StudyField field; public void addGroup(Group group) { diff --git a/Lab2/src/main/java/org/lumijiez/base/Grade.java b/Lab2/src/main/java/org/lumijiez/base/Grade.java index 3ffa4fc..4d4896a 100644 --- a/Lab2/src/main/java/org/lumijiez/base/Grade.java +++ b/Lab2/src/main/java/org/lumijiez/base/Grade.java @@ -6,6 +6,7 @@ import java.io.Serializable; public class Grade implements Serializable { private final Subjects subject; + private final int grade; public Grade(Subjects subject, int grade) { diff --git a/Lab2/src/main/java/org/lumijiez/gui/StudentManagementGUI.java b/Lab2/src/main/java/org/lumijiez/gui/StudentManagementGUI.java index d15c549..ae01f19 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/StudentManagementGUI.java +++ b/Lab2/src/main/java/org/lumijiez/gui/StudentManagementGUI.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui; import org.lumijiez.data.DataDeserializer; diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/EditFacultyForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/EditFacultyForm.java index c97ca1f..d6758e4 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/EditFacultyForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/EditFacultyForm.java @@ -1,12 +1,7 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.faculty; import org.lumijiez.base.Faculty; import org.lumijiez.enums.StudyField; -import org.lumijiez.gui.StudentManagementGUI; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayerManager; import org.lumijiez.managers.Supervisor; @@ -40,7 +35,8 @@ public class EditFacultyForm extends JFrame { setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); // NOI18N + titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); + titleLabel.setText("Edit a faculty"); submitButton.setText("Submit"); cancelButton.setText("Cancel"); diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/RemoveFacultyForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/RemoveFacultyForm.java index 173269b..a21d993 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/RemoveFacultyForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/RemoveFacultyForm.java @@ -1,11 +1,6 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.faculty; import org.lumijiez.base.Faculty; -import org.lumijiez.gui.StudentManagementGUI; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayerManager; import org.lumijiez.managers.Supervisor; @@ -34,7 +29,7 @@ public class RemoveFacultyForm extends JFrame { setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); // NOI18N + titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); titleLabel.setText("Remove a faculty"); submitButton.setText("Submit"); diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/ShowFacultyForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/ShowFacultyForm.java index af9ea06..4959a98 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/ShowFacultyForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/ShowFacultyForm.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.faculty; import org.lumijiez.base.Faculty; @@ -33,7 +29,7 @@ public class ShowFacultyForm extends JFrame { setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); // NOI18N + titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); titleLabel.setText("Show a faculty"); submitButton.setText("Submit"); diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/group/AddGroupForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/group/AddGroupForm.java index 8400a56..cde5435 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/group/AddGroupForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/group/AddGroupForm.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.group; import org.lumijiez.base.Faculty; @@ -36,7 +32,7 @@ public class AddGroupForm extends JFrame { setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); // NOI18N + titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); titleLabel.setText("Add a new group"); nameField.setText("Name..."); diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/group/DeleteGroupForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/group/DeleteGroupForm.java index 32209ee..ed45eea 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/group/DeleteGroupForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/group/DeleteGroupForm.java @@ -1,11 +1,6 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.group; import org.lumijiez.base.Group; -import org.lumijiez.gui.StudentManagementGUI; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayerManager; import org.lumijiez.managers.Supervisor; diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/group/EditGroupForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/group/EditGroupForm.java index bfd6694..efba322 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/group/EditGroupForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/group/EditGroupForm.java @@ -1,12 +1,7 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.group; import org.lumijiez.base.Faculty; import org.lumijiez.base.Group; -import org.lumijiez.gui.StudentManagementGUI; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayerManager; import org.lumijiez.managers.Supervisor; @@ -40,7 +35,7 @@ public class EditGroupForm extends JFrame { setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); // NOI18N + titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); titleLabel.setText("Edit a group"); nameField.setText("Name..."); diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/group/ShowGroupForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/group/ShowGroupForm.java index 29dbf90..e6e13af 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/group/ShowGroupForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/group/ShowGroupForm.java @@ -1,10 +1,5 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.group; -import org.lumijiez.base.Faculty; import org.lumijiez.base.Group; import org.lumijiez.base.Student; import org.lumijiez.gui.util.ComponentDecorator; @@ -35,7 +30,7 @@ public class ShowGroupForm extends JFrame { setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); // NOI18N + titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); titleLabel.setText("Show a group"); groupLabel.setText("Group:"); cancelButton.setText("Cancel"); diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/student/AddStudentForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/student/AddStudentForm.java index 97d9bfd..2d516ad 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/student/AddStudentForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/student/AddStudentForm.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.student; import org.lumijiez.base.Faculty; @@ -83,7 +79,7 @@ public class AddStudentForm extends JFrame { setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); // NOI18N + titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); titleLabel.setText("Add a new student"); submitButton.setText("Submit"); diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/student/DeleteStudentForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/student/DeleteStudentForm.java index 2985cbe..90c4842 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/student/DeleteStudentForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/student/DeleteStudentForm.java @@ -1,17 +1,13 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.student; import org.lumijiez.base.Student; -import org.lumijiez.gui.StudentManagementGUI; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayerManager; import org.lumijiez.managers.Supervisor; import org.lumijiez.gui.util.ComboBoxRenderers; import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.util.Objects; @@ -33,7 +29,7 @@ public class DeleteStudentForm extends JFrame { setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - titleLabel.setFont(new java.awt.Font("sansserif", 0, 18)); // NOI18N + titleLabel.setFont(new java.awt.Font("sansserif", Font.PLAIN, 18)); titleLabel.setText("Delete Student"); ComboBoxRenderers.setStudentRenderer(studentCombo); diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/student/EditStudentForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/student/EditStudentForm.java index fd9e813..08ea8a6 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/student/EditStudentForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/student/EditStudentForm.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.student; import org.lumijiez.base.Faculty; diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/student/GradeStudentForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/student/GradeStudentForm.java index fc43fca..300db35 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/student/GradeStudentForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/student/GradeStudentForm.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.student; import org.lumijiez.base.Grade; diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/student/GraduateStudentForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/student/GraduateStudentForm.java index 29ef43f..c2a0a9c 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/student/GraduateStudentForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/student/GraduateStudentForm.java @@ -1,11 +1,6 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.student; import org.lumijiez.base.Student; -import org.lumijiez.gui.StudentManagementGUI; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayerManager; import org.lumijiez.managers.Supervisor; diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/student/ShowStudentForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/student/ShowStudentForm.java index bf29af9..e5e1d80 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/student/ShowStudentForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/student/ShowStudentForm.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.student; import org.lumijiez.base.Student; diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/student/ShowStudentGradesForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/student/ShowStudentGradesForm.java index f9d064c..3ddb37b 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/student/ShowStudentGradesForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/student/ShowStudentGradesForm.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/GUIForms/JFrame.java to edit this template - */ package org.lumijiez.gui.forms.student; import org.lumijiez.base.Grade; diff --git a/Lab2/src/main/java/org/lumijiez/gui/util/FilePicker.java b/Lab2/src/main/java/org/lumijiez/gui/util/FilePicker.java index 5601d76..a638239 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/util/FilePicker.java +++ b/Lab2/src/main/java/org/lumijiez/gui/util/FilePicker.java @@ -127,67 +127,67 @@ public class FilePicker extends JFrame { String facultyName; StudyField specialty; - while (true) { line = reader.readLine(); + // Sorry for this if (line == null) break; if (line.isEmpty()) line = reader.readLine(); name = line.substring("name: ".length()); line = reader.readLine(); + // Sorry for this if (line == null) break; surname = line.substring("surname: ".length()); line = reader.readLine(); + // Sorry for this if (line == null) break; email = line.substring("email: ".length()); line = reader.readLine(); + // Sorry for this again lol if (line == null) break; groupName = line.substring("group: ".length()); line = reader.readLine(); + // Sorry for this again :(( if (line == null) break; facultyName = line.substring("faculty: ".length()); line = reader.readLine(); + // Please forgive me if (line == null) break; SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); birth = dateFormat.parse(line.substring("birthdate: ".length())); line = reader.readLine(); + // I'm really sorry if (line == null) break; enrol = dateFormat.parse(line.substring("enroldate: ".length())); line = reader.readLine(); + // This is the last one please don't hate me if (line == null) break; String spec = line.substring("specialty: ".length()); - if (StudyField.getEnum(spec) == null) { specialty = StudyField.DEFAULT_UNASSIGNED; - } else { - specialty = StudyField.getEnum(spec); - } + } else specialty = StudyField.getEnum(spec); Faculty faculty; Group group; + if (sv.getFacultyByName(facultyName) == null) { assert specialty != null; faculty = new Faculty(facultyName, specialty.getAbbreviation(), specialty); sv.addFaculty(faculty); - } else { - faculty = sv.getFacultyByName(facultyName); - } + } else faculty = sv.getFacultyByName(facultyName); + if (sv.getGroupByName(groupName, faculty) == null) { group = new Group(groupName); sv.addGroup(group, sv.getFacultyByName(facultyName)); - } else { - group = sv.getGroupByName(groupName, faculty); - } - - System.out.println(name + "\n" + surname+ "\n" + email+ "\n" + group.getName()+ "\n" + faculty.getName()+ "\n" + birth+ "\n" + enrol); + } else group = sv.getGroupByName(groupName, faculty); sv.addStudent(name, surname, email, group, faculty, birth, enrol); }