чистка лишних импортов.и фикс бага с сохранением тестов

2025-03-23 14:28:20 +03:00
parent 811acba5a7
commit b763c2c266
69 changed files with 134 additions and 246 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,12 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <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/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/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.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/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.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/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTestsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTestsDBTable.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
--- a/2
+++ b/2
@@ -4,7 +4,7 @@
  "ServerUserPassword": "mprit_2011",
  "OfferRegistrationOnStart": true,
  "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\sadp111_1742724294\\sadp111\\v1\\v1\\v1",
+  "ProjectsSearchDirectory": "C:\\Users\\misha\\Documents",
  "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
  "VisualiserPath": "C:\\Users\\misha\\Downloads",
  "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
--- a/src/Common/Database/Database.java
+++ b/src/Common/Database/Database.java
@@ -11,7 +11,6 @@ import org.apache.commons.io.FileUtils;

 import java.io.File;
 import java.util.LinkedHashMap;
-import java.util.Locale;
 import java.util.Vector;
 //самый общий интерфейс базы данных, независимо от реализации.
 public abstract class Database {
--- a/src/Common/Database/Tables/DBTable.java
+++ b/src/Common/Database/Tables/DBTable.java
@@ -1,7 +1,6 @@
 package Common.Database.Tables;
 import Common.Database.Database;
 import Common.Database.Objects.DBObject;
-import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;

 import java.lang.reflect.Field;
 import java.util.Vector;
--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
@@ -13,7 +13,6 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.TestingSystem.Common.Test.Test;
-import _VisualDVM.TestingSystem.Common.TestFile.TestFile;
 import _VisualDVM.Utils;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java
@@ -10,7 +10,6 @@ import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountJson;
 import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountsJson;
 import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountsForm;
-import _VisualDVM.Constants;

 import javax.swing.*;
 import java.util.LinkedHashMap;
--- a/src/_VisualDVM/GlobalData/User/UI/UserFields.java
+++ b/src/_VisualDVM/GlobalData/User/UI/UserFields.java
@@ -4,9 +4,6 @@ import Common.Visual.Menus.TextEditorMenu;
 import Common.Visual.TextField.StyledPasswordField;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
-import _VisualDVM.Global;
-import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
-import _VisualDVM.Passes.PassCode;

 import javax.swing.*;
 import java.awt.*;
@@ -51,7 +48,6 @@ public class UserFields implements DialogFields {
            }
        });
         */
-
    }
    @Override
    public Component getContent() {
--- a/src/_VisualDVM/Passes/All/DeleteUserAccount.java
+++ b/src/_VisualDVM/Passes/All/DeleteUserAccount.java
@@ -4,9 +4,6 @@ import _VisualDVM.ComponentsServer.ComponentsServer;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.DeleteServerObject;
-import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
-import _VisualDVM.Repository.Server.ServerCode;
-import javafx.util.Pair;
 public class DeleteUserAccount extends DeleteServerObject<ComponentsServer, UserAccount> {
    public DeleteUserAccount() {
        super(Global.componentsServer, UserAccount.class);
--- a/src/_VisualDVM/Passes/All/DownloadDvmTestsRepository.java
+++ b/src/_VisualDVM/Passes/All/DownloadDvmTestsRepository.java
@@ -1,15 +1,6 @@
 package _VisualDVM.Passes.All;
-import Common.CommonConstants;
-import Common.Utils.Utils_;
 import _VisualDVM.Constants;
-import _VisualDVM.Global;
-import _VisualDVM.Passes.ProcessPass;
 import _VisualDVM.Passes.Repository.DownloadRepositoryPass;
-import _VisualDVM.Utils;
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
-import java.nio.file.Paths;
 public class DownloadDvmTestsRepository extends DownloadRepositoryPass {
    /*
    git clone https://dvmguest:dvmguest@dvm.keldysh.ru/dvm-system/dvm DST
--- a/src/_VisualDVM/Passes/All/DownloadSapforRepository.java
+++ b/src/_VisualDVM/Passes/All/DownloadSapforRepository.java
@@ -1,15 +1,6 @@
 package _VisualDVM.Passes.All;
-import Common.CommonConstants;
-import Common.Utils.Utils_;
 import _VisualDVM.Constants;
-import _VisualDVM.Global;
-import _VisualDVM.Passes.ProcessPass;
 import _VisualDVM.Passes.Repository.DownloadRepositoryPass;
-import _VisualDVM.Utils;
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
-import java.nio.file.Paths;
 public class DownloadSapforRepository extends DownloadRepositoryPass {
    @Override
    protected boolean canStart(Object... args) throws Exception {
--- a/src/_VisualDVM/Passes/All/EditUserAccount.java
+++ b/src/_VisualDVM/Passes/All/EditUserAccount.java
@@ -4,8 +4,6 @@ import _VisualDVM.ComponentsServer.ComponentsServer;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.EditServerObject;
-import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
-import _VisualDVM.Repository.Server.ServerCode;
 public class EditUserAccount extends EditServerObject<ComponentsServer, UserAccount> {
    public EditUserAccount() {
        super(Global.componentsServer, UserAccount.class);
--- a/src/_VisualDVM/Passes/All/InitialiseUser.java
+++ b/src/_VisualDVM/Passes/All/InitialiseUser.java
@@ -10,7 +10,6 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.GlobalData.User.UserState;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Utils;
 public class InitialiseUser extends Pass {
    @Override
    public String getIconPath() {
--- a/src/_VisualDVM/Passes/All/PublishUserAccount.java
+++ b/src/_VisualDVM/Passes/All/PublishUserAccount.java
@@ -4,8 +4,6 @@ import _VisualDVM.ComponentsServer.ComponentsServer;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.PublishServerObject;
-import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
-import _VisualDVM.Repository.Server.ServerCode;
 public class PublishUserAccount extends PublishServerObject<ComponentsServer, UserAccount> {
    public PublishUserAccount() {
        super(Global.componentsServer, UserAccount.class);
--- a/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
+++ b/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
@@ -1,25 +1,14 @@
 package _VisualDVM.Passes.All;
 import Common.CommonConstants;
 import Common.Utils.Utils_;
-import _VisualDVM.Constants;
 import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
-import _VisualDVM.Utils;
 import javafx.util.Pair;
-import org.apache.commons.io.FileUtils;

 import java.io.File;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Vector;
 public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
    @Override
    public String getIconPath() {
--- a/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java
+++ b/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java
@@ -1,13 +1,7 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests;
-import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
-import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
-import _VisualDVM.TestingSystem.DVM.DVMConfigurationSettings.DVMConfigurationSettings;
-import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
-
-import java.util.Vector;
 public class ShowCurrentDVMConfigurationTests extends ShowCurrentConfigurationTests<DVMConfiguration> {
    @Override
    public Class currentClass() {
--- a/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java
+++ b/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java
@@ -1,12 +1,7 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests;
-import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
-import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
-
-import java.util.Vector;
 public class ShowCurrentSAPFORConfigurationTests extends ShowCurrentConfigurationTests<SapforConfiguration> {
    @Override
    public Class currentClass() {
--- 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.Utils;

 import java.io.BufferedReader;
 import java.io.File;
--- a/src/_VisualDVM/Passes/Server/ServerObjectPass.java
+++ b/src/_VisualDVM/Passes/Server/ServerObjectPass.java
@@ -26,7 +26,9 @@ public abstract class ServerObjectPass<S extends RepositoryServer, D extends DBO
    protected Database getDb() {
        return server.db;
    }
-    protected String getDBName(){return "";}
+    protected String getDBName() {
+        return "";
+    }
    @Override
    protected void performFinish() throws Exception {
        super.performFinish();
--- a/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java
+++ b/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java
@@ -1,13 +1,7 @@
 package _VisualDVM.Passes.Testing;
 import Common.Passes.Pass;
 import _VisualDVM.Global;
-import _VisualDVM.ServerObjectsCache.ConfigurationCache;
-import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
-import _VisualDVM.TestingSystem.Common.Group.Group;
-import _VisualDVM.TestingSystem.Common.Test.Test;
-
-import java.util.Vector;
 public abstract class ShowCurrentConfigurationTests<C extends Configuration> extends Pass<C> {
    @Override
    public String getIconPath() {
--- a/src/_VisualDVM/ProjectData/Files/ProjectFile.java
+++ b/src/_VisualDVM/ProjectData/Files/ProjectFile.java
@@ -1,8 +1,5 @@
 package _VisualDVM.ProjectData.Files;
-import Common.CommonConstants;
-import Common.Database.Objects.DBObject;
 import Common.Utils.Utils_;
-import _VisualDVM.Constants;
 import _VisualDVM.ProjectData.LanguageName;

 import javax.swing.*;
@@ -52,7 +49,6 @@ public class ProjectFile extends projectFile_ {
        }
        return new ImageIcon(imageUrl);
    }
-
    public String getUnixName() {
        return Utils_.toU(file.getName());
    }
@@ -60,7 +56,6 @@ public class ProjectFile extends projectFile_ {
    public String toString() {
        return file.getName();
    }
-
    public String getQSourceName() {
        return Utils_.DQuotes(getUnixName());
    }
--- a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
@@ -1,5 +1,4 @@
 package _VisualDVM.ProjectData.Files.UI.Editor;
-import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Editor.BaseEditor;
 import Common.Visual.Menus.StyledPopupMenu;
@@ -13,7 +12,6 @@ import _VisualDVM.Utils;
 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;

@@ -206,5 +204,4 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
    public int getCurrentSymbol() {
        return getCaretOffsetFromLineStart() + 1;
    }
-
 }
--- a/src/_VisualDVM/ProjectData/Files/projectFile_.java
+++ b/src/_VisualDVM/ProjectData/Files/projectFile_.java
@@ -10,6 +10,11 @@ public abstract class projectFile_ extends DBObject {
    public FileType fileType = FileType.none;
    public LanguageName languageName = LanguageName.n;
    public LanguageStyle style = LanguageStyle.none;
+    public projectFile_() {
+    }
+    public projectFile_(File file_in) {
+        AutoDetectProperties(file_in.getName());
+    }
    @Override
    public void SynchronizeFields(DBObject src) {
        super.SynchronizeFields(src);
@@ -18,10 +23,6 @@ public abstract class projectFile_ extends DBObject {
        languageName = src_.languageName;
        style = src_.style;
    }
-    public projectFile_(){}
-    public projectFile_(File file_in){
-        AutoDetectProperties(file_in.getName());
-    }
    public void AutoDetectProperties(String name_in) {
        //проверка запретных имен.
        String[] forbiddenNames = new String[]{
--- a/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
@@ -1,13 +1,5 @@
 package _VisualDVM.ServerObjectsCache;
-import Common.Utils.Utils_;
-import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
-import _VisualDVM.TestingSystem.Common.Group.Group;
-import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsArrayJson;
-import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
-import _VisualDVM.TestingSystem.Common.Test.Json.TestJson;
-import _VisualDVM.TestingSystem.Common.Test.Json.TestsJson;
-import _VisualDVM.TestingSystem.Common.Test.Test;

 import java.util.Vector;
 public class ConfigurationCache extends VisualCache {
--- a/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java
@@ -2,7 +2,6 @@ package _VisualDVM.ServerObjectsCache;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.TestingSystem.Common.Group.Group;
-import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
 import _VisualDVM.TestingSystem.DVM.DVMConfigurationSettings.DVMConfigurationSettings;
--- a/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
+++ b/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
@@ -1,6 +1,5 @@
 package _VisualDVM.ServerObjectsCache;
 import Common.Database.Objects.DBObject;
-import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
--- a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
+++ b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
@@ -3,16 +3,12 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
-import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.TestingSystem.Common.Group.Group;
-import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsArrayJson;
-import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
 import _VisualDVM.TestingSystem.Common.Settings.Settings;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import com.sun.org.glassfish.gmbal.Description;

 import javax.swing.*;
-import java.util.List;
 import java.util.Vector;
 public class Configuration extends riDBObject {
    //конфигурация = данные для пакета.
@@ -55,7 +51,6 @@ public class Configuration extends riDBObject {
    public void saveTests(Vector<Test> tests) {
    }
    public void saveSettings(Vector<Settings> settings_in) {
-
    }
    //--
    @Override
--- a/src/_VisualDVM/TestingSystem/Common/Group/Group.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/Group.java
@@ -6,7 +6,6 @@ import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ProjectData.LanguageName;
-import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.Common.Test.TestType;
 import _VisualDVM.Utils;
 import com.sun.org.glassfish.gmbal.Description;
--- a/src/_VisualDVM/TestingSystem/Common/TestFile/TestFile.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestFile/TestFile.java
@@ -13,6 +13,19 @@ public class TestFile extends projectFile_ {
    public int id;
    public int test_id = CommonConstants.Nan;
    public String name;  //имя относительно корневой папки проекта. не ключ.
+    public TestFile() {
+    }
+    public TestFile(Test test) {
+        test_id = test.id;
+    }
+    public TestFile(File file_in) {
+        super(file_in);
+        name = file_in.getName();
+    }
+    public TestFile(Test test, File file_in) {
+        this(file_in);
+        test_id = test.id;
+    }
    @Override
    public Object getPK() {
        return id;
@@ -29,17 +42,4 @@ public class TestFile extends projectFile_ {
        test_id = src_.test_id;
        name = src_.name;
    }
-    public TestFile() {
-    }
-    public TestFile(Test test) {
-        test_id = test.id;
-    }
-    public TestFile(File file_in){
-        super(file_in);
-        name = file_in.getName();
-    }
-    public TestFile(Test test, File file_in){
-        this(file_in);
-        test_id = test.id;
-    }
 }
--- a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.Common;
 import Common.CommonConstants;
 import Common.Utils.Loggable;
 import Common.Utils.Utils_;
-import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -192,7 +192,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                        db.getVectorByFK(sapforConfiguration, SapforConfigurationSettings.class),
                        sapforConfiguration.settings
                );
-
        }
    }
    @Override
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java
@@ -14,11 +14,6 @@ import java.util.Vector;
 //конфгурация тестирования ДВМ
 public class DVMConfiguration extends Configuration {
    public int c_maxtime = 40;
-    public DVMConfiguration(DVMConfiguration src) {
-        this.SynchronizeFields(src);
-    }
-    public DVMConfiguration() {
-    }
    //--
    @Description("IGNORE")
    public Vector<DVMConfigurationGroup> groups = null;
@@ -26,6 +21,11 @@ public class DVMConfiguration extends Configuration {
    public Vector<DVMConfigurationTest> tests = null;
    @Description("IGNORE")
    public Vector<DVMConfigurationSettings> settings = null;
+    public DVMConfiguration(DVMConfiguration src) {
+        this.SynchronizeFields(src);
+    }
+    public DVMConfiguration() {
+    }
    //--
    @Override
    public void SynchronizeFields(DBObject src) {
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.java
@@ -10,9 +10,9 @@ public class DVMConfigurationFields implements DialogFields {
    public JSpinner sCompilationMaxtime;
    public JSpinner sRunMaxtime;
    public JSpinner sKernels;
+    public JCheckBox cbGroupsOnly;
    //-
    private JPanel content;
-    public JCheckBox cbGroupsOnly;
    public DVMConfigurationFields() {
        sCompilationMaxtime.setModel(new SpinnerNumberModel(40,
                5, 3600, 1
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
@@ -57,7 +57,6 @@ public class DVMConfigurationsForm extends RDataSetControlForm<DVMConfiguration>
                        return RendererMultiline.class;
                    }
                },
-
                new ColumnInfo<DVMConfiguration>("тестов") {
                    @Override
                    public Object getFieldAt(DVMConfiguration object) {
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroup.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroup.java
@@ -7,6 +7,12 @@ import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 public class DVMConfigurationGroup extends iDBObject {
    public int dvmconfiguration_id = CommonConstants.Nan;
    public int group_id = CommonConstants.Nan;
+    public DVMConfigurationGroup() {
+    }
+    public DVMConfigurationGroup(DVMConfiguration configuration, Group group) {
+        dvmconfiguration_id = configuration.id;
+        group_id = group.id;
+    }
    @Override
    public void SynchronizeFields(DBObject src) {
        super.SynchronizeFields(src);
@@ -14,10 +20,4 @@ public class DVMConfigurationGroup extends iDBObject {
        dvmconfiguration_id = src_.dvmconfiguration_id;
        group_id = src_.group_id;
    }
-    public DVMConfigurationGroup() {
-    }
-    public DVMConfigurationGroup(DVMConfiguration configuration, Group group) {
-        dvmconfiguration_id = configuration.id;
-        group_id = group.id;
-    }
 }
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationSettings/DVMConfigurationSettings.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationSettings/DVMConfigurationSettings.java
@@ -3,7 +3,6 @@ import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
-import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
 public class DVMConfigurationSettings extends iDBObject {
    public int dvmconfiguration_id = CommonConstants.Nan;
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTest.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTest.java
@@ -4,12 +4,10 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
-import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
 public class DVMConfigurationTest extends iDBObject {
    public int dvmconfiguration_id = CommonConstants.Nan;
    public int test_id = CommonConstants.Nan;
    public DVMConfigurationTest() {
-
    }
    public DVMConfigurationTest(DVMConfiguration dvmConfiguration, Test test) {
        dvmconfiguration_id = dvmConfiguration.id;
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTestsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTestsDBTable.java
@@ -6,6 +6,6 @@ public class DVMConfigurationTestsDBTable extends iDBTable<DVMConfigurationTest>
    }
    @Override
    public boolean isEqual(DVMConfigurationTest o1, DVMConfigurationTest o2) {
-        return o1.dvmconfiguration_id==o2.dvmconfiguration_id && o2.test_id==o2.test_id;
+        return o1.dvmconfiguration_id == o2.dvmconfiguration_id && o1.test_id == o2.test_id;
    }
 }
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -11,7 +11,6 @@ import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.GlobalData.User.User;
-import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
 import _VisualDVM.ServerObjectsCache.DVMSettingsCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.Group.Group;
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
@@ -1,6 +1,5 @@
 package _VisualDVM.TestingSystem.DVM.DVMPackage;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 import com.google.gson.annotations.Expose;

 import java.io.Serializable;
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.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.TestingSystem.Common.TestFile.TestFile;
 import _VisualDVM.TestingSystem.DVM.DVMConfigurationSettings.DVMConfigurationSettings;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsForm;

--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java
@@ -9,7 +9,6 @@ import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.Common.Test.TestType;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
-import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
 import _VisualDVM.Utils;
 import com.google.gson.annotations.Expose;

--- a/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java
@@ -1,7 +1,6 @@
 package _VisualDVM.TestingSystem.DVM;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Repository.Server.ServerCode;
@@ -9,16 +8,12 @@ import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.Common.TestingPlanner;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMTask;
 import _VisualDVM.Utils;
-import org.apache.commons.io.FileUtils;

 import java.io.File;
 import java.io.FileFilter;
-import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Vector;
 public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
    public DVMTestingPlanner(String[] args) {
--- a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -3,18 +3,15 @@ import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
-import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.Passes.All.UnzipFolderPass;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
-import _VisualDVM.Utils;
-import javafx.util.Pair;
-import org.apache.commons.io.FileUtils;

 import java.io.File;
-import java.nio.file.Paths;
-import java.util.*;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Vector;
 public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
    RemoteFile packageRemoteWorkspace = null;
    public RemoteDVMTestingPlanner(String... args) {
--- a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java
@@ -2,8 +2,6 @@ package _VisualDVM.TestingSystem.SAPFOR.Json;
 import Common.CommonConstants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Tasks.TaskState;
-import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
-import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
@@ -44,7 +42,6 @@ public class SapforPackage_json implements Serializable {
    public SapforPackage_json() {
    }
    public SapforPackage_json(ServerSapfor serverSapfor, Vector<SapforConfiguration> configurations, int kernels_in) {
-
        sapfor_drv = serverSapfor.call_command;
        kernels = kernels_in;
        for (SapforConfiguration sapforConfiguration : configurations) {
--- a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
@@ -1,11 +1,8 @@
 package _VisualDVM.TestingSystem.SAPFOR.Json;
 import Common.CommonConstants;
 import _VisualDVM.Global;
-import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
-import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import com.google.gson.annotations.Expose;

 import java.io.Serializable;
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
@@ -14,7 +14,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurati
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import com.sun.org.glassfish.gmbal.Description;

-import java.util.LinkedHashMap;
 import java.util.Vector;
 public class SapforConfiguration extends Configuration {
    @Description("DEFAULT -1")
@@ -25,6 +24,11 @@ public class SapforConfiguration extends Configuration {
    public Vector<SapforConfigurationTest> tests = null;
    @Description("IGNORE")
    public Vector<SapforConfigurationSettings> settings = null;
+    public SapforConfiguration(SapforConfiguration sapforConfiguration) {
+        this.SynchronizeFields(sapforConfiguration);
+    }
+    public SapforConfiguration() {
+    }
    //--
    public String printEthalon() {
        return (ethalon_id == CommonConstants.Nan) ? "—" : String.valueOf(ethalon_id);
@@ -52,20 +56,13 @@ public class SapforConfiguration extends Configuration {
        SapforConfiguration c = (SapforConfiguration) src;
        ethalon_id = c.ethalon_id;
    }
-    public SapforConfiguration(SapforConfiguration sapforConfiguration) {
-        this.SynchronizeFields(sapforConfiguration);
-    }
-    public SapforConfiguration() {
-    }
    @Override
    public boolean validate(TextLog Log) {
        Vector<Integer> groups_ids = Global.testingServer.db.getSapforConfigurationGroupsIds(this);
        Vector<Integer> tests_ids = Global.testingServer.db.getSapforConfigurationTestsIds(this);
        Vector<Integer> settings_ids = Global.testingServer.db.getSapforConfigurationSettingsIds(this);
-
        Vector<Group> groups = new Vector<>();
        Vector<LanguageName> groupsLanguages = new Vector<>();
-
        for (int group_id : groups_ids) {
            LanguageName languageName = Global.testingServer.db.groups.get(group_id).language;
            if (!groupsLanguages.contains(languageName))
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -53,5 +53,4 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
                return sapforConfiguration;
        return null;
    }
-
 }
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroup.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroup.java
@@ -3,7 +3,6 @@ import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.TestingSystem.Common.Group.Group;
-import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 public class SapforConfigurationGroup extends iDBObject {
    public int sapforconfiguration_id = CommonConstants.Nan;
@@ -13,7 +12,6 @@ public class SapforConfigurationGroup extends iDBObject {
        group_id = group.id;
    }
    public SapforConfigurationGroup() {
-
    }
    @Override
    public void SynchronizeFields(DBObject src) {
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationSettings/SapforConfigurationSettings.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationSettings/SapforConfigurationSettings.java
@@ -6,7 +6,8 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 public class SapforConfigurationSettings extends iDBObject {
    public int sapforconfiguration_id = CommonConstants.Nan;
    public int sapforsettings_id = CommonConstants.Nan;
-    public SapforConfigurationSettings(){}
+    public SapforConfigurationSettings() {
+    }
    public SapforConfigurationSettings(SapforConfiguration sapforConfiguration, SapforSettings settings) {
        sapforconfiguration_id = sapforConfiguration.id;
        sapforsettings_id = settings.id;
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationTest/SapforConfigurationTest.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationTest/SapforConfigurationTest.java
@@ -3,13 +3,11 @@ import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.TestingSystem.Common.Test.Test;
-import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 public class SapforConfigurationTest extends iDBObject {
    public int sapforconfiguration_id = CommonConstants.Nan;
    public int test_id = CommonConstants.Nan;
    public SapforConfigurationTest() {
-
    }
    public SapforConfigurationTest(SapforConfiguration sapforConfiguration, Test test) {
        sapforconfiguration_id = sapforConfiguration.id;
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -153,7 +153,8 @@ public class MainUI extends UIModule_ {
        Global.normalProperties.setControlVisible("CompleteCompilationOptions", true);
        Global.normalProperties.setControlVisible("CompleteRunEnvironments", true);
        Global.normalProperties.setControlVisible("ErasePackageWorkspace", true);
-    };
+    }
+    ;
    public void ShowAccount() {
        getMainWindow().getCallbackWindow().ShowAccountInfo();
        switch (Global.mainModule.getAccount().role) {