From 120669d8590fb91f0353feb4d23c8eef5802f81b Mon Sep 17 00:00:00 2001
From: Daniel <danthevip@gmail.com>
Date: Tue, 26 Sep 2023 18:28:26 +0300
Subject: [PATCH] Forms now dispose themselves

---
 .../java/org/lumijiez/gui/forms/faculty/AddFacultyForm.java     | 1 +
 .../java/org/lumijiez/gui/forms/faculty/EditFacultyForm.java    | 2 +-
 .../java/org/lumijiez/gui/forms/faculty/RemoveFacultyForm.java  | 2 +-
 .../java/org/lumijiez/gui/forms/faculty/ShowFacultyForm.java    | 2 +-
 .../main/java/org/lumijiez/gui/forms/group/AddGroupForm.java    | 2 +-
 .../main/java/org/lumijiez/gui/forms/group/DeleteGroupForm.java | 2 +-
 .../main/java/org/lumijiez/gui/forms/group/EditGroupForm.java   | 2 +-
 .../main/java/org/lumijiez/gui/forms/group/ShowGroupForm.java   | 2 +-
 .../java/org/lumijiez/gui/forms/student/DeleteStudentForm.java  | 2 +-
 .../java/org/lumijiez/gui/forms/student/EditStudentForm.java    | 2 +-
 .../java/org/lumijiez/gui/forms/student/GradeStudentForm.java   | 2 +-
 .../java/org/lumijiez/gui/forms/student/ShowStudentForm.java    | 2 +-
 .../org/lumijiez/gui/forms/student/ShowStudentGradesForm.java   | 2 +-
 13 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/AddFacultyForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/AddFacultyForm.java
index 11e3bfd..952183c 100644
--- a/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/AddFacultyForm.java
+++ b/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/AddFacultyForm.java
@@ -124,6 +124,7 @@ public class AddFacultyForm extends JFrame {
 
     private void specialtyComboActionPerformed(ActionEvent evt) {
         abbreviationField.setText(StudyField.getAbbrevFromString(Objects.requireNonNull(specialtyCombo.getSelectedItem()).toString()));
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 096df2e..2fe903b 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
@@ -136,7 +136,7 @@ public class EditFacultyForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 1efb0d2..73f9777 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
@@ -89,7 +89,7 @@ public class RemoveFacultyForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 4321ef6..7a472e7 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
@@ -90,7 +90,7 @@ public class ShowFacultyForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 630defc..bbf6781 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
@@ -97,7 +97,7 @@ public class AddGroupForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 b0e21ee..75ab189 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
@@ -89,7 +89,7 @@ public class DeleteGroupForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 f8f92c5..44fe2d1 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
@@ -123,7 +123,7 @@ public class EditGroupForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 c4c0812..863b2f1 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
@@ -91,7 +91,7 @@ public class ShowGroupForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 1c28b01..8fec228 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
@@ -89,7 +89,7 @@ public class DeleteStudentForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 70c9af0..8b9eb16 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
@@ -167,7 +167,7 @@ public class EditStudentForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 a611e4d..1734c91 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
@@ -127,7 +127,7 @@ public class GradeStudentForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 21861ed..b1b1257 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
@@ -93,7 +93,7 @@ public class ShowStudentForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {
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 0447af6..8ed8b28 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
@@ -94,7 +94,7 @@ public class ShowStudentGradesForm extends JFrame {
     }
 
     private void submitButtonActionPerformed(ActionEvent evt) {
-
+        this.dispose();
     }
 
     private void cancelButtonActionPerformed(ActionEvent evt) {