From d4c2875ed5f3f2a8371e70e13f1d891a0160365d Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 4 Feb 2025 20:51:23 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  7 +++--
 .../All/GetComponentsBackupsFromServer.java   | 13 +++++----
 .../Passes/All/PingComponentsServer.java      | 28 +++----------------
 .../Passes/All/PingTestingServer.java         | 28 +++----------------
 .../Passes/All/PublishRemoteWorkspace.java    |  9 ++----
 .../Repository/Server/ServerCode.java         |  2 ++
 6 files changed, 24 insertions(+), 63 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 19b93dab..10282365 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,10 @@
   </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/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.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/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/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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java b/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
index abb8df91..741887e7 100644
--- a/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
+++ b/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
@@ -1,22 +1,23 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 
 import java.io.File;
 import java.util.Vector;
-public class GetComponentsBackupsFromServer extends ComponentsRepositoryPass_OLD<Vector<File>> {
+public class GetComponentsBackupsFromServer extends ComponentsServerPass<Vector<File>> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();
-        return Global.components.getUI().CheckCurrent(Log);
+        return Global.components.getUI().CheckCurrent(Log)&&
+                SendRequest(ServerCode.GetComponentsBackups,
+                        Global.components.getUI().getCurrent().getComponentType().toString());
     }
     @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsBackups,
-                Global.components.getUI().getCurrent().getComponentType().toString()));
-        target = (Vector<File>) server_response.object;
+    protected void body() throws Exception {
+        target = (Vector<File>) request.server_response.object;
     }
     @Override
     protected boolean validate() {
diff --git a/src/_VisualDVM/Passes/All/PingComponentsServer.java b/src/_VisualDVM/Passes/All/PingComponentsServer.java
index 741ca5bc..0170c3e8 100644
--- a/src/_VisualDVM/Passes/All/PingComponentsServer.java
+++ b/src/_VisualDVM/Passes/All/PingComponentsServer.java
@@ -1,36 +1,16 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 
 import java.net.ConnectException;
-public class PingComponentsServer extends ComponentsRepositoryPass_OLD {
-    boolean flag;
+public class PingComponentsServer extends ComponentsServerPass {
+    //todo ПИНГ РЕАЛИЗОВАТЬ ЧЕРЕЗ SSH
     boolean silent;
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        flag = false;
         silent = args.length > 0 ? (boolean) args[0] : false;
-        return super.canStart(args);
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.Ping));
-        flag = true;
-    }
-    @Override
-    protected boolean validate() {
-        return flag;
-    }
-    @Override
-    protected void CheckException(Exception ex) {
-        if (silent) {
-            Throwable cause = getCauseRec(ex);
-            if ((cause instanceof ConnectException) && cause.getMessage().contains("Connection refused: connect")) {
-                //так как это пинг, игнорируем.
-                return;
-            }
-        }
-        super.CheckException(ex);
+        return super.canStart(args)&&SendRequest(ServerCode.Ping);
     }
 }
\ No newline at end of file
diff --git a/src/_VisualDVM/Passes/All/PingTestingServer.java b/src/_VisualDVM/Passes/All/PingTestingServer.java
index 506a6b5a..ff966e6c 100644
--- a/src/_VisualDVM/Passes/All/PingTestingServer.java
+++ b/src/_VisualDVM/Passes/All/PingTestingServer.java
@@ -1,36 +1,16 @@
 package _VisualDVM.Passes.All;
+import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 
 import java.net.ConnectException;
-public class PingTestingServer extends TestingSystemPass_OLD {
-    boolean flag;
+public class PingTestingServer extends TestingServerPass {
+    //todo ПИНГ РЕАЛИЗОВАТЬ ЧЕРЕЗ SSH
     boolean silent;
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        flag = false;
         silent = args.length > 0 ? (boolean) args[0] : false;
-        return super.canStart(args);
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.Ping));
-        flag = true;
-    }
-    @Override
-    protected boolean validate() {
-        return flag;
-    }
-    @Override
-    protected void CheckException(Exception ex) {
-        if (silent) {
-            Throwable cause = getCauseRec(ex);
-            if ((cause instanceof ConnectException) && cause.getMessage().contains("Connection refused: connect")) {
-                //так как это пинг, игнорируем.
-                return;
-            }
-        }
-        super.CheckException(ex);
+        return super.canStart(args)&&(SendRequest(ServerCode.Ping));
     }
 }
diff --git a/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java b/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java
index f7450e03..ba4d6686 100644
--- a/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java
+++ b/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java
@@ -1,16 +1,13 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
-public class PublishRemoteWorkspace extends ComponentsRepositoryPass_OLD<SubscriberWorkspace> {
+public class PublishRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = (SubscriberWorkspace) args[0];
-        return true;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target));
+        return SendRequest(ServerCode.PublishObject, "", target);
     }
 }
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index ebfe2dc0..58501ce6 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -118,6 +118,8 @@ public enum ServerCode {
                 return "Публикация объектов на сервере";
             case ReplaceTestCode:
                 return  "Замена кода теста на сервере";
+            case GetComponentsBackups:
+                return "Получение резервных копий компонента с сервера";
             default:
                 return this.toString();
         }