From 3516b581279dda66185c4627f6863d8be7e2c6c2 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 7 Oct 2024 22:22:51 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 103 +++---------------
 src/Common/Database/Objects/nDBObject.java    |   4 +-
 .../Database/SQLITE/SQLiteDatabase.java       |   5 +-
 src/Common/Utils/CommonUtils.java             |  45 +++++++-
 src/Common_old/Constants.java                 |   1 +
 src/Common_old/Utils/Utils.java               |  64 +----------
 .../LinuxLocalCompilationSupervisor.java      |   3 +-
 .../WindowsLocalCompilationSupervisor.java    |   2 +-
 .../Remote/RemoteCompilationSupervisor.java   |   4 +-
 src/ProjectData/Project/db_project_info.java  |   8 +-
 src/Repository/Component/Sapfor/Sapfor.java   |   2 +-
 src/Repository/RepositoryClient.java          |   3 +-
 src/Repository/RepositoryServer.java          |   2 +-
 src/Repository/Server/ComponentsServer.java   |   4 +-
 .../Common/MachineProcess/MachineProcess.java |   2 +-
 src/TestingSystem/Common/TestingServer.java   |   4 +-
 .../UI/ConfigurationFields.java               |   3 +-
 .../DVM/RemoteDVMTestingPlanner.java          |   4 +-
 src/TestingSystem/DVM/UserConnection.java     |   4 +-
 .../SAPFOR/Json/SapforVersion_json.java       |   2 +-
 .../SAPFOR/PackageModeSupervisor.java         |   2 +-
 .../UI/SapforConfigurationFields.java         |   3 +-
 .../SAPFOR/SapforTestingPlanner.java          |   4 +-
 .../Passes/All/CreateTestFromDirectory.java   |   2 +-
 .../Passes/All/CreateTestFromFile.java        |   3 +-
 .../Passes/All/DownloadProject.java           |   2 +-
 .../Passes/All/ExportDVMPackageToExcel.java   |   6 +-
 .../Passes/All/MakeScreenShot.java            |   4 +-
 .../Passes/All/Precompilation.java            |   4 +-
 .../Passes/All/PrepareForModulesAssembly.java |   3 +-
 .../Passes/All/RemoteInitialiseUser.java      |   4 +-
 .../Passes/All/RemoteSingleCommand.java       |   3 +-
 .../Passes/OpenSapforVersionPass.java         |   4 +-
 .../Passes/SSH/RepositoryServerSSHPass.java   |   4 +-
 34 files changed, 115 insertions(+), 202 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 623247bd..04b125f3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,108 +8,39 @@
   <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/CommonConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/CommonConstants.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/Objects/nDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/nDBObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/TextLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/TextLog.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common_old/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/ControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/ControlForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/DragDrop/FileDrop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DragDrop/FileDrop.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Editor/CaretInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Editor/CaretInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/AttachementsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/AttachementsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/MainEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/MainEditorMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/ProjectFilesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/ProjectFilesMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/TableMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TableMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextComboBoxMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextComboBoxMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextEditorMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/DateRenderer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/DateRenderer_.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/DataTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/DataTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Form.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Form.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/PathValidator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/PathValidator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/ShellParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/ShellParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.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/RemoteFile/UI/RemoteFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.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/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Splitter/SplittersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Splitter/SplittersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Passes/TaskLocalPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Passes/TaskLocalPass.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/LocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/TaskSupervisor.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/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.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/Instruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Instruction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/OSDComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/OSDComponent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/MessagesServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/MessagesServer.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/Repository/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualizer_2.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/EmailMessage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/EmailMessage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryClient.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerExchangeUnit_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerExchangeUnit_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddBugReport.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/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CombineFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CombineFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadComponent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GCOV.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GCOV.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/MakeScreenShot.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/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SendBugReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.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/Passes/SSH/TaskConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.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/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Database/Objects/nDBObject.java b/src/Common/Database/Objects/nDBObject.java
