From 9dc4922b89a78f479e9f2cda68a4f23f0503b164 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 16 Oct 2024 19:40:55 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 18 ++++++++
 properties                                    |  2 +-
 src/Common/Passes/DeleteObjectsPass.java      |  2 -
 .../GlobalData/Compiler/CompilersDBTable.java | 12 +++--
 .../GlobalData/Machine/MachinesDBTable.java   |  6 ++-
 .../GlobalData/Makefile/MakefilesDBTable.java | 10 ++--
 .../CompilationTask/CompilationTask.java      |  4 ++
 .../CompilationTasksDBTable.java              |  7 ---
 .../CompilationTasksMenuBar.java              |  3 +-
 .../Tasks/RunTask/RunTasksDBTable.java        |  7 ---
 .../Tasks/RunTask/RunTasksMenuBar.java        |  3 +-
 .../GlobalData/User/UsersDBTable.java         | 10 ++--
 .../Passes/All/DeleteCompilationTasks.java    | 20 ++++++++
 src/_VisualDVM/Passes/All/DeleteCompiler.java |  4 +-
 src/_VisualDVM/Passes/All/DeleteMachine.java  |  4 +-
 src/_VisualDVM/Passes/All/DeleteMakefile.java |  4 +-
 src/_VisualDVM/Passes/All/DeleteRunTasks.java | 20 ++++++++
 .../All/DeleteSelectedCompilationTasks.java   | 46 -------------------
 .../Passes/All/DeleteSelectedRunTasks.java    | 41 -----------------
 src/_VisualDVM/Passes/All/DeleteUser.java     |  4 +-
 src/_VisualDVM/Passes/PassCode.java           | 12 ++---
 21 files changed, 108 insertions(+), 131 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/All/DeleteCompilationTasks.java
 create mode 100644 src/_VisualDVM/Passes/All/DeleteRunTasks.java
 delete mode 100644 src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java
 delete mode 100644 src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 45465d4d..1fec3081 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,25 @@
   </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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteCompiler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteMachine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteMachine.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteMakefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteMakefile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteCompilationTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteRunTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 3b795484..b348b777 100644
--- a/properties
+++ b/properties
@@ -33,7 +33,7 @@
   "InstructionPath": "",
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
-  "AutoCheckTesting": true,
+  "AutoCheckTesting": false,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": true,
   "eraseTestingWorkspaces": true
diff --git a/src/Common/Passes/DeleteObjectsPass.java b/src/Common/Passes/DeleteObjectsPass.java
index e0e0af8e..b72bf07a 100644
--- a/src/Common/Passes/DeleteObjectsPass.java
+++ b/src/Common/Passes/DeleteObjectsPass.java
@@ -32,7 +32,6 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
     }
     @Override
     protected void body() throws Exception {
-        getDb().BeginTransaction();
         for (D d: target){
             getDb().Delete(d);
             for (Class dep : getTable().getFKDependencies().keySet()) {
@@ -48,7 +47,6 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
                 }
             }
         }
-        getDb().Commit();
     }
     //тут именно на финише, чтобы в любом случае вся таблица всегда была видна.
     @Override
diff --git a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
index a3ef35c4..421818c9 100644
--- a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
@@ -132,6 +132,10 @@ public class CompilersDBTable extends iDBTable<Compiler> {
                 super.ShowNoCurrentObject();
                 Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
             }
+            @Override
+            public boolean hasCheckBox() {
+                return true;
+            }
         };
     }
     @Override
@@ -141,13 +145,13 @@ public class CompilersDBTable extends iDBTable<Compiler> {
     @Override
     public Object getFieldAt(Compiler object, int columnIndex) {
         switch (columnIndex) {
-            case 1:
-                return object.description;
             case 2:
-                return object.call_command;
+                return object.description;
             case 3:
-                return object.version;
+                return object.call_command;
             case 4:
+                return object.version;
+            case 5:
                 return object.revision;
         }
         return null;
diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
index d174191c..9b831a79 100644
--- a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
@@ -100,6 +100,10 @@ public class MachinesDBTable extends iDBTable<Machine> {
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
             }
+            @Override
+            public boolean hasCheckBox() {
+                return true;
+            }
         };
     }
     @Override
