рефакторинг

This commit is contained in:
2025-02-18 16:21:20 +03:00
parent 9c0ed53d52
commit 0a123988b3
163 changed files with 938 additions and 367 deletions

View File

@@ -3,12 +3,12 @@ import Common.Database.Database;
import Common.Passes.AddObjectPass;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
import _VisualDVM.ComponentsServer.Component.ComponentType;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Component.ComponentType;
import java.io.File;
import java.nio.file.Files;

View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.PublishServerObject;
import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.Subscribes.Subscriber;
public class AddSubscriber extends PublishServerObject<ComponentsServer, Subscriber> {
public AddSubscriber() {
super(Global.componentsServer, Subscriber.class);

View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.Json.BugReportAdditionJson;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.Json.BugReportAdditionJson;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;

View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.Global;
import _VisualDVM.Repository.BugReport.BugReport;
public class ApplyBugReportSettings extends Pass<BugReport> {
@Override
public String getIconPath() {

View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.Component.Component;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.ProcessPass;
import _VisualDVM.Repository.Component.Component;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;

View File

@@ -1,56 +1,60 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
public class CheckAccount extends Pass<Boolean> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = false;
return true;
}
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import org.apache.commons.io.FileUtils;
import java.io.File;
public class CheckAccount extends ComponentsServerPass<UserAccount> {
@Override
public String getIconPath() {
return "/icons/Registry.png";
}
@Override
public String getButtonText() {
return "";
protected boolean isSafe() {
return false;
}
File keyFile;
void confirmEmail() throws Exception{
ConfirmEmail confirmEmailPass = (ConfirmEmail) Global.mainModule.getPass(PassCode.ConfirmEmail);;
if (confirmEmailPass.Do()){
UserAccount userAccount = confirmEmailPass.target;
//подтвердили почту. теперь проверяем ее роль на сервере. если на сервере нет акка будет создан
if (SendRequest(ServerCode.GetUserAccountByEmail, null,userAccount)){
target = (UserAccount) request.server_response.object;
FileUtils.writeStringToFile(keyFile, target.security_key);
}
}
}
@Override
protected boolean canStart(Object... args) throws Exception {
target =null;
keyFile = new File(Global.KeyDirectory, "key");
//--
//1. Ищем ключ.
if (keyFile.exists()) {
//ключ есть. проверить его актуальность.
if (SendRequest(ServerCode.GetUserAccountByKey, FileUtils.readFileToString(keyFile))){
if (request.server_response!=null){
//ключ актуальный.
target = (UserAccount) request.server_response.object;
}else {
//ключ неактуальный. регистрируемся по новой.
Utils_.forceDeleteWithCheck(keyFile);
confirmEmail();
}
}
}else {
confirmEmail();
}
return target!=null;
}
@Override
protected void body() throws Exception {
/*
switch (Current.getAccount().email){
case "vmk-post@yandex.ru":
case "79854210702@ya.ru":
Current.getAccount().role = AccountRole.Admin;
target = true;
break;
case "npodderyugina@gmail.com":
case "savol@keldysh.ru":
case "mkocharmin@yandex.ru":
case "juk.06@list.ru":
Current.getAccount().role = AccountRole.Developer;
target = true;
break;
case "?":
Current.getAccount().role = AccountRole.Undefined;
target = false;
break;
default:
Current.getAccount().role =AccountRole.User;
target = true;
break;
}
*/
//временно. оффлайн проверка по почте
target = Global.mainModule.getAccount().email.equals("?") ?
(Global.mainModule.getPass(PassCode.EditAccount).Do() &&
Global.mainModule.getPass(PassCode.CheckRegistrationOnServer).Do()) :
(Global.mainModule.getPass(PassCode.CheckRegistrationOnServer).Do());
}
@Override
protected boolean validate() {
return target;
Global.normalProperties.SynchronizeAccount(target);
}
@Override
protected void showDone() throws Exception {

View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Subscribes.Subscriber;
public class CheckRegistrationOnServer extends ComponentsServerPass<Subscriber> {
@Override
protected boolean isSafe() {

View File

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.All;
import Common.MainModule_;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
@Override
protected boolean isSafe() {

View File

@@ -1,5 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
public class CloseBugReport extends UpdateBugReportField {
@Override
public String getIconPath() {

View File

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.Transformation;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.CombineFilesDialog;
import org.apache.commons.io.FileUtils;

View File

@@ -0,0 +1,64 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountDialog;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import javax.swing.*;
public class ConfirmEmail extends ComponentsServerPass<UserAccount> {
String password;
UserAccountDialog f = new UserAccountDialog() {
{
fields.tfName.setText(Global.normalProperties.Email);
fields.tfAddress.setText(Global.normalProperties.Email);
fields.cbRole.setEnabled(false);
}
};
public static int getRandomIntegerBetweenRange(int min, int max) {
return (int) ((Math.random() * ((max - min) + 1)) + min);
}
@Override
protected boolean isSafe() {
return false;
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = new UserAccount(); // объект для заполнения полей.не более.
password = null;
if (f.ShowDialog("Регистрация", target)) {
if (!Utils_.validateEmail(target.email, Log)) {
return false;
}
password = String.valueOf(getRandomIntegerBetweenRange(1111, 9999));
return SendRequest(ServerCode.Email,
target.email,
new EmailMessage("Код подтверждения визуализатора для: " + Utils_.Brackets(target.name), password));
}
return false;
}
@Override
protected boolean validate() {
String attempt = null;
do {
attempt = JOptionPane.showInputDialog(null,
new String[]{"Введите код активации, полученный по почте"},
"Подтверждение адреса почты",
JOptionPane.INFORMATION_MESSAGE);
if (attempt != null) {
if (attempt.equals(password)) {
UI.Info("Почта успешно подтверждена!");
return true;
} else {
UI.Error("Неверный код активации.\овторите попытку.");
}
} else {
UI.Info("Подтверждение почты отменено");
return false;
}
} while (true);
}
}

View File

@@ -3,12 +3,12 @@ import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.Utils;

View File

@@ -2,11 +2,11 @@ package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.Utils;

View File

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import Common.Database.Database;
import Common.Passes.DeleteObjectPass;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
public class DeleteBugReport extends DeleteObjectPass<BugReport> {
public DeleteBugReport() {
super(BugReport.class);

View File

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

View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.DeleteServerObject;
import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.Subscribes.Subscriber;
public class DeleteSubscriber extends DeleteServerObject<ComponentsServer, Subscriber> {
public DeleteSubscriber() {
super(Global.componentsServer, Subscriber.class);

View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.DeleteServerObject;
import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
public class DeleteSubscriberWorkspace extends DeleteServerObject<ComponentsServer, SubscriberWorkspace> {
public DeleteSubscriberWorkspace() {
super(Global.componentsServer, SubscriberWorkspace.class);

View File

@@ -3,7 +3,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.Common.Test.Test;
import java.util.Vector;
public class DetectSelectedTestsMinMaDim extends TestingServerPass<Vector<Object>> {

View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.Server.ServerCode;
public class DownloadBugReport extends ComponentsServerPass<BugReport> {
@Override

View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.Component.Component;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Server.ServerCode;
public class DownloadComponent extends ComponentsServerPass<Component> {
@Override

View File

@@ -1,7 +1,6 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
public class DownloadTaskTest extends DownloadTest {
@Override

View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
import _VisualDVM.ComponentsServer.Subscribes.UI.SubscriberDialog;
import _VisualDVM.Global;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Subscribes.Subscriber;
import _VisualDVM.Repository.Subscribes.UI.SubscriberDialog;
import javax.swing.*;
public class EditAccount extends Email {

View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.EditServerObject;
import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.Subscribes.Subscriber;
public class EditSubscriber extends EditServerObject<ComponentsServer, Subscriber> {
public EditSubscriber() {
super(Global.componentsServer, Subscriber.class);

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
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> {

View File

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import _VisualDVM.ComponentsServer.Component.Component;
import _VisualDVM.ComponentsServer.Component.ComponentType;
import _VisualDVM.ComponentsServer.Component.Json.ComponentVersionsInfoJson;
import _VisualDVM.Global;
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.ServerCode;
import java.util.Vector;

View File

@@ -2,13 +2,13 @@ package _VisualDVM.Passes.All;
import Common.MainModule_;
import Common.Passes.Pass;
import Common.Passes.PassException;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.GlobalData.User.UserState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
public class InitialiseUser extends Pass {
@Override
public String getIconPath() {

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingServerPass;
@@ -7,8 +6,6 @@ import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import java.util.Vector;
public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
@Override
public String getIconPath() {

View File

@@ -1,5 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
public class OpenBugReport extends UpdateBugReportField {
@Override
public String getIconPath() {

View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import java.io.File;
public class OpenBugReportTestProject extends Pass<BugReport> {

View File

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.Transformation;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import org.apache.commons.io.FileUtils;
import java.io.File;

View File

@@ -2,10 +2,10 @@ package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.EmailMessage;
import java.io.File;

View File

@@ -1,15 +1,15 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.Component.Component;
import _VisualDVM.ComponentsServer.Component.ComponentType;
import _VisualDVM.ComponentsServer.Component.Json.ComponentPublicationInfoJson;
import _VisualDVM.ComponentsServer.Component.UI.PublishForm;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
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.Server.ServerCode;

View File

@@ -1,14 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
import _VisualDVM.Passes.Server.PublishServerPass;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ComponentsServer;
import java.io.File;
public class PublishComponentsServer extends PublishServerPass<ComponentsServer> {
@Override
protected ComponentsServer getServer() {

View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
public class PublishRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -1,13 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
import _VisualDVM.Passes.Server.PublishServerPass;
import _VisualDVM.TestingSystem.Common.TestingServer;
import java.io.File;
public class PublishTestingServer extends PublishServerPass<TestingServer> {
@Override
protected TestingServer getServer() {

View File

@@ -17,7 +17,7 @@ import java.io.File;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.Vector;
public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDVM.Repository.Component.Component> {
public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDVM.ComponentsServer.Component.Component> {
Vector<RemoteFile> backups; //не забывать что файлы на СЕРВЕРЕ.
RemoteFile remoteFile;
File localFile;

View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Visual.UI;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
public class SPF_CreateParallelVariant extends SapforTransformation {
ParallelVariant variant = null;
@Override

View File

@@ -1,14 +1,14 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import org.apache.commons.io.FileUtils;
import java.util.Vector;

View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.BugReport.Json.RecipientsJson;
import _VisualDVM.Global;
import _VisualDVM.Repository.BugReport.Json.RecipientsJson;
public class SaveBugReportRecipients extends UpdateBugReportField {
@Override
public String getIconPath() {

View File

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Server.ServerCode;
public class SendBugReport extends ComponentsServerPass<BugReport> {
@Override

View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.Component.Component;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;

View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.ComponentsServer.Component.ComponentType;
import _VisualDVM.Global;
import _VisualDVM.Repository.Component.ComponentType;
import java.awt.*;
import java.io.File;

View File

@@ -1,9 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
import _VisualDVM.Passes.Server.ShutdownServerPass;
import _VisualDVM.Repository.Server.ComponentsServer;
public class ShutdownComponentsServer extends ShutdownServerPass<ComponentsServer> {
@Override
protected ComponentsServer getServer() {

View File

@@ -1,7 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
import _VisualDVM.Passes.Server.ShutdownServerPass;
import _VisualDVM.TestingSystem.Common.TestingServer;
public class ShutdownTestingServer extends ShutdownServerPass<TestingServer> {

View File

@@ -1,9 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
import _VisualDVM.Passes.Server.StartServerPass;
import _VisualDVM.Repository.Server.ComponentsServer;
public class StartComponentsServer extends StartServerPass<ComponentsServer> {
@Override
protected ComponentsServer getServer() {

View File

@@ -1,7 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
import _VisualDVM.Passes.Server.StartServerPass;
import _VisualDVM.TestingSystem.Common.TestingServer;
public class StartTestingServer extends StartServerPass<TestingServer> {

View File

@@ -1,9 +1,83 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.Global;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileWriter;
import java.io.InputStreamReader;
public class TestPass extends Pass {
public static String getMotherboardSN() {
String result = "";
try {
File file = File.createTempFile("realhowto",".vbs");
file.deleteOnExit();
FileWriter fw = new java.io.FileWriter(file);
String vbs =
"Set objWMIService = GetObject(\"winmgmts:\\\\.\\root\\cimv2\")\n"
+ "Set colItems = objWMIService.ExecQuery _ \n"
+ " (\"Select * from Win32_BaseBoard\") \n"
+ "For Each objItem in colItems \n"
+ " Wscript.Echo objItem.SerialNumber \n"
+ " exit for ' do the first cpu only! \n"
+ "Next \n";
fw.write(vbs);
fw.close();
Process p = Runtime.getRuntime().exec("cscript //NoLogo " + file.getPath());
BufferedReader input =
new BufferedReader
(new InputStreamReader(p.getInputStream()));
String line;
while ((line = input.readLine()) != null) {
result += line;
}
input.close();
}
catch(Exception e){
e.printStackTrace();
}
return result.trim();
}
@Override
protected void body() throws Exception {
Global.testingServer.PingFromClient();
// String cpuId = getMotherboardSN();
// UI.Info(cpuId);
/*
SystemInfo systemInfo = new SystemInfo();
HardwareAbstractionLayer hardware = systemInfo.getHardware();
CentralProcessor processor = hardware.getProcessor();
CentralProcessor.ProcessorIdentifier processorIdentifier = processor.getProcessorIdentifier();
System.out.println("Processor Vendor: " + processorIdentifier.getVendor());
System.out.println("Processor Name: " + processorIdentifier.getName());
System.out.println("Processor ID: " + processorIdentifier.getProcessorID());
System.out.println("Identifier: " + processorIdentifier.getIdentifier());
System.out.println("Microarchitecture: " + processorIdentifier.getMicroarchitecture());
System.out.println("Frequency (Hz): " + processorIdentifier.getVendorFreq());
System.out.println("Frequency (GHz): " + processorIdentifier.getVendorFreq() / 1000000000.0);
*/
/*
String serial = "";
Scanner sc = null;
Process process = null;
try {
process = Runtime.getRuntime().exec(new String[] { "wmic", "cpu", "get", "ProcessorId" });
process.getOutputStream().close();
sc = new Scanner(process.getInputStream());
sc.next();
serial = sc.next();
} catch (IOException e) {
} dummy
UI.Info(Utils_.Brackets(serial));
*/
/*
KeyGenerator keyGenerator = KeyGenerator.getInstance("AES");
SecureRandom secureRandom = new SecureRandom();
int keyBitSize = 256;
keyGenerator.init(keyBitSize, secureRandom);
SecretKey secretKey = keyGenerator.generateKey();
System.out.println("====");
System.out.println(secretKey.getEncoded());
System.out.println("====");
*/
}
}

View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Utils;

View File

@@ -2,9 +2,9 @@ package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.Component.Component;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Component;
public class UpdateComponent extends Pass<Component> {
@Override
protected PassCode necessary() {

View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.ComponentsServer.Component.Component;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Component;
import java.util.Vector;
public class UpdateSelectedComponents extends Pass<Vector<Component>> {

View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes;
import Common.Passes.Pass;
import _VisualDVM.ComponentsServer.Component.Component;
import _VisualDVM.Global;
import _VisualDVM.Repository.Component.Component;
public abstract class CurrentComponentPass extends Pass<Component> {
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -354,11 +354,15 @@ public enum PassCode implements PassCode_ {
ResumeDVMPackage,
JoinSapforTestingVersionsToGroup,
RefreshDVMPackageResults,
DetectSelectedTestsMinMaDim;
DetectSelectedTestsMinMaDim,
ConfirmEmail
;
//--
@Override
public String getDescription() {
switch (this) {
case ConfirmEmail:
return "Подтверждение почты";
case DetectSelectedTestsMinMaDim:
return "Определить размерность тестов";
case RefreshDVMPackageResults:

View File

@@ -7,7 +7,7 @@ import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.RepositoryServer;
import java.util.Date;
public abstract class RepositoryServerSSHPass<S extends RepositoryServer> extends ConnectionPass<S> {

View File

@@ -1,12 +1,12 @@
package _VisualDVM.Passes.Sapfor;
import Common.Visual.Controls.PassMenuItem;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import javax.swing.*;
public class SapforTransformation extends SapforPass {

View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.Sapfor;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.Global;
import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
public class SilentSapforPass extends CurrentProjectPass {
protected Sapfor sapfor;
@Override

View File

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.Sapfor;
import Common.Visual.Controls.PassMenuItem;
import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import javax.swing.*;
public class Transformation extends CurrentProjectPass {

View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.Sapfor;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
public abstract class VariantsMassPass extends CurrentProjectPass {
int count;
public abstract PassCode getSubPassCode();

View File

@@ -1,8 +1,6 @@
package _VisualDVM.Passes.Server;
import Common.Passes.Pass;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;

View File

@@ -1,10 +1,9 @@
package _VisualDVM.Passes.Server;
import Common.Database.Objects.riDBObject;
import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
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;

View File

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.Server;
import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.ComponentsServer;
public class ComponentsServerPass<T> extends ClientPass<ComponentsServer,T> {
@Override
protected ComponentsServer getServer() {

View File

@@ -1,9 +1,8 @@
package _VisualDVM.Passes.Server;
import Common.Database.Objects.DBObject;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
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> {

View File

@@ -4,10 +4,9 @@ import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Database.Tables.DBTable;
import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import javafx.util.Pair;

View File

@@ -1,9 +1,8 @@
package _VisualDVM.Passes.Server;
import Common.Database.Objects.DBObject;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
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> {
//--

View File

@@ -2,10 +2,9 @@ package _VisualDVM.Passes.Server;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class PublishServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
public Object pk = null;
public PublishServerObject(S server_in, Class<D> d_in) {

View File

@@ -2,7 +2,8 @@ package _VisualDVM.Passes.Server;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.RepositoryServer;
import java.io.File;
public abstract class PublishServerPass<S extends RepositoryServer> extends RepositoryServerSSHPass<S> {
@Override

View File

@@ -2,7 +2,7 @@ package _VisualDVM.Passes.Server;
import Common.Database.RepositoryRefuseException;
import Common.Passes.Pass;
import _VisualDVM.Constants;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;

View File

@@ -2,7 +2,7 @@ package _VisualDVM.Passes.Server;
import Common.Database.Database;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.RepositoryServer;
public abstract class ServerObjectPass<S extends RepositoryServer, D extends DBObject> extends RepositoryPass<S, D> {
protected Class<D> d; //класс объектов.
//---

View File

@@ -1,7 +1,6 @@
package _VisualDVM.Passes.Server;
import _VisualDVM.Global;
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.RepositoryServer;
public abstract class ShutdownServerPass<S extends RepositoryServer> extends RepositoryServerSSHPass<S> {
@Override
public String getIconPath() {

View File

@@ -1,13 +1,6 @@
package _VisualDVM.Passes.Server;
import Common.CommonConstants;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
import _VisualDVM.Repository.RepositoryServer;
import java.util.Date;
import _VisualDVM.Repository.Server.RepositoryServer;
public abstract class StartServerPass<S extends RepositoryServer> extends RepositoryServerSSHPass<S> {
@Override
public String getIconPath() {