From 3e55bdec38f7fff20b8246938880d145aff4a7ad Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 16 Sep 2024 16:03:39 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 26 ++---------------
 .../DVMConfigurationsMenuBar.java             |  2 +-
 .../DVM/DVMPackage/DVMPackagesBar.java        | 16 ++---------
 ...va => StartSelectedDVMConfigurations.java} | 28 +++++++++----------
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  6 ++--
 5 files changed, 23 insertions(+), 55 deletions(-)
 rename src/Visual_DVM_2021/Passes/All/{StartCurrentDVMConfiguration.java => StartSelectedDVMConfigurations.java} (87%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 739930d8..a1413c3e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,31 +8,9 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.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/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.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/DVMConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.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/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/DVMConfiguration/DVMConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.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/All/StartCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" afterDir="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" />
diff --git a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
index 6261d51b..45ac6020 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
@@ -13,7 +13,7 @@ public class DVMConfigurationsMenuBar extends DataMenuBar {
                 PassCode_2021.SaveCurrentDVMConfiguration,
                 PassCode_2021.DeleteConfiguration,
 
-                PassCode_2021.StartCurrentDVMConfiguration
+                PassCode_2021.StartSelectedDVMConfigurations
         );
     }
 }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
index 7005ed9f..b2f7f8ba 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
@@ -11,21 +11,11 @@ public class DVMPackagesBar extends DataMenuBar {
         super("пакеты задач DVM");
         addPasses(PassCode_2021.SynchronizeTests);
         addSeparator();
-        //addMenus(new AddDVMPackageMenu());
-        addPasses(PassCode_2021.AddDVMPackage
-
-              //  PassCode_2021.AddTasksToDVMPackage
-        );
-        addSeparator();
-
-        // addPasses(PassCode_2021.CloneDVMPackage);
-        addSeparator();
-        addPasses(PassCode_2021.DeleteDVMPackage);
-        addSeparator();
-        addPasses(PassCode_2021.AbortDVMPackage);
+        addPasses(PassCode_2021.AbortDVMPackage );
         addSeparator();
         addPasses(PassCode_2021.DownloadDVMPackage,
-                PassCode_2021.ExportDVMPackageToExcel);
+                PassCode_2021.ExportDVMPackageToExcel,
+                PassCode_2021.DeleteDVMPackage);
         add(new JSeparator());
         add(new MenuBarButton() {
             {
diff --git a/src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
similarity index 87%
rename from src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java
rename to src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
index 4822d795..4c733c7b 100644
--- a/src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
@@ -18,14 +18,14 @@ import Visual_DVM_2021.Passes.Server.PublishServerObject;
 
 import java.util.LinkedHashMap;
 import java.util.Vector;
-public class StartCurrentDVMConfiguration extends PublishServerObject<TestingServer, DVMPackage> {
+public class StartSelectedDVMConfigurations extends PublishServerObject<TestingServer, DVMPackage> {
     Vector<DVMConfiguration> configurations;
     Vector<Group> groups;
     Vector<Test> tests;
     LinkedHashMap<Integer, Vector<Test>> testByGroups;
     Vector<DVMCompilationTask> tasks;
     int tasks_count;
-    public StartCurrentDVMConfiguration() {
+    public StartSelectedDVMConfigurations() {
         super(Global.testingServer, DVMPackage.class);
     }
     //пока пусть будет одна конфигурация и один пакет.
@@ -103,7 +103,7 @@ public class StartCurrentDVMConfiguration extends PublishServerObject<TestingSer
     //--
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        configurations = new Vector<>();
+        configurations = Global.testingServer.db.dvm_configurations.getCheckedOrCurrent();
         groups = new Vector<>();
         tests = new Vector<>();
         testByGroups = new LinkedHashMap<>();
@@ -113,7 +113,8 @@ public class StartCurrentDVMConfiguration extends PublishServerObject<TestingSer
         if (!Current.getAccount().CheckRegistered(Log)) {
             return false;
         }
-        if (!Current.Check(Log, Current.DVMConfiguration)) {
+        if (configurations.isEmpty()){
+            Log.Writeln_("Не отмечено ни одной конфигурации, или отсутствует текущая конфигурация.");
             return false;
         }
         if (Current.Check(Log, Current.Machine, Current.User, Current.Compiler)) {
@@ -139,16 +140,15 @@ public class StartCurrentDVMConfiguration extends PublishServerObject<TestingSer
                     Current.getCompiler()
             );
             //----
-            DVMConfiguration configuration = Current.getDVMConfiguration();
-            configurations.add(configuration);
-            //--
-            groups = configuration.getGroups();
-            tests = configuration.getTests(groups, testByGroups);
-            //--
-            for (Group group : groups) {
-                Vector<Test> groupTests = testByGroups.get(group.id);
-                for (Test test : groupTests)
-                    tasks.addAll(createTasksCGT(configuration, group, test));
+            for (DVMConfiguration configuration: configurations) {
+                groups = configuration.getGroups();
+                tests = configuration.getTests(groups, testByGroups);
+                //--
+                for (Group group : groups) {
+                    Vector<Test> groupTests = testByGroups.get(group.id);
+                    for (Test test : groupTests)
+                        tasks.addAll(createTasksCGT(configuration, group, test));
+                }
             }
             return UI.Question("Будет запущено " + tasks_count + " задач. Продолжить");
         }
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 402f19ce..c29c1a17 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -343,15 +343,15 @@ public enum PassCode_2021 {
     GetOldBugReports,
     ShowCurrentDVMConfigurationTests,
     SaveCurrentDVMConfiguration,
-    StartCurrentDVMConfiguration,
+    StartSelectedDVMConfigurations,
     ;
     //--
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
-            case StartCurrentDVMConfiguration:
-                return "Запустить текущую конфигурацию тестирования DVM системы";
+            case StartSelectedDVMConfigurations:
+                return "Запустить отмеченные конфигурации тестирования DVM системы";
             case ShowCurrentDVMConfigurationTests:
                 return "Отметить группы и тесты, участвующие в текущей конфигурации DVM системы";
             case SaveCurrentDVMConfiguration: