byte/oop-labs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tiny code clean-ups

Browse Source
This commit is contained in:
Daniel
2023-09-30 00:14:07 +03:00
parent 2e72a64815
commit d85f9a6132
18 changed files with 25 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Lab2/src/main/java/org/lumijiez/base/Faculty.java
View File

@@ -15,11 +15,8 @@ public class Faculty implements Serializable {
}
private String name;
private String abbreviation;
private List<Group> groups = new ArrayList<>();
private final List<Group> groups = new ArrayList<>();
private StudyField field;
public void addGroup(Group group) {

1
Lab2/src/main/java/org/lumijiez/base/Grade.java
View File

@@ -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) {

4
Lab2/src/main/java/org/lumijiez/gui/StudentManagementGUI.java
View File

@@ -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;

8
Lab2/src/main/java/org/lumijiez/gui/forms/faculty/EditFacultyForm.java
View File

@@ -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");

7
Lab2/src/main/java/org/lumijiez/gui/forms/faculty/RemoveFacultyForm.java
View File

@@ -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");

6
Lab2/src/main/java/org/lumijiez/gui/forms/faculty/ShowFacultyForm.java
View File

@@ -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");

6
Lab2/src/main/java/org/lumijiez/gui/forms/group/AddGroupForm.java
View File

@@ -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...");

5
Lab2/src/main/java/org/lumijiez/gui/forms/group/DeleteGroupForm.java
View File

@@ -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;

7
Lab2/src/main/java/org/lumijiez/gui/forms/group/EditGroupForm.java
View File

@@ -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...");

7
Lab2/src/main/java/org/lumijiez/gui/forms/group/ShowGroupForm.java
View File

@@ -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");

6
Lab2/src/main/java/org/lumijiez/gui/forms/student/AddStudentForm.java
View File

@@ -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");

8
Lab2/src/main/java/org/lumijiez/gui/forms/student/DeleteStudentForm.java
View File

@@ -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);

4
Lab2/src/main/java/org/lumijiez/gui/forms/student/EditStudentForm.java
View File

@@ -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;

4
Lab2/src/main/java/org/lumijiez/gui/forms/student/GradeStudentForm.java
View File

@@ -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;

5
Lab2/src/main/java/org/lumijiez/gui/forms/student/GraduateStudentForm.java
View File

@@ -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;

4
Lab2/src/main/java/org/lumijiez/gui/forms/student/ShowStudentForm.java
View File

@@ -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;

4
Lab2/src/main/java/org/lumijiez/gui/forms/student/ShowStudentGradesForm.java
View File

@@ -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;

26
Lab2/src/main/java/org/lumijiez/gui/util/FilePicker.java
View File

@@ -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);
}