From e259a3c2a91b671887bb6cc860c0885a83003c1c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 5 Feb 2025 01:40:28 +0300
Subject: [PATCH] =?UTF-8?q?v++=20=D0=9B=D1=8E=D0=B1=D0=BE=D0=B5=20=D0=B2?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B8=D0=BC=D0=BE=D0=B4=D0=B5=D0=B9=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B5=20=D1=81=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=B8=20=D1=81=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=B4=D0=BE=20=D0=B5=D0=B4=D0=B8=D0=BD=D1=81=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B4=D1=8B.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  52 +---
 properties                                    |   2 +-
 src/_VisualDVM/Passes/Server/ClientPass.java  |   7 +
 .../Testing/ActualizeTestingPackages.java     |   4 +
 .../Repository/Component/Visualiser.java      |   2 +-
 .../Repository/RepositoryServer.java          | 229 +++++++++---------
 6 files changed, 126 insertions(+), 170 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d284bc21..d7ed6829 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,57 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyProfile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneSapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneSapforSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingComponentsServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingTestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ComponentsRepositoryPass_OLD.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/TestingSystemPass_OLD.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Json/ComponentVersionsInfoJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Json/ComponentVersionsInfoJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/TestingClient.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingServerProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingServerProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTestingChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTestingChecker.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererProfileAuto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererProfileAuto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/SwitcherProfileAuto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/SwitcherProfileAuto.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 0e4aee55..fff10d8d 100644
