From 46e050382b78f0211f8d4b1852b2e45cfb36096e Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 8 Oct 2023 02:05:57 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                 | 13 ++-----------
 src/Common/Current.java                             |  2 +-
 src/Common/Global.java                              |  8 ++++----
 src/TestingSystem/TestingServer.java                |  2 +-
 .../Passes/All/SPF_CreateParallelVariant.java       |  2 +-
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b02fb414..05a5912b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,19 +7,10 @@
   </component>
   <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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" 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/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.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/SapforServerScenario_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage_info.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Current.java b/src/Common/Current.java
index c458e0e2..8701d102 100644
--- a/src/Common/Current.java
+++ b/src/Common/Current.java
@@ -487,6 +487,6 @@ public enum Current {
         Normal,
         Server,
         Testing,
-        Scenario
+        Package
     }
 }
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 0b44df5e..71a468a9 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -347,7 +347,7 @@ public class Global {
         testingServer.Start();
         System.exit(0);
     }
-    public static void ScenarioMode() throws Exception {
+    public static void PackageMode() throws Exception {
         isWindows = System.getProperty("os.name").startsWith("Windows");
         Log = new Loggable() {
             @Override
@@ -356,7 +356,7 @@ public class Global {
             }
             @Override
             public String getLogName() {
-                return "Scenario";
+                return "Package";
             }
         };
         Log.ClearLog();
@@ -383,8 +383,8 @@ public class Global {
                 case Testing:
                     TestingSystemMode();
                     break;
-                case Scenario:
-                    ScenarioMode();
+                case Package:
+                    PackageMode();
                     break;
                 case Undefined:
                     break;
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index 21b5ade5..fe975c51 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -361,7 +361,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         FileUtils.copyFile(new File(Global.Home, "TestingSystem.jar"), visualiser);
         //создание настроек
         GlobalProperties properties = new GlobalProperties();
-        properties.Mode = Current.Mode.Scenario;
+        properties.Mode = Current.Mode.Package;
         properties.threadsNum = Global.properties.threadsNum; //брать из настроек сервера же.
         properties.threadsTimeout = Global.properties.threadsTimeout;
         Utils.jsonToFile(properties, new File(sapforTasksPackage.workspace, "properties"));
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java b/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
index 228d642d..9db94c1e 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
@@ -71,7 +71,7 @@ public class SPF_CreateParallelVariant extends SapforTransformation {
     @Override
     protected void performFinish() throws Exception {
         //в пакетном режиме вариант всегда один. поэтому, сообщения надо распаковать сразу.
-        if (Current.mode.equals(Current.Mode.Scenario))
+        if (Current.mode.equals(Current.Mode.Package))
             super.performFinish();
     }
     @Override