From 3863b31328b49f9b8929f04d2505cd98da7bbed1 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 19 Sep 2024 23:05:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BA=D1=80=D0=B0=D1=81=D0=BD=D1=8B=D0=B5=20?=
 =?UTF-8?q?=D0=B3=D0=B0=D0=BB=D0=BE=D1=87=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=B0=D0=B2=D1=82=D0=BE=20=D1=82=D0=B5=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F.=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B1=D0=B5=D0=B7=20=D0=BE=D0=B1=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B1=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  24 +-
 .../UI/Tables/ConfigurationAutoRenderer.java  |  11 +
 .../UI/Tables/ConfigurationAutoSwitcher.java  |  13 +
 src/Common/UI/Tables/TableEditors.java        |   4 +-
 src/Common/UI/Tables/TableRenderers.java      |   3 +-
 src/Common/UI/UI.java                         |   3 +
 .../Common/Configuration/Configuration.java   |  23 +-
 .../DVMConfigurationDBTable.java              |  31 +-
 .../SapforConfigurationDBTable.java           |   4 +-
 .../Passes/All/AddSapforPackage.java          |  77 -----
 .../Passes/All/AddTasksToSapforPackage.java   | 272 ------------------
 .../Passes/All/StartSapforPackage.java        |  13 -
 src/Visual_DVM_2021/Passes/PassCode_2021.java |   9 -
 src/icons/RedPick.png                         | Bin 0 -> 1157 bytes
 14 files changed, 80 insertions(+), 407 deletions(-)
 create mode 100644 src/Common/UI/Tables/ConfigurationAutoRenderer.java
 create mode 100644 src/Common/UI/Tables/ConfigurationAutoSwitcher.java
 delete mode 100644 src/Visual_DVM_2021/Passes/All/AddSapforPackage.java
 delete mode 100644 src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java
 delete mode 100644 src/Visual_DVM_2021/Passes/All/StartSapforPackage.java
 create mode 100644 src/icons/RedPick.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 119bb450..ba60db29 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,19 @@
   </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/StartSelectedSAPFORConfigurations.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/UI/Tables/ConfigurationAutoRenderer.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/UI/Tables/ConfigurationAutoSwitcher.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/RedPick.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/TableEditors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Tables/TableEditors.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/TableRenderers.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Tables/TableRenderers.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/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Configuration.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/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.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/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforPackage.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" />
@@ -97,7 +99,7 @@
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
     <property name="extract.method.default.visibility" value="public" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/Transformations" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -110,9 +112,9 @@
       <recent name="controls.Trees" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
-      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
     </key>
