no message

.idea/workspace.xml

@@ -7,23 +7,32 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/ConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/DVMConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/ConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/DVMConfigurationsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/DVMConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/DVMConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMPackage.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartDVMPackage.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />

src/Common/Current.java

@@ -19,7 +19,7 @@ import ProjectData.SapforData.Regions.ParallelRegion;
 import Repository.BugReport.BugReport;
 import Repository.Subscribes.Subscriber;
 import TestingSystem.Common.Test.Test;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.UI.PassForm;
 

src/Common/UI/UI.java

@@ -66,8 +66,8 @@ import TestingSystem.Common.Group.GroupsMenuBar;
 import TestingSystem.Common.Test.TestDBTable;
 import TestingSystem.Common.Test.TestsMenuBar;
 import TestingSystem.Common.TestingBar;
-import TestingSystem.DVM.Configuration.DVMConfigurationDBTable;
+import TestingSystem.DVM.DVMConfiguration.DVMConfigurationDBTable;
-import TestingSystem.DVM.Configuration.DVMConfigurationsMenuBar;
+import TestingSystem.DVM.DVMConfiguration.DVMConfigurationsMenuBar;
 import TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
 import TestingSystem.DVM.DVMPackage.DVMPackagesBar;
 import TestingSystem.DVM.DVMTasks.DVMRunTasksBar;

src/Common/Utils/Utils.java

@@ -1288,7 +1288,7 @@ public class Utils {
         System.out.println(new Date(dates.lastElement()));
         return dates.firstElement();
     }
