From 3f00d0f300048094c80e812e8f8852682a9f686e Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 15 Nov 2023 19:45:53 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 14 +--
 src/Common/Constants.java                     |  4 +-
 .../GroupsMenuBar/GroupsMenuBar.java          |  2 +-
 src/GlobalData/GlobalDatabase.java            | 96 -------------------
 src/Repository/RepositoryServer.java          |  5 +-
 .../Passes/All/DownloadGroup.java             | 67 -------------
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  3 -
 7 files changed, 9 insertions(+), 182 deletions(-)
 delete mode 100644 src/Visual_DVM_2021/Passes/All/DownloadGroup.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ae326054..96134f7b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/Database/riDBObject.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/DBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/DBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/iDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/iDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/nDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/nDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Group/Group.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CopyConfigurations.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CopyGroups.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CopyServerObjects.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadGroup.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Common/Constants.java b/src/Common/Constants.java
index 1a72e8fe..84ccc784 100644
--- a/src/Common/Constants.java
+++ b/src/Common/Constants.java
@@ -58,8 +58,8 @@ public class Constants {
     public static final String attachments = "attachments";
     public static final String statistic = "statistic";
     public static final String unknown_metric = " — ";
-    public static final String old_tests_db_name = "tests2023";
-    public static final String tests_db_name = "tests2024";
+    public static final String old_tests_db_name = "tests2024";
+    public static final String tests_db_name = "tests2025";
     public static final String dateNaN = "NaN";
     //пробный коммит. изменение комментария.++
     //кронтаб и перезагрузка
diff --git a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
index 6339cf70..5585ad3b 100644
--- a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
+++ b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
@@ -9,7 +9,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 import javax.swing.*;
 public class GroupsMenuBar extends DataMenuBar {
     public GroupsMenuBar() {
-        super("группы", PassCode_2021.SynchronizeTests, PassCode_2021.DownloadGroup, PassCode_2021.ConvertCorrectnessTests, PassCode_2021.PublishGroup,PassCode_2021.EditGroup, PassCode_2021.DeleteSelectedGroups);
+        super("группы", PassCode_2021.SynchronizeTests, PassCode_2021.ConvertCorrectnessTests, PassCode_2021.PublishGroup,PassCode_2021.EditGroup, PassCode_2021.DeleteSelectedGroups);
         add(new JSeparator());
         add(new MenuBarButton() {
             {
diff --git a/src/GlobalData/GlobalDatabase.java b/src/GlobalData/GlobalDatabase.java
index 9d86a8bf..8e9018d6 100644
--- a/src/GlobalData/GlobalDatabase.java
+++ b/src/GlobalData/GlobalDatabase.java
@@ -124,102 +124,6 @@ public class GlobalDatabase extends SQLiteDatabase {
             Global.Log.PrintException(ex);
         }
     }
-    /*
-    public DataSet<String, SapforTaskResult> getSapforPackagesMasterDataSet(SapforConfigurationTasksSet package_in) throws Exception {
-        DataSet<String, SapforTaskResult> res = new DataSet<String, SapforTaskResult>(String.class, SapforTaskResult.class) {
-            @Override
-            protected DataSetControlForm createUI() {
-                return new DataSetControlForm(this) {
-                    @Override
-                    protected void AdditionalInitColumns() {
-                        columns.get(1).setRenderer(RendererStatusEnum);
-                    }
-                    @Override
-                    public void MouseAction2() throws Exception {
-                        Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do(Current.SapforEtalonTaskResult);
-                    }
-                    @Override
-                    public void ShowCurrentObject() throws Exception {
-                        System.out.println(Current.get(Current.SapforEtalonTaskResult));
-                    }
-                };
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Статус"
-                };
-            }
-            @Override
-            public Object getFieldAt(SapforTaskResult object, int columnIndex) {
-                switch (columnIndex) {
-                    case 1:
-                        return object.task.state;
-                    default:
-                        return null;
-                }
-            }
-            @Override
-            public Current CurrentName() {
-                return Current.SapforEtalonTaskResult;
-            }
-        };
-        /*
-        for (SapforTask task : sapforTasks.Data.values())
-            if (task.sapfor_configuration_id == package_in.id)
-                res.put(task.test_description, new SapforTaskResult(package_in, task));
-        return res;
-    }
-    public DataSet<String, SapforTaskResult> getSapforPackagesSlaveDataSet(SapforConfigurationTasksSet package_in) throws Exception {
-        DataSet<String, SapforTaskResult> res = new DataSet<String, SapforTaskResult>(String.class, SapforTaskResult.class) {
-            @Override
-            protected DataSetControlForm createUI() {
-                return new DataSetControlForm(this) {
-                    @Override
-                    protected void AdditionalInitColumns() {
-                        columns.get(1).setRenderer(RendererStatusEnum);
-                        columns.get(2).setRenderer(RendererStatusEnum);
-                    }
-                    @Override
-                    public void MouseAction2() throws Exception {
-                        Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do(Current.SapforTaskResult);
-                    }
-                    @Override
-                    public void ShowCurrentObject() throws Exception {
-                        System.out.println(Current.get(Current.SapforTaskResult));
-                    }
-                };
-            }
-            @Override
-            public String[] getUIColumnNames() {
-                return new String[]{
-                        "Статус",
-                        "Совпадение"
-                };
-            }
-            @Override
-            public Object getFieldAt(SapforTaskResult object, int columnIndex) {
-                switch (columnIndex) {
-                    case 1:
-                        return object.task.state;
-                    case 2:
-                        return object.match_state;
-                    default:
-                        return null;
-                }
-            }
-            @Override
-            public Current CurrentName() {
-                return Current.SapforTaskResult;
-            }
-        };
-        for (SapforTask task : sapforTasks.Data.values())
-            if (task.sapfor_configuration_id == package_in.id)
-                res.put(task.test_description, new SapforTaskResult(package_in, task));
-
-        return res;
-    }
-    */
     //--
     public LinkedHashMap<SettingName, String> getSapforSettingsForProfile() {
         LinkedHashMap<SettingName, String> res = new LinkedHashMap<>();
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index 78a6412b..0231f85a 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -204,7 +204,7 @@ public abstract class RepositoryServer<D extends Database> {
                             code = request.getCode();
                             //базовый функционал.
                             switch (code) {
-                                //<editor-fold desc="БАЗОВЫЕ">
+                                //<editor-fold desc="файлы и почта">
                                 case ReadFile:
                                     Print("Отправить клиенту текст файла по пути " + Utils.Brackets(request.arg));
                                     response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.ReadAllText(new File(request.arg)));
@@ -227,6 +227,7 @@ public abstract class RepositoryServer<D extends Database> {
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     break;
                                 //</editor-fold>
+                                //<editor-fold desc="Главная база данных">
                                 case PublishObject:
                                     dbObject = (DBObject) request.object;
                                     Print("Опубликовать объект " + dbObject.getPK());
@@ -288,7 +289,7 @@ public abstract class RepositoryServer<D extends Database> {
                                     PublishAction(dbObject);
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     break;
-                                //------------------------
+                                //</editor-fold>
                                 case EXIT:
                                     Print("ЗАВЕРШИТЬ РАБОТУ СЕРВЕРА");
                                     System.exit(0);
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadGroup.java b/src/Visual_DVM_2021/Passes/All/DownloadGroup.java
deleted file mode 100644
index 63d131e6..00000000
--- a/src/Visual_DVM_2021/Passes/All/DownloadGroup.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Common.Utils.Utils;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Group.Group;
-import TestingSystem.Group.GroupInterface;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestInterface;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.TestingSystemPass;
-
-import java.io.File;
-import java.util.Vector;
-public class DownloadGroup extends TestingSystemPass<Group> {
-    File workspace = null;
-    Vector<Test> tests = null;
-    @Override
-    public String getIconPath() {
-        return "/icons/DownloadBugReport.png";
-    }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        workspace = null;
-        tests = null;
-        if (args.length > 0) {
-            target = (Group) args[0];
-            workspace = GroupInterface.getLocalWorkspaceD(target);
-            return true;
-        } else if (Current.Check(Log, Current.Group)) {
-            target = Current.getGroup();
-            workspace = GroupInterface.getLocalWorkspaceD(target);
-            return true;
-        }
-        return false;
-    }
-    @Override
-    protected void performPreparation() throws Exception {
-        //на случай если был открыт какой то из тестов.
-        passes.get(PassCode_2021.CloseCurrentProject).Do();
-        Utils.CheckAndCleanDirectory(workspace);
-        tests = new Vector<>();
-        server.db.tests.Data.values().stream().filter(test -> test.group_id.equals(target.id)).forEach(test -> tests.add(test));
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        for (Test test : tests) {
-            Command(new ServerExchangeUnit_2021(ServerCode.DownloadTest, test.id));
-            response.Unpack(TestInterface.getArchive(test));
-        }
-    }
-    @Override
-    protected void performDone() throws Exception {
-        super.performDone();
-        for (Test test : tests) {
-            if (TestInterface.getArchive(test).exists())
-                passes.get(PassCode_2021.UnzipFolderPass).Do(
-                        TestInterface.getArchive(test).getAbsolutePath(),
-                        workspace.getAbsolutePath(), false
-                );
-        }
-    }
-}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 62df209c..a582f255 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -210,7 +210,6 @@ public enum PassCode_2021 {
     EditGroup,
     PublishGroup,
     EditGroupOnServer,
-    DownloadGroup,
     //-
     DownloadAllBugReportsArchives,
     ShowInstruction,
@@ -413,8 +412,6 @@ public enum PassCode_2021 {
                 return "Разрешение конфликтов common блоков";
             case CreateParallelVariantsCoverageForScenario:
                 return "Построение минимального покрытия параллельных вариантов";
-            case DownloadGroup:
-                return "Загрузка группы в рабочее пространство";
             case OpenProject:
                 return "Открытие проекта (пакетный режим)";
             case CloseProject: