diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 26b7d9c3..f0126ef8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,32 +7,70 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Common/MainModules/_MainModule.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectsPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectsPass.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/GraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/GraphMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.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/Passes/All/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteRunTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameFile.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/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Project/ChangeFilePass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Project/ChangeFilePass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.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/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.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/ServerObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ServerObjectPass.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/Passes/Testing/DeleteTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.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/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/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/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.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/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index b348b777..e05c3698 100644
--- a/properties
+++ b/properties
@@ -10,7 +10,7 @@
   "SMTPHost": "smtp.mail.ru",
   "SMTPPort": 465,
   "MailSocketPort": 465,
-  "collapseCredentials": false,
+  "collapseCredentials": true,
   "collapseFileGraphs": false,
   "collapseFileMessages": false,
   "collapseProjectTrees": false,
@@ -33,7 +33,7 @@
   "InstructionPath": "",
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
-  "AutoCheckTesting": false,
+  "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": true,
   "eraseTestingWorkspaces": true
diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java
index 4e1eb295..a820e817 100644
--- a/src/Common/Database/Database.java
+++ b/src/Common/Database/Database.java
@@ -13,11 +13,14 @@ import java.util.Vector;
 //самый общий интерфейс базы данных, независимо от реализации.
 public abstract class Database {
     //------------------------------
-    public LinkedHashMap<Class<? extends DBObject>, DBTable> tables = new LinkedHashMap<>(); //таблицы
+    protected LinkedHashMap<Class<? extends DBObject>, DBTable> tables = new LinkedHashMap<>(); //таблицы
     protected File file = null;
     public Database(File file_in) {
         file = file_in;
     }
+    public <T extends DBObject> DBTable<?, T> getTable(Class<T> tableClass) {
+        return tables.get(tableClass);
+    }
     public File getFile() {
         return file;
     }
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index 7de29443..65535278 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -42,7 +42,9 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     }
     protected void createFilters() {
     }
-    public boolean hasMenuBar(){return true;}
+    public boolean hasMenuBar() {
+        return true;
+    }
     public DataMenuBar createMenuBar() {
         return new DataMenuBar(getPluralDescription());
     }
@@ -268,7 +270,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         return MainModule_.instance.Check(log, CurrentName());
     }
     public boolean CheckSelectedOrCurrent(TextLog log) {
-        if ((getSelectedCount() == 0) && (CurrentName()==null || (getCurrent()==null))) {
+        if ((getSelectedCount() == 0) && (CurrentName() == null || (getCurrent() == null))) {
             log.Writeln_(getPluralDescription() + ":");
             log.Writeln_("Отсутствуют отмеченные объекты, или текущий объект!");
             return false;
@@ -298,7 +300,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         }
         return res;
     }
-    public Vector<K> getSelectedOrCurrentKeys(){
+    public Vector<K> getSelectedOrCurrentKeys() {
         Vector<K> res = new Vector<>();
         if (getSelectedCount() > 0)
             res = getSelectedKeys();
@@ -328,5 +330,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         }
     }
     //-------------------------------------------------------------------------------------
-    public PassCode_ getDeletePassCode(){return null;}
+    public PassCode_ getDeletePassCode() {
+        return null;
+    }
 }
diff --git a/src/Common/MainModules/_MainModule.java b/src/Common/MainModules/_MainModule.java
new file mode 100644
index 00000000..311c75cd
--- /dev/null
+++ b/src/Common/MainModules/_MainModule.java
@@ -0,0 +1,3 @@
+package Common.MainModules;
+public class _MainModule {
+}
diff --git a/src/Common/Passes/AddObjectPass.java b/src/Common/Passes/AddObjectPass.java
index c7e72d5d..bad118f4 100644
--- a/src/Common/Passes/AddObjectPass.java
+++ b/src/Common/Passes/AddObjectPass.java
@@ -11,7 +11,7 @@ public abstract class AddObjectPass<D extends DBObject> extends ObjectPass<D> {
     protected boolean canStart(Object... args) throws Exception {
         target = d.newInstance();
         return
-                ((getOwner() == null) || (getDb().tables.get(getOwner()).CheckCurrent(Log))) &&
+                ((getOwner() == null) || (getDb().getTable(getOwner()).CheckCurrent(Log))) &&
                         fillObjectFields();
     }
     protected boolean fillObjectFields() throws Exception {
diff --git a/src/Common/Passes/DeleteObjectPass.java b/src/Common/Passes/DeleteObjectPass.java
index 255d4c95..0477d5e1 100644
--- a/src/Common/Passes/DeleteObjectPass.java
+++ b/src/Common/Passes/DeleteObjectPass.java
@@ -23,7 +23,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
                 case DROP:
                     break;
                 case DELETE:
-                    getDb().tables.get(dep).ClearUI();
+                    getDb().getTable(dep).ClearUI();
                     break;
             }
         }
@@ -49,7 +49,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
     protected void performFinish() throws Exception {
         getTable().ShowUI();
         for (Class dep : getTable().getFKDependencies().keySet()) {
-            getDb().tables.get(dep).RefreshUI();
+            getDb().getTable(dep).RefreshUI();
         }
     }
 }
diff --git a/src/Common/Passes/DeleteObjectsPass.java b/src/Common/Passes/DeleteObjectsPass.java
index b72bf07a..05658dfd 100644
--- a/src/Common/Passes/DeleteObjectsPass.java
+++ b/src/Common/Passes/DeleteObjectsPass.java
@@ -1,6 +1,6 @@
 package Common.Passes;
 import Common.Database.Objects.DBObject;
-public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<D>{
+public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<D> {
     public DeleteObjectsPass(Class<D> d_in) {
         super(d_in);
     }
@@ -12,7 +12,7 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
     protected boolean canStart(Object... args) throws Exception {
         if (!getTable().CheckSelectedOrCurrent(Log))
             return false;
-        target =  getTable().getSelectedOrCurrent();
+        target = getTable().getSelectedOrCurrent();
         return getTable().ShowDeleteObjectsDialog(target.size());
     }
     //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@@ -25,14 +25,14 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
                 case DROP:
                     break;
                 case DELETE:
-                    getDb().tables.get(dep).ClearUI();
+                    getDb().getTable(dep).ClearUI();
                     break;
             }
         }
     }
     @Override
     protected void body() throws Exception {
-        for (D d: target){
+        for (D d : target) {
             getDb().Delete(d);
             for (Class dep : getTable().getFKDependencies().keySet()) {
                 switch (getTable().getFKDependencies().get(dep).data) {
@@ -53,7 +53,7 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
     protected void performFinish() throws Exception {
         getTable().ShowUI();
         for (Class dep : getTable().getFKDependencies().keySet()) {
-            getDb().tables.get(dep).RefreshUI();
+            getDb().getTable(dep).RefreshUI();
         }
     }
 }
diff --git a/src/Common/Passes/EditObjectPass.java b/src/Common/Passes/EditObjectPass.java
index 2a698505..8aa6e9e9 100644
--- a/src/Common/Passes/EditObjectPass.java
+++ b/src/Common/Passes/EditObjectPass.java
@@ -21,6 +21,6 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
     protected void showFinish() throws Exception {
         getTable().ShowUI(target.getPK());
         for (Class dep : getTable().getFKDependencies().keySet())
-            getDb().tables.get(dep).RefreshUI();
+            getDb().getTable(dep).RefreshUI();
     }
 }
diff --git a/src/Common/Passes/ObjectPass.java b/src/Common/Passes/ObjectPass.java
index ad4695bc..87615bf7 100644
--- a/src/Common/Passes/ObjectPass.java
+++ b/src/Common/Passes/ObjectPass.java
@@ -13,7 +13,7 @@ public abstract class ObjectPass<D extends DBObject> extends Pass<D> {
     }
     ; //источник данных
     public DBTable getTable() {
-        return getDb().tables.get(d);
+        return getDb().getTable(d);
     } //таблица в источнике данных
     @Override//sorted
     public String getButtonText() {
diff --git a/src/Common/Passes/ObjectsPass.java b/src/Common/Passes/ObjectsPass.java
index defd8d27..3bb87736 100644
--- a/src/Common/Passes/ObjectsPass.java
+++ b/src/Common/Passes/ObjectsPass.java
@@ -15,7 +15,7 @@ public abstract class ObjectsPass<D extends DBObject> extends Pass<Vector<D>> {
         return MainModule_.instance.getDb();
     }
     public DBTable getTable() {
-        return getDb().tables.get(d);
+        return getDb().getTable(d);
     } //таблица в источнике данных
     @Override//sorted
     public String getButtonText() {
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index b4188df7..0ed4c8c9 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -309,7 +309,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
                 FKBehaviour behaviour = table.getFKDependencies().get(dep);
                 switch (behaviour.ui) {
                     case ACTIVE:
-                        table.getDb().tables.get(dep).ShowUI();
+                        table.getDb().getTable(dep).ShowUI();
                         break;
                     case PASSIVE:
                         break;
@@ -325,7 +325,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
                 FKBehaviour behaviour = table.getFKDependencies().get(dep);
                 switch (behaviour.ui) {
                     case ACTIVE:
-                        table.getDb().tables.get(dep).ClearUI();
+                        table.getDb().getTable(dep).ClearUI();
                         break;
                     case PASSIVE:
                         break;
diff --git a/src/Common/Visual/Menus/GraphMenu.java b/src/Common/Visual/Menus/GraphMenu.java
index 45f4e77a..fc77e801 100644
--- a/src/Common/Visual/Menus/GraphMenu.java
+++ b/src/Common/Visual/Menus/GraphMenu.java
@@ -1,6 +1,4 @@
 package Common.Visual.Menus;
-import Common.Visual.Menus.StyledPopupMenu;
-import Common.Visual.Menus.VisualiserMenuItem;
 import Common.Visual.Trees.StyledTree;
 
 import javax.swing.*;
diff --git a/src/Common/Visual/Trees/StyledTree.java b/src/Common/Visual/Trees/StyledTree.java
index 72f26877..b0823a67 100644
--- a/src/Common/Visual/Trees/StyledTree.java
+++ b/src/Common/Visual/Trees/StyledTree.java
@@ -1,8 +1,8 @@
 package Common.Visual.Trees;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.Themes.ThemeElement;
 import Common.Visual.Menus.GraphMenu;
+import Common.Visual.Themes.ThemeElement;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
index bc225d3f..292a50c5 100644
--- a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
@@ -165,7 +165,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),PassCode.AddCompiler,
+        return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
                 PassCode.EditCompiler,
                 PassCode.DeleteCompiler,
                 PassCode.ShowCompilerVersion,
diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
index ae431c1a..e27a50c1 100644
--- a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
@@ -137,7 +137,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
         return new DataMenuBar(getPluralDescription(),
                 PassCode.AddMachine,
                 PassCode.EditMachine,
-                PassCode.DeleteMachine){
+                PassCode.DeleteMachine) {
             {
                 add(new MenuBarButton() {
                     {
diff --git a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
index 07464bb3..8eae6a8a 100644
--- a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
@@ -82,7 +82,7 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
         return new DataMenuBar(getPluralDescription(), PassCode.Compile,
                 PassCode.AddMakefile,
                 PassCode.EditMakefile,
-                PassCode.DeleteMakefile){
+                PassCode.DeleteMakefile) {
             {
                 addSeparator();
                 addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
index e1dcb947..71910fc7 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -175,7 +175,7 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
                 PassCode.Run,
                 PassCode.AddRunConfiguration,
                 PassCode.EditRunConfiguration,
-                PassCode.DeleteRunConfiguration){
+                PassCode.DeleteRunConfiguration) {
             {
                 add(new JSeparator());
                 addPasses(PassCode.EditProjectRunMaxtime);
diff --git a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
index b65c2508..6cd479df 100644
--- a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
@@ -29,7 +29,7 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
     }
     @Override
     protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this){
+        return new DataSetControlForm(this) {
             @Override
             public boolean hasCheckBox() {
                 return true;
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
index b251b065..50e55860 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
@@ -14,7 +14,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
     protected P pass; //проход отвечающий за задачу
     protected int performanceTime; //сколько задача уже выполняется.
     public void ShowTaskState() {
-        Global.mainModule.getDb().tables.get(task.getClass()).ShowUI(task.getPK());
+        Global.mainModule.getDb().getTable(task.getClass()).ShowUI(task.getPK());
     }
     public void Init(T task_in, P pass_in, db_project_info project_in) {
         task = task_in;
diff --git a/src/_VisualDVM/Passes/All/AddFile.java b/src/_VisualDVM/Passes/All/AddFile.java
index 500b5a0a..0027fd50 100644
--- a/src/_VisualDVM/Passes/All/AddFile.java
+++ b/src/_VisualDVM/Passes/All/AddFile.java
@@ -1,11 +1,11 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
-import _VisualDVM.Visual.Windows.FileNameForm;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Project.ChangeFilePass;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileType;
 import _VisualDVM.Utils;
+import _VisualDVM.Visual.Windows.FileNameForm;
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java b/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java
index 589dfc2c..bf064e18 100644
--- a/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java
+++ b/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
-import _VisualDVM.Visual.Windows.FileNameForm;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Project.ChangeFilePass;
+import _VisualDVM.Visual.Windows.FileNameForm;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
diff --git a/src/_VisualDVM/Passes/All/CreateEmptyProject.java b/src/_VisualDVM/Passes/All/CreateEmptyProject.java
index b6f8d122..41e9e14f 100644
--- a/src/_VisualDVM/Passes/All/CreateEmptyProject.java
+++ b/src/_VisualDVM/Passes/All/CreateEmptyProject.java
@@ -2,10 +2,10 @@ package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
-import _VisualDVM.Visual.Windows.FileNameForm;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Visual.Windows.FileNameForm;
 
 import java.io.File;
 import java.nio.file.Paths;
diff --git a/src/_VisualDVM/Passes/All/DeleteRunTasks.java b/src/_VisualDVM/Passes/All/DeleteRunTasks.java
index f02b6b0f..4cba632e 100644
--- a/src/_VisualDVM/Passes/All/DeleteRunTasks.java
+++ b/src/_VisualDVM/Passes/All/DeleteRunTasks.java
@@ -1,11 +1,7 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.DeleteObjectsPass;
-import Common.Passes.Pass;
 import Common.Utils.Utils_;
-import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
-
-import java.util.Vector;
 public class DeleteRunTasks extends DeleteObjectsPass<RunTask> {
     public DeleteRunTasks() {
         super(RunTask.class);
diff --git a/src/_VisualDVM/Passes/All/RenameDirectory.java b/src/_VisualDVM/Passes/All/RenameDirectory.java
index cf6f18c7..0b371e87 100644
--- a/src/_VisualDVM/Passes/All/RenameDirectory.java
+++ b/src/_VisualDVM/Passes/All/RenameDirectory.java
@@ -1,13 +1,13 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
-import _VisualDVM.Visual.Windows.FileNameForm;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Project.ChangeFilePass;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.Utils;
+import _VisualDVM.Visual.Windows.FileNameForm;
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/_VisualDVM/Passes/All/RenameFile.java b/src/_VisualDVM/Passes/All/RenameFile.java
index 4a034f48..33d98a67 100644
--- a/src/_VisualDVM/Passes/All/RenameFile.java
+++ b/src/_VisualDVM/Passes/All/RenameFile.java
@@ -1,13 +1,13 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
-import _VisualDVM.Visual.Windows.FileNameForm;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Project.ChangeFilePass;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileType;
+import _VisualDVM.Visual.Windows.FileNameForm;
 
 import java.io.File;
 import java.nio.file.Paths;
diff --git a/src/_VisualDVM/Passes/All/ShowCompilerHelp.java b/src/_VisualDVM/Passes/All/ShowCompilerHelp.java
index 5a6f5e36..f0b170af 100644
--- a/src/_VisualDVM/Passes/All/ShowCompilerHelp.java
+++ b/src/_VisualDVM/Passes/All/ShowCompilerHelp.java
@@ -1,11 +1,11 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
-import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 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 00a8df74..f9114b55 100644
--- a/src/_VisualDVM/Passes/All/ShowCompilerVersion.java
+++ b/src/_VisualDVM/Passes/All/ShowCompilerVersion.java
@@ -1,11 +1,11 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
-import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 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 f36c5b21..9c7e0eec 100644
--- a/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
+++ b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
-import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
@@ -8,6 +7,7 @@ import _VisualDVM.Repository.Component.Component;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 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 46d6d711..24080ffc 100644
--- a/src/_VisualDVM/Passes/All/ShowTestingServerFile.java
+++ b/src/_VisualDVM/Passes/All/ShowTestingServerFile.java
@@ -1,11 +1,11 @@
 package _VisualDVM.Passes.All;
 import Common.Passes.PassException;
-import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.Passes.Server.TestingSystemPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 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/StartSelectedDVMConfigurations.java b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
index c035ee31..47048e78 100644
--- a/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
+++ b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
@@ -43,7 +43,7 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
         if (!Global.mainModule.getCompiler().versionLoaded)
             Global.mainModule.getPass(PassCode.ShowCompilerVersion).Do(Global.mainModule.getCompiler(), false);
         //-----
-        if (!Global.testingServer.db.dvm_configurations.CheckSelectedOrCurrent(Log)){
+        if (!Global.testingServer.db.dvm_configurations.CheckSelectedOrCurrent(Log)) {
             return false;
         }
         Vector<DVMConfiguration> configurations = Global.testingServer.db.dvm_configurations.getSelectedOrCurrent();
diff --git a/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java b/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java
index b2005a30..1100d14e 100644
--- a/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java
+++ b/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java
@@ -35,7 +35,7 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
             return false;
         }
         //--
-        if (!Global.testingServer.db.sapforConfigurations.CheckSelectedOrCurrent(Log)){
+        if (!Global.testingServer.db.sapforConfigurations.CheckSelectedOrCurrent(Log)) {
             return false;
         }
         configurations = Global.testingServer.db.sapforConfigurations.getSelectedOrCurrent();
diff --git a/src/_VisualDVM/Passes/Project/ChangeFilePass.java b/src/_VisualDVM/Passes/Project/ChangeFilePass.java
index 49be86f4..b1caff78 100644
--- a/src/_VisualDVM/Passes/Project/ChangeFilePass.java
+++ b/src/_VisualDVM/Passes/Project/ChangeFilePass.java
@@ -1,8 +1,8 @@
 package _VisualDVM.Passes.Project;
 import Common.Passes.Pass;
-import _VisualDVM.Visual.Windows.FileNameForm;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Project.db_project_info;
+import _VisualDVM.Visual.Windows.FileNameForm;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
diff --git a/src/_VisualDVM/Passes/Server/DeleteServerObject.java b/src/_VisualDVM/Passes/Server/DeleteServerObject.java
index 4531fcab..8ee9f5ff 100644
--- a/src/_VisualDVM/Passes/Server/DeleteServerObject.java
+++ b/src/_VisualDVM/Passes/Server/DeleteServerObject.java
@@ -12,20 +12,20 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        target = (D) getDb().tables.get(d).getCurrent();
-        return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowDeleteObjectDialog(target);
+        target = (D) getDb().getTable(d).getCurrent();
+        return getDb().getTable(d).CheckCurrent(Log) && getDb().getTable(d).ShowDeleteObjectDialog(target);
     }
     //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
     @Override
     protected void showPreparation() throws Exception {
-        getDb().tables.get(d).ClearUI();
-        for (Class dep : getDb().tables.get(d).getFKDependencies().keySet()) {
-            switch (getDb().tables.get(d).getFKDependencies().get(dep).data) {
+        getDb().getTable(d).ClearUI();
+        for (Class dep : getDb().getTable(d).getFKDependencies().keySet()) {
+            switch (getDb().getTable(d).getFKDependencies().get(dep).data) {
                 case NONE:
                 case DROP:
                     break;
                 case DELETE:
-                    getDb().tables.get(dep).ClearUI();
+                    getDb().getTable(dep).ClearUI();
                     break;
             }
         }
@@ -37,6 +37,6 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
     }
     @Override
     protected void showDone() throws Exception {
-        getDb().tables.get(d).ui_.Show();
+        getDb().getTable(d).ui_.Show();
     }
 }
diff --git a/src/_VisualDVM/Passes/Server/DeleteServerObjects.java b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java
index 208a13ef..3c815940 100644
--- a/src/_VisualDVM/Passes/Server/DeleteServerObjects.java
+++ b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java
@@ -35,7 +35,7 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        DBTable table = getDb().tables.get(d);
+        DBTable table = getDb().getTable(d);
         if (!table.CheckSelectedOrCurrent(Log))
             return false;
         target = table.getSelectedOrCurrentKeys();
@@ -44,14 +44,14 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
     //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
     @Override
     protected void showPreparation() throws Exception {
-        getDb().tables.get(d).ClearUI();
-        for (Class dep : getDb().tables.get(d).getFKDependencies().keySet()) {
-            switch (getDb().tables.get(d).getFKDependencies().get(dep).data) {
+        getDb().getTable(d).ClearUI();
+        for (Class dep : getDb().getTable(d).getFKDependencies().keySet()) {
+            switch (getDb().getTable(d).getFKDependencies().get(dep).data) {
                 case NONE:
                 case DROP:
                     break;
                 case DELETE:
-                    getDb().tables.get(dep).ClearUI();
+                    getDb().getTable(dep).ClearUI();
                     break;
             }
         }
diff --git a/src/_VisualDVM/Passes/Server/EditServerObject.java b/src/_VisualDVM/Passes/Server/EditServerObject.java
index c55692cb..022d2e10 100644
--- a/src/_VisualDVM/Passes/Server/EditServerObject.java
+++ b/src/_VisualDVM/Passes/Server/EditServerObject.java
@@ -15,8 +15,8 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
     //--
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        target = (D) getDb().tables.get(d).getCurrent();
-        return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowEditObjectDialog(target);
+        target = (D) getDb().getTable(d).getCurrent();
+        return getDb().getTable(d).CheckCurrent(Log) && getDb().getTable(d).ShowEditObjectDialog(target);
     }
     //--
     @Override
@@ -26,6 +26,6 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
     @Override
     protected void showDone() throws Exception {
         VisualCaches.RefreshCache(target);
-        getDb().tables.get(d).ui_.Show(target.getPK());
+        getDb().getTable(d).ui_.Show(target.getPK());
     }
 }
diff --git a/src/_VisualDVM/Passes/Server/PublishServerObject.java b/src/_VisualDVM/Passes/Server/PublishServerObject.java
index 73082c00..b758a91c 100644
--- a/src/_VisualDVM/Passes/Server/PublishServerObject.java
+++ b/src/_VisualDVM/Passes/Server/PublishServerObject.java
@@ -41,6 +41,6 @@ public class PublishServerObject<S extends RepositoryServer, D extends DBObject>
     @Override
     protected void showDone() throws Exception {
         super.showDone();
-        getDb().tables.get(d).ui_.Show(pk);
+        getDb().getTable(d).ui_.Show(pk);
     }
 }
diff --git a/src/_VisualDVM/Passes/Server/RepositoryPass.java b/src/_VisualDVM/Passes/Server/RepositoryPass.java
index 099124e5..14138aa8 100644
--- a/src/_VisualDVM/Passes/Server/RepositoryPass.java
+++ b/src/_VisualDVM/Passes/Server/RepositoryPass.java
@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.Server;
 import Common.Database.Objects.DBObject;
+import Common.Database.RepositoryRefuseException;
 import Common.Passes.Pass;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
-import Common.Database.RepositoryRefuseException;
 import _VisualDVM.Repository.RepositoryServer;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
diff --git a/src/_VisualDVM/Passes/Server/ServerObjectPass.java b/src/_VisualDVM/Passes/Server/ServerObjectPass.java
index dc450e50..1b063e59 100644
--- a/src/_VisualDVM/Passes/Server/ServerObjectPass.java
+++ b/src/_VisualDVM/Passes/Server/ServerObjectPass.java
@@ -26,6 +26,6 @@ public abstract class ServerObjectPass<S extends RepositoryServer, D extends DBO
     }
     //-
     public boolean fillObjectFields() throws Exception {
-        return getDb().tables.get(d).ShowAddObjectDialog(target);
+        return getDb().getTable(d).ShowAddObjectDialog(target);
     }
 }
diff --git a/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
index 41c5246a..034aac34 100644
--- a/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
+++ b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
@@ -14,7 +14,7 @@ public abstract class ActualizeTestingPackages<P extends TestingPackage> extends
         p = p_in;
     }
     iDBTable<P> getTable() {
-        return (iDBTable<P>) Global.testingServer.db.tables.get(p);
+        return (iDBTable<P>) Global.testingServer.db.getTable(p);
     }
     protected abstract ServerCode getCheckCode();
     @Override
diff --git a/src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java b/src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java
index 81246816..1393a15b 100644
--- a/src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java
+++ b/src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java
@@ -57,8 +57,8 @@ public abstract class DeleteTestingPackages<P extends TestingPackage> extends De
     }
     void DeleteDraftOnly() throws Exception {
         showPreparation();
-        getDb().tables.get(d).Data.remove(CommonConstants.Nan);
-        getDb().tables.get(d).ShowUI();
+        getDb().getTable(d).Data.remove(CommonConstants.Nan);
+        getDb().getTable(d).ShowUI();
     }
     @Override
     protected void performDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java b/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java
index 74a0b8bb..c587b489 100644
--- a/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java
+++ b/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java
@@ -38,7 +38,7 @@ public abstract class SaveCurrentConfiguration<C extends Configuration, S extend
             Vector<Test> groupTests = Global.testingServer.db.tests.getSelectedGroupTests(group);
             tests.addAll(groupTests);
         }
-        for (Object setting : Global.testingServer.db.tables.get(s).getSelectedItems()) {
+        for (Object setting : Global.testingServer.db.getTable(s).getSelectedItems()) {
             settings.add((Settings) setting);
         }
         return true;
diff --git a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
index 8ecca794..6fdca028 100644
--- a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
+++ b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
@@ -50,7 +50,7 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription()){
+        return new DataMenuBar(getPluralDescription()) {
             @Override
             public void createSelectionButtons(DataSet dataSet) {
                 //не нужны.
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java b/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
index 26695ef0..f1c934b9 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
@@ -1,10 +1,10 @@
 package _VisualDVM.ProjectData.Files.UI;
 import Common.Visual.Trees.DataTree;
-import _VisualDVM.Visual.Trees.GraphTreeCellRenderer;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.SapforData.FileObject;
 import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
+import _VisualDVM.Visual.Trees.GraphTreeCellRenderer;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 public class FileGraphTree extends DataTree {
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java b/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
index 319c41b6..d12b3cc7 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
@@ -1,11 +1,11 @@
 package _VisualDVM.ProjectData.Files.UI;
 import Common.Visual.DragDrop.FileDrop;
+import Common.Visual.Menus.GraphMenu;
 import Common.Visual.Trees.StyledTree;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
-import Common.Visual.Menus.GraphMenu;
 import _VisualDVM.Visual.Menus.ProjectFilesMenu;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java b/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
index 030b04c0..746cfbcd 100644
--- a/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
+++ b/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
@@ -21,7 +21,6 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
                 columns.get(1).setMinWidth(700);
                 columns.get(1).setRendererClass(RendererWrapText.class);
             }
-
         };
     }
     @Override
diff --git a/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java b/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
index 4a51b353..40aa8c72 100644
--- a/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
+++ b/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
@@ -1,10 +1,10 @@
 package _VisualDVM.ProjectData.Project.UI;
+import Common.Visual.Menus.GraphMenu;
 import Common.Visual.Selectable;
 import Common.Visual.Trees.DataTree;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import Common.Visual.Menus.GraphMenu;
 import _VisualDVM.Visual.Menus.VersionsMenu;
 
 import javax.swing.tree.TreePath;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
index 30180af2..98ab4b23 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
@@ -1,7 +1,6 @@
 package _VisualDVM.ProjectData.SapforData.Arrays;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
-import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererHiddenList;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
index 038e032b..5f6fd7f6 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
@@ -1,8 +1,8 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.UI;
+import Common.Visual.Menus.GraphMenu;
 import Common.Visual.Trees.StyledTree;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import Common.Visual.Menus.GraphMenu;
 
 import javax.swing.*;
 public class DistributionMenu extends GraphMenu {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
index e3cd018f..03db5dcd 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
@@ -1,9 +1,9 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.UI;
+import Common.Visual.Menus.GraphMenu;
 import Common.Visual.Trees.StyledTree;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
-import Common.Visual.Menus.GraphMenu;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java
index 5e529c2b..6ec6864b 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java
@@ -1,10 +1,10 @@
 package _VisualDVM.ProjectData.SapforData.Functions.UI;
+import Common.Visual.Menus.GraphMenu;
 import Common.Visual.Trees.SelectableTree;
 import Common.Visual.Trees.SelectionTreeCellRenderer;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.SapforData.FileObject;
-import Common.Visual.Menus.GraphMenu;
 public class InlineTree extends SelectableTree {
     public InlineTree() {
         super(Global.mainModule.getProject().inline_root);
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java
index 3d2c172f..c7b6e97f 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java
@@ -1,10 +1,10 @@
 package _VisualDVM.ProjectData.SapforData.Functions.UI;
+import Common.Visual.Menus.GraphMenu;
 import Common.Visual.Trees.SelectableTree;
 import Common.Visual.Trees.SelectionTreeCellRenderer;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.SapforData.FileObject;
-import Common.Visual.Menus.GraphMenu;
 public class InlineTree2 extends SelectableTree {
     public InlineTree2() {
         super(Global.mainModule.getProject().inline_root2);
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java
index f389f20e..e69ed63d 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java
@@ -1,9 +1,9 @@
 package _VisualDVM.ProjectData.SapforData.Includes.UI;
+import Common.Visual.Menus.GraphMenu;
 import Common.Visual.Trees.SelectableTree;
 import Common.Visual.Trees.SelectionTreeCellRenderer;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
-import Common.Visual.Menus.GraphMenu;
 public class IncludesTree extends SelectableTree {
     public IncludesTree() {
         super(Global.mainModule.getProject().includes_root);
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java b/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
index 8d78e889..c80f7a04 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
@@ -1,7 +1,6 @@
 package _VisualDVM.ProjectData.SapforData.Regions;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
-import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererMultiline;
 import Common.Visual.Tables.RendererTopLeft;
 import _VisualDVM.Current;
diff --git a/src/_VisualDVM/Repository/Component/ComponentsSet.java b/src/_VisualDVM/Repository/Component/ComponentsSet.java
index a21f3ca2..061c7c8b 100644
--- a/src/_VisualDVM/Repository/Component/ComponentsSet.java
+++ b/src/_VisualDVM/Repository/Component/ComponentsSet.java
@@ -95,7 +95,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
         return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
                 PassCode.UpdateSelectedComponents,
                 PassCode.PublishComponent,
-                PassCode.ShowComponentChangesLog){
+                PassCode.ShowComponentChangesLog) {
             {
                 addMenus(
                         new VisualiserMenu(
diff --git a/src/_VisualDVM/Repository/Server/ComponentsServer.java b/src/_VisualDVM/Repository/Server/ComponentsServer.java
index 05d67c31..d7a7a047 100644
--- a/src/_VisualDVM/Repository/Server/ComponentsServer.java
+++ b/src/_VisualDVM/Repository/Server/ComponentsServer.java
@@ -1,5 +1,6 @@
 package _VisualDVM.Repository.Server;
 import Common.Database.Objects.DBObject;
+import Common.Database.RepositoryRefuseException;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.Account;
@@ -16,7 +17,6 @@ import _VisualDVM.Repository.BugReport.BugReportInterface;
 import _VisualDVM.Repository.BugReportsDatabase;
 import _VisualDVM.Repository.Component.ComponentType;
 import _VisualDVM.Repository.EmailMessage;
-import Common.Database.RepositoryRefuseException;
 import _VisualDVM.Repository.RepositoryServer;
 import _VisualDVM.Repository.Subscribes.Subscriber;
 import _VisualDVM.Utils;
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
index ddeb0c71..3fcc40dc 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
@@ -158,7 +158,7 @@ public class GroupsDBTable extends iDBTable<Group> {
     public DataMenuBar createMenuBar() {
         return new DataMenuBar(getPluralDescription(),
                 PassCode.SynchronizeTests,
-                PassCode.ConvertCorrectnessTests){
+                PassCode.ConvertCorrectnessTests) {
             {
                 addMenus(new AddGroupMenu(), new EditGroupMenu());
                 addPasses(PassCode.DeleteGroup);
diff --git a/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java b/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
index 7ad1a566..3cb54f4c 100644
--- a/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
+++ b/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
@@ -2,8 +2,11 @@ package _VisualDVM.TestingSystem.Common.MachineProcess;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Utils_;
-import _VisualDVM.*;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalProperties;
+import _VisualDVM.Mode;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
+import _VisualDVM.Utils;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Test.java b/src/_VisualDVM/TestingSystem/Common/Test/Test.java
index 9be19115..7cba2472 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/Test.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/Test.java
@@ -2,6 +2,7 @@ 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.Current;
@@ -12,7 +13,6 @@ import _VisualDVM.ProjectData.Files.FileState;
 import _VisualDVM.ProjectData.Files.FileType;
 import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ProjectData.LanguageName;
-import Common.Database.RepositoryRefuseException;
 import com.sun.org.glassfish.gmbal.Description;
 import org.apache.commons.io.FileUtils;
 
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
index b6f6da69..e859854f 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
@@ -131,7 +131,7 @@ public class TestDBTable extends iDBTable<Test> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription()){
+        return new DataMenuBar(getPluralDescription()) {
             {
                 addMenus(new AddTestMenu(), new EditTestMenu());
                 addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 8a32c007..f039b508 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -1,6 +1,7 @@
 package _VisualDVM.TestingSystem.Common;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
+import Common.Database.RepositoryRefuseException;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
 import _VisualDVM.Constants;
@@ -12,7 +13,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor;
 import _VisualDVM.Repository.EmailMessage;
-import Common.Database.RepositoryRefuseException;
 import _VisualDVM.Repository.RepositoryServer;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
diff --git a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
index a6f3a724..06ae6091 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
@@ -1,5 +1,6 @@
 package _VisualDVM.TestingSystem.Common;
 import Common.CommonConstants;
+import Common.Database.RepositoryRefuseException;
 import Common.Database.SQLITE.SQLiteDatabase;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
@@ -9,7 +10,6 @@ import _VisualDVM.GlobalData.Account.Account;
 import _VisualDVM.Passes.All.ZipFolderPass;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor;
-import Common.Database.RepositoryRefuseException;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
 import _VisualDVM.TestingSystem.Common.Test.Test;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index eadc14b2..63cf389f 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -125,7 +125,7 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
                 PassCode.ShowCurrentDVMConfigurationTests,
                 PassCode.SaveCurrentDVMConfiguration,
                 PassCode.DeleteConfiguration,
-                PassCode.StartSelectedDVMConfigurations );
+                PassCode.StartSelectedDVMConfigurations);
     }
     @Override
     public PassCode_ getDeletePassCode() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 23dbe0e6..bdf8d16d 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -129,7 +129,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription()){
+        return new DataMenuBar(getPluralDescription()) {
             {
                 addPasses(PassCode.SynchronizeTests);
                 addSeparator();
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index deaf8380..813021e2 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -109,7 +109,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),PassCode.SynchronizeTests){
+        return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
             {
                 addSeparator();
                 addPasses(PassCode.AbortSapforPackage);