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

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/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 {