-    //------------------------------------------------------->>>
+    //методы работают только с непустыми запакованными данными
     public static Vector<Integer> unpackIntegers(String packed, String separator){
         Vector<Integer> ids = new Vector<>();
         String[] data = packed.split(separator);

src/TestingSystem/Common/TestingPackage/TestingPackage.java

@@ -5,10 +5,8 @@ import Common.Database.riDBObject;
 import Common.Global;
 import Common.Utils.Utils;
 import TestingSystem.Common.Configuration;
-import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.TasksPackageState;
-import TestingSystem.Common.Test.Test;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.File;
@@ -30,25 +28,12 @@ public abstract class TestingPackage<J> extends riDBObject {
     public int connectionErrosCount = 0;
     //--
     @Description("DEFAULT ''")
-    public String packedConfigurations = "";
+    public String packedConfigurationsIds = "";
     @Description("DEFAULT ''")
-    public String packedGroups = "";
+    public String packedConfigurationsNames = "";
-    @Description("DEFAULT ''")
-    public String packedTests = "";
-    //----
-    @Description("DEFAULT ''")
-    public String configurationsNames = "";
-    @Description("DEFAULT ''")
-    public String groupsNames = "";
-    //----
     @Description("DEFAULT 0")
     public int configurationsCount = 0;
-    @Description("DEFAULT 0")
+    //---
-    public int groupsCount = 0;
-    @Description("DEFAULT 0")
-    public int testsCount = 0;
-
-    //--
     public TasksPackageState state = TasksPackageState.Draft;
     //--
     @Override
@@ -68,16 +53,9 @@ public abstract class TestingPackage<J> extends riDBObject {
         connectionErrosCount = tp.connectionErrosCount;
         state = tp.state;
         //--
-        packedConfigurations = tp.packedConfigurations;
+        packedConfigurationsIds = tp.packedConfigurationsIds;
-        packedGroups = tp.packedGroups;
+        packedConfigurationsNames = tp.packedConfigurationsNames;
-        packedTests = tp.packedTests;
-        //--
         configurationsCount = tp.configurationsCount;
-        groupsCount = tp.groupsCount;
-        testsCount = tp.testsCount;
-        //--
-        groupsNames = tp.groupsNames;
-        configurationsNames = tp.configurationsNames;
     }
     public TestingPackage(TestingPackage p) {
         SynchronizeFields(p);
@@ -112,72 +90,11 @@ public abstract class TestingPackage<J> extends riDBObject {
     }
     public Vector<DVMConfiguration> getConfigurations() {
         Vector<DVMConfiguration> res = new Vector<>();
-        for (int o_id : Utils.unpackIntegers(packedConfigurations, "\n"))
+        for (int o_id : Utils.unpackIntegers(packedConfigurationsIds, "\n"))
             if (Global.testingServer.db.dvm_configurations.containsKey(o_id))
                 res.add(Global.testingServer.db.dvm_configurations.get(o_id));
         return res;
     }
-    public Vector<Group> getGroups() {
-        Vector<Group> res = new Vector<>();
-        for (int o_id : Utils.unpackIntegers(packedGroups, "\n"))
-            if (Global.testingServer.db.groups.containsKey(o_id))
-                res.add(Global.testingServer.db.groups.get(o_id));
-        return res;
-    }
-    public Vector<Test> getTests() {
-        Vector<Test> res = new Vector<>();
-        for (int o_id : Utils.unpackIntegers(packedTests, "\n"))
-            if (Global.testingServer.db.tests.containsKey(o_id))
-                res.add(Global.testingServer.db.tests.get(o_id));
-        return res;
-    }
-    public void Reset() {
-        StartDate = 0;
-        ChangeDate = 0;
-        progress = 0;
-        state = TasksPackageState.Inactive;
-        //--
-        File loaded = new File(getLocalWorkspace(), Constants.LOADED);
-        if (loaded.exists()) {
-            try {
-                Utils.forceDeleteWithCheck(loaded);
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-        }
-    }
-    /*
-    public void printCGT() {
-        try {
-            System.out.println("package="+id);
-            Vector<Configuration> configurations = getConfigurations();
-            System.out.println("+");
-
-            Vector<Group> groups = getGroups();
-            Vector<Test> tests = getTests();
-            Vector<String> res = new Vector<>();
-            res.add("конфигурации: " + configurations.size());
-            for (Configuration configuration : configurations)
-                res.add(configuration.description);
-
-            res.add("группы: " + groups.size());
-            for (Group group : groups)
-                res.add(group.description);
-            //--
-            res.add("тесты: " + tests.size());
-            for (Test test : tests)
-                res.add(test.description);
-            //--
-            res.add("-------");
-            System.out.println(String.join("\n", res));
-        }
-        catch (Exception ex){
-            System.out.println("```");
-            ex.printStackTrace();
-        }
-    }
-     */
-    //------------------------------------------------------->>>
     public void saveConfigurations(Vector<? extends Configuration> new_configurations) {
         Vector<String> res = new Vector<>();
         Vector<String> names = new Vector<>();
@@ -185,26 +102,8 @@ public abstract class TestingPackage<J> extends riDBObject {
             res.add(String.valueOf(configuration.id));
             names.add(configuration.description);
         }
-        packedConfigurations = String.join("\n", res);
+        packedConfigurationsIds = String.join("\n", res);
-        configurationsNames = String.join(";", names);
+        packedConfigurationsNames = String.join("\n", names);
         configurationsCount = new_configurations.size();
     }
-    public void saveGroups(Vector<Group> new_groups) {
-        Vector<String> res = new Vector<>();
-        Vector<String> names = new Vector<>();
-        for (Group group : new_groups) {
-            res.add(String.valueOf(group.id));
-            names.add(group.description);
-        }
-        packedGroups = String.join("\n", res);
-        groupsNames = String.join(";", names);
-        groupsCount = new_groups.size();
-    }
-    public void saveTests(Vector<Test> new_tests) {
-        Vector<String> res = new Vector<>();
-        for (Test test : new_tests)
-            res.add(String.valueOf(test.id));
-        packedTests = String.join("\n", res);
-        testsCount = new_tests.size();
-    }
 }

src/TestingSystem/Common/TestsDatabase.java

@@ -11,7 +11,7 @@ import TestingSystem.Common.Group.GroupsDBTable;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.Common.Test.TestDBTable;
 import TestingSystem.Common.TestingPackageToKill.TestingPackagesToKillDBTable;
-import TestingSystem.DVM.Configuration.DVMConfigurationDBTable;
+import TestingSystem.DVM.DVMConfiguration.DVMConfigurationDBTable;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
 import TestingSystem.DVM.DVMTasks.DVMRunTasksSet;

src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java

@@ -1,4 +1,4 @@
-package TestingSystem.DVM.Configuration;
+package TestingSystem.DVM.DVMConfiguration;
 import Common.Database.DBObject;
 import Common.Utils.Utils;
 import GlobalData.RunConfiguration.RunConfiguration;

src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java

@@ -1,4 +1,4 @@
-package TestingSystem.DVM.Configuration;
+package TestingSystem.DVM.DVMConfiguration;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Database.iDBTable;
@@ -7,7 +7,7 @@ import Common.UI.Tables.TableRenderers;
 import Common.UI.VisualiserStringList;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Utils;
-import TestingSystem.DVM.Configuration.UI.ConfigurationFields;
+import TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
 public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
     public DVMConfigurationDBTable() {
         super(DVMConfiguration.class);

src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java

@@ -1,4 +1,4 @@
-package TestingSystem.DVM.Configuration;
+package TestingSystem.DVM.DVMConfiguration;
 import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMConfigurationsMenuBar extends DataMenuBar {

src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.DVM.Configuration.UI.ConfigurationFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields">
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
@@ -15,7 +15,7 @@
           </grid>
         </constraints>
         <properties>
-          <dividerLocation value="727"/>
+          <dividerLocation value="500"/>
           <dividerSize value="3"/>
         </properties>
         <border type="none"/>

src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java

@@ -1,4 +1,4 @@
-package TestingSystem.DVM.Configuration.UI;
+package TestingSystem.DVM.DVMConfiguration.UI;
 import Common.Current;
 import Common.UI.VisualiserStringList;
 import Common.UI.TextField.StyledTextField;

src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java

@@ -40,11 +40,11 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(6).setRenderer(RendererMultiline);
-                columns.get(7).setRenderer(RendererMultiline);
+             //   columns.get(7).setRenderer(RendererMultiline);
-                columns.get(11).setRenderer(RendererProgress);
+                columns.get(9).setRenderer(RendererProgress);
-                columns.get(12).setRenderer(RendererDate);
+                columns.get(10).setRenderer(RendererDate);
-                columns.get(13).setRenderer(RendererDate);
+                columns.get(11).setRenderer(RendererDate);
-                columns.get(14).setRenderer(RendererStatusEnum);
+                columns.get(12).setRenderer(RendererStatusEnum);
             }
             @Override
             public void ShowCurrentObject() throws Exception {
@@ -71,8 +71,8 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
                 "DVM",
                 //-
                 "конфигурации",
-                "группы",
+              //  "группы",
-                "тестов",
+              //  "тестов",
                 //-
                 "Задач",
                 "Ядер",
@@ -83,11 +83,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
         };
     }
     public static Vector<String> getConfigurationsNames(TestingPackage object){
-        String[] data = object.configurationsNames.split(";");
+        String[] data = object.packedConfigurationsNames.split("\n");
-        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));
     }
 
@@ -104,21 +100,21 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
                 return object.version;
             case 6:
                 return getConfigurationsNames(object);
+       //     case 7:
+       //         return getGroupsNames(object);
+       //     case 8:
+       //         return object.testsCount;
             case 7:
-                return getGroupsNames(object);
-            case 8:
-                return object.testsCount;
-            case 9:
                 return object.tasksCount;
-            case 10:
+            case 8:
                 return object.kernels;
-            case 11:
+            case 9:
                 return object.progress;
-            case 12:
+            case 10:
                 return new Date(object.StartDate);
-            case 13:
+            case 11:
                 return new Date(object.ChangeDate);
-            case 14:
+            case 12:
                 return object.state;
             default:
                 return null;

src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java

@@ -17,15 +17,12 @@ public class DVMPackagesBar extends DataMenuBar {
               //  PassCode_2021.AddTasksToDVMPackage
         );
         addSeparator();
-        addPasses(PassCode_2021.ShowCurrentDVMPackage, PassCode_2021.SaveCurrentDVMPackage
 
-        //        PassCode_2021.CloneDVMPackage
+        // addPasses(PassCode_2021.CloneDVMPackage);
-        );
         addSeparator();
         addPasses(PassCode_2021.DeleteDVMPackage);
         addSeparator();
-        addPasses(PassCode_2021.StartDVMPackage,
+        addPasses(PassCode_2021.AbortDVMPackage);
-                PassCode_2021.AbortDVMPackage);
         addSeparator();
         addPasses(PassCode_2021.DownloadDVMPackage,
                 PassCode_2021.ExportDVMPackageToExcel);

src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java

@@ -1,7 +1,7 @@
 package TestingSystem.DVM.DVMTasks;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;

src/TestingSystem/DVM/DVMTasks/DVMRunTask.java

@@ -7,7 +7,7 @@ import GlobalData.Tasks.TaskState;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.Common.Test.TestType;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import com.google.gson.annotations.Expose;
 
 import java.io.File;

src/TestingSystem/DVM/DVMTasks/DVMTask.java

@@ -8,7 +8,7 @@ import ProjectData.LanguageName;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.Common.Test.TestType;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import com.google.gson.annotations.Expose;
 import org.apache.commons.io.FileUtils;
 

src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java

@@ -7,7 +7,7 @@ import TestingSystem.Common.Configuration;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.TasksPackageState;
 import TestingSystem.Common.Test.Test;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.DVMPackage.DVMPackage_json;
 import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
@@ -177,8 +177,6 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
         json.compilationTasks.addAll(tasks);
         //--
         target.saveConfigurations(configurations);
-        target.saveGroups(groups);
-        target.saveTests(tests);
         //--
         target.tasksCount += tasks_count;
         target.state= TasksPackageState.Inactive;

src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java

@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
 import TestingSystem.Common.TestingServer;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import Visual_DVM_2021.Passes.DeleteServerObjects;
 public class DeleteConfiguration extends DeleteServerObjects<TestingServer, DVMConfiguration> {
     public DeleteConfiguration() {

src/Visual_DVM_2021/Passes/All/EditConfiguration.java

@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
 import TestingSystem.Common.TestingServer;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import Visual_DVM_2021.Passes.Server.EditServerObject;
 public class EditConfiguration extends EditServerObject<TestingServer, DVMConfiguration> {
     public EditConfiguration() {

src/Visual_DVM_2021/Passes/All/PublishConfiguration.java

@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
 import TestingSystem.Common.TestingServer;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import Visual_DVM_2021.Passes.Server.PublishServerObject;
 public class PublishConfiguration extends PublishServerObject<TestingServer, DVMConfiguration> {
     public PublishConfiguration() {

src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java

@@ -4,7 +4,7 @@ import Common.Global;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.Common.TestingServer;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import Visual_DVM_2021.Passes.Server.EditServerObject;
 
 import java.util.Vector;

src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java

@@ -1,178 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Common.Global;
-import Common.UI.UI;
-import Common.Utils.Utils;
-import TestingSystem.Common.Configuration;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.Test.Test;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
-import TestingSystem.DVM.DVMPackage.DVMPackage;
-import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
-import TestingSystem.DVM.DVMTasks.DVMRunTask;
-import Visual_DVM_2021.Passes.Server.EditServerObject;
-
-import java.util.LinkedHashMap;
-import java.util.Vector;
-public class SaveCurrentDVMPackage extends EditServerObject<TestingServer, DVMPackage> {
-    //--
-    Vector<DVMConfiguration> configurations;
-    Vector<Group> groups;
-    Vector<Test> tests;
-    //--
-    Vector<String> configurationsNames;
-    Vector<String> groupsNames;
-    //--
-    LinkedHashMap<Integer, Vector<Test>> testsByGroups;
-    int tasks_count;
-    Vector<DVMCompilationTask> tasks;
-    public SaveCurrentDVMPackage() {
-        super(Global.testingServer,DVMPackage.class);
-    }
-    //--
-    @Override
-    public String getIconPath() {
-        return "/icons/Save.png";
-    }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    public static String checkFlags(String flags_in) {
-        if (!flags_in.contains("-shared-dvm")) {
-            if (flags_in.isEmpty())
-                return "-shared-dvm";
-            else return flags_in + " -shared-dvm";
-        } else
-            return flags_in;
-    }
-    public static String checkEnvironments(String environmentsSet_in) {
-        if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
-            if (environmentsSet_in.isEmpty())
-                return "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
-            else
-                return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
-        } else
-            return environmentsSet_in;
-    }
-    //--
-    public Vector<DVMCompilationTask> createTasksCGT(
-            DVMConfiguration configuration,
-            Group group,
-            Test test
-    ) {
-        Vector<DVMCompilationTask> compilationTasks = new Vector<>();
-        for (String flags : configuration.getFlagsArray()) {
-            String checked_flags = checkFlags(flags);
-            DVMCompilationTask dvmCompilationTask = new DVMCompilationTask(
-                    configuration,
-                    group,
-                    test,
-                    checked_flags
-            );
-            Vector<String> matrixes = configuration.getMatrixes(test.max_dim);
-            Vector<String> environments = configuration.getEnvironments();
-            for (String environmentSet : environments) {
-                String checkedEnvironments = checkEnvironments(environmentSet);
-                if (flags.trim().equalsIgnoreCase("-s")) {
-                    dvmCompilationTask.runTasks.add(new DVMRunTask(
-                            configuration,
-                            group,
-                            test,
-                            "",
-                            checked_flags,
-                            checkedEnvironments,
-                            configuration.getParamsText(),
-                            target.kernels
-                    ));
-                    tasks_count++;
-                } else
-                    for (String matrix : matrixes) {
-                        dvmCompilationTask.runTasks.add(new DVMRunTask(
-                                configuration,
-                                group,
-                                test,
-                                matrix,
-                                checked_flags,
-                                checkedEnvironments,
-                                configuration.getParamsText(),
-                                target.kernels));
-                        tasks_count++;
-                    }
-            }
-            compilationTasks.add(dvmCompilationTask);
-        }
-        return compilationTasks;
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = null;
-        configurations = new Vector<>();
-        //---
-        groups = new Vector<>();
-        tests = new Vector<>();
-        //---
-        configurationsNames = new Vector<>();
-        groupsNames = new Vector<>();
-        //---
-        tasks_count = 0;
-        tasks = new Vector<>();
-        testsByGroups = new LinkedHashMap<>();
-        //---
-        if (!Current.Check(Log, Current.DVMPackage)) return false;
-        //--
-        target = Current.getDVMPackage();
-        if (target.state.isActive()) {
-            Log.Writeln_("Возможно редактировать только неактивный пакет!");
-            return false;
-        }
-        for (DVMConfiguration configuration : Global.testingServer.db.dvm_configurations.getCheckedItems()) {
-            configurations.add(configuration);
-            configurationsNames.add(configuration.description);
-        }
-        for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
-            groups.add(group);
-            groupsNames.add(group.description);
-            Vector<Test> groupTests = Global.testingServer.db.tests.getSelectedGroupTests(group);
-            tests.addAll(groupTests);
-            testsByGroups.put(group.id, groupTests);
-        }
-        //---
-        //создание задач
-        for (DVMConfiguration configuration : configurations) {
-            for (Group group : groups) {
-                Vector<Test> groupTests = testsByGroups.get(group.id);
-                for (Test test: groupTests)
-                    tasks.addAll(createTasksCGT(configuration, group, test));
-            }
-        }
-        //---
-        /*
-        if (tasks.isEmpty()) {
-            Log.Writeln_("Не удалось добавить задачи.\n" +
-                    "Для создания задач отметьте требуемые конфигурации,\n" +
-                    "Отметьте группы, или отдельные тесты в отмеченной текущей группе");
-            return false;
-        }
-         */
-        //---
-        return UI.Question("Будет создано " + tasks_count + " задач. Продолжить");
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        //занесение информации об участвующих группах конфигурациях и тестах
-        target.saveConfigurations(configurations);
-        target.saveGroups(groups);
-        target.saveTests(tests);
-        //--
-        target.saveTasks(tasks, tasks_count);
-        target.Reset();
-        super.ServerAction();
-    }
-    @Override
-    protected void showDone() throws Exception {
-        Global.testingServer.db.dvmPackages.ShowUI(target.id);
-        Global.testingServer.db.dvmRunTasks.ShowDVMPackage(target);
-    }
-}

src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java

@@ -3,7 +3,7 @@ import Common.Current;
 import Common.Global;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.util.Vector;

src/Visual_DVM_2021/Passes/All/ShowCurrentDVMPackage.java

@@ -1,74 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Common.Global;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.Test.Test;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
-import TestingSystem.DVM.DVMPackage.DVMPackage;
-import Visual_DVM_2021.Passes.Pass_2021;
-
-import java.util.Vector;
-public class ShowCurrentDVMPackage extends Pass_2021<DVMPackage> {
-    @Override
-    public String getIconPath() {
-        return "/icons/Edit.png";
-    }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    public Current currentName(){return Current.DVMPackage;};
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = null;
-        if (Current.Check(Log, Current.DVMPackage)) {
-            target = Current.getDVMPackage();
-            return true;
-        }
-        return false;
-    }
-    @Override
-    protected void showPreparation() throws Exception {
-        Global.testingServer.db.UnselectAllGTC();
-    }
-    @Override
-    protected void showDone() throws Exception {
-        System.out.println("package="+target.id);
-        Vector<DVMConfiguration> configurations = target.getConfigurations();
-        Vector<Group> groups = target.getGroups();
-        Vector<Test> tests = target.getTests();
-        //-----
-        Vector<String> res = new Vector<>();
-        res.add("конфигурации: " + configurations.size());
-        for (DVMConfiguration configuration : configurations)
-            res.add(configuration.description);
-        //--
-        res.add("группы: " + groups.size());
-        for (Group group : groups)
-            res.add(group.description);
-        //--
-        res.add("тесты: " + tests.size());
-        for (Test test : tests)
-            res.add(test.description);
-        System.out.println(String.join("\n", res));
-        //--
-        for (DVMConfiguration configuration: configurations)
-            configuration.Select(true);
-        for (Group group: groups)
-            group.Select(true);
-        for (Test test: tests)
-            test.Select(true);
-        //--
-
-        if (!groups.isEmpty()){
-            Global.testingServer.db.groups.ShowUI(groups.lastElement().id);
-        }
-        if (!tests.isEmpty()){
-            Global.testingServer.db.tests.ShowUI(tests.lastElement().id);
-        }
-        if (!configurations.isEmpty()){
-            Global.testingServer.db.dvm_configurations.ShowUI(configurations.lastElement().id);
-        }
-    }
-
-}

src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java

@@ -9,7 +9,7 @@ import GlobalData.User.UserState;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.Common.TestingServer;
-import TestingSystem.DVM.Configuration.DVMConfiguration;
+import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
@@ -156,11 +156,8 @@ public class StartCurrentDVMConfiguration extends PublishServerObject<TestingSer
     }
     @Override
     protected void ServerAction() throws Exception {
-        //занесение информации об участвующих группах конфигурациях и тестах
+        //занесение информации об участвующих конфигурациях
         target.saveConfigurations(configurations);
-        target.saveGroups(groups);
-        target.saveTests(tests);
-        //--
         target.saveTasks(tasks, tasks_count);
         super.ServerAction();
     }

src/Visual_DVM_2021/Passes/All/StartDVMPackage.java

@@ -1,43 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Common.Global;
-import Common.UI.UI;
-import TestingSystem.Common.TasksPackageState;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.DVM.DVMPackage.DVMPackage;
-import Visual_DVM_2021.Passes.Server.EditServerObject;
-public class StartDVMPackage extends EditServerObject<TestingServer, DVMPackage> {
-    @Override
-    public String getIconPath() {
-        return "/icons/Start.png";
-    }
-    public StartDVMPackage() {
-        super(Global.testingServer,DVMPackage.class);
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (!Current.getAccount().CheckRegistered(Log)) {
-            return false;
-        }
-        if (Current.Check(Log,Current.DVMPackage)) {
-            target = Current.getDVMPackage();
-            //-
-            if (!target.state.equals(TasksPackageState.Inactive)) {
-                Log.Writeln_("Возможно запустить только неактивный пакет.");
-                return false;
-            }
-            if (target.tasksCount == 0) {
-                Log.Writeln_("В пакете отсутствуют задачи.");
-                return false;
-            }
-            if (UI.Question("Будет запущено:\n"
-                    + target.tasksCount + " задач.\n" +
-                    "Продолжить")) {
-                target.connectionErrosCount=0;
-                target.state = TasksPackageState.Queued;
-                return true;
-            }
-        }
-        return false;
-    }
-}

src/Visual_DVM_2021/Passes/PassCode_2021.java

@@ -299,8 +299,7 @@ public enum PassCode_2021 {
     ActualizePackages,
     //->
     AddDVMPackage,
-    AddTasksToDVMPackage,
+    AddTasksToDVMPackage,// вывести. теперь все через конфигурацию.
-    StartDVMPackage,
     DeleteDVMPackage,
     AbortDVMPackage,
     //->
@@ -342,9 +341,6 @@ public enum PassCode_2021 {
     ShowSapforCompilationOut,
     ShowSapforCompilationErr,
     GetOldBugReports,
-    ShowCurrentDVMPackage,
-    SaveCurrentDVMPackage,
-
     ShowCurrentDVMConfigurationTests,
     SaveCurrentDVMConfiguration,
     StartCurrentDVMConfiguration,
@@ -360,10 +356,6 @@ public enum PassCode_2021 {
                 return "Отметить группы и тесты, участвующие в текущей конфигурации DVM системы";
             case SaveCurrentDVMConfiguration:
                 return "Сохранить информацию о тестах текущей конфигурации DVM системы";
-            case SaveCurrentDVMPackage:
-                return "Сохранить текущий пакет тестирования DVM системы";
-            case ShowCurrentDVMPackage:
-                return "Редактировать пакет тестирования DVM системы";
             case GetOldBugReports:
                 return "Получить неиспользуемые баг репорты";
             case SPF_RenameIncludes:
@@ -435,8 +427,6 @@ public enum PassCode_2021 {
                 return "Прервать пакет тестирования DVM";
             case DeleteDVMPackage:
                 return "Удалить пакет задач DVM";
-            case StartDVMPackage:
-                return "Запустить пакет задач DVM";
             case DownloadDVMPackage:
                 return "Скачать пакет задач DVM";
             case AddTasksToDVMPackage: