From 022ece9c4918200805dcfefd1fa37486d135a04b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 18 Nov 2023 02:37:56 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 12 ++---
 .../Passes/All/DeleteSapforTasksPackage.java  | 44 +++++--------------
 .../Server/DeleteServerAccountObject.java     | 23 ++++++++++
 .../Passes/Server/RepositoryPass.java         |  7 ---
 4 files changed, 38 insertions(+), 48 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8e36eb37..a5bd67f5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforPackageData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.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/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
index 5307d8a9..b1e09e86 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
@@ -1,52 +1,32 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Current;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
 import TestingSystem.DVM.TasksPackage.TasksPackageState;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
-public class DeleteSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {
-    @Override
-    public String getIconPath() {
-        return "/icons/Delete.png";
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import Visual_DVM_2021.Passes.Server.DeleteServerAccountObject;
+public class DeleteSapforTasksPackage extends DeleteServerAccountObject<SapforTasksPackage> {
+    public DeleteSapforTasksPackage() {
+        super(SapforTasksPackage.class);
     }
-    @Override
-    public String getButtonText() {
-        return "";
+    public boolean checkActivity() {
+        if (!target.state.equals(TasksPackageState.Done) && !target.state.equals(TasksPackageState.Aborted)) {
+            Log.Writeln_("Нельзя удалить активный пакет!");
+            return false;
+        }
+        return true;
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.SapforTasksPackage)) {
-            target = Current.getSapforTasksPackage();
-            if (!target.state.equals(TasksPackageState.Done) && !target.state.equals(TasksPackageState.Aborted)) {
-                Log.Writeln_("Нельзя удалить активный пакет!");
-            } else
-                return true;
-        }
-        return false;
+        return super.canStart(args) && checkActivity();
     }
     @Override
     protected void showPreparation() throws Exception {
         UI.getMainWindow().getTestingWindow().DropSapforComparison();
     }
     @Override
-    protected void ServerAction() throws Exception {
-        DeleteAccountObject(target);
-    }
-    @Override
     protected void performDone() throws Exception {
         super.performDone();
         Utils.delete_with_check(target.getLocalWorkspace());
-        passes.get(PassCode_2021.SynchronizeTestsTasks).Do();
     }
 }
 
-
-/*
-    @Override
-    protected void performPreparation() throws Exception {
-        if (Current.hasUI()&&Current.HasSapforTasksPackage()) {
-            UI.getMainWindow().getTestingWindow().RemoveSapforPackageFromComparison();
-        }
-*/
diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java b/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java
new file mode 100644
index 00000000..bd9bd90b
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java
@@ -0,0 +1,23 @@
+package Visual_DVM_2021.Passes.Server;
+import Common.Current;
+import Common.Database.Database;
+import Common.Database.riDBObject;
+import Common.Global;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
+import TestingSystem.Common.TestingServer;
+import javafx.util.Pair;
+public class DeleteServerAccountObject<D extends riDBObject> extends DeleteServerObject<TestingServer, D> {
+    public DeleteServerAccountObject(Class<D> d_in) {
+        super(Global.testingServer, d_in);
+    }
+    @Override
+    protected Database getDb() {
+        return Global.testingServer.account_db;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        Command(new ServerExchangeUnit_2021(ServerCode.DeleteAccountObjectByPK, Current.getAccount().email,
+                new Pair<>(target.getClass(), target.getPK())));
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java b/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
index a140c855..b267dc75 100644
--- a/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
+++ b/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
@@ -1,6 +1,5 @@
 package Visual_DVM_2021.Passes.Server;
 import Common.Constants;
-import Common.Current;
 import Common.Database.DBObject;
 import Common.Database.iDBObject;
 import Common.Global;
@@ -136,10 +135,4 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
         Command(new ServerExchangeUnit_2021(ServerCode.DeleteObjectByPK, "",
                 new Pair<>(object.getClass(), object.getPK())));
     }
-    //-------------------------------------------
-    //--- ОБЪЕКТЫ БАЗЫ ПОЛЬЗОВАТЕЛЯ
-    public void DeleteAccountObject(DBObject object) throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.DeleteAccountObjectByPK, Current.getAccount().email,
-                new Pair<>(object.getClass(), object.getPK())));
-    }
 }