M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2025-02-05 01:14:41 +03:00
parent dd90100bfa
commit c89e757171
51 changed files with 145 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
.idea/workspace.xml generated
View File

@@ -8,17 +8,56 @@
<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/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyProfile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneSapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneSapforSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingTestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ComponentsRepositoryPass_OLD.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/TestingSystemPass_OLD.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Json/ComponentVersionsInfoJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Json/ComponentVersionsInfoJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/TestingClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.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/TestingServerProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingServerProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTestingChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTestingChecker.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererProfileAuto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererProfileAuto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/SwitcherProfileAuto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/SwitcherProfileAuto.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

1
src/_VisualDVM/Constants.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM;
import Common.Utils.Vector_;
import com.google.gson.annotations.Expose;
import java.util.Vector;
public class Constants {

3
src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java
View File

@@ -1,12 +1,9 @@
package _VisualDVM.GlobalData.SapforProfile;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import com.sun.org.glassfish.gmbal.Description;
import javax.swing.*;
import java.util.Vector;
public class SapforProfile extends iDBObject {
@Description("DEFAULT ''")
public String description = "";

1
src/_VisualDVM/Passes/All/ApplyProfile.java
View File

@@ -4,7 +4,6 @@ import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import _VisualDVM.Passes.PassCode;
import java.util.Vector;
public class ApplyProfile extends Pass<SapforProfile> {

2
src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java
View File

@@ -1,9 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.Subscribes.Subscriber;
public class CheckRegistrationOnServer extends ComponentsServerPass<Subscriber> {
@Override

2
src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
View File

@@ -3,10 +3,8 @@ import Common.MainModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
@Override

20
src/_VisualDVM/Passes/All/CloneSapforSettings.java
View File

@@ -1,15 +1,8 @@
package _VisualDVM.Passes.All;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.CloneServerObject;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import java.util.Vector;
public class CloneSapforSettings extends CloneServerObject<TestingServer, SapforSettings> {
public CloneSapforSettings() {
super(Global.testingServer, SapforSettings.class);
@@ -18,17 +11,4 @@ public class CloneSapforSettings extends CloneServerObject<TestingServer, Sapfor
protected Class currentClass() {
return SapforSettings.class;
}
@Override
protected void ServerAction() throws Exception {
super.ServerAction();
Vector<PassCode> codes = src.getCodes();
Vector<DBObject> new_commands = new Vector<>();
for (PassCode code : codes) {
SapforSettingsCommand command = new SapforSettingsCommand();
command.sapforsettings_id = (int) pk;
command.passCode = code;
new_commands.add(command);
}
Command(new ServerExchangeUnit_2021(ServerCode.PublishObjects, null, new_commands));
}
}

1
src/_VisualDVM/Passes/All/CreateGroupFromFiles.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Constants;
import _VisualDVM.Global;

2
src/_VisualDVM/Passes/All/DVMConvertProject.java
View File

@@ -5,12 +5,10 @@ import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;

2
src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java
View File

@@ -1,10 +1,8 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import javafx.util.Pair;
public class DeleteBugReportFromServer extends ComponentsServerPass<BugReport> {
@Override

2
src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java
View File

@@ -2,10 +2,8 @@ package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;

2
src/_VisualDVM/Passes/All/DownloadBugReport.java
View File

@@ -1,11 +1,9 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class DownloadBugReport extends ComponentsServerPass<BugReport> {
@Override
protected boolean canStart(Object... args) {

2
src/_VisualDVM/Passes/All/DownloadComponent.java
View File

@@ -1,11 +1,9 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class DownloadComponent extends ComponentsServerPass<Component> {
@Override
protected boolean canStart(Object... args) throws Exception {

3
src/_VisualDVM/Passes/All/DownloadDVMPackages.java
View File

@@ -1,13 +1,10 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;

3
src/_VisualDVM/Passes/All/DownloadSapforPackage.java
View File

@@ -1,13 +1,10 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;

2
src/_VisualDVM/Passes/All/Email.java
View File

@@ -1,9 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.util.Vector;
public class Email extends ComponentsServerPass<EmailMessage> {

2
src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
View File

@@ -1,9 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.io.File;
import java.util.Vector;

1
src/_VisualDVM/Passes/All/OpenCurrentProject.java
View File

@@ -7,7 +7,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Utils;

4
src/_VisualDVM/Passes/All/PingComponentsServer.java
View File

@@ -1,10 +1,6 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.net.ConnectException;
public class PingComponentsServer extends ComponentsServerPass {
//todo ПИНГ РЕАЛИЗОВАТЬ ЧЕРЕЗ SSH
boolean silent;

4
src/_VisualDVM/Passes/All/PingTestingServer.java
View File

@@ -1,10 +1,6 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.TestingServerPass;
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 TestingServerPass {
//todo ПИНГ РЕАЛИЗОВАТЬ ЧЕРЕЗ SSH
boolean silent;

2
src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java
View File

@@ -1,8 +1,6 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
public class PublishRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
@Override

2
src/_VisualDVM/Passes/All/PublishTests.java
View File

@@ -5,9 +5,7 @@ import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;

2
src/_VisualDVM/Passes/All/RefreshDVMTests.java
View File

@@ -2,9 +2,7 @@ package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class RefreshDVMTests extends TestingServerPass<Object> {
@Override
public String getIconPath() {

3
src/_VisualDVM/Passes/All/ReplaceTestProject.java
View File

@@ -1,11 +1,8 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.RepositoryPass;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.io.Serializable;
public class ReplaceTestProject extends CreateTestFromProject {

6
src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
View File

@@ -1,18 +1,12 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Visual.Controls.PassMenuItem;
import Common.Visual.Trees.DataTree;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.CurrentComponentPass;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import javax.swing.*;

2
src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
View File

@@ -11,8 +11,6 @@ import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import org.apache.commons.io.FileUtils;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeNode;
import java.util.Vector;
public class SPF_ParseFilesWithOrder extends SapforAnalysis {
public static boolean silent = false;

1
src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java
View File

@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.Utils;
import java.util.Vector;
public class SetDefaultSapforProfile extends Pass<SapforProfile> {

2
src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
View File

@@ -1,11 +1,9 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import org.apache.commons.io.FileUtils;

2
src/_VisualDVM/Passes/All/ShowTestingServerFile.java
View File

@@ -2,9 +2,7 @@ package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import org.apache.commons.io.FileUtils;

1
src/_VisualDVM/Passes/All/UpdateProperty.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.Passes.All;
import Common.MainModule_;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.SliderNumberForm;
import Common.Visual.Windows.Dialog.SpinnerNumberForm;
import Common.Visual.Windows.Dialog.VDirectoryChooser;

24
src/_VisualDVM/Passes/Server/CloneServerObject.java
View File

@@ -2,6 +2,9 @@ package _VisualDVM.Passes.Server;
import Common.Database.Objects.riDBObject;
import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import javafx.util.Pair;
public abstract class CloneServerObject<S extends RepositoryServer, D extends riDBObject> extends PublishServerObject<S, D> {
public D src;
public CloneServerObject(S server_in, Class<D> d_in) {
@@ -23,17 +26,14 @@ public abstract class CloneServerObject<S extends RepositoryServer, D extends ri
return false;
//---------
pk = null;
if (Global.mainModule.getAccount().CheckRegistered(Log)) {
target = d.newInstance();
target.SynchronizeFields(src = (D) server.db.getTable(currentClass()).getUI().getCurrent());
//единственное отличие клона - текущий автор
target.description += " копия";
target.sender_name = Global.mainModule.getAccount().name;
target.sender_address = Global.mainModule.getAccount().email;
additionalInitialization();
return true;
}
return false;
src= (D) server.db.getTable(currentClass()).getUI().getCurrent();
return true;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.CloneObjectByPK,
Global.mainModule.getAccount().name+"\n"+Global.mainModule.getAccount().email,
new Pair<>(src.getClass(), src.getPK())));
pk = server_response.object;
}
protected void additionalInitialization(){}
}

8
src/_VisualDVM/Passes/Server/ComponentsRepositoryPass_OLD.java
View File

@@ -1,8 +0,0 @@
package _VisualDVM.Passes.Server;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.ComponentsServer;
public abstract class ComponentsRepositoryPass_OLD<T> extends RepositoryPass<ComponentsServer, T> {
public ComponentsRepositoryPass_OLD() {
super(Global.componentsServer);
}
}

6
src/_VisualDVM/Passes/Server/DeleteServerObject.java
View File

@@ -1,7 +1,10 @@
package _VisualDVM.Passes.Server;
import Common.Database.Objects.DBObject;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import javafx.util.Pair;
public class DeleteServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
public DeleteServerObject(S server_in, Class<D> d_in) {
super(server_in, d_in);
@@ -35,7 +38,8 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
}
@Override
protected void ServerAction() throws Exception {
DeleteObject(target);
Command(new ServerExchangeUnit_2021(ServerCode.DeleteObjectByPK, "",
new Pair<>(target.getClass(), target.getPK())));
VisualCaches.DeleteCache(target);
}
@Override

2
src/_VisualDVM/Passes/Server/DeleteServerObjects.java
View File

@@ -59,7 +59,7 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
break;
}
}
}//DeleteTestingPackages
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.DeleteObjectsByPK, getEmail(), new Pair<>(d, target)));

4
src/_VisualDVM/Passes/Server/EditServerObject.java
View File

@@ -1,6 +1,8 @@
package _VisualDVM.Passes.Server;
import Common.Database.Objects.DBObject;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.ServerObjectsCache.VisualCaches;
public class EditServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
//--
@@ -28,7 +30,7 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
//--
@Override
protected void ServerAction() throws Exception {
EditObject(target);
Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
}
@Override
protected void showDone() throws Exception {

12
src/_VisualDVM/Passes/Server/RepositoryPass.java
View File

@@ -1,18 +1,14 @@
package _VisualDVM.Passes.Server;
import Common.Database.Objects.DBObject;
import Common.Database.RepositoryRefuseException;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import javafx.util.Pair;
import java.io.File;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.*;
@@ -105,12 +101,4 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
} else
super.CheckException(ex);
}
public void EditObject(DBObject object) throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", object));
}
//-
public void DeleteObject(DBObject object) throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.DeleteObjectByPK, "",
new Pair<>(object.getClass(), object.getPK())));
}
}

13
src/_VisualDVM/Passes/Server/TestingSystemPass_OLD.java
View File

@@ -1,13 +0,0 @@
package _VisualDVM.Passes.Server;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.Common.TestingServer;
public abstract class TestingSystemPass_OLD<T> extends RepositoryPass<TestingServer, T> {
public TestingSystemPass_OLD() {
super(Global.testingServer);
}
@Override
protected int getTimeout() {
return 120000;
}
//----
}

20
src/_VisualDVM/Passes/Testing/AbortTestingPackage.java
View File

@@ -1,26 +1,21 @@
package _VisualDVM.Passes.Testing;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Passes.Server.TestingServerPass;
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_OLD<TestingPackage> {
public abstract class AbortTestingPackage extends TestingServerPass<TestingPackage> {
TestingPackageToKill packageToKill = null;
@Override
public String getIconPath() {
return "/Common/icons/Ban.png";
}
@Override
public String getButtonText() {
return "";
}
public abstract Class currentClass();
public abstract int getAbortType();
@Override
protected boolean canStart(Object... args) throws Exception {
packageToKill = null;
if (server.db.CheckCurrent(Log, currentClass())) {
target = (TestingPackage) server.db.getTable(currentClass()).getUI().getCurrent();
if (getServer().db.CheckCurrent(Log, currentClass())) {
target = (TestingPackage) getServer().db.getTable(currentClass()).getUI().getCurrent();
switch (target.state) {
case Done:
case Aborted:
@@ -34,14 +29,9 @@ public abstract class AbortTestingPackage extends TestingSystemPass_OLD<TestingP
packageToKill = new TestingPackageToKill();
packageToKill.packageId = target.id;
packageToKill.type = getAbortType();
return true;
return SendRequest(ServerCode.PublishObject, null, packageToKill);
}
}
;
return false;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, null, packageToKill));
}
}

17
src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
View File

@@ -1,14 +1,13 @@
package _VisualDVM.Passes.Testing;
import Common.Database.Tables.iDBTable;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Passes.Server.TestingServerPass;
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<P extends TestingPackage> extends TestingSystemPass_OLD<Vector<Pair<Integer, Long>>> {
public abstract class ActualizeTestingPackages<P extends TestingPackage> extends TestingServerPass<Vector<Pair<Integer, Long>>> {
Class p;
public ActualizeTestingPackages(Class<P> p_in) {
p = p_in;
@@ -18,10 +17,6 @@ public abstract class ActualizeTestingPackages<P extends TestingPackage> extends
}
protected abstract ServerCode getCheckCode();
@Override
protected boolean needsAnimation() {
return false;
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
for (P testingPackage : getTable().Data.values()) {
@@ -29,15 +24,11 @@ public abstract class ActualizeTestingPackages<P extends TestingPackage> extends
target.add(new Pair(testingPackage.id, testingPackage.ChangeDate));
}
}
return !target.isEmpty();
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(getCheckCode(), "", target));
return !target.isEmpty()&&SendRequest(getCheckCode(), "", target);
}
@Override
protected void performDone() throws Exception {
Vector<P> res = (Vector<P>) server_response.object;
Vector<P> res = (Vector<P>) request.server_response.object;
Global.testingServer.db.BeginTransaction();
for (P actual : res)
Global.testingServer.db.UpdateWithCheck(actual);

1
src/_VisualDVM/ProjectData/SapforData/SapforProperties.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.ProjectData.SapforData;
import Common.Properties;
import Common.Utils.Utils_;
import Common.Utils.Vector_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;

1
src/_VisualDVM/Repository/Component/Json/ComponentVersionsInfoJson.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Repository.Component.Json;
import Common.CommonConstants;
import _VisualDVM.Repository.Component.ComponentType;
import com.google.gson.annotations.Expose;

46
src/_VisualDVM/Repository/RepositoryServer.java
View File

@@ -1,13 +1,11 @@
package _VisualDVM.Repository;
import Common.Database.Database;
import Common.Database.Objects.DBObject;
import Common.Passes.PassException;
import Common.Database.Objects.riDBObject;
import Common.Utils.InterruptThread;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.RepositoryPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.Server.DiagnosticSignalHandler;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -26,7 +24,10 @@ import javax.mail.internet.MimeMultipart;
import java.io.*;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.*;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Properties;
import java.util.Vector;
public abstract class RepositoryServer<D extends Database> {
public final static String separator = "----------------------------------";
protected static FileWriter Log;
@@ -54,8 +55,8 @@ public abstract class RepositoryServer<D extends Database> {
public RepositoryServer(Class<D> d_class_in) {
d_class = d_class_in;
}
protected static void ResetLog(){
if (printOn){
protected static void ResetLog() {
if (printOn) {
try {
Log = new FileWriter("Log.txt", false);
Log.close();
@@ -274,6 +275,9 @@ public abstract class RepositoryServer<D extends Database> {
case DeleteObjectsByPK:
DeleteObjectsByPK();
break;
case CloneObjectByPK:
CloneObject();
break;
//</editor-fold>
case EXIT:
Print("ЗАВЕРШИТЬ РАБОТУ СЕРВЕРА");
@@ -324,10 +328,10 @@ public abstract class RepositoryServer<D extends Database> {
}
}
}
private void EmailBroadcast() throws Exception{
String [] packed = request.arg.split("\n");
for (String address: packed){
if (!address.isEmpty()){
private void EmailBroadcast() throws Exception {
String[] packed = request.arg.split("\n");
for (String address : packed) {
if (!address.isEmpty()) {
Email((EmailMessage) request.object, address);
}
}
@@ -355,6 +359,27 @@ public abstract class RepositoryServer<D extends Database> {
afterPublishAction(dbObject);
}
}
private void CloneObject() throws Exception {
response = new ServerExchangeUnit_2021(ServerCode.OK);
Print("Дублировать объект по ключу");
Pair<Class, Object> to_clone = (Pair<Class, Object>) request.object;
Object pk = to_clone.getValue();
if (db.getTable(to_clone.getKey()).containsKey(to_clone.getValue())) {
riDBObject src = (riDBObject) db.getTable(to_clone.getKey()).get(to_clone.getValue());
riDBObject dst = (riDBObject) to_clone.getKey().newInstance();
dst.SynchronizeFields(src);
//единственное отличие клона - текущий автор
dst.description += " копия";
String[] packed = request.arg.split("\n");
dst.sender_name = packed[0];
dst.sender_address = packed[1];
db.Insert(dst);
afterCloneAction(src,dst);
response.object= (Serializable) dst.getPK();
}
}
protected void afterCloneAction(riDBObject src, riDBObject dst) throws Exception {
}
protected void beforePublishAction(DBObject object) throws Exception {
}
protected void afterPublishAction(DBObject object) throws Exception {
@@ -382,7 +407,6 @@ public abstract class RepositoryServer<D extends Database> {
public void Ping() {
response = new ServerExchangeUnit_2021(ServerCode.OK);
}
//---
/*
public <T extends DBObject> T getActual(T object_in, Class<T> object_class)throws Exception{

1
src/_VisualDVM/Repository/Server/ComponentsServer.java
View File

@@ -11,7 +11,6 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.All.ArchivesBackupPass;
import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.Passes.All.UpdateBugReportField;
import _VisualDVM.Passes.All.ZipFolderPass;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.BugReport.BugReport;

10
src/_VisualDVM/Repository/Server/ServerCode.java
View File

@@ -33,7 +33,9 @@ public enum ServerCode {
GetObjectsCopiesByPK,
DeleteObjects,
DeleteObjectsByPK,
CheckObjectExistense, //
CheckObjectExistense,
CloneObjectByPK,
//
//--
EXIT,
//--
@@ -134,6 +136,12 @@ public enum ServerCode {
return "Удаление объекта с сервера";
case CheckSubscriberRole:
return "Проверка роли подписчика на сервере";
case CloneObjectByPK:
return "Дублирование объекта на сервере";
case UpdateActiveDVMPackages:
return "Актуализация активных DVM пакетов на сервере";
case ActualizeSAPFORPackages:
return "Актуализация активных SAPFOR пакетов на сервере";
default:
return this.toString();
}

12
src/_VisualDVM/Repository/RepositoryClient.java → src/_VisualDVM/Repository/TestingClient.java
View File

@@ -1,14 +1,16 @@
package _VisualDVM.Repository;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.RepositoryPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.TestingServer;
import java.io.FileWriter;
import java.io.Serializable;
import java.util.Date;
public abstract class RepositoryClient {
public abstract class TestingClient {
//--
protected int getSleepMillis() {
return 2000;
@@ -31,7 +33,7 @@ public abstract class RepositoryClient {
}
//--
protected Object ServerCommand(ServerCode code_in, String arg, Serializable object_in) throws Exception {
TestingSystemPass_OLD<Object> pass = new TestingSystemPass_OLD<Object>() {
RepositoryPass<TestingServer,Object> pass = new RepositoryPass<TestingServer, Object>(Global.testingServer) {
@Override
public String getDescription() {
return "";
@@ -45,6 +47,10 @@ public abstract class RepositoryClient {
protected boolean validate() {
return Log.isEmpty();
}
@Override
protected int getTimeout() {
return 120000;
}
};
if (!pass.Do()) {
ServerConnectionError(code_in, pass.Log.toString());

2
src/_VisualDVM/TestingServerProperties.java
View File

@@ -1,6 +1,4 @@
package _VisualDVM;
import com.google.gson.annotations.Expose;
import java.io.File;
public class TestingServerProperties extends VisualDVMProperties{
public TestingServerProperties(){

4
src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
View File

@@ -8,8 +8,8 @@ import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.RepositoryClient;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.TestingClient;
import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
import _VisualDVM.TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
import _VisualDVM.Utils;
@@ -19,7 +19,7 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.util.Date;
import java.util.Vector;
public abstract class TestingPlanner<P extends TestingPackage> extends RepositoryClient {
public abstract class TestingPlanner<P extends TestingPackage> extends TestingClient {
protected P testingPackage;
protected File packageLocalWorkspace = null;
protected String serverName = "";

16
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.TestingSystem.Common;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Database.RepositoryRefuseException;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
@@ -103,6 +104,21 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
}
}
@Override
protected void afterCloneAction(riDBObject src, riDBObject dst) throws Exception{
if (src instanceof SapforSettings){
Vector<PassCode> codes = new Vector<>();
for (SapforSettingsCommand command : db.sapforSettingsCommands.Data.values())
if (command.sapforsettings_id == src.id) codes.add(command.passCode);
//--
for (PassCode code : codes) {
SapforSettingsCommand command = new SapforSettingsCommand();
command.sapforsettings_id = dst.id;
command.passCode = code;
db.Insert(command);
}
}
}
@Override
protected void afterEditAction(DBObject object) throws Exception {
if (object instanceof Group) {
Group group = (Group) object;

4
src/_VisualDVM/TestingSystem/DVM/DVMTestingChecker.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.DVM;
import _VisualDVM.Repository.RepositoryClient;
import _VisualDVM.Repository.Server.ServerCode;
public class DVMTestingChecker extends RepositoryClient {
import _VisualDVM.Repository.TestingClient;
public class DVMTestingChecker extends TestingClient {
@Override
public void perform() throws Exception {
ServerCommand(ServerCode.StartNecessaryMachines);

1
src/_VisualDVM/Visual/Tables/RendererProfileAuto.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.Visual.Tables;
import Common.Visual.Tables.RendererDBObject;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
public class RendererProfileAuto extends RendererDBObject {
@Override
public void Display() {

6
src/_VisualDVM/Visual/Tables/SwitcherProfileAuto.java
View File

@@ -1,14 +1,8 @@
package _VisualDVM.Visual.Tables;
import Common.Passes.Pass;
import Common.Visual.Tables.EditorDBObject;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.EditServerObject;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
public class SwitcherProfileAuto extends EditorDBObject<SapforProfile> {
@Override
public void Action() {