From a19a9759d3757b0ca37ef54550d9308538405c96 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 4 Feb 2025 21:37:07 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  3 ++-
 .../Passes/All/DownloadDVMPackages.java       | 25 +++----------------
 .../Passes/All/DownloadSapforPackage.java     | 25 +++----------------
 .../Repository/Server/ServerCode.java         |  4 +++
 4 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c3521bba..bca3abe3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,8 @@
   <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/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.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/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/_VisualDVM/Passes/All/DownloadDVMPackages.java b/src/_VisualDVM/Passes/All/DownloadDVMPackages.java
index 575dbb6e..25fdea2c 100644
--- a/src/_VisualDVM/Passes/All/DownloadDVMPackages.java
+++ b/src/_VisualDVM/Passes/All/DownloadDVMPackages.java
@@ -4,6 +4,7 @@ import Common.Passes.Pass;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -14,7 +15,7 @@ import org.apache.commons.io.FileUtils;
 import java.io.File;
 import java.util.Date;
 import java.util.Vector;
-public class DownloadDVMPackages extends Pass<Vector<Integer>> {
+public class DownloadDVMPackages extends TestingServerPass<Vector<Integer>> {
     Vector<Pair<Integer, Pair<byte[], byte[]>>> packed_packages;
     @Override
     public String getIconPath() {
@@ -32,29 +33,11 @@ public class DownloadDVMPackages extends Pass<Vector<Integer>> {
     protected boolean canStart(Object... args) throws Exception {
         target = (Vector<Integer>) args[0];
         packed_packages = null;
-        TestingSystemPass_OLD pass = new TestingSystemPass_OLD<Vector<Integer>>() {
-            @Override
-            protected boolean canStart(Object... args) throws Exception {
-                target = (Vector<Integer>) args[0];
-                return true;
-            }
-            @Override
-            public String getDescription() {
-                return "Получение пакетов";
-            }
-            @Override
-            protected void ServerAction() throws Exception {
-                Command(new ServerExchangeUnit_2021(ServerCode.DownloadDVMPackages, "", target));
-                packed_packages = (Vector<Pair<Integer, Pair<byte[], byte[]>>>) server_response.object;
-            }
-        };
-        if (!pass.Do(target)) {
-            return false;
-        }
-        return true;
+        return SendRequest(ServerCode.DownloadDVMPackages, "", target);
     }
     @Override
     protected void body() throws Exception {
+        packed_packages = (Vector<Pair<Integer, Pair<byte[], byte[]>>>) request.server_response.object;
         ShowMessage1("Распаковка пакета");
         for (Pair<Integer, Pair<byte[], byte[]>> p : packed_packages) {
             DVMPackage dvmPackage = Global.testingServer.db.dvmPackages.get(p.getKey());
diff --git a/src/_VisualDVM/Passes/All/DownloadSapforPackage.java b/src/_VisualDVM/Passes/All/DownloadSapforPackage.java
index 8e97afb9..81ea33b4 100644
--- a/src/_VisualDVM/Passes/All/DownloadSapforPackage.java
+++ b/src/_VisualDVM/Passes/All/DownloadSapforPackage.java
@@ -4,6 +4,7 @@ import Common.Passes.Pass;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -13,14 +14,10 @@ import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.util.Date;
-public class DownloadSapforPackage extends Pass<SapforPackage> {
+public class DownloadSapforPackage extends TestingServerPass<SapforPackage> {
     File loaded;
     byte[] packed;
     @Override
-    protected boolean needsAnimation() {
-        return true;
-    }
-    @Override
     protected boolean canStart(Object... args) throws Exception {
         target = (SapforPackage) args[0];
         if (!target.state.isDone()) {
@@ -29,25 +26,11 @@ public class DownloadSapforPackage extends Pass<SapforPackage> {
         }
         int id = target.id;
         loaded = new File(target.getLocalWorkspace(), CommonConstants.LOADED);
-        if (!loaded.exists()) {
-            Pass pass = new TestingSystemPass_OLD() {
-                @Override
-                public String getDescription() {
-                    return "Скачивание";
-                }
-                @Override
-                protected void ServerAction() throws Exception {
-                    Command(new ServerExchangeUnit_2021(ServerCode.DownloadSapforPackage, "", id));
-                    packed = (byte[]) server_response.object;
-                }
-            };
-            return pass.Do();
-        }
-        ;
-        return false;
+        return !loaded.exists()&&SendRequest(ServerCode.DownloadSapforPackage, "", id);
     }
     @Override
     protected void body() throws Exception {
+        packed = (byte[]) request.server_response.object;
         File workspace = target.getLocalWorkspace();
         Utils_.forceDeleteWithCheck(workspace);
         File archive = Utils.getTempFileName(String.valueOf(target.id));
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index 276bd307..ddfa2391 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -124,6 +124,10 @@ public enum ServerCode {
                 return "Конвертация проекта на сервере";
             case DownloadTest:
                 return "Скачивание теста с сервера";
+            case DownloadSapforPackage:
+                return "Скачивание пакета тестирования SAPFOR с сервера";
+            case DownloadDVMPackages:
+                return "Скачивание пакета тестирования DVM с сервера";
             default:
                 return this.toString();
         }