index 0c5aba65..68d1dd99 100644
--- a/src/Common/Database/Objects/nDBObject.java
+++ b/src/Common/Database/Objects/nDBObject.java
@@ -1,5 +1,5 @@
 package Common.Database.Objects;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import com.sun.org.glassfish.gmbal.Description;
 public abstract class nDBObject extends DBObject {
     @Description("PRIMARY KEY, UNIQUE")
@@ -13,7 +13,7 @@ public abstract class nDBObject extends DBObject {
         return "";
     }
     public void genName() {
-        id = Utils.getDateName(getClass().getSimpleName().toLowerCase());
+        id = CommonUtils.getDateName(getClass().getSimpleName().toLowerCase());
     }
     //-
     @Override
diff --git a/src/Common/Database/SQLITE/SQLiteDatabase.java b/src/Common/Database/SQLITE/SQLiteDatabase.java
index 766071f8..175ba0d8 100644
--- a/src/Common/Database/SQLITE/SQLiteDatabase.java
+++ b/src/Common/Database/SQLITE/SQLiteDatabase.java
@@ -5,7 +5,6 @@ import Common.Database.Tables.DBTableColumn;
 import Common.Database.Database;
 import Common.Utils.CommonUtils;
 import Common_old.UI.UI;
-import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassException;
 import javafx.util.Pair;
 
@@ -14,7 +13,7 @@ import java.sql.*;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 
-import static Common_old.Utils.Utils.requireNonNullElse;
+import static Common.Utils.CommonUtils.requireNonNullElse;
 public abstract class SQLiteDatabase extends Database {
     protected Connection conn = null;
     protected Statement statement = null;
@@ -37,7 +36,7 @@ public abstract class SQLiteDatabase extends Database {
                 ex.printStackTrace();
                 conn = null;
                 System.gc();
-                Utils.sleep(2000);
+                CommonUtils.sleep(2000);
             }
         }
         if (conn == null)
diff --git a/src/Common/Utils/CommonUtils.java b/src/Common/Utils/CommonUtils.java
index 1a125fa9..4f424187 100644
--- a/src/Common/Utils/CommonUtils.java
+++ b/src/Common/Utils/CommonUtils.java
@@ -17,6 +17,7 @@ import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Vector;
+import java.util.concurrent.Semaphore;
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 public class CommonUtils {
@@ -26,7 +27,13 @@ public class CommonUtils {
     public static String Home;
     //ГЛОБАЛЬНЫЙ ЖУРНАЛ
     public static Loggable MainLog;
+    public static Semaphore date_semaphore = new Semaphore(1);
+    public static long last_ticks = CommonConstants.Nan;
     //------------------------------------------------------------------------
+    public static Object requireNonNullElse(Object value, Object default_value) {
+        return (value != null) ? value : default_value;
+    }
+    //--
     //JSON
     //--
     //    public static String jsonToPrettyFormat(String packed) {
@@ -401,7 +408,41 @@ public class CommonUtils {
     public static String print_date(Date date) {
         return new SimpleDateFormat("dd.MM.yyyy HH:mm:ss").format(date);
     }
-    //-
+    public static String printSplittedDateInterval(long milliseconds) {
+        //--
+        long seconds = milliseconds / 1000;
+        long hours = seconds / 3600;
+        seconds = seconds - hours * 3600;
+        long minutes = (seconds) / 60;
+        seconds = seconds - minutes * 60;
+        //--
+        return hours + " часов, " + minutes + " минут, " + seconds + " секунд";
+    }
+    //Синхронизация
+    public static void sleep(long millis) {
+        try {
+            Thread.sleep(millis);
+        } catch (Exception ignore) {
+        }
+    }
     //ГЕНЕРАЦИЯ ИМЕН
-
+    public static long getDateNumber() {
+        //-
+        try {
+            date_semaphore.acquire();
+        } catch (Exception ignore) {
+        }
+        //-
+        long ticks = new Date().toInstant().getEpochSecond();
+        while (ticks == last_ticks) {
+            sleep(1);
+            ticks = new Date().toInstant().getEpochSecond();
+        }
+        last_ticks = ticks;  // Это и есть разделяемый ресурс.
+        date_semaphore.release();
+        return ticks;
+    }
+    public static String getDateName(String name_) {
+        return name_ + "_" + getDateNumber();
+    }
 }
diff --git a/src/Common_old/Constants.java b/src/Common_old/Constants.java
index a1fa4119..3e4e0206 100644
--- a/src/Common_old/Constants.java
+++ b/src/Common_old/Constants.java
@@ -5,6 +5,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 import java.util.Vector;
 public class Constants {
     public static final int planner_version = 3;
+    public static final int testingMaxKernels= 64; //вообще говоря, это параметр машины.
     //--
     public static final String ComponentsDirectoryName = "Components";
     public static final String DataDirectoryName = "Data";
diff --git a/src/Common_old/Utils/Utils.java b/src/Common_old/Utils/Utils.java
index f53d1b65..59d22840 100644
--- a/src/Common_old/Utils/Utils.java
+++ b/src/Common_old/Utils/Utils.java
@@ -1,5 +1,4 @@
 package Common_old.Utils;
-import Common.CommonConstants;
 import Common.Utils.CommonUtils;
 import Common.Utils.Index;
 import Common.Utils.StringTemplate;
@@ -28,7 +27,6 @@ import java.nio.file.*;
 import java.security.MessageDigest;
 import java.util.List;
 import java.util.*;
-import java.util.concurrent.Semaphore;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.IntStream;
@@ -70,9 +68,6 @@ public class Utils {
             }
         }
     }
-    public static Object requireNonNullElse(Object value, Object default_value) {
-        return (value != null) ? value : default_value;
-    }
     public static String ReadAllText(File file) {
         try {
             return new String(Files.readAllBytes(file.toPath()));
@@ -95,33 +90,6 @@ public class Utils {
             }
         }
     }
-    public static long last_ticks = CommonConstants.Nan;
-    public static void sleep(long millis) {
-        try {
-            Thread.sleep(millis);
-        } catch (Exception ignore) {
-        }
-    }
-    public static Semaphore date_semaphore = new Semaphore(1);
-    public static long getDateNumber() {
-        //-
-        try {
-            date_semaphore.acquire();
-        } catch (Exception ignore) {
-        }
-        //-
-        long ticks = new Date().toInstant().getEpochSecond();
-        while (ticks == last_ticks) {
-            sleep(1);
-            ticks = new Date().toInstant().getEpochSecond();
-        }
-        last_ticks = ticks;  // Это и есть разделяемый ресурс.
-        date_semaphore.release();
-        return ticks;
-    }
-    public static String getDateName(String name_) {
-        return name_ + "_" + getDateNumber();
-    }
     public static void WriteToFile(File f, String text) throws IOException {
         Files.write(
                 f.toPath(),
@@ -145,7 +113,7 @@ public class Utils {
     public static File CreateTempResourceFile(String res_name) throws Exception {
         URL u = (Utils.class.getResource("/files/" + res_name));
         InputStream i = u.openStream();
-        Path p = Paths.get(Global.TempDirectory.getAbsolutePath(), getDateName(res_name));
+        Path p = Paths.get(Global.TempDirectory.getAbsolutePath(), CommonUtils.getDateName(res_name));
         Files.copy(i, p, StandardCopyOption.REPLACE_EXISTING);
         return p.toFile();
     }
@@ -166,7 +134,7 @@ public class Utils {
         return res;
     }
     public static File getTempFileName(String name, String ext) {
-        return Paths.get(System.getProperty("user.dir"), "Temp", getDateName(name) + (ext.isEmpty() ? "" : ("." + ext))).toFile();
+        return Paths.get(System.getProperty("user.dir"), "Temp", CommonUtils.getDateName(name) + (ext.isEmpty() ? "" : ("." + ext))).toFile();
     }
     public static File getTempFileName(String name) {
         return getTempFileName(name, "");
@@ -625,11 +593,6 @@ public class Utils {
         }
         return false;
     }
-    //временно.
-    public static int getTestingMaxKernels() {
-        return 64; // (Current.getAccount().isAdmin()) ? 64 : 14;
-    }
-    //--
     public static boolean isCrushedLine(String line) {
         String l_line = line.toLowerCase();
         for (String crushed : Constants.crushed_cases)
@@ -714,20 +677,10 @@ public class Utils {
     public static boolean isVersion(File directory) throws Exception {
         return new File(directory, Constants.data).exists();
     }
-    public static String printSplittedDateInterval(long milliseconds) {
-        //--
-        long seconds = milliseconds / 1000;
-        long hours = seconds / 3600;
-        seconds = seconds - hours * 3600;
-        long minutes = (seconds) / 60;
-        seconds = seconds - minutes * 60;
-        //--
-        return hours + " часов, " + minutes + " минут, " + seconds + " секунд";
-    }
     public static boolean checkFileCreation(File file) {
         for (int i = 1; i <= 10; ++i) {
             if (file.exists()) return true;
-            else sleep(1000);
+            else CommonUtils.sleep(1000);
         }
         return false;
     }
@@ -887,17 +840,6 @@ public class Utils {
         System.out.println(new Date(dates.lastElement()));
         return dates.firstElement();
     }
-    public static Vector<String> unpack_s(String packed, String separator) {
-        Vector<String> ids = new Vector<>();
-        String[] data = packed.split(separator);
-        if (data.length > 0) {
-            for (String s : data) {
-                if (!s.isEmpty())
-                    ids.add(s);
-            }
-        }
-        return ids;
-    }
     public static void addDefaultMails(Vector<String> mails) {
         if (!mails.contains(Constants.MailAddress))
             mails.add(Constants.MailAddress);
diff --git a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
index 043e1e71..86ca0456 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
@@ -1,4 +1,5 @@
 package GlobalData.Tasks.Supervisor.Local.Linux;
+import Common.Utils.CommonUtils;
 import Common_old.Utils.Utils;
 import GlobalData.Makefile.Makefile;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
@@ -32,7 +33,7 @@ public class LinuxLocalCompilationSupervisor extends LinuxLocalTaskSupervisor<Co
     protected void ValidateTaskResults() throws Exception {
         if (getBinary().exists()) {
             File renamed_binary = Paths.get(getProjectCopy().getAbsolutePath(),
-                    Utils.getDateName("spf")).toFile();
+                    CommonUtils.getDateName("spf")).toFile();
             task.binary_name = renamed_binary.getName();
             Files.move(getBinary().toPath(), renamed_binary.toPath(), StandardCopyOption.REPLACE_EXISTING);
             task.state = TaskState.Done;
diff --git a/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
index 9fd79c5b..4a3f0639 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
@@ -45,7 +45,7 @@ public class WindowsLocalCompilationSupervisor extends WindowsLocalTaskSuperviso
     protected void ValidateTaskResults() throws Exception {
         if (getBinary().exists()) {
             File renamed_binary = Paths.get(getProjectCopy().getAbsolutePath(),
-                    Utils.getDateName("spf") + ".exe").toFile();
+                    CommonUtils.getDateName("spf") + ".exe").toFile();
             task.binary_name = renamed_binary.getName();
             Files.move(getBinary().toPath(), renamed_binary.toPath(), StandardCopyOption.REPLACE_EXISTING);
             task.state = TaskState.Done;
diff --git a/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java b/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
index adba9a01..cba5d70d 100644
--- a/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.Supervisor.Remote;
-import Common_old.UI.UI;
+import Common.Utils.CommonUtils;
 import Common_old.Utils.Utils;
 import GlobalData.Makefile.Makefile;
 import GlobalData.RemoteFile.RemoteFile;
@@ -36,7 +36,7 @@ public class RemoteCompilationSupervisor extends RemoteTaskSupervisor<Compilatio
     @Override
     protected void ValidateTaskResults() throws Exception {
         if (pass.user.connection.Exists(getBinary())) {
-            RemoteFile renamed_binary = new RemoteFile(getRemoteProject().full_name, Utils.getDateName("spf_" + getBinary().name));
+            RemoteFile renamed_binary = new RemoteFile(getRemoteProject().full_name, CommonUtils.getDateName("spf_" + getBinary().name));
             pass.user.connection.sftpChannel.rename(getBinary().full_name, renamed_binary.full_name);
             task.binary_name = renamed_binary.name;
             task.state = TaskState.Done;
diff --git a/src/ProjectData/Project/db_project_info.java b/src/ProjectData/Project/db_project_info.java
index 97b7bbe0..9ad4f92d 100644
--- a/src/ProjectData/Project/db_project_info.java
+++ b/src/ProjectData/Project/db_project_info.java
@@ -175,7 +175,7 @@ public class db_project_info extends DBObject {
         Home = Paths.get(parent_in.Home.getAbsolutePath(), name).toFile();
         parent.SaveVersionToBuild(name);
         if (!Home.mkdir()) throw new PassException("Не удалось создать папку для версии");
-        creationDate = Utils.getDateNumber(); //----------------------------------------------------------------------------->>>
+        creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
         CreateVisualiserData();
         parent.AddVersion(this);
         //если это делать раньше, папка версии учтется как подпапка.
@@ -188,7 +188,7 @@ public class db_project_info extends DBObject {
         name = Home.getName();
         description = description_;
         if (create_data) {
-            creationDate = Utils.getDateNumber(); //----------------------------------------------------------------------------->>>
+            creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
             CreateVisualiserData();
         }
     }
@@ -205,7 +205,7 @@ public class db_project_info extends DBObject {
         if (stored_info == null) {
             name = Home.getName();
             description = "";
-            creationDate = Utils.getDateNumber(); //----------------------------------------------------------------------------->>>
+            creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
             db.Insert(this);
         } else
             ExtractStoredInfo(stored_info);
@@ -921,7 +921,7 @@ public class db_project_info extends DBObject {
         last_version.description = description_in;
         last_version.original = last_modification.name;
         last_version.Home = versionDirectory;
-        last_version.creationDate = Utils.getDateNumber(); //----------------------------------------------------------------------------->>>
+        last_version.creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
         last_version.CreateVisualiserData();
         this.AddVersion(last_version);
     }
diff --git a/src/Repository/Component/Sapfor/Sapfor.java b/src/Repository/Component/Sapfor/Sapfor.java
index 8ed07322..44b13c10 100644
--- a/src/Repository/Component/Sapfor/Sapfor.java
+++ b/src/Repository/Component/Sapfor/Sapfor.java
@@ -479,7 +479,7 @@ public abstract class Sapfor extends OSDComponent {
                 flag = true;
             } catch (Exception ex) {
                 CommonUtils.MainLog.PrintException(ex);
-                Utils.sleep(1000);
+                CommonUtils.sleep(1000);
             }
         }
         while (!flag);
diff --git a/src/Repository/RepositoryClient.java b/src/Repository/RepositoryClient.java
index cb54d9ba..62604819 100644
--- a/src/Repository/RepositoryClient.java
+++ b/src/Repository/RepositoryClient.java
@@ -1,6 +1,5 @@
 package Repository;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import Visual_DVM_2021.Passes.PassException;
@@ -69,7 +68,7 @@ public abstract class RepositoryClient {
         } catch (Exception ex) {
             ex.printStackTrace();
         } finally {
-            Utils.sleep(getSleepMillis());
+            CommonUtils.sleep(getSleepMillis());
         }
     }
 }
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index 46425e3a..3edb161c 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -153,7 +153,7 @@ public abstract class RepositoryServer<D extends Database> {
                         } catch (Exception ex) {
                             System.out.println("Исключение во время отправки сообщения абоненту " + CommonUtils.Brackets(target));
                             ex.printStackTrace();
-                            Utils.sleep(1000);
+                            CommonUtils.sleep(1000);
                         } finally {
                             attempts--;
                         }
diff --git a/src/Repository/Server/ComponentsServer.java b/src/Repository/Server/ComponentsServer.java
index f44d3aff..2317a5f6 100644
--- a/src/Repository/Server/ComponentsServer.java
+++ b/src/Repository/Server/ComponentsServer.java
@@ -99,7 +99,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                     Print("Отправить клиенту архив всех архивов баг репортов");
                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                     ZipFolderPass zip = new ZipFolderPass();
-                    File archives = new File(Utils.getDateName("Bugs"));
+                    File archives = new File(CommonUtils.getDateName("Bugs"));
                     if (zip.Do("Bugs", archives.getAbsolutePath())) {
                         response.object = CommonUtils.fileToBytes(archives);
                         Print("Архив успешно запакован");
@@ -318,7 +318,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                                             + CommonUtils.DQuotes(program.getName());
                             //--
                             File fileWorkspace = program.getParentFile();
-                            Process process = Utils.startScript(workspace, fileWorkspace, Utils.getDateName("convert_script"), command);
+                            Process process = Utils.startScript(workspace, fileWorkspace, CommonUtils.getDateName("convert_script"), command);
                             process.waitFor();
                             String convertationOut = Utils.readAllOutput(process);
                             convertationOut = convertationOut.replace(program.getName(), fileName); //для учета пути.
diff --git a/src/TestingSystem/Common/MachineProcess/MachineProcess.java b/src/TestingSystem/Common/MachineProcess/MachineProcess.java
index 5a0aaf98..4261545b 100644
--- a/src/TestingSystem/Common/MachineProcess/MachineProcess.java
+++ b/src/TestingSystem/Common/MachineProcess/MachineProcess.java
@@ -35,7 +35,7 @@ public class MachineProcess extends DBObject {
         userWorkspace = p.user_workspace;
         testingSystemRoot = CommonUtils.Home;
         serverName = Global.testingServer.name;
-        id = Utils.getDateName(machineAddress + "_" + machinePort + "_" + userName);
+        id = CommonUtils.getDateName(machineAddress + "_" + machinePort + "_" + userName);
     }
     @Override
     public Object getPK() {
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index 999f0432..3e7c03a3 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -127,7 +127,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     }
     public TestingServer() {
         super(TestsDatabase.class);
-        name = Utils.getDateName("testingServer");
+        name = CommonUtils.getDateName("testingServer");
         System.out.println("ServerName=" + CommonUtils.Brackets(name));
     }
     //основа
@@ -147,7 +147,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         while (true) {
             dvmTestingChecker.Perform();
             sapforTestingPlanner.Perform();
-            Utils.sleep(5000);
+            CommonUtils.sleep(5000);
         }
     });
     //------>>>
diff --git a/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java b/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
index 84e86725..785a6cf0 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
@@ -1,4 +1,5 @@
 package TestingSystem.DVM.DVMConfiguration.UI;
+import Common_old.Constants;
 import Common_old.UI.TextField.StyledTextField;
 import Common_old.UI.Windows.Dialog.DialogFields;
 import Common_old.Utils.Utils;
@@ -28,7 +29,7 @@ public class ConfigurationFields implements DialogFields {
                 5, 3600, 1
         ));
         sKernels.setModel(new SpinnerNumberModel(1, 1,
-                Utils.getTestingMaxKernels(),
+                Constants.testingMaxKernels,
                 1));
     }
 }
diff --git a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 5b2237cf..2d678fda 100644
--- a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -183,7 +183,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
         RemoteFile PID = new RemoteFile(packageRemoteWorkspace, "PID");
         while (!user.connection.Exists(PID)) {
             Print("PID not found");
-            Utils.sleep(1000);
+            CommonUtils.sleep(1000);
         }
         testingPackage.PID = user.connection.readFromFile(PID).replace("\n", "").replace("\r", "");
         //---
@@ -191,7 +191,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
         RemoteFile STARTED = new RemoteFile(packageRemoteWorkspace, "STARTED");
         while (!user.connection.Exists(STARTED)) {
             Print("waiting for package start...");
-            Utils.sleep(1000);
+            CommonUtils.sleep(1000);
         }
     }
     @Override
diff --git a/src/TestingSystem/DVM/UserConnection.java b/src/TestingSystem/DVM/UserConnection.java
index be5f34cb..7c0a4d76 100644
--- a/src/TestingSystem/DVM/UserConnection.java
+++ b/src/TestingSystem/DVM/UserConnection.java
@@ -481,13 +481,13 @@ public class UserConnection {
     public void waitForFileCreation(RemoteFile file) throws Exception {
         while (!Exists(file)) {
             System.out.println(file.full_name + " NOT FOUND");
-            Utils.sleep(1000);
+            CommonUtils.sleep(1000);
         }
     }
     public void waitForFileFree(RemoteFile file) throws Exception {
         while (!Busy(file)) {
             System.out.println(file.full_name + " PERMISSION DENIED");
-            Utils.sleep(1000);
+            CommonUtils.sleep(1000);
         }
     }
     public String startShellProcess(RemoteFile directory, String outFileName, String... commands) throws Exception {
diff --git a/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
index 2f78366e..2c303c65 100644
--- a/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
+++ b/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
@@ -257,7 +257,7 @@ public class SapforVersion_json implements Serializable {
         project.name = project.Home.getName();
         project.description = description;
         project.languageName = LanguageName.fortran;
-        project.creationDate = Utils.getDateNumber();
+        project.creationDate = CommonUtils.getDateNumber();
         //---
         FileUtils.copyDirectory(Home, project.Home);
         ///--------------------------------------
diff --git a/src/TestingSystem/SAPFOR/PackageModeSupervisor.java b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
index 9ff34ec7..2b39d281 100644
--- a/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
+++ b/src/TestingSystem/SAPFOR/PackageModeSupervisor.java
@@ -19,7 +19,7 @@ public class PackageModeSupervisor extends ThreadsPlanner {
         package_json = (SapforPackage_json) CommonUtils.jsonFromFile(new File(Constants.package_json), SapforPackage_json.class);
         //--
         File sapfor_src = new File(package_json.sapfor_drv);
-        sapfor_drv = new File(CommonUtils.Home, Utils.getDateName("SAPFOR_F"));
+        sapfor_drv = new File(CommonUtils.Home, CommonUtils.getDateName("SAPFOR_F"));
         FileUtils.copyFile(sapfor_src, sapfor_drv);
         if (!sapfor_drv.setExecutable(true))
             throw new Exception("Не удалось сделать файл " + sapfor_drv.getName() + " исполняемым!");
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java b/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
index 79880769..98417607 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
@@ -1,4 +1,5 @@
 package TestingSystem.SAPFOR.SapforConfiguration.UI;
+import Common_old.Constants;
 import Common_old.UI.TextField.StyledTextField;
 import Common_old.UI.Windows.Dialog.DialogFields;
 import Common_old.Utils.Utils;
@@ -21,7 +22,7 @@ public class SapforConfigurationFields implements DialogFields {
     }
     public SapforConfigurationFields(){
         sKernels.setModel(new SpinnerNumberModel(1, 1,
-                Utils.getTestingMaxKernels(),
+                Constants.testingMaxKernels,
                 1));
     }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
index 5929956f..71825805 100644
--- a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -109,7 +109,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         File started = new File(workspace, Constants.STARTED);
         while (!started.exists()) {
             Print("waiting for package start...");
-            Utils.sleep(1000);
+            CommonUtils.sleep(1000);
         }
         File pid = new File(workspace, "PID");
         testingPackage.PID = FileUtils.readFileToString(pid, Charset.defaultCharset());
@@ -237,7 +237,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
                 return;
             }
             //-
-            File sapforHome = new File(Global.SapforsDirectory, Utils.getDateName("sapfor"));
+            File sapforHome = new File(Global.SapforsDirectory, CommonUtils.getDateName("sapfor"));
             //--
             sapfor.home_path = sapforHome.getAbsolutePath();
             sapfor.languageName = LanguageName.fortran;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
index 572152fd..9be385f5 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
@@ -173,7 +173,7 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
     }
     //-
     public File packTestCode() throws Exception {
-        target.temp_project_name = Utils.getDateName("test");
+        target.temp_project_name = CommonUtils.getDateName("test");
         //-
         File tempProject = target.getTempProject();
         File tempArchive = target.getTempArchive();
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
index 4cdba481..7b74f040 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
@@ -1,6 +1,5 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Constants;
 import Common_old.Current;
 import Common_old.Utils.Utils;
 import ProjectData.Files.FileType;
@@ -60,7 +59,7 @@ public class CreateTestFromFile extends Pass_2021<Test> {
         return true;
     }
     public File packTestCode() throws Exception {
-        target.temp_project_name = Utils.getDateName("test");
+        target.temp_project_name = CommonUtils.getDateName("test");
         //-
         File tempProject = target.getTempProject();
         File tempArchive = target.getTempArchive();
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadProject.java b/src/Visual_DVM_2021/Passes/All/DownloadProject.java
index f5b77386..6f551f66 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadProject.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadProject.java
@@ -51,7 +51,7 @@ public class DownloadProject extends CurrentConnectionPass {
     @Override
     protected void performDone() throws Exception {
         File project = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
-                Utils.getDateName(src.name)).toFile();
+                CommonUtils.getDateName(src.name)).toFile();
         if (passes.get(PassCode_2021.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) {
             if (UI.Question("Проект " + CommonUtils.Brackets(src.name) + " успешно загружен. Открыть его"))
                 passes.get(PassCode_2021.OpenCurrentProject).Do(project);
diff --git a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
index 3faba53c..5fa7385c 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
@@ -88,7 +88,7 @@ public class ExportDVMPackageToExcel extends Pass_2021<Vector<DVMPackage>> {
             Log.Writeln_("Папка не выбрана.");
             return false;
         }
-        res = new File(dir, Utils.getDateName("packages") + ".xls");
+        res = new File(dir, CommonUtils.getDateName("packages") + ".xls");
         return true;
     }
     //---
@@ -104,7 +104,7 @@ public class ExportDVMPackageToExcel extends Pass_2021<Vector<DVMPackage>> {
         long milliseconds = object.ChangeDate - object.StartDate;
         total_time += milliseconds;
         //--
-        lines.add("время выполнения " + Utils.printSplittedDateInterval(milliseconds));
+        lines.add("время выполнения " + CommonUtils.printSplittedDateInterval(milliseconds));
         return String.join("; ", lines);
     }
     //---
@@ -354,7 +354,7 @@ public class ExportDVMPackageToExcel extends Pass_2021<Vector<DVMPackage>> {
             offset.Inc();
         }
         if (target.size() > 1) {
-            addInfoRow(offset.getValue(), "всего задач " + total_tasks_count + "; общее время выполнения " + Utils.printSplittedDateInterval(total_time));
+            addInfoRow(offset.getValue(), "всего задач " + total_tasks_count + "; общее время выполнения " + CommonUtils.printSplittedDateInterval(total_time));
             offset.Inc();
         }
         addHeaderRow(offset.getValue(),
diff --git a/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java b/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java
index abcf77e4..e647feea 100644
--- a/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java
+++ b/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java
@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 
 import javax.imageio.ImageIO;
@@ -21,7 +21,7 @@ public class MakeScreenShot extends CurrentProjectPass {
         int y = display.getHeight();
         BufferedImage bufferedImage = new Robot().createScreenCapture(new Rectangle(x, y));
         //-
-        String res_name = Utils.getDateName("screenshot") + ".png";
+        String res_name = CommonUtils.getDateName("screenshot") + ".png";
         outputfile = Paths.get(target.getAttachmentsDirectory().getAbsolutePath(), res_name).toFile();
         //-
         ImageIO.write(bufferedImage, "png", outputfile);
diff --git a/src/Visual_DVM_2021/Passes/All/Precompilation.java b/src/Visual_DVM_2021/Passes/All/Precompilation.java
index 4a01a188..72ca56c4 100644
--- a/src/Visual_DVM_2021/Passes/All/Precompilation.java
+++ b/src/Visual_DVM_2021/Passes/All/Precompilation.java
@@ -93,7 +93,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
         performanceTime = 0;
         exitCode = CommonConstants.Nan;
         //------------------
-        workspace = Paths.get(Global.TempDirectory.getAbsolutePath(), Utils.getDateName("precompilation")).toFile();
+        workspace = Paths.get(Global.TempDirectory.getAbsolutePath(), CommonUtils.getDateName("precompilation")).toFile();
         FileUtils.forceMkdir(workspace);
         //------------------------------>>
         fortranCompiler = new Compiler();
@@ -194,7 +194,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
     protected void StartProcess(String command, int TA) throws Exception {
         killed = false;
         output = "";
-        process = Utils.startScript(workspace, workspace, Utils.getDateName("start_task_script"),
+        process = Utils.startScript(workspace, workspace, CommonUtils.getDateName("start_task_script"),
                 command,
                 null);
         outputLines.clear();
diff --git a/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java b/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
index 65f73b78..2dba2775 100644
--- a/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
+++ b/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
@@ -1,7 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
 import Repository.Component.Sapfor.TransformationPermission;
@@ -40,7 +39,7 @@ public class PrepareForModulesAssembly extends Transformation {
     protected void body() throws Exception {
         File total = Paths.get(target.last_version.Home.getAbsolutePath(), "total.for").toFile();
         while (total.exists()) {
-            total = Paths.get(target.last_version.Home.getAbsolutePath(), Utils.getDateName("total") + ".for").toFile();
+            total = Paths.get(target.last_version.Home.getAbsolutePath(), CommonUtils.getDateName("total") + ".for").toFile();
             Thread.sleep(1000);
         }
         //--создать
diff --git a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
index 58576363..78edc126 100644
--- a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
-import Common_old.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass;
@@ -25,7 +25,7 @@ public class RemoteInitialiseUser extends ConnectionPass<RemoteFile> {
     }
     @Override
     protected void ServerAction() throws Exception {
-        String workspace_name = Utils.getDateName("visual_sapfor_workspace");
+        String workspace_name = CommonUtils.getDateName("visual_sapfor_workspace");
         ShowMessage1("Создание рабочего пространства...");
         target = new RemoteFile(user.connection.sftpChannel.getHome(), workspace_name);
         user.connection.sftpChannel.mkdir(target.full_name);
diff --git a/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java b/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
index 8171e8dd..0a05ed2c 100644
--- a/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
@@ -1,6 +1,5 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass;
 public class RemoteSingleCommand extends CurrentConnectionPass<String> {
@@ -15,7 +14,7 @@ public class RemoteSingleCommand extends CurrentConnectionPass<String> {
     }
     @Override
     protected void ServerAction() throws Exception {
-        RemoteFile file = new RemoteFile(user.connection.sftpChannel.getHome(), Utils.getDateName("out"));
+        RemoteFile file = new RemoteFile(user.connection.sftpChannel.getHome(), CommonUtils.getDateName("out"));
         user.connection.Command(command + " 1>" + CommonUtils.DQuotes(file.full_name));
         if (user.connection.Exists(file)) {
             target = user.connection.readFromFile(file);
diff --git a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
index ed1f1f39..9a05f12b 100644
--- a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
+++ b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java
@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes;
+import Common.Utils.CommonUtils;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import TestingSystem.SAPFOR.Json.SapforVersion_json;
 import TestingSystem.SAPFOR.SapforTask.SapforTask;
@@ -35,7 +35,7 @@ public abstract class OpenSapforVersionPass extends Pass_2021<SapforVersion_json
         SapforTask task = target.task;
         ShowMessage1("Построение дерева версий и создание баз данных...");
         File rootHome = Paths.get(Global.getSetting(SettingName.Workspace).Value,
-                Utils.getDateName(task.test_description)).toFile();
+                CommonUtils.getDateName(task.test_description)).toFile();
         for (SapforVersion_json version_json : task.versions) {
             ShowMessage2(version_json.version);
             version_json.createProject(rootHome);
diff --git a/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java b/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
index 4bbbe18e..d0154b59 100644
--- a/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
+++ b/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
@@ -1,8 +1,8 @@
 package Visual_DVM_2021.Passes.SSH;
+import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.Utils.Utils;
 import GlobalData.Machine.Machine;
 import GlobalData.Machine.MachineType;
 import GlobalData.RemoteFile.RemoteFile;
@@ -66,7 +66,7 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass {
         user.connection.writeToFile("", INTERRUPT);
         ShowMessage1("Ожидание остановки сервера тестирования");
         do {
-            Utils.sleep(1000);
+            CommonUtils.sleep(1000);
             ShowMessage2("Проверка признака остановки..");
         } while (!user.connection.Exists(ABORTED));
         //--