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

2024-10-26 14:34:55 +03:00
parent ffcad7a620
commit a79816082a
43 changed files with 1607 additions and 1189 deletions
--- a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
+++ b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.Repository.BugReport.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.RendererProgressBar;
 import Common.Visual.Tables.RendererStatusEnum;
@@ -27,24 +28,81 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
    //-
    public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
+        AddColumns(
+                new ColumnInfo<BugReport>("Описание") {
+                    @Override
+                    public Object getFieldAt(BugReport object) {
+                        return object.getDescriptionHeader();
+                    }
+                    @Override
+                    public int getMaxWidth() {
+                        return 600;
+                    }
+                },
+                new ColumnInfo<BugReport>("Отправитель") {
+                    @Override
+                    public Object getFieldAt(BugReport object) {
+                        return object.sender_name;
+                    }
+                },
+                new ColumnInfo<BugReport>("Исполнитель") {
+                    @Override
+                    public Object getFieldAt(BugReport object) {
+                        return object.executor;
+                    }
+                },
+                new ColumnInfo<BugReport>("Проект") {
+                    @Override
+                    public Object getFieldAt(BugReport object) {
+                        return object.project_version;
+                    }
+                },
+                new ColumnInfo<BugReport>("Завершенность") {
+                    @Override
+                    public Object getFieldAt(BugReport object) {
+                        return object.percentage;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererProgressBar.class;
+                    }
+                },
+                new ColumnInfo<BugReport>("Дата создания") {
+                    @Override
+                    public Object getFieldAt(BugReport object) {
+                        return object.getDate();
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererDate.class;
+                    }
+                },
+                new ColumnInfo<BugReport>("Дата изменения") {
+                    @Override
+                    public Object getFieldAt(BugReport object) {
+                        return object.getChangeDate();
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererDate.class;
+                    }
+                },
+                new ColumnInfo<BugReport>("Статус") {
+                    @Override
+                    public Object getFieldAt(BugReport object) {
+                        return object.state;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererStatusEnum.class;
+                    }
+                }
+        );
    }
    @Override
    protected boolean hasCheckBox() {
        return false;
    }
-    //--
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "Описание",
-                "Отправитель",
-                "Исполнитель",
-                "Проект",
-                "Завершенность",
-                "Дата создания",
-                "Дата изменения",
-                "Статус"};
-    }
    @Override
    protected void ShowCurrentObject() throws Exception {
        super.ShowCurrentObject();
@@ -56,14 +114,6 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
        Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowNoCurrentBugReport();
    }
    @Override
-    protected void AdditionalInitColumns() {
-        columns.get(1).setMaxWidth(600);
-        columns.get(5).setRendererClass(RendererProgressBar.class);
-        columns.get(6).setRendererClass(RendererDate.class);
-        columns.get(7).setRendererClass(RendererDate.class);
-        columns.get(8).setRendererClass(RendererStatusEnum.class);
-    }
-    @Override
    protected void MouseAction2() throws Exception {
        Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
    }
@@ -116,27 +166,4 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
                        )
        );
    }
-    @Override
-    public Object getFieldAt(BugReport object, int columnIndex) {
-        switch (columnIndex) {
-            case 1:
-                return object.getDescriptionHeader();
-            case 2:
-                return object.sender_name;
-            case 3:
-                return object.executor;
-            case 4:
-                return object.project_version;
-            case 5:
-                return object.percentage;
-            case 6:
-                return object.getDate();
-            case 7:
-                return object.getChangeDate();
-            case 8:
-                return object.state;
-            default:
-                return null;
-        }
-    }
 }
--- a/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
+++ b/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
@@ -5,6 +5,7 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Menus.VisualiserMenu;
+import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.RendererMaskedNanInteger;
 import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Global;
@@ -16,39 +17,50 @@ import java.util.Vector;
 public class ComponentsForm extends DataSetControlForm<Component> {
    public ComponentsForm(DataSet<?, Component> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "Компонент",
-                "Текущая версия",
-                "Актуальная версия",
-                "Дата сборки",
-                "Статус"};
-    }
-    @Override
-    public Object getFieldAt(Component object, int columnIndex) {
-        switch (columnIndex) {
-            case 2:
-                return object.getComponentType().getDescription();
-            case 3:
-                return object.version;
-            case 4:
-                return object.actual_version;
-            case 5:
-                return object.date_text;
-            case 6:
-                return object.getState();
-            default:
-                return null;
-        }
-    }
-    @Override
-    protected void AdditionalInitColumns() {
-        columns.get(0).setVisible(false);
-        columns.get(3).setRendererClass(RendererMaskedNanInteger.class);
-        columns.get(4).setRendererClass(RendererMaskedNanInteger.class);
-        columns.get(6).setRendererClass(RendererStatusEnum.class);
+        AddColumns(
+                new ColumnInfo<Component>("Компонент") {
+                    @Override
+                    public Object getFieldAt(Component object) {
+                        return object.getComponentType().getDescription();
+                    }
+                },
+                new ColumnInfo<Component>("Текущая версия") {
+                    @Override
+                    public Object getFieldAt(Component object) {
+                        return object.version;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMaskedNanInteger.class;
+                    }
+                },
+                new ColumnInfo<Component>("Актуальная версия") {
+                    @Override
+                    public Object getFieldAt(Component object) {
+                        return object.actual_version;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMaskedNanInteger.class;
+                    }
+                },
+                new ColumnInfo<Component>("Дата сборки") {
+                    @Override
+                    public Object getFieldAt(Component object) {
+                        return object.date_text;
+                    }
+                },
+                new ColumnInfo<Component>("Статус") {
+                    @Override
+                    public Object getFieldAt(Component object) {
+                        return object.getState();
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererStatusEnum.class;
+                    }
+                }
+        );
    }
    @Override
    public DataMenuBar createMenuBar() {
--- a/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
+++ b/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.Repository.SubscriberWorkspace.UI;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Tables.ColumnInfo;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
@@ -11,31 +12,33 @@ import javax.swing.*;
 public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {
    public SubscriberWorkspacesForm(DataSet<?, SubscriberWorkspace> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
+        AddColumns(
+                new ColumnInfo<SubscriberWorkspace>("URL") {
+                    @Override
+                    public Object getFieldAt(SubscriberWorkspace object) {
+                        return object.URL;
+                    }
+                },
+                new ColumnInfo<SubscriberWorkspace>("пользователь") {
+                    @Override
+                    public Object getFieldAt(SubscriberWorkspace object) {
+                        return object.login;
+                    }
+                },
+                new ColumnInfo<SubscriberWorkspace>("папка") {
+                    @Override
+                    public Object getFieldAt(SubscriberWorkspace object) {
+                        return object.path;
+                    }
+                }
+        );
+        getColumnInfo(0).setVisible(false);
    }
    @Override
    protected boolean hasCheckBox() {
        return false;
    }
    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "URL",
-                "пользователь",
-                "папка"};
-    }
-    @Override
-    public Object getFieldAt(SubscriberWorkspace object, int columnIndex) {
-        switch (columnIndex) {
-            case 1:
-                return object.URL;
-            case 2:
-                return object.login;
-            case 3:
-                return object.path;
-        }
-        return null;
-    }
-    @Override
    public DataMenuBar createMenuBar() {
        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
    }
--- a/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
+++ b/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.Repository.Subscribes.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 Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Global;
@@ -13,33 +14,51 @@ import javax.swing.*;
 public class SubsribersForm extends DataSetControlForm<Subscriber> {
    public SubsribersForm(DataSet<?, Subscriber> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
+        AddColumns(
+                new ColumnInfo<Subscriber>("Имя") {
+                    @Override
+                    public Object getFieldAt(Subscriber object) {
+                        return object.name;
+                    }
+                    @Override
+                    public boolean isVisible() {
+                        return Global.componentsServer.db.bugReports.getUI().getCurrent() != null;
+                    }
+                },
+                new ColumnInfo<Subscriber>("Роль") {
+                    @Override
+                    public Object getFieldAt(Subscriber object) {
+                        return object.role.getDescription();
+                    }
+                    @Override
+                    public boolean isVisible() {
+                        return Global.mainModule.getAccount().role.equals(AccountRole.Admin);
+                    }
+                },
+                new ColumnInfo<Subscriber>("Рассылка") {
+                    @Override
+                    public Object getFieldAt(Subscriber object) {
+                        return (object.mailOn == 0) ? "выключена" : "включена";
+                    }
+                    @Override
+                    public boolean isVisible() {
+                        return Global.mainModule.getAccount().role.equals(AccountRole.Admin);
+                    }
+                }
+        );
    }
    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "Имя",
-                "Роль",
-                "Рассылка"};
-    }
-    @Override
-    public Object getFieldAt(Subscriber object, int columnIndex) {
-        switch (columnIndex) {
-            case 2:
-                return object.name;
-            case 3:
-                return object.role.getDescription();
-            case 4:
-                return (object.mailOn == 0) ? "выключена" : "включена";
-        }
-        return object.name;
-    }
-    @Override
-    protected void AdditionalInitColumns() {
-        boolean admin = Global.mainModule.getAccount().role.equals(AccountRole.Admin);
-        columns.get(0).setVisible(admin);
-        columns.get(1).setVisible(Global.componentsServer.db.bugReports.getUI().getCurrent() != null);
-        columns.get(3).setVisible(admin);
-        columns.get(4).setVisible(admin);
+    protected ColumnInfo<Subscriber> createPKColumn() {
+        return new ColumnInfo<Subscriber>(dataSource.getPKName()) {
+            @Override
+            public Object getFieldAt(Subscriber object) {
+                return object.getPK();
+            }
+            @Override
+            public boolean isVisible() {
+                return Global.mainModule.getAccount().role.equals(AccountRole.Admin);
+            }
+        };
    }
    @Override
    public DataMenuBar createMenuBar() {