From 2f0d01b9f34b47a9c2e72e3bbb5b6245875c12a4 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 4 Oct 2023 22:01:09 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 52 ++++++++++++++++++-
 src/Common/{Constants => }/Constants.java     | 11 +++-
 src/Common/Database/Database.java             |  2 +-
 src/Common/Database/iDBObject.java            |  2 +-
 src/Common/UI/DataSetControlForm.java         |  2 +-
 src/Common/UI/Menus/TableMenu.java            |  2 +-
 src/Common/UI/Tables/ColumnInfo.java          |  2 +-
 src/Common/Utils/InterruptThread.java         |  8 +--
 src/Common/Utils/Utils.java                   |  2 +-
 .../Utils/Validators/PathValidator.java       |  2 +-
 src/Common/Utils/Validators/ShellParser.java  |  2 +-
 src/GlobalData/Credentials/Credentials.java   |  2 +-
 .../EnvironmentValue/EnvironmentValue.java    |  2 +-
 src/GlobalData/Machine/Machine.java           |  2 +-
 src/GlobalData/Module/Module.java             |  2 +-
 src/GlobalData/Module/ModuleAnchestor.java    |  2 +-
 .../Module/UI/ModuleAnchestorForm.java        |  2 +-
 .../RunConfiguration/RunConfiguration.java    |  2 +-
 .../RunConfigurationsDBTable.java             |  2 +-
 .../SapforProfileSetting.java                 |  2 +-
 src/GlobalData/Splitter/Splitter.java         |  2 +-
 .../CompilationTask/CompilationTask.java      |  2 +-
 src/GlobalData/Tasks/RunTask/RunTask.java     |  2 +-
 .../Local/Linux/LinuxLocalTaskSupervisor.java |  8 +--
 .../Supervisor/Local/LocalTaskSupervisor.java |  7 ++-
 .../Remote/RemoteTaskSupervisor.java          | 16 +++---
 src/GlobalData/Tasks/Task.java                |  8 +--
 src/GlobalData/User/User.java                 |  2 +-
 src/ProjectData/Files/DBProjectFile.java      | 13 ++---
 src/ProjectData/Project/db_project_info.java  | 12 +----
 src/Repository/Component/Component.java       |  2 +-
 src/Repository/Component/Sapfor/Sapfor.java   |  2 +-
 .../PerformSapforTask.java                    |  2 +-
 .../SapforServerScenario_info.java            |  2 +-
 .../SapforTask/SapforTask.java                |  2 +-
 .../SapforTasksPackage.java                   |  2 +-
 .../SapforTestingPlanner.java                 | 11 ++--
 .../ThreadTask/ThreadTask.java                |  2 +-
 src/TestingSystem/Tasks/TestRunTask.java      |  2 +-
 src/TestingSystem/Tasks/TestTask.java         |  2 +-
 .../TestsSupervisor_2022.java                 | 14 ++---
 src/Visual_DVM_2021/Passes/All/AddFile.java   |  2 +-
 .../Passes/All/DownloadRepository.java        |  2 +-
 .../Passes/All/InstallServerSapfor.java       |  2 +-
 .../Passes/All/OpenSapforTest.java            |  2 +-
 .../Passes/All/PickCompilerEnvironments.java  |  2 +-
 .../Passes/All/Precompilation.java            |  2 +-
 src/Visual_DVM_2021/Passes/ProcessPass.java   |  2 +-
 .../UI/Main/ComparisonForm.java               |  2 +-
 src/Visual_DVM_2021/UI/Main/FileForm.java     |  2 +-
 src/Visual_DVM_2021/UI/Main/TestingForm.java  |  2 +-
 51 files changed, 146 insertions(+), 94 deletions(-)
 rename src/Common/{Constants => }/Constants.java (94%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 61e5c641..2e11522d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,56 @@
   <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/SapforTestingSystem/SapforScenario/SapforScenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenario.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/Common/Constants/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/iDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/iDBObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus/TableMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus/TableMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/ColumnInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Tables/ColumnInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/PathValidator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Validators/PathValidator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/ShellParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Validators/ShellParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Credentials/Credentials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Credentials/Credentials.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValue.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/Machine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/Machine.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/Module.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/Module.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModuleAnchestor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModuleAnchestor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Splitter/Splitter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Splitter/Splitter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Task.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/User.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Component.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.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/SapforServerScenario_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadTask/ThreadTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadTask/ThreadTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestRunTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Tasks/TestTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Constants/Constants.java b/src/Common/Constants.java
similarity index 94%
rename from src/Common/Constants/Constants.java
rename to src/Common/Constants.java
index fb633d66..710eea7d 100644
--- a/src/Common/Constants/Constants.java
+++ b/src/Common/Constants.java
@@ -1,4 +1,4 @@
-package Common.Constants;
+package Common;
 import GlobalData.Machine.Machine;
 import GlobalData.Machine.MachineType;
 import GlobalData.User.User;
@@ -12,6 +12,15 @@ public class Constants {
     public static final String SAPFOR_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/sapfor";
     //--
     public static final String LOADED = "LOADED";
+    //--файлы-признаки
+    public static final String ABORTED = "ABORTED";
+    public static final String INTERRUPT = "INTERRUPT"; //файл признак прерывания.
+    public final static String DONE = "DONE";
+    public final static String TIMEOUT = "TIMEOUT";
+    //- вывод задач
+    public final static String out_file = "out.txt";
+    public final static String err_file = "err.txt";
+    public final static String time_file = "total_time";
     //--
     //https://losst.ru/komandy-terminala-linux
     public static String[] linux_system_commands = new String[]{
diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java
index 68ef5af1..4eed9276 100644
--- a/src/Common/Database/Database.java
+++ b/src/Common/Database/Database.java
@@ -1,5 +1,5 @@
 package Common.Database;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import Repository.RepositoryRefuseException;
diff --git a/src/Common/Database/iDBObject.java b/src/Common/Database/iDBObject.java
index 2fbaa653..2257c9a8 100644
--- a/src/Common/Database/iDBObject.java
+++ b/src/Common/Database/iDBObject.java
@@ -1,5 +1,5 @@
 package Common.Database;
-import Common.Constants.Constants;
+import Common.Constants;
 import com.sun.org.glassfish.gmbal.Description;
 //автоинкрементальный ключ
 public class iDBObject extends DBObject {
diff --git a/src/Common/UI/DataSetControlForm.java b/src/Common/UI/DataSetControlForm.java
index e527148d..d7f1be1c 100644
--- a/src/Common/UI/DataSetControlForm.java
+++ b/src/Common/UI/DataSetControlForm.java
@@ -1,5 +1,5 @@
 package Common.UI;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Database.DBTable;
diff --git a/src/Common/UI/Menus/TableMenu.java b/src/Common/UI/Menus/TableMenu.java
index 3b6e06b3..dd1faced 100644
--- a/src/Common/UI/Menus/TableMenu.java
+++ b/src/Common/UI/Menus/TableMenu.java
@@ -1,5 +1,5 @@
 package Common.UI.Menus;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Utils.Utils;
 
 import javax.swing.*;
diff --git a/src/Common/UI/Tables/ColumnInfo.java b/src/Common/UI/Tables/ColumnInfo.java
index 4b90788c..049a0eb2 100644
--- a/src/Common/UI/Tables/ColumnInfo.java
+++ b/src/Common/UI/Tables/ColumnInfo.java
@@ -1,5 +1,5 @@
 package Common.UI.Tables;
-import Common.Constants.Constants;
+import Common.Constants;
 public class ColumnInfo {
     private String Name = "?";
     private boolean visible = true;
diff --git a/src/Common/Utils/InterruptThread.java b/src/Common/Utils/InterruptThread.java
index 9d79ad50..2fd7876c 100644
--- a/src/Common/Utils/InterruptThread.java
+++ b/src/Common/Utils/InterruptThread.java
@@ -1,5 +1,5 @@
 package Common.Utils;
-import ProjectData.Project.db_project_info;
+import Common.Constants;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -8,14 +8,14 @@ public class InterruptThread extends Thread{
     //------------
     public InterruptThread(int sleep_ms, Callable action){
         super(() -> {
-            File interruptFile = new File(db_project_info.interrupt);
+            File interruptFile = new File(Constants.INTERRUPT);
             try {
                 while (true) {
                     Thread.sleep(sleep_ms);
                     if (interruptFile.exists()) {
-                        FileUtils.writeStringToFile(new File("ABORTED"), "");
-                        FileUtils.forceDelete(interruptFile);
                         action.call();
+                        FileUtils.writeStringToFile(new File(Constants.ABORTED), "");
+                        FileUtils.forceDelete(interruptFile);
                     }
                 }
             } catch (Exception ex) {
diff --git a/src/Common/Utils/Utils.java b/src/Common/Utils/Utils.java
index 636ba997..8a759d05 100644
--- a/src/Common/Utils/Utils.java
+++ b/src/Common/Utils/Utils.java
@@ -1,5 +1,5 @@
 package Common.Utils;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Global;
 import Common.UI.UI;
 import ProjectData.Files.DBProjectFile;
diff --git a/src/Common/Utils/Validators/PathValidator.java b/src/Common/Utils/Validators/PathValidator.java
index ef2626a6..4eafb51a 100644
--- a/src/Common/Utils/Validators/PathValidator.java
+++ b/src/Common/Utils/Validators/PathValidator.java
@@ -1,5 +1,5 @@
 package Common.Utils.Validators;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Utils.TextLog;
 import Common.Utils.Utils;
 import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
diff --git a/src/Common/Utils/Validators/ShellParser.java b/src/Common/Utils/Validators/ShellParser.java
index f521daea..91b76e49 100644
--- a/src/Common/Utils/Validators/ShellParser.java
+++ b/src/Common/Utils/Validators/ShellParser.java
@@ -1,5 +1,5 @@
 package Common.Utils.Validators;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 
diff --git a/src/GlobalData/Credentials/Credentials.java b/src/GlobalData/Credentials/Credentials.java
index 20776801..d20290cb 100644
--- a/src/GlobalData/Credentials/Credentials.java
+++ b/src/GlobalData/Credentials/Credentials.java
@@ -1,5 +1,5 @@
 package GlobalData.Credentials;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Database.iDBObject;
 import com.sun.org.glassfish.gmbal.Description;
 public class Credentials extends iDBObject {
diff --git a/src/GlobalData/EnvironmentValue/EnvironmentValue.java b/src/GlobalData/EnvironmentValue/EnvironmentValue.java
index b0448db4..4ac0ab1b 100644
--- a/src/GlobalData/EnvironmentValue/EnvironmentValue.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValue.java
@@ -1,5 +1,5 @@
 package GlobalData.EnvironmentValue;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Database.iDBObject;
 import Common.Utils.Utils;
diff --git a/src/GlobalData/Machine/Machine.java b/src/GlobalData/Machine/Machine.java
index 5558b4f0..5b0e1929 100644
--- a/src/GlobalData/Machine/Machine.java
+++ b/src/GlobalData/Machine/Machine.java
@@ -1,5 +1,5 @@
 package GlobalData.Machine;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Database.iDBObject;
 import Common.Global;
 import Common.Utils.Utils;
diff --git a/src/GlobalData/Module/Module.java b/src/GlobalData/Module/Module.java
index b751642b..d68c13b4 100644
--- a/src/GlobalData/Module/Module.java
+++ b/src/GlobalData/Module/Module.java
@@ -1,5 +1,5 @@
 package GlobalData.Module;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import GlobalData.Makefile.Makefile;
diff --git a/src/GlobalData/Module/ModuleAnchestor.java b/src/GlobalData/Module/ModuleAnchestor.java
index a9a0e4b9..f7189368 100644
--- a/src/GlobalData/Module/ModuleAnchestor.java
+++ b/src/GlobalData/Module/ModuleAnchestor.java
@@ -1,5 +1,5 @@
 package GlobalData.Module;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Database.iDBObject;
 import Common.Global;
 import Common.Utils.Utils;
diff --git a/src/GlobalData/Module/UI/ModuleAnchestorForm.java b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
index da9eef4b..ea1fd135 100644
--- a/src/GlobalData/Module/UI/ModuleAnchestorForm.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
@@ -1,5 +1,5 @@
 package GlobalData.Module.UI;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.DBObjectDialog;
diff --git a/src/GlobalData/RunConfiguration/RunConfiguration.java b/src/GlobalData/RunConfiguration/RunConfiguration.java
index 322a0ac7..6b160d79 100644
--- a/src/GlobalData/RunConfiguration/RunConfiguration.java
+++ b/src/GlobalData/RunConfiguration/RunConfiguration.java
@@ -1,5 +1,5 @@
 package GlobalData.RunConfiguration;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Database.iDBObject;
 import Common.Global;
diff --git a/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
index 13e31462..80dcca60 100644
--- a/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -1,5 +1,5 @@
 package GlobalData.RunConfiguration;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Database.*;
 import Common.Global;
diff --git a/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java b/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java
index 7359201e..81f12be7 100644
--- a/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java
+++ b/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java
@@ -1,5 +1,5 @@
 package GlobalData.SapforProfileSetting;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Database.iDBObject;
 import GlobalData.Settings.SettingName;
diff --git a/src/GlobalData/Splitter/Splitter.java b/src/GlobalData/Splitter/Splitter.java
index c6b47fce..f4c9bbea 100644
--- a/src/GlobalData/Splitter/Splitter.java
+++ b/src/GlobalData/Splitter/Splitter.java
@@ -1,5 +1,5 @@
 package GlobalData.Splitter;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Database.DBObject;
 import com.sun.org.glassfish.gmbal.Description;
 
diff --git a/src/GlobalData/Tasks/CompilationTask/CompilationTask.java b/src/GlobalData/Tasks/CompilationTask/CompilationTask.java
index 2e94ab26..291ba89c 100644
--- a/src/GlobalData/Tasks/CompilationTask/CompilationTask.java
+++ b/src/GlobalData/Tasks/CompilationTask/CompilationTask.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.CompilationTask;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.Utils.Utils;
diff --git a/src/GlobalData/Tasks/RunTask/RunTask.java b/src/GlobalData/Tasks/RunTask/RunTask.java
index d5d4a293..a743a1f6 100644
--- a/src/GlobalData/Tasks/RunTask/RunTask.java
+++ b/src/GlobalData/Tasks/RunTask/RunTask.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.RunTask;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.Utils.StringTemplate;
diff --git a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
index 363d4a6e..87e2de26 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
@@ -1,10 +1,10 @@
 package GlobalData.Tasks.Supervisor.Local.Linux;
+import Common.Constants;
 import Common.Utils.Utils;
 import GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
 import GlobalData.User.User;
-import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassException;
 
 import java.io.File;
@@ -59,13 +59,13 @@ public abstract class LinuxLocalTaskSupervisor<T extends Task> extends LocalTask
         }
     }
     protected File getProjectTime() {
-        return Paths.get(getProjectCopy().getAbsolutePath(), db_project_info.time_file).toFile();
+        return Paths.get(getProjectCopy().getAbsolutePath(), Constants.time_file).toFile();
     }
     protected File getDONE_file() {
-        return Paths.get(getProjectCopy().getAbsolutePath(), db_project_info.DONE).toFile();
+        return Paths.get(getProjectCopy().getAbsolutePath(), Constants.DONE).toFile();
     }
     protected File getTIMEOUT_file() {
-        return Paths.get(getProjectCopy().getAbsolutePath(), db_project_info.TIMEOUT).toFile();
+        return Paths.get(getProjectCopy().getAbsolutePath(), Constants.TIMEOUT).toFile();
     }
     @Override
     protected void PrepareWorkspace() throws Exception {
diff --git a/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
index b4a94e4e..ae65f5c9 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
@@ -1,12 +1,11 @@
 package GlobalData.Tasks.Supervisor.Local;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Tasks.RunTask.RunTask;
 import GlobalData.Tasks.Supervisor.TaskSupervisor;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
-import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.Pass_2021;
 import org.apache.commons.io.FileUtils;
 
@@ -47,10 +46,10 @@ public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor
         return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (Global.isWindows ? ".exe" : "")).toFile();
     }
     protected File getProjectOutput() {
-        return Paths.get(getProjectCopy().getAbsolutePath(), db_project_info.out_file).toFile();
+        return Paths.get(getProjectCopy().getAbsolutePath(), Constants.out_file).toFile();
     }
     protected File getProjectErrors() {
-        return Paths.get(getProjectCopy().getAbsolutePath(), db_project_info.err_file).toFile();
+        return Paths.get(getProjectCopy().getAbsolutePath(), Constants.err_file).toFile();
     }
     @Override
     protected void PrepareWorkspace() throws Exception {
diff --git a/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
index 49ec8a7e..b9136a9b 100644
--- a/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
@@ -1,10 +1,10 @@
 package GlobalData.Tasks.Supervisor.Remote;
+import Common.Constants;
 import Common.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.Supervisor.TaskSupervisor;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
-import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSupervisor<T, ConnectionPass> {
     protected RemoteFile getRemoteProjectsPath() {
@@ -17,19 +17,19 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
         return new RemoteFile(getRemoteProject().full_name, "0");
     }
     protected RemoteFile getRemoteTime() {
-        return new RemoteFile(getRemoteProject().full_name, db_project_info.time_file);
+        return new RemoteFile(getRemoteProject().full_name, Constants.time_file);
     }
     protected RemoteFile getRemoteOutput() {
-        return new RemoteFile(getRemoteProject().full_name, db_project_info.out_file);
+        return new RemoteFile(getRemoteProject().full_name, Constants.out_file);
     }
     protected RemoteFile getRemoteErrors() {
-        return new RemoteFile(getRemoteProject().full_name, db_project_info.err_file);
+        return new RemoteFile(getRemoteProject().full_name, Constants.err_file);
     }
     public RemoteFile getDONE_file() {
-        return new RemoteFile(getRemoteProject().full_name, db_project_info.DONE);
+        return new RemoteFile(getRemoteProject().full_name, Constants.DONE);
     }
     public RemoteFile getTIMEOUT_file() {
-        return new RemoteFile(getRemoteProject().full_name, db_project_info.TIMEOUT);
+        return new RemoteFile(getRemoteProject().full_name, Constants.TIMEOUT);
     }
     @Override
     protected void PrepareWorkspace() throws Exception {
@@ -42,9 +42,9 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
     }
     @Override
     protected void CheckTask() throws Exception {
-        if (pass.Exists(getRemoteProject().full_name, db_project_info.DONE))
+        if (pass.Exists(getRemoteProject().full_name, Constants.DONE))
             task.state = TaskState.Finished;
-        else if (pass.Exists(getRemoteProject().full_name, db_project_info.TIMEOUT))
+        else if (pass.Exists(getRemoteProject().full_name, Constants.TIMEOUT))
             task.state = TaskState.AbortedByTimeout;
     }
     @Override
diff --git a/src/GlobalData/Tasks/Task.java b/src/GlobalData/Tasks/Task.java
index f5f40faf..5f3a51b6 100644
--- a/src/GlobalData/Tasks/Task.java
+++ b/src/GlobalData/Tasks/Task.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Database.iDBObject;
 import Common.Global;
 import Common.Utils.Utils;
@@ -52,13 +52,13 @@ public abstract class Task extends iDBObject {
         return Paths.get(getHome().getAbsolutePath(), String.valueOf(id)).toFile();
     }
     public File getOutputFile() {
-        return Paths.get(getLocalWorkspace().getAbsolutePath(), db_project_info.out_file).toFile();
+        return Paths.get(getLocalWorkspace().getAbsolutePath(), Constants.out_file).toFile();
     }
     public File getErrorsFile() {
-        return Paths.get(getLocalWorkspace().getAbsolutePath(), db_project_info.err_file).toFile();
+        return Paths.get(getLocalWorkspace().getAbsolutePath(), Constants.err_file).toFile();
     }
     public File getTimeFile() {
-        return Paths.get(getLocalWorkspace().getAbsolutePath(), db_project_info.time_file).toFile();
+        return Paths.get(getLocalWorkspace().getAbsolutePath(), Constants.time_file).toFile();
     }
     public abstract String getFullCommand();
     public Date getEndDate() {
diff --git a/src/GlobalData/User/User.java b/src/GlobalData/User/User.java
index 4075de05..b342b2af 100644
--- a/src/GlobalData/User/User.java
+++ b/src/GlobalData/User/User.java
@@ -1,5 +1,5 @@
 package GlobalData.User;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Database.iDBObject;
 import GlobalData.Machine.Machine;
diff --git a/src/ProjectData/Files/DBProjectFile.java b/src/ProjectData/Files/DBProjectFile.java
index 60707daf..cb23afd5 100644
--- a/src/ProjectData/Files/DBProjectFile.java
+++ b/src/ProjectData/Files/DBProjectFile.java
@@ -1,4 +1,5 @@
 package ProjectData.Files;
+import Common.Constants;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Global;
@@ -146,15 +147,15 @@ public class DBProjectFile extends DBObject {
     public void AutoDetectProperties() {
         //проверка запретных имен.
         String[] forbiddenNames = new String[]{
-                db_project_info.interrupt,
+                Constants.INTERRUPT,
                 db_project_info.launch_script_name,
                 db_project_info.default_binary_name,
                 //--
-                db_project_info.DONE,
-                db_project_info.TIMEOUT,
-                db_project_info.out_file,
-                db_project_info.err_file,
-                db_project_info.time_file,
+                Constants.DONE,
+                Constants.TIMEOUT,
+                Constants.out_file,
+                Constants.err_file,
+                Constants.time_file,
                 "Makefile"
         };
         for (String forbidden : forbiddenNames) {
diff --git a/src/ProjectData/Project/db_project_info.java b/src/ProjectData/Project/db_project_info.java
index 53f3f99c..7addde8c 100644
--- a/src/ProjectData/Project/db_project_info.java
+++ b/src/ProjectData/Project/db_project_info.java
@@ -1,5 +1,5 @@
 package ProjectData.Project;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Global;
@@ -49,8 +49,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 public class db_project_info extends DBObject {
     public static Vector<db_project_info> newVersions = new Vector<>();
-    //--
-    public static final String interrupt = "INTERRUPT";
     public static final String launch_script_name = "run";
     public static final String default_binary_name = "0";
     public static final String data = "visualiser_data";
@@ -61,12 +59,6 @@ public class db_project_info extends DBObject {
     public static final String statistic = "statistic";
     private static final String unknown_metric = " — ";
     //--
-    public final static String DONE = "DONE";
-    public final static String TIMEOUT = "TIMEOUT";
-    public final static String out_file = "out.txt";
-    public final static String err_file = "err.txt";
-    public final static String time_file = "total_time";
-    //--
     public DefaultMutableTreeNode align_rules_root = new DefaultMutableTreeNode("");
     public DefaultMutableTreeNode includes_root = new DefaultMutableTreeNode("");
     //-
@@ -719,7 +711,7 @@ public class db_project_info extends DBObject {
         return true;
     }
     public File getInterruptFile() {
-        return Paths.get(getDataDirectory().getAbsolutePath(), interrupt).toFile();
+        return Paths.get(getDataDirectory().getAbsolutePath(), Constants.INTERRUPT).toFile();
     }
     public void CleanInterruptFile() throws Exception {
         File file = getInterruptFile();
diff --git a/src/Repository/Component/Component.java b/src/Repository/Component/Component.java
index dcc0dbd1..dff31b4f 100644
--- a/src/Repository/Component/Component.java
+++ b/src/Repository/Component/Component.java
@@ -1,5 +1,5 @@
 package Repository.Component;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Database.DBObject;
 import Common.Global;
 import Common.Utils.Files.VFileChooser;
diff --git a/src/Repository/Component/Sapfor/Sapfor.java b/src/Repository/Component/Sapfor/Sapfor.java
index 25247aba..6f82d610 100644
--- a/src/Repository/Component/Sapfor/Sapfor.java
+++ b/src/Repository/Component/Sapfor/Sapfor.java
@@ -1,5 +1,5 @@
 package Repository.Component.Sapfor;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
diff --git a/src/SapforTestingSystem/PerformSapforTask.java b/src/SapforTestingSystem/PerformSapforTask.java
index a4f2bf3a..4d868b0c 100644
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -1,5 +1,5 @@
 package SapforTestingSystem;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
diff --git a/src/SapforTestingSystem/SapforServerScenario_info.java b/src/SapforTestingSystem/SapforServerScenario_info.java
index 0040f830..c67b9bc6 100644
--- a/src/SapforTestingSystem/SapforServerScenario_info.java
+++ b/src/SapforTestingSystem/SapforServerScenario_info.java
@@ -1,5 +1,5 @@
 package SapforTestingSystem;
-import Common.Constants.Constants;
+import Common.Constants;
 import com.google.gson.annotations.Expose;
 
 import java.io.Serializable;
diff --git a/src/SapforTestingSystem/SapforTask/SapforTask.java b/src/SapforTestingSystem/SapforTask/SapforTask.java
index 3028a99c..1e10574d 100644
--- a/src/SapforTestingSystem/SapforTask/SapforTask.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTask.java
@@ -1,5 +1,5 @@
 package SapforTestingSystem.SapforTask;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Database.DBObject;
 import GlobalData.Tasks.TaskState;
 import SapforTestingSystem.Json.SapforVersion_json;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
index 9ab9005f..2b8ca64d 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
@@ -1,5 +1,5 @@
 package SapforTestingSystem.SapforTasksPackage;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Database.iDBObject;
diff --git a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java b/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
index 47574680..958053eb 100644
--- a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
+++ b/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
@@ -1,4 +1,5 @@
 package SapforTestingSystem.SapforTestingPlaner;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import SapforTestingSystem.Json.SapforConfiguration_json;
@@ -7,6 +8,7 @@ import SapforTestingSystem.Json.PackageModeScenario_json;
 import SapforTestingSystem.PerformSapforTask;
 import SapforTestingSystem.SapforTask.SapforTask;
 import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
+import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.util.Date;
@@ -43,6 +45,7 @@ public class SapforTestingPlanner extends ThreadsPlanner {
         Process killer = Runtime.getRuntime().exec(kill_command);
         killer.waitFor();
         System.out.println("done!");
+
         //todo для надежности сделать еще один kill с внешнего процесса.
         // может быть гонка, что нить успеет запустить процесс уже после интеррупта.
     }
@@ -54,14 +57,14 @@ public class SapforTestingPlanner extends ThreadsPlanner {
         try {
             System.out.println("Запись результатов");
             Utils.jsonToFile(results_json, new File(Global.Home, "results"));
-            System.out.println("Очистка служебных файлов");
+           // System.out.println("Очистка служебных файлов");
             //тут же и строить версии.
-            Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep", "bat");
-            System.out.println("Нажмите любую клавишу для выхода...");
-            System.in.read();
+          //  Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep", "bat");
+            FileUtils.writeStringToFile(new File(Constants.DONE), "");
         } catch (Exception e) {
             Global.Log.PrintException(e);
         }
+
         System.exit(0);
     }
 }
diff --git a/src/SapforTestingSystem/ThreadTask/ThreadTask.java b/src/SapforTestingSystem/ThreadTask/ThreadTask.java
index 85ebc43a..73224fb1 100644
--- a/src/SapforTestingSystem/ThreadTask/ThreadTask.java
+++ b/src/SapforTestingSystem/ThreadTask/ThreadTask.java
@@ -1,5 +1,5 @@
 package SapforTestingSystem.ThreadTask;
-import Common.Constants.Constants;
+import Common.Constants;
 public class ThreadTask {
     public int id = Constants.Nan;
     public Thread thread;
diff --git a/src/TestingSystem/Tasks/TestRunTask.java b/src/TestingSystem/Tasks/TestRunTask.java
index 9a5839ef..b43ed9f5 100644
--- a/src/TestingSystem/Tasks/TestRunTask.java
+++ b/src/TestingSystem/Tasks/TestRunTask.java
@@ -1,5 +1,5 @@
 package TestingSystem.Tasks;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Database.DBObject;
 import GlobalData.Tasks.TaskState;
 import ProjectData.LanguageName;
diff --git a/src/TestingSystem/Tasks/TestTask.java b/src/TestingSystem/Tasks/TestTask.java
index b3a735d2..5b396948 100644
--- a/src/TestingSystem/Tasks/TestTask.java
+++ b/src/TestingSystem/Tasks/TestTask.java
@@ -1,5 +1,5 @@
 package TestingSystem.Tasks;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Database.DBObject;
 import GlobalData.Tasks.TaskState;
 import TestingSystem.Configuration.Configuration;
diff --git a/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java b/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java
index 9400d5a7..22a47326 100644
--- a/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java
+++ b/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java
@@ -1,9 +1,9 @@
 package TestingSystem.TestsSupervisor_2022;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.TaskState;
-import ProjectData.Project.db_project_info;
 import Repository.Server.ServerCode;
 import TestingSystem.Tasks.TestCompilationTask;
 import TestingSystem.Tasks.TestRunTask;
@@ -198,9 +198,9 @@ public class TestsSupervisor_2022 {
             RemoteFile taskRemoteWorkspace = new RemoteFile(packageRemoteWorkspace.full_name, String.valueOf(testTask.id));
             Utils.CheckDirectory(taskLocalWorkspace);
             if (connection.Exists(packageRemoteWorkspace.full_name, String.valueOf(testTask.id))) {
-                CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, db_project_info.out_file);
-                CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, db_project_info.err_file);
-                CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, db_project_info.time_file);
+                CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, Constants.out_file);
+                CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, Constants.err_file);
+                CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, Constants.time_file);
                 CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, "TaskState");
                 if (testTask instanceof TestRunTask)
                     CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, "sts.gz+");
@@ -302,9 +302,9 @@ public class TestsSupervisor_2022 {
             File taskWorkspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), String.valueOf(testTask.id)).toFile();
             System.out.println("id=" + testTask.id + ":  path=" + taskWorkspace.getAbsolutePath());
             File stateFile = Paths.get(taskWorkspace.getAbsolutePath(), "TaskState").toFile();
-            File outFile = Paths.get(taskWorkspace.getAbsolutePath(), db_project_info.out_file).toFile();
-            File errFile = Paths.get(taskWorkspace.getAbsolutePath(), db_project_info.err_file).toFile();
-            File timeFile = Paths.get(taskWorkspace.getAbsolutePath(), db_project_info.time_file).toFile();
+            File outFile = Paths.get(taskWorkspace.getAbsolutePath(), Constants.out_file).toFile();
+            File errFile = Paths.get(taskWorkspace.getAbsolutePath(), Constants.err_file).toFile();
+            File timeFile = Paths.get(taskWorkspace.getAbsolutePath(), Constants.time_file).toFile();
             if (outFile.exists())
                 testTask.output = FileUtils.readFileToString(outFile);
             if (errFile.exists())
diff --git a/src/Visual_DVM_2021/Passes/All/AddFile.java b/src/Visual_DVM_2021/Passes/All/AddFile.java
index 9770669c..c142ad68 100644
--- a/src/Visual_DVM_2021/Passes/All/AddFile.java
+++ b/src/Visual_DVM_2021/Passes/All/AddFile.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.Text.FileNameForm;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadRepository.java b/src/Visual_DVM_2021/Passes/All/DownloadRepository.java
index 90df186e..5021c1ce 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadRepository.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadRepository.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import Visual_DVM_2021.Passes.ProcessPass;
diff --git a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
index 951519b1..9d69bb61 100644
--- a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
+++ b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
diff --git a/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java b/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java
index 7d2fd46a..7695fead 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
index 47acc1d0..21824091 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
+++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.UI.Windows.Dialog.Dialog;
diff --git a/src/Visual_DVM_2021/Passes/All/Precompilation.java b/src/Visual_DVM_2021/Passes/All/Precompilation.java
index 5fa37cfa..e36f8b1b 100644
--- a/src/Visual_DVM_2021/Passes/All/Precompilation.java
+++ b/src/Visual_DVM_2021/Passes/All/Precompilation.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
diff --git a/src/Visual_DVM_2021/Passes/ProcessPass.java b/src/Visual_DVM_2021/Passes/ProcessPass.java
index 72e1e307..98abf63a 100644
--- a/src/Visual_DVM_2021/Passes/ProcessPass.java
+++ b/src/Visual_DVM_2021/Passes/ProcessPass.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 
diff --git a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
index 8055150e..a533176e 100644
--- a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Main;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Global;
diff --git a/src/Visual_DVM_2021/UI/Main/FileForm.java b/src/Visual_DVM_2021/UI/Main/FileForm.java
index 6ed965ef..0ef0a05b 100644
--- a/src/Visual_DVM_2021/UI/Main/FileForm.java
+++ b/src/Visual_DVM_2021/UI/Main/FileForm.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Main;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Global;
 import Common.UI.Editor.Viewer;
 import Common.UI.Menus_2023.FileMenuBar.FileMenuBar;
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index cee67ee0..b944b074 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.UI.Main;
-import Common.Constants.Constants;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.UI.Menus_2023.TasksPackagesMenuBar.TasksPackagesMenuBar;