From 96c9c271914aaede15fe11d973aecb9664502c36 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 17 Sep 2024 14:01:38 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  12 +-
 .../Common/TestingPackage/TestingPackage.java |   3 +-
 .../DVM/DVMPackage/UI/AddDVMPackageMenu.java  |  13 --
 .../DVM/DVMPackage/UI/EditDVMPackageMenu.java |   9 -
 .../Passes/All/AddTasksToDVMPackage.java      | 192 ------------------
 src/Visual_DVM_2021/Passes/PassCode_2021.java |   3 -
 6 files changed, 4 insertions(+), 228 deletions(-)
 delete mode 100644 src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java
 delete mode 100644 src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java
 delete mode 100644 src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dd709884..0c1749db 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,18 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Json/GroupJson.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Json/GroupsJson.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Json/TestJson.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Json/TestsJson.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/ConfigurationJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Json/ConfigurationJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/ConfigurationsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Json/ConfigurationsJson.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/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.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/StartSelectedDVMConfigurations.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/All/AddTasksToDVMPackage.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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index eb1a7987..99d696bc 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -26,10 +26,11 @@ public abstract class TestingPackage<J> extends riDBObject {
     public long ChangeDate = 0;
     @Description("DEFAULT 0")
     public int connectionErrosCount = 0;
+    public TasksPackageState state = TasksPackageState.Draft;
+
     //---данные для отображения.
     @Description("DEFAULT ''")
     public String packedConfigurationsJson = "";
-    public TasksPackageState state = TasksPackageState.Draft;
     //--
     @Description("IGNORE")
     public ConfigurationsJson configurationsJson = null;
diff --git a/src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java b/src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java
deleted file mode 100644
index b016e6f3..00000000
--- a/src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package TestingSystem.DVM.DVMPackage.UI;
-import Common.UI.Menus_2023.VisualiserMenu;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
-public class AddDVMPackageMenu extends VisualiserMenu {
-    public AddDVMPackageMenu() {
-        super("", "/icons/RedAdd.png");
-        /*
-        addPasses(PassCode_2021.AddDVMPackage,
-                  PassCode_2021.CloneDVMPackage);
-         */
-    }
-}
diff --git a/src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java b/src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java
deleted file mode 100644
index 548e9fac..00000000
--- a/src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package TestingSystem.DVM.DVMPackage.UI;
-import Common.UI.Menus_2023.VisualiserMenu;
-import Visual_DVM_2021.Passes.PassCode_2021;
-public class EditDVMPackageMenu extends VisualiserMenu {
-    public EditDVMPackageMenu() {
-        super("",  "/icons/Edit.png");
-        addPasses(PassCode_2021.AddTasksToDVMPackage);
-    }
-}
diff --git a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
deleted file mode 100644
index a5b43bb4..00000000
--- a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
+++ /dev/null
@@ -1,192 +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.Configuration;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.TasksPackageState;
-import TestingSystem.Common.Test.Test;
-import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
-import TestingSystem.DVM.DVMPackage.DVMPackage;
-import TestingSystem.DVM.DVMPackage.DVMPackage_json;
-import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
-import TestingSystem.DVM.DVMTasks.DVMRunTask;
-import Visual_DVM_2021.Passes.Pass_2021;
-
-import java.util.Vector;
-public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
-    Vector<DVMCompilationTask> tasks;
-    Vector<Configuration> configurations;
-    Vector<Group> groups;
-    Vector<Test> tests;
-    int tasks_count;
-    @Override
-    public String getIconPath() {
-        return "/icons/AddTasks.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 {
-        if (Current.Check(Log, Current.DVMPackage)) {
-            target = Current.getDVMPackage();
-            if (!target.state.equals(TasksPackageState.Draft)) {
-                Log.Writeln_("Пакет " + Utils.Brackets(target.id) + " не готовится к публикации!");
-                return false;
-            }
-            //---
-            tasks = new Vector<>();
-            configurations = new Vector<>();
-            groups = new Vector<>();
-            tests = new Vector<>();
-            tasks_count = 0;
-            //-----------
-            //1, Проверяем выбраны ли конфиги.
-            if (Global.testingServer.db.dvm_configurations.getCheckedCount() == 0) {
-                Log.Writeln_("Не отмечена ни одна конфигурация тестирования.");
-                return false;
-            }
-            if (Global.testingServer.db.groups.getCheckedCount() > 0) {
-                //2 Проверяем выбраны ли группы.
-                for (DVMConfiguration configuration : Global.testingServer.db.dvm_configurations.getCheckedItems()) {
-                    configurations.add(configuration);
-                    for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
-                        Vector<Test> groupTests = new Vector<>();
-                        Vector<Test> checkedGroupTests = new Vector<>();
-                        for (Test test : Global.testingServer.db.tests.Data.values()) {
-                            if (test.group_id == group.id) {
-                                groupTests.add(test);
-                                if (test.isSelected())
-                                    checkedGroupTests.add(test);
-                            }
-                        }
-                        if (!groupTests.isEmpty()) {
-                            groups.add(group);
-                            if (checkedGroupTests.isEmpty()) {
-                                for (Test test : groupTests) {
-                                    tasks.addAll(createTasksCGT(configuration, group, test));
-                                    tests.add(test);
-                                }
-                            } else {
-                                //добавляем только отмеченные.
-                                for (Test test : checkedGroupTests) {
-                                    tasks.addAll(createTasksCGT(configuration, group, test));
-                                    tests.add(test);
-                                }
-                            }
-                            //--
-                        }
-                    }
-                }
-            }
-            if (tasks.isEmpty()) {
-                Log.Writeln_("Не удалось добавить задачи.\n" +
-                        "Для создания задач отметьте требуемые конфигурации,\n" +
-                        "Отметьте группы, или отдельные тесты в отмеченной текущей группе");
-                return false;
-            }
-            return UI.Question("Будет добавлено " + tasks_count + " задач. Продолжить");
-        }
-        //
-        return false;
-    }
-    @Override
-    protected void body() throws Exception {
-        target.package_json = new DVMPackage_json();
-        DVMPackage_json json = target.package_json;
-        //инициализируем идентификаторы задач.
-        for (DVMCompilationTask compilationTask : tasks) {
-            //--
-            compilationTask.id = json.getMaxTaskId();
-            //-
-            for (DVMRunTask runTask : compilationTask.runTasks) {
-                runTask.id = json.getMaxTaskId();
-                runTask.dvmcompilationtask_id = compilationTask.id;
-            }
-        }
-        json.compilationTasks.addAll(tasks);
-        //--
-        target.saveConfigurationsAsJson(configurations);
-        //--
-        target.tasksCount += tasks_count;
-        target.state= TasksPackageState.Inactive;
-        Global.testingServer.db.Update(target);
-        //--
-       // target.printCGT();
-    }
-    @Override
-    protected void showDone() throws Exception {
-        Global.testingServer.db.dvmPackages.ShowUI(target.id);
-        Global.testingServer.db.dvmRunTasks.ShowDVMPackage(target);
-    }
-}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index c29c1a17..9cce17d3 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -299,7 +299,6 @@ public enum PassCode_2021 {
     ActualizePackages,
     //->
     AddDVMPackage,
-    AddTasksToDVMPackage,// вывести. теперь все через конфигурацию.
     DeleteDVMPackage,
     AbortDVMPackage,
     //->
@@ -429,8 +428,6 @@ public enum PassCode_2021 {
                 return "Удалить пакет задач DVM";
             case DownloadDVMPackage:
                 return "Скачать пакет задач DVM";
-            case AddTasksToDVMPackage:
-                return "Добавить задачи в пакет тестирования DVM";
             case AddDVMPackage:
                 return "Создать пустой пакет";
             case ActualizePackages: