no message

src/Common/Current.java

@@ -18,12 +18,12 @@ import ProjectData.SapforData.Functions.FuncInfo;
 import ProjectData.SapforData.Regions.ParallelRegion;
 import Repository.BugReport.BugReport;
 import Repository.Subscribes.Subscriber;
-import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
-import TestingSystem.Configuration.Configuration;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.Test.Test;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.UI.PassForm;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -224,22 +224,22 @@ public enum Current {
     public static boolean HasGroup() {
         return get(Current.Group) != null;
     }
-    public static TestingSystem.Group.Group getGroup() {
-        return (TestingSystem.Group.Group) get(Current.Group);
+    public static TestingSystem.Common.Group.Group getGroup() {
+        return (TestingSystem.Common.Group.Group) get(Current.Group);
     }
     //--
     public static boolean HasConfiguration() {
         return get(Current.Configuration) != null;
     }
-    public static TestingSystem.Configuration.Configuration getConfiguration() {
+    public static TestingSystem.DVM.Configuration.Configuration getConfiguration() {
         return (Configuration) get(Current.Configuration);
     }
     public static SapforConfiguration getSapforConfiguration() {
-        return (SapforTestingSystem.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
+        return (TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
     }
     //--
     public static Test getTest() {
-        return (TestingSystem.Test.Test) get(Current.Test);
+        return (TestingSystem.Common.Test.Test) get(Current.Test);
     }
     public static boolean HasTest() {
         return get(Current.Test) != null;
@@ -248,7 +248,7 @@ public enum Current {
         return get(Current.Version) != null;
     }
     public static TestCompilationTask getTestCompilationTask() {
-        return (TestingSystem.Tasks.TestCompilationTask) get(Current.TestCompilationTask);
+        return (TestingSystem.DVM.Tasks.TestCompilationTask) get(Current.TestCompilationTask);
     }
     public static boolean HasTestCompilationTask() {
         return get(Current.TestCompilationTask) != null;
@@ -257,7 +257,7 @@ public enum Current {
         return get(Current.TestRunTask) != null;
     }
     public static TestRunTask getTestRunTask() {
-        return (TestingSystem.Tasks.TestRunTask) get(Current.TestRunTask);
+        return (TestingSystem.DVM.Tasks.TestRunTask) get(Current.TestRunTask);
     }
     public static RemoteFile getComponentServerBackup() {
         return (RemoteFile) get(Current.ComponentServerBackup);
@@ -332,8 +332,8 @@ public enum Current {
     public static boolean HasSapforTask() {
         return get(Current.SapforTask) != null;
     }
-    public static SapforTestingSystem.SapforTask.SapforTask getSapforTask() {
-        return (SapforTestingSystem.SapforTask.SapforTask) get(Current.SapforTask);
+    public static TestingSystem.SAPFOR.SapforTask.SapforTask getSapforTask() {
+        return (TestingSystem.SAPFOR.SapforTask.SapforTask) get(Current.SapforTask);
     }
     public static ProjectData.ProjectView getProjectView() {
         return (ProjectData.ProjectView) get(ProjectView);
@@ -360,8 +360,8 @@ public enum Current {
     public static boolean CheckID(Current name, int id) {
         return (get(name) != null) && (((iDBObject) get(name)).id == id);
     }
-    public static SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
-        return (SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
+    public static TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
+        return (TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
     }
     public static boolean HasSapforProfile() {
         return get(Current.SapforProfile) != null;
@@ -372,15 +372,15 @@ public enum Current {
     public static boolean HasSapforTasksPackage() {
         return get(Current.SapforTasksPackage) != null;
     }
-    public static SapforTestingSystem.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
-        return (SapforTestingSystem.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
+    public static TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
+        return (TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
     }
     //сапфоры установленные на тестовый сервер.
     public static boolean HasServerSapfor() {
         return get(Current.ServerSapfor) != null;
     }
-    public static SapforTestingSystem.ServerSapfor.ServerSapfor getServerSapfor() {
-        return (SapforTestingSystem.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
+    public static TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
+        return (TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
     }
     //--------------------------------------------
     public String getDescription() {

src/Common/Global.java

@@ -13,8 +13,8 @@ import Repository.Component.Sapfor.MessagesServer;
 import Repository.Component.Sapfor.Sapfor_F;
 import Repository.Component.Sapfor.TransformationPermission;
 import Repository.Server.ComponentsServer;
-import SapforTestingSystem.PackageModeSupervisor.PackageModeSupervisor;
-import TestingSystem.TestingServer;
+import TestingSystem.SAPFOR.PackageModeSupervisor;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import Visual_DVM_2021.UI.Interface.Loggable;

src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java

@@ -3,7 +3,7 @@ import Common.Global;
 import Common.UI.Menus_2023.DataMenuBar;
 import Common.UI.Menus_2023.MenuBarButton;
 import Common.Utils.Utils;
-import TestingSystem.Group.GroupInterface;
+import TestingSystem.Common.Group.GroupsDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;
@@ -21,13 +21,13 @@ public class GroupsMenuBar extends DataMenuBar {
                 setToolTipText("Отображать только группы тестов авторства пользователя");
                 Mark();
                 addActionListener(e -> {
-                    GroupInterface.filterMyOnly = !GroupInterface.filterMyOnly;
+                    GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
                     Mark();
                     Global.testingServer.db.groups.ShowUI();
                 });
             }
             public void Mark() {
-                setIcon(Utils.getIcon(GroupInterface.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                setIcon(Utils.getIcon(GroupsDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
     }

src/Common/UI/Menus_2023/TestingBar/TestingBar.java

@@ -6,7 +6,7 @@ import Common.UI.Menus_2023.VisualiserMenuBar;
 import Common.UI.Themes.VisualiserFonts;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import TestingSystem.TestingServer;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;

src/Common/UI/UI.java

@@ -57,7 +57,7 @@ import GlobalData.Tasks.RunTask.RunTasksDBTable;
 import GlobalData.User.UsersDBTable;
 import ProjectData.DBArray.ArraysDBTable;
 import ProjectData.Files.UI.FilesTreeCellRenderer;
-import SapforTestingSystem.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
 import ProjectData.Project.UI.VersionsTreeCellRenderer;
 import ProjectData.SapforData.Arrays.ArraysSet;
 import ProjectData.SapforData.Arrays.UI.DimensionRenderer;
@@ -69,16 +69,16 @@ import ProjectData.SapforData.Variants.VariantsSet;
 import Repository.BugReport.BugReportsDBTable;
 import Repository.Component.UI.ComponentsForm;
 import Repository.Subscribes.SubsribersDBTable;
-import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
-import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
-import SapforTestingSystem.SapforTask.SapforTasksDBTable;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
-import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
-import TestingSystem.Configuration.UI.ConfigurationDBTable;
-import TestingSystem.Group.GroupsDBTable;
-import TestingSystem.Tasks.TestRunTasksDBTable;
-import TestingSystem.TasksPackage.TasksPackageDBTable;
-import TestingSystem.Test.TestDBTable;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
+import TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
+import TestingSystem.DVM.Configuration.UI.ConfigurationDBTable;
+import TestingSystem.Common.Group.GroupsDBTable;
+import TestingSystem.DVM.Tasks.TestRunTasksDBTable;
+import TestingSystem.DVM.TasksPackage.TasksPackageDBTable;
+import TestingSystem.Common.Test.TestDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.UI.Interface.DebugWindow;
 import Visual_DVM_2021.UI.Interface.VersionsWindow;

src/GlobalData/Tasks/RunTask/RunTask.java

@@ -10,7 +10,7 @@ import GlobalData.Tasks.CompilationTask.CompilationTask;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Tasks.TestRunTaskInterface;
+import TestingSystem.DVM.Tasks.TestRunTaskInterface;
 import com.sun.org.glassfish.gmbal.Description;
 import org.apache.commons.io.FileUtils;
 

src/GlobalData/User/User.java

@@ -3,7 +3,7 @@ import Common.Constants;
 import Common.Current;
 import Common.Database.iDBObject;
 import GlobalData.Machine.Machine;
-import TestingSystem.UserConnection;
+import TestingSystem.DVM.UserConnection;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 import com.sun.org.glassfish.gmbal.Description;
 

src/ProjectData/Files/DBProjectFile.java

@@ -472,4 +472,19 @@ public class DBProjectFile extends ProjectFile {
         }
         return res;
     }
+    //---
+    public String getStyleOptions() {
+        if (languageName == LanguageName.fortran) {
+            switch (style) {
+                case fixed:
+                case extended:
+                    return "-FI";
+                case free:
+                    return "-f90";
+                case none:
+                    break;
+            }
+        }
+        return "";
+    }
 }

src/ProjectData/Project/db_project_info.java

@@ -31,9 +31,8 @@ import ProjectData.SapforData.Regions.ParallelRegion;
 import ProjectData.SapforData.Regions.RegionsSet;
 import ProjectData.SapforData.Variants.ParallelVariant;
 import ProjectData.SapforData.Variants.VariantsSet;
-import TestingSystem.Test.ProjectFiles_json;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestInterface;
+import TestingSystem.Common.Test.ProjectFiles_json;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
 import com.mxgraph.swing.mxGraphComponent;
@@ -212,7 +211,7 @@ public class db_project_info extends DBObject {
     }
     //для запуска тестов.
     public db_project_info(Test test) throws Exception {
-        Home = TestInterface.getServerPath(test);
+        Home = test.getServerPath();
         //-
         CheckVisualiserDirectories();
         db = new ProjectDatabase(this);

src/Repository/Server/ServerCode.java

@@ -79,4 +79,5 @@ public enum ServerCode {
     OLD,
     //-
     PublishAIObject, //публикация объекта с автоинкрементом.
+    PublishTestProject, //отправка теста на сервер в архиве.
 }

src/SapforTestingSystem/PerformSapforTask.java

@@ -4,9 +4,9 @@ import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Messages.Errors.MessageError;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.Json.SapforVersion_json;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import org.apache.commons.io.FileUtils;

src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java

@@ -1,121 +0,0 @@
-package SapforTestingSystem.ServerSapfor;
-import Common.Current;
-import Common.Database.iDBTable;
-import Common.UI.DataSetControlForm;
-import Common.UI.Tables.TableRenderers;
-public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
-    public ServerSapforsDBTable() {
-        super(ServerSapfor.class);
-    }
-    @Override
-    public String getSingleDescription() {
-        return "SAPFOR";
-    }
-    @Override
-    public String getPluralDescription() {
-        return "SAPFOR";
-    }
-    @Override
-    public Current CurrentName() {
-        return Current.ServerSapfor;
-    }
-    @Override
-    public String[] getUIColumnNames() {
-        return new String[]{"версия", "дата сборки"};
-    }
-    @Override
-    public Object getFieldAt(ServerSapfor object, int columnIndex) {
-        switch (columnIndex) {
-            case 1:
-                return object.version;
-            case 2:
-                return object.getBuildDate();
-        }
-        return null;
-    }
-    @Override
-    protected DataSetControlForm createUI() {
-        return new DataSetControlForm(this) {
-            @Override
-            protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
-                columns.get(2).setRenderer(TableRenderers.RendererDate);
-            }
-        };
-    }
-    //---
-    /*
-    @Override
-    public DBObjectDialog<RemoteSapfor, RemoteSapforFields> getDialog() {
-        return new DBObjectDialog<RemoteSapfor, RemoteSapforFields>(RemoteSapforFields.class) {
-            @Override
-            public void validateFields() {
-                //<editor-fold desc="расположение">
-                String home = fields.tfHome.getText();
-                if (!home.isEmpty()) {
-                    if (home.startsWith("/")) {
-                        if (Utils.ContainsCyrillic(home))
-                            Log.Writeln("Расположение системы SAPFOR не может содержать кириллицу");
-                        else {
-                            new PathValidator(home, "Расположение системы SAPFOR", Log).Validate();
-                        }
-                    } else
-                        Log.Writeln("Расположение системы SAPFOR может быть либо пустой строкой, либо путём к файлу");
-                }
-                //</editor-fold>
-                //<editor-fold desc="команда вызова">
-                String call_command = fields.tfCallCommand.getText();
-                if (call_command.isEmpty()) Log.Writeln("Команда вызова системы SAPFOR не может быть пустой");
-                else if (Utils.ContainsCyrillic(call_command))
-                    Log.Writeln("Команда вызова системы SAPFOR не может содержать кириллицу");
-                else {
-                    switch (call_command.charAt(0)) {
-                        case ' ':
-                            Log.Writeln("Команда вызова системы SAPFOR не может начинаться с пробела.");
-                            break;
-                        case '/':
-                            if (call_command.endsWith("/"))
-                                Log.Writeln("Каталог не может быть указан в качестве команды.");
-                            else new PathValidator(call_command, "Команда вызова системы SAPFOR", Log).Validate();
-                            break;
-                        default:
-                            //это команда.
-                            //самое опасное место. теоретически тут можно ввести любую команду ОС, в том числе rm -rf
-                            if (call_command.contains(" "))
-                                Log.Writeln("Прямая команда вызова системы SAPFOR не может содержать пробелы");
-                            if (!call_command.contains("+") && Utils.ContainsForbiddenName(call_command))
-                                Log.Writeln("Прямая команда вызова системы SAPFOR содержит запрещённые символы");
-                            else {
-                                if (Utils.isLinuxSystemCommand(call_command))
-                                    Log.Writeln(Utils.DQuotes(call_command) + " является системной командой Linux");
-                            }
-                            break;
-                    }
-                }
-                //</editor-fold>
-            }
-            @Override
-            public void fillFields() {
-                fields.tfDescription.setText(Result.description);
-                fields.tfCallCommand.setText(Result.call_command);
-                fields.tfHome.setText(Result.home_path);
-                UI.TrySelect(fields.cbLanguageName, Result.languageName);
-                fields.tfVersion.setText(Result.version);
-                fields.events_on = true;
-            }
-            @Override
-            public void ProcessResult() {
-                Result.machine_id = Current.getMachine().id;
-                Result.description = fields.tfDescription.getText();
-                Result.call_command = fields.tfCallCommand.getText();
-                Result.home_path = fields.tfHome.getText();
-                Result.languageName = (LanguageName) fields.cbLanguageName.getSelectedItem();
-                Result.version = fields.tfVersion.getText();
-            }
-            @Override
-            public int getDefaultHeight() {
-                return 300;
-            }
-        };
-     */
-}

src/SapforTestingSystem/TaskThread.java

@@ -1,6 +1,6 @@
 package SapforTestingSystem;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 
 import java.io.File;
 public class TaskThread extends Thread {

src/TestingSystem/Common/Group/Group.java

@@ -1,55 +1,33 @@
-package TestingSystem.Group;
+package TestingSystem.Common.Group;
 import Common.Current;
+import Common.Database.DBObject;
+import Common.Database.riDBObject;
 import Common.Global;
+import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.LanguageName;
 import ProjectData.Project.db_project_info;
+import TestingSystem.Common.Test.TestType;
+import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.LinkedHashMap;
 import java.util.Vector;
-//dynamic cats возможен через рефлексию.
-//https://stackoverflow.com/questions/2127318/java-how-can-i-do-dynamic-casting-of-a-variable-from-one-type-to-another
-public class GroupInterface {
-    //-
-    public static boolean filterMyOnly = false;
+public class Group extends riDBObject {
+    @Description("DEFAULT 'Default'")
+    public TestType type = TestType.Default;
+    @Description("DEFAULT 'fortran'")
+    public LanguageName language = LanguageName.fortran;
     //--
-    public static boolean isVisible(Group object) {
-        return (!filterMyOnly || Current.getAccount().email.equals(object.sender_address)) &&
-                Global.testingServer.db.groups.applyFilters(object);
-    }
-    public static String getStyleOptions(DBProjectFile program) {
-        if (program.languageName == LanguageName.fortran) {
-            switch (program.style) {
-                case fixed:
-                case extended:
-                    return "-FI";
-                case free:
-                    return "-f90";
-                case none:
-                    break;
-            }
-        }
-        return "";
-    }
-    public static String getLanguageCompileCommand(LanguageName language) {
-        switch (language) {
-            case fortran:
-                return "f";
-            case c:
-                return "c";
-        }
-        return "";
-    }
-    public static String getLanguageLinkCommand(LanguageName language) {
-        switch (language) {
-            case fortran:
-                return "flink";
-            case c:
-                return "clink";
-        }
-        return "";
+    @Description("IGNORE")
+    public LinkedHashMap<String, byte[]> testsFiles = new LinkedHashMap<>(); //транспорт.
+    //--
+    @Override
+    public boolean isVisible() {
+        return (!GroupsDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) &&
+                Global.testingServer.db.groups.applyFilters(this);
     }
+    //-
     public static void generateForLanguage(
             String dvm_drv,
             LinkedHashMap<LanguageName, Vector<DBProjectFile>> programs,
@@ -75,7 +53,7 @@ public class GroupInterface {
                                 String.join(" ",
                                         Utils.MFVar(LANG_ + "COMMAND"),
                                         Utils.MFVar(LANG_ + "FLAGS"),
-                                        getStyleOptions(program),
+                                        program.getStyleOptions(),
                                         "-c",
                                         program.getQSourceName(),
                                         "-o",
@@ -85,7 +63,7 @@ public class GroupInterface {
             }
             titles.add(String.join("\n",
                     LANG_ + "COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
-                            getLanguageCompileCommand(language),
+                            language.getDVMCompile(),
                     LANG_ + "FLAGS=" + flags_in,
                     LANG_ + "OBJECTS=" + String.join(" ", module_objects),
                     ""
@@ -94,7 +72,7 @@ public class GroupInterface {
             bodies.add(module_body);
         }
     }
-    public static String GenerateMakefile(Group object, db_project_info project, String dvm_drv, String flags_in) {
+    public String GenerateMakefile(db_project_info project, String dvm_drv, String flags_in) {
         //----->>
         LinkedHashMap<LanguageName, Vector<DBProjectFile>> programs = project.getPrograms();
         Vector<String> titles = new Vector<>();
@@ -102,11 +80,11 @@ public class GroupInterface {
         Vector<String> bodies = new Vector<>();
         String binary = Utils.DQuotes("0");
         //----->>
-        generateForLanguage(dvm_drv, programs, object.language, titles, objects, bodies, flags_in);
+        generateForLanguage(dvm_drv, programs, language, titles, objects, bodies, flags_in);
         //----->>
         return String.join("\n",
                 "LINK_COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
-                        getLanguageLinkCommand(object.language),
+                        language.getDVMLink(),
                 "LINK_FLAGS=" + flags_in + "\n",
                 String.join("\n", titles),
                 "all: " + binary,
@@ -114,7 +92,27 @@ public class GroupInterface {
                 "\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary,
                 String.join(" ", bodies));
     }
-    public static String getSummary(Group group) {
-        return group.description + " " + group.language.getDescription();
+    public String getSummary() {
+        return description + " " + language.getDescription();
+    }
+    //-
+
+    @Override
+    public void SynchronizeFields(DBObject src) {
+        super.SynchronizeFields(src);
+        Group g = (Group) src;
+        type = g.type;
+        language = g.language;
+    }
+    public Group(Group group) {
+        this.SynchronizeFields(group);
+    }
+    public Group() {
+    }
+    @Override
+    public void select(boolean flag) {
+        super.select(flag);
+        if (Current.hasUI())
+            UI.getMainWindow().ShowCheckedTestsCount();
     }
 }

src/TestingSystem/Common/Group/GroupsDBTable.java

@@ -1,4 +1,4 @@
-package TestingSystem.Group;
+package TestingSystem.Common.Group;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
@@ -7,15 +7,16 @@ import Common.UI.Menus_2023.VisualiserMenu;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import ProjectData.LanguageName;
-import TestingSystem.Group.UI.GroupFields;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestType;
+import TestingSystem.Common.Group.UI.GroupFields;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.Test.TestType;
 
 import javax.swing.*;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 //-
 public class GroupsDBTable extends iDBTable<Group> {
+    public static boolean filterMyOnly = false;
     public Vector<TableFilter<Group>> typeFilters;
     public Vector<TableFilter<Group>> languageFilters;
     //------------------------------------------------>>>

src/TestingSystem/Common/Group/UI/GroupFields.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Group.UI.GroupFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Common.Group.UI.GroupFields">
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

src/TestingSystem/Common/Group/UI/GroupFields.java

@@ -1,8 +1,8 @@
-package TestingSystem.Group.UI;
+package TestingSystem.Common.Group.UI;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.Windows.Dialog.DialogFields;
 import ProjectData.LanguageName;
-import TestingSystem.Test.TestType;
+import TestingSystem.Common.Test.TestType;
 
 import javax.swing.*;
 import java.awt.*;

src/TestingSystem/Common/TSetting/TSetting.java

@@ -1,4 +1,4 @@
-package TestingSystem.TSetting;
+package TestingSystem.Common.TSetting;
 import Common.Database.DBObject;
 import GlobalData.Settings.SettingName;
 import com.sun.org.glassfish.gmbal.Description;

src/TestingSystem/Common/TSetting/TSettingsDBTable.java

@@ -1,4 +1,4 @@
-package TestingSystem.TSetting;
+package TestingSystem.Common.TSetting;
 import Common.Database.DBTable;
 public class TSettingsDBTable extends DBTable<String, TSetting> {
     public TSettingsDBTable() {

src/TestingSystem/Common/TasksDatabase.java

@@ -1,21 +1,21 @@
-package TestingSystem;
+package TestingSystem.Common;
 import Common.Constants;
 import Common.Database.SQLITE.SQLiteDatabase;
 import Common.Global;
 import GlobalData.Settings.SettingName;
-import SapforTestingSystem.SapforTask.SapforTasksDBTable;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
-import TestingSystem.TSetting.TSetting;
-import TestingSystem.TSetting.TSettingsDBTable;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestCompilationTasksDBTable;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.Tasks.TestRunTasksDBTable;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.TasksPackage.TasksPackageDBTable;
-import TestingSystem.TasksPackage.TasksPackageState;
-import TestingSystem.TasksPackageToKill.TasksPackageToKillDBTable;
+import TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
+import TestingSystem.Common.TSetting.TSetting;
+import TestingSystem.Common.TSetting.TSettingsDBTable;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestCompilationTasksDBTable;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.Tasks.TestRunTasksDBTable;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageDBTable;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import TestingSystem.Common.TasksPackageToKill.TasksPackageToKillDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import javafx.util.Pair;
 

src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java

@@ -1,4 +1,4 @@
-package TestingSystem.TasksPackageToKill;
+package TestingSystem.Common.TasksPackageToKill;
 import Common.Database.iDBObject;
 public class TasksPackageToKill extends iDBObject {
     public String packageName = "";

src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKillDBTable.java

@@ -1,4 +1,4 @@
-package TestingSystem.TasksPackageToKill;
+package TestingSystem.Common.TasksPackageToKill;
 import Common.Database.iDBTable;
 public class TasksPackageToKillDBTable extends iDBTable<TasksPackageToKill> {
     public TasksPackageToKillDBTable() {

src/TestingSystem/Common/Test/ProjectFiles_json.java

@@ -1,4 +1,4 @@
-package TestingSystem.Test;
+package TestingSystem.Common.Test;
 import ProjectData.Files.DBProjectFile;
 import com.google.gson.annotations.Expose;
 

src/TestingSystem/Common/Test/Test.java

@@ -1,23 +1,23 @@
-package TestingSystem.Test;
+package TestingSystem.Common.Test;
 import Common.Constants;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Database.riDBObject;
+import Common.Global;
 import Common.UI.UI;
+import GlobalData.User.UserState;
 import com.sun.org.glassfish.gmbal.Description;
+
+import java.io.File;
 public class Test extends riDBObject {
-    @Override
-    public boolean isVisible() {
-        return TestInterface.isVisible(this);
-    }
     @Description("DEFAULT 1")
     public int dim = 1; //размерность теста. для удобства пусть будет и внешним полем.
     @Description("DEFAULT ''")
     public String args = ""; //аргументы командной строки. на всякий случай поле зарезервирую. пусть будут.
     @Description("DEFAULT -1")
     public int group_id = Constants.Nan;
-    @Description("IGNORE")
-    public byte[] project_archive_bytes = null;
+    @Description("DEFAULT 'initial'")
+    public UserState state = UserState.initial; //загружен ли тестовый проект.
     @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
@@ -37,4 +37,20 @@ public class Test extends riDBObject {
         if (Current.hasUI())
             UI.getMainWindow().ShowCheckedTestsCount();
     }
+    //---
+    @Override
+    public boolean isVisible() {
+        return Current.HasGroup() && (Current.getGroup().id == group_id);
+    }
+    //-
+    public File getArchive() {
+        return new File(Global.TestsDirectory, id + ".zip");
+    }
+    //-
+    public File getServerPath() {
+        return new File(Global.TestsDirectory, String.valueOf(id));
+    }
+    public File getHomePath() {
+        return new File(Global.visualiser.getWorkspace(), String.valueOf(id));
+    }
 }

src/TestingSystem/Common/Test/TestDBTable.java

@@ -1,12 +1,12 @@
-package TestingSystem.Test;
+package TestingSystem.Common.Test;
 import Common.Current;
-import Common.Database.DBTable;
+import Common.Database.iDBTable;
 import Common.UI.DataSetControlForm;
 import Common.UI.Windows.Dialog.DBObjectDialog;
-import TestingSystem.Test.UI.TestFields;
-public class TestDBTable extends DBTable<String, Test> {
+import TestingSystem.Common.Test.UI.TestFields;
+public class TestDBTable extends iDBTable<Test> {
     public TestDBTable() {
-        super(String.class, Test.class);
+        super(Test.class);
     }
     @Override
     public String getSingleDescription() {
@@ -21,13 +21,12 @@ public class TestDBTable extends DBTable<String, Test> {
         return new DataSetControlForm(this) {
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
+                //columns.get(0).setVisible(false);
             }
             @Override
             public boolean hasCheckBox() {
                 return true;
             }
-
         };
     }
     @Override

src/TestingSystem/Common/Test/TestType.java

@@ -1,4 +1,4 @@
-package TestingSystem.Test;
+package TestingSystem.Common.Test;
 public enum TestType {
     Default,
     Correctness,

src/TestingSystem/Common/Test/UI/TestFields.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Test.UI.TestFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Common.Test.UI.TestFields">
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

src/TestingSystem/Common/Test/UI/TestFields.java

@@ -1,4 +1,4 @@
-package TestingSystem.Test.UI;
+package TestingSystem.Common.Test.UI;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.Windows.Dialog.DialogFields;
 

src/TestingSystem/Common/TestingPlanner.java

@@ -1,4 +1,4 @@
-package TestingSystem;
+package TestingSystem.Common;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Machine.Machine;
@@ -6,13 +6,14 @@ import GlobalData.User.User;
 import Repository.EmailMessage;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackageSupervisor.SapforTasksPackageSupervisor;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestTask;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.TasksPackage.TasksPackageState;
-import TestingSystem.TestsSupervisor_2022.TestsSupervisor_2022;
+import TestingSystem.DVM.UserConnection;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.SapforTasksPackageSupervisor.SapforTasksPackageSupervisor;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestTask;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import TestingSystem.DVM.TestsSupervisor_2022;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;

src/TestingSystem/Common/TestingServer.java

@@ -1,4 +1,4 @@
-package TestingSystem;
+package TestingSystem.Common;
 import Common.Constants;
 import Common.Database.DBObject;
 import Common.Global;
@@ -14,19 +14,18 @@ import Repository.RepositoryRefuseException;
 import Repository.RepositoryServer;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforTask.SapforTask;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.ServerSapfor.ServerSapfor;
-import TestingSystem.Group.Group;
-import TestingSystem.Group.GroupInterface;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.Tasks.TestTask;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.TasksPackageToKill.TasksPackageToKill;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestInterface;
-import TestingSystem.Test.TestType;
+import TestingSystem.DVM.UserConnection;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.Tasks.TestTask;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.Test.TestType;
 import Visual_DVM_2021.Passes.All.DownloadRepository;
 import Visual_DVM_2021.Passes.All.UnzipFolderPass;
 import Visual_DVM_2021.Passes.All.ZipFolderPass;
@@ -92,7 +91,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                                 task.state = TaskState.Waiting;
                                 task.id = db.IncMaxTaskId();
                                 task.taskspackage_id = tasksPackage.id;
-                                task.makefile_text = GroupInterface.GenerateMakefile(group, project, tasksPackage.dvm_drv, task.flags);
+                                task.makefile_text = group.GenerateMakefile(project, tasksPackage.dvm_drv, task.flags);
                                 task.test_home = tasksPackage.user_workspace + "/projects/" + test_id;
                                 //-->>
                                 task.remote_workspace =
@@ -120,32 +119,32 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             }
         } else if (object instanceof Test) {
             Test new_test = (Test) object;
-            Utils.unpackFile(new_test.project_archive_bytes, TestInterface.getArchive(new_test));
+           // Utils.unpackFile(new_test.project_archive_bytes, new_test.getArchive());
             //распаковать архив в папку с тестами. для тестирования удобнее хранить их уже открытыми.
             UnzipFolderPass unzipFolderPass = new UnzipFolderPass();
             if (!unzipFolderPass.Do(
-                    TestInterface.getArchive(new_test).getAbsolutePath(),
-                    TestInterface.getServerPath(new_test).getParentFile().getAbsolutePath()))
-                throw new RepositoryRefuseException("Не удалось распаковать Тест с именем " + new_test.id);
+                    new_test.getArchive().getAbsolutePath(),
+                    new_test.getServerPath().getParentFile().getAbsolutePath()))
+                throw new RepositoryRefuseException("Не удалось распаковать Тест с id " + new_test.id);
         }
     }
     @Override
     public void DeleteAction(DBObject object) throws Exception {
         if (object instanceof Test) {
             Test test = (Test) object;
-            Utils.forceDeleteWithCheck(TestInterface.getArchive(test));
-            Utils.forceDeleteWithCheck(TestInterface.getServerPath(test));
+            Utils.forceDeleteWithCheck(test.getArchive());
+            Utils.forceDeleteWithCheck(test.getServerPath());
         } else if (object instanceof Group) {
             Group group = (Group) object;
             Vector<Test> tests = new Vector<>();
             for (Test group_test : db.tests.Data.values()) {
-                if (group_test.group_id==group.id) // todo group_name -> group_id
+                if (group_test.group_id == group.id) // todo group_name -> group_id
                     tests.add(group_test);
             }
             for (Test group_test : tests) {
                 db.Delete(group_test);
-                Utils.forceDeleteWithCheck(TestInterface.getArchive(group_test));
-                Utils.forceDeleteWithCheck(TestInterface.getServerPath(group_test));
+                Utils.forceDeleteWithCheck(group_test.getArchive());
+                Utils.forceDeleteWithCheck(group_test.getServerPath());
             }
         } else if (object instanceof ServerSapfor) {
             Utils.forceDeleteWithCheck(
@@ -396,7 +395,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Print("Отправить клиенту тест " + request.arg);
                 if (db.tests.containsKey(request.arg)) {
                     test = db.tests.get(request.arg);
-                    response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.packFile(TestInterface.getArchive(test)));
+                    response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.packFile(test.getArchive()));
                 } else
                     throw new RepositoryRefuseException("Теста с именем " + request.arg + " не существует");
                 break;

src/TestingSystem/Common/TestsDatabase.java

@@ -1,15 +1,15 @@
-package TestingSystem;
+package TestingSystem.Common;
 import Common.Constants;
 import Common.Database.SQLITE.SQLiteDatabase;
 import GlobalData.Settings.SettingName;
-import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
-import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
-import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
-import TestingSystem.Configuration.UI.ConfigurationDBTable;
-import TestingSystem.Group.GroupsDBTable;
-import TestingSystem.TSetting.TSetting;
-import TestingSystem.TSetting.TSettingsDBTable;
-import TestingSystem.Test.TestDBTable;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
+import TestingSystem.DVM.Configuration.UI.ConfigurationDBTable;
+import TestingSystem.Common.Group.GroupsDBTable;
+import TestingSystem.Common.TSetting.TSetting;
+import TestingSystem.Common.TSetting.TSettingsDBTable;
+import TestingSystem.Common.Test.TestDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import java.nio.file.Paths;

src/TestingSystem/DVM/Configuration/Configuration.java

@@ -1,4 +1,4 @@
-package TestingSystem.Configuration;
+package TestingSystem.DVM.Configuration;
 import Common.Database.DBObject;
 import Common.Database.rDBObject;
 public class Configuration extends rDBObject {

src/TestingSystem/DVM/Configuration/ConfigurationInterface.java

@@ -1,19 +1,19 @@
-package TestingSystem.Configuration;
+package TestingSystem.DVM.Configuration;
 import Common.Utils.Utils;
 import GlobalData.RunConfiguration.RunConfiguration;
 
 import java.util.Vector;
 public class ConfigurationInterface {
-    public static Vector<String> getFlags(TestingSystem.Configuration.Configuration object) {
+    public static Vector<String> getFlags(TestingSystem.DVM.Configuration.Configuration object) {
         return Utils.unpackStrings(object.flags);
     }
-    public static Vector<String> getEnvironments(TestingSystem.Configuration.Configuration object) {
+    public static Vector<String> getEnvironments(TestingSystem.DVM.Configuration.Configuration object) {
         return Utils.unpackStrings(object.environments);
     }
-    public static Vector<String> getParams(TestingSystem.Configuration.Configuration object) {
+    public static Vector<String> getParams(TestingSystem.DVM.Configuration.Configuration object) {
         return Utils.unpackStrings(object.usr_par);
     }
-    public static Vector<String> getMatrixes(TestingSystem.Configuration.Configuration object, int testDim) {
+    public static Vector<String> getMatrixes(TestingSystem.DVM.Configuration.Configuration object, int testDim) {
         Vector<Vector<Integer>> res_ = new Vector<>();
         Vector<String> res = new Vector<>();
         if ((object.max_proc_count==0) || (object.min_dim_proc_count == 0 && object.max_dim_proc_count == 0)) {

src/TestingSystem/DVM/Configuration/UI/ConfigurationDBTable.java

@@ -1,4 +1,4 @@
-package TestingSystem.Configuration.UI;
+package TestingSystem.DVM.Configuration.UI;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Database.DBTable;
@@ -7,8 +7,8 @@ import Common.UI.Tables.TableRenderers;
 import Common.UI.VisualiserStringList;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Utils;
-import TestingSystem.Configuration.Configuration;
-import TestingSystem.Configuration.ConfigurationInterface;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.DVM.Configuration.ConfigurationInterface;
 public class ConfigurationDBTable extends DBTable<String, Configuration> {
     public ConfigurationDBTable() {
         super(String.class, Configuration.class);

src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.Configuration.UI.ConfigurationFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.DVM.Configuration.UI.ConfigurationFields">
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.java

@@ -1,4 +1,4 @@
-package TestingSystem.Configuration.UI;
+package TestingSystem.DVM.Configuration.UI;
 import Common.Current;
 import Common.UI.VisualiserStringList;
 import Common.UI.TextField.StyledTextField;

src/TestingSystem/DVM/Tasks/TestCompilationTask.java

@@ -1,8 +1,8 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Database.DBObject;
-import TestingSystem.Configuration.Configuration;
-import TestingSystem.Group.Group;
-import TestingSystem.Test.Test;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Vector;

src/TestingSystem/DVM/Tasks/TestCompilationTasksDBTable.java

@@ -1,4 +1,4 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Current;
 import Common.Database.DBTable;
 public class TestCompilationTasksDBTable extends DBTable<Integer, TestCompilationTask> {

src/TestingSystem/DVM/Tasks/TestRunTask.java

@@ -1,11 +1,11 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Constants;
 import Common.Database.DBObject;
 import GlobalData.Tasks.TaskState;
 import ProjectData.LanguageName;
-import TestingSystem.Configuration.Configuration;
-import TestingSystem.Group.Group;
-import TestingSystem.Test.Test;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Vector;

src/TestingSystem/DVM/Tasks/TestRunTaskInterface.java

@@ -1,4 +1,4 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Current;
 import Common.Global;
 import Common.Utils.StringTemplate;

src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java

@@ -1,4 +1,4 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Current;
 import Common.Database.DBTable;
 import Common.Database.TableFilter;

src/TestingSystem/DVM/Tasks/TestTask.java

@@ -1,11 +1,11 @@
-package TestingSystem.Tasks;
+package TestingSystem.DVM.Tasks;
 import Common.Constants;
 import Common.Database.DBObject;
 import GlobalData.Tasks.TaskState;
-import TestingSystem.Configuration.Configuration;
-import TestingSystem.Group.Group;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestType;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.Test.TestType;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Date;

src/TestingSystem/DVM/TasksPackage/TasksPackage.java

@@ -1,8 +1,8 @@
-package TestingSystem.TasksPackage;
+package TestingSystem.DVM.TasksPackage;
 import Common.Database.DBObject;
 import Common.Database.nDBObject;
 import GlobalData.Machine.MachineType;
-import TestingSystem.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.LinkedHashMap;

src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java

@@ -1,9 +1,9 @@
-package TestingSystem.TasksPackage;
+package TestingSystem.DVM.TasksPackage;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
-import TestingSystem.Tasks.TestRunTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
 
 import java.util.Date;
 import java.util.LinkedHashMap;

src/TestingSystem/DVM/TasksPackage/TasksPackageState.java

@@ -1,4 +1,4 @@
-package TestingSystem.TasksPackage;
+package TestingSystem.DVM.TasksPackage;
 import Common.Current;
 import Common.UI.StatusEnum;
 import Common.UI.Themes.VisualiserFonts;

src/TestingSystem/DVM/TestsSupervisor_2022.java

@@ -1,19 +1,18 @@
-package TestingSystem.TestsSupervisor_2022;
+package TestingSystem.DVM;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.TaskState;
 import Repository.Server.ServerCode;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.Tasks.TestRunTaskInterface;
-import TestingSystem.Tasks.TestTask;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.TasksPackage.TasksPackageState;
-import TestingSystem.Test.TestType;
-import TestingSystem.TestingPlanner;
-import TestingSystem.UserConnection;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.Tasks.TestRunTaskInterface;
+import TestingSystem.DVM.Tasks.TestTask;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import TestingSystem.Common.Test.TestType;
+import TestingSystem.Common.TestingPlanner;
 import com.jcraft.jsch.ChannelSftp;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;

src/TestingSystem/DVM/UserConnection.java

@@ -1,4 +1,4 @@
-package TestingSystem;
+package TestingSystem.DVM;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;

src/TestingSystem/Group/Group.java

@@ -1,42 +0,0 @@
-package TestingSystem.Group;
-import Common.Current;
-import Common.Database.DBObject;
-import Common.Database.riDBObject;
-import Common.UI.UI;
-import ProjectData.LanguageName;
-import TestingSystem.Test.TestType;
-import com.sun.org.glassfish.gmbal.Description;
-
-import java.util.LinkedHashMap;
-public class Group extends riDBObject {
-    @Override
-    public boolean isVisible() {
-        return GroupInterface.isVisible(this);
-    }
-    @Description("DEFAULT 'Default'")
-    public TestType type = TestType.Default;
-    @Description("DEFAULT 'fortran'")
-    public LanguageName language = LanguageName.fortran;
-    //--
-    @Description("IGNORE")
-    public LinkedHashMap<String, byte[]> testsFiles = new LinkedHashMap<>(); //транспорт.
-    //--
-    @Override
-    public void SynchronizeFields(DBObject src) {
-        super.SynchronizeFields(src);
-        Group g = (Group) src;
-        type = g.type;
-        language = g.language;
-    }
-    public Group(Group group) {
-        this.SynchronizeFields(group);
-    }
-    public Group() {
-    }
-    @Override
-    public void select(boolean flag) {
-        super.select(flag);
-        if (Current.hasUI())
-            UI.getMainWindow().ShowCheckedTestsCount();
-    }
-}

src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.Json;
+package TestingSystem.SAPFOR.Json;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
 

src/TestingSystem/SAPFOR/Json/SapforTasksPackage_json.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.Json;
+package TestingSystem.SAPFOR.Json;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;

src/TestingSystem/SAPFOR/Json/SapforTasksResults_json.java

@@ -1,10 +1,10 @@
-package SapforTestingSystem.Json;
+package TestingSystem.SAPFOR.Json;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
-import SapforTestingSystem.SapforTask.MatchState;
-import SapforTestingSystem.SapforTask.SapforTask;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.UI.*;
+import TestingSystem.SAPFOR.SapforTask.MatchState;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.*;
 import com.google.gson.annotations.Expose;
 
 import javax.swing.tree.DefaultMutableTreeNode;

src/TestingSystem/SAPFOR/Json/SapforTest_json.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.Json;
+package TestingSystem.SAPFOR.Json;
 import com.google.gson.annotations.Expose;
 public class SapforTest_json {
     @Expose

src/TestingSystem/SAPFOR/Json/SapforVersion_json.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.Json;
+package TestingSystem.SAPFOR.Json;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
@@ -8,7 +8,7 @@ import ProjectData.Files.ProjectFile;
 import ProjectData.LanguageName;
 import ProjectData.Messages.Errors.MessageError;
 import ProjectData.Project.db_project_info;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import com.google.gson.annotations.Expose;
 import org.apache.commons.io.FileUtils;
 

src/TestingSystem/SAPFOR/PackageModeSupervisor.java

@@ -1,12 +1,12 @@
-package SapforTestingSystem.PackageModeSupervisor;
+package TestingSystem.SAPFOR;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.Json.SapforTasksPackage_json;
-import SapforTestingSystem.Json.SapforTasksResults_json;
-import SapforTestingSystem.Json.SapforTest_json;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
+import TestingSystem.SAPFOR.Json.SapforTasksPackage_json;
+import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
+import TestingSystem.SAPFOR.Json.SapforTest_json;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import SapforTestingSystem.TaskThread;
 import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
 import Visual_DVM_2021.Passes.PassCode_2021;

src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforConfiguration;
+package TestingSystem.SAPFOR.SapforConfiguration;
 import Common.Database.rDBObject;
 public class SapforConfiguration extends rDBObject {
     //настройки.

src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java

@@ -1,11 +1,11 @@
-package SapforTestingSystem.SapforConfiguration;
+package TestingSystem.SAPFOR.SapforConfiguration;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Utils;
-import SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields;
-import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
 
 import java.util.LinkedHashMap;
 public class SapforConfigurationDBTable extends DBTable<String, SapforConfiguration> {

src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationInterface.java

@@ -1,7 +1,7 @@
-package SapforTestingSystem.SapforConfiguration;
+package TestingSystem.SAPFOR.SapforConfiguration;
 import Common.Global;
 import Common.Utils.TextLog;
-import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import java.util.Vector;

src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="SapforTestingSystem.SapforConfiguration.UI.SapforConfigurationFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields">
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforConfiguration.UI;
+package TestingSystem.SAPFOR.SapforConfiguration.UI;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.Windows.Dialog.DialogFields;
 

src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommand.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforConfigurationCommand;
+package TestingSystem.SAPFOR.SapforConfigurationCommand;
 import Common.Database.rDBObject;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.sun.org.glassfish.gmbal.Description;

src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandInterface.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforConfigurationCommand;
+package TestingSystem.SAPFOR.SapforConfigurationCommand;
 import Common.Current;
 public class SapforConfigurationCommandInterface {
     public static boolean isVisible(SapforConfigurationCommand object) {

src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java

@@ -1,10 +1,10 @@
-package SapforTestingSystem.SapforConfigurationCommand;
+package TestingSystem.SAPFOR.SapforConfigurationCommand;
 import Common.Current;
 import Common.Database.DBTable;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.DBObjectDialog;
-import SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.UI.SapforConfigurationCommandFields;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforConfigurationCommandsDBTable extends DBTable<String, SapforConfigurationCommand> {
     public SapforConfigurationCommandsDBTable() {

src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="SapforTestingSystem.SapforConfigurationCommand.UI.SapforConfigurationCommandFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="TestingSystem.SAPFOR.SapforConfigurationCommand.UI.SapforConfigurationCommandFields">
   <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

src/TestingSystem/SAPFOR/SapforConfigurationCommand/UI/SapforConfigurationCommandFields.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforConfigurationCommand.UI;
+package TestingSystem.SAPFOR.SapforConfigurationCommand.UI;
 import Common.Current;
 import Common.UI.Tables.StyledCellLabel;
 import Common.UI.Windows.Dialog.DialogFields;

src/TestingSystem/SAPFOR/SapforTask/MatchState.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTask;
+package TestingSystem.SAPFOR.SapforTask;
 import Common.Current;
 import Common.UI.StatusEnum;
 import Common.UI.Themes.VisualiserFonts;

src/TestingSystem/SAPFOR/SapforTask/SapforTask.java

@@ -1,11 +1,11 @@
-package SapforTestingSystem.SapforTask;
+package TestingSystem.SAPFOR.SapforTask;
 import Common.Constants;
 import Common.Current;
 import Common.Database.DBObject;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
-import SapforTestingSystem.Json.SapforVersion_json;
-import SapforTestingSystem.SapforTasksPackage.UI.VersionSummary;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.VersionSummary;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
 import com.sun.org.glassfish.gmbal.Description;

src/TestingSystem/SAPFOR/SapforTask/SapforTasksDBTable.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTask;
+package TestingSystem.SAPFOR.SapforTask;
 import Common.Current;
 import Common.Database.DBTable;
 import Common.UI.DataSetControlForm;

src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java

@@ -1,12 +1,12 @@
-package SapforTestingSystem.SapforTasksPackage;
+package TestingSystem.SAPFOR.SapforTasksPackage;
 import Common.Constants;
 import Common.Database.DBObject;
 import Common.Database.nDBObject;
 import Common.Global;
 import Common.Utils.Utils;
-import SapforTestingSystem.Json.SapforTasksResults_json;
-import SapforTestingSystem.SapforTask.SapforTask;
-import TestingSystem.TasksPackage.TasksPackageState;
+import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.File;

src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java

@@ -1,8 +1,8 @@
-package SapforTestingSystem.SapforTasksPackage;
+package TestingSystem.SAPFOR.SapforTasksPackage;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 
 import java.util.Date;
 import java.util.LinkedHashMap;

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/ConfigurationSummary.java

@@ -1,6 +1,6 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import Common.Utils.Utils;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import java.util.Arrays;

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/GroupSummary.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 public class GroupSummary extends SapforPackageTreeNode {
     public String group_name = "";
     @Override

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/MatchesSummary.java

@@ -1,5 +1,5 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
-import SapforTestingSystem.SapforTask.MatchState;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
+import TestingSystem.SAPFOR.SapforTask.MatchState;
 public class MatchesSummary extends SapforPackageTreeNode {
     public MatchState state;
     public int count = 0;

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/PackageSummary.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 public class PackageSummary extends SapforPackageTreeNode {
     public int count = 0;
     @Override

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.util.Objects;

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java

@@ -1,9 +1,9 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import Common.Current;
 import Common.UI.Trees.DataTree;
 import Common.UI.Trees.TreeRenderers;
 import Common.UI.UI;
-import SapforTestingSystem.Json.SapforVersion_json;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import Common.UI.Trees.StyledTreeCellRenderer;
 
 import javax.swing.*;

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/StateSummary.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import GlobalData.Tasks.TaskState;
 public class StateSummary extends SapforPackageTreeNode {
     public TaskState state;

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/TreeSummary.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import javax.swing.*;
 import java.util.Objects;
 public abstract class TreeSummary {

src/TestingSystem/SAPFOR/SapforTasksPackage/UI/VersionSummary.java

@@ -1,5 +1,5 @@
-package SapforTestingSystem.SapforTasksPackage.UI;
-import SapforTestingSystem.Json.SapforVersion_json;
+package TestingSystem.SAPFOR.SapforTasksPackage.UI;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
 public class VersionSummary extends SapforPackageTreeNode{
 
     public String version_name = "";

src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java

@@ -1,22 +1,22 @@
-package SapforTestingSystem.SapforTasksPackageSupervisor;
+package TestingSystem.SAPFOR.SapforTasksPackageSupervisor;
 import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.GlobalProperties;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.Json.SapforTasksPackage_json;
-import SapforTestingSystem.Json.SapforTasksResults_json;
-import SapforTestingSystem.Json.SapforTest_json;
-import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
-import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
-import SapforTestingSystem.SapforTask.SapforTask;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.Group.Group;
-import TestingSystem.TasksPackage.TasksPackageState;
-import TestingSystem.Test.Test;
-import TestingSystem.TestingPlanner;
+import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
+import TestingSystem.SAPFOR.Json.SapforTasksPackage_json;
+import TestingSystem.SAPFOR.Json.SapforTasksResults_json;
+import TestingSystem.SAPFOR.Json.SapforTest_json;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationInterface;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.TestingPlanner;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;

src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java

@@ -1,4 +1,4 @@
-package SapforTestingSystem.ServerSapfor;
+package TestingSystem.SAPFOR.ServerSapfor;
 import Common.Database.riDBObject;
 import Common.Utils.Utils;
 import ProjectData.LanguageName;

src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java

@@ -0,0 +1,46 @@
+package TestingSystem.SAPFOR.ServerSapfor;
+import Common.Current;
+import Common.Database.iDBTable;
+import Common.UI.DataSetControlForm;
+import Common.UI.Tables.TableRenderers;
+public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
+    public ServerSapforsDBTable() {
+        super(ServerSapfor.class);
+    }
+    @Override
+    public String getSingleDescription() {
+        return "SAPFOR";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "SAPFOR";
+    }
+    @Override
+    public Current CurrentName() {
+        return Current.ServerSapfor;
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{"версия", "дата сборки"};
+    }
+    @Override
+    public Object getFieldAt(ServerSapfor object, int columnIndex) {
+        switch (columnIndex) {
+            case 1:
+                return object.version;
+            case 2:
+                return object.getBuildDate();
+        }
+        return null;
+    }
+    @Override
+    protected DataSetControlForm createUI() {
+        return new DataSetControlForm(this) {
+            @Override
+            protected void AdditionalInitColumns() {
+               // columns.get(0).setVisible(false);
+                columns.get(2).setRenderer(TableRenderers.RendererDate);
+            }
+        };
+    }
+}

src/TestingSystem/Test/TestInterface.java

@@ -1,24 +0,0 @@
-package TestingSystem.Test;
-import Common.Current;
-import Common.Global;
-
-import java.io.File;
-import java.nio.file.Paths;
-public class TestInterface {
-    public static boolean isVisible(Test object) {
-        return Current.HasGroup() && (Current.getGroup().id == object.group_id);
-    }
-    public static File getArchive(Test object) {
-        return Paths.get(System.getProperty("user.dir"), "Tests", object.id + ".zip").toFile();
-    }
-    public static File getServerPath(Test object) {
-        return Paths.get(System.getProperty("user.dir"), "Tests", String.valueOf(object.id)).toFile();
-    }
-    public static File getHomePath(Test object) {
-        return Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), String.valueOf(object.id)).toFile();
-    }
-    public static String getSummary(Test test) {
-        return test.description;
-    }
-    //--
-}

src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java

@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.TasksPackageToKill.TasksPackageToKill;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 
 import java.util.Vector;

src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java

@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.TasksPackageToKill.TasksPackageToKill;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 
 import java.util.Vector;

src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java

@@ -7,8 +7,8 @@ import ProjectData.Files.DBProjectFile;
 import ProjectData.Project.db_project_info;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Group.Group;
-import TestingSystem.Test.Test;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
@@ -96,7 +96,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
                 //архивация.
                 File archive = Utils.getTempFileName("test_archive");
                 if (passes.get(PassCode_2021.ZipFolderPass).Do(vizTestProject.Home.getAbsolutePath(), archive.getAbsolutePath())) {
-                    test.project_archive_bytes = Utils.packFile(archive);
+                 //   test.project_archive_bytes = Utils.packFile(archive);
                     if (test.dim >= 0)
                         tests.add(test);
                     else UI.Info("для теста " + testFileName + " не удалось определить размерность");

src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java

@@ -4,9 +4,9 @@ import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Group.Group;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestType;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.Test.TestType;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 

src/Visual_DVM_2021/Passes/All/DeleteGroup.java

@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
-import TestingSystem.Group.Group;
-import TestingSystem.TestingServer;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.Server.DeleteServerObject;
 public class DeleteGroup extends DeleteServerObject<TestingServer, Group> {
     public DeleteGroup() {

src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java

@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
 
 import java.util.Vector;

src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java

@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
 
 import java.util.Vector;

src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java

@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.TasksPackage.TasksPackageState;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class DeleteSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {

src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java

@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import TestingSystem.Configuration.Configuration;
+import TestingSystem.DVM.Configuration.Configuration;
 import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
 public class DeleteSelectedConfigurations extends DeleteSelectedServerObjects {
     public DeleteSelectedConfigurations() {

src/Visual_DVM_2021/Passes/All/DeleteSelectedTests.java

@@ -1,5 +1,5 @@
 package Visual_DVM_2021.Passes.All;
-import TestingSystem.Test.Test;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
 public class DeleteSelectedTests  extends DeleteSelectedServerObjects {
     public DeleteSelectedTests() {

src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java

@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
-import SapforTestingSystem.ServerSapfor.ServerSapfor;
-import TestingSystem.TestingServer;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.Server.DeleteServerObject;
 public class DeleteServerSapfor extends DeleteServerObject<TestingServer, ServerSapfor> {
     public DeleteServerSapfor() {

src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java

@@ -3,8 +3,8 @@ import Common.Current;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.TasksPackage.TasksPackageState;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 

src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java

@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.Test.Test;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.Common.Test.Test;
 public class DownloadTaskTest extends DownloadTest {
     @Override
     protected boolean canStart(Object... args) throws Exception {

src/Visual_DVM_2021/Passes/All/DownloadTest.java

@@ -5,8 +5,7 @@ import Common.UI.UI;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestInterface;
+import TestingSystem.Common.Test.Test;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class DownloadTest extends TestingSystemPass<Test> {
@@ -30,29 +29,29 @@ public class DownloadTest extends TestingSystemPass<Test> {
     protected void performPreparation() throws Exception {
         passes.get(PassCode_2021.CloseCurrentProject).Do();
         Current.set(Current.Root, null); //чтобы гарантированно не существовало корня.
-        Utils.forceDeleteWithCheck(TestInterface.getArchive(target));
-        Utils.forceDeleteWithCheck(TestInterface.getHomePath(target));
+        Utils.forceDeleteWithCheck(target.getArchive());
+        Utils.forceDeleteWithCheck(target.getHomePath());
     }
     @Override
     protected void ServerAction() throws Exception {
         Command(new ServerExchangeUnit_2021(ServerCode.DownloadTest, String.valueOf(target.id)));
-        response.Unpack(TestInterface.getArchive(target));
+        response.Unpack(target.getArchive());
     }
     @Override
     protected boolean validate() {
-        return TestInterface.getArchive(target).exists();
+        return target.getArchive().exists();
     }
     @Override
     protected void performDone() throws Exception {
         super.performDone();
         if (passes.get(PassCode_2021.UnzipFolderPass).Do(
-                TestInterface.getArchive(target).getAbsolutePath(),
+                target.getArchive().getAbsolutePath(),
                 Global.visualiser.getWorkspace().getAbsolutePath(), false
         ))
             if (UI.Question("Тестовый проект успешно загружен под именем\n" +
-                    Utils.Brackets(TestInterface.getHomePath(target).getName()) +
+                    Utils.Brackets(target.getHomePath().getName()) +
                     "\nОткрыть его"))
-                passes.get(PassCode_2021.OpenCurrentProject).Do(TestInterface.getHomePath(target));
+                passes.get(PassCode_2021.OpenCurrentProject).Do(target.getHomePath());
     }
 }
 

src/Visual_DVM_2021/Passes/All/EditConfiguration.java

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Database.Database;
 import Common.Global;
-import TestingSystem.Configuration.Configuration;
+import TestingSystem.DVM.Configuration.Configuration;
 import Visual_DVM_2021.Passes.EditObjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EditConfiguration extends EditObjectPass<Configuration> {

src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java

@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Configuration.Configuration;
+import TestingSystem.DVM.Configuration.Configuration;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 public class EditConfigurationOnServer extends TestingSystemPass<Configuration> {
     @Override

src/Visual_DVM_2021/Passes/All/EditGroup.java

@@ -1,7 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
-import TestingSystem.Group.Group;
-import TestingSystem.TestingServer;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.Server.EditServerObject;
 public class EditGroup extends EditServerObject<TestingServer, Group> {
     public EditGroup() {