diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25505eae..2c69782c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,210 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/RDataSetControlForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Properties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Properties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/TableMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TableMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HeaderTextFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HeaderTextFilter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererMilliseconds.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererMilliseconds.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Themes/ThemeElement.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Themes/ThemeElement.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Recipient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Recipient.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServerProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServerProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.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/GlobalData/CompilerEnvironment/EnvironmentsLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLine.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLinesSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLinesSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsSetJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsSetJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/RawCompilerEnvironmentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/RawCompilerEnvironmentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/EnvironmentsLinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/EnvironmentsLinesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/OptionsLinesSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/OptionsLinesSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/RawCompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/RawCompilerOptionsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilePreviewForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilePreviewForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportComment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportComment.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ArchivesBackupPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ArchivesBackupPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/BuildComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/BuildComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ComponentsServerBackUp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ComponentsServerBackUp.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConfirmEmail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConfirmEmail.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteUserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteUserAccount.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDvmRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDvmRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditUserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditUserAccount.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetDVMPackageCredetials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetDVMPackageCredetials.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerOptions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerOptions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedure.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedure.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeCredentials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeCredentials.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestingServerBackUp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestingServerBackUp.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSapforProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSapforProperty.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ComponentsServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ComponentsServerPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/StartServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/StartServerPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/TestingServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/TestingServerPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/BackUpsChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/BackUpsChecker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/EmailChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/EmailChecker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServerClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServerClient.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/TestCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/TestCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingServerProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingServerProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachinesDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachinesDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingClient.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackageCredentials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackageCredentials.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackagesCredentialsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackagesCredentialsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Editor/BaseEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/Viewer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Editor/Viewer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/MainWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VersionsComparisonMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VersionsComparisonMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CredentialsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CredentialsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MultilineTextForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/MultilineTextForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ReadOnlyMultilineTextForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/ReadOnlyMultilineTextForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java
index a5fb1638..c4ce4fdf 100644
--- a/src/Common/Database/Database.java
+++ b/src/Common/Database/Database.java
@@ -34,7 +34,7 @@ public abstract class Database {
         // UI.Print(DebugPrintLevel.Database, "соединение с базой данных " + file.getAbsolutePath());
         connect();
     }
