debug-version/aston-team-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(ui): reorganize classes into logical feature packages

Browse Source
This commit is contained in:
Володин Герман
2026-08-29 23:37:58 +04:00
parent 0f4df4b811
commit 545fae857a
15 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/project/App.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.googlecode.lanterna.gui2.MultiWindowTextGUI;
import com.googlecode.lanterna.screen.Screen; import com.googlecode.lanterna.screen.Screen;
import com.googlecode.lanterna.terminal.DefaultTerminalFactory; import com.googlecode.lanterna.terminal.DefaultTerminalFactory;
import ru.project.model.AppState; import ru.project.model.AppState;
import ru.project.ui.menu.MainMenu; import ru.project.ui.main.MainMenu;
public final class App { public final class App {
app/src/main/java/ru/project/ui/window/CollectionDisplayWindow.java → app/src/main/java/ru/project/ui/common/CollectionDisplayWindow.java
+1 -1
View File
@@ -1,4 +1,4 @@
package ru.project.ui.window; package ru.project.ui.common;
import com.googlecode.lanterna.TerminalSize; import com.googlecode.lanterna.TerminalSize;
import com.googlecode.lanterna.gui2.Button; import com.googlecode.lanterna.gui2.Button;
app/src/main/java/ru/project/ui/window/InputValueWindow.java → app/src/main/java/ru/project/ui/common/InputValueWindow.java
+1 -1
View File
@@ -1,4 +1,4 @@
package ru.project.ui.window; package ru.project.ui.common;
import com.googlecode.lanterna.gui2.Button; import com.googlecode.lanterna.gui2.Button;
import com.googlecode.lanterna.gui2.Label; import com.googlecode.lanterna.gui2.Label;
app/src/main/java/ru/project/ui/window/MessageWindow.java → app/src/main/java/ru/project/ui/common/MessageWindow.java
+1 -1
View File
@@ -1,4 +1,4 @@
package ru.project.ui.window; package ru.project.ui.common;
import com.googlecode.lanterna.gui2.Button; import com.googlecode.lanterna.gui2.Button;
import com.googlecode.lanterna.gui2.Label; import com.googlecode.lanterna.gui2.Label;
app/src/main/java/ru/project/ui/menu/CreateCollectionMenu.java → app/src/main/java/ru/project/ui/creation/CreateCollectionMenu.java
+3 -5
View File
@@ -1,4 +1,4 @@
package ru.project.ui.menu; package ru.project.ui.creation;
import com.googlecode.lanterna.gui2.Button; import com.googlecode.lanterna.gui2.Button;
import com.googlecode.lanterna.gui2.Label; import com.googlecode.lanterna.gui2.Label;
@@ -8,12 +8,10 @@ import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
import ru.project.collection.MyLinkedList; import ru.project.collection.MyLinkedList;
import ru.project.collection.MyList; import ru.project.collection.MyList;
import ru.project.model.AppState; import ru.project.model.AppState;
import ru.project.model.FillMethod;
import ru.project.student.Student; import ru.project.student.Student;
import ru.project.ui.base.BaseModalWindow; import ru.project.ui.base.BaseModalWindow;
import ru.project.ui.window.CustomDataSettingsWindow; import ru.project.ui.common.InputValueWindow;
import ru.project.ui.window.InputValueWindow; import ru.project.ui.common.MessageWindow;
import ru.project.ui.window.MessageWindow;
public class CreateCollectionMenu extends BaseModalWindow { public class CreateCollectionMenu extends BaseModalWindow {
app/src/main/java/ru/project/ui/window/CustomDataSettingsWindow.java → app/src/main/java/ru/project/ui/creation/CustomDataSettingsWindow.java
+4 -1
View File
@@ -1,4 +1,4 @@
package ru.project.ui.window; package ru.project.ui.creation;
import com.googlecode.lanterna.gui2.Button; import com.googlecode.lanterna.gui2.Button;
import com.googlecode.lanterna.gui2.Label; import com.googlecode.lanterna.gui2.Label;
@@ -12,6 +12,9 @@ import ru.project.model.AppState;
import ru.project.student.Student; import ru.project.student.Student;
import ru.project.student.StudentBuilder; import ru.project.student.StudentBuilder;
import ru.project.ui.base.BaseModalWindow; import ru.project.ui.base.BaseModalWindow;
import ru.project.ui.common.CollectionDisplayWindow;
import ru.project.ui.common.InputValueWindow;
import ru.project.ui.common.MessageWindow;
public class CustomDataSettingsWindow extends BaseModalWindow { public class CustomDataSettingsWindow extends BaseModalWindow {
app/src/main/java/ru/project/model/FillMethod.java → app/src/main/java/ru/project/ui/creation/FillMethod.java
+1 -1
View File
@@ -1,4 +1,4 @@
package ru.project.model; package ru.project.ui.creation;
public enum FillMethod { public enum FillMethod {
CUSTOM, CUSTOM,
app/src/main/java/ru/project/ui/menu/FillMethodSelectionWindow.java → app/src/main/java/ru/project/ui/creation/FillMethodSelectionWindow.java
+1 -2
View File
@@ -1,9 +1,8 @@
package ru.project.ui.menu; package ru.project.ui.creation;
import com.googlecode.lanterna.gui2.ActionListBox; import com.googlecode.lanterna.gui2.ActionListBox;
import com.googlecode.lanterna.gui2.WindowBasedTextGUI; import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
import java.util.function.Consumer; import java.util.function.Consumer;
import ru.project.model.FillMethod;
import ru.project.ui.base.BaseModalWindow; import ru.project.ui.base.BaseModalWindow;
public class FillMethodSelectionWindow extends BaseModalWindow { public class FillMethodSelectionWindow extends BaseModalWindow {
app/src/main/java/ru/project/ui/menu/MainMenu.java → app/src/main/java/ru/project/ui/main/MainMenu.java
+5 -3
View File
@@ -1,4 +1,4 @@
package ru.project.ui.menu; package ru.project.ui.main;
import com.googlecode.lanterna.gui2.ActionListBox; import com.googlecode.lanterna.gui2.ActionListBox;
import com.googlecode.lanterna.gui2.WindowBasedTextGUI; import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
@@ -6,8 +6,10 @@ import ru.project.collection.MyList;
import ru.project.model.AppState; import ru.project.model.AppState;
import ru.project.student.Student; import ru.project.student.Student;
import ru.project.ui.base.BaseModalWindow; import ru.project.ui.base.BaseModalWindow;
import ru.project.ui.window.CollectionDisplayWindow; import ru.project.ui.common.CollectionDisplayWindow;
import ru.project.ui.window.MessageWindow; import ru.project.ui.common.MessageWindow;
import ru.project.ui.creation.CreateCollectionMenu;
import ru.project.ui.sorting.SortCollectionMenu;
public class MainMenu extends BaseModalWindow { public class MainMenu extends BaseModalWindow {
app/src/main/java/ru/project/ui/window/NormalSortSettingsWindow.java → app/src/main/java/ru/project/ui/sorting/NormalSortSettingsWindow.java
+1 -2
View File
@@ -1,4 +1,4 @@
package ru.project.ui.window; package ru.project.ui.sorting;
import com.googlecode.lanterna.gui2.ActionListBox; import com.googlecode.lanterna.gui2.ActionListBox;
import com.googlecode.lanterna.gui2.Button; import com.googlecode.lanterna.gui2.Button;
@@ -6,7 +6,6 @@ import com.googlecode.lanterna.gui2.LinearLayout;
import com.googlecode.lanterna.gui2.Panel; import com.googlecode.lanterna.gui2.Panel;
import com.googlecode.lanterna.gui2.WindowBasedTextGUI; import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
import java.util.function.Consumer; import java.util.function.Consumer;
import ru.project.model.SortField;
import ru.project.ui.base.BaseModalWindow; import ru.project.ui.base.BaseModalWindow;
public class NormalSortSettingsWindow extends BaseModalWindow { public class NormalSortSettingsWindow extends BaseModalWindow {
app/src/main/java/ru/project/ui/window/ParitySortSettingsWindow.java → app/src/main/java/ru/project/ui/sorting/ParitySortSettingsWindow.java
+1 -1
View File
@@ -1,4 +1,4 @@
package ru.project.ui.window; package ru.project.ui.sorting;
import com.googlecode.lanterna.gui2.Button; import com.googlecode.lanterna.gui2.Button;
import com.googlecode.lanterna.gui2.Label; import com.googlecode.lanterna.gui2.Label;
app/src/main/java/ru/project/ui/menu/SortCollectionMenu.java → app/src/main/java/ru/project/ui/sorting/SortCollectionMenu.java
+2 -7
View File
@@ -1,4 +1,4 @@
package ru.project.ui.menu; package ru.project.ui.sorting;
import com.googlecode.lanterna.gui2.Button; import com.googlecode.lanterna.gui2.Button;
import com.googlecode.lanterna.gui2.Label; import com.googlecode.lanterna.gui2.Label;
@@ -6,13 +6,8 @@ import com.googlecode.lanterna.gui2.LinearLayout;
import com.googlecode.lanterna.gui2.Panel; import com.googlecode.lanterna.gui2.Panel;
import com.googlecode.lanterna.gui2.WindowBasedTextGUI; import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
import ru.project.model.AppState; import ru.project.model.AppState;
import ru.project.model.SortField;
import ru.project.model.SortMethod;
import ru.project.ui.base.BaseModalWindow; import ru.project.ui.base.BaseModalWindow;
import ru.project.ui.window.MessageWindow; import ru.project.ui.common.MessageWindow;
import ru.project.ui.window.NormalSortSettingsWindow;
import ru.project.ui.window.ParitySortSettingsWindow;
import ru.project.ui.window.SortMethodSelectionWindow;
public class SortCollectionMenu extends BaseModalWindow { public class SortCollectionMenu extends BaseModalWindow {
app/src/main/java/ru/project/model/SortField.java → app/src/main/java/ru/project/ui/sorting/SortField.java
+1 -1
View File
@@ -1,4 +1,4 @@
package ru.project.model; package ru.project.ui.sorting;
public enum SortField { public enum SortField {
GROUP_NUMBER, GROUP_NUMBER,
app/src/main/java/ru/project/model/SortMethod.java → app/src/main/java/ru/project/ui/sorting/SortMethod.java
+1 -1
View File
@@ -1,4 +1,4 @@
package ru.project.model; package ru.project.ui.sorting;
public enum SortMethod { public enum SortMethod {
NORMAL, NORMAL,
app/src/main/java/ru/project/ui/window/SortMethodSelectionWindow.java → app/src/main/java/ru/project/ui/sorting/SortMethodSelectionWindow.java
+1 -2
View File
@@ -1,9 +1,8 @@
package ru.project.ui.window; package ru.project.ui.sorting;
import com.googlecode.lanterna.gui2.ActionListBox; import com.googlecode.lanterna.gui2.ActionListBox;
import com.googlecode.lanterna.gui2.WindowBasedTextGUI; import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
import java.util.function.Consumer; import java.util.function.Consumer;
import ru.project.model.SortMethod;
import ru.project.ui.base.BaseModalWindow; import ru.project.ui.base.BaseModalWindow;
public class SortMethodSelectionWindow extends BaseModalWindow { public class SortMethodSelectionWindow extends BaseModalWindow {