рефакторинг форм таблиц и заполнения информации о столбцах

2024-10-26 14:34:55 +03:00
parent ffcad7a620
commit a79816082a
43 changed files with 1607 additions and 1189 deletions
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.RendererMultiline;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
@@ -14,48 +15,64 @@ import javax.swing.*;
 public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration> {
    public DVMConfigurationsForm(DataSet<?, DVMConfiguration> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "имя",
-                "автор",
-                "ядра",
-                "параметры",
-                "группы",
-                "тестов",
-                "компиляция(с)",
-                "запуск(с)"
-        };
-    }
-    @Override
-    public Object getFieldAt(DVMConfiguration object, int columnIndex) {
-        ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(object);
-        switch (columnIndex) {
-            case 2:
-                return object.description;
-            case 3:
-                return object.sender_name;
-            case 4:
-                return object.kernels;
-            case 5:
-                return cache.settingsSummary;
-            case 6:
-                return cache.groupsSummary;
-            case 7:
-                return cache.getTestsCount();
-            case 8:
-                return object.c_maxtime;
-            case 9:
-                return object.maxtime;
-            default:
-                return null;
-        }
-    }
-    @Override
-    protected void AdditionalInitColumns() {
-        columns.get(6).setRendererClass(RendererMultiline.class);
-        columns.get(6).setMaxWidth(500);
+        AddColumns(
+                new ColumnInfo<DVMConfiguration>("имя") {
+                    @Override
+                    public Object getFieldAt(DVMConfiguration object) {
+                        return object.description;
+                    }
+                },
+                new ColumnInfo<DVMConfiguration>("автор") {
+                    @Override
+                    public Object getFieldAt(DVMConfiguration object) {
+                        return object.sender_name;
+                    }
+                },
+                new ColumnInfo<DVMConfiguration>("ядра") {
+                    @Override
+                    public Object getFieldAt(DVMConfiguration object) {
+                        return object.kernels;
+                    }
+                },
+                new ColumnInfo<DVMConfiguration>("параметры") {
+                    @Override
+                    public Object getFieldAt(DVMConfiguration object) {
+                        return ((ConfigurationCache) VisualCaches.GetCache(object)).settingsSummary;
+                    }
+                },
+                new ColumnInfo<DVMConfiguration>("группы") {
+                    @Override
+                    public Object getFieldAt(DVMConfiguration object) {
+                        return ((ConfigurationCache) VisualCaches.GetCache(object)).groupsSummary;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMultiline.class;
+                    }
+                    @Override
+                    public int getMaxWidth() {
+                        return 700;
+                    }
+                },
+                new ColumnInfo<DVMConfiguration>("тестов") {
+                    @Override
+                    public Object getFieldAt(DVMConfiguration object) {
+                        return ((ConfigurationCache) VisualCaches.GetCache(object)).getTestsCount();
+                    }
+                },
+                new ColumnInfo<DVMConfiguration>("компиляция(с)") {
+                    @Override
+                    public Object getFieldAt(DVMConfiguration object) {
+                        return object.c_maxtime;
+                    }
+                },
+                new ColumnInfo<DVMConfiguration>("запуск(с)") {
+                    @Override
+                    public Object getFieldAt(DVMConfiguration object) {
+                        return object.maxtime;
+                    }
+                }
+        );
    }
    @Override
    public DataMenuBar createMenuBar() {
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -4,10 +4,7 @@ import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.FilterFlag;
 import Common.Visual.Menus.DataMenuBar;
-import Common.Visual.Tables.RendererDate;
-import Common.Visual.Tables.RendererMultiline;
-import Common.Visual.Tables.RendererProgressBar;
-import Common.Visual.Tables.RendererStatusEnum;
+import Common.Visual.Tables.*;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -20,60 +17,94 @@ import java.util.Date;
 public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
    public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "Автор",
-                "Машина",
-                "Пользователь",
-                "DVM",
-                "Конфигурации",
-                "Задач",
-                "Ядер",
-                "Прогресс",
-                "Начало",
-                "Изменено",
-                "Статус"
-        };
-    }
-    @Override
-    public Object getFieldAt(DVMPackage object, int columnIndex) {
-        PackageCache cache = (PackageCache) VisualCaches.GetCache(object);
-        switch (columnIndex) {
-            case 2:
-                return object.sender_name;
-            case 3:
-                return object.machine_address + ":" + object.machine_port;
-            case 4:
-                return object.user_name;
-            case 5:
-                return object.version;
-            case 6:
-                return cache.getConfigurationsDescriptions();
-            case 7:
-                return object.tasksCount;
-            case 8:
-                return object.kernels;
-            case 9:
-                return object.progress;
-            case 10:
-                return new Date(object.StartDate);
-            case 11:
-                return new Date(object.ChangeDate);
-            case 12:
-                return object.state;
-            default:
-                return null;
-        }
-    }
-    @Override
-    protected void AdditionalInitColumns() {
-        columns.get(6).setRendererClass(RendererMultiline.class);
-        columns.get(9).setRendererClass(RendererProgressBar.class);
-        columns.get(10).setRendererClass(RendererDate.class);
-        columns.get(11).setRendererClass(RendererDate.class);
-        columns.get(12).setRendererClass(RendererStatusEnum.class);
+        AddColumns(
+                new ColumnInfo<DVMPackage>("Автор") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return object.sender_name;
+                    }
+                },
+                new ColumnInfo<DVMPackage>("Машина") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return object.machine_address + ":" + object.machine_port;
+                    }
+                },
+                new ColumnInfo<DVMPackage>("Пользователь") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return object.user_name;
+                    }
+                },
+                new ColumnInfo<DVMPackage>("DVM") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return object.version;
+                    }
+                },
+                new ColumnInfo<DVMPackage>("Конфигурации") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return ((PackageCache) VisualCaches.GetCache(object)).getConfigurationsDescriptions();
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMultiline.class;
+                    }
+                },
+                new ColumnInfo<DVMPackage>("Задач") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return object.tasksCount;
+                    }
+                },
+                new ColumnInfo<DVMPackage>("Ядер") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return object.kernels;
+                    }
+                },
+                new ColumnInfo<DVMPackage>("Прогресс") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return object.progress;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererProgressBar.class;
+                    }
+                },
+                new ColumnInfo<DVMPackage>("Начало") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return new Date(object.StartDate);
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererDate.class;
+                    }
+                },
+                new ColumnInfo<DVMPackage>("Изменено") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return new Date(object.ChangeDate);
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererDate.class;
+                    }
+                },
+                new ColumnInfo<DVMPackage>("Статус") {
+                    @Override
+                    public Object getFieldAt(DVMPackage object) {
+                        return object.state;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererStatusEnum.class;
+                    }
+                }
+        );
    }
    @Override
    protected void ShowCurrentObject() throws Exception {
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
@@ -11,45 +12,62 @@ import javax.swing.*;
 public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
    public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "имя",
-                "автор",
-                "флаги",
-                "окружение",
-                "usr.par",
-                "куб",
-                "max",
-                "min dim",
-                "max dim"
-        };
-    }
-    @Override
-    public Object getFieldAt(DVMSettings object, int columnIndex) {
-        switch (columnIndex) {
-            case 2:
-                return object.description;
-            case 3:
-                return object.sender_name;
-            case 4:
-                return object.flags;
-            case 5:
-                return object.environments;
-            case 6:
-                return object.printUsrPar();
-            case 7:
-                return object.cube;
-            case 8:
-                return object.max_proc_count;
-            case 9:
-                return object.min_dim_proc_count;
-            case 10:
-                return object.max_dim_proc_count;
-            default:
-                return null;
-        }
+        AddColumns(
+                new ColumnInfo<DVMSettings>("имя") {
+                    @Override
+                    public Object getFieldAt(DVMSettings object) {
+                        return object.description;
+                    }
+                },
+                new ColumnInfo<DVMSettings>("автор") {
+                    @Override
+                    public Object getFieldAt(DVMSettings object) {
+                        return object.sender_name;
+                    }
+                },
+                new ColumnInfo<DVMSettings>("флаги") {
+                    @Override
+                    public Object getFieldAt(DVMSettings object) {
+                        return object.flags;
+                    }
+                },
+                new ColumnInfo<DVMSettings>("окружение") {
+                    @Override
+                    public Object getFieldAt(DVMSettings object) {
+                        return object.environments;
+                    }
+                },
+                new ColumnInfo<DVMSettings>("usr.par") {
+                    @Override
+                    public Object getFieldAt(DVMSettings object) {
+                        return object.printUsrPar();
+                    }
+                },
+                new ColumnInfo<DVMSettings>("куб") {
+                    @Override
+                    public Object getFieldAt(DVMSettings object) {
+                        return object.cube;
+                    }
+                },
+                new ColumnInfo<DVMSettings>("max") {
+                    @Override
+                    public Object getFieldAt(DVMSettings object) {
+                        return object.max_proc_count;
+                    }
+                },
+                new ColumnInfo<DVMSettings>("min dim") {
+                    @Override
+                    public Object getFieldAt(DVMSettings object) {
+                        return object.min_dim_proc_count;
+                    }
+                },
+                new ColumnInfo<DVMSettings>("max dim") {
+                    @Override
+                    public Object getFieldAt(DVMSettings object) {
+                        return object.max_dim_proc_count;
+                    }
+                }
+        );
    }
    @Override
    public DataMenuBar createMenuBar() {
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
@@ -5,6 +5,7 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.DataSetFiltersMenu;
 import Common.Visual.FilterMenuFlag;
 import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.RendererProgressBar;
 import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -16,60 +17,92 @@ import java.util.Comparator;
 public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
    public DVMRunTasksForm(DataSet<?, DVMRunTask> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "Тест",
-                "Язык",
-                "Флаги",
-                "Компиляция",
-                "Запуск",
-                "Матрица",
-                "Окружение",
-                "usr.par",
-                "Время компиляции (с)",
-                "Время запуска (с)",
-                "Чистое время (с)",
-                "Прогресс",
-        };
-    }
-    @Override
-    public Object getFieldAt(DVMRunTask object, int columnIndex) {
-        switch (columnIndex) {
-            case 2:
-                return object.test_description;
-            case 3:
-                return object.language;
-            case 4:
-                return object.flags;
-            case 5:
-                return object.compilation_state;
-            case 6:
-                return object.state;
-            case 7:
-                return object.matrix;
-            case 8:
-                return object.getEnvironments();
-            case 9:
-                return object.getUsrPar();
-            case 10:
-                return object.compilation_time;
-            case 11:
-                return object.Time;
-            case 12:
-                return object.CleanTime;
-            case 13:
-                return object.progress;
-            default:
-                return null;
-        }
-    }
-    @Override
-    protected void AdditionalInitColumns() {
-        columns.get(5).setRendererClass(RendererStatusEnum.class);
-        columns.get(6).setRendererClass(RendererStatusEnum.class);
-        columns.get(13).setRendererClass(RendererProgressBar.class);
+        AddColumns(
+                new ColumnInfo<DVMRunTask>("Тест") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.test_description;
+                    }
+                },
+                new ColumnInfo<DVMRunTask>("Язык") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.language;
+                    }
+                },
+                new ColumnInfo<DVMRunTask>("Флаги") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.flags;
+                    }
+                },
+                new ColumnInfo<DVMRunTask>("Компиляция") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.compilation_state;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererStatusEnum.class;
+                    }
+                },
+                new ColumnInfo<DVMRunTask>("Запуск") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.state;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererStatusEnum.class;
+                    }
+                },
+                new ColumnInfo<DVMRunTask>("Матрица") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.matrix;
+                    }
+                },
+                new ColumnInfo<DVMRunTask>("Окружение") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.getEnvironments();
+                    }
+                },
+                new ColumnInfo<DVMRunTask>("usr.par") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.getUsrPar();
+                    }
+                },
+                new ColumnInfo<DVMRunTask>("Время компиляции (с)") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.compilation_time;
+                    }
+                },
+                new ColumnInfo<DVMRunTask>("Время запуска (с)") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.Time;
+                    }
+                },
+                new ColumnInfo<DVMRunTask>("Чистое время (с)") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.CleanTime;
+                    }
+                },
+                new ColumnInfo<DVMRunTask>("Прогресс") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.progress;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererProgressBar.class;
+                    }
+                }
+        );
    }
    @Override
    public DataMenuBar createMenuBar() {