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

2024-10-26 14:34:55 +03:00
parent ffcad7a620
commit a79816082a
43 changed files with 1607 additions and 1189 deletions
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.ProjectData.SapforData.Variants.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.RendererMaskedNanInteger;
 import Common.Visual.Tables.RendererMultiline;
@@ -12,62 +13,125 @@ import javax.swing.*;
 public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
    public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) {
        super(dataSource_in, mountPanel_in);
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{
-                "Распределение",
-                "PARALLEL",
-                "REMOTE",
-                "REDISTRIBUTE",
-                "INTERVALS",
-                "PS.REMOTE",
-                "PS.SHADOW",
-                "PS.REDUCTION",
-                "PS.ACROSS",
-                "Оценка",
-                "Дата оценки",
-                "Версия"};
-    }
-    @Override
-    public Object getFieldAt(ParallelVariant object, int columnIndex) {
-        switch (columnIndex) {
-            case 2:
-                return object.templates_description;
-            case 3:
-                return object.stats.ParallelCount;
-            case 4:
-                return object.stats.RemoteCount;
-            case 5:
-                return object.stats.RedistributeCount;
-            case 6:
-                return object.stats.IntervalCount;
-            case 7:
-                return object.stats.PS_RemoteCount;
-            case 8:
-                return object.stats.PS_ShadowCount;
-            case 9:
-                return object.stats.PS_ReductionCount;
-            case 10:
-                return object.stats.PS_AcrossCount;
-            case 11:
-                return object.stats.Rank;
-            case 12:
-                return object.stats.getPredictionDate();
-            case 13:
-                return object.stats.last_version;
-            default:
-                return null;
-        }
-    }
-    @Override
-    protected void AdditionalInitColumns() {
-        columns.get(0).setVisible(false);
-        columns.get(2).setRendererClass(RendererMultiline.class);
-        for (int i = 3; i < columns.size() - 3; ++i)
-            columns.get(i).setRendererClass(RendererMaskedNanInteger.class);
-        columns.get(columns.size() - 3).setRendererClass(RendererVariantRank.class);
-        columns.get(columns.size() - 2).setRendererClass(RendererDate.class);
+        AddColumns(
+                new ColumnInfo<ParallelVariant>("Распределение") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.templates_description;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMultiline.class;
+                    }
+                },
+                new ColumnInfo<ParallelVariant>("PARALLEL") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.stats.ParallelCount;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMaskedNanInteger.class;
+                    }
+                },
+                new ColumnInfo<ParallelVariant>("REMOTE") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.stats.RemoteCount;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMaskedNanInteger.class;
+                    }
+                },
+                new ColumnInfo<ParallelVariant>("REDISTRIBUTE") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.stats.RedistributeCount;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMaskedNanInteger.class;
+                    }
+                },
+                new ColumnInfo<ParallelVariant>("INTERVALS") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.stats.IntervalCount;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMaskedNanInteger.class;
+                    }
+                },
+                new ColumnInfo<ParallelVariant>("PS.REMOTE") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.stats.PS_RemoteCount;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMaskedNanInteger.class;
+                    }
+                },
+                new ColumnInfo<ParallelVariant>("PS.SHADOW") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.stats.PS_ShadowCount;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMaskedNanInteger.class;
+                    }
+                },
+                new ColumnInfo<ParallelVariant>("PS.REDUCTION") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.stats.PS_ReductionCount;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMaskedNanInteger.class;
+                    }
+                },
+                new ColumnInfo<ParallelVariant>("PS.ACROSS") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.stats.PS_AcrossCount;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererMaskedNanInteger.class;
+                    }
+                },
+                new ColumnInfo<ParallelVariant>("Оценка") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.stats.Rank;
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererVariantRank.class;
+                    }
+                },
+                new ColumnInfo<ParallelVariant>("Дата оценки") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.stats.getPredictionDate();
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererDate.class;
+                    }
+                },
+                new ColumnInfo<ParallelVariant>("Версия") {
+                    @Override
+                    public Object getFieldAt(ParallelVariant object) {
+                        return object.stats.last_version;
+                    }
+                }
+        );
+        getColumnInfo(0).setVisible(false);
    }
    @Override
    public DataMenuBar createMenuBar() {