-    public void Activate() throws Exception{
+    public void Activate() throws Exception {
         Connect();
         CreateAllTables();
         prepareTablesStatements();
@@ -310,7 +310,7 @@ public abstract class Database {
     }
     public abstract PassCode_ getSynchronizePassCode(); //если бд есть на сервере.
     //--
-    public void ReplaceFileAndReconnect(File file_in) throws Exception{
+    public void ReplaceFileAndReconnect(File file_in) throws Exception {
         Disconnect();
         Utils_.forceDeleteWithCheck(getFile());
         FileUtils.moveFile(file_in, getFile());
@@ -318,10 +318,10 @@ public abstract class Database {
         prepareTablesStatements();
         Synchronize();
     }
-    public void DropUI(){
+    public void DropUI() {
         SaveLastSelections();
     }
-    public void ResetUI(){
+    public void ResetUI() {
         RestoreLastSelections();
     }
 }
diff --git a/src/Common/Database/SQLITE/SQLiteDatabase.java b/src/Common/Database/SQLITE/SQLiteDatabase.java
index 2be7ebef..e19c550f 100644
--- a/src/Common/Database/SQLITE/SQLiteDatabase.java
+++ b/src/Common/Database/SQLITE/SQLiteDatabase.java
@@ -255,5 +255,4 @@ public abstract class SQLiteDatabase extends Database {
     }
     //--
     //https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause
-
 }
\ No newline at end of file
diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java
index db6191a5..31dbfa96 100644
--- a/src/Common/Passes/Pass.java
+++ b/src/Common/Passes/Pass.java
@@ -22,10 +22,6 @@ public class Pass<T> {
     //--------------
     public boolean ui_visible = true;
     public Vector<PassControl> controls = new Vector<>();
-    public void addControl(PassControl control_in){
-        control_in.setVisible(ui_visible);
-        controls.add(control_in);
-    }
     public TextLog Log; //внутренний журнал прохода.
     protected boolean interrupt;
     protected SwingWorker dispatcher = null;
@@ -34,6 +30,10 @@ public class Pass<T> {
     private JButton button = null;
     private JButton tabButton = null;
     private Exception last_error; //последнее пойманное исключение выполнения.
+    public void addControl(PassControl control_in) {
+        control_in.setVisible(ui_visible);
+        controls.add(control_in);
+    }
     //->>
     public Throwable getCauseRec(Throwable ex) {
         Throwable cause = ex.getCause();
@@ -79,7 +79,7 @@ public class Pass<T> {
             control.setEnabled(flag);
     }
     public void setControlsVisible(boolean flag) {
-        ui_visible =flag;
+        ui_visible = flag;
         for (PassControl control : controls)
             control.setVisible(ui_visible);
     }
diff --git a/src/Common/Properties.java b/src/Common/Properties.java
index e0942dc1..9d9fc264 100644
--- a/src/Common/Properties.java
+++ b/src/Common/Properties.java
@@ -11,6 +11,11 @@ import java.util.LinkedHashMap;
 public class Properties {
     protected LinkedHashMap<String, JMenuItem> controls = new LinkedHashMap<>();
     private File file = null; //файл где хранятся настройки.
+    public Properties() {
+    }
+    public Properties(File file_in) {
+        setFile(file_in);
+    }
     public File getFile() {
         return file;
     }
@@ -24,11 +29,6 @@ public class Properties {
             e.printStackTrace();
         }
     }
-    public Properties() {
-    }
-    public Properties(File file_in) {
-        setFile(file_in);
-    }
     public boolean updateField(String name, Object newValue) {
         try {
             Field field = getClass().getField(name);
@@ -50,7 +50,7 @@ public class Properties {
         return "?";
     }
     public boolean controlAction(String fieldName, JMenuItem control
-    ){
+    ) {
         return false;
     }
     public JMenuItem getMenuItem(String fieldName) {
@@ -86,8 +86,8 @@ public class Properties {
             ex.printStackTrace();
         }
     }
-    public void setControlVisible(String settingName, boolean flag){
-        if (controls.containsKey(settingName)){
+    public void setControlVisible(String settingName, boolean flag) {
+        if (controls.containsKey(settingName)) {
             controls.get(settingName).setVisible(flag);
         }
     }
diff --git a/src/Common/Utils/Loggable.java b/src/Common/Utils/Loggable.java
index 36019e46..5d7fe37f 100644
--- a/src/Common/Utils/Loggable.java
+++ b/src/Common/Utils/Loggable.java
@@ -1,6 +1,6 @@
 package Common.Utils;
 import Common.Visual.UI;
-import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
+import Common.Visual.Windows.ReadOnlyMultilineTextForm;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index 45480247..3b76380d 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -2,7 +2,6 @@ package Common.Visual;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.Grid.TableVisualData;
-import Common.Database.Objects.riDBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Tables.DataSet;
 import Common.Database.Tables.FKBehaviour;
@@ -15,7 +14,6 @@ import Common.Visual.Menus.TableMenu;
 import Common.Visual.Tables.*;
 import Common.Visual.Tables.Grid.GridAnchestor;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
-import _VisualDVM.Global;
 
 import javax.swing.*;
 import javax.swing.table.TableColumn;
@@ -42,8 +40,6 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
     //--
     Object savedCurrentKey = null;
     Vector<Object> savedSelectedKeys = new Vector<>();
-    //--
-    public DataMenuBar getMenuBar() {return bar;}
     public DataSetControlForm(DataSet<?, D> dataSource_in, JPanel mountPanel_in) {
         super(DataTable.class, mountPanel_in);
         dataSource = dataSource_in;
@@ -71,7 +67,7 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
                 //--
                 counter_ui = (count -> bar.countLabel.setText(String.valueOf(count)));
                 //--фильтры всегда в конец бара.
-              //  bar.add(new JSeparator());
+                //  bar.add(new JSeparator());
                 for (FilterFlag filter : getFilters(FilterFlag.class)) {
                     bar.add(filter.getControl());
                 }
@@ -84,6 +80,10 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
             }
         }
     }
+    //--
+    public DataMenuBar getMenuBar() {
+        return bar;
+    }
     protected boolean isPKVisible() {
         return true;
     }
@@ -575,12 +575,10 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
     public PassCode_ getDeletePassCode() {
         return null;
     }
-    public Object getCurrentPK(Object nanValue){
-        return current==null? nanValue: current.getPK();
+    public Object getCurrentPK(Object nanValue) {
+        return current == null ? nanValue : current.getPK();
     }
-    //todo временное решение ? ->>>
-    public boolean canModifyCurrent(TextLog Log){
-        return CheckCurrent(Log) && (
-                !(current instanceof riDBObject) || Global.mainModule.getAccount().CheckAuthorship(((riDBObject)current).sender_address,Log));
+    public boolean canModifyCurrent(TextLog Log) {
+        return CheckCurrent(Log);
     }
 }
diff --git a/src/_VisualDVM/Visual/Editor/BaseEditor.java b/src/Common/Visual/Editor/BaseEditor.java
similarity index 90%
rename from src/_VisualDVM/Visual/Editor/BaseEditor.java
rename to src/Common/Visual/Editor/BaseEditor.java
index 68116ce1..ef1708ed 100644
--- a/src/_VisualDVM/Visual/Editor/BaseEditor.java
+++ b/src/Common/Visual/Editor/BaseEditor.java
@@ -1,12 +1,10 @@
-package _VisualDVM.Visual.Editor;
-import Common.MainModule_;
+package Common.Visual.Editor;
 import Common.Utils.Utils_;
 import Common.Visual.Menus.StyledPopupMenu;
 import Common.Visual.Menus.TextEditorMenu;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DialogFields;
-import _VisualDVM.Visual.Syntax.SPFEditorTheme;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 
 import javax.swing.event.HyperlinkEvent;
@@ -16,7 +14,7 @@ import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.net.URI;
 public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogFields {
-    private final StyledPopupMenu menu;
+    protected final StyledPopupMenu menu;
     //  protected int changesCount = 0;
     //  protected int insertsCount = 0;
     //  protected int removesCount = 0;
@@ -128,14 +126,6 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
         changeFont(getFont().getSize() - 1);
     }
     @Override
-    public void applyTheme() {
-        float font_size = (float) getFont().getSize();
-        ((SPFEditorTheme) MainModule_.instance.getUI().getTheme()).getEditorTheme().apply(this);
-        setFont(getFont().deriveFont(font_size));
-        menu.applyTheme();
-        //меню связано с редактором. поэтому тема меняется только вместе с ним.
-    }
-    @Override
     public Component getContent() {
         return this;
     }
diff --git a/src/_VisualDVM/Visual/Editor/Viewer.java b/src/Common/Visual/Editor/Viewer.java
similarity index 82%
rename from src/_VisualDVM/Visual/Editor/Viewer.java
rename to src/Common/Visual/Editor/Viewer.java
index e1e744f0..47fd03a5 100644
--- a/src/_VisualDVM/Visual/Editor/Viewer.java
+++ b/src/Common/Visual/Editor/Viewer.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Visual.Editor;
+package Common.Visual.Editor;
 public class Viewer extends BaseEditor {
     public Viewer() {
         setLineWrap(true);
diff --git a/src/Common/Visual/Menus/DataMenuBar.java b/src/Common/Visual/Menus/DataMenuBar.java
index cbd243d0..b6f4d26a 100644
--- a/src/Common/Visual/Menus/DataMenuBar.java
+++ b/src/Common/Visual/Menus/DataMenuBar.java
@@ -8,12 +8,12 @@ import java.awt.*;
 import java.awt.event.ActionListener;
 public class DataMenuBar extends VisualiserMenuBar {
     public JLabel countLabel = null;
-    private DataSet dataSource = null;
     //-
     public ActionListener selectAllListener = null;
     public ActionListener unselectAllListener = null;
     JButton selectAllButton = null;
     JButton unselectAllButton = null;
+    private DataSet dataSource = null;
     //-
     public DataMenuBar(String dataName, PassCode_... passes) {
         add(new JLabel(dataName + " : "));
diff --git a/src/Common/Visual/Menus/TableMenu.java b/src/Common/Visual/Menus/TableMenu.java
index b4b74b15..79b5cb58 100644
--- a/src/Common/Visual/Menus/TableMenu.java
+++ b/src/Common/Visual/Menus/TableMenu.java
@@ -21,7 +21,7 @@ public class TableMenu extends StyledPopupMenu {
         mcopy.addActionListener(e -> Utils_.CopyToClipboard(target.toString()));
         add(mcopy);
         //
-        add(value_scroll= new JScrollPane(value_view = new JTextArea()));
+        add(value_scroll = new JScrollPane(value_view = new JTextArea()));
         value_view.setEditable(false);
         //value_view.setLineWrap(true);
         //value_view.setWrapStyleWord(true);
@@ -33,13 +33,13 @@ public class TableMenu extends StyledPopupMenu {
         if ((row >= 0) && (column >= 0)) {
             target = owner.getValueAt(row, column);
             mcopy.setVisible(true);
-            Dimension d= new Dimension(Math.max(mcopy.getWidth(), 300),100);
+            Dimension d = new Dimension(Math.max(mcopy.getWidth(), 300), 100);
             value_view.setVisible(true);
             String res = target.toString();
-            if (target instanceof Vector){
+            if (target instanceof Vector) {
                 Vector<Object> v = (Vector<Object>) target;
                 Vector<String> res_ = new Vector<>();
-                for (Object o: v){
+                for (Object o : v) {
                     res_.add(o.toString());
                 }
                 res = String.join("\n", res_);
diff --git a/src/Common/Visual/Menus/VisualiserMenuBar.java b/src/Common/Visual/Menus/VisualiserMenuBar.java
index 7288269f..ba612edd 100644
--- a/src/Common/Visual/Menus/VisualiserMenuBar.java
+++ b/src/Common/Visual/Menus/VisualiserMenuBar.java
@@ -21,8 +21,8 @@ public class VisualiserMenuBar extends JToolBar {
             }
         }
     }
-    public void addPasses(Pass...passes){
-        for (Pass pass: passes)
+    public void addPasses(Pass... passes) {
+        for (Pass pass : passes)
             add(pass.createButton());
     }
     public JMenuBar addMenus(JMenu... menus) {
diff --git a/src/Common/Visual/Tables/HeaderTextFilter.java b/src/Common/Visual/Tables/HeaderTextFilter.java
index a5940a7f..03047b6e 100644
--- a/src/Common/Visual/Tables/HeaderTextFilter.java
+++ b/src/Common/Visual/Tables/HeaderTextFilter.java
@@ -18,26 +18,26 @@ public class HeaderTextFilter<D extends DBObject> implements DBObjectFilter_<D>
     int columnIndex = CommonConstants.Nan; //номер столбца к которому привязан фильтр.
     JTextField textField = null;
     JPopupMenu popup = null;
+    boolean contains = true;
     private String filterValue = "";
     private int offset = 0;
-    boolean contains = true;
     //при одиночном клике, показать поверх заголовка столбца выпавшее меню с полем фильтра.
     public HeaderTextFilter(DataSet dataSet_in, int columnIndex_in, int offset_in, boolean contains_in) {
         dataSet = dataSet_in;
         columnIndex = columnIndex_in;
         offset = offset_in;
-        contains=contains_in;
+        contains = contains_in;
     }
     public HeaderTextFilter(DataSet dataSet_in, int columnIndex_in, int offset_in) {
-        this(dataSet_in,columnIndex_in,offset_in, true);
+        this(dataSet_in, columnIndex_in, offset_in, true);
     }
     @Override
     public boolean Validate(D object) {
         Object field = dataSet.getUI().getColumnInfo(columnIndex).getFieldAt(object);
-        if (field instanceof String){
-            String s  = field.toString().toLowerCase();
-            return contains?s.contains(filterValue):
-                    (filterValue.isEmpty()||s.equals(filterValue)) || (filterValue.trim().isEmpty()&&s.isEmpty());
+        if (field instanceof String) {
+            String s = field.toString().toLowerCase();
+            return contains ? s.contains(filterValue) :
+                    (filterValue.isEmpty() || s.equals(filterValue)) || (filterValue.trim().isEmpty() && s.isEmpty());
         }
         return false;
     }
diff --git a/src/Common/Visual/Tables/RendererMilliseconds.java b/src/Common/Visual/Tables/RendererMilliseconds.java
index 9db85ef8..62f7e1f0 100644
--- a/src/Common/Visual/Tables/RendererMilliseconds.java
+++ b/src/Common/Visual/Tables/RendererMilliseconds.java
@@ -1,11 +1,8 @@
 package Common.Visual.Tables;
-import Common.MainModule_;
 import Common.Utils.Utils_;
-import Common.Visual.Fonts.VisualiserFonts;
 
 import javax.swing.*;
-import java.util.Date;
-public class RendererMilliseconds extends RendererCell<Long>{
+public class RendererMilliseconds extends RendererCell<Long> {
     @Override
     public Long Init(JTable table, Object value, int row, int column) {
         return (Long) value;
diff --git a/src/Common/Visual/Themes/ThemeElement.java b/src/Common/Visual/Themes/ThemeElement.java
index ef4f32a7..6db57501 100644
--- a/src/Common/Visual/Themes/ThemeElement.java
+++ b/src/Common/Visual/Themes/ThemeElement.java
@@ -4,5 +4,7 @@ public interface ThemeElement {
     }
     default void FontDown() {
     }
-    void applyTheme();
+    default void applyTheme() {
+    }
+    ;
 }
diff --git a/src/Common/Visual/Trees/TreeForm.java b/src/Common/Visual/Trees/TreeForm.java
index 46368ac9..d7a5ab36 100644
--- a/src/Common/Visual/Trees/TreeForm.java
+++ b/src/Common/Visual/Trees/TreeForm.java
@@ -13,6 +13,6 @@ public class TreeForm<C extends StyledTree> extends ControlForm<C> {
     }
     @Override
     protected void redrawControl() {
-        ((DefaultTreeModel)getTree().getModel()).reload();
+        ((DefaultTreeModel) getTree().getModel()).reload();
     }
 }
diff --git a/src/Common/Visual/Windows/Dialog/Dialog.java b/src/Common/Visual/Windows/Dialog/Dialog.java
index b172e1e1..87b3a991 100644
--- a/src/Common/Visual/Windows/Dialog/Dialog.java
+++ b/src/Common/Visual/Windows/Dialog/Dialog.java
@@ -108,7 +108,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
         }
         getContentPane().add(buttonsPane, BorderLayout.SOUTH);
     }
-    public void BlockButtons(){
+    public void BlockButtons() {
         btnOK.setVisible(false);
         btnCancel.setVisible(false);
     }
diff --git a/src/_VisualDVM/Visual/Windows/MultilineTextForm.java b/src/Common/Visual/Windows/MultilineTextForm.java
similarity index 91%
rename from src/_VisualDVM/Visual/Windows/MultilineTextForm.java
rename to src/Common/Visual/Windows/MultilineTextForm.java
index de850f01..5068f32f 100644
--- a/src/_VisualDVM/Visual/Windows/MultilineTextForm.java
+++ b/src/Common/Visual/Windows/MultilineTextForm.java
@@ -1,6 +1,6 @@
-package _VisualDVM.Visual.Windows;
+package Common.Visual.Windows;
+import Common.Visual.Editor.BaseEditor;
 import Common.Visual.Windows.Dialog.Text.TextDialog;
-import _VisualDVM.Visual.Editor.BaseEditor;
 public class MultilineTextForm extends TextDialog<BaseEditor> {
     public MultilineTextForm() {
         super(BaseEditor.class);
diff --git a/src/_VisualDVM/Visual/Windows/ReadOnlyMultilineTextForm.java b/src/Common/Visual/Windows/ReadOnlyMultilineTextForm.java
similarity index 87%
rename from src/_VisualDVM/Visual/Windows/ReadOnlyMultilineTextForm.java
rename to src/Common/Visual/Windows/ReadOnlyMultilineTextForm.java
index b1b65091..8e04a0f6 100644
--- a/src/_VisualDVM/Visual/Windows/ReadOnlyMultilineTextForm.java
+++ b/src/Common/Visual/Windows/ReadOnlyMultilineTextForm.java
@@ -1,4 +1,4 @@
-package _VisualDVM.Visual.Windows;
+package Common.Visual.Windows;
 public class ReadOnlyMultilineTextForm extends MultilineTextForm {
     public ReadOnlyMultilineTextForm() {
     }
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java b/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
index fd624708..6aeabb35 100644
--- a/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
@@ -155,12 +155,10 @@ public class BugReport extends rDBObject {
         return project_version.isEmpty();
     }
     //--->
-
     public void CheckRecipients() {
         for (Recipient recipient : Global.componentsServer.db.recipients.Data.values())
             recipient.Select(packedRecipientsJson.contains(recipient.email));
     }
-
     public void saveRecipientsAsJson(Vector<Recipient> recipients) {
         packedRecipientsJson = Utils_.gson.toJson(new RecipientsJson(recipients));
     }
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java
index a74ca7e2..f7f11bf5 100644
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java
@@ -9,8 +9,8 @@ public class BugReportAdditionJson implements Serializable {
     @Expose
     public String fieldName = "";
     @Expose
-    public String textAddition ="";
-    public BugReportAdditionJson(BugReport bugReport,  String fieldName_in, String addition_in){
+    public String textAddition = "";
+    public BugReportAdditionJson(BugReport bugReport, String fieldName_in, String addition_in) {
         id = bugReport.id;
         fieldName = fieldName_in;
         textAddition = addition_in;
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java
index e033b07b..eb0cfe85 100644
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java
@@ -4,7 +4,7 @@ public class RecipientJson {
     @Expose
     public String address;
     public RecipientJson(String addres_in) {
-       address= addres_in;
+        address = addres_in;
     }
     public RecipientJson() {
     }
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java
index 811555f2..e9b49d7d 100644
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java
@@ -5,6 +5,6 @@ public class VisualiserSettingJson {
     public String name;
     @Expose
     public String value;
-    public VisualiserSettingJson(){
+    public VisualiserSettingJson() {
     }
 }
diff --git a/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java b/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
index b780508e..b073e29f 100644
--- a/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
+++ b/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
@@ -3,7 +3,6 @@ import Common.Database.SQLITE.SQLiteDatabase;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.ComponentsServer.BugReport.BugReportsDBTable;
 import _VisualDVM.ComponentsServer.Recipient.RecipientsDataSet;
-import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspaceDBTable;
 import _VisualDVM.Passes.PassCode;
 
 import java.nio.file.Paths;
diff --git a/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java b/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java
index 9aecee99..ca2c0781 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java
@@ -25,7 +25,7 @@ public class ComponentPublicationInfoJson implements Serializable {
     public boolean needsEmail = false;
     @Expose
     public boolean needsSendFile = false;
-    public ComponentPublicationInfoJson(Component component) throws Exception{
+    public ComponentPublicationInfoJson(Component component) throws Exception {
         componentType = component.getComponentType();
         fileName = component.getFileName();
         packedFile = Utils_.fileToBytes(component.getFile());
diff --git a/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java b/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java
index a2264c11..bbf660d5 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java
@@ -10,7 +10,7 @@ public class ComponentVersionsInfoJson implements Serializable {
     public String minimal_version = "";
     @Expose
     public String actual_version = "";
-    public ComponentVersionsInfoJson(ComponentType componentType_in){
-        componentType=componentType_in;
+    public ComponentVersionsInfoJson(ComponentType componentType_in) {
+        componentType = componentType_in;
     }
 }
diff --git a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
index d087426a..b430a0c7 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
@@ -301,6 +301,112 @@ public abstract class Sapfor extends OSDComponent {
         }
         return res;
     }
+    //--
+    public static int getFileMaxDim_C(File file) {
+        int fileMax = 0;
+        final String prefix = "#pragma dvm array distribute";
+        int n = 0;
+        try {
+            for (String line : FileUtils.readLines(file, Charset.defaultCharset())) {
+                //  #pragma dvm array distribute[block][block], не важно
+                String packedLine = Utils_.removeCharacters(Utils_.removeRedundantSpaces(line).toLowerCase(), "\n", "\r", "\t");
+                if (packedLine.startsWith(prefix)) {
+                    packedLine = packedLine.substring(prefix.length());
+                    boolean bracketOpen = false;
+                    int pragmaMax = 0;
+                    String distr = "";
+                    for (int i = packedLine.indexOf('['); i < packedLine.length(); ++i) {
+                        char c = packedLine.charAt(i);
+                        if (bracketOpen) {
+                            if (c == ']') {
+                                bracketOpen = false;
+                                if (distr.equals("block"))
+                                    pragmaMax++;
+                                distr = "";
+                            } else {
+                                distr += c;
+                            }
+                        } else {
+                            if (c == '[') {
+                                bracketOpen = true;
+                            } else {
+                                break;
+                            }
+                        }
+                    }
+                    fileMax = Math.max(fileMax, pragmaMax);
+                }
+                ++n;
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return fileMax;
+    }
+    public static int getProjectMinMaxDim_C(db_project_info project) {
+        int res = 0;
+        for (DBProjectFile file : project.db.files.Data.values()) {
+            if (file.isActiveProgram())
+                res = Math.max(res, Sapfor.getFileMaxDim_C(file.file));
+        }
+        return res;
+    }
+    public static Pair<Integer, Integer> getProjectFolderMinMaxDim_F(File sapfor_drv, File projectPath) {
+        String flags = "-noLogo";
+        Pair<Integer, Integer> res = new Pair<>(0, 0);
+        try {
+            if (Sapfor.parse(sapfor_drv, projectPath, flags)
+            ) {
+                Vector<String> outputLines = new Vector<>();
+                if (Sapfor.analysis(sapfor_drv, projectPath, PassCode.SPF_GetMaxMinBlockDistribution, flags, outputLines)) {
+                    //---
+                    for (String line : outputLines) {
+                        String prefix = "GET_MIN_MAX_BLOCK_DIST: ";
+                        if (line.startsWith(prefix)) {
+                            String s = line.substring(prefix.length());
+                            String[] data = s.split(" ");
+                            res = new Pair<>(Math.max(Integer.parseInt(data[0]), 0), Math.max(Integer.parseInt(data[1]), 0));
+                            break;
+                        }
+                    }
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            try {
+                Utils.deleteFilesByExtensions(projectPath,
+                        "proj", "dep", "jar"
+                );
+                File visualiser_data = new File(projectPath, Constants.data);
+                if (visualiser_data.exists())
+                    FileUtils.forceDelete(visualiser_data);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+        return res;
+    }
+    public static void getTestMinMaxDim_F(File sapfor_drv, Test test) {
+        Pair<Integer, Integer> res = getProjectFolderMinMaxDim_F(sapfor_drv, test.getServerPath());
+        test.min_dim = res.getKey();
+        test.max_dim = res.getValue();
+    }
+    public static void getTestMinMaxDime_C(Test test) {
+        File workspace = test.getServerPath();
+        Vector<File> files = new Vector<>();
+        TestFilesJson filesJson = Utils_.gson.fromJson(test.packedFilesJson, TestFilesJson.class);
+        for (TestFileJson fileJson : filesJson.values) {
+            files.add(new File(workspace, fileJson.name));
+        }
+        int min_dim = 0;
+        int max_dim = 0;
+        for (File file : files) {
+            max_dim = Math.max(max_dim, getFileMaxDim_C(file));
+        }
+        test.min_dim = min_dim;
+        test.max_dim = max_dim;
+    }
     public void refreshPid() {
         try {
             //  UI.Info("Calling SPF_GetCurrentPID...");
@@ -542,110 +648,4 @@ public abstract class Sapfor extends OSDComponent {
             Global.mainModule.getUI().getVersionsWindow().BlockVariants();
     }
     //--
-    public static int getFileMaxDim_C(File file) {
-        int fileMax = 0;
-        final String prefix = "#pragma dvm array distribute";
-        int n = 0;
-        try {
-            for (String line : FileUtils.readLines(file, Charset.defaultCharset())) {
-                //  #pragma dvm array distribute[block][block], не важно
-                String packedLine = Utils_.removeCharacters(Utils_.removeRedundantSpaces(line).toLowerCase(), "\n", "\r", "\t");
-                if (packedLine.startsWith(prefix)) {
-                    packedLine = packedLine.substring(prefix.length());
-                    boolean bracketOpen = false;
-                    int pragmaMax = 0;
-                    String distr = "";
-                    for (int i = packedLine.indexOf('['); i < packedLine.length(); ++i) {
-                        char c = packedLine.charAt(i);
-                        if (bracketOpen) {
-                            if (c == ']') {
-                                bracketOpen = false;
-                                if (distr.equals("block"))
-                                    pragmaMax++;
-                                distr = "";
-                            } else {
-                                distr += c;
-                            }
-                        } else {
-                            if (c == '[') {
-                                bracketOpen = true;
-                            } else {
-                                break;
-                            }
-                        }
-                    }
-                    fileMax = Math.max(fileMax, pragmaMax);
-                }
-                ++n;
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        return fileMax;
-    }
-    public static int getProjectMinMaxDim_C(db_project_info project) {
-        int res = 0;
-        for (DBProjectFile file : project.db.files.Data.values()) {
-            if (file.isActiveProgram())
-                res = Math.max(res, Sapfor.getFileMaxDim_C(file.file));
-        }
-        return res;
-    }
-    public static Pair<Integer, Integer> getProjectFolderMinMaxDim_F(File sapfor_drv, File projectPath) {
-        String flags = "-noLogo";
-        Pair<Integer, Integer> res = new Pair<>(0, 0);
-        try {
-            if (Sapfor.parse(sapfor_drv, projectPath, flags)
-            ) {
-                Vector<String> outputLines = new Vector<>();
-                if (Sapfor.analysis(sapfor_drv, projectPath, PassCode.SPF_GetMaxMinBlockDistribution, flags, outputLines)) {
-                    //---
-                    for (String line : outputLines) {
-                        String prefix = "GET_MIN_MAX_BLOCK_DIST: ";
-                        if (line.startsWith(prefix)) {
-                            String s = line.substring(prefix.length());
-                            String[] data = s.split(" ");
-                            res = new Pair<>(Math.max(Integer.parseInt(data[0]), 0), Math.max(Integer.parseInt(data[1]), 0));
-                            break;
-                        }
-                    }
-                }
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        } finally {
-            try {
-                Utils.deleteFilesByExtensions(projectPath,
-                        "proj", "dep", "jar"
-                );
-                File visualiser_data = new File(projectPath, Constants.data);
-                if (visualiser_data.exists())
-                    FileUtils.forceDelete(visualiser_data);
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-        }
-        return res;
-    }
-    public static void getTestMinMaxDim_F(File sapfor_drv, Test test) {
-        Pair<Integer, Integer> res = getProjectFolderMinMaxDim_F(sapfor_drv, test.getServerPath());
-        test.min_dim = res.getKey();
-        test.max_dim = res.getValue();
-    }
-    public static void getTestMinMaxDime_C(Test test) {
-        File workspace = test.getServerPath();
-        Vector<File> files = new Vector<>();
-        TestFilesJson filesJson = Utils_.gson.fromJson(test.packedFilesJson,TestFilesJson.class);
-        for (TestFileJson fileJson : filesJson.values) {
-            files.add(new File(workspace, fileJson.name));
-        }
-        int min_dim = 0;
-        int max_dim = 0;
-        for (File file: files){
-            max_dim = Math.max(max_dim,getFileMaxDim_C(file));
-        }
-        test.min_dim = min_dim;
-        test.max_dim = max_dim;
-    }
-    //--
 }
diff --git a/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java b/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java
index 2bae0795..0e8891c7 100644
--- a/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java
+++ b/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java
@@ -1,6 +1,6 @@
 package _VisualDVM.ComponentsServer.Component.UI;
+import Common.Visual.Editor.BaseEditor;
 import Common.Visual.Windows.Dialog.DialogFields;
-import _VisualDVM.Visual.Editor.BaseEditor;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/ComponentsServer/Component/Visualiser.java b/src/_VisualDVM/ComponentsServer/Component/Visualiser.java
index 513e020b..8d6541b5 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Visualiser.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Visualiser.java
@@ -85,7 +85,7 @@ public class Visualiser extends Component {
         }
         return res;
     }
-    public File getDownloadsDirectory(){
+    public File getDownloadsDirectory() {
         File res = new File(getWorkspace(), Constants.DownloadsDirectoryName);
         Utils_.CheckDirectory(res);
         return res;
diff --git a/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java b/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
index e87044cb..9bc6ce90 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
@@ -73,8 +73,8 @@ public class Visualizer_2 extends OSDComponent {
     }
     @Override
     public String getAssemblyCommand() {
-        File src_home= Paths.get(Global.RepoDirectory.getAbsolutePath(),"SAPFOR/src/Server").toFile();
-        return "cd " +Utils_.DQuotes(src_home)+
+        File src_home = Paths.get(Global.RepoDirectory.getAbsolutePath(), "SAPFOR/src/Server").toFile();
+        return "cd " + Utils_.DQuotes(src_home) +
                 "\n" +
                 "g++ -O3 -std=c++17 checkUniq.cpp server.cpp -o Visualizer_2 -lpthread -lstdc++fs\n";
     }
diff --git a/src/_VisualDVM/ComponentsServer/ComponentsServer.java b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
index f29fb182..1a3df75e 100644
--- a/src/_VisualDVM/ComponentsServer/ComponentsServer.java
+++ b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
@@ -1,6 +1,5 @@
 package _VisualDVM.ComponentsServer;
 import Common.Database.Objects.DBObject;
-import Common.Database.Objects.riDBObject;
 import Common.Database.RepositoryRefuseException;
 import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
@@ -12,13 +11,7 @@ import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Machine.Machine;
-import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
-import _VisualDVM.GlobalData.User.User;
-import _VisualDVM.Passes.All.ArchivesBackupPass;
-import _VisualDVM.Passes.All.Email;
-import _VisualDVM.Passes.All.UnzipFolderPass;
 import _VisualDVM.Passes.All.ZipFolderPass;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Repository.EmailMessage;
@@ -26,17 +19,14 @@ import _VisualDVM.Repository.Server.RepositoryServer;
 import _VisualDVM.Utils;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.RandomStringUtils;
 
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.Serializable;
 import java.lang.reflect.Field;
-import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.Vector;
 public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
@@ -54,7 +44,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
     }
     @Override
     protected void extraBackup(File todayBackUp) {
-        zip.Do("Bugs",new File (todayBackUp, "Bugs.zip").getAbsolutePath());
+        zip.Do("Bugs", new File(todayBackUp, "Bugs.zip").getAbsolutePath());
     }
     @Override
     protected void beforePublishAction(DBObject object) throws Exception {
@@ -71,7 +61,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
         if (object instanceof BugReport) {
             BugReport bugReport = (BugReport) object;
             if (!bugReport.project_version.isEmpty()) Utils_.forceDeleteWithCheck(bugReport.getArchiveFile());
-        }else if (object instanceof UserAccount){
+        } else if (object instanceof UserAccount) {
             UserAccount account = (UserAccount) object;
             Utils_.forceDeleteWithCheck(account.getServerKeyFile());
         }
@@ -237,7 +227,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
             bufferWriter_.close();
         }
         //-рассылка об изменениях.
-        if (info.needsEmail){
+        if (info.needsEmail) {
             String version_mail_header = String.join(" ",
                     "Опубликована версия",
                     Utils_.DQuotes(info.versionNumber),
@@ -246,13 +236,13 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
             //-
             EmailMessage message =
                     new EmailMessage(version_mail_header,
-                           info.changeRecord
+                            info.changeRecord
                     );
             if (info.needsSendFile)
                 message.addAttachement(componentFile);
             //--
-            for (String address: credentials_db.userAccounts.getActiveMails()){
-                EmailMessagesQueue.add(new Pair<>(address,message));
+            for (String address : credentials_db.userAccounts.getActiveMails()) {
+                EmailMessagesQueue.add(new Pair<>(address, message));
             }
         }
     }
diff --git a/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java b/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
index 69dd66f6..24284680 100644
--- a/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
+++ b/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
@@ -1,17 +1,11 @@
 package _VisualDVM.ComponentsServer;
-import Common.Database.Objects.DBObject;
 import Common.Database.SQLITE.SQLiteDatabase;
-import Common.Database.Tables.FKBehaviour;
-import Common.Database.Tables.FKCurrentObjectBehaviuor;
-import Common.Database.Tables.FKDataBehaviour;
 import Common.Passes.PassCode_;
-import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspaceDBTable;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccountsDBTable;
 import _VisualDVM.Passes.PassCode;
 
 import java.nio.file.Paths;
-import java.util.LinkedHashMap;
 public class CredentialsDatabase extends SQLiteDatabase {
     public UserAccountsDBTable userAccounts;
     public SubscriberWorkspaceDBTable workspaces;
@@ -38,5 +32,4 @@ public class CredentialsDatabase extends SQLiteDatabase {
         userAccounts.ShowUI();
         super.ResetUI();
     }
-
 }
diff --git a/src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountJson.java b/src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountJson.java
index 8e217a9d..f54c0a43 100644
--- a/src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountJson.java
+++ b/src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountJson.java
@@ -5,7 +5,7 @@ public class UserAccountJson {
     public String email;
     @Expose
     public String name;
-    public UserAccountJson(String email_in, String name_in){
+    public UserAccountJson(String email_in, String name_in) {
         email = email_in;
         name = name_in;
     }
diff --git a/src/_VisualDVM/ComponentsServer/Recipient/Recipient.java b/src/_VisualDVM/ComponentsServer/Recipient/Recipient.java
index a86ffff4..cbef2f5b 100644
--- a/src/_VisualDVM/ComponentsServer/Recipient/Recipient.java
+++ b/src/_VisualDVM/ComponentsServer/Recipient/Recipient.java
@@ -4,6 +4,12 @@ import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountJson;
 public class Recipient extends DBObject {
     public String email = "";
     public String name = "";
+    public Recipient() {
+    }
+    public Recipient(UserAccountJson json) {
+        email = json.email;
+        name = json.name;
+    }
     @Override
     public Object getPK() {
         return email;
@@ -15,10 +21,4 @@ public class Recipient extends DBObject {
         email = src_.email;
         name = src_.name;
     }
-    public Recipient() {
-    }
-    public Recipient(UserAccountJson json) {
-        email = json.email;
-        name = json.name;
-    }
 }
diff --git a/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java b/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java
index d3b14a1d..6f183f30 100644
--- a/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java
+++ b/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java
@@ -5,7 +5,6 @@ import Common.Visual.DataSetControlForm;
 import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountJson;
 import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountsJson;
 import _VisualDVM.ComponentsServer.Recipient.UI.RecipientsForm;
-import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 
@@ -15,16 +14,16 @@ public class RecipientsDataSet extends DataSet<String, Recipient> {
     public RecipientsDataSet() {
         super(String.class, Recipient.class);
     }
-    public void Unpack(String packed){
+    public void Unpack(String packed) {
         clear();
         UserAccountsJson jsons = Utils_.gson.fromJson(packed, UserAccountsJson.class);
-        for (UserAccountJson userAccountJson: jsons.values){
+        for (UserAccountJson userAccountJson : jsons.values) {
             Global.componentsServer.db.recipients.put(userAccountJson.email, new Recipient(userAccountJson));
         }
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new RecipientsForm(this,mountPanel);
+        return new RecipientsForm(this, mountPanel);
     }
     @Override
     public String getPluralDescription() {
@@ -34,11 +33,11 @@ public class RecipientsDataSet extends DataSet<String, Recipient> {
     public String getSingleDescription() {
         return "адресат";
     }
-    public Vector<String> getSelectedMails(){
+    public Vector<String> getSelectedMails() {
         //баг текущий. значит адресаты уже активные и правильные. дополняем их админами и автором.
         Vector<String> res = new Vector<>();
-        for (Recipient recipient:Data.values()){
-            if (recipient.isSelected()&& !res.contains(recipient.email))
+        for (Recipient recipient : Data.values()) {
+            if (recipient.isSelected() && !res.contains(recipient.email))
                 res.add(recipient.email);
         }
         //--
diff --git a/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java b/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java
index 7d4e6446..c8f85993 100644
--- a/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java
+++ b/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java
@@ -26,7 +26,7 @@ public class RecipientsForm extends DataSetControlForm<Recipient> {
     }
     @Override
     protected DataMenuBar createMenuBar() {
-        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SaveBugReportExecutor,PassCode.SaveBugReportRecipients);
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SaveBugReportExecutor, PassCode.SaveBugReportRecipients);
     }
     @Override
     protected ColumnInfo<Recipient> createPKColumn() {
diff --git a/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java b/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
index 4692df14..527e9c4d 100644
--- a/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
+++ b/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
@@ -1,13 +1,11 @@
 package _VisualDVM.ComponentsServer.SubscriberWorkspace.UI;
 import Common.Database.Tables.DataSet;
-import Common.Passes.PassCode_;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
 import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
 public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {
diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java
index 71693a92..1b462a50 100644
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java
@@ -2,9 +2,9 @@ package _VisualDVM.ComponentsServer.UserAccount.UI;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
+import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
-import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 public class UserAccountDialog extends DBObjectDialog<UserAccount, UserAccountFields> {
     public UserAccountDialog() {
         super(UserAccountFields.class);
diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java
index 2de22f1f..b202deda 100644
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java
@@ -6,11 +6,11 @@ import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 import javax.swing.*;
 import java.awt.*;
 public class UserAccountFields implements DialogFields {
-    private JPanel content;
     public JTextField tfName;
     public JTextField tfAddress;
     public JCheckBox cbMail;
     public JComboBox cbRole;
+    private JPanel content;
     private void createUIComponents() {
         // TODO: place custom component creation code here
         tfName = new StyledTextField();
diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java b/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java
index 5d06940b..7dc0b207 100644
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java
@@ -13,38 +13,37 @@ public class UserAccount extends iDBObject {
     public String name = "";
     public String email = "";
     @Description("DEFAULT ''")
-    public String telegram_name="";
+    public String telegram_name = "";
     @Description("DEFAULT 1")
     public int subscribe_active = 1;
     @Description("DEFAULT 'Undefined'")
     public AccountRole role = AccountRole.Undefined;  //права доступа
-    public UserAccount(){
-
+    public UserAccount() {
     }
     public UserAccount(UserAccount account_in) {
         this.SynchronizeFields(account_in);
     }
+    public UserAccount(String name_in, String email_in) {
+        name = name_in;
+        email = email_in;
+    }
     @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
         UserAccount src_ = (UserAccount) src;
         name = src_.name;
         email = src_.email;
-        telegram_name=src_.telegram_name;
-        subscribe_active=src_.subscribe_active;
+        telegram_name = src_.telegram_name;
+        subscribe_active = src_.subscribe_active;
         role = src_.role;
     }
-    public UserAccount(String name_in, String email_in){
-        name = name_in;
-        email=email_in;
+    public File getClientKeyFile() {
+        return new File(Global.KeysDirectory, "key");
     }
-    public File getClientKeyFile(){
-        return new File(Global.KeysDirectory,"key");
+    public File getServerKeyFile() {
+        return new File(Global.KeysDirectory, String.valueOf(id));
     }
-    public File getServerKeyFile(){
-        return new File(Global.KeysDirectory,String.valueOf(id));
-    }
-    public String getKey() throws Exception{
+    public String getKey() throws Exception {
         return FileUtils.readFileToString(getServerKeyFile());
     }
     public void generateKey() throws Exception {
diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java b/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java
index c48bea80..023c278e 100644
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java
@@ -11,7 +11,6 @@ import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountsJson;
 import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountsForm;
 import _VisualDVM.Constants;
-import _VisualDVM.Global;
 
 import javax.swing.*;
 import java.util.LinkedHashMap;
@@ -20,15 +19,15 @@ public class UserAccountsDBTable extends iDBTable<UserAccount> {
     public UserAccountsDBTable() {
         super(UserAccount.class);
     }
-    public UserAccount getByKey(String key_in) throws Exception{
-        for (UserAccount userAccount: Data.values()){
+    public UserAccount getByKey(String key_in) throws Exception {
+        for (UserAccount userAccount : Data.values()) {
             if (userAccount.getKey().equals(key_in))
                 return userAccount;
         }
         return null;
     }
-    public UserAccount getByEmail(String email_in){
-        for (UserAccount userAccount: Data.values()){
+    public UserAccount getByEmail(String email_in) {
+        for (UserAccount userAccount : Data.values()) {
             if (userAccount.email.equals(email_in))
                 return userAccount;
         }
@@ -53,22 +52,21 @@ public class UserAccountsDBTable extends iDBTable<UserAccount> {
         res.put(SubscriberWorkspace.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
         return res;
     }
-    public String getPackedActiveRecipients(){
-        UserAccountsJson res  = new UserAccountsJson();
+    public String getPackedActiveRecipients() {
+        UserAccountsJson res = new UserAccountsJson();
         Vector<String> active = new Vector<>();
-        for (UserAccount userAccount: Data.values()){
-            if ((userAccount.subscribe_active!=0) && !active.contains(userAccount.email)){
+        for (UserAccount userAccount : Data.values()) {
+            if ((userAccount.subscribe_active != 0) && !active.contains(userAccount.email)) {
                 active.add(userAccount.email);
                 res.values.add(new UserAccountJson(userAccount.email, userAccount.name));
             }
         }
         return Utils_.gson.toJson(res);
     }
-
-    public Vector<String> getActiveMails(){
+    public Vector<String> getActiveMails() {
         Vector<String> res = new Vector<>();
-        for (UserAccount account: Data.values()){
-            if ((account.subscribe_active!=0)&& !res.contains(account.email))
+        for (UserAccount account : Data.values()) {
+            if ((account.subscribe_active != 0) && !res.contains(account.email))
                 res.add(account.email);
         }
         for (String admin_mail : Constants.admins_mails) {
diff --git a/src/_VisualDVM/ComponentsServerProperties.java b/src/_VisualDVM/ComponentsServerProperties.java
index 8b3f1e40..8a1f500f 100644
--- a/src/_VisualDVM/ComponentsServerProperties.java
+++ b/src/_VisualDVM/ComponentsServerProperties.java
@@ -2,17 +2,17 @@ package _VisualDVM;
 import com.google.gson.annotations.Expose;
 
 import java.io.File;
-public class ComponentsServerProperties extends VisualDVMProperties{
+public class ComponentsServerProperties extends VisualDVMProperties {
     //---
     @Expose
     public int ComponentsBackUpsCount = 10;
     @Expose
-    public String default_dvm_drv="";
+    public String default_dvm_drv = "";
     //---
-    public ComponentsServerProperties(){
+    public ComponentsServerProperties() {
         Mode = _VisualDVM.Mode.Server;
     }
-    public ComponentsServerProperties(File file_in){
+    public ComponentsServerProperties(File file_in) {
         super(_VisualDVM.Mode.Server, file_in);
     }
 }
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 5b8640ee..7a7470d8 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -31,7 +31,7 @@ public class Constants {
     public static final String DVM_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/dvm";
     //GIT
     public static final String SAPFOR_REPOSITORY = "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR.git";
-    public static final String SAPFOR_VERSION_URL= "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR/raw/branch/master/src/Utils/version.h";
+    public static final String SAPFOR_VERSION_URL = "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR/raw/branch/master/src/Utils/version.h";
     //-вывод задач
     public final static String parse_out_file = "parse_out.txt";
     public final static String parse_err_file = "parse_err.txt";
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 836d98f3..4e16e703 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -17,7 +17,6 @@ import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
 
 import java.io.File;
-import java.nio.file.Files;
 import java.nio.file.Paths;
 public class Global {
     //todo свести большинство к содержимому mainModule
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLine.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLine.java
index 6a6888be..fb066e59 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLine.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLine.java
@@ -1,12 +1,10 @@
 package _VisualDVM.GlobalData.CompilerEnvironment;
 import Common.Database.Objects.iDBObject;
 import Common.Utils.Utils_;
-import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson;
 import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
-import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
 public class EnvironmentsLine extends iDBObject {
     public EnvironmentsJson json;
-    public EnvironmentsLine(EnvironmentsJson json_in){
+    public EnvironmentsLine(EnvironmentsJson json_in) {
         json = json_in;
     }
     @Override
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLinesSet.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLinesSet.java
index 190b9e9e..b837ad29 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLinesSet.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLinesSet.java
@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
 import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
 import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsSetJson;
 import _VisualDVM.GlobalData.CompilerEnvironment.UI.EnvironmentsLinesForm;
-import _VisualDVM.GlobalData.CompilerOption.OptionsLine;
 
 import javax.swing.*;
 public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
@@ -14,8 +13,8 @@ public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
     }
     public EnvironmentsLinesSet(EnvironmentsSetJson json) {
         super(Integer.class, EnvironmentsLine.class);
-        for (EnvironmentsJson environmentsJson: json.values) {
-            EnvironmentsLine environmentsLine =new EnvironmentsLine(environmentsJson);
+        for (EnvironmentsJson environmentsJson : json.values) {
+            EnvironmentsLine environmentsLine = new EnvironmentsLine(environmentsJson);
             environmentsLine.id = maxId++;
             put(environmentsLine.id, environmentsLine);
         }
@@ -30,11 +29,11 @@ public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new EnvironmentsLinesForm(this,mountPanel);
+        return new EnvironmentsLinesForm(this, mountPanel);
     }
-    public EnvironmentsSetJson toJson(){
-        EnvironmentsSetJson res= new EnvironmentsSetJson();
-        for (EnvironmentsLine environmentsLine: Data.values()){
+    public EnvironmentsSetJson toJson() {
+        EnvironmentsSetJson res = new EnvironmentsSetJson();
+        for (EnvironmentsLine environmentsLine : Data.values()) {
             res.values.add(environmentsLine.json);
         }
         return res;
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java
index cee92b1e..411ee695 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java
@@ -1,14 +1,13 @@
 package _VisualDVM.GlobalData.CompilerEnvironment.Json;
 import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
-import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
 import com.google.gson.annotations.Expose;
 public class EnvironmentJson {
     @Expose
     public String name; //в том числе и с разделителем если есть. поиск по startswith
     @Expose
     public String value; //значение без кавычек
-    public EnvironmentJson(CompilerEnvironment src){
-        name= src.name;
+    public EnvironmentJson(CompilerEnvironment src) {
+        name = src.name;
         value = src.value;
     }
 }
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsJson.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsJson.java
index e0e8be55..dec4d9f1 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsJson.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsJson.java
@@ -1,6 +1,5 @@
 package _VisualDVM.GlobalData.CompilerEnvironment.Json;
 import Common.Utils.Utils_;
-import _VisualDVM.GlobalData.CompilerOption.Json.OptionJson;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;
@@ -8,10 +7,10 @@ import java.util.Vector;
 public class EnvironmentsJson {
     @Expose
     public List<EnvironmentJson> values = new Vector<>();
-    public String toLine(){
+    public String toLine() {
         Vector<String> res = new Vector<>();
-        for (EnvironmentJson environmentJson: values){
-            res.add(environmentJson.name+"="+Utils_.DQuotes(environmentJson.value));
+        for (EnvironmentJson environmentJson : values) {
+            res.add(environmentJson.name + "=" + Utils_.DQuotes(environmentJson.value));
         }
         return String.join(" ", res);
     }
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsSetJson.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsSetJson.java
index a5e2d9e0..119c9b52 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsSetJson.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsSetJson.java
@@ -1,5 +1,4 @@
 package _VisualDVM.GlobalData.CompilerEnvironment.Json;
-import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/RawCompilerEnvironmentsSet.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/RawCompilerEnvironmentsSet.java
index f962f798..916aa39e 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/RawCompilerEnvironmentsSet.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/RawCompilerEnvironmentsSet.java
@@ -4,9 +4,6 @@ import Common.Visual.DataSetControlForm;
 import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson;
 import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
 import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsForm;
-import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
-import _VisualDVM.GlobalData.CompilerOption.Json.OptionJson;
-import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
 
 import javax.swing.*;
 public class RawCompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
@@ -25,23 +22,23 @@ public class RawCompilerEnvironmentsSet extends DataSet<String, CompilerEnvironm
     public String getSingleDescription() {
         return "переменная окружения";
     }
-    public CompilerEnvironment findByJson(EnvironmentJson json){
-        for (CompilerEnvironment compilerEnvironment: Data.values()){
+    public CompilerEnvironment findByJson(EnvironmentJson json) {
+        for (CompilerEnvironment compilerEnvironment : Data.values()) {
             if (json.name.equals(compilerEnvironment.name))
                 return compilerEnvironment;
         }
         return null;
     }
     public void Reset() {
-        for (CompilerEnvironment environment: Data.values()){
+        for (CompilerEnvironment environment : Data.values()) {
             environment.select(false);
-            environment.value="";
+            environment.value = "";
         }
     }
     public void Synchronize(EnvironmentsJson json) {
-        for (EnvironmentJson environmentJson: json.values){
+        for (EnvironmentJson environmentJson : json.values) {
             CompilerEnvironment compilerEnvironment = findByJson(environmentJson);
-            if (compilerEnvironment!=null){
+            if (compilerEnvironment != null) {
                 compilerEnvironment.select(true);
                 compilerEnvironment.value = environmentJson.value;
             }
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/EnvironmentsLinesForm.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/EnvironmentsLinesForm.java
index 3be26fbb..e529283b 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/EnvironmentsLinesForm.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/EnvironmentsLinesForm.java
@@ -8,9 +8,6 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLine;
 import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLinesSet;
 import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
-import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
-import _VisualDVM.GlobalData.CompilerOption.OptionsLine;
-import _VisualDVM.GlobalData.CompilerOption.OptionsLinesSet;
 import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
@@ -18,7 +15,6 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
     public EnvironmentsLinesForm(DataSet<?, EnvironmentsLine> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
-
     @Override
     protected boolean hasCheckBox() {
         return false;
@@ -40,7 +36,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
     protected DataMenuBar createMenuBar() {
         DataMenuBar res = super.createMenuBar();
         res.addPasses(
-                new Pass<EnvironmentsLine>(){
+                new Pass<EnvironmentsLine>() {
                     @Override
                     public String getIconPath() {
                         return "/Common/icons/RedAdd.png";
@@ -56,9 +52,9 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
                     @Override
                     protected boolean canStart(Object... args) throws Exception {
                         Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
-                        if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())){
-                            target= new EnvironmentsLine((EnvironmentsJson) pass.target);
-                            target.id = ((EnvironmentsLinesSet)dataSource).maxId++;
+                        if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())) {
+                            target = new EnvironmentsLine((EnvironmentsJson) pass.target);
+                            target.id = ((EnvironmentsLinesSet) dataSource).maxId++;
                             return true;
                         }
                         return false;
@@ -72,7 +68,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
                         dataSource.ShowUI(target.getPK());
                     }
                 },
-                new Pass<EnvironmentsLine>(){
+                new Pass<EnvironmentsLine>() {
                     @Override
                     public String getIconPath() {
                         return "/Common/icons/Edit.png";
@@ -90,7 +86,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
                         if (dataSource.getUI().CheckCurrent(Log)) {
                             target = dataSource.getUI().getCurrent();
                             Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
-                            if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)){
+                            if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)) {
                                 return true;
                             }
                         }
@@ -98,14 +94,13 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
                     }
                     @Override
                     protected void body() throws Exception {
-
                     }
                     @Override
                     protected void showFinish() throws Exception {
                         dataSource.ShowUI(target.getPK());
                     }
                 },
-                new Pass<EnvironmentsLine>(){
+                new Pass<EnvironmentsLine>() {
                     @Override
                     public String getIconPath() {
                         return "/Common/icons/Delete.png";
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java b/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java
index b6519a69..65003aeb 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java
@@ -1,7 +1,6 @@
 package _VisualDVM.GlobalData.CompilerOption;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Utils_;
-import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Arrays;
 import java.util.Vector;
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java b/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java
index b4c4b4e8..d1311d74 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java
@@ -6,8 +6,8 @@ public class OptionJson {
     public String name; //в том числе и с разделителем если есть. поиск по startswith
     @Expose
     public String value; //значение без кавычек
-    public OptionJson(CompilerOption src){
-        name= src.name+src.parameterSeparator;
+    public OptionJson(CompilerOption src) {
+        name = src.name + src.parameterSeparator;
         value = src.parameterValue;
     }
 }
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java b/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java
index 71d83ab0..535796b8 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java
@@ -7,12 +7,11 @@ import java.util.Vector;
 public class OptionsJson {
     @Expose
     public List<OptionJson> values = new Vector<>();
-    public String toLine(){
+    public String toLine() {
         Vector<String> res = new Vector<>();
-        for (OptionJson optionJson: values){
-            res.add(optionJson.name+
-
-                    (optionJson.value.contains(" ")? Utils_.DQuotes(optionJson.value): optionJson.value));
+        for (OptionJson optionJson : values) {
+            res.add(optionJson.name +
+                    (optionJson.value.contains(" ") ? Utils_.DQuotes(optionJson.value) : optionJson.value));
         }
         return String.join(" ", res);
     }
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java b/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java
index 22706ad3..dbf19a84 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java
@@ -6,6 +6,6 @@ import java.util.Vector;
 public class OptionsSetJson {
     @Expose
     public List<OptionsJson> values = new Vector<>();
-    public OptionsSetJson(){
+    public OptionsSetJson() {
     }
 }
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java b/src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java
index 7768c6e4..88dd7eda 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java
@@ -4,7 +4,7 @@ import Common.Utils.Utils_;
 import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
 public class OptionsLine extends iDBObject {
     public OptionsJson json;
-    public OptionsLine(OptionsJson json_in){
+    public OptionsLine(OptionsJson json_in) {
         json = json_in;
     }
     @Override
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/OptionsLinesSet.java b/src/_VisualDVM/GlobalData/CompilerOption/OptionsLinesSet.java
index 4feac96e..c78832ab 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/OptionsLinesSet.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/OptionsLinesSet.java
@@ -11,10 +11,10 @@ public class OptionsLinesSet extends DataSet<Integer, OptionsLine> {
     public OptionsLinesSet() {
         super(Integer.class, OptionsLine.class);
     }
-    public OptionsLinesSet(OptionsSetJson json){
+    public OptionsLinesSet(OptionsSetJson json) {
         super(Integer.class, OptionsLine.class);
-        for (OptionsJson optionsJson: json.values) {
-            OptionsLine optionsLine =new OptionsLine(optionsJson);
+        for (OptionsJson optionsJson : json.values) {
+            OptionsLine optionsLine = new OptionsLine(optionsJson);
             optionsLine.id = maxId++;
             put(optionsLine.id, optionsLine);
         }
@@ -29,11 +29,11 @@ public class OptionsLinesSet extends DataSet<Integer, OptionsLine> {
     }
     @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
-        return new OptionsLinesForm(this,mountPanel);
+        return new OptionsLinesForm(this, mountPanel);
     }
-    public OptionsSetJson toJson(){
-        OptionsSetJson res= new OptionsSetJson();
-        for (OptionsLine optionsLine: Data.values()){
+    public OptionsSetJson toJson() {
+        OptionsSetJson res = new OptionsSetJson();
+        for (OptionsLine optionsLine : Data.values()) {
             res.values.add(optionsLine.json);
         }
         return res;
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/RawCompilerOptionsSet.java b/src/_VisualDVM/GlobalData/CompilerOption/RawCompilerOptionsSet.java
index 29508300..5b3f3a0e 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/RawCompilerOptionsSet.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/RawCompilerOptionsSet.java
@@ -23,24 +23,24 @@ public class RawCompilerOptionsSet extends DataSet<String, CompilerOption> {
     public String getSingleDescription() {
         return "опция компиляции";
     }
-    public CompilerOption findByJson(OptionJson json){
-        for (CompilerOption compilerOption: Data.values()){
-            if (json.name.equals(compilerOption.name+compilerOption.parameterSeparator))
+    public CompilerOption findByJson(OptionJson json) {
+        for (CompilerOption compilerOption : Data.values()) {
+            if (json.name.equals(compilerOption.name + compilerOption.parameterSeparator))
                 return compilerOption;
         }
         return null;
     }
-    public void Reset(){
-        for (CompilerOption option: Data.values()){
+    public void Reset() {
+        for (CompilerOption option : Data.values()) {
             option.select(false);
-            option.parameterValue="";
+            option.parameterValue = "";
         }
     }
-    public void Synchronize(OptionsJson json){
-        for (OptionJson option_json: json.values){
+    public void Synchronize(OptionsJson json) {
+        for (OptionJson option_json : json.values) {
             // найти опцию по началу
             CompilerOption compilerOption = findByJson(option_json);
-            if (compilerOption!=null){
+            if (compilerOption != null) {
                 compilerOption.select(true);
                 compilerOption.parameterValue = option_json.value;
             }
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java b/src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java
index cf9af4ad..a838aece 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java
@@ -1,7 +1,5 @@
 package _VisualDVM.GlobalData.CompilerOption.UI;
-import Common.Database.Tables.DataSet;
 import Common.Passes.Pass;
-import Common.Utils.Utils_;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
@@ -37,7 +35,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
     protected DataMenuBar createMenuBar() {
         DataMenuBar res = super.createMenuBar();
         res.addPasses(
-                new Pass<OptionsLine>(){
+                new Pass<OptionsLine>() {
                     @Override
                     public String getIconPath() {
                         return "/Common/icons/RedAdd.png";
@@ -53,9 +51,9 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
                     @Override
                     protected boolean canStart(Object... args) throws Exception {
                         Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
-                        if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())){
-                            target= new OptionsLine((OptionsJson) pass.target);
-                            target.id = ((OptionsLinesSet)dataSource).maxId++;
+                        if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())) {
+                            target = new OptionsLine((OptionsJson) pass.target);
+                            target.id = ((OptionsLinesSet) dataSource).maxId++;
                             return true;
                         }
                         return false;
@@ -69,7 +67,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
                         dataSource.ShowUI(target.getPK());
                     }
                 },
-                new Pass<OptionsLine>(){
+                new Pass<OptionsLine>() {
                     @Override
                     public String getIconPath() {
                         return "/Common/icons/Edit.png";
@@ -87,7 +85,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
                         if (dataSource.getUI().CheckCurrent(Log)) {
                             target = dataSource.getUI().getCurrent();
                             Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
-                            if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)){
+                            if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)) {
                                 return true;
                             }
                         }
@@ -95,14 +93,13 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
                     }
                     @Override
                     protected void body() throws Exception {
-
                     }
                     @Override
                     protected void showFinish() throws Exception {
                         dataSource.ShowUI(target.getPK());
                     }
                 },
-                new Pass<OptionsLine>(){
+                new Pass<OptionsLine>() {
                     @Override
                     public String getIconPath() {
                         return "/Common/icons/Delete.png";
diff --git a/src/_VisualDVM/GlobalData/GlobalDatabase.java b/src/_VisualDVM/GlobalData/GlobalDatabase.java
index cf1a0ed4..e15a8d6c 100644
--- a/src/_VisualDVM/GlobalData/GlobalDatabase.java
+++ b/src/_VisualDVM/GlobalData/GlobalDatabase.java
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData;
 import Common.CommonConstants;
 import Common.Database.VisualiserDatabase;
 import Common.MainModule_;
-import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
@@ -98,7 +97,6 @@ public class GlobalDatabase extends VisualiserDatabase {
     //--
     //проверить, есть ли профиль с таким же набором настроек.
     public SapforProfile checkProfileForCurrentSettings() {
-
         LinkedHashMap<String, String> current_values = Global.mainModule.getProject().sapforProperties.toMap();
         for (SapforProfile profile : sapforProfiles.Data.values()) {
             //--получить все настройки профиля
@@ -152,9 +150,9 @@ public class GlobalDatabase extends VisualiserDatabase {
         Insert(profile);
         insertProfileSettings(profile);
     }
-    public SapforProfile getDefaultSapforProfile(){
-        for (SapforProfile sapforProfile: sapforProfiles.Data.values()){
-            if (sapforProfile.isAuto!=0)
+    public SapforProfile getDefaultSapforProfile() {
+        for (SapforProfile sapforProfile : sapforProfiles.Data.values()) {
+            if (sapforProfile.isAuto != 0)
                 return sapforProfile;
         }
         return null;
diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java b/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java
index 205bb014..55ca8429 100644
--- a/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java
+++ b/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java
@@ -33,8 +33,8 @@ public class MachineFields implements DialogFields {
         //-
         cbMachineType = new JComboBox<>();
         cbMachineType.addItem(MachineType.Server);
-      //  cbMachineType.addItem(MachineType.MVS_cluster);
-      // cbMachineType.addItem(MachineType.Local);
+        //  cbMachineType.addItem(MachineType.MVS_cluster);
+        // cbMachineType.addItem(MachineType.Local);
     }
     @Override
     public Component getContent() {
diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
index c8ed6e35..48992cdc 100644
--- a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
+++ b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
@@ -24,7 +24,7 @@ public class MachinesForm extends DataSetControlForm<Machine> {
                         return object.name;
                     }
                 },
-        new ColumnInfo<Machine>("URL") {
+                new ColumnInfo<Machine>("URL") {
                     @Override
                     public Object getFieldAt(Machine object) {
                         return object.getURL();
diff --git a/src/_VisualDVM/GlobalData/Makefile/UI/MakefilePreviewForm.java b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilePreviewForm.java
index 0bf8b463..fe0027d0 100644
--- a/src/_VisualDVM/GlobalData/Makefile/UI/MakefilePreviewForm.java
+++ b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilePreviewForm.java
@@ -1,6 +1,6 @@
 package _VisualDVM.GlobalData.Makefile.UI;
+import Common.Visual.Editor.Viewer;
 import Common.Visual.Windows.Dialog.Text.TextDialog;
-import _VisualDVM.Visual.Editor.Viewer;
 public class MakefilePreviewForm extends TextDialog<Viewer> {
     public MakefilePreviewForm() {
         super(Viewer.class);
diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
index 34af35be..22f62ae7 100644
--- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
+++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
@@ -42,7 +42,7 @@ public class ModuleAnchestorFields implements DialogFields {
             public void actionPerformed(ActionEvent e) {
                 Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
                 if (pass.Do(compiler)) {
-                    UI.TrySelect(cbFlags, ((OptionsJson)pass.target).toLine());
+                    UI.TrySelect(cbFlags, ((OptionsJson) pass.target).toLine());
                 }
             }
         });
@@ -60,7 +60,7 @@ public class ModuleAnchestorFields implements DialogFields {
                 ((Module) target).language;
         cbCompilers.addActionListener(e -> {
             if (cbCompilers.getSelectedItem() instanceof Compiler) {
-               Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
+                Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
                 UI.TrySelect(cbCommands,
                         linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName));
             }
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
index 60cfac4a..4c2f3984 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
@@ -45,8 +45,8 @@ public abstract class LinuxLocalTaskSupervisor<T extends Task> extends LocalTask
     @Override
     public void WaitForTask() throws Exception {
         if (isTaskActive()) {
-          //  if (task.PID.isEmpty())
-          //      throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
+            //  if (task.PID.isEmpty())
+            //      throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
             task.StartDate = (new Date()).getTime();
             pass.ShowMessage1("Задача активна, идентификатор " + Utils_.Brackets(task.PID));
             RefreshProgress();
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
index 9df929de..77d38e0a 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
@@ -18,7 +18,7 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
         String env = String.join(" ", MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().getEnvList());
         if (!env.isEmpty()) res = env + " " + res;
         //--
-      //  task.PID =
+        //  task.PID =
         pass.user.connection.startShellProcess(getRemoteProject(), "PID", res);
         task.state = TaskState.Running;
     }
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
index 54a06202..90a9853e 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
@@ -113,8 +113,8 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
     }
     public void WaitForTask() throws Exception {
         if (isTaskActive()) {
-          //  if (task.PID.isEmpty())
-           //     throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
+            //  if (task.PID.isEmpty())
+            //     throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
             task.StartDate = (new Date()).getTime();
             pass.ShowMessage1("Задача активна");//, идентификатор " + Utils_.Brackets(task.PID));
             RefreshProgress();
diff --git a/src/_VisualDVM/GlobalData/User/UI/UsersForm.java b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
index 87ef5740..2932bce9 100644
--- a/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
+++ b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
@@ -48,7 +48,7 @@ public class UsersForm extends DataSetControlForm<User> {
     protected void ShowNoCurrentObject() throws Exception {
         super.ShowNoCurrentObject();
         Global.mainModule.getUI().mainMenuBar.ShowNoUser();
-       // Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
+        // Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
     }
     @Override
     public PassCode_ getDeletePassCode() {
diff --git a/src/_VisualDVM/Passes/All/AddBugReport.java b/src/_VisualDVM/Passes/All/AddBugReport.java
index 4566cfca..46d18ed4 100644
--- a/src/_VisualDVM/Passes/All/AddBugReport.java
+++ b/src/_VisualDVM/Passes/All/AddBugReport.java
@@ -6,8 +6,8 @@ import Common.Visual.UI;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.ComponentsServer.BugReport.BugReportState;
 import _VisualDVM.ComponentsServer.Component.ComponentType;
-import _VisualDVM.Global;
 import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
+import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 
 import java.io.File;
diff --git a/src/_VisualDVM/Passes/All/AppendBugReportComment.java b/src/_VisualDVM/Passes/All/AppendBugReportComment.java
index f588f2d1..bfcd13a2 100644
--- a/src/_VisualDVM/Passes/All/AppendBugReportComment.java
+++ b/src/_VisualDVM/Passes/All/AppendBugReportComment.java
@@ -13,6 +13,6 @@ public class AppendBugReportComment extends AppendBugReportField {
     }
     @Override
     protected boolean canUpdate() {
-        return target.canAppend(Global.mainModule.getAccount(),Log);
+        return target.canAppend(Global.mainModule.getAccount(), Log);
     }
 }
diff --git a/src/_VisualDVM/Passes/All/ArchivesBackupPass.java b/src/_VisualDVM/Passes/All/ArchivesBackupPass.java
index cd7ef10e..d404aa18 100644
--- a/src/_VisualDVM/Passes/All/ArchivesBackupPass.java
+++ b/src/_VisualDVM/Passes/All/ArchivesBackupPass.java
@@ -1,6 +1,4 @@
 package _VisualDVM.Passes.All;
-import Common.Utils.Utils_;
-import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.GlobalData.User.User;
@@ -8,7 +6,6 @@ import _VisualDVM.Passes.SSH.ConnectionPass;
 import com.jcraft.jsch.ChannelSftp;
 
 import java.io.File;
-import java.nio.file.Paths;
 import java.util.Comparator;
 import java.util.Vector;
 public class ArchivesBackupPass extends ConnectionPass<File> {
@@ -26,7 +23,7 @@ public class ArchivesBackupPass extends ConnectionPass<File> {
     }
     @Override
     protected void ServerAction() throws Exception {
-        RemoteFile workspace =  new RemoteFile(user.connection.sftpChannel.getHome(), "_sapfor_x64_backups", true);
+        RemoteFile workspace = new RemoteFile(user.connection.sftpChannel.getHome(), "_sapfor_x64_backups", true);
         user.connection.MKDIR(workspace);
         RemoteFile dst = new RemoteFile(workspace.full_name, src.getName());
         user.connection.putSingleFile(src, dst);
diff --git a/src/_VisualDVM/Passes/All/BuildComponent.java b/src/_VisualDVM/Passes/All/BuildComponent.java
index 5187b0d9..a234bab2 100644
--- a/src/_VisualDVM/Passes/All/BuildComponent.java
+++ b/src/_VisualDVM/Passes/All/BuildComponent.java
@@ -31,9 +31,9 @@ public class BuildComponent extends ProcessPass<Component> {
     @Override
     protected void body() throws Exception {
         ShowMessage1("Сборка " + target.getComponentType().getDescription());
-        if (target.getComponentType().equals(ComponentType.Sapfor_F)){
+        if (target.getComponentType().equals(ComponentType.Sapfor_F)) {
             File RepoSapfor = new File(Global.RepoDirectory, "SAPFOR");
-            File installationDirectory = new File(RepoSapfor,"install");
+            File installationDirectory = new File(RepoSapfor, "install");
             Utils_.CheckAndCleanDirectory(installationDirectory);
         }
         PerformScript(target.getAssemblyCommand());
diff --git a/src/_VisualDVM/Passes/All/CheckAccount.java b/src/_VisualDVM/Passes/All/CheckAccount.java
index 2ac58df9..3e475747 100644
--- a/src/_VisualDVM/Passes/All/CheckAccount.java
+++ b/src/_VisualDVM/Passes/All/CheckAccount.java
@@ -1,9 +1,9 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
+import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
-import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
@@ -11,6 +11,7 @@ import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 public class CheckAccount extends ComponentsServerPass {
+    File keyFile;
     @Override
     public String getIconPath() {
         return "/icons/Registry.png";
@@ -19,12 +20,12 @@ public class CheckAccount extends ComponentsServerPass {
     protected boolean isSafe() {
         return false;
     }
-    File keyFile;
-    void confirmEmail() throws Exception{
-        ConfirmEmail confirmEmailPass = (ConfirmEmail) Global.mainModule.getPass(PassCode.ConfirmEmail);;
+    void confirmEmail() throws Exception {
+        ConfirmEmail confirmEmailPass = (ConfirmEmail) Global.mainModule.getPass(PassCode.ConfirmEmail);
+        ;
         if (confirmEmailPass.Do(Global.mainModule.getAccount())) {
             //подтвердили почту. теперь проверяем ее роль на сервере. если на сервере нет акка будет создан
-            if (SendRequest(ServerCode.GetUserAccountByEmail, "",Global.mainModule.getAccount())){
+            if (SendRequest(ServerCode.GetUserAccountByEmail, "", Global.mainModule.getAccount())) {
                 Global.mainModule.setAccount((UserAccount) request.server_response.object);
                 FileUtils.writeStringToFile(keyFile, request.server_response.arg);
             }
@@ -39,19 +40,19 @@ public class CheckAccount extends ComponentsServerPass {
         //1. Ищем ключ.
         if (keyFile.exists()) {
             //ключ есть. проверить его актуальность.
-            String key =  FileUtils.readFileToString(keyFile);
-            if (SendRequest(ServerCode.GetUserAccountByKey,key)){
-                if (request.server_response.object!=null){
+            String key = FileUtils.readFileToString(keyFile);
+            if (SendRequest(ServerCode.GetUserAccountByKey, key)) {
+                if (request.server_response.object != null) {
                     //ключ актуальный.
                     Global.mainModule.setAccount((UserAccount) request.server_response.object);
-                }else {
+                } else {
                     //ключ неактуальный. регистрируемся по новой.
                     UI.Error("Текущий ключ неверен. Он будет удален.");
                     Utils_.forceDeleteWithCheck(keyFile);
                     confirmEmail();
                 }
             }
-        }else {
+        } else {
             confirmEmail();
         }
         return !Global.mainModule.getAccount().role.equals(AccountRole.Undefined);
diff --git a/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java b/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
index 4dbe042c..652f2b96 100644
--- a/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
+++ b/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
@@ -10,7 +10,7 @@ public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspa
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = null;
-        if (Global.mainModule.getAccount().CheckRegistered(Log)){
+        if (Global.mainModule.getAccount().CheckRegistered(Log)) {
             String email = Global.mainModule.getAccount().email;
             String machineURL = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().getURL();
             String login = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent().login;
@@ -18,7 +18,8 @@ public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspa
                 target = (SubscriberWorkspace) request.server_response.object;
                 return true;
             }
-        };
+        }
+        ;
         return false;
     }
 }
diff --git a/src/_VisualDVM/Passes/All/ComponentsServerBackUp.java b/src/_VisualDVM/Passes/All/ComponentsServerBackUp.java
index 4cc85bc5..4d6a130c 100644
--- a/src/_VisualDVM/Passes/All/ComponentsServerBackUp.java
+++ b/src/_VisualDVM/Passes/All/ComponentsServerBackUp.java
@@ -9,6 +9,6 @@ public class ComponentsServerBackUp extends ComponentsServerPass {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        return Global.mainModule.getAccount().isAdmin()&&SendRequest(ServerCode.CreateBackUp,"", true);
+        return Global.mainModule.getAccount().isAdmin() && SendRequest(ServerCode.CreateBackUp, "", true);
     }
 }
diff --git a/src/_VisualDVM/Passes/All/ConfirmEmail.java b/src/_VisualDVM/Passes/All/ConfirmEmail.java
index e28d199f..2f3959ba 100644
--- a/src/_VisualDVM/Passes/All/ConfirmEmail.java
+++ b/src/_VisualDVM/Passes/All/ConfirmEmail.java
@@ -3,7 +3,6 @@ import Common.Utils.Utils_;
 import Common.Visual.UI;
 import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountDialog;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
-import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
@@ -32,7 +31,7 @@ public class ConfirmEmail extends ComponentsServerPass<UserAccount> {
                 return false;
             }
             password = String.valueOf(getRandomIntegerBetweenRange(1111, 9999));
-            return  SendRequest(ServerCode.Email,
+            return SendRequest(ServerCode.Email,
                     target.email,
                     new EmailMessage("Код подтверждения визуализатора для: " + Utils_.Brackets(target.name), password));
         }
diff --git a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
index de2196fc..2477886e 100644
--- a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
+++ b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
@@ -18,7 +18,7 @@ public class ConvertCorrectnessTests extends TestingServerPass<File> {
             Log.Writeln_("Вы не являетесь администратором");
             return false;
         }
-        return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.")&&
+        return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.") &&
                 SendRequest(ServerCode.RefreshDVMTests, "", null);
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
index bcb3a9fa..2cee4c72 100644
--- a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
+++ b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
@@ -168,7 +168,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
             filesNames.add(projectFile.file.getName());
             filesJson.values.add(new TestFileJson(projectFile));
         }
-        target.packedFilesJson=Utils_.gson.toJson(filesJson);
+        target.packedFilesJson = Utils_.gson.toJson(filesJson);
         return true;
     }
     public boolean isNotExcluded(ProjectFile projectFile) {
diff --git a/src/_VisualDVM/Passes/All/CreateTestFromProject.java b/src/_VisualDVM/Passes/All/CreateTestFromProject.java
index f01b5453..8ac5745e 100644
--- a/src/_VisualDVM/Passes/All/CreateTestFromProject.java
+++ b/src/_VisualDVM/Passes/All/CreateTestFromProject.java
@@ -24,8 +24,7 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
                     return true;
                 }
             }
-        }
-        else {
+        } else {
             project = (db_project_info) args[0];
             group = (Group) args[1];
             //если проект не текущий, освежить его бд.
diff --git a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
index 558a77a7..a3427736 100644
--- a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -47,7 +47,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
         }
         //---
         return UI.Question("В группу " + Utils_.Brackets(group.description) +
-                "\nбудет добавлено " + target.size() + " тестов.\nПродолжить")&&
+                "\nбудет добавлено " + target.size() + " тестов.\nПродолжить") &&
                 SendRequest(ServerCode.PublishObjects, null, target);
     }
 }
diff --git a/src/_VisualDVM/Passes/All/DVMConvertProject.java b/src/_VisualDVM/Passes/All/DVMConvertProject.java
index d4d7bf31..8214978a 100644
--- a/src/_VisualDVM/Passes/All/DVMConvertProject.java
+++ b/src/_VisualDVM/Passes/All/DVMConvertProject.java
@@ -72,7 +72,7 @@ public class DVMConvertProject extends ComponentsServerPass<db_project_info> {
             unit_args.add(target.languageName.toString());
             unit_args.add(target.sapforProperties.DVMConvertationOptions);
             unit_args.addAll(programsNames);
-            return SendRequest(ServerCode.DVMConvertProject, String.join("\n", unit_args),Utils_.fileToBytes(archive));
+            return SendRequest(ServerCode.DVMConvertProject, String.join("\n", unit_args), Utils_.fileToBytes(archive));
             //--
         }
         return false;
diff --git a/src/_VisualDVM/Passes/All/DeleteBugReport.java b/src/_VisualDVM/Passes/All/DeleteBugReport.java
index ff84e2d1..29ee343c 100644
--- a/src/_VisualDVM/Passes/All/DeleteBugReport.java
+++ b/src/_VisualDVM/Passes/All/DeleteBugReport.java
@@ -10,7 +10,7 @@ public class DeleteBugReport extends DeleteObjectPass<BugReport> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        return super.canStart(args) && target.canModify(Global.mainModule.getAccount(),Log);
+        return super.canStart(args) && target.canModify(Global.mainModule.getAccount(), Log);
     }
     @Override
     protected void performDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java b/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java
index 59dfd1e6..997c1c91 100644
--- a/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java
+++ b/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java
@@ -8,7 +8,7 @@ public class DeleteBugReportFromServer extends ComponentsServerPass<BugReport> {
     @Override
     protected boolean canStart(Object... args) {
         target = (BugReport) args[0];
-        return !target.state.equals(BugReportState.draft)&&
-                SendRequest(ServerCode.DeleteObjectByPK, "",new Pair<>(BugReport.class, target.getPK()));
+        return !target.state.equals(BugReportState.draft) &&
+                SendRequest(ServerCode.DeleteObjectByPK, "", new Pair<>(BugReport.class, target.getPK()));
     }
 }
diff --git a/src/_VisualDVM/Passes/All/DeleteUserAccount.java b/src/_VisualDVM/Passes/All/DeleteUserAccount.java
index 7fc1f7e8..30d9da2b 100644
--- a/src/_VisualDVM/Passes/All/DeleteUserAccount.java
+++ b/src/_VisualDVM/Passes/All/DeleteUserAccount.java
@@ -6,7 +6,6 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.DeleteServerObject;
 import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
 import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.ServerObjectsCache.VisualCaches;
 import javafx.util.Pair;
 public class DeleteUserAccount extends DeleteServerObject<ComponentsServer, UserAccount> {
     public DeleteUserAccount() {
diff --git a/src/_VisualDVM/Passes/All/DownloadBugReport.java b/src/_VisualDVM/Passes/All/DownloadBugReport.java
index 6bfe82e3..147861f5 100644
--- a/src/_VisualDVM/Passes/All/DownloadBugReport.java
+++ b/src/_VisualDVM/Passes/All/DownloadBugReport.java
@@ -8,7 +8,7 @@ public class DownloadBugReport extends ComponentsServerPass<BugReport> {
     @Override
     protected boolean canStart(Object... args) {
         target = (BugReport) args[0];
-        return !target.getArchiveFile().exists()&&SendRequest(ServerCode.ReceiveBugReport, target.id);
+        return !target.getArchiveFile().exists() && SendRequest(ServerCode.ReceiveBugReport, target.id);
     }
     @Override
     protected void performPreparation() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/DownloadDvmRepository.java b/src/_VisualDVM/Passes/All/DownloadDvmRepository.java
index e3509d0d..764aae2f 100644
--- a/src/_VisualDVM/Passes/All/DownloadDvmRepository.java
+++ b/src/_VisualDVM/Passes/All/DownloadDvmRepository.java
@@ -13,7 +13,6 @@ public class DownloadDvmRepository extends ProcessPass {
     git clone https://dvmguest:dvmguest@dvm.keldysh.ru/dvm-system/dvm /home/testuser/Repo/DVM/
     git clone https://dvmguest:dvmguest@dvm.keldysh.ru/dvm-system/dvm-auto-test /home/testuser/Repo/DVM_AUTO_TEST/
     */
-
     File dvmHome;
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/_VisualDVM/Passes/All/DownloadSapforPackage.java b/src/_VisualDVM/Passes/All/DownloadSapforPackage.java
index d23ec677..46232ebe 100644
--- a/src/_VisualDVM/Passes/All/DownloadSapforPackage.java
+++ b/src/_VisualDVM/Passes/All/DownloadSapforPackage.java
@@ -23,7 +23,7 @@ public class DownloadSapforPackage extends TestingServerPass<SapforPackage> {
         }
         int id = target.id;
         loaded = new File(target.getLocalWorkspace(), CommonConstants.LOADED);
-        return !loaded.exists()&&SendRequest(ServerCode.DownloadSapforPackage, "", id);
+        return !loaded.exists() && SendRequest(ServerCode.DownloadSapforPackage, "", id);
     }
     @Override
     protected void body() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/DownloadTaskTest.java b/src/_VisualDVM/Passes/All/DownloadTaskTest.java
index 7aac3fc4..42c54df4 100644
--- a/src/_VisualDVM/Passes/All/DownloadTaskTest.java
+++ b/src/_VisualDVM/Passes/All/DownloadTaskTest.java
@@ -12,8 +12,8 @@ public class DownloadTaskTest extends DownloadTest {
         target = null;
         if (Global.testingServer.db.dvmRunTasks.getUI().CheckCurrent(Log)) {
             DVMRunTask task = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
-            if (!Global.testingServer.db.tests.containsKey(task.test_id)){
-                Log.Writeln_("Теста с ключом "+task.test_id+" не существует!");
+            if (!Global.testingServer.db.tests.containsKey(task.test_id)) {
+                Log.Writeln_("Теста с ключом " + task.test_id + " не существует!");
                 return false;
             }
             target = Global.testingServer.db.tests.get(task.test_id);
diff --git a/src/_VisualDVM/Passes/All/DownloadTest.java b/src/_VisualDVM/Passes/All/DownloadTest.java
index ad6a1459..198deb45 100644
--- a/src/_VisualDVM/Passes/All/DownloadTest.java
+++ b/src/_VisualDVM/Passes/All/DownloadTest.java
@@ -17,7 +17,7 @@ public class DownloadTest extends TestingServerPass<Test> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        testArchive= null;
+        testArchive = null;
         if (Global.mainModule.getAccount().CheckRegistered(Log) &&
                 Global.testingServer.db.tests.getUI().CheckCurrent(Log)
         ) {
@@ -34,7 +34,7 @@ public class DownloadTest extends TestingServerPass<Test> {
     }
     @Override
     protected void body() throws Exception {
-        testArchive= new File(Global.TempDirectory, Utils_.getDateName(String.valueOf(target.id)));
+        testArchive = new File(Global.TempDirectory, Utils_.getDateName(String.valueOf(target.id)));
         request.server_response.Unpack(testArchive);
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/EditUserAccount.java b/src/_VisualDVM/Passes/All/EditUserAccount.java
index aab337c9..6b0327ca 100644
--- a/src/_VisualDVM/Passes/All/EditUserAccount.java
+++ b/src/_VisualDVM/Passes/All/EditUserAccount.java
@@ -1,15 +1,12 @@
 package _VisualDVM.Passes.All;
 import Common.Database.Database;
-import Common.Passes.Pass;
 import _VisualDVM.ComponentsServer.ComponentsServer;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Passes.Server.EditServerObject;
 import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
 import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.ServerObjectsCache.VisualCaches;
-public class EditUserAccount extends EditServerObject<ComponentsServer,UserAccount> {
+public class EditUserAccount extends EditServerObject<ComponentsServer, UserAccount> {
     public EditUserAccount() {
         super(Global.componentsServer, UserAccount.class);
     }
diff --git a/src/_VisualDVM/Passes/All/Email.java b/src/_VisualDVM/Passes/All/Email.java
index 27be0567..03face1e 100644
--- a/src/_VisualDVM/Passes/All/Email.java
+++ b/src/_VisualDVM/Passes/All/Email.java
@@ -17,17 +17,16 @@ public class Email extends ComponentsServerPass<EmailMessage> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         recipients = null;
-        if (args.length<=1) {
+        if (args.length <= 1) {
             return false;
         }
         target = (EmailMessage) args[0];
-        if (args[1]instanceof Vector) {
+        if (args[1] instanceof Vector) {
             recipients = (Vector<String>) args[1];
             return true;
-        }
-        else if (args[1] instanceof String){
-            recipients= new Vector<>();
-            for (int i=1; i< args.length; ++i){
+        } else if (args[1] instanceof String) {
+            recipients = new Vector<>();
+            for (int i = 1; i < args.length; ++i) {
                 recipients.add((String) args[i]);
             }
             return true;
diff --git a/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java b/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
index 147faf81..2776558c 100644
--- a/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
+++ b/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
@@ -13,7 +13,7 @@ public class GetComponentsBackupsFromServer extends ComponentsServerPass<Vector<
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();
-        return Global.components.getUI().CheckCurrent(Log)&&
+        return Global.components.getUI().CheckCurrent(Log) &&
                 SendRequest(ServerCode.GetComponentsBackups,
                         Global.components.getUI().getCurrent().getComponentType().toString());
     }
diff --git a/src/_VisualDVM/Passes/All/GetDVMPackageCredetials.java b/src/_VisualDVM/Passes/All/GetDVMPackageCredetials.java
index 7bc35bcc..2e063e31 100644
--- a/src/_VisualDVM/Passes/All/GetDVMPackageCredetials.java
+++ b/src/_VisualDVM/Passes/All/GetDVMPackageCredetials.java
@@ -7,7 +7,7 @@ public class GetDVMPackageCredetials extends TestingServerPass<DVMPackageCredent
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = null;
-        return SendRequest(ServerCode.GetDVMPackageCredentials, "", ((DVMPackage)args[0]).id);
+        return SendRequest(ServerCode.GetDVMPackageCredentials, "", ((DVMPackage) args[0]).id);
     }
     @Override
     protected void performDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java b/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
index 76c9aeb0..f86ba78e 100644
--- a/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
+++ b/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
@@ -7,22 +7,22 @@ import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
+    Group group;
+    SapforPackage sapforPackage;
     @Override
     public String getIconPath() {
         return "/Common/icons/Publish.png";
     }
-    Group group;
-    SapforPackage sapforPackage;
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)){
+        if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)) {
             group = Global.testingServer.db.groups.getUI().getCurrent();
             sapforPackage = Global.testingServer.db.sapforPackages.getUI().getCurrent();
-            if (!sapforPackage.state.equals(TasksPackageState.Done)&&!sapforPackage.state.equals(TasksPackageState.DoneWithErrors)){
+            if (!sapforPackage.state.equals(TasksPackageState.Done) && !sapforPackage.state.equals(TasksPackageState.DoneWithErrors)) {
                 Log.Writeln_("Пакет не завершен!");
                 return false;
             }
-            return SendRequest(ServerCode.JoinSapforVersionsToGroup, group.id+"\n"+sapforPackage.id, null);
+            return SendRequest(ServerCode.JoinSapforVersionsToGroup, group.id + "\n" + sapforPackage.id, null);
         }
         return false;
     }
diff --git a/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java b/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
index 6e9226a4..2daff32a 100644
--- a/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
+++ b/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
@@ -24,8 +24,6 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
                 (target = Global.componentsServer.db.bugReports.getUI().getCurrent()).CheckNotDraft(Log)) {
             if (!target.project_version.isEmpty()) {
                 root = new File(Global.visualiser.getDownloadsDirectory(), target.id);
-
-
                 project = new File(root,
                         Utils_.isWindows() ? Utils_.toW(target.project_version) : Utils_.toU(target.project_version)
                 );
@@ -64,7 +62,7 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
     }
     @Override
     protected void performDone() throws Exception {
-        if (Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(project)&&target.visualiser_version<1134)
+        if (Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(project) && target.visualiser_version < 1134)
             Global.mainModule.getPass(PassCode.ApplyBugReportSettings).Do();
     }
 }
diff --git a/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java b/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java
index 1805b58a..386c3df8 100644
--- a/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java
+++ b/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
-import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.Dialog;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -9,11 +8,9 @@ import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
 import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson;
 import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
 import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsFields;
-import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
 import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
-import java.util.Vector;
 public class PickCompilerEnvironmentsForTesting extends Pass<EnvironmentsJson> {
     Compiler compiler = null;
     //-
@@ -32,7 +29,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass<EnvironmentsJson> {
         if (!(compiler.helpLoaded || Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, false)))
             return false;
         compiler.environments.Reset();
-        if (args.length>1){
+        if (args.length > 1) {
             target = (EnvironmentsJson) args[1];
             compiler.environments.Synchronize(target);
         }
@@ -61,7 +58,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass<EnvironmentsJson> {
     protected void body() throws Exception {
         target.values.clear();
         for (CompilerEnvironment compilerEnv : compiler.environments.Data.values()) {
-            if (compilerEnv.isSelected()){
+            if (compilerEnv.isSelected()) {
                 target.values.add(new EnvironmentJson(compilerEnv));
             }
         }
diff --git a/src/_VisualDVM/Passes/All/PickCompilerOptions.java b/src/_VisualDVM/Passes/All/PickCompilerOptions.java
index 50cd4e6e..ad5a5b98 100644
--- a/src/_VisualDVM/Passes/All/PickCompilerOptions.java
+++ b/src/_VisualDVM/Passes/All/PickCompilerOptions.java
@@ -29,8 +29,8 @@ public class PickCompilerOptions extends Pass<OptionsJson> {
         if (!(compiler.helpLoaded || Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, false)))
             return false;
         compiler.options.Reset();
-        if (args.length>1){
-            target =(OptionsJson) args[1];
+        if (args.length > 1) {
+            target = (OptionsJson) args[1];
             compiler.options.Synchronize(target);
         }
         Dialog<String, CompilerOptionsFields> dialog = new Dialog<String, CompilerOptionsFields>(CompilerOptionsFields.class) {
diff --git a/src/_VisualDVM/Passes/All/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java
index 84807032..5afc0e63 100644
--- a/src/_VisualDVM/Passes/All/PublishBugReport.java
+++ b/src/_VisualDVM/Passes/All/PublishBugReport.java
@@ -42,8 +42,8 @@ public class PublishBugReport extends Pass<BugReport> {
     }
     @Override
     protected void body() throws Exception {
-       // target.targets = BugReport.getPackedTargets();
-      //  target.saveRecipientsAsJson(Global.componentsServer.db.subscribers.getUI().getSelectedItems());
+        // target.targets = BugReport.getPackedTargets();
+        //  target.saveRecipientsAsJson(Global.componentsServer.db.subscribers.getUI().getSelectedItems());
         target.change_date = new Date().getTime();
         Global.componentsServer.db.Update(target);
         target.state = BugReportState.active;
diff --git a/src/_VisualDVM/Passes/All/PublishComponent.java b/src/_VisualDVM/Passes/All/PublishComponent.java
index c15da6a8..b4d93545 100644
--- a/src/_VisualDVM/Passes/All/PublishComponent.java
+++ b/src/_VisualDVM/Passes/All/PublishComponent.java
@@ -1,5 +1,4 @@
 package _VisualDVM.Passes.All;
-import Common.Passes.Pass;
 import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.Component.Component;
 import _VisualDVM.ComponentsServer.Component.ComponentType;
@@ -10,11 +9,9 @@ import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
-import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
 
 import java.util.Date;
-import java.util.Vector;
 public class PublishComponent extends ComponentsServerPass<Component> {
     String version_mail_header = "";
     String version_text = "";
@@ -64,13 +61,13 @@ public class PublishComponent extends ComponentsServerPass<Component> {
                         Constants.separator, ""
                 );
                 //--
-                ComponentPublicationInfoJson info=new ComponentPublicationInfoJson(target);
+                ComponentPublicationInfoJson info = new ComponentPublicationInfoJson(target);
                 info.changeRecord = change_record;
-                info.needsUpdateMinimalVersion =  f.fields.cbUpdateMinimalVersion.isSelected();
+                info.needsUpdateMinimalVersion = f.fields.cbUpdateMinimalVersion.isSelected();
                 info.needsEmail = f.fields.cbNeedsBroadcast.isSelected();
-                info.needsSendFile =f.fields.cbForceMail.isSelected();
+                info.needsSendFile = f.fields.cbForceMail.isSelected();
                 //--
-                return SendRequest(ServerCode.UpdateComponent, "",info);
+                return SendRequest(ServerCode.UpdateComponent, "", info);
             }
         }
         return false;
diff --git a/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java b/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
index d9ba20e2..d7e607fa 100644
--- a/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
+++ b/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
@@ -112,7 +112,7 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
     }
     @Override
     protected void performDone() throws Exception {
-        SendRequest(ServerCode.ReplaceDVMPackageResults,"",
+        SendRequest(ServerCode.ReplaceDVMPackageResults, "",
                 new Pair<>(
                         target,
                         Utils_.fileToBytes(target.getJsonFile())
diff --git a/src/_VisualDVM/Passes/All/ReplaceTestProject.java b/src/_VisualDVM/Passes/All/ReplaceTestProject.java
index d39a84a3..cac2a256 100644
--- a/src/_VisualDVM/Passes/All/ReplaceTestProject.java
+++ b/src/_VisualDVM/Passes/All/ReplaceTestProject.java
@@ -13,7 +13,7 @@ public class ReplaceTestProject extends CreateTestFromProject {
     }
     @Override
     protected void performDone() throws Exception {
-        new TestingServerPass(){
+        new TestingServerPass() {
             @Override
             public String getDescription() {
                 return "";
diff --git a/src/_VisualDVM/Passes/All/SPF_InlineProcedure.java b/src/_VisualDVM/Passes/All/SPF_InlineProcedure.java
index c3d984bc..c4a43816 100644
--- a/src/_VisualDVM/Passes/All/SPF_InlineProcedure.java
+++ b/src/_VisualDVM/Passes/All/SPF_InlineProcedure.java
@@ -15,7 +15,7 @@ public class SPF_InlineProcedure extends SapforFilesModification {
         if (super.canStart(args) && (call = (args.length > 0) ? (FuncCall) args[0] : null) != null) {
             addOpt1 = call.funcName + "|" + Global.mainModule.getFile().name;
             addOpt2 = String.valueOf(call.parent_offset);
-            target.sapforProperties.PARSE_FOR_INLINE=true;
+            target.sapforProperties.PARSE_FOR_INLINE = true;
             target.sapforProperties.Update();
             SPF_ParseFilesWithOrder.silent = true;
             return Global.mainModule.getPass(PassCode.SPF_ParseFilesWithOrder).Do();
diff --git a/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java b/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java
index 6fed3667..caa6cc5d 100644
--- a/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java
+++ b/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java
@@ -41,7 +41,7 @@ public class SPF_InlineProcedures extends SapforTransformation {
                 return false;
             }
             Options = Utils_.toU(String.join("|", Result));
-            target.sapforProperties.PARSE_FOR_INLINE=true;
+            target.sapforProperties.PARSE_FOR_INLINE = true;
             target.sapforProperties.Update();
             SPF_ParseFilesWithOrder.silent = true;
             return Global.mainModule.getPass(PassCode.SPF_ParseFilesWithOrder).Do(false);
diff --git a/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java b/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java
index 3ce60112..a1b92c81 100644
--- a/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java
+++ b/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java
@@ -71,7 +71,7 @@ public class SPF_InlineProceduresH extends SapforTransformation {
                 }
             }
             Options = Utils_.toU(String.join("|", Result));
-            target.sapforProperties.PARSE_FOR_INLINE=true;
+            target.sapforProperties.PARSE_FOR_INLINE = true;
             target.sapforProperties.Update();
             SPF_ParseFilesWithOrder.silent = true;
             return Global.mainModule.getPass(PassCode.SPF_ParseFilesWithOrder).Do();
diff --git a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
index 87fd8751..06b76003 100644
--- a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
+++ b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
@@ -172,7 +172,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
      */
     @Override
     protected void performFinish() throws Exception {
-        target.sapforProperties.PARSE_FOR_INLINE=false;
+        target.sapforProperties.PARSE_FOR_INLINE = false;
         target.sapforProperties.Update();
         super.performFinish();
     }
diff --git a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
index ffa1f599..75c111ae 100644
--- a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
+++ b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
@@ -15,6 +15,5 @@ public class SaveBugReportRecipients extends UpdateBugReportField {
     protected boolean canStart(Object... args) throws Exception {
         return super.canStart("packedRecipientsJson",
                 Utils_.gson.toJson(new RecipientsJson(Global.componentsServer.db.recipients.getUI().getSelectedItems())));
-
     }
 }
diff --git a/src/_VisualDVM/Passes/All/SaveGraph.java b/src/_VisualDVM/Passes/All/SaveGraph.java
index 5f0f5cd2..b497e82d 100644
--- a/src/_VisualDVM/Passes/All/SaveGraph.java
+++ b/src/_VisualDVM/Passes/All/SaveGraph.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
-import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
@@ -20,7 +19,6 @@ import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.net.URLEncoder;
-import java.nio.file.Paths;
 public class SaveGraph extends Pass<File> {
     VDirectoryChooser directoryChooser = new VDirectoryChooser("Выбор папки для сохранения скриншота графа функций");
     FunctionsGraphForm graphForm = null;
@@ -43,9 +41,9 @@ public class SaveGraph extends Pass<File> {
         File dir = directoryChooser.ShowDialog();
         if (dir == null) {
             Log.Writeln_("Папка не выбрана.");
-        }else {
+        } else {
             Global.mainModule.getPass(PassCode.UpdateProperty).Do("DocumentsDirectory", dir.getAbsolutePath());
-            target = new File(dir, Utils_.getDateName("Graph")+".png");
+            target = new File(dir, Utils_.getDateName("Graph") + ".png");
             return true;
         }
         return false;
@@ -72,15 +70,16 @@ public class SaveGraph extends Pass<File> {
     @Override
     protected void showDone() throws Exception {
         if (UI.Question("Изображение графа процедур успешно сохранено\n"
-                 + "в папке " + Utils_.Brackets(target.getParent())+"\n"
-                 + "под именем "+Utils_.Brackets(target.getName())+"\n"
-                 + "Открыть его"
-                )){
+                + "в папке " + Utils_.Brackets(target.getParent()) + "\n"
+                + "под именем " + Utils_.Brackets(target.getName()) + "\n"
+                + "Открыть его"
+        )) {
             try {
                 Desktop.getDesktop().open(target);
             } catch (Exception ex) {
                 Utils_.MainLog.PrintException(ex);
             }
-        };
+        }
+        ;
     }
 }
diff --git a/src/_VisualDVM/Passes/All/SendBugReport.java b/src/_VisualDVM/Passes/All/SendBugReport.java
index ceb04be6..0d294420 100644
--- a/src/_VisualDVM/Passes/All/SendBugReport.java
+++ b/src/_VisualDVM/Passes/All/SendBugReport.java
@@ -10,7 +10,7 @@ public class SendBugReport extends ComponentsServerPass<BugReport> {
     protected boolean canStart(Object... args) throws Exception {
         target = Global.componentsServer.db.bugReports.getUI().getCurrent();
         if (!target.project_version.isEmpty())
-            target.packed_archive =  Utils_.fileToBytes(target.getArchiveFile());
+            target.packed_archive = Utils_.fileToBytes(target.getArchiveFile());
         return SendRequest(ServerCode.PublishObject, "", target);
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java b/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java
index 08360d65..8f51ecb9 100644
--- a/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java
+++ b/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java
@@ -10,13 +10,13 @@ public class SetDefaultSapforProfile extends Pass<SapforProfile> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = (SapforProfile) args[0];
-        return UI.Question("Назначить профиль "+ Utils_.Brackets(target.description)+" профилем по умолчанию");
+        return UI.Question("Назначить профиль " + Utils_.Brackets(target.description) + " профилем по умолчанию");
     }
     @Override
     protected void body() throws Exception {
         Vector<SapforProfile> toDrop = new Vector<>();
         for (SapforProfile sapforProfile : Global.mainModule.getDb().sapforProfiles.Data.values()) {
-            if (sapforProfile.id!=target.id) {
+            if (sapforProfile.id != target.id) {
                 if (sapforProfile.isAuto != 0) {
                     sapforProfile.isAuto = 0;
                     toDrop.add(sapforProfile);
diff --git a/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java b/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java
index 22d5638a..4fc2e598 100644
--- a/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java
+++ b/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java
@@ -28,7 +28,7 @@ public class SetSapforConfigurationEthalon extends EditSapforConfiguration {
             if (configurationJson.id != target.id) {
                 Log.Writeln_(
                         "Конфигурация пакета " + Utils_.Brackets(configurationJson.description) +
-                        "\nне совпадает с текущей конфигурацией " + Utils_.Brackets(target.description) + "!");
+                                "\nне совпадает с текущей конфигурацией " + Utils_.Brackets(target.description) + "!");
                 return false;
             }
             //-
diff --git a/src/_VisualDVM/Passes/All/ShowCompilerHelp.java b/src/_VisualDVM/Passes/All/ShowCompilerHelp.java
index 254a3c92..6308afe6 100644
--- a/src/_VisualDVM/Passes/All/ShowCompilerHelp.java
+++ b/src/_VisualDVM/Passes/All/ShowCompilerHelp.java
@@ -1,12 +1,12 @@
 package _VisualDVM.Passes.All;
 import Common.MainModule_;
 import Common.Passes.Pass;
+import Common.Visual.Windows.ReadOnlyMultilineTextForm;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
 public class ShowCompilerHelp extends Pass<String> {
     Pass<String> subpass;
     Compiler compiler;
diff --git a/src/_VisualDVM/Passes/All/ShowCompilerVersion.java b/src/_VisualDVM/Passes/All/ShowCompilerVersion.java
index 14b2432d..a5ac45e7 100644
--- a/src/_VisualDVM/Passes/All/ShowCompilerVersion.java
+++ b/src/_VisualDVM/Passes/All/ShowCompilerVersion.java
@@ -1,12 +1,12 @@
 package _VisualDVM.Passes.All;
 import Common.MainModule_;
 import Common.Passes.Pass;
+import Common.Visual.Windows.ReadOnlyMultilineTextForm;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
 public class ShowCompilerVersion extends Pass<String> {
     Pass<String> subpass;
     boolean needsShow = true;
diff --git a/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
index cfc96221..82ace2ef 100644
--- a/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
+++ b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
@@ -1,11 +1,11 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import Common.Visual.Windows.ReadOnlyMultilineTextForm;
 import _VisualDVM.ComponentsServer.Component.Component;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
diff --git a/src/_VisualDVM/Passes/All/ShowTestingServerFile.java b/src/_VisualDVM/Passes/All/ShowTestingServerFile.java
index 8d0ef0a7..9bcf0a55 100644
--- a/src/_VisualDVM/Passes/All/ShowTestingServerFile.java
+++ b/src/_VisualDVM/Passes/All/ShowTestingServerFile.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.PassException;
+import Common.Visual.Windows.ReadOnlyMultilineTextForm;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -14,7 +14,7 @@ public class ShowTestingServerFile extends TestingServerPass<RemoteFile> {
     String title;
     File localFile;
     @Override
-    protected boolean isSafe(){
+    protected boolean isSafe() {
         return false;
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
index 533415f7..ab38845c 100644
--- a/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
+++ b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
@@ -18,6 +18,10 @@ import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 
 import java.util.Vector;
 public class StartSelectedDVMConfigurations extends PublishServerObject<TestingServer, DVMPackage> {
+    //--
+    Machine machine;
+    User user;
+    Compiler compiler;
     public StartSelectedDVMConfigurations() {
         super(Global.testingServer, DVMPackage.class);
     }
@@ -26,16 +30,12 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
         return "/Common/icons/BlueStart.png";
     }
     //--
-    Machine machine;
-    User user;
-    Compiler compiler;
-    //--
     @Override
     protected boolean canStart(Object... args) throws Exception {
         //--
-        machine =null;
-        user= null;
-        compiler =null;
+        machine = null;
+        user = null;
+        compiler = null;
         //--
         if (!Global.mainModule.getAccount().CheckRegistered(Log)) {
             return false;
diff --git a/src/_VisualDVM/Passes/All/SynchronizeCredentials.java b/src/_VisualDVM/Passes/All/SynchronizeCredentials.java
index 4e579925..efae6515 100644
--- a/src/_VisualDVM/Passes/All/SynchronizeCredentials.java
+++ b/src/_VisualDVM/Passes/All/SynchronizeCredentials.java
@@ -14,15 +14,15 @@ public class SynchronizeCredentials extends ComponentsServerPass<Object> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        return  Global.mainModule.getAccount().role.equals(AccountRole.Admin) && SendRequest(ServerCode.ReceiveCredentialsDatabase);
+        return Global.mainModule.getAccount().role.equals(AccountRole.Admin) && SendRequest(ServerCode.ReceiveCredentialsDatabase);
     }
     @Override
     protected void showPreparation() throws Exception {
-         getServer().credentials_db.DropUI();
+        getServer().credentials_db.DropUI();
     }
     @Override
     protected void body() throws Exception {
-          request.server_response.Unpack(new_db_file = Utils.getTempFileName("сdb"));
+        request.server_response.Unpack(new_db_file = Utils.getTempFileName("сdb"));
     }
     @Override
     protected void performDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/SynchronizeTests.java b/src/_VisualDVM/Passes/All/SynchronizeTests.java
index 7d9da833..3aeab85d 100644
--- a/src/_VisualDVM/Passes/All/SynchronizeTests.java
+++ b/src/_VisualDVM/Passes/All/SynchronizeTests.java
@@ -27,7 +27,7 @@ public class SynchronizeTests extends TestingServerPass<Object> {
     }
     @Override
     protected void showPreparation() throws Exception {
-      getServer().db.DropUI();
+        getServer().db.DropUI();
     }
     @Override
     protected void body() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/TestPass.java b/src/_VisualDVM/Passes/All/TestPass.java
index 85347187..7fd58ff3 100644
--- a/src/_VisualDVM/Passes/All/TestPass.java
+++ b/src/_VisualDVM/Passes/All/TestPass.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
-import _VisualDVM.Global;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -10,7 +9,7 @@ public class TestPass extends Pass {
     public static String getMotherboardSN() {
         String result = "";
         try {
-            File file = File.createTempFile("realhowto",".vbs");
+            File file = File.createTempFile("realhowto", ".vbs");
             file.deleteOnExit();
             FileWriter fw = new java.io.FileWriter(file);
             String vbs =
@@ -21,7 +20,6 @@ public class TestPass extends Pass {
                             + "    Wscript.Echo objItem.SerialNumber \n"
                             + "    exit for  ' do the first cpu only! \n"
                             + "Next \n";
-
             fw.write(vbs);
             fw.close();
             Process p = Runtime.getRuntime().exec("cscript //NoLogo " + file.getPath());
@@ -33,18 +31,17 @@ public class TestPass extends Pass {
                 result += line;
             }
             input.close();
-        }
-        catch(Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return result.trim();
     }
     @Override
     protected void body() throws Exception {
-        int a= 1/0;
-      //  System.out.println(Global.componentsServer.credentials_db.userAccounts.getPackedActiveRecipients());
-       // String cpuId = getMotherboardSN();
-       // UI.Info(cpuId);
+        int a = 1 / 0;
+        //  System.out.println(Global.componentsServer.credentials_db.userAccounts.getPackedActiveRecipients());
+        // String cpuId = getMotherboardSN();
+        // UI.Info(cpuId);
         /*
         SystemInfo systemInfo = new SystemInfo();
         HardwareAbstractionLayer hardware = systemInfo.getHardware();
diff --git a/src/_VisualDVM/Passes/All/TestingServerBackUp.java b/src/_VisualDVM/Passes/All/TestingServerBackUp.java
index d7d5a1fe..50f15724 100644
--- a/src/_VisualDVM/Passes/All/TestingServerBackUp.java
+++ b/src/_VisualDVM/Passes/All/TestingServerBackUp.java
@@ -9,6 +9,6 @@ public class TestingServerBackUp extends TestingServerPass {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        return Global.mainModule.getAccount().isAdmin()&&SendRequest(ServerCode.CreateBackUp,"", true);
+        return Global.mainModule.getAccount().isAdmin() && SendRequest(ServerCode.CreateBackUp, "", true);
     }
 }
diff --git a/src/_VisualDVM/Passes/All/UpdateBugReportField.java b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
index 0b46e2e6..c0f3fd81 100644
--- a/src/_VisualDVM/Passes/All/UpdateBugReportField.java
+++ b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
@@ -20,7 +20,7 @@ public class UpdateBugReportField extends ComponentsServerPass<BugReport> {
     String old_comment = "";
     BugReport actual;
     protected boolean canUpdate() {
-        return target.canModify(Global.mainModule.getAccount(),Log);
+        return target.canModify(Global.mainModule.getAccount(), Log);
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
@@ -54,7 +54,7 @@ public class UpdateBugReportField extends ComponentsServerPass<BugReport> {
             getServer().db.bugReports.getUI().RedrawControl();
             Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
         } else {
-            if (canUpdate()&& SendRequest(ServerCode.GetObjectCopyByPK, "", new Pair<>(BugReport.class, target.id))){
+            if (canUpdate() && SendRequest(ServerCode.GetObjectCopyByPK, "", new Pair<>(BugReport.class, target.id))) {
                 actual = (BugReport) request.target;
                 target.SynchronizeFields(actual);
                 for (int i = 0; i < fieldNames.size(); ++i) {
diff --git a/src/_VisualDVM/Passes/All/UpdateProperty.java b/src/_VisualDVM/Passes/All/UpdateProperty.java
index 14147e92..d9dd3458 100644
--- a/src/_VisualDVM/Passes/All/UpdateProperty.java
+++ b/src/_VisualDVM/Passes/All/UpdateProperty.java
@@ -28,15 +28,15 @@ public class UpdateProperty extends Pass<Object> {
         VDirectoryChooser directoryChooser = new VDirectoryChooser("");
         VFileChooser fileChooser = new VFileChooser("", "exe");
         //-
-        if (args.length==1){
-            if (oldValue instanceof Boolean){
-                newValue=!(Boolean)oldValue;
+        if (args.length == 1) {
+            if (oldValue instanceof Boolean) {
+                newValue = !(Boolean) oldValue;
                 return true;
             }
-            switch (name){
+            switch (name) {
                 case "Kernels":
                     if (sliderNumberForm.ShowDialog(description, oldValue, 1, Utils.getMaxKernels()))
-                        newValue=sliderNumberForm.Result;
+                        newValue = sliderNumberForm.Result;
                     break;
                 case "LocalMakePathWindows":
                     fileChooser.setTitle(description);
@@ -46,25 +46,25 @@ public class UpdateProperty extends Pass<Object> {
                     break;
                 case "BugReportsAgeLimit":
                     if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
-                       newValue=sliderNumberForm.Result;
+                        newValue = sliderNumberForm.Result;
                     break;
                 case "FastAccessPassesCount":
                     if (sliderNumberForm.ShowDialog(description, oldValue, 5, 15))
-                        newValue=sliderNumberForm.Result;
+                        newValue = sliderNumberForm.Result;
                     break;
                 case "LastOpenedProjectsCount":
                     SpinnerNumberForm spinnerNumberForm = new SpinnerNumberForm() {
                         @Override
                         public void InitFields() {
                             fields.setModel(new SpinnerNumberModel(
-                                    (int)oldValue,
+                                    (int) oldValue,
                                     1,
                                     50,
                                     1));
                         }
                     };
                     if (spinnerNumberForm.ShowDialog(description, oldValue, 1, 50))
-                        newValue=spinnerNumberForm.Result;
+                        newValue = spinnerNumberForm.Result;
                     break;
                 case "Workspace":
                     directoryChooser.setTitle(description);
@@ -76,10 +76,10 @@ public class UpdateProperty extends Pass<Object> {
                         newValue = dir.getAbsolutePath();
                     break;
             }
-        }else
+        } else
             newValue = args[1];
         //--
-        return newValue!=null&&!newValue.equals(oldValue);
+        return newValue != null && !newValue.equals(oldValue);
     }
     @Override
     protected void body() throws Exception {
@@ -130,7 +130,7 @@ public class UpdateProperty extends Pass<Object> {
                 if (Global.mainModule.HasProject())
                     Global.mainModule.getUI().getMainWindow().getProjectWindow().SwitchScreen(
                             Global.normalProperties.SmallScreen);
-                Global.mainModule.getUI().getMainWindow().getCallbackWindow().SwitchScreen( Global.normalProperties.SmallScreen);
+                Global.mainModule.getUI().getMainWindow().getCallbackWindow().SwitchScreen(Global.normalProperties.SmallScreen);
                 break;
         }
     }
diff --git a/src/_VisualDVM/Passes/All/UpdateSapforProperty.java b/src/_VisualDVM/Passes/All/UpdateSapforProperty.java
index 14199ccd..bfe2b471 100644
--- a/src/_VisualDVM/Passes/All/UpdateSapforProperty.java
+++ b/src/_VisualDVM/Passes/All/UpdateSapforProperty.java
@@ -35,7 +35,8 @@ public class UpdateSapforProperty extends Pass<Object> {
                         if (percentsForm.ShowDialog(description, oldValue))
                             newValue = percentsForm.Result;
                         break;
-                    case "DVMConvertationOptions": case "ANALYSIS_OPTIONS":
+                    case "DVMConvertationOptions":
+                    case "ANALYSIS_OPTIONS":
                         TextFieldDialog textFieldDialog = new TextFieldDialog();
                         if (textFieldDialog.ShowDialog(description, oldValue)) {
                             newValue = textFieldDialog.Result;
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index 421eb094..944c5059 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -356,8 +356,7 @@ public enum PassCode implements PassCode_ {
     DeleteUserAccount,
     GetDVMPackageCredetials,
     ComponentsServerBackUp,
-    TestingServerBackUp
-    ;
+    TestingServerBackUp;
     //--
     @Override
     public String getDescription() {
diff --git a/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java b/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java
index 72158041..307078dc 100644
--- a/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java
+++ b/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java
@@ -27,7 +27,7 @@ public abstract class RepositoryServerSSHPass<S extends RepositoryServer> extend
     protected boolean canStart(Object... args) throws Exception {
         if (!Global.mainModule.getAccount().CheckAdmin(Log))
             return false;
-        if (Global.normalProperties.ServerUserPassword.isEmpty()){
+        if (Global.normalProperties.ServerUserPassword.isEmpty()) {
             Log.Writeln_("Не задан пароль");
             return false;
         }
diff --git a/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java b/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java
index 8cd29e75..1a48971d 100644
--- a/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java
+++ b/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java
@@ -35,7 +35,6 @@ public abstract class OpenSapforVersionPass extends Pass<SapforVersion_json> {
         SapforTask task = target.task;
         ShowMessage1("Построение дерева версий и создание баз данных...");
         File rootHome = new File(Global.visualiser.getDownloadsDirectory(), Utils_.getDateName(task.test_description));
-
         for (SapforVersion_json version_json : task.versions) {
             ShowMessage2(version_json.version);
             version_json.createProject(rootHome);
diff --git a/src/_VisualDVM/Passes/Server/ClientPass.java b/src/_VisualDVM/Passes/Server/ClientPass.java
index 0893b0e3..5b1e15a5 100644
--- a/src/_VisualDVM/Passes/Server/ClientPass.java
+++ b/src/_VisualDVM/Passes/Server/ClientPass.java
@@ -6,16 +6,16 @@ import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 
 import java.io.Serializable;
-public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T> {
+public abstract class ClientPass<S extends RepositoryServer, T> extends Pass<T> {
     protected RepositoryPass request;
-    protected boolean isSafe(){
+    protected boolean isSafe() {
         return true;
     }
     @Override
     protected boolean needsAnimation() {
         return false;
     }
-    protected boolean requestNeedsAnimation(){
+    protected boolean requestNeedsAnimation() {
         return true;
     }
     @Override
@@ -23,9 +23,9 @@ public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T>
         return "";
     }
     protected abstract S getServer();
-    protected boolean SendRequest(ServerCode code_in, String arg_in, Serializable object_in){
+    protected boolean SendRequest(ServerCode code_in, String arg_in, Serializable object_in) {
         request = null;
-        request =  new RepositoryPass(getServer()) {
+        request = new RepositoryPass(getServer()) {
             @Override
             protected boolean needsAnimation() {
                 return requestNeedsAnimation();
@@ -41,9 +41,9 @@ public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T>
             @Override
             protected void ServerAction() throws Exception {
                 if (isSafe())
-                    Command(new SafeServerExchangeUnit(code_in, arg_in,object_in));
+                    Command(new SafeServerExchangeUnit(code_in, arg_in, object_in));
                 else
-                    unsafe_command(new ServerExchangeUnit_2021(code_in,arg_in,object_in)); //только для отдельных команд.
+                    unsafe_command(new ServerExchangeUnit_2021(code_in, arg_in, object_in)); //только для отдельных команд.
                 target = server_response.object;
             }
             @Override
@@ -53,10 +53,10 @@ public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T>
         };
         return request.Do();
     }
-    protected boolean SendRequest(ServerCode code_in, String arg_in){
-        return SendRequest(code_in,arg_in,null);
+    protected boolean SendRequest(ServerCode code_in, String arg_in) {
+        return SendRequest(code_in, arg_in, null);
     }
-    protected boolean SendRequest(ServerCode code_in){
+    protected boolean SendRequest(ServerCode code_in) {
         return SendRequest(code_in, "", null);
     }
 }
diff --git a/src/_VisualDVM/Passes/Server/CloneServerObject.java b/src/_VisualDVM/Passes/Server/CloneServerObject.java
index 1692a1c5..50de417a 100644
--- a/src/_VisualDVM/Passes/Server/CloneServerObject.java
+++ b/src/_VisualDVM/Passes/Server/CloneServerObject.java
@@ -26,13 +26,13 @@ public abstract class CloneServerObject<S extends RepositoryServer, D extends ri
             return false;
         //---------
         pk = null;
-        src= (D) server.db.getTable(currentClass()).getUI().getCurrent();
+        src = (D) server.db.getTable(currentClass()).getUI().getCurrent();
         return true;
     }
     @Override
     protected void ServerAction() throws Exception {
         Command(new SafeServerExchangeUnit(ServerCode.CloneObjectByPK,
-                Global.mainModule.getAccount().name+"\n"+Global.mainModule.getAccount().email,
+                Global.mainModule.getAccount().name + "\n" + Global.mainModule.getAccount().email,
                 new Pair<>(src.getClass(), src.getPK())));
         pk = server_response.object;
     }
diff --git a/src/_VisualDVM/Passes/Server/ComponentsServerPass.java b/src/_VisualDVM/Passes/Server/ComponentsServerPass.java
index d5a1b208..8fd6e3d1 100644
--- a/src/_VisualDVM/Passes/Server/ComponentsServerPass.java
+++ b/src/_VisualDVM/Passes/Server/ComponentsServerPass.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.Server;
 import _VisualDVM.ComponentsServer.ComponentsServer;
 import _VisualDVM.Global;
-public class ComponentsServerPass<T> extends ClientPass<ComponentsServer,T> {
+public class ComponentsServerPass<T> extends ClientPass<ComponentsServer, T> {
     @Override
     protected ComponentsServer getServer() {
         return Global.componentsServer;
diff --git a/src/_VisualDVM/Passes/Server/DeleteServerObjects.java b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java
index a69255e8..795e0bdd 100644
--- a/src/_VisualDVM/Passes/Server/DeleteServerObjects.java
+++ b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java
@@ -46,17 +46,17 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
         Vector<D> selected_or_current_objects = table.getUI().getSelectedOrCurrent();
         Vector<Object> res = new Vector<>(); //ключи объектов после фильтрации.
         Vector<Object> forbidden = new Vector<>();
-        for (D object: selected_or_current_objects){
-            if (object instanceof riDBObject){
+        for (D object : selected_or_current_objects) {
+            if (object instanceof riDBObject) {
                 riDBObject r = (riDBObject) object;
-                if (Global.mainModule.getAccount().CheckAuthorship(r.sender_address,null))
+                if (Global.mainModule.getAccount().CheckAuthorship(r.sender_address, null))
                     res.add(r.getPK());
                 else
                     forbidden.add(r.getPK());
             }
         }
-        if (!forbidden.isEmpty()){
-            Log.Writeln_("У вас нет прав на удаление "+forbidden.size()+" объектов!");
+        if (!forbidden.isEmpty()) {
+            Log.Writeln_("У вас нет прав на удаление " + forbidden.size() + " объектов!");
             return false;
         }
         target = res;
diff --git a/src/_VisualDVM/Passes/Server/RepositoryPass.java b/src/_VisualDVM/Passes/Server/RepositoryPass.java
index 8de2eb81..9b64f7cb 100644
--- a/src/_VisualDVM/Passes/Server/RepositoryPass.java
+++ b/src/_VisualDVM/Passes/Server/RepositoryPass.java
@@ -1,7 +1,6 @@
 package _VisualDVM.Passes.Server;
 import Common.Database.RepositoryRefuseException;
 import Common.Passes.Pass;
-import Common.Visual.UI;
 import _VisualDVM.Constants;
 import _VisualDVM.Repository.Server.RepositoryServer;
 import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
@@ -13,12 +12,12 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.net.*;
 public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass<T> {
-    protected S server;
-    protected ObjectInputStream in = null; // поток чтения из сокета
-    protected ObjectOutputStream out = null; // поток записи в сокет
     //-
     public ServerExchangeUnit_2021 client_request;
     public ServerExchangeUnit_2021 server_response;
+    protected S server;
+    protected ObjectInputStream in = null; // поток чтения из сокета
+    protected ObjectOutputStream out = null; // поток записи в сокет
     //-
     protected Socket clientSocket = null; //сокет для общения
     protected ServerCode ExitCode = ServerCode.Undefined;
diff --git a/src/_VisualDVM/Passes/Server/StartServerPass.java b/src/_VisualDVM/Passes/Server/StartServerPass.java
index 50afd5de..94ad79e3 100644
--- a/src/_VisualDVM/Passes/Server/StartServerPass.java
+++ b/src/_VisualDVM/Passes/Server/StartServerPass.java
@@ -16,6 +16,6 @@ public abstract class StartServerPass<S extends RepositoryServer> extends Reposi
     }
     @Override
     protected void ServerAction() throws Exception {
-       StartServer();
+        StartServer();
     }
 }
diff --git a/src/_VisualDVM/Passes/Server/TestingServerPass.java b/src/_VisualDVM/Passes/Server/TestingServerPass.java
index 19bb4781..2adb0b36 100644
--- a/src/_VisualDVM/Passes/Server/TestingServerPass.java
+++ b/src/_VisualDVM/Passes/Server/TestingServerPass.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.Server;
 import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.Common.TestingServer;
-public class TestingServerPass<T> extends ClientPass<TestingServer,T> {
+public class TestingServerPass<T> extends ClientPass<TestingServer, T> {
     @Override
     protected TestingServer getServer() {
         return Global.testingServer;
diff --git a/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
index bdca25b5..2533a160 100644
--- a/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
+++ b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
@@ -32,7 +32,7 @@ public abstract class ActualizeTestingPackages<P extends TestingPackage> extends
             }
         }
         return (account.role.equals(AccountRole.Admin) || account.role.equals(AccountRole.Developer)) &&
-                !target.isEmpty()&&SendRequest(getCheckCode(), "", target);
+                !target.isEmpty() && SendRequest(getCheckCode(), "", target);
     }
     @Override
     protected void performDone() throws Exception {
diff --git a/src/_VisualDVM/ProjectData/Files/DBProjectFile.java b/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
index 56d67f68..dcd090a6 100644
--- a/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
+++ b/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
@@ -415,8 +415,8 @@ public class DBProjectFile extends ProjectFile {
                 break;
         }
         languageName = parent.languageName;
-        if (sapforStyle) style = Global.mainModule.getProject().sapforProperties.FREE_FORM? LanguageStyle.free : LanguageStyle.fixed;
-
+        if (sapforStyle)
+            style = Global.mainModule.getProject().sapforProperties.FREE_FORM ? LanguageStyle.free : LanguageStyle.fixed;
         else style = parent.style;
     }
     public void importSourceCodeSettings(DBProjectFile parent, boolean sapforStyle) throws Exception {
@@ -430,7 +430,8 @@ public class DBProjectFile extends ProjectFile {
                 break;
         }
         languageName = parent.languageName;
-        if (sapforStyle) style = Global.mainModule.getProject().sapforProperties.FREE_FORM? LanguageStyle.free : LanguageStyle.fixed;
+        if (sapforStyle)
+            style = Global.mainModule.getProject().sapforProperties.FREE_FORM ? LanguageStyle.free : LanguageStyle.fixed;
         else style = parent.style;
     }
     //------------------
diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
index c8838a5e..b1c1be3c 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
@@ -1,5 +1,7 @@
 package _VisualDVM.ProjectData.Files.UI.Editor;
+import Common.MainModule_;
 import Common.Utils.Utils_;
+import Common.Visual.Editor.BaseEditor;
 import Common.Visual.Menus.StyledPopupMenu;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
@@ -8,10 +10,10 @@ import _VisualDVM.ProjectData.Files.FileState;
 import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
 import _VisualDVM.ProjectData.SapforData.Loops.Loop;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.Editor.BaseEditor;
 import _VisualDVM.Visual.Editor.CaretInfo;
 import _VisualDVM.Visual.Interface.SPFEditorInterface;
 import _VisualDVM.Visual.Menus.MainEditorMenu;
+import _VisualDVM.Visual.Syntax.SPFEditorTheme;
 import javafx.util.Pair;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
 
@@ -204,4 +206,12 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
     public int getCurrentSymbol() {
         return getCaretOffsetFromLineStart() + 1;
     }
+    @Override
+    public void applyTheme() {
+        float font_size = (float) getFont().getSize();
+        ((SPFEditorTheme) MainModule_.instance.getUI().getTheme()).getEditorTheme().apply(this);
+        setFont(getFont().deriveFont(font_size));
+        menu.applyTheme();
+        //меню связано с редактором. поэтому тема меняется только вместе с ним.
+    }
 }
diff --git a/src/_VisualDVM/ProjectData/Messages/Message.java b/src/_VisualDVM/ProjectData/Messages/Message.java
index d4ea2967..a6715950 100644
--- a/src/_VisualDVM/ProjectData/Messages/Message.java
+++ b/src/_VisualDVM/ProjectData/Messages/Message.java
@@ -282,7 +282,7 @@ public class Message extends FileObject {
             codedMessages.put("R202", "Ссылка '%s' имеет отличный от оригинального массива размер");
 //2025
             codedMessages.put("R203", "Нельзя удалить приватную переменную '%s' - она используется в вызове функции %s");
-            codedMessages.put("R205","Массив '%s' состоящий в common блоке '%s' должен иметь описание в главной программной единице для объявления в директиве DECLARE");
+            codedMessages.put("R205", "Массив '%s' состоящий в common блоке '%s' должен иметь описание в главной программной единице для объявления в директиве DECLARE");
 //3002
 //3001
             codedMessages.put("R108", "Добавлена across-зависимость к массиву '%s' в цикле.");
diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java
index b7e794e2..28f64f46 100644
--- a/src/_VisualDVM/ProjectData/Project/db_project_info.java
+++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java
@@ -147,28 +147,8 @@ public class db_project_info extends DBObject {
     public DefaultMutableTreeNode filesTreeRoot = null;
     public ProjectDatabase db = null;
     public LinkedHashMap<String, DBProjectFile> allIncludes = new LinkedHashMap<>();
+    public SapforProperties sapforProperties = null;
     DBLastProject info = null; //обновляется при открытии проекта.
-    public SapforProperties sapforProperties=null;
-    public void SynchronizeSapforProperties() throws Exception{
-        if (sapforProperties==null) {
-            File propertiesFile = getPropertiesFile();
-            if (propertiesFile.exists()) {
-                sapforProperties = Utils_.ReadProperties(propertiesFile,SapforProperties.class);
-            } else {
-                SapforProfile defaultProfile = Global.mainModule.getDb().getDefaultSapforProfile();
-                if (defaultProfile == null) {
-                    sapforProperties = new SapforProperties(propertiesFile);
-                    Utils_.jsonToFile(sapforProperties, propertiesFile);
-                } else {
-                    sapforProperties = new SapforProperties(getPropertiesFile());
-                    sapforProperties.applyProfile(Global.mainModule.getDb().getVectorByFK(defaultProfile, SapforProfileSetting.class));
-                }
-            }
-        }
-    }
-    public File getPropertiesFile(){
-        return new File(getDataDirectory(), "properties");
-    }
     public db_project_info() {
     }
     //----------------------------------
@@ -239,6 +219,26 @@ public class db_project_info extends DBObject {
     public static void sortVersionsByNumber(Vector<db_project_info> versions) {
         versions.sort(Comparator.comparingInt(db_project_info::extractVersionNumber));
     }
+    public void SynchronizeSapforProperties() throws Exception {
+        if (sapforProperties == null) {
+            File propertiesFile = getPropertiesFile();
+            if (propertiesFile.exists()) {
+                sapforProperties = Utils_.ReadProperties(propertiesFile, SapforProperties.class);
+            } else {
+                SapforProfile defaultProfile = Global.mainModule.getDb().getDefaultSapforProfile();
+                if (defaultProfile == null) {
+                    sapforProperties = new SapforProperties(propertiesFile);
+                    Utils_.jsonToFile(sapforProperties, propertiesFile);
+                } else {
+                    sapforProperties = new SapforProperties(getPropertiesFile());
+                    sapforProperties.applyProfile(Global.mainModule.getDb().getVectorByFK(defaultProfile, SapforProfileSetting.class));
+                }
+            }
+        }
+    }
+    public File getPropertiesFile() {
+        return new File(getDataDirectory(), "properties");
+    }
     //-
     public void Open() throws Exception {
         db.Connect();
@@ -376,8 +376,8 @@ public class db_project_info extends DBObject {
         return null;
     }
     public DBProjectFile getLastOpenedFile() {
-        Vector<DBProjectFile> sorted_= new Vector<>();
-        for (DBProjectFile f: db.files.Data.values()){
+        Vector<DBProjectFile> sorted_ = new Vector<>();
+        for (DBProjectFile f : db.files.Data.values()) {
             if (!f.state.equals(FileState.Excluded) && !f.fileType.equals(FileType.forbidden)) {
                 sorted_.add(f);
             }
@@ -389,17 +389,17 @@ public class db_project_info extends DBObject {
             }
         }.reversed());
         LinkedHashMap<FileType, DBProjectFile> matches = new LinkedHashMap<>();
-        DBProjectFile sorceFile= null;
+        DBProjectFile sorceFile = null;
         DBProjectFile headerFile = null;
-        for (DBProjectFile f: sorted_){
-            if (!matches.containsKey(f.fileType)){
+        for (DBProjectFile f : sorted_) {
+            if (!matches.containsKey(f.fileType)) {
                 matches.put(f.fileType, f);
             }
         }
         Vector<FileType> priority = new Vector_<>(FileType.program, FileType.header, FileType.data, FileType.none);
-        for (FileType type: priority){
+        for (FileType type : priority) {
             if (matches.containsKey(type))
-                    return matches.get(type);
+                return matches.get(type);
         }
         return null;
     }
@@ -1533,9 +1533,9 @@ public class db_project_info extends DBObject {
         }
         return true;
     }
-    public DBProjectFile getMainProgramUnit(){
-        for (DBProjectFile file: db.files.Data.values()){
-            if (file.isMain!=0)
+    public DBProjectFile getMainProgramUnit() {
+        for (DBProjectFile file : db.files.Data.values()) {
+            if (file.isMain != 0)
                 return file;
         }
         return null;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
index bb9acc7b..6d108c69 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
@@ -60,7 +60,7 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
                     }
                     @Override
                     public int getMaxWidth() {
-                        return  Global.normalProperties.ShowFullArraysDeclarations ? CommonConstants.Nan : 200;
+                        return Global.normalProperties.ShowFullArraysDeclarations ? CommonConstants.Nan : 200;
                     }
                 },
                 new ColumnInfo<ProjectArray>("Размерность") {
diff --git a/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java b/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java
index b8ca5e1d..764b1e83 100644
--- a/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java
+++ b/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java
@@ -58,28 +58,6 @@ public class SapforProperties extends Properties {
     public int GCOVLimit = 10;
     @Expose
     public String DVMConvertationOptions = " ";
-    public String pack() {
-        Vector<String> res = new Vector_<String>(
-                STATIC_SHADOW_ANALYSIS ? "1" : "0",
-                STATIC_PRIVATE_ANALYSIS ? "1" : "0",
-                FREE_FORM ? "1" : "0",
-                KEEP_DVM_DIRECTIVES ? "1" : "0",
-                KEEP_SPF_DIRECTIVES ? "1" : "0",
-                PARALLELIZE_FREE_LOOPS ? "1" : "0",
-                String.valueOf(MAX_SHADOW_WIDTH),
-                OUTPUT_UPPER ? "1" : "0",
-                TRANSLATE_MESSAGES ? "1" : "0",
-                KEEP_LOOPS_CLOSE_NESTING ? "1" : "0",
-                KEEP_GCOV ? "1" : "0",
-                ANALYSIS_OPTIONS,
-                DEBUG_PRINT_ON ? "1" : "0",
-                MPI_PROGRAM ? "1" : "0",
-                IGNORE_IO_SAPFOR ? "1" : "0",
-                KEEP_SPF_DIRECTIVES_AMONG_TRANSFORMATIONS ? "1" : "0",
-                PARSE_FOR_INLINE ? "1" : "0"
-        );
-        return String.join("|", res);
-    }
     //-
     public SapforProperties(File file_in) {
         super(file_in);
@@ -110,6 +88,28 @@ public class SapforProperties extends Properties {
         this.KEEP_SPF_DIRECTIVES_AMONG_TRANSFORMATIONS = src.KEEP_SPF_DIRECTIVES_AMONG_TRANSFORMATIONS;
         this.PARSE_FOR_INLINE = src.PARSE_FOR_INLINE;
     }
+    public String pack() {
+        Vector<String> res = new Vector_<String>(
+                STATIC_SHADOW_ANALYSIS ? "1" : "0",
+                STATIC_PRIVATE_ANALYSIS ? "1" : "0",
+                FREE_FORM ? "1" : "0",
+                KEEP_DVM_DIRECTIVES ? "1" : "0",
+                KEEP_SPF_DIRECTIVES ? "1" : "0",
+                PARALLELIZE_FREE_LOOPS ? "1" : "0",
+                String.valueOf(MAX_SHADOW_WIDTH),
+                OUTPUT_UPPER ? "1" : "0",
+                TRANSLATE_MESSAGES ? "1" : "0",
+                KEEP_LOOPS_CLOSE_NESTING ? "1" : "0",
+                KEEP_GCOV ? "1" : "0",
+                ANALYSIS_OPTIONS,
+                DEBUG_PRINT_ON ? "1" : "0",
+                MPI_PROGRAM ? "1" : "0",
+                IGNORE_IO_SAPFOR ? "1" : "0",
+                KEEP_SPF_DIRECTIVES_AMONG_TRANSFORMATIONS ? "1" : "0",
+                PARSE_FOR_INLINE ? "1" : "0"
+        );
+        return String.join("|", res);
+    }
     //-
     @Override
     public String getFieldDescription(String fieldName) {
@@ -268,10 +268,10 @@ public class SapforProperties extends Properties {
     public LinkedHashMap<String, String> toMap() {
         LinkedHashMap<String, String> res = new LinkedHashMap<>();
         Vector<String> forbidden = new Vector_<String>(
-           //     "Precompilation",
-           //     "SaveModifications",
-           //     "GCOVLimit",
-           //     "DVMConvertationOptions",
+                //     "Precompilation",
+                //     "SaveModifications",
+                //     "GCOVLimit",
+                //     "DVMConvertationOptions",
                 "PARSE_FOR_INLINE",
                 "STATIC_PRIVATE_ANALYSIS",
                 "PARALLELIZE_FREE_LOOPS"
diff --git a/src/_VisualDVM/Repository/Server/BackUpsChecker.java b/src/_VisualDVM/Repository/Server/BackUpsChecker.java
index 9237c6b4..034aa209 100644
--- a/src/_VisualDVM/Repository/Server/BackUpsChecker.java
+++ b/src/_VisualDVM/Repository/Server/BackUpsChecker.java
@@ -2,13 +2,13 @@ package _VisualDVM.Repository.Server;
 import java.util.Calendar;
 public class BackUpsChecker extends RepositoryServerClient {
     RepositoryServer server;
+    public BackUpsChecker(RepositoryServer server_in) {
+        server = server_in;
+    }
     @Override
     protected RepositoryServer getServer() {
         return server;
     }
-    public BackUpsChecker(RepositoryServer server_in) {
-        server = server_in;
-    }
     @Override
     protected int getSleepMillis() {
         return 60000;
@@ -19,7 +19,7 @@ public class BackUpsChecker extends RepositoryServerClient {
         int hour = rightNow.get(Calendar.HOUR_OF_DAY);
         int minute = rightNow.get(Calendar.MINUTE);
         if ((hour == 1) && (minute == 45)) {
-            ServerCommand(ServerCode.CreateBackUp,false);
+            ServerCommand(ServerCode.CreateBackUp, false);
         }
     }
 }
diff --git a/src/_VisualDVM/Repository/Server/EmailChecker.java b/src/_VisualDVM/Repository/Server/EmailChecker.java
index ee5b04c7..f759d96e 100644
--- a/src/_VisualDVM/Repository/Server/EmailChecker.java
+++ b/src/_VisualDVM/Repository/Server/EmailChecker.java
@@ -18,13 +18,13 @@ import java.util.LinkedHashMap;
 import java.util.Properties;
 public class EmailChecker extends RepositoryServerClient {
     RepositoryServer server;
+    public EmailChecker(RepositoryServer server_in) {
+        server = server_in;
+    }
     @Override
     protected RepositoryServer getServer() {
         return server;
     }
-    public EmailChecker(RepositoryServer server_in) {
-        server = server_in;
-    }
     @Override
     protected int getSleepMillis() {
         return 5000;
diff --git a/src/_VisualDVM/Repository/Server/RepositoryServer.java b/src/_VisualDVM/Repository/Server/RepositoryServer.java
index a49ae7f5..c56c60bd 100644
--- a/src/_VisualDVM/Repository/Server/RepositoryServer.java
+++ b/src/_VisualDVM/Repository/Server/RepositoryServer.java
@@ -21,15 +21,19 @@ import java.io.*;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.file.Files;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Vector;
 public abstract class RepositoryServer<D extends Database> {
+    //--
+    public static ZipFolderPass zip = new ZipFolderPass();
+    public static UnzipFolderPass unzip = new UnzipFolderPass();
+    public static ArchivesBackupPass backupSession = new ArchivesBackupPass();
+    ;
+    //--
+    public static Vector<Pair<String, EmailMessage>> EmailMessagesQueue = null;
     protected static FileWriter Log;
     protected static boolean printOn = true;
-    public String getServerFileName() {
-        return Constants.ApplicationFileName;
-    }
-    ;
-    public abstract String getServerHomeName();
     //-
     public D db;
     protected Socket clientSocket; //сокет для общения
@@ -43,26 +47,20 @@ public abstract class RepositoryServer<D extends Database> {
     protected long count = 0; //для отладки.
     EmailChecker emailChecker = null;
     BackUpsChecker backUpsChecker = null;
-      /*
-        public static Vector<Pair<Machine, User>> storages = new Vector<>(
-                Arrays.asList(new Pair<>(new Machine("titan",
-                        "dvmh.keldysh.ru",
-                        22, MachineType.Server),
-                        new User("dvmuser1", "mprit_2011"))
-                ));
-        //-
-         */
+    /*
+      public static Vector<Pair<Machine, User>> storages = new Vector<>(
+              Arrays.asList(new Pair<>(new Machine("titan",
+                      "dvmh.keldysh.ru",
+                      22, MachineType.Server),
+                      new User("dvmuser1", "mprit_2011"))
+              ));
+      //-
+       */
     Class<D> d_class;
     //-----------RECURSION ->
     SignalHandler signalHandler = signal -> {
     };
     //--
-    public static ZipFolderPass zip = new ZipFolderPass();
-    public static UnzipFolderPass unzip = new UnzipFolderPass();
-    public static ArchivesBackupPass backupSession = new ArchivesBackupPass();
-    //--
-    public static Vector<Pair<String, EmailMessage>> EmailMessagesQueue = null;
-    //--
     public RepositoryServer(Class<D> d_class_in) {
         d_class = d_class_in;
     }
@@ -89,6 +87,10 @@ public abstract class RepositoryServer<D extends Database> {
             }
         }
     }
+    public String getServerFileName() {
+        return Constants.ApplicationFileName;
+    }
+    public abstract String getServerHomeName();
     //-DVMTestingChecker
     public abstract int getPort();
     protected void Session() throws Exception {
@@ -332,7 +334,7 @@ public abstract class RepositoryServer<D extends Database> {
         int day = rightNow.get(Calendar.DAY_OF_MONTH);
         //--
         String backUpName = year + "_" + (month + 1) + "_" + (day);
-        System.out.println("name="+backUpName);
+        System.out.println("name=" + backUpName);
         File todayBackUp = new File(Global.DataBackUpsDirectory, backUpName);
         File todayBackUpArchive = new File(Global.DataBackUpsDirectory, backUpName + ".zip");
         if (force || todayBackUpArchive.exists())
@@ -355,18 +357,17 @@ public abstract class RepositoryServer<D extends Database> {
             //     backupSession.Do(cred.getKey(), cred.getValue(), todayBackUpArchive);
             // }
             //bonus backup
-            if (!force&&rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) {
+            if (!force && rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) {
                 System.out.println("MONDAY");
                 //на почту шлем только базу.
-                EmailMessage message = new EmailMessage(getClass().getSimpleName() + " BackUp","Резервная копия базы данных");
+                EmailMessage message = new EmailMessage(getClass().getSimpleName() + " BackUp", "Резервная копия базы данных");
                 message.addAttachement(db.getFile());
                 for (String address : Constants.admins_mails)
-                    EmailMessagesQueue.add(new Pair<>(address,message));
+                    EmailMessagesQueue.add(new Pair<>(address, message));
                 //--
             }
         }
     }
-
     protected void extraBackup(File todayBackUp) {
     }
     //----
@@ -432,11 +433,11 @@ public abstract class RepositoryServer<D extends Database> {
     }
     void GetFirstEmailToSend() throws Exception {
         //
-        if (EmailMessagesQueue.isEmpty()){
+        if (EmailMessagesQueue.isEmpty()) {
             response.object = null;
-        }else {
+        } else {
             response.object = EmailMessagesQueue.lastElement();
-            EmailMessagesQueue.removeElementAt(EmailMessagesQueue.size()-1);
+            EmailMessagesQueue.removeElementAt(EmailMessagesQueue.size() - 1);
         }
     }
 }
diff --git a/src/_VisualDVM/Repository/Server/RepositoryServerClient.java b/src/_VisualDVM/Repository/Server/RepositoryServerClient.java
index f4076577..113d246c 100644
--- a/src/_VisualDVM/Repository/Server/RepositoryServerClient.java
+++ b/src/_VisualDVM/Repository/Server/RepositoryServerClient.java
@@ -1,9 +1,7 @@
 package _VisualDVM.Repository.Server;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
-import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.RepositoryPass;
-import _VisualDVM.TestingSystem.Common.TestingServer;
 
 import java.io.FileWriter;
 import java.io.Serializable;
@@ -31,7 +29,7 @@ public abstract class RepositoryServerClient<T extends RepositoryServer> {
     }
     //--
     protected Object ServerCommand(ServerCode code_in, String arg, Serializable object_in) throws Exception {
-        RepositoryPass<T,Object> pass = new RepositoryPass<T, Object>(getServer()) {
+        RepositoryPass<T, Object> pass = new RepositoryPass<T, Object>(getServer()) {
             @Override
             public String getDescription() {
                 return "";
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index 3aec6034..f78d2ce9 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -72,8 +72,8 @@ public enum ServerCode {
     CreateBackUp,
     GetFirstEmailToSend,
     SynchronizeSapforRepoitory;
-    public String getDescription(){
-        switch (this){
+    public String getDescription() {
+        switch (this) {
             case SynchronizeSapforRepoitory:
                 return "Синхронизация репозитория SAPFOR на сервере";
             case Email:
@@ -127,7 +127,7 @@ public enum ServerCode {
             case PublishObjects:
                 return "Публикация объектов на сервере";
             case ReplaceTestCode:
-                return  "Замена кода теста на сервере";
+                return "Замена кода теста на сервере";
             case GetComponentsBackups:
                 return "Получение резервных копий компонента с сервера";
             case DVMConvertProject:
diff --git a/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java b/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java
index c11bbde9..55e15ea2 100644
--- a/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java
@@ -7,11 +7,10 @@ import _VisualDVM.GlobalData.CompilerOption.Json.OptionsSetJson;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
 import javafx.util.Pair;
 
-import java.util.LinkedHashMap;
 import java.util.Vector;
 public class DVMSettingsCache extends VisualCache {
-    public OptionsSetJson optionsSetJson=null;
-    public EnvironmentsSetJson environmentsSetJson=null;
+    public OptionsSetJson optionsSetJson = null;
+    public EnvironmentsSetJson environmentsSetJson = null;
     //--
     public String optionsSummary = null;
     public String environmentsSummary = null;
@@ -28,31 +27,30 @@ public class DVMSettingsCache extends VisualCache {
         else
             environmentsSetJson = Utils_.gson.fromJson(dvmSettings.packedRunEnvironmentValuesJson, EnvironmentsSetJson.class);
         //--
-        Vector<String> optionsSummary_=new Vector<>();
-        for (OptionsJson optionsJson: optionsSetJson.values){
+        Vector<String> optionsSummary_ = new Vector<>();
+        for (OptionsJson optionsJson : optionsSetJson.values) {
             optionsSummary_.add(optionsJson.toLine());
         }
         optionsSummary = String.join(";\n", optionsSummary_);
         Vector<String> environmentsSummary_ = new Vector<>();
-        for (EnvironmentsJson environmentsJson: environmentsSetJson.values){
+        for (EnvironmentsJson environmentsJson : environmentsSetJson.values) {
             environmentsSummary_.add(environmentsJson.toLine());
         }
         environmentsSummary = String.join(";\n", environmentsSummary_);
     }
-
-    public Vector<Pair<String, String>> getTasksParameters(){
+    public Vector<Pair<String, String>> getTasksParameters() {
         //уравниваем количество наборов опций и окружений и сопоставляем 1 к 1
         Vector<Pair<String, String>> res = new Vector<>();
-        for (int i=0;i< optionsSetJson.values.size(); ++i){
-            String optionsLine =  optionsSetJson.values.get(i).toLine();
-            String environmentsLine = (i< environmentsSetJson.values.size())?
+        for (int i = 0; i < optionsSetJson.values.size(); ++i) {
+            String optionsLine = optionsSetJson.values.get(i).toLine();
+            String environmentsLine = (i < environmentsSetJson.values.size()) ?
                     environmentsSetJson.values.get(i).toLine() : "";
             res.add(new Pair<>(
                     optionsLine,
                     environmentsLine));
         }
-        if (optionsSetJson.values.size()<environmentsSetJson.values.size()){
-            for (int i= optionsSetJson.values.size(); i<environmentsSetJson.values.size(); ++i){
+        if (optionsSetJson.values.size() < environmentsSetJson.values.size()) {
+            for (int i = optionsSetJson.values.size(); i < environmentsSetJson.values.size(); ++i) {
                 res.add(new Pair<>(
                         "",
                         environmentsSetJson.values.get(i).toLine()
diff --git a/src/_VisualDVM/ServerObjectsCache/PackageCache.java b/src/_VisualDVM/ServerObjectsCache/PackageCache.java
index ffe0aad3..6aedbcab 100644
--- a/src/_VisualDVM/ServerObjectsCache/PackageCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/PackageCache.java
@@ -8,7 +8,7 @@ import java.util.Vector;
 public class PackageCache extends VisualCache {
     public ConfigurationsJson configurationsJson = null;
     public Vector<String> configurationsDescriptions = null;
-    public String confifurationsDescriptionsLine= null;
+    public String confifurationsDescriptionsLine = null;
     public PackageCache(TestingPackage testingPackage) {
         if (testingPackage.packedConfigurationsJson.isEmpty())
             configurationsJson = new ConfigurationsJson(); //просто пустой
@@ -23,7 +23,7 @@ public class PackageCache extends VisualCache {
     public Vector<String> getConfigurationsDescriptions() {
         return configurationsDescriptions;
     }
-    public String getConfifurationsDescriptionsLine(){
+    public String getConfifurationsDescriptionsLine() {
         return confifurationsDescriptionsLine;
     }
 }
diff --git a/src/_VisualDVM/ServerObjectsCache/TestCache.java b/src/_VisualDVM/ServerObjectsCache/TestCache.java
index 64d6412f..6514d2a3 100644
--- a/src/_VisualDVM/ServerObjectsCache/TestCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/TestCache.java
@@ -2,18 +2,17 @@ package _VisualDVM.ServerObjectsCache;
 import Common.Utils.Utils_;
 import _VisualDVM.TestingSystem.Common.Test.Json.TestFileJson;
 import _VisualDVM.TestingSystem.Common.Test.Json.TestFilesJson;
-import _VisualDVM.TestingSystem.Common.Test.Json.TestJson;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 
 import java.util.Vector;
-public class TestCache extends VisualCache{
-    public String srcNames="";
+public class TestCache extends VisualCache {
+    public String srcNames = "";
     public TestCache(Test object) {
-        Vector<String> names=new Vector<>();
+        Vector<String> names = new Vector<>();
         TestFilesJson json = Utils_.gson.fromJson(object.packedFilesJson, TestFilesJson.class);
-        for (TestFileJson testJson: json.values){
+        for (TestFileJson testJson : json.values) {
             names.add(testJson.name);
         }
-        srcNames =String.join(";", names);
+        srcNames = String.join(";", names);
     }
 }
diff --git a/src/_VisualDVM/ServerObjectsCache/VisualCaches.java b/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
index 05a9f3a5..9ddb48f3 100644
--- a/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
+++ b/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
@@ -32,7 +32,7 @@ public class VisualCaches {
         if (object instanceof DVMConfiguration) return new DVMConfigurationCache((Configuration) object);
         if (object instanceof TestingPackage) return new PackageCache((TestingPackage) object);
         if (object instanceof DVMSettings) return new DVMSettingsCache((DVMSettings) object);
-        if (object instanceof Test) return new TestCache((Test)object);
+        if (object instanceof Test) return new TestCache((Test) object);
         return new VisualCache();
     }
     public static VisualCache GetCache(DBObject object) {
diff --git a/src/_VisualDVM/TestingServerProperties.java b/src/_VisualDVM/TestingServerProperties.java
index 7a92be09..fa6e8f8b 100644
--- a/src/_VisualDVM/TestingServerProperties.java
+++ b/src/_VisualDVM/TestingServerProperties.java
@@ -1,10 +1,10 @@
 package _VisualDVM;
 import java.io.File;
-public class TestingServerProperties extends VisualDVMProperties{
-    public TestingServerProperties(){
+public class TestingServerProperties extends VisualDVMProperties {
+    public TestingServerProperties() {
         Mode = _VisualDVM.Mode.Testing;
     }
-    public TestingServerProperties(File file_in){
+    public TestingServerProperties(File file_in) {
         super(_VisualDVM.Mode.Testing, file_in);
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
index e3725a60..a74c858f 100644
--- a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
+++ b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
@@ -146,7 +146,7 @@ public class Configuration extends riDBObject {
         ConfigurationCache unpacked = new ConfigurationCache(this);
         List<TestJson> actualTests = new Vector<>();
         for (TestJson testJson : unpacked.testsJson.array) {
-            if (testJson.id==test.id)
+            if (testJson.id == test.id)
                 flag = true;
             else actualTests.add(testJson);
         }
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
index be7e0fd4..280e1125 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
@@ -5,7 +5,6 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import _VisualDVM.Global;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
 import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -51,5 +50,5 @@ public class GroupsDBTable extends iDBTable<Group> {
         }
         return null;
     }
-  //  CheckCurrent(Log) && Global.mainModule.getAccount().CheckAuthorship(getCurrent().sender_address, Log);
+    //  CheckCurrent(Log) && Global.mainModule.getAccount().CheckAuthorship(getCurrent().sender_address, Log);
 }
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java
index 0b90e3c0..2787f33b 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java
@@ -33,8 +33,10 @@ public class GroupDialog extends DBObjectDialog<Group, GroupFields> {
     }
     @Override
     public void SetReadonly() {
-       fields.tfName.setEnabled(false);
-       fields.cbType.setEnabled(false);;
-       fields.cbLanguage.setEnabled(false);;
+        fields.tfName.setEnabled(false);
+        fields.cbType.setEnabled(false);
+        ;
+        fields.cbLanguage.setEnabled(false);
+        ;
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
index 0b675f47..de626c11 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
@@ -1,10 +1,11 @@
 package _VisualDVM.TestingSystem.Common.Group.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
-import Common.Utils.TextLog;
-import Common.Visual.*;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.Controls.StableMenuItem;
+import Common.Visual.DataSetFiltersMenu;
+import Common.Visual.FilterFlag;
+import Common.Visual.FilterMenuFlag;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.HeaderTextFilter;
@@ -15,9 +16,10 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.TestType;
+import _VisualDVM.Visual.RDataSetControlForm;
 
 import javax.swing.*;
-public class GroupsForm extends DataSetControlForm<Group> {
+public class GroupsForm extends RDataSetControlForm<Group> {
     public static boolean filterMyOnly = false;
     public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
@@ -121,7 +123,6 @@ public class GroupsForm extends DataSetControlForm<Group> {
     protected DBObjectDialog getDialog() {
         return new GroupDialog();
     }
-
     @Override
     protected boolean isObjectEditable(Group object) {
         if (Global.mainModule.getAccount().CheckRegistered(null)) {
diff --git a/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java b/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
index a0b60227..fa8bb48e 100644
--- a/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
+++ b/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
@@ -5,7 +5,6 @@ import Common.Utils.Utils_;
 import _VisualDVM.*;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 import _VisualDVM.TestingSystem.DVM.PackageCredentials.DVMPackageCredentials;
-import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.net.InetAddress;
diff --git a/src/_VisualDVM/TestingSystem/Common/MachinesDatabase.java b/src/_VisualDVM/TestingSystem/Common/MachinesDatabase.java
index dfea969e..b5cf880e 100644
--- a/src/_VisualDVM/TestingSystem/Common/MachinesDatabase.java
+++ b/src/_VisualDVM/TestingSystem/Common/MachinesDatabase.java
@@ -1,9 +1,6 @@
 package _VisualDVM.TestingSystem.Common;
 import Common.Database.SQLITE.SQLiteDatabase;
 import Common.Passes.PassCode_;
-import _VisualDVM.GlobalData.Machine.MachinesDBTable;
-import _VisualDVM.GlobalData.User.UsersDBTable;
-import _VisualDVM.TestingSystem.DVM.PackageCredentials.DVMPackageCredentials;
 import _VisualDVM.TestingSystem.DVM.PackageCredentials.DVMPackagesCredentialsDBTable;
 
 import java.nio.file.Paths;
diff --git a/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java b/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java
index 264e75fe..ad18390a 100644
--- a/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java
+++ b/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java
@@ -1,5 +1,4 @@
 package _VisualDVM.TestingSystem.Common.Settings;
-import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import Common.Utils.TextLog;
 //предопределенный набор настроек тестируемой системы. сохраняется для упрощения.
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Test.java b/src/_VisualDVM/TestingSystem/Common/Test/Test.java
index 1ab6c82e..1bae9e2b 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/Test.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/Test.java
@@ -2,13 +2,10 @@ package _VisualDVM.TestingSystem.Common.Test;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
-import Common.Database.RepositoryRefuseException;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.All.UnzipFolderPass;
-import _VisualDVM.Passes.All.ZipFolderPass;
-import _VisualDVM.ProjectData.Files.FileState;
 import _VisualDVM.ProjectData.Files.FileType;
 import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ProjectData.LanguageName;
@@ -30,7 +27,7 @@ public class Test extends riDBObject {
     @Description("DEFAULT -1")
     public int group_id = CommonConstants.Nan;
     @Description("DEFAULT ''")
-    public String extended_description="";
+    public String extended_description = "";
     @Description("DEFAULT ''")
     public String packedFilesJson = "";
     //--------------------------------------------->>>
@@ -53,7 +50,7 @@ public class Test extends riDBObject {
         args = t.args;
         group_id = t.group_id;
         extended_description = t.extended_description;
-        packedFilesJson=t.packedFilesJson;
+        packedFilesJson = t.packedFilesJson;
     }
     @Override
     public void select(boolean flag) {
@@ -110,7 +107,7 @@ public class Test extends riDBObject {
         res.put(LanguageName.c, new Vector<>());
         res.put(LanguageName.cpp, new Vector<>());
         //--
-        TestFilesJson json = Utils_.gson.fromJson(packedFilesJson,TestFilesJson.class);
+        TestFilesJson json = Utils_.gson.fromJson(packedFilesJson, TestFilesJson.class);
         for (TestFileJson file : json.values) {
             //--
             if (file.type.equals(FileType.program) &&
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
index 013e9b09..1d6c3d4e 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
@@ -1,5 +1,4 @@
 package _VisualDVM.TestingSystem.Common.Test.UI;
-import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.Common.Group.Group;
@@ -25,7 +24,7 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
                         +
                         Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language);
         }
-        Utils.validateFileShortNewName(fields.tfName.getText(),Log);
+        Utils.validateFileShortNewName(fields.tfName.getText(), Log);
     }
     @Override
     public void fillFields() {
@@ -37,7 +36,7 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
     @Override
     public void ProcessResult() {
         Result.description = fields.tfName.getText();
-        Result.extended_description=fields.taExtendedDescription.getText();
+        Result.extended_description = fields.taExtendedDescription.getText();
         Result.min_dim = (int) fields.sMinDim.getValue();
         Result.max_dim = (int) fields.sMaxDim.getValue();
         if (!edit) {
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
index 59db2e95..a73d55ca 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
@@ -1,7 +1,6 @@
 package _VisualDVM.TestingSystem.Common.Test.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
-import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.HeaderTextFilter;
@@ -13,9 +12,10 @@ import _VisualDVM.ServerObjectsCache.TestCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
+import _VisualDVM.Visual.RDataSetControlForm;
 
 import javax.swing.*;
-public class TestsForm extends DataSetControlForm<Test> {
+public class TestsForm extends RDataSetControlForm<Test> {
     public TestsForm(DataSet<?, Test> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
@@ -31,7 +31,7 @@ public class TestsForm extends DataSetControlForm<Test> {
                 new ColumnInfo<Test>("описание") {
                     @Override
                     public Object getFieldAt(Test object) {
-                        return object.extended_description.replace("\n",";\n");
+                        return object.extended_description.replace("\n", ";\n");
                     }
                     @Override
                     public Class getRendererClass() {
@@ -47,7 +47,7 @@ public class TestsForm extends DataSetControlForm<Test> {
                 new ColumnInfo<Test>("файлы") {
                     @Override
                     public Object getFieldAt(Test object) {
-                        return ((TestCache)VisualCaches.GetCache(object)).srcNames;
+                        return ((TestCache) VisualCaches.GetCache(object)).srcNames;
                     }
                 }
         );
@@ -61,7 +61,7 @@ public class TestsForm extends DataSetControlForm<Test> {
         return new DataMenuBar(dataSource.getPluralDescription()) {
             {
                 addMenus(new AddTestMenu(), new EditTestMenu());
-                addPasses(PassCode.DetectSelectedTestsMinMaDim,PassCode.DownloadTest, PassCode.DeleteTest);
+                addPasses(PassCode.DetectSelectedTestsMinMaDim, PassCode.DownloadTest, PassCode.DeleteTest);
             }
         };
     }
@@ -74,7 +74,6 @@ public class TestsForm extends DataSetControlForm<Test> {
     protected DBObjectDialog getDialog() {
         return new TestDialog();
     }
-
     @Override
     protected boolean isObjectEditable(Test object) {
         if (Global.mainModule.getAccount().CheckRegistered(null)) {
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingClient.java b/src/_VisualDVM/TestingSystem/Common/TestingClient.java
index b13b832f..03ae844b 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingClient.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingClient.java
@@ -1,15 +1,6 @@
 package _VisualDVM.TestingSystem.Common;
-import Common.Passes.PassException;
-import Common.Utils.Utils_;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.Server.RepositoryPass;
 import _VisualDVM.Repository.Server.RepositoryServerClient;
-import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
-import _VisualDVM.Repository.Server.ServerCode;
-
-import java.io.FileWriter;
-import java.io.Serializable;
-import java.util.Date;
 public abstract class TestingClient extends RepositoryServerClient<TestingServer> {
     @Override
     protected TestingServer getServer() {
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
index bf65a8fb..6a234a05 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -25,9 +25,6 @@ public abstract class TestingPackage<J> extends riDBObject {
     public int progress = 0; //прогресс выполнения
     public long StartDate = 0;
     public long ChangeDate = 0;
-    public long getMilliseconds() {
-        return ((StartDate != 0) && (ChangeDate != 0)) ? ChangeDate - StartDate : 0;
-    }
     @Description("DEFAULT 0")
     public int connectionErrosCount = 0;
     public TasksPackageState state = TasksPackageState.Draft;
@@ -41,6 +38,9 @@ public abstract class TestingPackage<J> extends riDBObject {
     }
     public TestingPackage() {
     }
+    public long getMilliseconds() {
+        return ((StartDate != 0) && (ChangeDate != 0)) ? ChangeDate - StartDate : 0;
+    }
     //--
     @Override
     public void SynchronizeFields(DBObject src) {
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
index 5319369b..802a778a 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
@@ -159,11 +159,9 @@ public abstract class TestingPlanner<P extends TestingPackage> extends TestingCl
                         Kill();
                         UpdatePackageState(TasksPackageState.Aborted);
                         ServerCommand(ServerCode.DeleteObjectByPK, new Pair(TestingPackageToKill.class, ptk_id));
-                    }
-                    else if (checkIfPaused()) {
+                    } else if (checkIfPaused()) {
                         UpdatePackageState(TasksPackageState.Paused);
-                    }
-                    else {
+                    } else {
                         //--
                         switch (testingPackage.state) {
                             case TestsSynchronize:
@@ -184,7 +182,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends TestingCl
                                 UpdatePackageState(TasksPackageState.Analysis);
                                 break;
                             case Paused:
-                                if (!checkIfPaused()&&CheckNextState())
+                                if (!checkIfPaused() && CheckNextState())
                                     UpdatePackage();
                                 break;
                             default:
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index aba6453a..9354bb69 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -69,19 +69,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         super(TestsDatabase.class);
         name = Utils_.getDateName("testingServer");
     }
-    @Override
-    public void StartAction() throws Exception {
-        try {
-            machines_db = new MachinesDatabase();
-            machines_db.Activate();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-    @Override
-    protected void extraBackup(File todayBackUp) {
-        zip.Do("Tests", new File(todayBackUp, "Tests.zip").getAbsolutePath());
-    }
     public static void TimerOn() {
         checkTimer = new Timer(Global.normalProperties.CheckTestingIntervalSeconds * 1000, e -> {
             Global.mainModule.getPass(PassCode.ActualizePackages).Do();
@@ -97,6 +84,19 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         TimerOn();
     }
     @Override
+    public void StartAction() throws Exception {
+        try {
+            machines_db = new MachinesDatabase();
+            machines_db.Activate();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+    @Override
+    protected void extraBackup(File todayBackUp) {
+        zip.Do("Tests", new File(todayBackUp, "Tests.zip").getAbsolutePath());
+    }
+    @Override
     public void afterPublishAction(DBObject object) throws Exception {
         if (object instanceof Test) {
             Test test = (Test) object;
@@ -306,7 +306,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                         Log.toString()
                 );
         for (String address : Constants.admins_mails)
-            EmailMessagesQueue.add(new Pair<>(address,message));
+            EmailMessagesQueue.add(new Pair<>(address, message));
     }
     void DownloadTest() throws Exception {
         int test_id = Integer.parseInt(request.arg);
diff --git a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
index 267a6f02..9a10b287 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
@@ -6,7 +6,6 @@ import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.All.ZipFolderPass;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
@@ -204,9 +203,9 @@ public class TestsDatabase extends SQLiteDatabase {
         test.sender_name = account.name;
         test.sender_address = account.email;
         test.group_id = group.id;
-        TestFilesJson testFilesJson=new TestFilesJson();
+        TestFilesJson testFilesJson = new TestFilesJson();
         testFilesJson.values.add(new TestFileJson(new ProjectFile(file)));
-        test.packedFilesJson=Utils_.gson.toJson(testFilesJson);
+        test.packedFilesJson = Utils_.gson.toJson(testFilesJson);
         Insert(test);
         //->>
         SaveTestFromSingleFile(sapfor, group, test, file);
@@ -282,8 +281,8 @@ public class TestsDatabase extends SQLiteDatabase {
         }
         return null;
     }
-    public ServerSapfor getSapforForVersion(String version_in){
-        for (ServerSapfor serverSapfor: serverSapfors.Data.values()){
+    public ServerSapfor getSapforForVersion(String version_in) {
+        for (ServerSapfor serverSapfor : serverSapfors.Data.values()) {
             if (serverSapfor.version.equals(version_in))
                 return serverSapfor;
         }
@@ -319,7 +318,7 @@ public class TestsDatabase extends SQLiteDatabase {
     //todo возможно рассмотреть вариант с синхроннизацией тестов для пакетов через команду серверу а не в нити
     //во избежание конфликта доступа,или удалением тестов во время копирования(?)
     @Override
-    public void DropUI(){
+    public void DropUI() {
         super.DropUI();
         dvmConfigurations.ClearUI();
         groups.ClearUI();
@@ -331,7 +330,7 @@ public class TestsDatabase extends SQLiteDatabase {
         dvmSettings.ClearUI();
     }
     @Override
-    public void ResetUI(){
+    public void ResetUI() {
         VisualCaches.ClearDataForClass(DVMConfiguration.class);
         VisualCaches.ClearDataForClass(SapforConfiguration.class);
         VisualCaches.ClearDataForClass(DVMPackage.class);
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
index 2719d760..4bf0f300 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
 import Common.Visual.Controls.MenuBarButton;
-import Common.Visual.DataSetControlForm;
 import Common.Visual.FilterFlag;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
@@ -14,9 +13,10 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
+import _VisualDVM.Visual.RDataSetControlForm;
 
 import javax.swing.*;
-public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration> {
+public class DVMConfigurationsForm extends RDataSetControlForm<DVMConfiguration> {
     public DVMConfigurationsForm(DataSet<?, DVMConfiguration> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
@@ -124,6 +124,5 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
                 }
         );
     }
-
 }
 
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
index 05ad4e53..e8fcbf65 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -73,7 +73,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
                         DVMSettingsCache settingsCache = (DVMSettingsCache) VisualCaches.GetCache(dvmSettings);
                         Vector<Pair<String, String>> params = settingsCache.getTasksParameters();
                         //---
-                        for (Pair<String, String> p: params) {
+                        for (Pair<String, String> p : params) {
                             //--
                             String options_ = Global.normalProperties.CompleteCompilationOptions ?
                                     completeOptions(p.getKey()) : p.getKey();
@@ -96,7 +96,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
                                         environments_,
                                         kernels
                                 ));
-                            }else {
+                            } else {
                                 for (String matrix : matrixes) {
                                     compilationTask.runTasks.add(new DVMRunTask(
                                             configuration,
@@ -123,6 +123,23 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
         super(p);
         this.SynchronizeFields(p);
     }
+    public static String completeOptions(String flags_in) {
+        if (!flags_in.contains("-shared-dvm")) {
+            if (flags_in.isEmpty())
+                return "-shared-dvm";
+            else return flags_in + " -shared-dvm";
+        } else
+            return flags_in;
+    }
+    public static String completeEnvironments(String environmentsSet_in) {
+        if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
+            if (environmentsSet_in.isEmpty())
+                return "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
+            else
+                return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
+        } else
+            return environmentsSet_in;
+    }
     @Override
     public Class getJsonClass() {
         return DVMPackage_json.class;
@@ -151,25 +168,8 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
     @Override
     public void checkFinishState() throws Exception {
     }
-    public String getMachineURL(){
+    public String getMachineURL() {
         return machine_address + ":" + machine_port;
     }
-    public static String completeOptions(String flags_in) {
-        if (!flags_in.contains("-shared-dvm")) {
-            if (flags_in.isEmpty())
-                return "-shared-dvm";
-            else return flags_in + " -shared-dvm";
-        } else
-            return flags_in;
-    }
-    public static String completeEnvironments(String environmentsSet_in) {
-        if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
-            if (environmentsSet_in.isEmpty())
-                return "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
-            else
-                return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
-        } else
-            return environmentsSet_in;
-    }
 }
 
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index 8a84d425..59222836 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -2,29 +2,24 @@ package _VisualDVM.TestingSystem.DVM.DVMPackage.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
 import Common.Visual.Controls.MenuBarButton;
-import Common.Visual.Controls.StableMenuItem;
-import Common.Visual.DataSetControlForm;
-import Common.Visual.DataSetFiltersMenu;
 import Common.Visual.FilterFlag;
-import Common.Visual.FilterMenuFlag;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererMilliseconds;
 import Common.Visual.Tables.RendererProgressBar;
 import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
+import _VisualDVM.Visual.RDataSetControlForm;
 import _VisualDVM.Visual.Tables.RendererTestingPackageStatus;
 
 import javax.swing.*;
 import java.util.Comparator;
-public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
+public class DVMPackagesForm extends RDataSetControlForm<DVMPackage> {
     public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
@@ -154,7 +149,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
             {
                 addPasses(PassCode.SynchronizeTests);
                 addSeparator();
-                addPasses(PassCode.PauseDVMPackage,PassCode.ResumeDVMPackage,PassCode.AbortDVMPackage);
+                addPasses(PassCode.PauseDVMPackage, PassCode.ResumeDVMPackage, PassCode.AbortDVMPackage);
                 addSeparator();
                 addPasses(PassCode.DownloadDVMPackage,
                         PassCode.RefreshDVMPackageResults,
@@ -199,7 +194,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
                         return object.state.equals(TasksPackageState.DoneWithErrors);
                     }
                 }
-                );
+        );
     }
     @Override
     protected Comparator<DVMPackage> getDefaultComparator() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java
index c8cb6b64..bcd2a873 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java
@@ -49,7 +49,7 @@ public class DVMSettingsDialog extends DBObjectDialog<DVMSettings, DVMSettingsFi
         Result.Is_DVM_STAT = fields.cbDvmStat.isSelected() ? 1 : 0;
         //--
         Result.packedCompilationOptionsJson = Utils_.gson.toJson(fields.optionsLines.toJson());
-        Result.packedRunEnvironmentValuesJson= Utils_.gson.toJson(fields.environmentsLines.toJson());
+        Result.packedRunEnvironmentValuesJson = Utils_.gson.toJson(fields.environmentsLines.toJson());
     }
     @Override
     public void SetReadonly() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
index c49f9def..987db34c 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
@@ -3,13 +3,9 @@ import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
-import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLine;
 import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLinesSet;
-import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
 import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsSetJson;
-import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
 import _VisualDVM.GlobalData.CompilerOption.Json.OptionsSetJson;
-import _VisualDVM.GlobalData.CompilerOption.OptionsLine;
 import _VisualDVM.GlobalData.CompilerOption.OptionsLinesSet;
 
 import javax.swing.*;
@@ -22,22 +18,28 @@ public class DVMSettingsFields implements DialogFields {
     public JCheckBox cbCube;
     public JTextField tfEnvironments;
     public JCheckBox cbDvmStat;
-    private JPanel content;
     public JButton bAddFlags;
     public JButton bAddEnvironments;
     public JButton bDeleteFlags;
     public JButton bDeleteEnvironment;
+    //
+    public OptionsLinesSet optionsLines;
+    public EnvironmentsLinesSet environmentsLines;
+    private JPanel content;
     private JPanel optionsLinesPanel;
     private JPanel environmentsLinesPanel;
     private JSplitPane SC1;
     private JSplitPane SC2;
-    //
-    public OptionsLinesSet optionsLines;
-    public EnvironmentsLinesSet environmentsLines;
+    public DVMSettingsFields() {
+        sMinDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
+        sMaxDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
+        sMaxProc.setModel(new SpinnerNumberModel(0, 0, 128, 1));
+        //-
+    }
     //
     public void fillOptionsLines(String packed) {
         OptionsSetJson optionsSetJson = packed.isEmpty() ? new OptionsSetJson() : Utils_.gson.fromJson(packed, OptionsSetJson.class);
-        optionsLines= new OptionsLinesSet(optionsSetJson);
+        optionsLines = new OptionsLinesSet(optionsSetJson);
         //-
         //-Это нужно для того, чтобы старый меню бар был пересоздан. бары создаются один раз в целях экономии памяти.
         // В противном случае бар его проходы добавления редактирования и удаления
@@ -49,20 +51,13 @@ public class DVMSettingsFields implements DialogFields {
     }
     public void fillEnvironmentsLines(String packed) {
         EnvironmentsSetJson environmentsSetJson = packed.isEmpty() ? new EnvironmentsSetJson() : Utils_.gson.fromJson(packed, EnvironmentsSetJson.class);
-        environmentsLines =new EnvironmentsLinesSet(environmentsSetJson);
+        environmentsLines = new EnvironmentsLinesSet(environmentsSetJson);
         //-
         if (MainModule_.instance.getUI().menuBars.containsKey(EnvironmentsLinesSet.class))
             MainModule_.instance.getUI().menuBars.remove(EnvironmentsLinesSet.class);
         environmentsLines.mountUI(environmentsLinesPanel);
         environmentsLines.ShowUI();
     }
-
-    public DVMSettingsFields() {
-        sMinDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
-        sMaxDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
-        sMaxProc.setModel(new SpinnerNumberModel(0, 0, 128, 1));
-        //-
-    }
     @Override
     public Component getContent() {
         return content;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
index 1e7140e8..227fdccc 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
@@ -2,22 +2,20 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
 import Common.Visual.Controls.MenuBarButton;
-import Common.Visual.DataSetControlForm;
 import Common.Visual.FilterFlag;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.HeaderTextFilter;
-import Common.Visual.Tables.RendererMultiline;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.DVMSettingsCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
+import _VisualDVM.Visual.RDataSetControlForm;
 
 import javax.swing.*;
-public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
+public class DVMSettingsForm extends RDataSetControlForm<DVMSettings> {
     public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
diff --git a/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackageCredentials.java b/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackageCredentials.java
index 47a3d450..642644a5 100644
--- a/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackageCredentials.java
+++ b/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackageCredentials.java
@@ -1,9 +1,6 @@
 package _VisualDVM.TestingSystem.DVM.PackageCredentials;
 import Common.CommonConstants;
 import Common.Database.Objects.iDBObject;
-import _VisualDVM.GlobalData.Machine.Machine;
-import _VisualDVM.GlobalData.Machine.MachineType;
-import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 public class DVMPackageCredentials extends iDBObject {
     public int dvmpackage_id = CommonConstants.Nan;
diff --git a/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackagesCredentialsDBTable.java b/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackagesCredentialsDBTable.java
index 12183b98..9b5651cc 100644
--- a/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackagesCredentialsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackagesCredentialsDBTable.java
@@ -1,13 +1,12 @@
 package _VisualDVM.TestingSystem.DVM.PackageCredentials;
 import Common.Database.Tables.iDBTable;
-import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 public class DVMPackagesCredentialsDBTable extends iDBTable<DVMPackageCredentials> {
     public DVMPackagesCredentialsDBTable() {
         super(DVMPackageCredentials.class);
     }
-    public DVMPackageCredentials getForPackageId(int dvmPackage_id){
-        for (DVMPackageCredentials dvmPackageCredentials: Data.values()){
-            if (dvmPackageCredentials.dvmpackage_id==dvmPackage_id)
+    public DVMPackageCredentials getForPackageId(int dvmPackage_id) {
+        for (DVMPackageCredentials dvmPackageCredentials : Data.values()) {
+            if (dvmPackageCredentials.dvmpackage_id == dvmPackage_id)
                 return dvmPackageCredentials;
         }
         return null;
diff --git a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index d649c84a..52f05547 100644
--- a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -177,8 +177,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
         File unpacked_results = new File(packageLocalWorkspace.getAbsolutePath(), "results");
         try {
             Utils_.forceDeleteWithCheck(unpacked_results);
-        }
-        catch (Exception ex){
+        } catch (Exception ex) {
             ex.printStackTrace();
         }
     }
diff --git a/src/_VisualDVM/TestingSystem/DVM/UserConnection.java b/src/_VisualDVM/TestingSystem/DVM/UserConnection.java
index 96e75f1f..7dc6e40f 100644
--- a/src/_VisualDVM/TestingSystem/DVM/UserConnection.java
+++ b/src/_VisualDVM/TestingSystem/DVM/UserConnection.java
@@ -252,7 +252,7 @@ public class UserConnection {
         boolean planner = module_name.equals("planner");
         String flags = planner ? getAvailibleCPPStandard(modulesDirectory) : "";
         String command = "g++ -O3 " + flags + " " + Utils_.DQuotes(module_name + ".cpp") + " -o " + Utils_.DQuotes(module_name);
-        if (planner&& flags.contains("c++17")) command+=" -lstdc++fs";
+        if (planner && flags.contains("c++17")) command += " -lstdc++fs";
         RemoteFile binary = new RemoteFile(modulesDirectory, module_name);
         //--
         if (Exists(binary))
@@ -476,7 +476,6 @@ public class UserConnection {
         System.gc();
     }
  */
-
     public void waitForFileCreation(RemoteFile file) throws Exception {
         while (!Exists(file)) {
             System.out.println(file.full_name + " NOT FOUND");
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
index 7ccf37f3..c98e8118 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
@@ -160,13 +160,12 @@ public class SapforVersion_json implements Serializable {
                 ex.printStackTrace();
             }
             return text1.equalsIgnoreCase(text2);
-          //  if (!Utils.compareFortranTexts(text1, text2)) {
-          //      return false;
-          // }
+            //  if (!Utils.compareFortranTexts(text1, text2)) {
+            //      return false;
+            // }
         }
         return true;
     }
-
     public MessageError unpackMessage(String line_in) throws Exception {
         MessageError res = new MessageError();
         res.file = "";
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java b/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java
index 3281c25e..69d969c6 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java
@@ -60,7 +60,7 @@ public class PerformSapforTask extends Pass<SapforTask> {
     }
     //слегка изменить подход.
     protected boolean transformation(PassCode code) throws Exception {
-        task = new File(parentTask, code.equals(PassCode.SPF_SharedMemoryParallelization)?"p1":"v1" );
+        task = new File(parentTask, code.equals(PassCode.SPF_SharedMemoryParallelization) ? "p1" : "v1");
         Utils_.CheckAndCleanDirectory(task); //папка для преобразования.
         //если версия пустая, это тоже результат тестирования. Поэтому должна учитываться в древе.
         target.versions.add(version_json = new SapforVersion_json(
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
index b788f402..d6018ae7 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
@@ -22,7 +22,7 @@ public class SapforConfiguration extends Configuration {
         //--
         Vector<Group> groups = cache.getGroups();
         Vector<SapforSettings> settingsArray = cache.getSettings();
-        Vector<Test> tests= cache.getTests();
+        Vector<Test> tests = cache.getTests();
         //--
         Vector<LanguageName> groupsLanguages = new Vector<>();
         for (Group group : groups) {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
index 2e6a34ab..07e2d107 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
@@ -3,7 +3,6 @@ import Common.CommonConstants;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
 import Common.Visual.Controls.MenuBarButton;
-import Common.Visual.DataSetControlForm;
 import Common.Visual.FilterFlag;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
@@ -15,11 +14,12 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import _VisualDVM.Visual.RDataSetControlForm;
 import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
 import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
 
 import javax.swing.*;
-public class SapforConfigurationsForm extends DataSetControlForm<SapforConfiguration> {
+public class SapforConfigurationsForm extends RDataSetControlForm<SapforConfiguration> {
     public SapforConfigurationsForm(DataSet<?, SapforConfiguration> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
@@ -117,9 +117,9 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
     @Override
     protected void ShowCurrentObject() throws Exception {
         super.ShowCurrentObject();
-        if (current.ethalon_id!=CommonConstants.Nan){
+        if (current.ethalon_id != CommonConstants.Nan) {
             Global.testingServer.db.sapforPackages.getUI().SetCurrentByPK(current.ethalon_id);
-        }else {
+        } else {
             Global.testingServer.db.sapforPackages.getUI().ClearSelection();
         }
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
index 3b93f1b6..0451b782 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
@@ -75,7 +75,7 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
         SapforPackage p = (SapforPackage) src;
         sapforId = p.sapforId;
         ethalon_id = p.ethalon_id;
-        mismatchesCount=p.mismatchesCount;
+        mismatchesCount = p.mismatchesCount;
     }
     @Override
     public Class getJsonClass() {
@@ -107,9 +107,9 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
         double percent = (((double) (good)) / tasksCount) * 100.0;
         description = "Выполнено на " + ((int) percent) + "%\n" +
                 "Всего задач: " + tasksCount + ", из них с ошибками " + bad;
-        doneTasksCount= good;
+        doneTasksCount = good;
     }
-    public boolean canCompare(SapforPackage package2, TextLog log){
+    public boolean canCompare(SapforPackage package2, TextLog log) {
         if (package_json.tasks.size() != package2.package_json.tasks.size()) {
             log.Writeln_("Количество задач в пакетах не совпадает!");
             return false;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index b4e93a63..3ff6b0b1 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -2,22 +2,24 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
 import Common.Visual.Controls.MenuBarButton;
-import Common.Visual.DataSetControlForm;
 import Common.Visual.FilterFlag;
 import Common.Visual.Menus.DataMenuBar;
-import Common.Visual.Tables.*;
+import Common.Visual.Tables.ColumnInfo;
+import Common.Visual.Tables.RendererDate;
+import Common.Visual.Tables.RendererMilliseconds;
+import Common.Visual.Tables.RendererProgressBar;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
-import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
+import _VisualDVM.Visual.RDataSetControlForm;
 import _VisualDVM.Visual.Tables.RendererTestingPackageStatus;
 
 import javax.swing.*;
 import java.util.Comparator;
-public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
+public class SapforPackagesForm extends RDataSetControlForm<SapforPackage> {
     public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
@@ -178,8 +180,6 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
                         return object.state.equals(TasksPackageState.DoneWithErrors);
                     }
                 }
-
-
-                );
+        );
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
index 0c9b2860..72920376 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
 import Common.Visual.Controls.MenuBarButton;
-import Common.Visual.DataSetControlForm;
 import Common.Visual.FilterFlag;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
@@ -11,9 +10,10 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
+import _VisualDVM.Visual.RDataSetControlForm;
 
 import javax.swing.*;
-public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
+public class SapforSettingsForm extends RDataSetControlForm<SapforSettings> {
     public SapforSettingsForm(DataSet<?, SapforSettings> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
@@ -40,7 +40,6 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
                 }
         );
     }
-
     @Override
     protected void createFilters() {
         AddFilters(new HeaderTextFilter<>(dataSource, 2, 65),
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
index 1f1175fd..c777b557 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
@@ -1,7 +1,6 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
-import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
@@ -9,9 +8,10 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
+import _VisualDVM.Visual.RDataSetControlForm;
 
 import javax.swing.*;
-public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSettingsCommand> {
+public class SapforSettingsCommandsForm extends RDataSetControlForm<SapforSettingsCommand> {
     public SapforSettingsCommandsForm(DataSet<?, SapforSettingsCommand> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
index 03575b44..83a13c55 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
@@ -226,13 +226,12 @@ public class SapforTask extends DBObject {
     }
     @Override
     public String toString() {
-
         return
                 "#" + id + " группа "
                         + Utils_.Brackets(group_description) +
                         " тест " + Utils_.Brackets(test_description)
                         + " параметры "
-                        + Utils_.Brackets(configuration_description.isEmpty()?sapfor_configuration_id: configuration_description);
+                        + Utils_.Brackets(configuration_description.isEmpty() ? sapfor_configuration_id : configuration_description);
         //   getUniqueKey();
     }
     public String getPassesInfo() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
index 8317b9f3..dbf7f388 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
@@ -1,11 +1,9 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
-import Common.Utils.Utils_;
-
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 public abstract class SapforPackageTreeNode extends DefaultMutableTreeNode {
     public ImageIcon getIcon() {
-      //  Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
+        //  Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
         ImageIcon res = new ImageIcon((getClass().getResource("/icons/versions/" + getImageKey() + ".png")));
         return (getImageKey() != null) ? res : null;
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
index e46a3646..17eacdcd 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -43,7 +43,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         repo = new File(Utils_.getHomeDirectory(), "Repo");
         repo_sapfor = new File(repo, "SAPFOR");
         //-
-        repo_sapfor_installation_directory =new File(repo_sapfor, "install");
+        repo_sapfor_installation_directory = new File(repo_sapfor, "install");
         repo_out = new File(repo_sapfor_installation_directory, Constants.out_file);
         repo_err = new File(repo_sapfor_installation_directory, Constants.err_file);
         repo_sapfor_assembly = new File(repo_sapfor_installation_directory, "Sapfor_F");
@@ -238,7 +238,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         Utils.CleanDirectory(repo);
         Utils.startScript(repo, repo, "git_clone",
                 "git clone " + Constants.SAPFOR_REPOSITORY + " " +
-                        Utils_.DQuotes(repo_sapfor)+
+                        Utils_.DQuotes(repo_sapfor) +
                         " 1>spf_out.txt 2>spf_err.txt\n").waitFor();
     }
     void CompileSapfor() throws Exception {
@@ -247,7 +247,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         Utils_.CheckAndCleanDirectory(repo_sapfor_installation_directory);
         //--
         Utils.startScript(repo_sapfor_installation_directory, repo_sapfor_installation_directory, "build_sapfor",
-                "cmake .. 1>" +  Constants.out_file + " 2>" + Constants.err_file +
+                "cmake .. 1>" + Constants.out_file + " 2>" + Constants.err_file +
                         "\nmake -j 14 1>>" +
                         Constants.out_file +
                         " 2>>" +
@@ -293,7 +293,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
                 FileUtils.copyFile(repo_sapfor_assembly, sapforBin);
                 sapforBin.setExecutable(true, false);
                 //--
-
                 sapfor.call_command = sapforBin.getAbsolutePath();
                 sapfor.buildDate = new Date().getTime();
                 //--
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index e49ae85b..2b73924b 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -22,18 +22,18 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new ServerSapforsForm(this, mountPanel);
     }
-    public ServerSapfor getLastDoneVersion(){
+    public ServerSapfor getLastDoneVersion() {
         Vector<ServerSapfor> versions = new Vector<>();
-        for (ServerSapfor serverSapfor: Data.values()){
+        for (ServerSapfor serverSapfor : Data.values()) {
             if (serverSapfor.state.equals(ServerSapforState.Done))
                 versions.add(serverSapfor);
         }
         versions.sort(new Comparator<ServerSapfor>() {
             @Override
             public int compare(ServerSapfor o1, ServerSapfor o2) {
-                return Long.compare(o1.buildDate,o2.buildDate);
+                return Long.compare(o1.buildDate, o2.buildDate);
             }
         });
-        return versions.isEmpty()?null:versions.lastElement();
+        return versions.isEmpty() ? null : versions.lastElement();
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
index 5be1dde7..b9662e1f 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
@@ -1,7 +1,6 @@
 package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
-import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Tables.RendererDate;
@@ -9,10 +8,11 @@ import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
+import _VisualDVM.Visual.RDataSetControlForm;
 
 import javax.swing.*;
 import java.util.Comparator;
-public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
+public class ServerSapforsForm extends RDataSetControlForm<ServerSapfor> {
     public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
diff --git a/src/_VisualDVM/Utils.java b/src/_VisualDVM/Utils.java
index 82244794..8aa578f5 100644
--- a/src/_VisualDVM/Utils.java
+++ b/src/_VisualDVM/Utils.java
@@ -511,13 +511,13 @@ public class Utils {
             }
         }
         TaskState state = TaskState.Finished;
-     //   if (starts == 0 || ends == 0) {
-     //       state = TaskState.WrongTestFormat;
-     //  } else
-       if (errors > 0) {
+        //   if (starts == 0 || ends == 0) {
+        //       state = TaskState.WrongTestFormat;
+        //  } else
+        if (errors > 0) {
             state = TaskState.DoneWithErrors;
         } else {
-            if (complete==0){
+            if (complete == 0) {
                 complete = total = 1;
             }
             state = TaskState.Done;
diff --git a/src/_VisualDVM/Visual/Interface/MainWindow.java b/src/_VisualDVM/Visual/Interface/MainWindow.java
index 0cb7dc8a..ac30c042 100644
--- a/src/_VisualDVM/Visual/Interface/MainWindow.java
+++ b/src/_VisualDVM/Visual/Interface/MainWindow.java
@@ -1,5 +1,4 @@
 package _VisualDVM.Visual.Interface;
-import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 public interface MainWindow {
     void Show();
     void ShowProject();
diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java
index f905f23e..2763eb00 100644
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -100,7 +100,7 @@ public class MainUI extends UIModule_ {
         return profilesWindow;
     }
     //---
-    void showUndefinedRights(){
+    void showUndefinedRights() {
         Global.mainModule.SetUserPassesAccess();
         getMainWindow().ShowUndefinedTabs();
         getTestingMenuBar().showServerAdminLabel(false);
@@ -111,8 +111,9 @@ public class MainUI extends UIModule_ {
         Global.normalProperties.setControlVisible("AddDefaultsToRunEnvironments", false);
         Global.normalProperties.AutoCheckTesting = false;
         Global.normalProperties.Update();
-    };
-    void showUserRights(){
+    }
+    ;
+    void showUserRights() {
         Global.mainModule.SetUserPassesAccess();
         getMainWindow().ShowUserTabs();
         getTestingMenuBar().showServerAdminLabel(false);
@@ -123,8 +124,9 @@ public class MainUI extends UIModule_ {
         Global.normalProperties.setControlVisible("AddDefaultsToRunEnvironments", false);
         Global.normalProperties.AutoCheckTesting = false;
         Global.normalProperties.Update();
-    };
-    void showDeveloperRights(){
+    }
+    ;
+    void showDeveloperRights() {
         Global.mainModule.SetDeveloperPassesAccess();
         getMainWindow().ShowDeveloperTabs();
         getTestingMenuBar().showServerAdminLabel(false);
@@ -134,7 +136,7 @@ public class MainUI extends UIModule_ {
         Global.normalProperties.setControlVisible("AddDefaultsToCompilationOptions", true);
         Global.normalProperties.setControlVisible("AddDefaultsToRunEnvironments", true);
     }
-    void showAdminRights(){
+    void showAdminRights() {
         Global.mainModule.SetAdminPassesAccess();
         getMainWindow().ShowAdminTabs();
         getTestingMenuBar().showServerAdminLabel(true);
@@ -143,8 +145,9 @@ public class MainUI extends UIModule_ {
         Global.normalProperties.setControlVisible("AutoTestsLoad", true);
         Global.normalProperties.setControlVisible("AddDefaultsToCompilationOptions", true);
         Global.normalProperties.setControlVisible("AddDefaultsToRunEnvironments", true);
-    };
-    public void ShowAccount(){
+    }
+    ;
+    public void ShowAccount() {
         getMainWindow().getCallbackWindow().ShowAccountInfo();
         switch (Global.mainModule.getAccount().role) {
             case Undefined:
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
index 2925c2a1..c523ed8a 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
@@ -17,12 +17,18 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 public class MainMenuBar extends VisualiserMenuBar {
-    JMenu analyses;
-    JMenu transformations;
-    MenuBarButton componentsButton;
     public MenuBarButton MachineButton;
     public MenuBarButton UserButton;
     public MenuBarButton CompilerButton;
+    JMenu analyses;
+    JMenu transformations;
+    MenuBarButton componentsButton;
+    ActionListener credentialsListener = new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            Global.mainModule.getUI().getMainWindow().FocusCredentials();
+        }
+    };
     public MainMenuBar() {
         addMenus(new LastOpenedProjectsMenu());
         addPasses(PassCode.OpenCurrentProject, PassCode.CreateEmptyProject);
@@ -100,12 +106,6 @@ public class MainMenuBar extends VisualiserMenuBar {
         CompilerButton.addActionListener(credentialsListener);
         ShowProject(false);
     }
-    ActionListener credentialsListener= new ActionListener() {
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            Global.mainModule.getUI().getMainWindow().FocusCredentials();
-        }
-    };
     public void ShowUpdatesIcon() {
         componentsButton.setIcon(Global.components.getButtonIconPath());
     }
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VersionsComparisonMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VersionsComparisonMenu.java
index aeb7f9e6..8ec98d36 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VersionsComparisonMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VersionsComparisonMenu.java
@@ -11,6 +11,6 @@ public class VersionsComparisonMenu extends PropertiesSubmenu {
                 "FortranWrapsOn",
                 "ExtensionsOn",
                 "ComparsionDiffMergeOn"
-                );
+        );
     }
 }
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
index 4367fb21..330294db 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
@@ -17,11 +17,10 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
         if (Utils_.isWindows()) {
             add(new PropertiesSubmenu("Компиляция на локальной машине", null,
                     Global.normalProperties,
-
                     "LocalMakePathWindows",
                     "Kernels"
             ));
-        }else {
+        } else {
             add(new PropertiesSubmenu("Компиляция на локальной машине", null,
                     Global.normalProperties,
                     "Kernels"
diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
index e77fb4a0..ac1e7ff1 100644
--- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
@@ -35,7 +35,7 @@ public class ProjectSettingsMenu extends VisualiserMenu {
         addSeparator();
         add(new PropertiesSubmenu("Анализ", null,
                 Global.mainModule.getProject().sapforProperties,
-               "Precompilation",
+                "Precompilation",
                 "KEEP_DVM_DIRECTIVES",
                 "IGNORE_IO_SAPFOR",
                 "MPI_PROGRAM",
@@ -59,9 +59,9 @@ public class ProjectSettingsMenu extends VisualiserMenu {
                 "SaveModifications"
         ));
         addSeparator();
-        add( Global.mainModule.getProject().sapforProperties.getMenuItem("TRANSLATE_MESSAGES"));
-        add( Global.mainModule.getProject().sapforProperties.getMenuItem("DEBUG_PRINT_ON"));
-        add( Global.mainModule.getProject().sapforProperties.getMenuItem("GCOVLimit"));
+        add(Global.mainModule.getProject().sapforProperties.getMenuItem("TRANSLATE_MESSAGES"));
+        add(Global.mainModule.getProject().sapforProperties.getMenuItem("DEBUG_PRINT_ON"));
+        add(Global.mainModule.getProject().sapforProperties.getMenuItem("GCOVLimit"));
     }
     public void ShowLanguage() {
         mLanguage.setText("Язык: " + Global.mainModule.getProject().languageName.getDescription());
diff --git a/src/_VisualDVM/Visual/RDataSetControlForm.java b/src/_VisualDVM/Visual/RDataSetControlForm.java
new file mode 100644
index 00000000..14dc9b79
--- /dev/null
+++ b/src/_VisualDVM/Visual/RDataSetControlForm.java
@@ -0,0 +1,19 @@
+package _VisualDVM.Visual;
+import Common.Database.Objects.riDBObject;
+import Common.Database.Tables.DataSet;
+import Common.Utils.TextLog;
+import Common.Visual.DataSetControlForm;
+import _VisualDVM.Global;
+
+import javax.swing.*;
+public abstract class RDataSetControlForm<D extends riDBObject> extends DataSetControlForm<D> {
+    public RDataSetControlForm(DataSet<?, D> dataSource_in, JPanel mountPanel_in) {
+        super(dataSource_in, mountPanel_in);
+    }
+    @Override
+    public boolean canModifyCurrent(TextLog Log) {
+        return super.canModifyCurrent(Log) && (
+                !(current instanceof riDBObject) ||
+                        Global.mainModule.getAccount().CheckAuthorship(((riDBObject) current).sender_address, Log));
+    }
+}
diff --git a/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java b/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java
index e1e9fcdc..7afa9a2e 100644
--- a/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java
+++ b/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java
@@ -1,7 +1,6 @@
 package _VisualDVM.Visual.Tables;
 import Common.MainModule_;
 import Common.Utils.Utils_;
-import Common.Visual.StatusEnum;
 import Common.Visual.Tables.RendererCell;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
@@ -18,9 +17,9 @@ public class RendererTestingPackageStatus extends RendererCell<TestingPackage> {
             TasksPackageState state = value.state;
             setFont(MainModule_.instance.getUI().getTheme().Fonts.get(state.getFont()));
             String text_ = state.getDescription();
-            switch (state){
+            switch (state) {
                 case DoneWithErrors:
-                    text_+=" "+ Utils_.Brackets((value.tasksCount-value.doneTasksCount)+"/"+value.tasksCount);
+                    text_ += " " + Utils_.Brackets((value.tasksCount - value.doneTasksCount) + "/" + value.tasksCount);
                     break;
                 default:
                     break;
diff --git a/src/_VisualDVM/Visual/Windows/AdministrationForm.java b/src/_VisualDVM/Visual/Windows/AdministrationForm.java
index 6b899df3..53ec55a4 100644
--- a/src/_VisualDVM/Visual/Windows/AdministrationForm.java
+++ b/src/_VisualDVM/Visual/Windows/AdministrationForm.java
@@ -5,20 +5,20 @@ import _VisualDVM.Visual.Interface.AdministrationWindow;
 
 import javax.swing.*;
 public class AdministrationForm implements FormWithSplitters, AdministrationWindow {
-    private JPanel content;
     public JSplitPane SC67;
+    private JPanel content;
     private JPanel userAccountsPanel;
     private JPanel workspacesPanel;
-    @Override
-    public JPanel getContent() {
-        return content;
-    }
-    public AdministrationForm(){
+    public AdministrationForm() {
         LoadSplitters();
         Global.componentsServer.credentials_db.userAccounts.mountUI(userAccountsPanel);
         Global.componentsServer.credentials_db.workspaces.mountUI(workspacesPanel);
     }
     @Override
+    public JPanel getContent() {
+        return content;
+    }
+    @Override
     public void ShowAll() {
         Global.componentsServer.credentials_db.userAccounts.ShowUI();
     }
diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java
index 838ccc60..9091dce2 100644
--- a/src/_VisualDVM/Visual/Windows/CallbackForm.java
+++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java
@@ -1,5 +1,7 @@
 package _VisualDVM.Visual.Windows;
 import Common.Utils.Utils_;
+import Common.Visual.Editor.BaseEditor;
+import Common.Visual.Editor.Viewer;
 import Common.Visual.FormWithSplitters;
 import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.TextField.StyledTextField;
@@ -9,8 +11,6 @@ import _VisualDVM.ComponentsServer.BugReport.BugReportState;
 import _VisualDVM.ComponentsServer.BugReport.UI.BugReportsForm;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.Editor.BaseEditor;
-import _VisualDVM.Visual.Editor.Viewer;
 import _VisualDVM.Visual.Interface.CallbackWindow;
 import _VisualDVM.Visual.Interface.CommentInterface;
 import _VisualDVM.Visual.Interface.DescriptionInterface;
@@ -364,7 +364,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         accountPanel.add(SC10);
     }
     @Override
-    public void showNoBugReports(){
+    public void showNoBugReports() {
         UI.Clear(accountPanel);
         accountPanel.add(new CallbackWelcomeForm().content);
         adminLabel.setVisible(false);
diff --git a/src/_VisualDVM/Visual/Windows/ComparisonForm.java b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
index d8faf825..86c8d0b1 100644
--- a/src/_VisualDVM/Visual/Windows/ComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
@@ -4,11 +4,11 @@ import Common.Database.Objects.DBObject;
 import Common.Passes.Pass;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.ShortLabel;
+import Common.Visual.Editor.BaseEditor;
 import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.UI;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.Editor.BaseEditor;
 import javafx.util.Pair;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
 import org.fife.ui.rtextarea.RTextScrollPane;
diff --git a/src/_VisualDVM/Visual/Windows/CredentialsForm.java b/src/_VisualDVM/Visual/Windows/CredentialsForm.java
index 44e3cf6d..03664d5b 100644
--- a/src/_VisualDVM/Visual/Windows/CredentialsForm.java
+++ b/src/_VisualDVM/Visual/Windows/CredentialsForm.java
@@ -4,14 +4,14 @@ import _VisualDVM.Global;
 import _VisualDVM.Visual.Interface.CredentialsWindow;
 
 import javax.swing.*;
-public class CredentialsForm implements CredentialsWindow,FormWithSplitters {
+public class CredentialsForm implements CredentialsWindow, FormWithSplitters {
+    public JSplitPane SC18;
+    public JSplitPane SC19;
     private JPanel content;
     private JPanel compilersPanel;
     private JPanel machinesPanel;
     private JPanel usersPanel;
-    public JSplitPane SC18;
-    public JSplitPane SC19;
-    public CredentialsForm(){
+    public CredentialsForm() {
         LoadSplitters();
         Global.mainModule.getDb().machines.mountUI(machinesPanel);
         Global.mainModule.getDb().users.mountUI(usersPanel);
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java
index 615b6301..aca03105 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.java
+++ b/src/_VisualDVM/Visual/Windows/FileForm.java
@@ -1,5 +1,6 @@
 package _VisualDVM.Visual.Windows;
 import Common.CommonConstants;
+import Common.Visual.Editor.Viewer;
 import Common.Visual.FormWithSplitters;
 import Common.Visual.Tables.DataTable;
 import Common.Visual.Trees.TreeForm;
@@ -12,7 +13,6 @@ import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.ProjectData.SapforData.Arrays.UI.FileArraysTree;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree;
 import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree;
-import _VisualDVM.Visual.Editor.Viewer;
 import _VisualDVM.Visual.Interface.FileWindow;
 import _VisualDVM.Visual.Interface.SPFEditorInterface;
 import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
@@ -172,29 +172,29 @@ public class FileForm implements FileWindow, FormWithSplitters {
     }
     @Override
     public void ShowErrorsCount() {
-        messagesTabs.setTitleAt(2, (Global.normalProperties.ShowFullTabsNames  ? "Ошибки: " : "") + file.father.db.errors.getUI().getRowCount());
+        messagesTabs.setTitleAt(2, (Global.normalProperties.ShowFullTabsNames ? "Ошибки: " : "") + file.father.db.errors.getUI().getRowCount());
     }
     @Override
     public void ShowNotesCount() {
-        messagesTabs.setTitleAt(0, (Global.normalProperties.ShowFullTabsNames  ? "Примечания: " : "") + file.father.db.notes.getUI().getRowCount());
+        messagesTabs.setTitleAt(0, (Global.normalProperties.ShowFullTabsNames ? "Примечания: " : "") + file.father.db.notes.getUI().getRowCount());
     }
     @Override
     public void ShowRecommendationsCount() {
-        messagesTabs.setTitleAt(3, (Global.normalProperties.ShowFullTabsNames  ? "Рекомендации: " : "") + file.father.db.recommendations.getUI().getRowCount());
+        messagesTabs.setTitleAt(3, (Global.normalProperties.ShowFullTabsNames ? "Рекомендации: " : "") + file.father.db.recommendations.getUI().getRowCount());
     }
     //---
     @Override
     public void RefreshTabsNames() {
-        UI.ShowTabsNames(graphsTabs, Global.normalProperties.ShowFullTabsNames );
+        UI.ShowTabsNames(graphsTabs, Global.normalProperties.ShowFullTabsNames);
         //--
         ShowNotesCount();
         ShowWarningsCount();
         ShowErrorsCount();
         ShowRecommendationsCount();
         //--
-        messagesTabs.setTitleAt(4, (Global.normalProperties.ShowFullTabsNames  ? "Компиляция" : ""));
-        messagesTabs.setTitleAt(5, (Global.normalProperties.ShowFullTabsNames  ? "Запуск" : ""));
-        messagesTabs.setTitleAt(6, (Global.normalProperties.ShowFullTabsNames  ? "Журнал GCOV" : ""));
+        messagesTabs.setTitleAt(4, (Global.normalProperties.ShowFullTabsNames ? "Компиляция" : ""));
+        messagesTabs.setTitleAt(5, (Global.normalProperties.ShowFullTabsNames ? "Запуск" : ""));
+        messagesTabs.setTitleAt(6, (Global.normalProperties.ShowFullTabsNames ? "Журнал GCOV" : ""));
     }
     @Override
     public void FocusCompilationOut() {
@@ -229,10 +229,10 @@ public class FileForm implements FileWindow, FormWithSplitters {
         file.father.db.warnings.ClearUI();
         file.father.db.errors.ClearUI();
         file.father.db.recommendations.ClearUI();
-        messagesTabs.setTitleAt(0, (Global.normalProperties.ShowFullTabsNames  ? "Примечания: " : "") + "-");
-        messagesTabs.setTitleAt(1, (Global.normalProperties.ShowFullTabsNames  ? "Предупреждения: " : "") + "-");
-        messagesTabs.setTitleAt(2, (Global.normalProperties.ShowFullTabsNames  ? "Ошибки: " : "") + "-");
-        messagesTabs.setTitleAt(3, (Global.normalProperties.ShowFullTabsNames  ? "Рекомендации: " : "") + "-");
+        messagesTabs.setTitleAt(0, (Global.normalProperties.ShowFullTabsNames ? "Примечания: " : "") + "-");
+        messagesTabs.setTitleAt(1, (Global.normalProperties.ShowFullTabsNames ? "Предупреждения: " : "") + "-");
+        messagesTabs.setTitleAt(2, (Global.normalProperties.ShowFullTabsNames ? "Ошибки: " : "") + "-");
+        messagesTabs.setTitleAt(3, (Global.normalProperties.ShowFullTabsNames ? "Рекомендации: " : "") + "-");
     }
     @Override
     public void ShowLoops() {
diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java
index ec0c6c30..32eec45a 100644
--- a/src/_VisualDVM/Visual/Windows/MainForm.java
+++ b/src/_VisualDVM/Visual/Windows/MainForm.java
@@ -258,13 +258,12 @@ public class MainForm extends Form implements MainWindow {
     }
     @Override
     public AdministrationWindow getAdministrationWindow() {
-        if (administrationForm==null)
-            administrationForm= new AdministrationForm();
+        if (administrationForm == null)
+            administrationForm = new AdministrationForm();
         return administrationForm;
     }
     @Override
-    public void ShowUndefinedTabs()
-    {
+    public void ShowUndefinedTabs() {
         //ничего не делаем. лишних панелей и так нет. экспорт
     }
     @Override
diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java
index abe2bff7..28687cea 100644
--- a/src/_VisualDVM/Visual/Windows/ProjectForm.java
+++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java
@@ -2,6 +2,7 @@ package _VisualDVM.Visual.Windows;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.TabToolBar;
+import Common.Visual.Editor.Viewer;
 import Common.Visual.FormWithSplitters;
 import Common.Visual.Trees.TreeForm;
 import Common.Visual.UI;
@@ -13,7 +14,6 @@ import _VisualDVM.ProjectData.ProjectView;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.InlineTree;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.InlineTree2;
 import _VisualDVM.ProjectData.SapforData.Includes.UI.IncludesTree;
-import _VisualDVM.Visual.Editor.Viewer;
 import _VisualDVM.Visual.Interface.AnalysisWindow;
 import _VisualDVM.Visual.Interface.ArraysWindow;
 import _VisualDVM.Visual.Interface.FunctionsWindow;
diff --git a/src/_VisualDVM/Visual/Windows/TestingForm.java b/src/_VisualDVM/Visual/Windows/TestingForm.java
index 2efb919c..b436fd1e 100644
--- a/src/_VisualDVM/Visual/Windows/TestingForm.java
+++ b/src/_VisualDVM/Visual/Windows/TestingForm.java
@@ -1,5 +1,6 @@
 package _VisualDVM.Visual.Windows;
 import Common.MainModule_;
+import Common.Visual.Editor.BaseEditor;
 import Common.Visual.FormWithSplitters;
 import Common.Visual.TextField.StyledTextField;
 import _VisualDVM.Current;
@@ -10,7 +11,6 @@ import _VisualDVM.TestingSystem.Common.TestingServer;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import _VisualDVM.Visual.Editor.BaseEditor;
 import _VisualDVM.Visual.Interface.TestingWindow;
 
 import javax.swing.*;