no message

src/Common/Current.java

@@ -20,9 +20,9 @@ import ProjectData.SapforData.Regions.ParallelRegion;
 import Repository.BugReport.BugReport;
 import Repository.Subscribes.Subscriber;
 import TestingSystem.Configuration.Configuration;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 import TestingSystem.Tasks.TestCompilationTask;
 import TestingSystem.Tasks.TestRunTask;
 import TestingSystem.TasksPackage.TasksPackage;
@@ -236,7 +236,7 @@ public enum Current {
         return (Configuration) get(Current.Configuration);
     }
     public static SapforConfiguration getSapforConfiguration() {
-        return (TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
+        return (SapforTestingSystem.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
     }
     //--
     public static Test getTest() {
@@ -374,8 +374,8 @@ public enum Current {
     public static boolean CheckID(Current name, int id) {
         return (get(name) != null) && (((iDBObject) get(name)).id == id);
     }
-    public static TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
-    return (TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
+    public static SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
+    return (SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
     }
     public static boolean HasSapforProfile() {
         return get(Current.SapforProfile)!=null;

src/Common/Global.java

@@ -382,7 +382,7 @@ public class Global {
                         }
                     };
                     Log.ClearLog();
-                    new PackageModeSupervisor().Start();
+                    new PackageModeSupervisor().Do();
                     break;
                 case Undefined:
                     break;

src/Common/ModesSupervisors/PackageModeSupervisor.java

@@ -2,19 +2,20 @@ package Common.ModesSupervisors;
 import Common.Global;
 import Common.Utils.InterruptThread;
 import Common.Utils.Utils;
-import TestingSystem.Sapfor.Scenario_json;
+import SapforTestingSystem.Json.Scenario_json;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.nio.charset.Charset;
+import java.util.Stack;
+import java.util.Vector;
 public class PackageModeSupervisor {
     Thread interruptThread = new InterruptThread(5000, () -> {
         System.exit(0);
         return null;
     });
     //--->>
-    int free_kernels = 4;
-    int busy_kernels = 0;
+    int kernels = 4;
     //--->>
     Scenario_json scenario;
     //--->>
@@ -23,21 +24,49 @@ public class PackageModeSupervisor {
     File sapfor_drv;
     File scenarioFile;
     //--->>
-    public void Start() {
+    Vector<String> activeTests = new Vector<>();
+    Stack<String> waitingTests = new Stack<>();
+    //--->>
+    public void init() throws Exception {
+        packageWorkspace = new File(Global.Home);
+        scenarioFile = new File(packageWorkspace, "scenario.txt");
+        sapfor_drv = new File(packageWorkspace, "SAPFOR_F.exe");
+        String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
+        scenario = Utils.gson.fromJson(packed, Scenario_json.class);
+        //--->>
+        for (String test : scenario.tests)
+            waitingTests.push(test);
+    }
+    public boolean isFinished(String test){
+        return true;
+    }
+    //--->>
+    public void checkActiveTests() throws Exception {
+        Vector<String> finishedTests = new Vector<>();
+        for (String test: activeTests){
+            if (isFinished(test))
+                finishedTests.add(test);
+        }
+        for (String test: finishedTests){
+            activeTests.remove(test);
+        }
+    }
+    public void startWaitingTests() throws Exception {
+    }
+    //--->>
+    public void Do() {
         try {
             interruptThread.start();
             //--->>
-            packageWorkspace = new File(Global.Home);
-            scenarioFile = new File(packageWorkspace, "scenario.txt");
-            sapfor_drv = new File(packageWorkspace, "SAPFOR_F.exe");
+            init();
             //--->>
-            String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
-            scenario = Utils.gson.fromJson(packed, Scenario_json.class);
+            do {
+                checkActiveTests();
+                startWaitingTests();
+                Thread.sleep(1000);
+            } while (!activeTests.isEmpty() && !waitingTests.isEmpty());
         } catch (Exception ex) {
             ex.printStackTrace();
         }
     }
-    //--->>
-    public void startTest() {
-    }
 }

src/Common/UI/UI.java

@@ -70,10 +70,10 @@ import Repository.Component.UI.ComponentsForm;
 import Repository.Subscribes.SubsribersDBTable;
 import TestingSystem.Configuration.UI.ConfigurationDBTable;
 import TestingSystem.Group.GroupsDBTable;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfigurationDBTable;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
-import TestingSystem.Sapfor.SapforTask.SapforTasksDBTable;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackagesDBTable;
+import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
+import SapforTestingSystem.SapforTask.SapforTasksDBTable;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
 import TestingSystem.Tasks.TestRunTasksDBTable;
 import TestingSystem.TasksPackage.TasksPackageDBTable;
 import TestingSystem.Test.TestDBTable;

src/GlobalData/GlobalDatabase.java

@@ -33,11 +33,11 @@ import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
 import GlobalData.Tasks.RunTask.RunTasksDBTable;
 import GlobalData.User.UsersDBTable;
 import Repository.Component.ComponentType;
-import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.SapforTask.SapforTasksDBTable;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackagesDBTable;
+import SapforTestingSystem.SapforTask.SapforTaskResult;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.SapforTask.SapforTasksDBTable;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
 import TestingSystem.TaskKey.TaskKeysDBTable;
 import Visual_DVM_2021.PassStats.PassStatsDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;

src/SapforTestingSystem/Json/SapforVersion_json.java

@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor;
+package SapforTestingSystem.Json;
 import com.google.gson.annotations.Expose;
 public class SapforVersion_json {
     @Expose

src/SapforTestingSystem/Json/ScenarioResults_json.java

@@ -1,5 +1,5 @@
-package TestingSystem.Sapfor;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
+package SapforTestingSystem.Json;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;

src/SapforTestingSystem/Json/Scenario_json.java

@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor;
+package SapforTestingSystem.Json;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
 

src/SapforTestingSystem/SapforConfiguration/SapforConfiguration.java

@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforConfiguration;
+package SapforTestingSystem.SapforConfiguration;
 import Common.Database.rDBObject;
 public class SapforConfiguration extends rDBObject {
     //настройки.

src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java

@@ -1,12 +1,12 @@
-package TestingSystem.Sapfor.SapforConfiguration;
+package SapforTestingSystem.SapforConfiguration;
 import Common.Current;
 import Common.Database.*;
 import Common.Global;
 import Common.UI.DataSetControlForm;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Utils;
-import TestingSystem.Sapfor.SapforConfiguration.UI.SapforConfigurationFields;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 
 import java.util.LinkedHashMap;
 public class SapforConfigurationDBTable extends DBTable<String, SapforConfiguration> {

src/SapforTestingSystem/SapforConfiguration/SapforConfigurationInterface.java

@@ -1,7 +1,7 @@
-package TestingSystem.Sapfor.SapforConfiguration;
+package SapforTestingSystem.SapforConfiguration;
 import Common.Global;
 import Common.Utils.TextLog;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import java.util.Vector;

src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Sapfor.SapforConfiguration.UI.SapforConfigurationFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields">
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

src/SapforTestingSystem/SapforConfiguration/UI/SapforConfigurationFields.java

@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforConfiguration.UI;
+package SapforTestingSystem.SapforConfiguration.UI;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.Windows.Dialog.DialogFields;
 

src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommand.java

@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforConfigurationCommand;
+package SapforTestingSystem.SapforConfigurationCommand;
 import Common.Database.rDBObject;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.sun.org.glassfish.gmbal.Description;

src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandInterface.java

@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforConfigurationCommand;
+package SapforTestingSystem.SapforConfigurationCommand;
 import Common.Current;
 public class SapforConfigurationCommandInterface {
     public static boolean isVisible(SapforConfigurationCommand object) {

src/SapforTestingSystem/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java

@@ -1,10 +1,10 @@
-package TestingSystem.Sapfor.SapforConfigurationCommand;
+package SapforTestingSystem.SapforConfigurationCommand;
 import Common.Current;
 import Common.Database.DBTable;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.DBObjectDialog;
-import TestingSystem.Sapfor.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
+import SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforConfigurationCommand> {
     public SapforConfigurationCommandsDBTable() {

src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Sapfor.SapforConfigurationCommand.UI.SapforConfigurationCommandFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields">
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

src/SapforTestingSystem/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java

@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforConfigurationCommand.UI;
+package SapforTestingSystem.SapforConfigurationCommand.UI;
 import Common.Current;
 import Common.UI.Tables.StyledCellLabel;
 import Common.UI.Windows.Dialog.DialogFields;

src/SapforTestingSystem/SapforTask/MatchState.java

@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforTask;
+package SapforTestingSystem.SapforTask;
 import Common.Current;
 import Common.UI.StatusEnum;
 import Common.UI.Themes.VisualiserFonts;

src/SapforTestingSystem/SapforTask/SapforTaskResult.java

@@ -1,6 +1,6 @@
-package TestingSystem.Sapfor.SapforTask;
+package SapforTestingSystem.SapforTask;
 import Common.Database.DBObject;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 public class SapforTaskResult extends DBObject {
     public SapforTasksPackage_2023 sapforTasksPackage;
     public SapforTask_2023 task;

src/SapforTestingSystem/SapforTask/SapforTask_2023.java

@@ -1,8 +1,8 @@
-package TestingSystem.Sapfor.SapforTask;
+package SapforTestingSystem.SapforTask;
 import Common.Database.DBObject;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
-import TestingSystem.Sapfor.SapforVersion_json;
+import SapforTestingSystem.Json.SapforVersion_json;
 import com.google.gson.annotations.Expose;
 import com.sun.org.glassfish.gmbal.Description;
 

src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java

@@ -1,4 +1,4 @@
-package TestingSystem.Sapfor.SapforTask;
+package SapforTestingSystem.SapforTask;
 import Common.Current;
 import Common.Database.DBTable;
 import Common.UI.DataSetControlForm;

src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage_2023.java

@@ -1,7 +1,7 @@
-package TestingSystem.Sapfor.SapforTasksPackage;
+package SapforTestingSystem.SapforTasksPackage;
 import Common.Database.DBObject;
 import Common.Database.iDBObject;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import TestingSystem.TasksPackage.TasksPackageState;
 import TestingSystem.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;

src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java

@@ -1,8 +1,8 @@
-package TestingSystem.Sapfor.SapforTasksPackage;
+package SapforTestingSystem.SapforTasksPackage;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
 
 import java.util.Date;
 import java.util.LinkedHashMap;

src/TestingSystem/TestsDatabase.java

@@ -4,8 +4,8 @@ import GlobalData.Settings.SettingName;
 import TestingSystem.Configuration.UI.ConfigurationDBTable;
 import TestingSystem.Group.GroupsDBTable;
 import TestingSystem.MachineMaxKernels.MachineMaxKernelsDBTable;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfigurationDBTable;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
+import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
 import TestingSystem.TSetting.TSetting;
 import TestingSystem.TSetting.TSettingsDBTable;
 import TestingSystem.Test.TestDBTable;

src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java

@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
 import Common.Utils.Utils;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.ScenarioResults_json;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.Json.ScenarioResults_json;
 import Visual_DVM_2021.Passes.Pass_2021;
 import org.apache.commons.io.FileUtils;
 

src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java

@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Database.DataSet;
-import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
+import SapforTestingSystem.SapforTask.SapforTaskResult;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class CompareSapforPackages extends Pass_2021 {
     DataSet<String, SapforTaskResult> masterTasks;

src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java

@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
 
 import java.util.Vector;

src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java

@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
 
 import java.util.Vector;

src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java

@@ -4,7 +4,7 @@ import Common.Database.Database;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 import Visual_DVM_2021.Passes.DeleteObjectPass;
 
 import java.io.File;

src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Database.Database;
 import Common.Global;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.EditObjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EditSapforConfiguration extends EditObjectPass<SapforConfiguration> {

src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Database.Database;
 import Common.Global;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.EditObjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EditSapforConfigurationCommand  extends EditObjectPass<SapforConfigurationCommand> {

src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommandOnServer.java

@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.TestingSystemPass;
 public class EditSapforConfigurationCommandOnServer extends TestingSystemPass<SapforConfigurationCommand> {
     @Override

src/Visual_DVM_2021/Passes/All/EditSapforConfigurationOnServer.java

@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.TestingSystemPass;
 public class EditSapforConfigurationOnServer extends TestingSystemPass<SapforConfiguration> {
     @Override

src/Visual_DVM_2021/Passes/All/OpenSapforTest.java

@@ -6,9 +6,9 @@ import ProjectData.Files.DBProjectFile;
 import ProjectData.LanguageName;
 import ProjectData.Messages.Errors.MessageError;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.SapforVersion_json;
+import SapforTestingSystem.SapforTask.SapforTaskResult;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.Json.SapforVersion_json;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import org.apache.commons.io.FileUtils;

src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java

@@ -2,10 +2,10 @@ package Visual_DVM_2021.Passes.All;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.SapforVersion_json;
-import TestingSystem.Sapfor.ScenarioResults_json;
-import TestingSystem.Sapfor.Scenario_json;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.Json.SapforVersion_json;
+import SapforTestingSystem.Json.ScenarioResults_json;
+import SapforTestingSystem.Json.Scenario_json;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Pass_2021;

src/Visual_DVM_2021/Passes/All/PerformScenario.java

@@ -3,11 +3,11 @@ import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
-import TestingSystem.Sapfor.SapforVersion_json;
-import TestingSystem.Sapfor.ScenarioResults_json;
-import TestingSystem.Sapfor.Scenario_json;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.Json.SapforVersion_json;
+import SapforTestingSystem.Json.ScenarioResults_json;
+import SapforTestingSystem.Json.Scenario_json;
 import TestingSystem.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;

src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.TestingSystemPass;
 public class PublishSapforConfiguration extends TestingSystemPass<SapforConfiguration> {

src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.TestingSystemPass;
 public class PublishSapforConfigurationCommand extends TestingSystemPass<SapforConfigurationCommand> {

src/Visual_DVM_2021/Passes/All/StartSapforTests.java

@@ -9,11 +9,11 @@ import ProjectData.LanguageName;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Group.Group;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
-import TestingSystem.Sapfor.SapforConfiguration.SapforConfigurationInterface;
-import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
-import TestingSystem.Sapfor.Scenario_json;
+import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
+import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
+import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.Json.Scenario_json;
 import TestingSystem.Test.Test;
 import TestingSystem.Test.TestInterface;
 import Visual_DVM_2021.Passes.PassCode_2021;

src/Visual_DVM_2021/UI/Interface/TestingWindow.java

@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Interface;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 public interface TestingWindow extends VisualizerForm {
     void ShowAll();
     void RestoreLastCredentials();

src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java

@@ -7,8 +7,8 @@ import Common.UI.Label.ShortLabel;
 import Common.UI.Menus_2023.VisualiserMenuBar;
 import Common.UI.UI;
 import Common.Utils.TextLog;
-import TestingSystem.Sapfor.SapforTask.SapforTaskResult;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTask.SapforTaskResult;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 import TestingSystem.Test.ProjectFiles_json;
 import Visual_DVM_2021.Passes.Pass_2021;
 

src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java

@@ -1,6 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Current;
-import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
+import SapforTestingSystem.SapforTask.SapforTask_2023;
 //упразднить.
 public class SapforTasksComparisonForm extends TasksComparisonForm<SapforTask_2023> {
     public SapforTasksComparisonForm(ComparisonForm<SapforTask_2023> slave_in) {

src/Visual_DVM_2021/UI/Main/TestingForm.java

@@ -10,7 +10,7 @@ import GlobalData.Credentials.Credentials;
 import TestingSystem.Configuration.UI.ConfigurationDBTable;
 import TestingSystem.Group.Group;
 import TestingSystem.MachineMaxKernels.MachineMaxKernels;
-import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
 import TestingSystem.TasksPackage.TasksPackageDBTable;
 import TestingSystem.Test.Test;
 import Visual_DVM_2021.UI.Interface.FormWithSplitters;