no message

src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java

@@ -1,15 +1,15 @@
 package TestingSystem.DVM.DVMPackage;
 import Common.Current;
-import Common.Database.*;
+import Common.Database.iDBTable;
 import Common.Global;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
-import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
-import TestingSystem.DVM.DVMTasks.DVMRunTask;
-import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
+import TestingSystem.Common.TestingPackage.TestingPackage;
 
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.Vector;
 
 import static Common.UI.Tables.TableRenderers.*;
 public class DVMPackageDBTable extends iDBTable<DVMPackage> {
@@ -39,10 +39,12 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(8).setRenderer(RendererProgress);
-                columns.get(9).setRenderer(RendererDate);
-                columns.get(10).setRenderer(RendererDate);
-                columns.get(11).setRenderer(RendererStatusEnum);
+                columns.get(6).setRenderer(RendererMultiline);
+                columns.get(7).setRenderer(RendererMultiline);
+                columns.get(11).setRenderer(RendererProgress);
+                columns.get(12).setRenderer(RendererDate);
+                columns.get(13).setRenderer(RendererDate);
+                columns.get(14).setRenderer(RendererStatusEnum);
             }
             @Override
             public void ShowCurrentObject() throws Exception {
@@ -64,12 +66,15 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     public String[] getUIColumnNames() {
         return new String[]{
                 "Автор",
-
                 "Машина",
                 "Пользователь",
                 "DVM",
+                //-
+                "конфигурации",
+                "группы",
+                "тестов",
+                //-
                 "Задач",
-
                 "Ядер",
                 "Прогресс",
                 "Начало",
@@ -77,6 +82,15 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
                 "Статус"
         };
     }
+    public static Vector<String> getConfigurationsNames(TestingPackage object){
+        String[] data = object.configurationsNames.split(";");
+        return new Vector<String>(Arrays.asList(data));
+    }
+    public static Vector<String> getGroupsNames(TestingPackage object){
+        String[] data = object.groupsNames.split(";");
+        return new Vector<String>(Arrays.asList(data));
+    }
+
     @Override
     public Object getFieldAt(DVMPackage object, int columnIndex) {
         switch (columnIndex) {
@@ -89,16 +103,22 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
             case 5:
                 return object.version;
             case 6:
-                return object.tasksCount;
+                return getConfigurationsNames(object);
             case 7:
-                return object.kernels;
+                return getGroupsNames(object);
             case 8:
-                return object.progress;
+                return object.testsCount;
             case 9:
-                return new Date(object.StartDate);
+                return object.tasksCount;
             case 10:
-                return new Date(object.ChangeDate);
+                return object.kernels;
             case 11:
+                return object.progress;
+            case 12:
+                return new Date(object.StartDate);
+            case 13:
+                return new Date(object.ChangeDate);
+            case 14:
                 return object.state;
             default:
                 return null;
@@ -109,7 +129,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
         return new Comparator<DVMPackage>() {
             @Override
             public int compare(DVMPackage o1, DVMPackage o2) {
-                return o2.id-o1.id;
+                return o2.id - o1.id;
             }
         };
         // return Comparator.comparingInt(o -> o.).reversed();

src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java

@@ -12,9 +12,15 @@ public class DVMPackagesBar extends DataMenuBar {
         addPasses(PassCode_2021.SynchronizeTests);
         addSeparator();
         //addMenus(new AddDVMPackageMenu());
-        addPasses(PassCode_2021.AddDVMPackage, PassCode_2021.AddTasksToDVMPackage);
+        addPasses(PassCode_2021.AddDVMPackage
+
+              //  PassCode_2021.AddTasksToDVMPackage
+        );
         addSeparator();
-        addPasses(PassCode_2021.ShowCurrentDVMPackage, PassCode_2021.CloneDVMPackage);
+        addPasses(PassCode_2021.ShowCurrentDVMPackage, PassCode_2021.SaveCurrentDVMPackage
+
+        //        PassCode_2021.CloneDVMPackage
+        );
         addSeparator();
         addPasses(PassCode_2021.DeleteDVMPackage);
         addSeparator();