From 239f75be5dae70b6cf670e3906327a273494e4d8 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 4 Oct 2023 03:23:52 +0300 Subject: [PATCH] Generics to center all types of JFrame children --- .../lumijiez/gui/forms/faculty/AddFacultyForm.java | 7 ++----- .../gui/forms/faculty/EditFacultyForm.java | 10 +++++----- .../gui/forms/faculty/RemoveFacultyForm.java | 6 ++---- .../gui/forms/faculty/ShowFacultyForm.java | 6 ++---- .../forms/faculty/ShowSpecialtyFacultyForm.java | 6 ++---- .../org/lumijiez/gui/forms/group/AddGroupForm.java | 6 ++---- .../lumijiez/gui/forms/group/DeleteGroupForm.java | 6 ++---- .../lumijiez/gui/forms/group/EditGroupForm.java | 14 +++++++------- .../lumijiez/gui/forms/group/ShowGroupForm.java | 6 ++---- .../lumijiez/gui/forms/student/AddStudentForm.java | 6 ++---- .../gui/forms/student/DeleteStudentForm.java | 6 ++---- .../gui/forms/student/EditStudentForm.java | 6 ++---- .../gui/forms/student/GradeStudentForm.java | 6 ++---- .../gui/forms/student/GraduateStudentForm.java | 6 ++---- .../gui/forms/student/ShowStudentForm.java | 6 ++---- .../gui/forms/student/ShowStudentGradesForm.java | 6 ++---- .../org/lumijiez/gui/loader/BatchGraduater.java | 7 ++----- .../java/org/lumijiez/gui/loader/BatchLoader.java | 7 ++----- .../java/org/lumijiez/gui/util/WindowConfig.java | 13 +++++++++++++ 19 files changed, 57 insertions(+), 79 deletions(-) create mode 100644 Lab2/src/main/java/org/lumijiez/gui/util/WindowConfig.java 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 8600f43..47c5fe5 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 @@ -5,6 +5,7 @@ import org.lumijiez.enums.StudyField; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -82,7 +83,6 @@ public class AddFacultyForm extends JFrame { .addGap(0, 0, Short.MAX_VALUE) .addComponent(titleLabel) .addGap(149, 149, 149))); - layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addGap(7, 7, 7) @@ -103,10 +103,7 @@ public class AddFacultyForm extends JFrame { .addComponent(submitButton)) .addContainerGap(24, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(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 926f7ad..65cc130 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 @@ -5,6 +5,7 @@ import org.lumijiez.enums.StudyField; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -114,14 +115,13 @@ public class EditFacultyForm extends JFrame { .addComponent(submitButton)) .addGap(14, 14, 14))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void facultyComboEvent(ActionEvent actionEvent) { - specialtyCombo.setSelectedItem(((Faculty) Objects.requireNonNull(facultyCombo.getSelectedItem())).getField()); + Faculty fac = ((Faculty) Objects.requireNonNull(facultyCombo.getSelectedItem())); + specialtyCombo.setSelectedItem(fac.getField()); + nameField.setText(fac.getName()); } private void specialtyComboEvent(ActionEvent actionEvent) { 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 2a63d19..b700e2f 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 @@ -4,6 +4,7 @@ import org.lumijiez.base.Faculty; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -76,10 +77,7 @@ public class RemoveFacultyForm extends JFrame { .addComponent(submitButton)) .addContainerGap(21, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(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 2ac78db..45ab559 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 @@ -4,6 +4,7 @@ import org.lumijiez.base.Faculty; import org.lumijiez.base.Group; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -79,10 +80,7 @@ public class ShowFacultyForm extends JFrame { .addComponent(submitButton)) .addContainerGap(24, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(ActionEvent evt) { diff --git a/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/ShowSpecialtyFacultyForm.java b/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/ShowSpecialtyFacultyForm.java index 49a0c4d..cdf1d0e 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/ShowSpecialtyFacultyForm.java +++ b/Lab2/src/main/java/org/lumijiez/gui/forms/faculty/ShowSpecialtyFacultyForm.java @@ -4,6 +4,7 @@ import org.lumijiez.base.Faculty; import org.lumijiez.enums.StudyField; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -79,10 +80,7 @@ public class ShowSpecialtyFacultyForm extends JFrame { .addComponent(submitButton)) .addContainerGap(24, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(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 87d0c12..6209863 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 @@ -5,6 +5,7 @@ import org.lumijiez.base.Group; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -89,10 +90,7 @@ public class AddGroupForm extends JFrame { .addComponent(submitButton)) .addGap(15, 15, 15))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(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 ba644bc..f6b4ad0 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 @@ -4,6 +4,7 @@ import org.lumijiez.base.Group; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -77,10 +78,7 @@ public class DeleteGroupForm extends JFrame { .addComponent(submitButton)) .addContainerGap(18, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(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 4294256..3631c1e 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 @@ -5,6 +5,7 @@ import org.lumijiez.base.Group; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -103,18 +104,17 @@ public class EditGroupForm extends JFrame { .addComponent(submitButton)) .addContainerGap(36, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(ActionEvent evt) { Faculty fac = ((Faculty) Objects.requireNonNull(facultyCombo.getSelectedItem())); Group gr = (Group) Objects.requireNonNull(groupCombo.getSelectedItem()); - sv.editGroup(gr, nameField.getText(), fac); - DisplayHandler.displayGroups(); - this.dispose(); + if (!nameField.getText().isEmpty()) { + sv.editGroup(gr, nameField.getText(), fac); + DisplayHandler.displayGroups(); + this.dispose(); + } else JOptionPane.showMessageDialog(null, "Fill in all the fields!", "Warning!", JOptionPane.INFORMATION_MESSAGE, null); } private void cancelEvent(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 ff4fa0f..c115884 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 @@ -4,6 +4,7 @@ import org.lumijiez.base.Group; import org.lumijiez.base.Student; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -81,10 +82,7 @@ public class ShowGroupForm extends JFrame { .addComponent(submitButton)) .addContainerGap(25, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(ActionEvent evt) { 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 cec5391..68996e6 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 @@ -5,6 +5,7 @@ import org.lumijiez.base.Group; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -234,10 +235,7 @@ public class AddStudentForm extends JFrame { .addComponent(submitButton)) .addGap(21, 21, 21))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void cancelEvent(ActionEvent actionEvent) { 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 f304caf..d6be12c 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 @@ -4,6 +4,7 @@ import org.lumijiez.base.Student; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -78,10 +79,7 @@ public class DeleteStudentForm extends JFrame { .addComponent(cancelButton)) .addContainerGap(26, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(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 62cf46e..ad986f3 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 @@ -6,6 +6,7 @@ import org.lumijiez.base.Student; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -243,10 +244,7 @@ public class EditStudentForm extends JFrame { .addComponent(cancelButton)) .addContainerGap(25, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void cancelEvent(ActionEvent actionEvent) { 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 0c186e3..b83536d 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 @@ -5,6 +5,7 @@ import org.lumijiez.base.Student; import org.lumijiez.enums.Subjects; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -109,10 +110,7 @@ public class GradeStudentForm extends JFrame { .addComponent(submitButton)) .addContainerGap(30, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(ActionEvent evt) { 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 d4b6bd8..4f88c8a 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 @@ -4,6 +4,7 @@ import org.lumijiez.base.Student; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -78,10 +79,7 @@ public class GraduateStudentForm extends JFrame { .addComponent(cancelButton)) .addContainerGap(26, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void cancelEvent(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 b1df47b..c56e6c9 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 @@ -3,6 +3,7 @@ package org.lumijiez.gui.forms.student; import org.lumijiez.base.Student; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -81,10 +82,7 @@ public class ShowStudentForm extends JFrame { .addComponent(submitButton)) .addContainerGap(22, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(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 f13fc52..6274b52 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 @@ -4,6 +4,7 @@ import org.lumijiez.base.Grade; import org.lumijiez.base.Student; import org.lumijiez.gui.util.ComboRenderer; import org.lumijiez.gui.util.ComponentDecorator; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -82,10 +83,7 @@ public class ShowStudentGradesForm extends JFrame { .addComponent(submitButton)) .addContainerGap(22, Short.MAX_VALUE))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void submitEvent(ActionEvent evt) { diff --git a/Lab2/src/main/java/org/lumijiez/gui/loader/BatchGraduater.java b/Lab2/src/main/java/org/lumijiez/gui/loader/BatchGraduater.java index 1c20943..31e88f3 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/loader/BatchGraduater.java +++ b/Lab2/src/main/java/org/lumijiez/gui/loader/BatchGraduater.java @@ -6,6 +6,7 @@ import org.lumijiez.base.Student; import org.lumijiez.enums.StudyField; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -50,7 +51,6 @@ public class BatchGraduater extends JFrame { formatLabel.setText("File format example:"); cancelButton.setText("Cancel"); - exampleText.setColumns(15); exampleText.setRows(5); exampleText.setEditable(false); @@ -99,10 +99,7 @@ public class BatchGraduater extends JFrame { .addComponent(submitButton)) .addGap(23, 23, 23))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void cancelEvent(ActionEvent evt) { diff --git a/Lab2/src/main/java/org/lumijiez/gui/loader/BatchLoader.java b/Lab2/src/main/java/org/lumijiez/gui/loader/BatchLoader.java index fcf59dd..5415f44 100644 --- a/Lab2/src/main/java/org/lumijiez/gui/loader/BatchLoader.java +++ b/Lab2/src/main/java/org/lumijiez/gui/loader/BatchLoader.java @@ -5,6 +5,7 @@ import org.lumijiez.base.Group; import org.lumijiez.enums.StudyField; import org.lumijiez.gui.util.ComponentDecorator; import org.lumijiez.gui.util.DisplayHandler; +import org.lumijiez.gui.util.WindowConfig; import org.lumijiez.managers.Supervisor; import javax.swing.*; @@ -52,7 +53,6 @@ public class BatchLoader extends JFrame { formatLabel.setText("File format example:"); cancelButton.setText("Cancel"); - exampleText.setColumns(15); exampleText.setRows(5); exampleText.setEditable(false); @@ -101,10 +101,7 @@ public class BatchLoader extends JFrame { .addComponent(submitButton)) .addGap(23, 23, 23))); pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int x = (screenSize.width - this.getWidth()) / 2; - int y = (screenSize.height - this.getHeight()) / 2; - this.setLocation(x, y); + WindowConfig.center(this); } private void cancelEvent(ActionEvent evt) { diff --git a/Lab2/src/main/java/org/lumijiez/gui/util/WindowConfig.java b/Lab2/src/main/java/org/lumijiez/gui/util/WindowConfig.java new file mode 100644 index 0000000..7633812 --- /dev/null +++ b/Lab2/src/main/java/org/lumijiez/gui/util/WindowConfig.java @@ -0,0 +1,13 @@ +package org.lumijiez.gui.util; + +import javax.swing.*; +import java.awt.*; + +public class WindowConfig { + public static void center(T frame) { + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int x = (screenSize.width - frame.getWidth()) / 2; + int y = (screenSize.height - frame.getHeight()) / 2; + frame.setLocation(x, y); + } +}