From 49805f12933472f84a5076afe79ed2796d458aed Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 7 Oct 2023 21:02:01 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                   | 11 +++++------
 src/Common/Global.java                                |  4 ++--
 src/SapforTestingSystem/PerformSapforTask.java        |  5 ++++-
 .../SapforScenarioSupervisor.java}                    |  8 ++++----
 .../ServerSapforTestingPlanner.java                   |  6 ++++++
 src/TestingSystem/TestingServer.java                  |  3 +++
 6 files changed, 24 insertions(+), 13 deletions(-)
 rename src/SapforTestingSystem/{SapforTestingPlaner/SapforTestingPlanner.java => SapforScenarioSupervisor/SapforScenarioSupervisor.java} (93%)
 create mode 100644 src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a67eecca..e93018e0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,12 @@
   </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/ShowAllParallelVariants.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowParallelVariantsCoverage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/icons/AllVariants.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/icons/VariantsCoverage.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.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/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.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" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenarioSupervisor/SapforScenarioSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 1b34de59..92e62ce2 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -13,7 +13,7 @@ import Repository.Component.Sapfor.MessagesServer;
 import Repository.Component.Sapfor.Sapfor_F;
 import Repository.Component.Sapfor.TransformationPermission;
 import Repository.Server.ComponentsServer;
-import SapforTestingSystem.SapforTestingPlaner.SapforTestingPlanner;
+import SapforTestingSystem.SapforScenarioSupervisor.SapforScenarioSupervisor;
 import TestingSystem.TestingServer;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
@@ -360,7 +360,7 @@ public class Global {
             }
         };
         Log.ClearLog();
-        SapforTestingPlanner planner = new SapforTestingPlanner();
+        SapforScenarioSupervisor planner = new SapforScenarioSupervisor();
         planner.Start();
     }
     //---
diff --git a/src/SapforTestingSystem/PerformSapforTask.java b/src/SapforTestingSystem/PerformSapforTask.java
index adb6826c..0948e219 100644
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -147,7 +147,10 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
     }
     protected void variants() throws Exception {
         //папки вариантов создается самим сапфором.
-        target.state = performSapforScript("create_variants", parentTask, " -t 13 -allVars -tinfo",
+        target.state = performSapforScript("create_variants", parentTask, " -t 13 -allVars"
+                      +                    " -tinfo"
+                ,
+
                 Constants.out_file,
                 Constants.err_file
         ) ? TaskState.Done : TaskState.DoneWithErrors;
diff --git a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java b/src/SapforTestingSystem/SapforScenarioSupervisor/SapforScenarioSupervisor.java
similarity index 93%
rename from src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
rename to src/SapforTestingSystem/SapforScenarioSupervisor/SapforScenarioSupervisor.java
index 9664b433..985380f6 100644
--- a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
+++ b/src/SapforTestingSystem/SapforScenarioSupervisor/SapforScenarioSupervisor.java
@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTestingPlaner;
+package SapforTestingSystem.SapforScenarioSupervisor;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
@@ -12,10 +12,10 @@ import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.util.Date;
-public class SapforTestingPlanner extends ThreadsPlanner {
+public class SapforScenarioSupervisor extends ThreadsPlanner {
     PackageModeScenario_json scenario_json = null;
     SapforScenarioResults_json results_json = new SapforScenarioResults_json();
-    public SapforTestingPlanner() throws Exception {
+    public SapforScenarioSupervisor() throws Exception {
         super(Global.properties.threadsTimeout, Global.properties.threadsNum);
         scenario_json = (PackageModeScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario"), PackageModeScenario_json.class);
         results_json.StartDate = new Date().getTime();
@@ -59,7 +59,7 @@ public class SapforTestingPlanner extends ThreadsPlanner {
             Utils.jsonToFile(results_json, new File(Global.Home, "results"));
            // System.out.println("Очистка служебных файлов");
             //тут же и строить версии.
-            Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep", "bat","sh"); //Потом txt тоже добавить.
+            Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep"); //Потом txt тоже добавить.
             FileUtils.writeStringToFile(new File(Constants.DONE), "");
         } catch (Exception e) {
             Global.Log.PrintException(e);
diff --git a/src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java b/src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java
new file mode 100644
index 00000000..95b24f2e
--- /dev/null
+++ b/src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java
@@ -0,0 +1,6 @@
+package SapforTestingSystem.ServerSapforTestingPlanner;
+public class ServerSapforTestingPlanner {
+    public void Perform(){
+        
+    }
+}
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index a6e2788c..da7bf440 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -22,6 +22,7 @@ import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
 import SapforTestingSystem.SapforScenario.SapforScenario;
 import SapforTestingSystem.SapforServerScenario_info;
 import SapforTestingSystem.ServerSapfor.ServerSapfor;
+import SapforTestingSystem.ServerSapforTestingPlanner.ServerSapforTestingPlanner;
 import TestingSystem.Group.Group;
 import TestingSystem.Group.GroupInterface;
 import TestingSystem.Tasks.TestCompilationTask;
@@ -222,6 +223,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     }
     protected TestingPlanner testingPlanner = new TestingPlanner();
     protected Thread testingThread = new Thread(() -> testingPlanner.Perform());
+    protected ServerSapforTestingPlanner sapforTestingPlanner = new ServerSapforTestingPlanner();
+    protected Thread sapforTestingThread = new Thread(()-> sapforTestingPlanner.Perform());
     //------>>>
     public static boolean checkTasks = false;
     //--