рефакторинг. неудачные наименования классов, и остатки старых вариантов

src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java

@@ -1,50 +1,26 @@
 package SapforTestingSystem.SapforTasksPackage;
-import Common.Constants;
-import Common.Current;
-import Common.Database.DBObject;
 import Common.Database.iDBObject;
-import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
-import TestingSystem.Test.Test;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import TestingSystem.TasksPackage.TasksPackageState;
 import com.sun.org.glassfish.gmbal.Description;
-
-import java.util.Vector;
 public class SapforTasksPackage extends iDBObject {
-    public int sapforscenario_id = Constants.Nan;
     @Description("DEFAULT ''")
-    public String sapforconfiguration_id = "";
-    //--
+    public String testsNames = "";//имена тестов через ; для отображения
+    //---
+    public String sapfor_version = "?"; //тестируемая версия SAPFOR
+    public long sapfor_build_date = 0;
+    //---
     public String workspace = ""; //домашняя папка
     //---
-    @Description("DEFAULT ''")
-    public String flags = "";
-    @Description("DEFAULT ''")
-    public String passesNames = "";
-    @Description("DEFAULT 0")
-    public int versions_tree_built = 0;
-    //--
-    @Description("IGNORE")
-    public Vector<Test> tests = null;
-    @Description("IGNORE")
-    public Vector<PassCode_2021> codes = null;
-    //--
-    @Override
-    public void SynchronizeFields(DBObject src) {
-        super.SynchronizeFields(src);
-        SapforTasksPackage tasksPackage = (SapforTasksPackage) src;
-        flags = tasksPackage.flags;
-        passesNames = tasksPackage.passesNames;
-    }
-    public SapforTasksPackage(SapforTasksPackage src) {
-        this.SynchronizeFields(src);
-    }
-    public SapforTasksPackage() {
-    }
-    public SapforTasksPackage(SapforConfiguration configuration_in, Vector<Test> tests_in) {
-    }
-    @Override
-    public boolean isVisible() {
-        return Current.HasSapforScenario() && Current.getSapforScenario().id == sapforscenario_id;
-    }
+    public int tasksCount = 0; //Общее число задач
+    //---
+    public long StartDate = 0; //дата начала выполнения
+    public long ChangeDate = 0;//дата окончания выполнения
+    //-
+    public TasksPackageState state = TasksPackageState.Queued;
+    // допустимые состояния
+    //Queued
+    //PackageStart
+    //RunningExecution
+    //Done
+    //Aborted
 }
-

src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java

@@ -1,29 +1,37 @@
 package SapforTestingSystem.SapforTasksPackage;
 import Common.Current;
-import Common.Database.*;
+import Common.Database.iDBTable;
 import Common.UI.DataSetControlForm;
-import SapforTestingSystem.SapforTask.SapforTask;
 
-import java.util.LinkedHashMap;
+import java.util.Date;
+
+import static Common.UI.Tables.TableRenderers.RendererDate;
+import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
 public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage> {
     public SapforTasksPackagesDBTable() {
         super(SapforTasksPackage.class);
     }
     @Override
     public Current CurrentName() {
-        return Current.SapforTasksPackage;
+        return Current.SapforScenario;
     }
     @Override
     public String getSingleDescription() {
-        return "пакеты задач Sapfor";
+        return "пакет задач Sapfor";
     }
     @Override
     public String getPluralDescription() {
-        return "пакеты задач";
+        return "пакеты задач Sapfor";
     }
     @Override
     protected DataSetControlForm createUI() {
         return new DataSetControlForm(this) {
+            @Override
+            protected void AdditionalInitColumns() {
+                columns.get(4).setRenderer(RendererDate);
+                columns.get(5).setRenderer(RendererDate);
+                columns.get(6).setRenderer(RendererStatusEnum);
+            }
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
@@ -39,25 +47,39 @@ public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage> {
     @Override
     public String[] getUIColumnNames() {
         return new String[]{
-                "Проходы",
-                "Флаги"
+                "SAPFOR",
+                "Тесты",
+                "Задач",
+                "Начало",
+                "Изменено",
+                "Статус"
         };
     }
     @Override
     public Object getFieldAt(SapforTasksPackage object, int columnIndex) {
         switch (columnIndex) {
             case 1:
-                return object.passesNames;
+                return object.sapfor_version;
             case 2:
-                return object.flags;
+                return object.testsNames;
+            case 3:
+                return object.tasksCount;
+            case 4:
+                return new Date(object.StartDate);
+            case 5:
+                return new Date(object.ChangeDate);
+            case 6:
+                return object.state;
             default:
                 return null;
         }
     }
+    /*
     @Override
     public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
         LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
-        res.put(SapforTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
+        res.put(SapforTasksPackage.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
         return res;
     }
+     */
 }