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

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/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.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.Passes.PassCode;
@@ -15,50 +16,78 @@ import javax.swing.*;
 public class SapforConfigurationsForm extends DataSetControlForm<SapforConfiguration> {
    public SapforConfigurationsForm(DataSet<?, SapforConfiguration> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "имя",
-                "автор",
-                "",
-                "ядра",
-                "параметры",
-                "группы",
-                "тестов"
-        };
-    }
-    @Override
-    public Object getFieldAt(SapforConfiguration 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.printAuto();
-            case 5:
-                return object.kernels;
-            case 6:
-                return cache.settingsSummary;
-            case 7:
-                return cache.groupsSummary;
-            case 8:
-                return cache.getTestsCount();
-            default:
-                return null;
-        }
-    }
-    @Override
-    protected void AdditionalInitColumns() {
-        columns.get(4).setRendererClass(RendererConfigurationAuto.class);
-        columns.get(4).setEditorClass(SwitcherConfigurationAuto.class);
-        columns.get(4).setMinWidth(25);
-        columns.get(4).setMaxWidth(25);
-        columns.get(6).setMaxWidth(500);
-        columns.get(7).setRendererClass(RendererMultiline.class);
-        columns.get(7).setMaxWidth(500);
+        AddColumns(
+                new ColumnInfo<SapforConfiguration>("имя") {
+                    @Override
+                    public Object getFieldAt(SapforConfiguration object) {
+                        return object.description;
+                    }
+                },
+                new ColumnInfo<SapforConfiguration>("автор") {
+                    @Override
+                    public Object getFieldAt(SapforConfiguration object) {
+                        return object.sender_name;
+                    }
+                },
+                new ColumnInfo<SapforConfiguration>("") {
+                    @Override
+                    public Object getFieldAt(SapforConfiguration object) {
+                        return object.printAuto();
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererConfigurationAuto.class;
+                    }
+                    @Override
+                    public Class getEditorClass() {
+                        return SwitcherConfigurationAuto.class;
+                    }
+                    @Override
+                    public int getMinWidth() {
+                        return 25;
+                    }
+                    @Override
+                    public int getMaxWidth() {
+                        return 25;
+                    }
+                },
+                new ColumnInfo<SapforConfiguration>("ядра") {
+                    @Override
+                    public Object getFieldAt(SapforConfiguration object) {
+                        return object.kernels;
+                    }
+                },
+                new ColumnInfo<SapforConfiguration>("параметры") {
+                    @Override
+                    public Object getFieldAt(SapforConfiguration object) {
+                        return ((ConfigurationCache) VisualCaches.GetCache(object)).settingsSummary;
+                    }
+                    @Override
+                    public int getMaxWidth() {
+                        return 500;
+                    }
+                },
+                new ColumnInfo<SapforConfiguration>("группы") {
+                    @Override
+                    public Object getFieldAt(SapforConfiguration object) {
+                        return ((ConfigurationCache) VisualCaches.GetCache(object)).groupsSummary;
+                    }
+                    @Override
+                    public int getMaxWidth() {
+                        return 500;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMultiline.class;
+                    }
+                },
+                new ColumnInfo<SapforConfiguration>("тестов") {
+                    @Override
+                    public Object getFieldAt(SapforConfiguration object) {
+                        return ((ConfigurationCache) VisualCaches.GetCache(object)).getTestsCount();
+                    }
+                }
+        );
    }
    @Override
    public DataMenuBar createMenuBar() {
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.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,54 +17,82 @@ import java.util.Date;
 public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
    public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "Автор",
-                "SAPFOR",
-                "Конфигурации",
-                "Задач",
-                "Ядер",
-                "Прогресс",
-                "Начало",
-                "Изменено",
-                "Статус"
-        };
-    }
-    @Override
-    public Object getFieldAt(SapforPackage object, int columnIndex) {
-        PackageCache cache = (PackageCache) VisualCaches.GetCache(object);
-        switch (columnIndex) {
-            case 2:
-                return object.sender_name;
-            case 3:
-                return object.version;
-            case 4:
-                return cache.getConfigurationsDescriptions();
-            case 5:
-                return object.tasksCount;
-            case 6:
-                return object.kernels;
-            case 7:
-                return object.progress;
-            case 8:
-                return new Date(object.StartDate);
-            case 9:
-                return new Date(object.ChangeDate);
-            case 10:
-                return object.state;
-            default:
-                return null;
-        }
-    }
-    @Override
-    protected void AdditionalInitColumns() {
-        columns.get(4).setRendererClass(RendererMultiline.class);
-        columns.get(7).setRendererClass(RendererProgressBar.class);
-        columns.get(8).setRendererClass(RendererDate.class);
-        columns.get(9).setRendererClass(RendererDate.class);
-        columns.get(10).setRendererClass(RendererStatusEnum.class);
+        AddColumns(
+                new ColumnInfo<SapforPackage>("Автор") {
+                    @Override
+                    public Object getFieldAt(SapforPackage object) {
+                        return object.sender_name;
+                    }
+                },
+                new ColumnInfo<SapforPackage>("SAPFOR") {
+                    @Override
+                    public Object getFieldAt(SapforPackage object) {
+                        return object.version;
+                    }
+                },
+                new ColumnInfo<SapforPackage>("Конфигурации") {
+                    @Override
+                    public Object getFieldAt(SapforPackage object) {
+                        return ((PackageCache) VisualCaches.GetCache(object)).getConfigurationsDescriptions();
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMultiline.class;
+                    }
+                },
+                new ColumnInfo<SapforPackage>("Задач") {
+                    @Override
+                    public Object getFieldAt(SapforPackage object) {
+                        return object.tasksCount;
+                    }
+                },
+                new ColumnInfo<SapforPackage>("Ядер") {
+                    @Override
+                    public Object getFieldAt(SapforPackage object) {
+                        return object.kernels;
+                    }
+                },
+                new ColumnInfo<SapforPackage>("Прогресс") {
+                    @Override
+                    public Object getFieldAt(SapforPackage object) {
+                        return object.progress;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererProgressBar.class;
+                    }
+                },
+                new ColumnInfo<SapforPackage>("Начало") {
+                    @Override
+                    public Object getFieldAt(SapforPackage object) {
+                        return new Date(object.StartDate);
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererDate.class;
+                    }
+                },
+                new ColumnInfo<SapforPackage>("Изменено") {
+                    @Override
+                    public Object getFieldAt(SapforPackage object) {
+                        return new Date(object.ChangeDate);
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererDate.class;
+                    }
+                },
+                new ColumnInfo<SapforPackage>("Статус") {
+                    @Override
+                    public Object getFieldAt(SapforPackage object) {
+                        return object.state;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererStatusEnum.class;
+                    }
+                }
+        );
    }
    @Override
    protected void MouseAction2() throws Exception {
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.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.Passes.PassCode;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
@@ -10,27 +11,26 @@ import javax.swing.*;
 public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
    public SapforSettingsForm(DataSet<?, SapforSettings> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "имя",
-                "автор",
-                "флаги"
-        };
-    }
-    @Override
-    public Object getFieldAt(SapforSettings object, int columnIndex) {
-        switch (columnIndex) {
-            case 2:
-                return object.description;
-            case 3:
-                return object.sender_name;
-            case 4:
-                return object.flags;
-            default:
-                return null;
-        }
+        AddColumns(
+                new ColumnInfo<SapforSettings>("имя") {
+                    @Override
+                    public Object getFieldAt(SapforSettings object) {
+                        return object.description;
+                    }
+                },
+                new ColumnInfo<SapforSettings>("автор") {
+                    @Override
+                    public Object getFieldAt(SapforSettings object) {
+                        return object.sender_name;
+                    }
+                },
+                new ColumnInfo<SapforSettings>("флаги") {
+                    @Override
+                    public Object getFieldAt(SapforSettings object) {
+                        return object.flags;
+                    }
+                }
+        );
    }
    @Override
    public DataMenuBar createMenuBar() {
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.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;
@@ -12,21 +13,15 @@ import javax.swing.*;
 public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSettingsCommand> {
    public SapforSettingsCommandsForm(DataSet<?, SapforSettingsCommand> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "Проход"
-        };
-    }
-    @Override
-    public Object getFieldAt(SapforSettingsCommand object, int columnIndex) {
-        switch (columnIndex) {
-            case 2:
-                return object.passCode.getDescription();
-            default:
-                return null;
-        }
+        AddColumns(
+                new ColumnInfo<SapforSettingsCommand>("Проход") {
+                    @Override
+                    public Object getFieldAt(SapforSettingsCommand object) {
+                        return object.passCode.getDescription();
+                    }
+                }
+        );
+        getColumnInfo(0).setVisible(false);
    }
    @Override
    public DataMenuBar createMenuBar() {
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Global;
@@ -13,34 +14,40 @@ import java.util.Comparator;
 public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
    public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "версия",
-                "автор",
-                "дата сборки",
-                "сборка"
-        };
-    }
-    @Override
-    public Object getFieldAt(ServerSapfor object, int columnIndex) {
-        switch (columnIndex) {
-            case 2:
-                return object.version;
-            case 3:
-                return object.sender_name;
-            case 4:
-                return object.getBuildDate();
-            case 5:
-                return object.state;
-        }
-        return null;
-    }
-    @Override
-    protected void AdditionalInitColumns() {
-        columns.get(4).setRendererClass(RendererDate.class);
-        columns.get(5).setRendererClass(RendererStatusEnum.class);
+        AddColumns(
+                new ColumnInfo<ServerSapfor>("версия") {
+                    @Override
+                    public Object getFieldAt(ServerSapfor object) {
+                        return object.version;
+                    }
+                },
+                new ColumnInfo<ServerSapfor>("автор") {
+                    @Override
+                    public Object getFieldAt(ServerSapfor object) {
+                        return object.sender_name;
+                    }
+                },
+                new ColumnInfo<ServerSapfor>("дата сборки") {
+                    @Override
+                    public Object getFieldAt(ServerSapfor object) {
+                        return object.getBuildDate();
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererDate.class;
+                    }
+                },
+                new ColumnInfo<ServerSapfor>("сборка") {
+                    @Override
+                    public Object getFieldAt(ServerSapfor object) {
+                        return object.state;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererStatusEnum.class;
+                    }
+                }
+        );
    }
    @Override
    protected void ShowCurrentObject() throws Exception {