From 87a761f5a6858b38f746df82576f86f1ca613cb8 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 4 Feb 2025 16:33:06 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                  | 12 +++++++++---
 src/_VisualDVM/Passes/All/AppendBugReportField.java  | 11 ++---------
 .../Passes/All/GetComponentsActualVersions.java      |  7 ++-----
 src/_VisualDVM/Passes/All/PublishComponent.java      |  7 ++-----
 src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java |  7 ++-----
 src/_VisualDVM/Passes/All/SendBugReport.java         |  8 ++------
 src/_VisualDVM/Passes/All/SynchronizeBugReports.java |  7 ++-----
 src/_VisualDVM/Passes/All/SynchronizeTests.java      |  7 ++-----
 src/_VisualDVM/Passes/All/UpdateBugReportField.java  |  7 ++-----
 .../Passes/Server/ComponentsServerClientPass.java    |  9 +++++++++
 .../Passes/Server/TestingServerClientPass.java       |  9 +++++++++
 11 files changed, 43 insertions(+), 48 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/Server/ComponentsServerClientPass.java
 create mode 100644 src/_VisualDVM/Passes/Server/TestingServerClientPass.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aee3bcda..2641ccaa 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,16 @@
   </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 afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ComponentsServerClientPass.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/TestingServerClientPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReportsDatabase.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$/src/_VisualDVM/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/AppendBugReportField.java b/src/_VisualDVM/Passes/All/AppendBugReportField.java
index 5b87263e..24832883 100644
--- a/src/_VisualDVM/Passes/All/AppendBugReportField.java
+++ b/src/_VisualDVM/Passes/All/AppendBugReportField.java
@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ClientPass;
+import _VisualDVM.Passes.Server.ComponentsServerClientPass;
 import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.BugReport.Json.BugReportAdditionJson;
 import _VisualDVM.Repository.EmailMessage;
@@ -10,7 +11,7 @@ import _VisualDVM.Repository.Server.ComponentsServer;
 import _VisualDVM.Repository.Server.ServerCode;
 
 import java.util.Date;