diff --git a/src/Common/UI/Tables/ConfigurationAutoRenderer.java b/src/Common/UI/Tables/ConfigurationAutoRenderer.java
new file mode 100644
index 00000000..03cce22b
--- /dev/null
+++ b/src/Common/UI/Tables/ConfigurationAutoRenderer.java
@@ -0,0 +1,11 @@
+package Common.UI.Tables;
+import Common.Utils.Utils;
+import TestingSystem.Common.Configuration.Configuration;
+public class ConfigurationAutoRenderer extends DBObjectRenderer {
+    @Override
+    public void Display() {
+        if (value != null) {
+            setIcon(((Configuration)value).GetAutoIcon());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Common/UI/Tables/ConfigurationAutoSwitcher.java b/src/Common/UI/Tables/ConfigurationAutoSwitcher.java
new file mode 100644
index 00000000..aa0da5fc
--- /dev/null
+++ b/src/Common/UI/Tables/ConfigurationAutoSwitcher.java
@@ -0,0 +1,13 @@
+package Common.UI.Tables;
+import TestingSystem.Common.Configuration.Configuration;
+public class ConfigurationAutoSwitcher extends DBObjectEditor<Configuration> {
+    @Override
+    public void Action() {
+        value.SwitchAuto();
+        setIcon(value.GetAutoIcon());
+    }
+    @Override
+    public Object getCellEditorValue() {
+        return value;
+    }
+}
diff --git a/src/Common/UI/Tables/TableEditors.java b/src/Common/UI/Tables/TableEditors.java
index 090c6751..1777c093 100644
--- a/src/Common/UI/Tables/TableEditors.java
+++ b/src/Common/UI/Tables/TableEditors.java
@@ -4,5 +4,7 @@ public enum TableEditors {
     EditorSelect,
     EditorHyperlinks,
     EditorDimension,
-    EditorCompilerEnvironmentValue, EditorCompilerOptionParameterValue
+    EditorCompilerEnvironmentValue,
+    EditorCompilerOptionParameterValue,
+    EditorAutoConfiguration
 }
diff --git a/src/Common/UI/Tables/TableRenderers.java b/src/Common/UI/Tables/TableRenderers.java
index 82598e50..9e4c3df2 100644
--- a/src/Common/UI/Tables/TableRenderers.java
+++ b/src/Common/UI/Tables/TableRenderers.java
@@ -15,5 +15,6 @@ public enum TableRenderers {
     RendererCompilerOptionParameterValue,
     RendererCompilerEnvironmentValue,
     RendererCompilerOptionParameterName,
-    RendererStatusEnum
+    RendererStatusEnum,
+    RendererAutoConfiguration
 }
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index f842cacc..20494109 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -330,6 +330,7 @@ public class UI {
         TableRenderers.put(RendererCompilerOptionParameterName, new CompilerOptionParameterNameRenderer());
         TableRenderers.put(RendererCompilerEnvironmentValue, new CompilerEnvironmentValueRenderer());
         TableRenderers.put(RendererStatusEnum, new StatusEnumRenderer());
+        TableRenderers.put(RendererAutoConfiguration, new ConfigurationAutoRenderer());
         //---------------------------------------------
         TreeRenderers.put(RendererGraph, new GraphTreeCellRenderer());
         TreeRenderers.put(RendererRemoteFile, new RemoteFileRenderer());
@@ -338,12 +339,14 @@ public class UI {
         TreeRenderers.put(RendererSapforVersion, new SapforVersionsTreeCellRenderer());
         TreeRenderers.put(RendererRule, new RulesTreeCellRenderer());
         TreeRenderers.put(RendererSelection, new SelectionTreeCellRenderer());
+
         //----------------------------------------------
         TableEditors.put(EditorSelect, new DBObjectSelector());
         TableEditors.put(EditorHyperlinks, new VectorEditor());
         TableEditors.put(EditorDimension, new DimensionStateChanger());
         TableEditors.put(EditorCompilerOptionParameterValue, new CompilerOptionParameterValueEditor());
         TableEditors.put(EditorCompilerEnvironmentValue, new CompilerEnvironmentValueEditor());
+        TableEditors.put(EditorAutoConfiguration, new ConfigurationAutoSwitcher());
         //</editor-fold>
     }
     public static void printAccessible_r(Accessible accessible) {
diff --git a/src/TestingSystem/Common/Configuration/Configuration.java b/src/TestingSystem/Common/Configuration/Configuration.java
index 3cabf7d1..168df4c2 100644
--- a/src/TestingSystem/Common/Configuration/Configuration.java
+++ b/src/TestingSystem/Common/Configuration/Configuration.java
@@ -8,6 +8,7 @@ import TestingSystem.Common.Test.Json.TestsJson;
 import TestingSystem.Common.Test.Test;
 import com.sun.org.glassfish.gmbal.Description;
 
+import javax.swing.*;
 import java.util.Vector;
 public class Configuration extends riDBObject {
     //конфигурация = данные для пакета.
@@ -19,12 +20,22 @@ public class Configuration extends riDBObject {
     public int maxtime = 300;
     @Description("DEFAULT 0")
     public int autoTesting = 0;
-    public String printAuto(){
-        return autoTesting>0? "Да":"Нет";
+    public String printAuto() {
+        return autoTesting > 0 ? "Да" : "Нет";
+    }
+    public void SwitchAuto() {
+        autoTesting = (autoTesting == 0)? 1:0;
+    }
+    public ImageIcon GetAutoIcon() {
+        return  Utils.getIcon("/icons/" + (autoTesting==1 ? "RedPick" : "NotPick") + ".png");
     }
     //--
-    public String getFlags(){return "";}
-    public Vector<String> getFlagsArray(){return new Vector<>();}
+    public String getFlags() {
+        return "";
+    }
+    public Vector<String> getFlagsArray() {
+        return new Vector<>();
+    }
     //--
     @Description("DEFAULT ''")
     public String packedGroupsJson = "";
@@ -44,9 +55,9 @@ public class Configuration extends riDBObject {
         Configuration c = (Configuration) src;
         //--
         maxtime = c.maxtime;
-        autoTesting= c.autoTesting;
+        autoTesting = c.autoTesting;
         //-
-        packedGroupsJson= c.packedGroupsJson;
+        packedGroupsJson = c.packedGroupsJson;
         packedTestsJson = c.packedTestsJson;
     }
     //-
diff --git a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index 74a2f9cf..09563c94 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -4,6 +4,8 @@ import Common.Database.DBObject;
 import Common.Database.iDBTable;
 import Common.Global;
 import Common.UI.DataSetControlForm;
+import Common.UI.Tables.DBObjectSelector;
+import Common.UI.Tables.TableEditors;
 import Common.UI.Tables.TableRenderers;
 import Common.UI.VisualCache.ConfigurationCache;
 import Common.UI.VisualCache.VisualCache;
@@ -37,10 +39,10 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(5).setMaxWidth(300);
+                columns.get(4).setMaxWidth(300);
+                columns.get(6).setRenderer(TableRenderers.RendererMultiline);
                 columns.get(7).setRenderer(TableRenderers.RendererMultiline);
-                columns.get(8).setRenderer(TableRenderers.RendererMultiline);
-                columns.get(15).setRenderer(TableRenderers.RendererMultiline);
+                columns.get(14).setRenderer(TableRenderers.RendererMultiline);
             }
         };
     }
@@ -49,7 +51,6 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
         return new String[]{
                 "имя",
                 "автор",
-                "авто",
                 "группы",
                 "тестов",
                 "флаги",
@@ -72,30 +73,28 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
             case 3:
                 return object.sender_name;
             case 4:
-                return object.printAuto();
-            case 5:
                 return cache.getGroupsDescriptions();
-            case 6:
+            case 5:
                 return cache.getTestsCount();
                 //todo упростить. и флаги и окружение будут просто одной строкой. мульти не актуально.
-            case 7:
+            case 6:
                 return Utils.unpackStrings(object.flags, true);
-            case 8:
+            case 7:
                 return Utils.unpackStrings(object.environments, true);
                 //------------------------------------------------------------------------------------
-            case 9:
+            case 8:
                 return object.c_maxtime;
-            case 10:
+            case 9:
                 return object.cube;
-            case 11:
+            case 10:
                 return object.max_proc_count;
-            case 12:
+            case 11:
                 return object.min_dim_proc_count;
-            case 13:
+            case 12:
                 return object.max_dim_proc_count;
-            case 14:
+            case 13:
                 return object.maxtime;
-            case 15:
+            case 14:
                 return Utils.unpackStrings(object.usr_par, true);
             default:
                 return null;
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index 1503d636..fecd7e3d 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -2,6 +2,7 @@ package TestingSystem.SAPFOR.SapforConfiguration;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
+import Common.UI.Tables.TableEditors;
 import Common.UI.Tables.TableRenderers;
 import Common.UI.VisualCache.ConfigurationCache;
 import Common.UI.VisualCache.VisualCaches;
@@ -36,8 +37,9 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
             }
             @Override
             protected void AdditionalInitColumns() {
+                columns.get(4).setRenderer(TableRenderers.RendererAutoConfiguration);
+                columns.get(4).setEditor(TableEditors.EditorAutoConfiguration);
                 columns.get(5).setMaxWidth(300);
-             //   columns.get(5).setRenderer(TableRenderers.RendererHiddenList);
             }
         };
     }
diff --git a/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java b/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java
deleted file mode 100644
index f1abf63e..00000000
--- a/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Common.Constants;
-import Common.Current;
-import Common.Database.Database;
-import Common.Global;
-import TestingSystem.Common.TasksPackageState;
-import TestingSystem.SAPFOR.Json.SapforPackage_json;
-import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
-import Visual_DVM_2021.Passes.AddObjectPass;
-
-import java.io.File;
-public class AddSapforPackage extends AddObjectPass<SapforPackage> {
-    @Override
-    public String getIconPath() {
-        return "/icons/CreateProject.png";
-    }
-    protected File sapfor = null;
-    //---
-    //временный вариант. в дальнейшем, следует сделать возможность формирования.(?)
-    public AddSapforPackage() {
-        super(SapforPackage.class);
-    }
-    @Override
-    protected Database getDb() {
-        return Global.testingServer.db;
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (!Current.getAccount().CheckRegistered(Log)) {
-            return false;
-        }
-        if (!Current.Check(Log, Current.ServerSapfor))
-            return false;
-        if (!Current.getServerSapfor().state.equals(ServerSapforState.Done)) {
-            Log.Writeln_("Выбранная версия SAPFOR не собрана!");
-            return false;
-        }
-        if (!Current.getServerSapfor().state.equals(ServerSapforState.Done)) {
-            Log.Writeln_("Выбранная версия SAPFOR не собрана!");
-            return false;
-        }
-        for (SapforPackage sapforPackage : Global.testingServer.db.sapforPackages.Data.values()) {
-            if (sapforPackage.state.equals(TasksPackageState.Draft)) {
-                Log.Writeln_("Может существовать только один пакет, готовящийся к публикации.");
-                return false;
-            }
-        }
-        //--
-        target = new SapforPackage();
-        target.id = Constants.Nan;
-        target.state = TasksPackageState.Draft;
-        //-
-        target.sender_name = Current.getAccount().name;
-        target.sender_address = Current.getAccount().email;
-        //-
-        target.drv = Current.getServerSapfor().call_command;
-        target.version = Current.getServerSapfor().version;
-        target.kernels = Global.properties.TestingKernels;
-        target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
-        //--
-        target.sapforId = Current.getServerSapfor().id;
-        //
-        SapforPackage_json package_json = new SapforPackage_json();
-        target.package_json = package_json;
-        ///-------------------------------
-        package_json.kernels = target.kernels;
-        package_json.sapfor_drv = Current.getServerSapfor().call_command;
-        ///-------------------------------
-        return true;
-    }
-    @Override
-    protected void body() throws Exception {
-        //черновик не вставляется в бд. идет только как элемент списка.
-        Global.testingServer.db.sapforPackages.Data.put(target.id, target);
-    }
-}
\ No newline at end of file
diff --git a/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java b/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java
deleted file mode 100644
index 720976c7..00000000
--- a/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Common.Constants;
-import Common.Current;
-import Common.Global;
-import Common.UI.UI;
-import Common.Utils.Index;
-import Common.Utils.Utils;
-import ProjectData.LanguageName;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.TasksPackageState;
-import TestingSystem.Common.Test.Test;
-import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
-import TestingSystem.SAPFOR.Json.SapforTest_json;
-import TestingSystem.SAPFOR.Json.SapforTestingSet_json;
-import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
-import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import TestingSystem.SAPFOR.SapforTask.SapforTask;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
-
-import java.io.File;
-import java.util.LinkedHashMap;
-import java.util.Vector;
-public class AddTasksToSapforPackage extends Pass_2021<SapforPackage> {
-    SapforTestingSet_json testingSet; //то, что добавляем.
-    //--
-    protected LinkedHashMap<Integer, Vector<Integer>> groupsTests = null;
-    protected LinkedHashMap<String, Test> testsByDescriptions = null;
-    protected Vector<String> testsNames_lower = null; //все тесты что участвуют здесь
-    protected Vector<LanguageName> groupsLanguages = null;
-    protected File sapfor = null;
-    //--
-    protected Vector<SapforTask> new_tasks = null;
-    //--
-    @Override
-    public String getIconPath() {
-        return "/icons/AddTasks.png";
-    }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    //--
-    boolean checkTerminalCode(SapforConfiguration sapforConfiguration, PassCode_2021 code, int count, Vector<PassCode_2021> codes) {
-        if (count > 2) {
-            Log.Writeln_("Неверная конфигурация:" + sapforConfiguration.id + ": " +
-                    code.getDescription() +
-                    " возможно только один раз.");
-            return false;
-        }
-        //--
-        if ((count == 1) && codes.size() > 1) {
-            if (!codes.lastElement().equals(code)) {
-                Log.Writeln_("Неверная конфигурация:" + sapforConfiguration.id + ": " +
-                        code.getDescription() +
-                        " может быть только завершающей командой!");
-                return false;
-            }
-        }
-        return true;
-    }
-    boolean checkStartingCode(SapforConfiguration sapforConfiguration, PassCode_2021 code, int count, Vector<PassCode_2021> codes) {
-        if (count > 2) {
-            Log.Writeln_("Неверная конфигурация:" + sapforConfiguration.id + ": " +
-                    code.getDescription() +
-                    " возможно только один раз.");
-            return false;
-        }
-        //--
-        if ((count == 1) && codes.size() > 1) {
-            if (!codes.firstElement().equals(code)) {
-                Log.Writeln_("Неверная конфигурация:" + sapforConfiguration.id + ": " +
-                        code.getDescription() +
-                        " может быть только первой командой!");
-                return false;
-            }
-        }
-        return true;
-    }
-    //--
-    //--
-    public boolean checkConfigurationCommands(SapforConfiguration sapforConfiguration) {
-        //1. получить список всех команд.
-        Vector<PassCode_2021> codes = new Vector<>();
-        //-- счетчик завершающих команд.
-        LinkedHashMap<PassCode_2021, Index> terminalCodesCount = new LinkedHashMap<>();
-        for (PassCode_2021 code : Constants.terminalSapforTestingCodes)
-            terminalCodesCount.put(code, new Index());
-        //--
-        LinkedHashMap<PassCode_2021, Index> startingCodesCount = new LinkedHashMap<>();
-        for (PassCode_2021 code : Constants.startingSapforTestingCodes)
-            startingCodesCount.put(code, new Index());
-        //--
-        for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) {
-            if (command.sapforconfiguration_id == sapforConfiguration.id) {
-                codes.add(command.passCode);
-                //---
-                for (PassCode_2021 t_code : Constants.terminalSapforTestingCodes) {
-                    if (command.passCode.equals(t_code))
-                        terminalCodesCount.get(t_code).Inc();
-                }
-                //---
-                for (PassCode_2021 s_code : Constants.startingSapforTestingCodes) {
-                    if (command.passCode.equals(s_code))
-                        startingCodesCount.get(s_code).Inc();
-                }
-            }
-        }
-        //--
-        if (codes.size() == 0) {
-            Log.Writeln_("Пустая конфигурация:" + sapforConfiguration.id);
-            return false;
-        }
-        for (PassCode_2021 t_code : Constants.terminalSapforTestingCodes) {
-            if (!checkTerminalCode(sapforConfiguration, t_code,
-                    terminalCodesCount.get(t_code).getValue(), codes
-            ))
-                return false;
-        }
-        //-
-        for (PassCode_2021 s_code : Constants.startingSapforTestingCodes) {
-            if (!checkStartingCode(sapforConfiguration, s_code,
-                    startingCodesCount.get(s_code).getValue(), codes
-            ))
-                return false;
-        }
-        //--
-        return true;
-    }
-    //--
-    protected boolean checkTestName(Test test) {
-        String name = test.description.toLowerCase();
-        if (testsNames_lower.contains(name)) {
-            Log.Writeln_("В пакет не могут входить тесты с одинаковыми именами (без учета регистра):" + test.description.toLowerCase());
-            return false;
-        }
-        testsNames_lower.add(name);
-        return true;
-    }
-    protected boolean getGroupTests(int groupId) {
-        Vector<Integer> groupTests = new Vector<>();
-        Vector<Integer> selectedGroupTests = new Vector<>();
-        //---
-        for (Test test : Global.testingServer.db.tests.Data.values()) {
-            if (test.group_id == groupId) {
-                groupTests.add(test.id);
-                if (test.isSelected())
-                    selectedGroupTests.add(test.id);
-            }
-        }
-        if (!groupTests.isEmpty() && !selectedGroupTests.isEmpty())
-            groupTests = selectedGroupTests;
-        //---
-        if (groupTests.isEmpty()) {
-            Log.Writeln_("Пустая группа тестов: " + groupId);
-            return false;
-        }
-        //--
-        for (int testId : groupTests) {
-            Test test = Global.testingServer.db.tests.get(testId);
-            if (!checkTestName(test))
-                return false;
-            else
-                testsByDescriptions.put(test.description, test);
-        }
-        //--
-        groupsTests.put(groupId, groupTests);
-        //--
-        return true;
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.SapforPackage)) {
-            target = Current.getSapforPackage();
-            if (!target.state.equals(TasksPackageState.Draft)) {
-                Log.Writeln_("Пакет " + Utils.Brackets(target.id) + " не готовится к публикации!");
-                return false;
-            }
-            //---
-            groupsTests = new LinkedHashMap<>();
-            testsNames_lower = new Vector<>();
-            testsByDescriptions = new LinkedHashMap<>();
-            groupsLanguages = new Vector<>();
-            //--
-            if (Global.testingServer.db.sapforConfigurations.getCheckedCount() == 0) {
-                Log.Writeln_("Не отмечено ни одной конфигурации SAPFOR.");
-                return false;
-            }
-            for (SapforConfiguration configuration : Global.testingServer.db.sapforConfigurations.getCheckedItems()) {
-                if (!checkConfigurationCommands(configuration))
-                    return false;
-            }
-            //--
-            if (Global.testingServer.db.groups.getCheckedCount() == 0) {
-                Log.Writeln_("Не отмечено ни одной группы тестов");
-                return false;
-            }
-            //--
-            for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
-                //---
-                if (!groupsLanguages.contains(group.language))
-                    groupsLanguages.add(group.language);
-                //-
-                if (groupsLanguages.get(0) != LanguageName.fortran) {
-                    Log.Writeln_("Поддерживается пакетный режим только для языка Fortran!");
-                    return false;
-                }
-                if (groupsLanguages.size() > 1) {
-                    Log.Writeln_("Запуск тестов на разных языках в рамках одного пакета запрещен!");
-                    return false;
-                }
-                //---
-                if (!getGroupTests(group.id))
-                    return false;
-            }
-            //--
-            testingSet = new SapforTestingSet_json();
-            testingSet.id = target.package_json.getMaxSetId();
-            for (Test test : testsByDescriptions.values()) {
-                SapforTest_json test_json = new SapforTest_json();
-                test_json.id = test.id;
-                test_json.description = test.description;
-                test_json.group_description = Global.testingServer.db.groups.get(test.group_id).description;
-                testingSet.tests.add(test_json);
-            }
-            for (SapforConfiguration configuration : Global.testingServer.db.sapforConfigurations.getCheckedItems()) {
-                //--
-                SapforConfiguration_json configuration_json = new SapforConfiguration_json();
-                configuration_json.id = configuration.id;
-                configuration_json.name=configuration.description;
-                configuration_json.flags = configuration.getFlags();
-                Vector<PassCode_2021> codes = configuration.getPassCodes();
-                //--- коррекцию кода нельзя вызвать если инклуды есть. в общем случае.
-                if (!codes.firstElement().equals(PassCode_2021.SPF_InsertIncludesPass))
-                    configuration_json.codes.add(PassCode_2021.SPF_CorrectCodeStylePass); //всегда добавляется.
-                //--
-                configuration_json.codes.addAll(codes);
-                //--->>
-                testingSet.configurations.add(configuration_json);
-                //-->>
-            }
-            new_tasks = target.getActualTestingSetTasks(testingSet);
-            if (new_tasks.size() == 0) {
-                Log.Writeln_("Не сформировано ни одной новой задачи.\n" +
-                        "Задачи уже присутствуют в пакете, или не отмечено ни одного теста.");
-                return false;
-            }
-            return UI.Question("Будет добавлено " + new_tasks.size() + " задач. Продолжить");
-        }
-        //
-        return false;
-    }
-    @Override
-    protected void body() throws Exception {
-        //-->>
-        target.package_json.testingSets.add(testingSet);
-        for (SapforTask task : new_tasks) {
-            task.id = target.package_json.getMaxTaskId();
-            target.package_json.tasks.add(task);
-        }
-        target.tasksCount += new_tasks.size();
-    }
-    @Override
-    protected void showDone() throws Exception {
-        Global.testingServer.db.sapforPackages.ShowUI(target.id);
-        //----
-        // Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
-        // target.saveJson();
-        //---
-    }
-}
\ No newline at end of file
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforPackage.java b/src/Visual_DVM_2021/Passes/All/StartSapforPackage.java
deleted file mode 100644
index 8342eb80..00000000
--- a/src/Visual_DVM_2021/Passes/All/StartSapforPackage.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import Visual_DVM_2021.Passes.StartTestingPackage;
-public class StartSapforPackage extends StartTestingPackage<SapforPackage> {
-    public StartSapforPackage() {
-        super(SapforPackage.class);
-    }
-    @Override
-    protected Current getCurrentName() {
-        return Current.SapforPackage;
-    }
-}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 14dc9f72..67b268df 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -301,10 +301,7 @@ public enum PassCode_2021 {
     DeleteDVMPackage,
     AbortDVMPackage,
     //->
-    AddSapforPackage,
-    AddTasksToSapforPackage,
     DeleteSapforPackage,
-    StartSapforPackage,
     AbortSapforPackage,
     DownloadDVMPackage,
     DownloadDVMPackages,
@@ -414,8 +411,6 @@ public enum PassCode_2021 {
                 return "Клонировать пакет SAPFOR с текущей версией";
             case CloneDVMPackage:
                 return "Клонировать пакет DVM c текущим компилятором";
-            case AddTasksToSapforPackage:
-                return "Добавить задачи в пакет SAPFOR";
             case SPF_InsertPrivateFromGUI:
                 return "Вставка директив приватизации";
             case CreateTestFromSelectedFiles:
@@ -426,12 +421,8 @@ public enum PassCode_2021 {
                 return "Синхронизация пакетов задач DVM";
             case AbortSapforPackage:
                 return "Прервать пакет тестирования SAPFOR";
-            case StartSapforPackage:
-                return "Запустить пакет задач SAPFOR";
             case DeleteSapforPackage:
                 return "Удалить пакеты тестирования SAPFOR";
-            case AddSapforPackage:
-                return "Создать пустой пакет";
             case AbortDVMPackage:
                 return "Прервать пакет тестирования DVM";
             case DeleteDVMPackage:
diff --git a/src/icons/RedPick.png b/src/icons/RedPick.png
new file mode 100644
index 0000000000000000000000000000000000000000..482ffbd088aa29a692a464d1a09ae58772f31f6d
GIT binary patch
literal 1157
zcmV;01bX|4P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ=3rR#lRCwC#)oV;!Wf%wW=bWwt3@8CoAz1>2!ZsYNB?3c8I1EX%2pwt&agOS^
zPP7nYNi(ZBHN~Nel`RZPS*aRu>D&~UOSEz+v16XXT6!A^D@7TM+PS(yTcGsRFG31q
z*kb(V`S#|${NC&NBOZ?j{_79<AMp$EE|^TFNU2o%l1wI}+wJxM6h*h4f!pmycJGd~
z6%@QU%x1Iu03c{a`5`mE{KB>I@p=0r$oZD@Wwo4I0YMNUJDDx>$N}9ubeg4O<lDZn
zyL(&odi}}<q_eZ5<oNOOF984&5)#IlOlE&TK)@nF5a@OTlSpK@b<P@Yx!PA&aA-bA
zG7C$%;fYL_%W=#57!ZTO5TBi${iDTVi772Dy&x8g-}Gk%lea`Qw4*1RUwC@u{&l%C
zg2g&=skgW1l?_N;UEK+RK+qZ*8hX!YH0})#54ZUYTxn>e@tRM)m5H{BCANO2+x<;g
zSlFCSr;Cq@igK(Y3<je?rBZ#6oSZzW(P&bA2BfDOX$^u?4R+FiaOT0$Vh)Gg*4Fkb
zK@g6~$w?ZON;R(|bUOWgwOW1JA7or|j+=buy)ys+&&)kMXt2RA3WXv%D=TXXMbXD2
zNl8hgTCMgUkvodZ?6|V>F8~0FgNQPzYC#MDFf}z59UB`vMIw>@9b%qUW>RvW{}}+_
z?bJY#;43o+0G9nhlv=GeO(?7+S5>vUHUpl;-y`AK_<H~VA2U{U?blpI(+evTYxO=M
z3`VL_rBbH#e3Dh#qrCl4eEE+n-iWr6)wh3Go(}-<axhVTb#&pPcfG-2h)zsQ+#X3w
zOB=;;JoVMX=})Go;KQLkp5M+|p;|KwcPHc>C-+p<e+mFle~|p$XOjD`0f5bKgifcA
zs@3XL0D$7c{c)EjX6^t0RArz|!V!YI)*-`Y&$~Id`qSp^^a<H~@YU=+IW747fcHQ(
z=}5;7U0n6p*qCca$X4&<#34#$>)f(%t$e`h$k3QwH@CWZJ4OHiYRcgAX2nyr)fuGr
z*3JiS007}PQc+RC5s5_SC=|-H*=*j2Ajpz;XDlWrkaf)7F8SIj(HK_;9`}a&`}?2E
z&COK=2M3!?CR2PwM8v{6g5x+H!>}J54hMzD<MH@>e&aUbwq=NUJf2+`hV{zj^22#~
zdEd)qviuEyVE_O=pI^`8@y-GO<mBXBFDxwV3keNbB%@?BFfb7G`rE|vvJ**3NkNvD
zmcZ?H0{{Sl5X7``I;yLy>zL7KOhyo7WpHp1!!T^*5d;8$%jJI5)YSCuPIH`0CjZ&p
z-Tit|QBlv|tJ^x`aU7?M#bWl*(9k}o)49u+jHgg2P8N%GqokxnLZwpYy|!?@-CqL$
Xp<YhyYxzt|00000NkvXXu0mjf<{290

literal 0
HcmV?d00001