--- a/properties
+++ b/properties
@@ -1,6 +1,6 @@
 {
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1738237411\\smodule114a",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/_VisualDVM/Passes/Server/ClientPass.java b/src/_VisualDVM/Passes/Server/ClientPass.java
index 7db48c6b..4594be03 100644
--- a/src/_VisualDVM/Passes/Server/ClientPass.java
+++ b/src/_VisualDVM/Passes/Server/ClientPass.java
@@ -12,6 +12,9 @@ public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T>
     protected boolean needsAnimation() {
         return false;
     }
+    protected boolean requestNeedsAnimation(){
+        return true;
+    }
     @Override
     public String getButtonText() {
         return "";
@@ -20,6 +23,10 @@ public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T>
     protected boolean SendRequest(ServerCode code_in, String arg_in, Serializable object_in, int delay){
         request = null;
         request =  new RepositoryPass(getServer()) {
+            @Override
+            protected boolean needsAnimation() {
+                return requestNeedsAnimation();
+            }
             @Override
             public String getDescription() {
                 return code_in.getDescription();
diff --git a/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
index ed188440..c105c9d4 100644
--- a/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
+++ b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
@@ -17,6 +17,10 @@ public abstract class ActualizeTestingPackages<P extends TestingPackage> extends
     }
     protected abstract ServerCode getCheckCode();
     @Override
+    protected boolean requestNeedsAnimation() {
+        return false;
+    }
+    @Override
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();
         for (P testingPackage : getTable().Data.values()) {
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index 426b0d6d..eef4b4e6 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1142;
+        version = 1143;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/_VisualDVM/Repository/RepositoryServer.java b/src/_VisualDVM/Repository/RepositoryServer.java
index 3060f779..28263b33 100644
--- a/src/_VisualDVM/Repository/RepositoryServer.java
+++ b/src/_VisualDVM/Repository/RepositoryServer.java
@@ -188,121 +188,119 @@ public abstract class RepositoryServer<D extends Database> {
                 out = new ObjectOutputStream(clientSocket.getOutputStream());
                 in = new ObjectInputStream(clientSocket.getInputStream());
                 //->
-                //todo убрать цикл. пусть читает лишь одну команду.было зависание как раз на чтении второй
-                while (true) {
-                    DBObject dbObject = null;
-                    Pair<Class, Object> p = null;
-                    Print("Ожидание команды от клиента...");
-                    Object transport = in.readObject(); //может висеть!!!!
-                    Print("Команда прочитана.");
-                    if (transport instanceof ServerExchangeUnit_2021) {
-                        request = (ServerExchangeUnit_2021) transport;
-                        response = null;
-                        Print("клиент_2021: <- " + (request.codeName));
-                        try {
-                            code = request.getCode();
-                            //базовый функционал.
-                            switch (code) {
-                                //<editor-fold desc="файлы и почта">
-                                case ReadFile:
-                                    Print("Отправить клиенту текст файла по пути " + Utils_.Brackets(request.arg));
-                                    response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.ReadAllText(new File(request.arg)));
-                                    break;
-                                case SendFile:
-                                    //нам пришел файл.
-                                    Print("Получить от клиента файл, и распаковать его по пути " + Utils_.Brackets(request.arg));
-                                    request.Unpack(); //распаковка идет по его аргу-пути назначения
-                                    response = new ServerExchangeUnit_2021(ServerCode.OK);
-                                    break;
-                                case ReceiveFile:
-                                    Print("Отправить клиенту файл по пути " + Utils_.Brackets(request.arg));
-                                    response = new ServerExchangeUnit_2021(ServerCode.OK);
-                                    File file = new File(request.arg);
-                                    response.object = file.exists() ? Utils_.fileToBytes(file) : null;
-                                    break;
-                                case Email:
-                                    Print("Отправка сообщения электронной почты");
-                                    Email((EmailMessage) request.object, request.arg);
-                                    response = new ServerExchangeUnit_2021(ServerCode.OK);
-                                    break;
-                                case EmailBroadcast:
-                                    EmailBroadcast();
-                                    break;
-                                //</editor-fold>
-                                //<editor-fold desc="Главная база данных">
-                                case CheckObjectExistense:
-                                    p = (Pair<Class, Object>) request.object;
-                                    Print("Проверить существование объекта класса " + p.getKey().toString() + " с ключом " + p.getValue());
-                                    response = new ServerExchangeUnit_2021(ServerCode.OK);
-                                    response.object = db.checkObjectExistense(p.getKey(), p.getValue());
-                                    break;
-                                case EditObject:
-                                    DBObject new_object = (DBObject) request.object;
-                                    Print("Редактировать объект " + new_object.getPK());
-                                    db.UpdateWithCheck(new_object);
-                                    afterEditAction(new_object);
-                                    response = new ServerExchangeUnit_2021(ServerCode.OK);
-                                    break;
-                                case DeleteObject:  //устарело. потом убрать. сейчас на это баг репорты повязаны.
-                                    dbObject = (DBObject) request.object;
-                                    Print("Удалить объект " + dbObject.getPK());
-                                    db.DeleteWithCheck(dbObject);
-                                    afterDeleteAction(dbObject);
-                                    response = new ServerExchangeUnit_2021(ServerCode.OK);
-                                    break;
-                                case GetObjectCopyByPK:
-                                    p = (Pair<Class, Object>) request.object;
-                                    Print("Получить копию объекта класса " + p.getKey().toString() + " по ключу " + p.getValue());
-                                    dbObject = db.getObjectCopyByPK(p.getKey(), p.getValue());
-                                    response = new ServerExchangeUnit_2021(ServerCode.OK);
-                                    response.object = dbObject;
-                                    break;
-                                case GetObjectsCopiesByPK:
-                                    Print("Получить список копий объектов по ключам");
-                                    p = (Pair<Class, Object>) request.object;
-                                    response = new ServerExchangeUnit_2021(ServerCode.OK);
-                                    response.object = db.getObjectsCopies(p.getKey(), (Vector<Object>) p.getValue());
-                                    break;
-                                case PublishObject:
-                                    PublishObject();
-                                    break;
-                                case PublishObjects:
-                                    PublishObjects();
-                                    break;
-                                case DeleteObjectByPK:
-                                    DeleteObjectByPK();
-                                    break;
-                                case DeleteObjectsByPK:
-                                    DeleteObjectsByPK();
-                                    break;
-                                case CloneObjectByPK:
-                                    CloneObject();
-                                    break;
-                                //</editor-fold>
-                                case EXIT:
-                                    Print("ЗАВЕРШИТЬ РАБОТУ СЕРВЕРА");
-                                    System.exit(0);
-                                    break;
-                                case Ping:
-                                    Print("Проверка активности сервера");
-                                    Ping();
-                                    break;
-                                default:
-                                    Session();
-                                    break;
-                            }
-                        } catch (Exception ex) {
-                            response = new ServerExchangeUnit_2021(ServerCode.FAIL, "Исключение сервера", ex);
-                        } finally {
-                            Print("сервер: -> " + response.codeName);
-                            out.writeObject(response);
-                            Print("Ответ отправлен.");
+                DBObject dbObject = null;
+                Pair<Class, Object> p = null;
+                Print("Ожидание команды от клиента...");
+                Object transport = in.readObject();
+                Print("Команда прочитана.");
+                if (transport instanceof ServerExchangeUnit_2021) {
+                    request = (ServerExchangeUnit_2021) transport;
+                    response = null;
+                    Print("клиент_2021: <- " + (request.codeName));
+                    try {
+                        code = request.getCode();
+                        //базовый функционал.
+                        switch (code) {
+                            //<editor-fold desc="файлы и почта">
+                            case ReadFile:
+                                Print("Отправить клиенту текст файла по пути " + Utils_.Brackets(request.arg));
+                                response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils.ReadAllText(new File(request.arg)));
+                                break;
+                            case SendFile:
+                                //нам пришел файл.
+                                Print("Получить от клиента файл, и распаковать его по пути " + Utils_.Brackets(request.arg));
+                                request.Unpack(); //распаковка идет по его аргу-пути назначения
+                                response = new ServerExchangeUnit_2021(ServerCode.OK);
+                                break;
+                            case ReceiveFile:
+                                Print("Отправить клиенту файл по пути " + Utils_.Brackets(request.arg));
+                                response = new ServerExchangeUnit_2021(ServerCode.OK);
+                                File file = new File(request.arg);
+                                response.object = file.exists() ? Utils_.fileToBytes(file) : null;
+                                break;
+                            case Email:
+                                Print("Отправка сообщения электронной почты");
+                                Email((EmailMessage) request.object, request.arg);
+                                response = new ServerExchangeUnit_2021(ServerCode.OK);
+                                break;
+                            case EmailBroadcast:
+                                EmailBroadcast();
+                                break;
+                            //</editor-fold>
+                            //<editor-fold desc="Главная база данных">
+                            case CheckObjectExistense:
+                                p = (Pair<Class, Object>) request.object;
+                                Print("Проверить существование объекта класса " + p.getKey().toString() + " с ключом " + p.getValue());
+                                response = new ServerExchangeUnit_2021(ServerCode.OK);
+                                response.object = db.checkObjectExistense(p.getKey(), p.getValue());
+                                break;
+                            case EditObject:
+                                DBObject new_object = (DBObject) request.object;
+                                Print("Редактировать объект " + new_object.getPK());
+                                db.UpdateWithCheck(new_object);
+                                afterEditAction(new_object);
+                                response = new ServerExchangeUnit_2021(ServerCode.OK);
+                                break;
+                            case DeleteObject:  //устарело. потом убрать. сейчас на это баг репорты повязаны.
+                                dbObject = (DBObject) request.object;
+                                Print("Удалить объект " + dbObject.getPK());
+                                db.DeleteWithCheck(dbObject);
+                                afterDeleteAction(dbObject);
+                                response = new ServerExchangeUnit_2021(ServerCode.OK);
+                                break;
+                            case GetObjectCopyByPK:
+                                p = (Pair<Class, Object>) request.object;
+                                Print("Получить копию объекта класса " + p.getKey().toString() + " по ключу " + p.getValue());
+                                dbObject = db.getObjectCopyByPK(p.getKey(), p.getValue());
+                                response = new ServerExchangeUnit_2021(ServerCode.OK);
+                                response.object = dbObject;
+                                break;
+                            case GetObjectsCopiesByPK:
+                                Print("Получить список копий объектов по ключам");
+                                p = (Pair<Class, Object>) request.object;
+                                response = new ServerExchangeUnit_2021(ServerCode.OK);
+                                response.object = db.getObjectsCopies(p.getKey(), (Vector<Object>) p.getValue());
+                                break;
+                            case PublishObject:
+                                PublishObject();
+                                break;
+                            case PublishObjects:
+                                PublishObjects();
+                                break;
+                            case DeleteObjectByPK:
+                                DeleteObjectByPK();
+                                break;
+                            case DeleteObjectsByPK:
+                                DeleteObjectsByPK();
+                                break;
+                            case CloneObjectByPK:
+                                CloneObject();
+                                break;
+                            //</editor-fold>
+                            case EXIT:
+                                Print("ЗАВЕРШИТЬ РАБОТУ СЕРВЕРА");
+                                System.exit(0);
+                                break;
+                            case Ping:
+                                Print("Проверка активности сервера");
+                                Ping();
+                                break;
+                            default:
+                                Session();
+                                break;
                         }
+                    } catch (Exception ex) {
+                        response = new ServerExchangeUnit_2021(ServerCode.FAIL, "Исключение сервера", ex);
+                    } finally {
+                        Print("сервер: -> " + response.codeName);
+                        out.writeObject(response);
+                        Print("Ответ отправлен.");
                     }
                 }
+                Print("Соединение с клиентом завершено.");
                 //->
             } catch (Exception ex) {
-                Print("Соединение с клиентом завершено.");
+                Print("Исключение.Соединение с клиентом завершено.");
             } finally {
                 //->
                 try {
@@ -374,8 +372,8 @@ public abstract class RepositoryServer<D extends Database> {
             dst.sender_name = packed[0];
             dst.sender_address = packed[1];
             db.Insert(dst);
-            afterCloneAction(src,dst);
-            response.object= (Serializable) dst.getPK();
+            afterCloneAction(src, dst);
+            response.object = (Serializable) dst.getPK();
         }
     }
     protected void afterCloneAction(riDBObject src, riDBObject dst) throws Exception {
@@ -407,11 +405,4 @@ public abstract class RepositoryServer<D extends Database> {
     public void Ping() {
         response = new ServerExchangeUnit_2021(ServerCode.OK);
     }
-    //---
-    /*
-    public <T extends DBObject> T  getActual(T object_in, Class<T> object_class)throws Exception{
-        return (T) ClientRequest(ServerCode.GetObjectCopyByPK, "",
-                new Pair<>(object_class, object_in.getPK()));
-    }
-     */
 }