@@ -109,7 +113,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
     @Override
     public Object getFieldAt(Machine object, int columnIndex) {
         switch (columnIndex) {
-            case 1:
+            case 2:
                 return object.getURL();
             default:
                 return null;
diff --git a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
index a06407a7..22f01b3e 100644
--- a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
@@ -43,6 +43,10 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
             }
+            @Override
+            public boolean hasCheckBox() {
+                return true;
+            }
         };
     }
     @Override
@@ -56,11 +60,11 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
     @Override
     public Object getFieldAt(Makefile object, int columnIndex) {
         switch (columnIndex) {
-            case 1:
-                return object.getCompilerDescription();
             case 2:
-                return object.command;
+                return object.getCompilerDescription();
             case 3:
+                return object.command;
+            case 4:
                 return object.flags;
             default:
                 return null;
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
index c6aa7ca2..40a021f5 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
@@ -108,4 +108,8 @@ public class CompilationTask extends Task {
         FileUtils.writeStringToFile(getOutputFile(), output);
         FileUtils.writeStringToFile(getErrorsFile(), errors);
     }
+    @Override
+    public String getFKName() {
+        return "compilation_task_id";
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
index eb3e5fba..f9115c10 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
@@ -54,13 +54,6 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
                 super.ShowNoCurrentObject();
                 Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
             }
-            @Override
-            public void CreateControl() {
-                super.CreateControl();
-                TableMenu dataTableMenu = new TableMenu(control);
-                dataTableMenu.add(Global.mainModule.getPass(PassCode.DeleteSelectedCompilationTasks).createMenuItem());
-                control.setComponentPopupMenu(dataTableMenu);
-            }
         };
     }
     @Override
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java
index 5d474e6d..7acba449 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java
@@ -1,7 +1,8 @@
 package _VisualDVM.GlobalData.Tasks.CompilationTask;
 import Common.Visual.Menus.DataMenuBar;
+import _VisualDVM.Passes.PassCode;
 public class CompilationTasksMenuBar extends DataMenuBar {
     public CompilationTasksMenuBar() {
-        super("задачи на компиляцию");
+        super("задачи на компиляцию", PassCode.DeleteCompilationTasks);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
index 6cb9bceb..8913ea9c 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
@@ -41,13 +41,6 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
                 super.ShowNoCurrentObject();
                 Global.mainModule.getUI().getDebugWindow().ShowNoCurrentRunTask();
             }
-            @Override
-            public void CreateControl() {
-                super.CreateControl();
-                TableMenu dataTableMenu = new TableMenu(control);
-                dataTableMenu.add(Global.mainModule.getPass(PassCode.DeleteSelectedRunTasks).createMenuItem());
-                control.setComponentPopupMenu(dataTableMenu);
-            }
         };
     }
     @Override
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java
index c95dc70a..f6f010be 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java
@@ -1,7 +1,8 @@
 package _VisualDVM.GlobalData.Tasks.RunTask;
 import Common.Visual.Menus.DataMenuBar;
