diff --git a/properties b/properties index d9ddebb4..1ca1ad45 100644 --- a/properties +++ b/properties @@ -1,6 +1,6 @@ { "Workspace": "E:\\Tests", - "ProjectsSearchDirectory": "E:\\BUG", + "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1701089001", "VisualiserPath": "C:\\Users\\misha\\Downloads", "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F", "Visualizer_2Path": "C:\\Users\\misha\\Documents", @@ -24,9 +24,9 @@ "CheckTestingIntervalSeconds": 10, "AutoCheckTesting": true, "EmailOnTestingProgress": true, - "lastMachineId": 11, - "lastUserId": 23, - "lastCompilerId": 40, + "lastMachineId": 13, + "lastUserId": 24, + "lastCompilerId": 52, "RegisterOn": false, "SpacesOn": false, "EmptyLinesOn": false, diff --git a/src/_VisualDVM/Passes/All/AppendBugReportField.java b/src/_VisualDVM/Passes/All/AppendBugReportField.java index 24832883..8baa927b 100644 --- a/src/_VisualDVM/Passes/All/AppendBugReportField.java +++ b/src/_VisualDVM/Passes/All/AppendBugReportField.java @@ -2,16 +2,14 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.Server.ClientPass; -import _VisualDVM.Passes.Server.ComponentsServerClientPass; +import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.Json.BugReportAdditionJson; import _VisualDVM.Repository.EmailMessage; -import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.Server.ServerCode; import java.util.Date; -public class AppendBugReportField extends ComponentsServerClientPass { +public class AppendBugReportField extends ComponentsServerPass { String fieldName; String oldValue; String addition; diff --git a/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java b/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java index d174c732..176c5cce 100644 --- a/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java +++ b/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java @@ -1,15 +1,13 @@ package _VisualDVM.Passes.All; import _VisualDVM.Global; -import _VisualDVM.Passes.Server.ClientPass; -import _VisualDVM.Passes.Server.ComponentsServerClientPass; +import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Component.ComponentType; import _VisualDVM.Repository.Component.Json.ComponentVersionsInfoJson; -import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.Server.ServerCode; import java.util.Vector; -public class GetComponentsActualVersions extends ComponentsServerClientPass { +public class GetComponentsActualVersions extends ComponentsServerPass { Vector versions; @Override public String getIconPath() { diff --git a/src/_VisualDVM/Passes/All/PublishComponent.java b/src/_VisualDVM/Passes/All/PublishComponent.java index f01e9568..08a850d3 100644 --- a/src/_VisualDVM/Passes/All/PublishComponent.java +++ b/src/_VisualDVM/Passes/All/PublishComponent.java @@ -3,19 +3,17 @@ import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.Server.ClientPass; -import _VisualDVM.Passes.Server.ComponentsServerClientPass; +import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Component.ComponentType; import _VisualDVM.Repository.Component.Json.ComponentPublicationInfoJson; import _VisualDVM.Repository.Component.UI.PublishForm; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.RepositoryServer; -import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.Server.ServerCode; import java.util.Date; -public class PublishComponent extends ComponentsServerClientPass { +public class PublishComponent extends ComponentsServerPass { String version_mail_header = ""; String version_text = ""; PublishForm f = new PublishForm(); diff --git a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java index 0e9536b2..246f2ac9 100644 --- a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java +++ b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java @@ -6,18 +6,16 @@ import Common.Visual.Windows.Dialog.VFileChooser; import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.Server.ClientPass; -import _VisualDVM.Passes.Server.TestingServerClientPass; +import _VisualDVM.Passes.Server.TestingServerPass; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.Test; -import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.Utils; import java.io.File; import java.util.LinkedHashMap; import java.util.Vector; -public class ReplaceTestsFromFiles extends TestingServerClientPass> { +public class ReplaceTestsFromFiles extends TestingServerPass> { VFileChooser fileChooser = new VFileChooser("Выберите файлы для замены тестов"); //-- Group group; diff --git a/src/_VisualDVM/Passes/All/SendBugReport.java b/src/_VisualDVM/Passes/All/SendBugReport.java index a651603f..4dc1468a 100644 --- a/src/_VisualDVM/Passes/All/SendBugReport.java +++ b/src/_VisualDVM/Passes/All/SendBugReport.java @@ -1,12 +1,11 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; -import _VisualDVM.Passes.Server.ComponentsServerClientPass; +import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReportState; -import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.Server.ServerCode; -public class SendBugReport extends ComponentsServerClientPass { +public class SendBugReport extends ComponentsServerPass { @Override protected boolean canStart(Object... args) throws Exception { target = Global.componentsServer.db.bugReports.getUI().getCurrent(); diff --git a/src/_VisualDVM/Passes/All/SynchronizeBugReports.java b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java index e591ceeb..d8cf4ca5 100644 --- a/src/_VisualDVM/Passes/All/SynchronizeBugReports.java +++ b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java @@ -1,15 +1,11 @@ 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.Passes.Server.ComponentsServerPass; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Utils; -import org.apache.commons.io.FileUtils; import java.io.File; -public class SynchronizeBugReports extends ComponentsServerClientPass { +public class SynchronizeBugReports extends ComponentsServerPass { File new_db_file; @Override public String getIconPath() { diff --git a/src/_VisualDVM/Passes/All/SynchronizeTests.java b/src/_VisualDVM/Passes/All/SynchronizeTests.java index 155986fc..2a5db10b 100644 --- a/src/_VisualDVM/Passes/All/SynchronizeTests.java +++ b/src/_VisualDVM/Passes/All/SynchronizeTests.java @@ -1,23 +1,13 @@ package _VisualDVM.Passes.All; -import Common.Utils.Utils_; import Common.Visual.Controls.PassButton; import _VisualDVM.Global; -import _VisualDVM.Passes.Server.ClientPass; -import _VisualDVM.Passes.Server.TestingServerClientPass; +import _VisualDVM.Passes.Server.TestingServerPass; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import _VisualDVM.ServerObjectsCache.VisualCaches; -import _VisualDVM.TestingSystem.Common.TestingServer; -import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; -import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; -import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; -import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; import _VisualDVM.Utils; -import org.apache.commons.io.FileUtils; import javax.swing.*; import java.io.File; -public class SynchronizeTests extends TestingServerClientPass { +public class SynchronizeTests extends TestingServerPass { File new_db_file; @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/_VisualDVM/Passes/All/UpdateBugReportField.java b/src/_VisualDVM/Passes/All/UpdateBugReportField.java index 9418035a..56f4b0e9 100644 --- a/src/_VisualDVM/Passes/All/UpdateBugReportField.java +++ b/src/_VisualDVM/Passes/All/UpdateBugReportField.java @@ -2,12 +2,10 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.Server.ClientPass; -import _VisualDVM.Passes.Server.ComponentsServerClientPass; +import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.EmailMessage; -import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Utils; import javafx.util.Pair; @@ -15,7 +13,7 @@ import javafx.util.Pair; import java.io.Serializable; import java.util.Date; import java.util.Vector; -public class UpdateBugReportField extends ComponentsServerClientPass { +public class UpdateBugReportField extends ComponentsServerPass { Vector fieldNames = new Vector<>(); Vector fieldValues = new Vector<>(); String old_description = ""; diff --git a/src/_VisualDVM/Passes/Server/ComponentsServerClientPass.java b/src/_VisualDVM/Passes/Server/ComponentsServerPass.java similarity index 72% rename from src/_VisualDVM/Passes/Server/ComponentsServerClientPass.java rename to src/_VisualDVM/Passes/Server/ComponentsServerPass.java index 5329b778..5e0b9e90 100644 --- a/src/_VisualDVM/Passes/Server/ComponentsServerClientPass.java +++ b/src/_VisualDVM/Passes/Server/ComponentsServerPass.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.Server; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ComponentsServer; -public class ComponentsServerClientPass extends ClientPass { +public class ComponentsServerPass extends ClientPass { @Override protected ComponentsServer getServer() { return Global.componentsServer; diff --git a/src/_VisualDVM/Passes/Server/TestingServerClientPass.java b/src/_VisualDVM/Passes/Server/TestingServerPass.java similarity index 73% rename from src/_VisualDVM/Passes/Server/TestingServerClientPass.java rename to src/_VisualDVM/Passes/Server/TestingServerPass.java index 333a6d28..19bb4781 100644 --- a/src/_VisualDVM/Passes/Server/TestingServerClientPass.java +++ b/src/_VisualDVM/Passes/Server/TestingServerPass.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.Server; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; -public class TestingServerClientPass extends ClientPass { +public class TestingServerPass extends ClientPass { @Override protected TestingServer getServer() { return Global.testingServer;