From 281ec9bfc29c2d9ff6fcf7c8be530cb552f1f9a8 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 4 Feb 2025 18:13:49 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  4 +--
 .../All/ResurrectComponentFromServer.java     | 28 +++++++------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 77449b4b..343e4c24 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <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/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.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/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
index dd02f45b..12ac5e79 100644
--- a/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
+++ b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
@@ -10,6 +10,7 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.Passes.CurrentComponentPass;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Utils;
@@ -22,22 +23,26 @@ import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.Vector;
-public class ResurrectComponentFromServer extends CurrentComponentPass {
+public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDVM.Repository.Component.Component> {
     Vector<RemoteFile> backups; //не забывать что файлы на СЕРВЕРЕ.
     RemoteFile remoteFile;
     File localFile;
+    /*
     @Override
     public JMenuItem createMenuItem() {
         if (menuItem == null)
             menuItem = new PassMenuItem(this);
         return menuItem;
     }
+
+     */
     @Override
     protected boolean canStart(Object... args) throws Exception {
         remoteFile = null;
         localFile = null;
-        if (super.canStart() && Global.mainModule.getPass(PassCode.GetComponentsBackupsFromServer).Do()) {
+        if (Global.components.getUI().CheckCurrent(Log) && Global.mainModule.getPass(PassCode.GetComponentsBackupsFromServer).Do()) {
             //1. Получить список бекапов.
+            target = Global.components.getUI().getCurrent();
             backups = (Vector<RemoteFile>) Global.mainModule.getPass(PassCode.GetComponentsBackupsFromServer).target;
             backups.sort((o1, o2) -> o2.name.compareTo(o1.name));
             Dialog d = new Dialog(null) {
@@ -81,29 +86,16 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
             };
             if (d.ShowDialog("Выбор версии для восстановления") && Global.mainModule.Check(Log, Current.ComponentServerBackup)) {
                 remoteFile = Global.mainModule.getComponentServerBackup();
-                return true;
+                return SendRequest(ServerCode.ReceiveFile, remoteFile.full_name);
             }
-            ;
         }
         return false;
     }
     @Override
     protected void body() throws Exception {
         //1. Скачать файл.
-        Pass receivePass = new ComponentsRepositoryPass_OLD() {
-            @Override
-            public String getDescription() {
-                return "Скачивание файла с сервера";
-            }
-            @Override
-            protected void ServerAction() throws Exception {
-                Command(new ServerExchangeUnit_2021(ServerCode.ReceiveFile, remoteFile.full_name));
-                localFile = Utils.getTempFileName(remoteFile.name);
-                server_response.Unpack(localFile);
-            }
-        };
-        if (!receivePass.Do())
-            throw new PassException("Не удалось скачать файл!");
+        localFile = Utils.getTempFileName(remoteFile.name);
+        request.server_response.Unpack(localFile);
         //------------>>
         Files.copy(localFile.toPath(), target.getNewFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
         target.Update();