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

---
 .idea/workspace.xml                           |  3 ++-
 .../Passes/All/CheckRemoteWorkspace.java      | 23 ++++++++++---------
 .../All/ResurrectComponentFromServer.java     |  9 --------
 .../Repository/Server/ServerCode.java         |  2 ++
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 343e4c24..f9b74525 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,9 @@
   </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/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.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/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java b/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
index 984057ce..1d7bff34 100644
--- a/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
+++ b/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
@@ -4,22 +4,23 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.User.User;
 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 CheckRemoteWorkspace extends ComponentsRepositoryPass_OLD<SubscriberWorkspace> {
+public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = null;
-        return Global.mainModule.getAccount().CheckRegistered(Log);
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        String email = Global.mainModule.getAccount().email;
-        String machineURL = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().getURL();
-        String login = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent().login;
-        Command(new ServerExchangeUnit_2021(ServerCode.CheckURLRegistered,
-                email + "\n" + machineURL + "\n" + login));
-        target = (SubscriberWorkspace) server_response.object;
+        if (Global.mainModule.getAccount().CheckRegistered(Log)){
+            String email = Global.mainModule.getAccount().email;
+            String machineURL = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().getURL();
+            String login = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent().login;
+            if (SendRequest(ServerCode.CheckURLRegistered, email + "\n" + machineURL + "\n" + login)) {
+                target = (SubscriberWorkspace) request.server_response.object;
+                return true;
+            }
+        };
+        return false;
     }
 }
diff --git a/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
index 12ac5e79..36c06475 100644
--- a/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
+++ b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
@@ -27,15 +27,6 @@ public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDV
     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;
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index 5d0100df..d898367e 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -109,6 +109,8 @@ public enum ServerCode {
                 return "Скачивание файла с сервера";
             case GetComponentChangesLog:
                 return "Получение журнала изменений компонента с сервера";
+            case CheckURLRegistered:
+                return "Проверка регистрации машины на сервере";
             default:
                 return this.toString();
         }