diff --git a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java index 89ede0db..3f0f686c 100644 --- a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java +++ b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java @@ -3,12 +3,12 @@ import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import java.io.File; -public class ConvertCorrectnessTests extends TestingSystemPass { +public class ConvertCorrectnessTests extends TestingSystemPass_OLD { @Override public String getIconPath() { return "/icons/DownloadAll.png"; diff --git a/src/_VisualDVM/Passes/All/DownloadDVMPackages.java b/src/_VisualDVM/Passes/All/DownloadDVMPackages.java index 6be04113..575dbb6e 100644 --- a/src/_VisualDVM/Passes/All/DownloadDVMPackages.java +++ b/src/_VisualDVM/Passes/All/DownloadDVMPackages.java @@ -4,7 +4,7 @@ import Common.Passes.Pass; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; @@ -32,7 +32,7 @@ public class DownloadDVMPackages extends Pass> { protected boolean canStart(Object... args) throws Exception { target = (Vector) args[0]; packed_packages = null; - TestingSystemPass pass = new TestingSystemPass>() { + TestingSystemPass_OLD pass = new TestingSystemPass_OLD>() { @Override protected boolean canStart(Object... args) throws Exception { target = (Vector) args[0]; diff --git a/src/_VisualDVM/Passes/All/DownloadSapforPackage.java b/src/_VisualDVM/Passes/All/DownloadSapforPackage.java index 7a8ce219..8e97afb9 100644 --- a/src/_VisualDVM/Passes/All/DownloadSapforPackage.java +++ b/src/_VisualDVM/Passes/All/DownloadSapforPackage.java @@ -4,7 +4,7 @@ import Common.Passes.Pass; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; @@ -30,7 +30,7 @@ public class DownloadSapforPackage extends Pass { int id = target.id; loaded = new File(target.getLocalWorkspace(), CommonConstants.LOADED); if (!loaded.exists()) { - Pass pass = new TestingSystemPass() { + Pass pass = new TestingSystemPass_OLD() { @Override public String getDescription() { return "Скачивание"; diff --git a/src/_VisualDVM/Passes/All/DownloadTest.java b/src/_VisualDVM/Passes/All/DownloadTest.java index 161f00b3..a6c6213b 100644 --- a/src/_VisualDVM/Passes/All/DownloadTest.java +++ b/src/_VisualDVM/Passes/All/DownloadTest.java @@ -4,11 +4,11 @@ import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.Test.Test; -public class DownloadTest extends TestingSystemPass { +public class DownloadTest extends TestingSystemPass_OLD { @Override public String getIconPath() { return "/icons/DownloadBugReport.png"; diff --git a/src/_VisualDVM/Passes/All/PingTestingServer.java b/src/_VisualDVM/Passes/All/PingTestingServer.java index 2b5c1e6c..506a6b5a 100644 --- a/src/_VisualDVM/Passes/All/PingTestingServer.java +++ b/src/_VisualDVM/Passes/All/PingTestingServer.java @@ -1,10 +1,10 @@ package _VisualDVM.Passes.All; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import java.net.ConnectException; -public class PingTestingServer extends TestingSystemPass { +public class PingTestingServer extends TestingSystemPass_OLD { boolean flag; boolean silent; @Override diff --git a/src/_VisualDVM/Passes/All/PublishTests.java b/src/_VisualDVM/Passes/All/PublishTests.java index 09ad7351..e4e466cb 100644 --- a/src/_VisualDVM/Passes/All/PublishTests.java +++ b/src/_VisualDVM/Passes/All/PublishTests.java @@ -4,7 +4,7 @@ import Common.Utils.Utils_; import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.Group.Group; @@ -12,7 +12,7 @@ import _VisualDVM.TestingSystem.Common.Test.Test; import java.io.File; import java.util.Vector; -public abstract class PublishTests extends TestingSystemPass> { +public abstract class PublishTests extends TestingSystemPass_OLD> { protected Group group; //---- @Override diff --git a/src/_VisualDVM/Passes/All/RefreshDVMTests.java b/src/_VisualDVM/Passes/All/RefreshDVMTests.java index 2a9897bb..0860561c 100644 --- a/src/_VisualDVM/Passes/All/RefreshDVMTests.java +++ b/src/_VisualDVM/Passes/All/RefreshDVMTests.java @@ -1,10 +1,10 @@ package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -public class RefreshDVMTests extends TestingSystemPass { +public class RefreshDVMTests extends TestingSystemPass_OLD { @Override public String getIconPath() { return "/icons/DownloadAll.png"; diff --git a/src/_VisualDVM/Passes/All/ReplaceTestProject.java b/src/_VisualDVM/Passes/All/ReplaceTestProject.java index c6588e82..e7fac9f6 100644 --- a/src/_VisualDVM/Passes/All/ReplaceTestProject.java +++ b/src/_VisualDVM/Passes/All/ReplaceTestProject.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; @@ -13,7 +13,7 @@ public class ReplaceTestProject extends CreateTestFromProject { } @Override protected void performDone() throws Exception { - TestingSystemPass testingSystemPass = new TestingSystemPass() { + TestingSystemPass_OLD testingSystemPass = new TestingSystemPass_OLD() { @Override protected boolean canStart(Object... args) throws Exception { target = args[0]; diff --git a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java index 7edaa588..b2e425ad 100644 --- a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java +++ b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java @@ -7,9 +7,7 @@ import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Server.ClientPass; -import _VisualDVM.Passes.Server.TestingSystemPass; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.TestingServer; diff --git a/src/_VisualDVM/Passes/All/ShowTestingServerFile.java b/src/_VisualDVM/Passes/All/ShowTestingServerFile.java index 3b1fa067..a9c0aa9d 100644 --- a/src/_VisualDVM/Passes/All/ShowTestingServerFile.java +++ b/src/_VisualDVM/Passes/All/ShowTestingServerFile.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.PassException; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Utils; @@ -11,7 +11,7 @@ import org.apache.commons.io.FileUtils; import java.io.File; import java.util.List; import java.util.Vector; -public class ShowTestingServerFile extends TestingSystemPass { +public class ShowTestingServerFile extends TestingSystemPass_OLD { String title; File localFile; @Override diff --git a/src/_VisualDVM/Passes/Server/TestingSystemPass.java b/src/_VisualDVM/Passes/Server/TestingSystemPass_OLD.java similarity index 65% rename from src/_VisualDVM/Passes/Server/TestingSystemPass.java rename to src/_VisualDVM/Passes/Server/TestingSystemPass_OLD.java index 6d06f106..4cf57a4a 100644 --- a/src/_VisualDVM/Passes/Server/TestingSystemPass.java +++ b/src/_VisualDVM/Passes/Server/TestingSystemPass_OLD.java @@ -1,8 +1,8 @@ package _VisualDVM.Passes.Server; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; -public abstract class TestingSystemPass extends RepositoryPass { - public TestingSystemPass() { +public abstract class TestingSystemPass_OLD extends RepositoryPass { + public TestingSystemPass_OLD() { super(Global.testingServer); } @Override diff --git a/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java index 716798d8..10468a48 100644 --- a/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java +++ b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java @@ -1,10 +1,10 @@ package _VisualDVM.Passes.Testing; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage; import _VisualDVM.TestingSystem.Common.TestingPackageToKill.TestingPackageToKill; -public abstract class AbortTestingPackage extends TestingSystemPass { +public abstract class AbortTestingPackage extends TestingSystemPass_OLD { TestingPackageToKill packageToKill = null; @Override public String getIconPath() { diff --git a/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java index 1d781e40..be05f19e 100644 --- a/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java +++ b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java @@ -1,14 +1,14 @@ package _VisualDVM.Passes.Testing; import Common.Database.Tables.iDBTable; import _VisualDVM.Global; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage; import javafx.util.Pair; import java.util.Vector; -public abstract class ActualizeTestingPackages

extends TestingSystemPass>> { +public abstract class ActualizeTestingPackages

extends TestingSystemPass_OLD>> { Class p; public ActualizeTestingPackages(Class

p_in) { p = p_in; diff --git a/src/_VisualDVM/Repository/RepositoryClient.java b/src/_VisualDVM/Repository/RepositoryClient.java index d7394024..2e9bdc23 100644 --- a/src/_VisualDVM/Repository/RepositoryClient.java +++ b/src/_VisualDVM/Repository/RepositoryClient.java @@ -1,7 +1,7 @@ package _VisualDVM.Repository; import Common.Passes.PassException; import Common.Utils.Utils_; -import _VisualDVM.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; @@ -31,7 +31,7 @@ public abstract class RepositoryClient { } //-- protected Object ServerCommand(ServerCode code_in, String arg, Serializable object_in) throws Exception { - TestingSystemPass pass = new TestingSystemPass() { + TestingSystemPass_OLD pass = new TestingSystemPass_OLD() { @Override public String getDescription() { return "";