-public class AppendBugReportField extends ClientPass<ComponentsServer, BugReport> {
+public class AppendBugReportField extends ComponentsServerClientPass<BugReport> {
     String fieldName;
     String oldValue;
     String addition;
@@ -21,14 +22,6 @@ public class AppendBugReportField extends ClientPass<ComponentsServer, BugReport
         return "/icons/Append.png";
     }
     @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected ComponentsServer getServer() {
-        return Global.componentsServer;
-    }
-    @Override
     protected boolean canStart(Object... args) throws Exception {
         actual = null;
         if (getServer().db.getTable(BugReport.class).getUI().CheckCurrent(Log)) {
diff --git a/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java b/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java
index 539f2039..d174c732 100644
--- a/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java
+++ b/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java
@@ -1,6 +1,7 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ClientPass;
+import _VisualDVM.Passes.Server.ComponentsServerClientPass;
 import _VisualDVM.Repository.Component.Component;
 import _VisualDVM.Repository.Component.ComponentType;
 import _VisualDVM.Repository.Component.Json.ComponentVersionsInfoJson;
@@ -8,17 +9,13 @@ import _VisualDVM.Repository.Server.ComponentsServer;
 import _VisualDVM.Repository.Server.ServerCode;
 
 import java.util.Vector;
-public class GetComponentsActualVersions extends ClientPass<ComponentsServer, Object> {
+public class GetComponentsActualVersions extends ComponentsServerClientPass<Object> {
     Vector<ComponentVersionsInfoJson> versions;
     @Override
     public String getIconPath() {
         return "/icons/Components.png";
     }
     @Override
-    protected ComponentsServer getServer() {
-        return Global.componentsServer;
-    }
-    @Override
     protected boolean canStart(Object... args) throws Exception {
         versions = null;
         Vector<String> types = new Vector<>();
diff --git a/src/_VisualDVM/Passes/All/PublishComponent.java b/src/_VisualDVM/Passes/All/PublishComponent.java
index b8b87924..f01e9568 100644
--- a/src/_VisualDVM/Passes/All/PublishComponent.java
+++ b/src/_VisualDVM/Passes/All/PublishComponent.java
@@ -4,6 +4,7 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.AccountRole;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ClientPass;
+import _VisualDVM.Passes.Server.ComponentsServerClientPass;
 import _VisualDVM.Repository.Component.Component;
 import _VisualDVM.Repository.Component.ComponentType;
 import _VisualDVM.Repository.Component.Json.ComponentPublicationInfoJson;
@@ -14,7 +15,7 @@ import _VisualDVM.Repository.Server.ComponentsServer;
 import _VisualDVM.Repository.Server.ServerCode;
 
 import java.util.Date;
-public class PublishComponent extends ClientPass<ComponentsServer, Component> {
+public class PublishComponent extends ComponentsServerClientPass<Component> {
     String version_mail_header = "";
     String version_text = "";
     PublishForm f = new PublishForm();
@@ -23,10 +24,6 @@ public class PublishComponent extends ClientPass<ComponentsServer, Component> {
         return "/Common/icons/Publish.png";
     }
     @Override
-    protected ComponentsServer getServer() {
-        return Global.componentsServer;
-    }
-    @Override
     protected boolean canStart(Object... args) throws Exception {
         if (!Utils_.isWindows()) {
             Log.Writeln_("Публикация компонент разрешена только для Windows");
diff --git a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
index b2e425ad..0e9536b2 100644
--- a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
@@ -7,6 +7,7 @@ import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ClientPass;
+import _VisualDVM.Passes.Server.TestingServerClientPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -16,7 +17,7 @@ import _VisualDVM.Utils;
 import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.Vector;
-public class ReplaceTestsFromFiles extends ClientPass<TestingServer,Vector<Test>> {
+public class ReplaceTestsFromFiles extends TestingServerClientPass<Vector<Test>> {
     VFileChooser fileChooser = new VFileChooser("Выберите файлы для замены тестов");
     //--
     Group group;
@@ -28,10 +29,6 @@ public class ReplaceTestsFromFiles extends ClientPass<TestingServer,Vector<Test>
     public String getIconPath() {
         return "/icons/Menu/Undo.png";
     }
-    @Override
-    protected TestingServer getServer() {
-        return Global.testingServer;
-    }
     //-
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/_VisualDVM/Passes/All/SendBugReport.java b/src/_VisualDVM/Passes/All/SendBugReport.java
index 0dc44d8a..a651603f 100644
--- a/src/_VisualDVM/Passes/All/SendBugReport.java
+++ b/src/_VisualDVM/Passes/All/SendBugReport.java
@@ -1,12 +1,12 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.Server.ClientPass;
+import _VisualDVM.Passes.Server.ComponentsServerClientPass;
 import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.Server.ComponentsServer;
 import _VisualDVM.Repository.Server.ServerCode;
-public class SendBugReport extends ClientPass<ComponentsServer,BugReport> {
+public class SendBugReport extends ComponentsServerClientPass<BugReport> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = Global.componentsServer.db.bugReports.getUI().getCurrent();
@@ -18,8 +18,4 @@ public class SendBugReport extends ClientPass<ComponentsServer,BugReport> {
     protected void performFail() throws Exception {
         target.state = BugReportState.draft;
     }
-    @Override
-    protected ComponentsServer getServer() {
-        return Global.componentsServer;
-    }
 }
diff --git a/src/_VisualDVM/Passes/All/SynchronizeBugReports.java b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
index c7b68d1c..e591ceeb 100644
--- a/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
+++ b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
@@ -2,19 +2,16 @@ package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ClientPass;
+import _VisualDVM.Passes.Server.ComponentsServerClientPass;
 import _VisualDVM.Repository.Server.ComponentsServer;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Utils;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
-public class SynchronizeBugReports extends ClientPass<ComponentsServer, Object> {
+public class SynchronizeBugReports extends ComponentsServerClientPass<Object> {
     File new_db_file;
     @Override
-    protected ComponentsServer getServer() {
-        return Global.componentsServer;
-    }
-    @Override
     public String getIconPath() {
         return "/icons/ComponentsActual.png";
     }
diff --git a/src/_VisualDVM/Passes/All/SynchronizeTests.java b/src/_VisualDVM/Passes/All/SynchronizeTests.java
index fa07a840..155986fc 100644
--- a/src/_VisualDVM/Passes/All/SynchronizeTests.java
+++ b/src/_VisualDVM/Passes/All/SynchronizeTests.java
@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
 import Common.Visual.Controls.PassButton;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ClientPass;
+import _VisualDVM.Passes.Server.TestingServerClientPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
@@ -16,7 +17,7 @@ import org.apache.commons.io.FileUtils;
 
 import javax.swing.*;
 import java.io.File;
-public class SynchronizeTests extends ClientPass<TestingServer,Object> {
+public class SynchronizeTests extends TestingServerClientPass<Object> {
     File new_db_file;
     @Override
     protected boolean canStart(Object... args) throws Exception {
@@ -27,10 +28,6 @@ public class SynchronizeTests extends ClientPass<TestingServer,Object> {
         return "/icons/ComponentsActual.png";
     }
     @Override
-    protected TestingServer getServer() {
-        return Global.testingServer;
-    }
-    @Override
     public JButton createButton() {
         return new PassButton(this);
     }
diff --git a/src/_VisualDVM/Passes/All/UpdateBugReportField.java b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
index b577b63b..9418035a 100644
--- a/src/_VisualDVM/Passes/All/UpdateBugReportField.java
+++ b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ClientPass;
+import _VisualDVM.Passes.Server.ComponentsServerClientPass;
 import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.EmailMessage;
@@ -14,16 +15,12 @@ import javafx.util.Pair;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Vector;
-public class UpdateBugReportField extends ClientPass<ComponentsServer,BugReport> {
+public class UpdateBugReportField extends ComponentsServerClientPass<BugReport> {
     Vector<String> fieldNames = new Vector<>();
     Vector<Serializable> fieldValues = new Vector<>();
     String old_description = "";
     String old_comment = "";
     BugReport actual;
-    @Override
-    protected ComponentsServer getServer() {
-        return Global.componentsServer;
-    }
     protected boolean canUpdate() {
         return target.canModify(Global.mainModule.getAccount(),Log);
     }
diff --git a/src/_VisualDVM/Passes/Server/ComponentsServerClientPass.java b/src/_VisualDVM/Passes/Server/ComponentsServerClientPass.java
new file mode 100644
index 00000000..5329b778
--- /dev/null
+++ b/src/_VisualDVM/Passes/Server/ComponentsServerClientPass.java
@@ -0,0 +1,9 @@
+package _VisualDVM.Passes.Server;
+import _VisualDVM.Global;
+import _VisualDVM.Repository.Server.ComponentsServer;
+public class ComponentsServerClientPass<T> extends ClientPass<ComponentsServer,T> {
+    @Override
+    protected ComponentsServer getServer() {
+        return Global.componentsServer;
+    }
+}
diff --git a/src/_VisualDVM/Passes/Server/TestingServerClientPass.java b/src/_VisualDVM/Passes/Server/TestingServerClientPass.java
new file mode 100644
index 00000000..333a6d28
--- /dev/null
+++ b/src/_VisualDVM/Passes/Server/TestingServerClientPass.java
@@ -0,0 +1,9 @@
+package _VisualDVM.Passes.Server;
+import _VisualDVM.Global;
+import _VisualDVM.TestingSystem.Common.TestingServer;
+public class TestingServerClientPass<T> extends ClientPass<TestingServer,T> {
+    @Override
+    protected TestingServer getServer() {
+        return Global.testingServer;
+    }
+}