+import _VisualDVM.Passes.PassCode;
 public class RunTasksMenuBar extends DataMenuBar {
     public RunTasksMenuBar() {
-        super("задачи на запуск");
+        super("задачи на запуск", PassCode.DeleteRunTasks);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/User/UsersDBTable.java b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
index 953131f2..de045215 100644
--- a/src/_VisualDVM/GlobalData/User/UsersDBTable.java
+++ b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
@@ -75,7 +75,7 @@ public class UsersDBTable extends iDBTable<User> {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(0).setVisible(false);
-                columns.get(2).setRendererClass(RendererStatusEnum.class);
+                columns.get(3).setRendererClass(RendererStatusEnum.class);
             }
             @Override
             public void ShowCurrentObject() throws Exception {
@@ -89,6 +89,10 @@ public class UsersDBTable extends iDBTable<User> {
                 //   UI.getMainWindow().ShowCurrentCompiler();
                 Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
             }
+            @Override
+            public boolean hasCheckBox() {
+                return true;
+            }
         };
     }
     @Override
@@ -98,9 +102,9 @@ public class UsersDBTable extends iDBTable<User> {
     @Override
     public Object getFieldAt(User object, int columnIndex) {
         switch (columnIndex) {
-            case 1:
-                return object.login;
             case 2:
+                return object.login;
+            case 3:
                 return object.state;
             default:
                 return null;
diff --git a/src/_VisualDVM/Passes/All/DeleteCompilationTasks.java b/src/_VisualDVM/Passes/All/DeleteCompilationTasks.java
new file mode 100644
index 00000000..57b4cc07
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/DeleteCompilationTasks.java
@@ -0,0 +1,20 @@
+package _VisualDVM.Passes.All;
+import Common.Passes.DeleteObjectsPass;
+import Common.Utils.Utils_;
+import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
+import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
+public class DeleteCompilationTasks extends DeleteObjectsPass<CompilationTask> {
+    public DeleteCompilationTasks() {
+        super(CompilationTask.class);
+    }
+    @Override
+    protected void body() throws Exception {
+        super.body();
+        for (CompilationTask task : target) {
+            for (RunTask runTask : task.getRunTasks().values()) {
+                Utils_.forceDeleteWithCheck(runTask.getLocalWorkspace());
+            }
+            Utils_.forceDeleteWithCheck(task.getLocalWorkspace());
+        }
+    }
+}
diff --git a/src/_VisualDVM/Passes/All/DeleteCompiler.java b/src/_VisualDVM/Passes/All/DeleteCompiler.java
index 79ea00b6..d70b0e7c 100644
--- a/src/_VisualDVM/Passes/All/DeleteCompiler.java
+++ b/src/_VisualDVM/Passes/All/DeleteCompiler.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.All;
-import Common.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectsPass;
 import _VisualDVM.GlobalData.Compiler.Compiler;
-public class DeleteCompiler extends DeleteObjectPass<Compiler> {
+public class DeleteCompiler extends DeleteObjectsPass<Compiler> {
     public DeleteCompiler() {
         super(Compiler.class);
     }
diff --git a/src/_VisualDVM/Passes/All/DeleteMachine.java b/src/_VisualDVM/Passes/All/DeleteMachine.java
index b51ed204..c910d7b1 100644
--- a/src/_VisualDVM/Passes/All/DeleteMachine.java
+++ b/src/_VisualDVM/Passes/All/DeleteMachine.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.All;
-import Common.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectsPass;
 import _VisualDVM.GlobalData.Machine.Machine;
-public class DeleteMachine extends DeleteObjectPass<Machine> {
+public class DeleteMachine extends DeleteObjectsPass<Machine> {
     public DeleteMachine() {
         super(Machine.class);
     }
diff --git a/src/_VisualDVM/Passes/All/DeleteMakefile.java b/src/_VisualDVM/Passes/All/DeleteMakefile.java
index 49fa1306..91bd818e 100644
--- a/src/_VisualDVM/Passes/All/DeleteMakefile.java
+++ b/src/_VisualDVM/Passes/All/DeleteMakefile.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.All;
-import Common.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectsPass;
 import _VisualDVM.GlobalData.Makefile.Makefile;
-public class DeleteMakefile extends DeleteObjectPass<Makefile> {
+public class DeleteMakefile extends DeleteObjectsPass<Makefile> {
     public DeleteMakefile() {
         super(Makefile.class);
     }
diff --git a/src/_VisualDVM/Passes/All/DeleteRunTasks.java b/src/_VisualDVM/Passes/All/DeleteRunTasks.java
new file mode 100644
index 00000000..f02b6b0f
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/DeleteRunTasks.java
@@ -0,0 +1,20 @@
+package _VisualDVM.Passes.All;
+import Common.Passes.DeleteObjectsPass;
+import Common.Passes.Pass;
+import Common.Utils.Utils_;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
+
+import java.util.Vector;
+public class DeleteRunTasks extends DeleteObjectsPass<RunTask> {
+    public DeleteRunTasks() {
+        super(RunTask.class);
+    }
+    @Override
+    protected void body() throws Exception {
+        super.body();
+        for (RunTask task : target) {
+            Utils_.forceDeleteWithCheck(task.getLocalWorkspace());
+        }
+    }
+}
diff --git a/src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java b/src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java
deleted file mode 100644
index 7fd38143..00000000
--- a/src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package _VisualDVM.Passes.All;
-import Common.Passes.Pass;
-import Common.Utils.Utils_;
-import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
-import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
-
-import java.util.Vector;
-public class DeleteSelectedCompilationTasks extends Pass<Vector<CompilationTask>> {
-    @Override
-    public String getIconPath() {
-        return "/Common/icons/Delete.png";
-    }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = new Vector<>();
-        Global.mainModule.getDb().compilationTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
-        if (target.isEmpty()) {
-            Log.Writeln_("Не отмечено ни одной задачи для удаления.");
-            return false;
-        } else return true;
-    }
-    @Override
-    protected void showPreparation() throws Exception {
-        Global.mainModule.getDb().compilationTasks.ClearUI();
-    }
-    @Override
-    protected void body() throws Exception {
-        for (CompilationTask task : target) {
-            for (RunTask runTask : task.getRunTasks().values()) {
-                Global.mainModule.getDb().Delete(runTask);
-                Utils_.forceDeleteWithCheck(runTask.getLocalWorkspace());
-            }
-            Global.mainModule.getDb().Delete(task);
-            Utils_.forceDeleteWithCheck(task.getLocalWorkspace());
-        }
-    }
-    @Override
-    protected void showFinish() throws Exception {
-        Global.mainModule.getDb().compilationTasks.ShowUI();
-    }
-}
diff --git a/src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java b/src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java
deleted file mode 100644
index 22952f12..00000000
--- a/src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package _VisualDVM.Passes.All;
-import Common.Passes.Pass;
-import Common.Utils.Utils_;
-import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
-
-import java.util.Vector;
-public class DeleteSelectedRunTasks extends Pass<Vector<RunTask>> {
-    @Override
-    public String getIconPath() {
-        return "/Common/icons/Delete.png";
-    }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = new Vector<>();
-        (Global.mainModule.getDb()).runTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
-        if (target.isEmpty()) {
-            Log.Writeln_("Не отмечено ни одной задачи для удаления.");
-            return false;
-        } else return true;
-    }
-    @Override
-    protected void showPreparation() throws Exception {
-        Global.mainModule.getDb().runTasks.ClearUI();
-    }
-    @Override
-    protected void body() throws Exception {
-        for (RunTask task : target) {
-            Global.mainModule.getDb().Delete(task);
-            Utils_.forceDeleteWithCheck(task.getLocalWorkspace());
-        }
-    }
-    @Override
-    protected void showFinish() throws Exception {
-        Global.mainModule.getDb().runTasks.ShowUI();
-    }
-}
diff --git a/src/_VisualDVM/Passes/All/DeleteUser.java b/src/_VisualDVM/Passes/All/DeleteUser.java
index 4daef4c4..ed4f55a8 100644
--- a/src/_VisualDVM/Passes/All/DeleteUser.java
+++ b/src/_VisualDVM/Passes/All/DeleteUser.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.All;
-import Common.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectsPass;
 import _VisualDVM.GlobalData.User.User;
-public class DeleteUser extends DeleteObjectPass<User> {
+public class DeleteUser extends DeleteObjectsPass<User> {
     public DeleteUser() {
         super(User.class);
     }
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index 7ab2cf0b..2c546b99 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -224,8 +224,8 @@ public enum PassCode implements PassCode_ {
     PickCompilerOptions,
     PickCompilerEnvironments,
     //-
-    DeleteSelectedCompilationTasks,
-    DeleteSelectedRunTasks,
+    DeleteCompilationTasks,
+    DeleteRunTasks,
     AddDVMParameter,
     EditDVMParameter,
     DeleteDVMParameter,
@@ -635,10 +635,10 @@ public enum PassCode implements PassCode_ {
                 return "Редактирование группы";
             case PublishGroup:
                 return "Создать пустую группу тестов";
-            case DeleteSelectedCompilationTasks:
-                return "Удалить отмеченные задачи на компиляцию";
-            case DeleteSelectedRunTasks:
-                return "Удалить отмеченные задачи на запуск";
+            case DeleteCompilationTasks:
+                return "Удалить задачи на компиляцию";
+            case DeleteRunTasks:
+                return "Удалить задачи на запуск";
             case PickCompilerEnvironments:
                 return "Выбор переменных окружения DVM компилятора";
             case PickCompilerOptions: