diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7589e077..2e43ea06 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,601 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -48,10 +640,10 @@
-
-
-
-
+
+
+
+
diff --git a/PerformanceAnalyzer/1049392283/stat.json b/PerformanceAnalyzer/1049392283/stat.json
deleted file mode 100644
index ded4cdb9..00000000
--- a/PerformanceAnalyzer/1049392283/stat.json
+++ /dev/null
@@ -1 +0,0 @@
-{"inter":[{"col_op":[{"comm":0.0,"ncall":8,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0,"ncall":0,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0,"ncall":0,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0,"ncall":0,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0}],"id":{"expr":2000000000,"nenter":1.0,"nlev":0,"nline":6,"nline_end":64,"pname":"jac3d.f","t":21},"proc_times":[{"comm":0.0,"exec_time":0.3102550506591797,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"gpu_times":null,"idle":0.0,"insuf_sys":0.0,"insuf_user":0.0,"load_imb":0.0,"lost_time":0.0,"num_gpu":0,"num_threads":0,"overlap":0.0,"prod_cpu":0.3100552558898926,"prod_io":0.0001800060272216797,"prod_sys":1.9788742065429688e-05,"real_comm":0.0,"synch":0.0,"sys_time":0.0,"th_times":null,"thr_sys_time":0.0,"thr_user_time":0.0,"time_var":0.0}],"times":{"comm":0.0,"comm_start":0.0,"efficiency":1.0,"exec_time":0.3102550506591797,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"idle":0.0,"insuf":0.0,"insuf_sys":0.0,"insuf_user":0.0,"load_imb":0.0,"lost_time":0.0,"nproc":1,"overlap":0.0,"prod_cpu":0.3100552558898926,"prod_io":0.0001800060272216797,"prod_sys":1.9788742065429688e-05,"real_comm":0.0,"synch":0.0,"sys_time":0.3102550506591797,"thr_sys_time":0.0,"thr_user_time":0.0,"threadsOfAllProcs":2,"time_var":0.0}}],"iscomp":false,"nproc":1,"p_heading":"1*1","proc":[{"node_name":"mic.dvm-system.org","test_time":0.5540609359741211}]}
\ No newline at end of file
diff --git a/PerformanceAnalyzer/139606632/stat.json b/PerformanceAnalyzer/139606632/stat.json
deleted file mode 100644
index 519065e8..00000000
--- a/PerformanceAnalyzer/139606632/stat.json
+++ /dev/null
@@ -1 +0,0 @@
-{"inter":[{"col_op":[{"comm":0.0,"ncall":107,"overlap":0.0,"real_comm":0.0,"synch":0.09642767906188965,"time_var":0.10170316696166992},{"comm":0.09526991844177246,"ncall":100,"overlap":0.00025081634521484375,"real_comm":0.0,"synch":2.384185791015625e-05,"time_var":1.5735626220703125e-05},{"comm":0.01116180419921875,"ncall":100,"overlap":7.390975952148438e-05,"real_comm":0.0,"synch":0.0018832683563232422,"time_var":0.0013852119445800781},{"comm":0.0,"ncall":0,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0}],"id":{"expr":2000000000,"nenter":1.0,"nlev":0,"nline":15,"nline_end":71,"pname":"jac2d.for","t":21},"proc_times":[{"comm":0.008355379104614258,"exec_time":4.960660934448242,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"gpu_times":null,"idle":0.00014519691467285156,"insuf_sys":0.02597987651824951,"insuf_user":0.002836167812347412,"load_imb":0.0,"lost_time":0.03731662034988403,"num_gpu":0,"num_threads":0,"overlap":0.0,"prod_cpu":4.9148295521736145,"prod_io":0.0015007257461547852,"prod_sys":0.007159233093261719,"real_comm":0.0,"synch":0.015146493911743164,"sys_time":1.42268456e-316,"th_times":null,"thr_sys_time":0.0,"thr_user_time":0.0,"time_var":0.011813640594482422},{"comm":0.020066499710083008,"exec_time":4.960740089416504,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"gpu_times":null,"idle":6.604194641113281e-05,"insuf_sys":0.022036850452423096,"insuf_user":0.0030239224433898926,"load_imb":0.006429493427276611,"lost_time":0.04519331455230713,"num_gpu":0,"num_threads":0,"overlap":0.0,"prod_cpu":4.9082671999931335,"prod_io":5.352497100830078e-05,"prod_sys":0.0072920918464660645,"real_comm":0.0,"synch":0.021478652954101563,"sys_time":1632742196.495043,"th_times":null,"thr_sys_time":0.0,"thr_user_time":0.0,"time_var":0.024171829223632813},{"comm":0.05277681350708008,"exec_time":4.960806131362915,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"gpu_times":null,"idle":0.0,"insuf_sys":0.023320376873016357,"insuf_user":0.0034398436546325684,"load_imb":0.040790677070617676,"lost_time":0.079537034034729,"num_gpu":0,"num_threads":0,"overlap":0.0,"prod_cpu":4.873495638370514,"prod_io":7.098913192749023e-05,"prod_sys":0.007702469825744629,"real_comm":0.0,"synch":0.03799128532409668,"sys_time":5.51718905656e-313,"th_times":null,"thr_sys_time":0.0,"thr_user_time":0.0,"time_var":0.04065394401550293},{"comm":0.025233030319213867,"exec_time":4.960805177688599,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"gpu_times":null,"idle":9.5367431640625e-07,"insuf_sys":0.022124826908111572,"insuf_user":0.0031962990760803223,"load_imb":0.011793673038482666,"lost_time":0.05055510997772217,"num_gpu":0,"num_threads":0,"overlap":0.0,"prod_cpu":4.902876079082489,"prod_io":5.5909156799316406e-05,"prod_sys":0.007319033145904541,"real_comm":0.0,"synch":0.02371835708618164,"sys_time":1.4228205e-316,"th_times":null,"thr_sys_time":0.0,"thr_user_time":0.0,"time_var":0.02646470069885254}],"times":{"comm":0.10643172264099121,"comm_start":0.0,"efficiency":0.989285910732807,"exec_time":4.960806131362915,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"idle":0.00021219253540039063,"insuf":0.10595816373825073,"insuf_sys":0.09346193075180054,"insuf_user":0.012496232986450195,"load_imb":0.05901384353637695,"lost_time":0.21260207891464233,"nproc":4,"overlap":0.0003247261047363281,"prod_cpu":19.59946846961975,"prod_io":0.0016811490058898926,"prod_sys":0.029472827911376953,"real_comm":0.0,"synch":0.09833478927612305,"sys_time":19.84322452545166,"thr_sys_time":0.0,"thr_user_time":0.0,"threadsOfAllProcs":4,"time_var":0.1031041145324707}}],"iscomp":false,"nproc":4,"p_heading":"2*2","proc":[{"node_name":"mic.dvm-system.org","test_time":0.5796339511871338},{"node_name":"mic.dvm-system.org","test_time":0.5798628330230713},{"node_name":"mic.dvm-system.org","test_time":0.5795998573303223},{"node_name":"mic.dvm-system.org","test_time":0.5797138214111328}]}
\ No newline at end of file
diff --git a/PerformanceAnalyzer/1664247100/stat.json b/PerformanceAnalyzer/1664247100/stat.json
deleted file mode 100644
index f96aaa5a..00000000
--- a/PerformanceAnalyzer/1664247100/stat.json
+++ /dev/null
@@ -1 +0,0 @@
-{"inter":[{"col_op":[{"comm":0.0,"ncall":107,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0012249946594238281,"ncall":100,"overlap":0.00010442733764648438,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0,"ncall":100,"overlap":5.507469177246094e-05,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0,"ncall":0,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0}],"id":{"expr":2000000000,"nenter":1.0,"nlev":0,"nline":15,"nline_end":71,"pname":"jac2d.for","t":21},"proc_times":[{"comm":0.0012249946594238281,"exec_time":12.855837106704712,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"gpu_times":null,"idle":0.0,"insuf_sys":0.0,"insuf_user":0.0,"load_imb":0.0,"lost_time":0.0012249946594238281,"num_gpu":0,"num_threads":0,"overlap":0.0,"prod_cpu":12.844730615615845,"prod_io":0.0035636425018310547,"prod_sys":0.006317853927612305,"real_comm":0.0,"synch":0.0,"sys_time":1.4784531e-316,"th_times":null,"thr_sys_time":0.0,"thr_user_time":0.0,"time_var":0.0}],"times":{"comm":0.0012249946594238281,"comm_start":0.0,"efficiency":0.9999047129604042,"exec_time":12.855837106704712,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"idle":0.0,"insuf":0.0,"insuf_sys":0.0,"insuf_user":0.0,"load_imb":0.0,"lost_time":0.0012249946594238281,"nproc":1,"overlap":0.0001595020294189453,"prod_cpu":12.844730615615845,"prod_io":0.0035636425018310547,"prod_sys":0.006317853927612305,"real_comm":0.0,"synch":0.0,"sys_time":12.855837106704712,"thr_sys_time":0.0,"thr_user_time":0.0,"threadsOfAllProcs":1,"time_var":0.0}}],"iscomp":false,"nproc":1,"p_heading":"1*1","proc":[{"node_name":"mic.dvm-system.org","test_time":0.5531537532806396}]}
\ No newline at end of file
diff --git a/PerformanceAnalyzer/535943622/stat.json b/PerformanceAnalyzer/535943622/stat.json
deleted file mode 100644
index cfb1ec1e..00000000
--- a/PerformanceAnalyzer/535943622/stat.json
+++ /dev/null
@@ -1 +0,0 @@
-{"inter":[{"col_op":[{"comm":0.0,"ncall":54,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0,"ncall":0,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0,"ncall":0,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0,"ncall":0,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0}],"id":{"expr":2000000000,"nenter":1.0,"nlev":0,"nline":174,"nline_end":298,"pname":"bt.f","t":21},"proc_times":[{"comm":0.0,"exec_time":37.97893500328064,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"gpu_times":null,"idle":0.0,"insuf_sys":0.0,"insuf_user":0.0,"load_imb":0.0,"lost_time":0.0,"num_gpu":0,"num_threads":0,"overlap":0.0,"prod_cpu":37.97744798660278,"prod_io":0.0006661415100097656,"prod_sys":0.0008208751678466797,"real_comm":0.0,"synch":0.0,"sys_time":4.080717506121202e-33,"th_times":null,"thr_sys_time":0.0,"thr_user_time":0.0,"time_var":0.0}],"times":{"comm":0.0,"comm_start":0.0,"efficiency":1.0,"exec_time":37.97893500328064,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"idle":0.0,"insuf":0.0,"insuf_sys":0.0,"insuf_user":0.0,"load_imb":0.0,"lost_time":0.0,"nproc":1,"overlap":0.0,"prod_cpu":37.97744798660278,"prod_io":0.0006661415100097656,"prod_sys":0.0008208751678466797,"real_comm":0.0,"synch":0.0,"sys_time":37.97893500328064,"thr_sys_time":0.0,"thr_user_time":0.0,"threadsOfAllProcs":12,"time_var":0.0}}],"iscomp":false,"nproc":1,"p_heading":"1*1*1*1","proc":[{"node_name":"mic.dvm-system.org","test_time":0.5507678985595703}]}
\ No newline at end of file
diff --git a/PerformanceAnalyzer/622828792/stat.json b/PerformanceAnalyzer/622828792/stat.json
deleted file mode 100644
index d4769aa2..00000000
--- a/PerformanceAnalyzer/622828792/stat.json
+++ /dev/null
@@ -1 +0,0 @@
-{"inter":[{"col_op":[{"comm":0.0,"ncall":107,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0011873245239257813,"ncall":100,"overlap":9.274482727050781e-05,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0,"ncall":100,"overlap":5.435943603515625e-05,"real_comm":0.0,"synch":0.0,"time_var":0.0},{"comm":0.0,"ncall":0,"overlap":0.0,"real_comm":0.0,"synch":0.0,"time_var":0.0}],"id":{"expr":2000000000,"nenter":1.0,"nlev":0,"nline":15,"nline_end":71,"pname":"jac2d.for","t":21},"proc_times":[{"comm":0.0011873245239257813,"exec_time":12.533138990402222,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"gpu_times":null,"idle":0.0,"insuf_sys":0.0,"insuf_user":0.0,"load_imb":0.0,"lost_time":0.0011873245239257813,"num_gpu":0,"num_threads":0,"overlap":0.0,"prod_cpu":12.522205114364624,"prod_io":0.0035867691040039063,"prod_sys":0.006159782409667969,"real_comm":0.0,"synch":0.0,"sys_time":2.49049955e-316,"th_times":null,"thr_sys_time":0.0,"thr_user_time":0.0,"time_var":0.0}],"times":{"comm":0.0011873245239257813,"comm_start":0.0,"efficiency":0.999905265191359,"exec_time":12.533138990402222,"gpu_time_lost":0.0,"gpu_time_prod":0.0,"idle":0.0,"insuf":0.0,"insuf_sys":0.0,"insuf_user":0.0,"load_imb":0.0,"lost_time":0.0011873245239257813,"nproc":1,"overlap":0.00014710426330566406,"prod_cpu":12.522205114364624,"prod_io":0.0035867691040039063,"prod_sys":0.006159782409667969,"real_comm":0.0,"synch":0.0,"sys_time":12.533138990402222,"thr_sys_time":0.0,"thr_user_time":0.0,"threadsOfAllProcs":1,"time_var":0.0}}],"iscomp":false,"nproc":1,"p_heading":"1*1","proc":[{"node_name":"mic.dvm-system.org","test_time":0.5526328086853027}]}
\ No newline at end of file
diff --git a/src/Common/Constants.java b/src/Common/Constants.java
index 84ccc784..e6c512ae 100644
--- a/src/Common/Constants.java
+++ b/src/Common/Constants.java
@@ -2,7 +2,7 @@ package Common;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;
import GlobalData.User.User;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Common.Passes.PassCode_2021;
import java.util.regex.Pattern;
public class Constants {
diff --git a/src/Common/Current.java b/src/Common/Current.java
index 9d9f44ca..d00447f7 100644
--- a/src/Common/Current.java
+++ b/src/Common/Current.java
@@ -16,15 +16,15 @@ import ProjectData.Files.DBProjectFile;
import ProjectData.Project.db_project_info;
import ProjectData.SapforData.Functions.FuncInfo;
import ProjectData.SapforData.Regions.ParallelRegion;
-import Repository.BugReport.BugReport;
-import Repository.Subscribes.Subscriber;
-import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import TestingSystem.DVM.Configuration.Configuration;
-import TestingSystem.DVM.Tasks.TestCompilationTask;
-import TestingSystem.DVM.Tasks.TestRunTask;
-import TestingSystem.DVM.TasksPackage.TasksPackage;
-import TestingSystem.Common.Test.Test;
-import Visual_DVM_2021.Passes.UI.PassForm;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Repository.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import Repository.TestingSystem.DVM.Configuration.Configuration;
+import Repository.TestingSystem.DVM.Tasks.TestCompilationTask;
+import Repository.TestingSystem.DVM.Tasks.TestRunTask;
+import Repository.TestingSystem.DVM.TasksPackage.TasksPackage;
+import Repository.TestingSystem.Common.Test.Test;
+import Common.Passes.UI.PassForm;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
@@ -167,10 +167,10 @@ public enum Current {
public static DBProjectFile getFile() {
return (DBProjectFile) get(File);
}
- public static Repository.Component.Component getComponent() {
- return (Repository.Component.Component) get(Component);
+ public static Repository.ComponentsServer.Component.Component getComponent() {
+ return (Repository.ComponentsServer.Component.Component) get(Component);
}
- public static Repository.BugReport.BugReport getBugReport() {
+ public static Repository.ComponentsServer.Component.BugReport.BugReport getBugReport() {
return (BugReport) get(BugReport);
}
public static db_project_info getRoot() {
@@ -188,7 +188,7 @@ public enum Current {
public static boolean HasSubscriber() {
return get(Current.Subscriber) != null;
}
- public static Repository.Subscribes.Subscriber getSubscriber() {
+ public static Repository.ComponentsServer.Subscribes.Subscriber getSubscriber() {
return (Subscriber) get(Current.Subscriber);
}
public static Machine getMachine() {
@@ -218,28 +218,28 @@ public enum Current {
public static RunConfiguration getRunConfiguration() {
return (RunConfiguration) get(Current.RunConfiguration);
}
- public static Repository.Component.Sapfor.Sapfor getSapfor() {
- return (Repository.Component.Sapfor.Sapfor) get(Current.Sapfor);
+ public static Repository.ComponentsServer.Component.Sapfor.Sapfor getSapfor() {
+ return (Repository.ComponentsServer.Component.Sapfor.Sapfor) get(Current.Sapfor);
}
public static boolean HasGroup() {
return get(Current.Group) != null;
}
- public static TestingSystem.Common.Group.Group getGroup() {
- return (TestingSystem.Common.Group.Group) get(Current.Group);
+ public static Repository.TestingSystem.Common.Group.Group getGroup() {
+ return (Repository.TestingSystem.Common.Group.Group) get(Current.Group);
}
//--
public static boolean HasConfiguration() {
return get(Current.Configuration) != null;
}
- public static TestingSystem.DVM.Configuration.Configuration getConfiguration() {
+ public static Repository.TestingSystem.DVM.Configuration.Configuration getConfiguration() {
return (Configuration) get(Current.Configuration);
}
public static SapforConfiguration getSapforConfiguration() {
- return (TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
+ return (Repository.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
}
//--
public static Test getTest() {
- return (TestingSystem.Common.Test.Test) get(Current.Test);
+ return (Repository.TestingSystem.Common.Test.Test) get(Current.Test);
}
public static boolean HasTest() {
return get(Current.Test) != null;
@@ -248,7 +248,7 @@ public enum Current {
return get(Current.Version) != null;
}
public static TestCompilationTask getTestCompilationTask() {
- return (TestingSystem.DVM.Tasks.TestCompilationTask) get(Current.TestCompilationTask);
+ return (Repository.TestingSystem.DVM.Tasks.TestCompilationTask) get(Current.TestCompilationTask);
}
public static boolean HasTestCompilationTask() {
return get(Current.TestCompilationTask) != null;
@@ -257,7 +257,7 @@ public enum Current {
return get(Current.TestRunTask) != null;
}
public static TestRunTask getTestRunTask() {
- return (TestingSystem.DVM.Tasks.TestRunTask) get(Current.TestRunTask);
+ return (Repository.TestingSystem.DVM.Tasks.TestRunTask) get(Current.TestRunTask);
}
public static RemoteFile getComponentServerBackup() {
return (RemoteFile) get(Current.ComponentServerBackup);
@@ -287,7 +287,7 @@ public enum Current {
return get(Current.BugReport) != null;
}
public static PassForm getPassForm() {
- return (Visual_DVM_2021.Passes.UI.PassForm) get(Current.PassForm);
+ return (Common.Passes.UI.PassForm) get(Current.PassForm);
}
public static VisualiserTheme getTheme() {
return (VisualiserTheme) get(Current.Theme);
@@ -332,8 +332,8 @@ public enum Current {
public static boolean HasSapforTask() {
return get(Current.SapforTask) != null;
}
- public static TestingSystem.SAPFOR.SapforTask.SapforTask getSapforTask() {
- return (TestingSystem.SAPFOR.SapforTask.SapforTask) get(Current.SapforTask);
+ public static Repository.TestingSystem.SAPFOR.SapforTask.SapforTask getSapforTask() {
+ return (Repository.TestingSystem.SAPFOR.SapforTask.SapforTask) get(Current.SapforTask);
}
public static ProjectData.ProjectView getProjectView() {
return (ProjectData.ProjectView) get(ProjectView);
@@ -360,8 +360,8 @@ public enum Current {
public static boolean CheckID(Current name, int id) {
return (get(name) != null) && (((iDBObject) get(name)).id == id);
}
- public static TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
- return (TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
+ public static Repository.TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
+ return (Repository.TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
}
public static boolean HasSapforProfile() {
return get(Current.SapforProfile) != null;
@@ -372,15 +372,15 @@ public enum Current {
public static boolean HasSapforTasksPackage() {
return get(Current.SapforTasksPackage) != null;
}
- public static TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
- return (TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
+ public static Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
+ return (Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
}
//сапфоры установленные на тестовый сервер.
public static boolean HasServerSapfor() {
return get(Current.ServerSapfor) != null;
}
- public static TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
- return (TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
+ public static Repository.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
+ return (Repository.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
}
//--------------------------------------------
public String getDescription() {
diff --git a/src/Common/Database/DataSet.java b/src/Common/Database/DataSet.java
index 3d4fc6d7..07b2dbce 100644
--- a/src/Common/Database/DataSet.java
+++ b/src/Common/Database/DataSet.java
@@ -7,7 +7,7 @@ import Common.UI.UI;
import Common.UI.Windows.Dialog.DBObjectDialog;
import Common.UI.Windows.Dialog.DialogFields;
import Common.Utils.TextLog;
-import Visual_DVM_2021.UI.Interface.FilterWindow;
+import Common.UI.Windows.Interface.FilterWindow;
import javax.swing.*;
import java.awt.*;
diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java
index 92a03369..a996b4b3 100644
--- a/src/Common/Database/Database.java
+++ b/src/Common/Database/Database.java
@@ -3,7 +3,7 @@ import Common.Constants;
import Common.Global;
import Common.Utils.Utils;
import Repository.RepositoryRefuseException;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Common.Passes.PassCode_2021;
import java.io.File;
import java.util.LinkedHashMap;
diff --git a/src/Common/Database/SQLITE/SQLiteDatabase.java b/src/Common/Database/SQLITE/SQLiteDatabase.java
index 0449b873..b7b30414 100644
--- a/src/Common/Database/SQLITE/SQLiteDatabase.java
+++ b/src/Common/Database/SQLITE/SQLiteDatabase.java
@@ -5,7 +5,7 @@ import Common.Database.DBTableColumn;
import Common.Database.Database;
import Common.UI.UI;
import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.PassException;
+import Common.Passes.PassException;
import javafx.util.Pair;
import java.io.File;
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 3613eed8..6f0694d6 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -7,17 +7,17 @@ import GlobalData.GlobalDatabase;
import GlobalData.Settings.DBSetting;
import GlobalData.Settings.SettingName;
import ProjectData.ProjectView;
-import Repository.Component.*;
-import Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
-import Repository.Component.Sapfor.MessagesServer;
-import Repository.Component.Sapfor.Sapfor_F;
-import Repository.Component.Sapfor.TransformationPermission;
-import Repository.Server.ComponentsServer;
-import TestingSystem.SAPFOR.PackageModeSupervisor;
-import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.UI.Interface.Loggable;
+import Repository.ComponentsServer.Component.*;
+import Repository.ComponentsServer.Component.PerformanceAnalyzer.PerformanceAnalyzer;
+import Repository.ComponentsServer.Component.Sapfor.MessagesServer;
+import Repository.ComponentsServer.Component.Sapfor.Sapfor_F;
+import Repository.ComponentsServer.Component.Sapfor.TransformationPermission;
+import Repository.ComponentsServer.ComponentsServer;
+import Repository.TestingSystem.SAPFOR.PackageModeSupervisor;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
+import Common.UI.Windows.Interface.Loggable;
import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
diff --git a/src/Visual_DVM_2021/Passes/AddObjectPass.java b/src/Common/Passes/AddObjectPass.java
similarity index 96%
rename from src/Visual_DVM_2021/Passes/AddObjectPass.java
rename to src/Common/Passes/AddObjectPass.java
index 3865a0a5..9cbd7b4b 100644
--- a/src/Visual_DVM_2021/Passes/AddObjectPass.java
+++ b/src/Common/Passes/AddObjectPass.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes;
+package Common.Passes;
import Common.Database.DBObject;
public abstract class AddObjectPass extends ObjectPass {
public AddObjectPass(Class d_in) {
diff --git a/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java b/src/Common/Passes/All/AbortSapforTaskPackage.java
similarity index 80%
rename from src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
rename to src/Common/Passes/All/AbortSapforTaskPackage.java
index d418211e..ed4f289e 100644
--- a/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
+++ b/src/Common/Passes/All/AbortSapforTaskPackage.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import Repository.TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
+import Common.Passes.Server.TestingSystemPass;
import java.util.Vector;
public class AbortSapforTaskPackage extends TestingSystemPass {
diff --git a/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java b/src/Common/Passes/All/AbortSelectedPackages.java
similarity index 82%
rename from src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java
rename to src/Common/Passes/All/AbortSelectedPackages.java
index c6bd801e..76adb62c 100644
--- a/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java
+++ b/src/Common/Passes/All/AbortSelectedPackages.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.DVM.TasksPackage.TasksPackage;
-import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.DVM.TasksPackage.TasksPackage;
+import Repository.TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
+import Common.Passes.Server.TestingSystemPass;
import java.util.Vector;
public class AbortSelectedPackages extends TestingSystemPass> {
diff --git a/src/Visual_DVM_2021/Passes/All/AddBugReport.java b/src/Common/Passes/All/AddBugReport.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/AddBugReport.java
rename to src/Common/Passes/All/AddBugReport.java
index 293035c1..0f421979 100644
--- a/src/Visual_DVM_2021/Passes/All/AddBugReport.java
+++ b/src/Common/Passes/All/AddBugReport.java
@@ -1,16 +1,16 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import GlobalData.Account.AccountRole;
-import Repository.BugReport.BugReport;
-import Repository.BugReport.BugReportInterface;
-import Repository.BugReport.BugReportState;
-import Repository.Component.ComponentType;
-import Visual_DVM_2021.Passes.AddObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Component.BugReport.BugReportInterface;
+import Repository.ComponentsServer.Component.BugReport.BugReportState;
+import Repository.ComponentsServer.Component.ComponentType;
+import Common.Passes.AddObjectPass;
+import Common.Passes.PassCode_2021;
import java.io.File;
import java.nio.file.Files;
diff --git a/src/Visual_DVM_2021/Passes/All/AddCompiler.java b/src/Common/Passes/All/AddCompiler.java
similarity index 85%
rename from src/Visual_DVM_2021/Passes/All/AddCompiler.java
rename to src/Common/Passes/All/AddCompiler.java
index ad22842d..7a082682 100644
--- a/src/Visual_DVM_2021/Passes/All/AddCompiler.java
+++ b/src/Common/Passes/All/AddCompiler.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.DBObject;
import Common.Database.Database;
import Common.Global;
import GlobalData.Compiler.Compiler;
import GlobalData.Machine.Machine;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
public class AddCompiler extends AddObjectPass {
public AddCompiler() {
super(Compiler.class);
diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java b/src/Common/Passes/All/AddDVMParameter.java
similarity index 86%
rename from src/Visual_DVM_2021/Passes/All/AddDVMParameter.java
rename to src/Common/Passes/All/AddDVMParameter.java
index 37796e34..d637e149 100644
--- a/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java
+++ b/src/Common/Passes/All/AddDVMParameter.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.DBObject;
import Common.Database.Database;
import Common.Global;
import GlobalData.DVMParameter.DVMParameter;
import GlobalData.RunConfiguration.RunConfiguration;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
public class AddDVMParameter extends AddObjectPass {
public AddDVMParameter() {
super(DVMParameter.class);
diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java b/src/Common/Passes/All/AddDVMParameterForTesting.java
similarity index 95%
rename from src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
rename to src/Common/Passes/All/AddDVMParameterForTesting.java
index f7d263e4..fc424c7b 100644
--- a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
+++ b/src/Common/Passes/All/AddDVMParameterForTesting.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.UI.Windows.Dialog.DBObjectDialog;
import Common.Utils.Utils;
import GlobalData.DVMParameter.DVMParameter;
import GlobalData.DVMParameter.UI.DVMParameterFields;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
public class AddDVMParameterForTesting extends Pass_2021 {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java b/src/Common/Passes/All/AddEnvironmentValue.java
similarity index 80%
rename from src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java
rename to src/Common/Passes/All/AddEnvironmentValue.java
index 30b63c1b..6c7748a0 100644
--- a/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java
+++ b/src/Common/Passes/All/AddEnvironmentValue.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.EnvironmentValue.EnvironmentValue;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
public class AddEnvironmentValue extends AddObjectPass {
public AddEnvironmentValue() {
super(EnvironmentValue.class);
diff --git a/src/Visual_DVM_2021/Passes/All/AddFile.java b/src/Common/Passes/All/AddFile.java
similarity index 97%
rename from src/Visual_DVM_2021/Passes/All/AddFile.java
rename to src/Common/Passes/All/AddFile.java
index c142ad68..8cbd316e 100644
--- a/src/Visual_DVM_2021/Passes/All/AddFile.java
+++ b/src/Common/Passes/All/AddFile.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Constants;
import Common.Current;
import Common.UI.UI;
@@ -6,7 +6,7 @@ import Common.UI.Windows.Dialog.Text.FileNameForm;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.Files.FileType;
-import Visual_DVM_2021.Passes.ChangeFilePass;
+import Common.Passes.ChangeFilePass;
import org.apache.commons.io.FileUtils;
import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/Visual_DVM_2021/Passes/All/AddMachine.java b/src/Common/Passes/All/AddMachine.java
similarity index 95%
rename from src/Visual_DVM_2021/Passes/All/AddMachine.java
rename to src/Common/Passes/All/AddMachine.java
index e9d77cad..e8133487 100644
--- a/src/Visual_DVM_2021/Passes/All/AddMachine.java
+++ b/src/Common/Passes/All/AddMachine.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.Compiler.Compiler;
@@ -6,7 +6,7 @@ import GlobalData.Compiler.CompilerType;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;
import GlobalData.User.User;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
public class AddMachine extends AddObjectPass {
public AddMachine() {
super(Machine.class);
diff --git a/src/Visual_DVM_2021/Passes/All/AddMakefile.java b/src/Common/Passes/All/AddMakefile.java
similarity index 91%
rename from src/Visual_DVM_2021/Passes/All/AddMakefile.java
rename to src/Common/Passes/All/AddMakefile.java
index 08a98a38..abca26cf 100644
--- a/src/Visual_DVM_2021/Passes/All/AddMakefile.java
+++ b/src/Common/Passes/All/AddMakefile.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.DBObject;
import Common.Database.Database;
import Common.Global;
@@ -6,7 +6,7 @@ import GlobalData.Machine.Machine;
import GlobalData.Makefile.Makefile;
import GlobalData.Module.Module;
import ProjectData.LanguageName;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
public class AddMakefile extends AddObjectPass {
public AddMakefile() {
super(Makefile.class);
diff --git a/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java b/src/Common/Passes/All/AddRunConfiguration.java
similarity index 86%
rename from src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java
rename to src/Common/Passes/All/AddRunConfiguration.java
index 520c3bcb..5317eb24 100644
--- a/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java
+++ b/src/Common/Passes/All/AddRunConfiguration.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.DBObject;
import Common.Database.Database;
import Common.Global;
import GlobalData.Machine.Machine;
import GlobalData.RunConfiguration.RunConfiguration;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
public class AddRunConfiguration extends AddObjectPass {
public AddRunConfiguration() {
super(RunConfiguration.class);
diff --git a/src/Visual_DVM_2021/Passes/All/AddSubscriber.java b/src/Common/Passes/All/AddSubscriber.java
similarity index 78%
rename from src/Visual_DVM_2021/Passes/All/AddSubscriber.java
rename to src/Common/Passes/All/AddSubscriber.java
index 1660e1a6..b64e0e4e 100644
--- a/src/Visual_DVM_2021/Passes/All/AddSubscriber.java
+++ b/src/Common/Passes/All/AddSubscriber.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+package Common.Passes.All;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
public class AddSubscriber extends ComponentsRepositoryPass {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/AddUser.java b/src/Common/Passes/All/AddUser.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/AddUser.java
rename to src/Common/Passes/All/AddUser.java
index 50245ba4..eb24ed52 100644
--- a/src/Visual_DVM_2021/Passes/All/AddUser.java
+++ b/src/Common/Passes/All/AddUser.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Database.DBObject;
import Common.Database.Database;
@@ -6,7 +6,7 @@ import Common.Global;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;
import GlobalData.User.User;
-import Visual_DVM_2021.Passes.AddObjectPass;
+import Common.Passes.AddObjectPass;
public class AddUser extends AddObjectPass {
public AddUser() {
super(User.class);
diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java b/src/Common/Passes/All/AppendBugReportComment.java
similarity index 94%
rename from src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java
rename to src/Common/Passes/All/AppendBugReportComment.java
index 0a294753..9896ee66 100644
--- a/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java
+++ b/src/Common/Passes/All/AppendBugReportComment.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
public class AppendBugReportComment extends AppendBugReportField {
diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java b/src/Common/Passes/All/AppendBugReportDescription.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java
rename to src/Common/Passes/All/AppendBugReportDescription.java
index 7df1180d..69eb8cf3 100644
--- a/src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java
+++ b/src/Common/Passes/All/AppendBugReportDescription.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.UI.UI;
public class AppendBugReportDescription extends AppendBugReportField {
@Override
diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java b/src/Common/Passes/All/AppendBugReportField.java
similarity index 90%
rename from src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
rename to src/Common/Passes/All/AppendBugReportField.java
index 9ef38813..8cf4fb17 100644
--- a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
+++ b/src/Common/Passes/All/AppendBugReportField.java
@@ -1,14 +1,14 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
import Common.Utils.Utils;
-import Repository.BugReport.BugReport;
-import Repository.BugReport.BugReportInterface;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Component.BugReport.BugReportInterface;
import Repository.EmailMessage;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
import javafx.util.Pair;
import java.util.Date;
diff --git a/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java b/src/Common/Passes/All/ApplyBugReportSettings.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java
rename to src/Common/Passes/All/ApplyBugReportSettings.java
index 0cc63b7a..3a381faf 100644
--- a/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java
+++ b/src/Common/Passes/All/ApplyBugReportSettings.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import GlobalData.Settings.SettingName;
-import Repository.BugReport.BugReport;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.util.LinkedHashMap;
public class ApplyBugReportSettings extends Pass_2021 {
diff --git a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java b/src/Common/Passes/All/ApplyCurrentFunction.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
rename to src/Common/Passes/All/ApplyCurrentFunction.java
index fbf8a0ef..c9515fce 100644
--- a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
+++ b/src/Common/Passes/All/ApplyCurrentFunction.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
import Common.UI.Windows.Dialog.Text.ComboTextDialog;
import Common.Utils.Utils;
import ProjectData.SapforData.Functions.FuncInfo;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.util.Comparator;
import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java b/src/Common/Passes/All/ApplyProfile.java
similarity index 91%
rename from src/Visual_DVM_2021/Passes/All/ApplyProfile.java
rename to src/Common/Passes/All/ApplyProfile.java
index 2798fcaf..5203863a 100644
--- a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java
+++ b/src/Common/Passes/All/ApplyProfile.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import GlobalData.SapforProfile.SapforProfile;
import GlobalData.SapforProfileSetting.SapforProfileSetting;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.util.Vector;
public class ApplyProfile extends Pass_2021 {
diff --git a/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java b/src/Common/Passes/All/ArchivesBackupPass.java
similarity index 95%
rename from src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
rename to src/Common/Passes/All/ArchivesBackupPass.java
index d8d9b94c..811ce6b4 100644
--- a/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
+++ b/src/Common/Passes/All/ArchivesBackupPass.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import GlobalData.Machine.Machine;
import GlobalData.RemoteFile.RemoteFile;
import GlobalData.User.User;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass;
+import Common.Passes.SSH.ConnectionPass;
import com.jcraft.jsch.ChannelSftp;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/BuildComponent.java b/src/Common/Passes/All/BuildComponent.java
similarity index 86%
rename from src/Visual_DVM_2021/Passes/All/BuildComponent.java
rename to src/Common/Passes/All/BuildComponent.java
index 396039a4..0b63e01a 100644
--- a/src/Visual_DVM_2021/Passes/All/BuildComponent.java
+++ b/src/Common/Passes/All/BuildComponent.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Utils.Utils;
-import Repository.Component.Component;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.ProcessPass;
+import Repository.ComponentsServer.Component.Component;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
+import Common.Passes.ProcessPass;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
diff --git a/src/Visual_DVM_2021/Passes/All/CheckAccount.java b/src/Common/Passes/All/CheckAccount.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/CheckAccount.java
rename to src/Common/Passes/All/CheckAccount.java
index 0f5b6689..f8cea074 100644
--- a/src/Visual_DVM_2021/Passes/All/CheckAccount.java
+++ b/src/Common/Passes/All/CheckAccount.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
public class CheckAccount extends Pass_2021 {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java b/src/Common/Passes/All/CheckRegistrationOnServer.java
similarity index 62%
rename from src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java
rename to src/Common/Passes/All/CheckRegistrationOnServer.java
index 579367cc..ea192076 100644
--- a/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java
+++ b/src/Common/Passes/All/CheckRegistrationOnServer.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Common.Passes.Server.ComponentsRepositoryPass;
public class CheckRegistrationOnServer extends ComponentsRepositoryPass {
@Override
protected void ServerAction() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java b/src/Common/Passes/All/CheckRemoteWorkspace.java
similarity index 73%
rename from src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java
rename to src/Common/Passes/All/CheckRemoteWorkspace.java
index 280c9b41..1acedf36 100644
--- a/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java
+++ b/src/Common/Passes/All/CheckRemoteWorkspace.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.SubscriberWorkspace.SubscriberWorkspace;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
+import Common.Passes.Server.ComponentsRepositoryPass;
public class CheckRemoteWorkspace extends ComponentsRepositoryPass {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java b/src/Common/Passes/All/CleanAnalyses.java
similarity index 91%
rename from src/Visual_DVM_2021/Passes/All/CleanAnalyses.java
rename to src/Common/Passes/All/CleanAnalyses.java
index 75cdef1a..97a1f5a4 100644
--- a/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java
+++ b/src/Common/Passes/All/CleanAnalyses.java
@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
+import Common.Passes.CurrentProjectPass;
public class CleanAnalyses extends CurrentProjectPass {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/CloseBugReport.java b/src/Common/Passes/All/CloseBugReport.java
similarity index 80%
rename from src/Visual_DVM_2021/Passes/All/CloseBugReport.java
rename to src/Common/Passes/All/CloseBugReport.java
index 2134b412..53e9593c 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseBugReport.java
+++ b/src/Common/Passes/All/CloseBugReport.java
@@ -1,5 +1,5 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.BugReport.BugReportState;
+package Common.Passes.All;
+import Repository.ComponentsServer.Component.BugReport.BugReportState;
public class CloseBugReport extends UpdateBugReportField {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java b/src/Common/Passes/All/CloseCurrentFile.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
rename to src/Common/Passes/All/CloseCurrentFile.java
index 4a567a32..3c21d77a 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
+++ b/src/Common/Passes/All/CloseCurrentFile.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import javax.swing.*;
public class CloseCurrentFile extends Pass_2021 {
diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java b/src/Common/Passes/All/CloseCurrentProject.java
similarity index 94%
rename from src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
rename to src/Common/Passes/All/CloseCurrentProject.java
index adfe9fa5..59c93857 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
+++ b/src/Common/Passes/All/CloseCurrentProject.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import javax.swing.*;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/CloseProject.java b/src/Common/Passes/All/CloseProject.java
similarity index 89%
rename from src/Visual_DVM_2021/Passes/All/CloseProject.java
rename to src/Common/Passes/All/CloseProject.java
index 5518e405..4ede991d 100644
--- a/src/Visual_DVM_2021/Passes/All/CloseProject.java
+++ b/src/Common/Passes/All/CloseProject.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
import java.io.File;
public class CloseProject extends Pass_2021 {
diff --git a/src/Visual_DVM_2021/Passes/All/CombineFiles.java b/src/Common/Passes/All/CombineFiles.java
similarity index 95%
rename from src/Visual_DVM_2021/Passes/All/CombineFiles.java
rename to src/Common/Passes/All/CombineFiles.java
index 08052557..d9678ef8 100644
--- a/src/Visual_DVM_2021/Passes/All/CombineFiles.java
+++ b/src/Common/Passes/All/CombineFiles.java
@@ -1,12 +1,12 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import Common.UI.Windows.Dialog.Text.ComboTextDialog;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
-import Repository.Component.Sapfor.TransformationPermission;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Transformation;
-import Visual_DVM_2021.UI.Main.CombineFilesDialog;
+import Repository.ComponentsServer.Component.Sapfor.TransformationPermission;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Transformation;
+import Common.UI.Windows.Main.CombineFilesDialog;
import org.apache.commons.io.FileUtils;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/Compile.java b/src/Common/Passes/All/Compile.java
similarity index 95%
rename from src/Visual_DVM_2021/Passes/All/Compile.java
rename to src/Common/Passes/All/Compile.java
index 9e7423b4..a07339b7 100644
--- a/src/Visual_DVM_2021/Passes/All/Compile.java
+++ b/src/Common/Passes/All/Compile.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
@@ -8,9 +8,9 @@ import GlobalData.Tasks.TaskState;
import GlobalData.User.UserState;
import ProjectData.LanguageName;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
+import Common.Passes.Pass_2021;
public class Compile extends Pass_2021 {
Pass_2021 subpass = null;
CompilationTask compilationTask = null;
diff --git a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java b/src/Common/Passes/All/ConvertCorrectnessTests.java
similarity index 91%
rename from src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
rename to src/Common/Passes/All/ConvertCorrectnessTests.java
index 6bced39e..854e84d8 100644
--- a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
+++ b/src/Common/Passes/All/ConvertCorrectnessTests.java
@@ -1,15 +1,15 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Project.db_project_info;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.Test.Test;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.Common.Group.Group;
+import Repository.TestingSystem.Common.Test.Test;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Server.TestingSystemPass;
import org.apache.commons.io.FileUtils;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/CopyProject.java b/src/Common/Passes/All/CopyProject.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/CopyProject.java
rename to src/Common/Passes/All/CopyProject.java
index 0090d605..cde29b66 100644
--- a/src/Visual_DVM_2021/Passes/All/CopyProject.java
+++ b/src/Common/Passes/All/CopyProject.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import Common.UI.UI;
import Common.UI.Windows.Dialog.Dialog;
import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.UI.CopyProjectFields;
+import Common.Passes.CurrentProjectPass;
+import Common.Passes.PassCode_2021;
+import Common.Passes.UI.CopyProjectFields;
import org.apache.commons.io.FileUtils;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateComponentBackUp.java b/src/Common/Passes/All/CreateComponentBackUp.java
similarity index 83%
rename from src/Visual_DVM_2021/Passes/All/CreateComponentBackUp.java
rename to src/Common/Passes/All/CreateComponentBackUp.java
index 23fed722..8e7f7653 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateComponentBackUp.java
+++ b/src/Common/Passes/All/CreateComponentBackUp.java
@@ -1,5 +1,5 @@
-package Visual_DVM_2021.Passes.All;
-import Visual_DVM_2021.Passes.CurrentComponentPass;
+package Common.Passes.All;
+import Common.Passes.CurrentComponentPass;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java b/src/Common/Passes/All/CreateEmptyDirectory.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
rename to src/Common/Passes/All/CreateEmptyDirectory.java
index 50a5e2e0..3d54d3af 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java
+++ b/src/Common/Passes/All/CreateEmptyDirectory.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Constants;
import Common.Current;
import Common.UI.UI;
import Common.UI.Windows.Dialog.Text.FileNameForm;
import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.ChangeFilePass;
-import Visual_DVM_2021.Passes.PassException;
+import Common.Passes.ChangeFilePass;
+import Common.Passes.PassException;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java b/src/Common/Passes/All/CreateEmptyProject.java
similarity index 89%
rename from src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
rename to src/Common/Passes/All/CreateEmptyProject.java
index d4886604..87e1adf9 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
+++ b/src/Common/Passes/All/CreateEmptyProject.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Constants;
import Common.Global;
import Common.UI.Windows.Dialog.Text.FileNameForm;
import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
+import Common.Passes.Pass_2021;
import java.io.File;
import java.nio.file.Paths;
diff --git a/src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java b/src/Common/Passes/All/CreateParallelVariants.java
similarity index 84%
rename from src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java
rename to src/Common/Passes/All/CreateParallelVariants.java
index cc29012d..d1b0b7a9 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java
+++ b/src/Common/Passes/All/CreateParallelVariants.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.UI.UI;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.VariantsMassPass;
+import Common.Passes.PassCode_2021;
+import Common.Passes.VariantsMassPass;
public class CreateParallelVariants extends VariantsMassPass {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/CreateParallelVariantsCoverageForScenario.java b/src/Common/Passes/All/CreateParallelVariantsCoverageForScenario.java
similarity index 90%
rename from src/Visual_DVM_2021/Passes/All/CreateParallelVariantsCoverageForScenario.java
rename to src/Common/Passes/All/CreateParallelVariantsCoverageForScenario.java
index 086cb326..c59b8359 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateParallelVariantsCoverageForScenario.java
+++ b/src/Common/Passes/All/CreateParallelVariantsCoverageForScenario.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import ProjectData.SapforData.Variants.ParallelVariant;
-import Repository.Component.Sapfor.Sapfor;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ComponentsServer.Component.Sapfor.Sapfor;
+import Common.Passes.CurrentProjectPass;
+import Common.Passes.PassCode_2021;
public class CreateParallelVariantsCoverageForScenario extends CurrentProjectPass {
@Override
public void Interrupt() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Common/Passes/All/CreateTestsGroupFromSelectedVersions.java
similarity index 95%
rename from src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
rename to src/Common/Passes/All/CreateTestsGroupFromSelectedVersions.java
index 51e15570..2f99444a 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/Common/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -1,14 +1,14 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Project.db_project_info;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.Test.Test;
-import TestingSystem.Common.Test.TestType;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Repository.TestingSystem.Common.Group.Group;
+import Repository.TestingSystem.Common.Test.Test;
+import Repository.TestingSystem.Common.Test.TestType;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.util.Vector;
public class CreateTestsGroupFromSelectedVersions extends Pass_2021> {
diff --git a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java b/src/Common/Passes/All/DVMConvertProject.java
similarity index 96%
rename from src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
rename to src/Common/Passes/All/DVMConvertProject.java
index ecb59215..8e8e81fa 100644
--- a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
+++ b/src/Common/Passes/All/DVMConvertProject.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.Menus_2023.PassMenuItem;
@@ -7,10 +7,10 @@ import Common.Utils.Utils;
import GlobalData.Settings.SettingName;
import ProjectData.Files.DBProjectFile;
import ProjectData.Project.db_project_info;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
import org.apache.commons.io.FileUtils;
import javax.swing.*;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java b/src/Common/Passes/All/DeleteBugReport.java
similarity index 80%
rename from src/Visual_DVM_2021/Passes/All/DeleteBugReport.java
rename to src/Common/Passes/All/DeleteBugReport.java
index e09cdfe9..5a50f61c 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java
+++ b/src/Common/Passes/All/DeleteBugReport.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
-import Repository.BugReport.BugReport;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Common.Passes.DeleteObjectPass;
+import Common.Passes.PassCode_2021;
public class DeleteBugReport extends DeleteObjectPass {
public DeleteBugReport() {
super(BugReport.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteBugReportFromServer.java b/src/Common/Passes/All/DeleteBugReportFromServer.java
similarity index 58%
rename from src/Visual_DVM_2021/Passes/All/DeleteBugReportFromServer.java
rename to src/Common/Passes/All/DeleteBugReportFromServer.java
index 9635bb82..2bd766d7 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteBugReportFromServer.java
+++ b/src/Common/Passes/All/DeleteBugReportFromServer.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.BugReport.BugReport;
-import Repository.BugReport.BugReportState;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+package Common.Passes.All;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Component.BugReport.BugReportState;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
public class DeleteBugReportFromServer extends ComponentsRepositoryPass {
@Override
protected boolean canStart(Object... args) {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java b/src/Common/Passes/All/DeleteCompiler.java
similarity index 78%
rename from src/Visual_DVM_2021/Passes/All/DeleteCompiler.java
rename to src/Common/Passes/All/DeleteCompiler.java
index 5d885905..42dc5e8d 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java
+++ b/src/Common/Passes/All/DeleteCompiler.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.Compiler.Compiler;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
public class DeleteCompiler extends DeleteObjectPass {
public DeleteCompiler() {
super(Compiler.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java b/src/Common/Passes/All/DeleteDVMParameter.java
similarity index 79%
rename from src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java
rename to src/Common/Passes/All/DeleteDVMParameter.java
index 37d6f196..a37950d4 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java
+++ b/src/Common/Passes/All/DeleteDVMParameter.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.DVMParameter.DVMParameter;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
public class DeleteDVMParameter extends DeleteObjectPass {
public DeleteDVMParameter() {
super(DVMParameter.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java b/src/Common/Passes/All/DeleteDebugResults.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java
rename to src/Common/Passes/All/DeleteDebugResults.java
index 245cdb82..952531ad 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java
+++ b/src/Common/Passes/All/DeleteDebugResults.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import GlobalData.Tasks.Task;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
+import Common.Passes.CurrentProjectPass;
import java.util.Vector;
import java.util.stream.Collectors;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java b/src/Common/Passes/All/DeleteDirectory.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
rename to src/Common/Passes/All/DeleteDirectory.java
index 3a0d00e2..7bf35a25 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
+++ b/src/Common/Passes/All/DeleteDirectory.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.ChangeFilePass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
+import Common.Passes.ChangeFilePass;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
import org.apache.commons.io.FileUtils;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java b/src/Common/Passes/All/DeleteDownloadedBugReports.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
rename to src/Common/Passes/All/DeleteDownloadedBugReports.java
index 584b677d..3ea6c072 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
+++ b/src/Common/Passes/All/DeleteDownloadedBugReports.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.io.File;
import java.util.Arrays;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java b/src/Common/Passes/All/DeleteEnvironmentValue.java
similarity index 80%
rename from src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java
rename to src/Common/Passes/All/DeleteEnvironmentValue.java
index 9203e0fb..afe8da23 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java
+++ b/src/Common/Passes/All/DeleteEnvironmentValue.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.EnvironmentValue.EnvironmentValue;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
public class DeleteEnvironmentValue extends DeleteObjectPass {
public DeleteEnvironmentValue() {
super(EnvironmentValue.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteFile.java b/src/Common/Passes/All/DeleteFile.java
similarity index 90%
rename from src/Visual_DVM_2021/Passes/All/DeleteFile.java
rename to src/Common/Passes/All/DeleteFile.java
index 25764e00..a1623bae 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteFile.java
+++ b/src/Common/Passes/All/DeleteFile.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.ChangeFilePass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Common.Passes.ChangeFilePass;
+import Common.Passes.PassCode_2021;
public class DeleteFile extends ChangeFilePass {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteGroup.java b/src/Common/Passes/All/DeleteGroup.java
similarity index 50%
rename from src/Visual_DVM_2021/Passes/All/DeleteGroup.java
rename to src/Common/Passes/All/DeleteGroup.java
index dd1f1462..05f99071 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteGroup.java
+++ b/src/Common/Passes/All/DeleteGroup.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+import Repository.TestingSystem.Common.Group.Group;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.Server.DeleteServerObject;
public class DeleteGroup extends DeleteServerObject {
public DeleteGroup() {
super(Global.testingServer, Group.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java b/src/Common/Passes/All/DeleteLonelyM.java
similarity index 84%
rename from src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java
rename to src/Common/Passes/All/DeleteLonelyM.java
index 223968f0..a2ef59c8 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java
+++ b/src/Common/Passes/All/DeleteLonelyM.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.util.Vector;
public class DeleteLonelyM extends Pass_2021 {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteMachine.java b/src/Common/Passes/All/DeleteMachine.java
similarity index 78%
rename from src/Visual_DVM_2021/Passes/All/DeleteMachine.java
rename to src/Common/Passes/All/DeleteMachine.java
index 6444f899..fece1743 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteMachine.java
+++ b/src/Common/Passes/All/DeleteMachine.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.Machine.Machine;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
public class DeleteMachine extends DeleteObjectPass {
public DeleteMachine() {
super(Machine.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java b/src/Common/Passes/All/DeleteMakefile.java
similarity index 78%
rename from src/Visual_DVM_2021/Passes/All/DeleteMakefile.java
rename to src/Common/Passes/All/DeleteMakefile.java
index 43d47543..590d0fb5 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java
+++ b/src/Common/Passes/All/DeleteMakefile.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.Makefile.Makefile;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
public class DeleteMakefile extends DeleteObjectPass {
public DeleteMakefile() {
super(Makefile.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteProfile.java b/src/Common/Passes/All/DeleteProfile.java
similarity index 79%
rename from src/Visual_DVM_2021/Passes/All/DeleteProfile.java
rename to src/Common/Passes/All/DeleteProfile.java
index a711cb67..8e8a0a8e 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteProfile.java
+++ b/src/Common/Passes/All/DeleteProfile.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.SapforProfile.SapforProfile;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
public class DeleteProfile extends DeleteObjectPass {
public DeleteProfile() {
super(SapforProfile.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java b/src/Common/Passes/All/DeleteRunConfiguration.java
similarity index 80%
rename from src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java
rename to src/Common/Passes/All/DeleteRunConfiguration.java
index bb1ae521..76f8efba 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java
+++ b/src/Common/Passes/All/DeleteRunConfiguration.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.RunConfiguration.RunConfiguration;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
public class DeleteRunConfiguration extends DeleteObjectPass {
public DeleteRunConfiguration() {
super(RunConfiguration.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java b/src/Common/Passes/All/DeleteSapforConfiguration.java
similarity index 53%
rename from src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java
rename to src/Common/Passes/All/DeleteSapforConfiguration.java
index 8f756384..0baa29a9 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java
+++ b/src/Common/Passes/All/DeleteSapforConfiguration.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+import Repository.TestingSystem.Common.TestingServer;
+import Repository.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import Common.Passes.Server.DeleteServerObject;
public class DeleteSapforConfiguration extends DeleteServerObject {
public DeleteSapforConfiguration() {
super(Global.testingServer, SapforConfiguration.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java b/src/Common/Passes/All/DeleteSapforConfigurationCommand.java
similarity index 54%
rename from src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
rename to src/Common/Passes/All/DeleteSapforConfigurationCommand.java
index c7ba4f1e..8d05ff44 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
+++ b/src/Common/Passes/All/DeleteSapforConfigurationCommand.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+import Repository.TestingSystem.Common.TestingServer;
+import Repository.TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
+import Common.Passes.Server.DeleteServerObject;
public class DeleteSapforConfigurationCommand extends DeleteServerObject {
public DeleteSapforConfigurationCommand() {
super(Global.testingServer, SapforConfigurationCommand.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java b/src/Common/Passes/All/DeleteSapforTasksPackage.java
similarity index 81%
rename from src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
rename to src/Common/Passes/All/DeleteSapforTasksPackage.java
index b1e09e86..5fc5975b 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
+++ b/src/Common/Passes/All/DeleteSapforTasksPackage.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.UI.UI;
import Common.Utils.Utils;
-import TestingSystem.DVM.TasksPackage.TasksPackageState;
-import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
-import Visual_DVM_2021.Passes.Server.DeleteServerAccountObject;
+import Repository.TestingSystem.DVM.TasksPackage.TasksPackageState;
+import Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import Common.Passes.Server.DeleteServerAccountObject;
public class DeleteSapforTasksPackage extends DeleteServerAccountObject {
public DeleteSapforTasksPackage() {
super(SapforTasksPackage.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java b/src/Common/Passes/All/DeleteSelectedCompilationTasks.java
similarity index 95%
rename from src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java
rename to src/Common/Passes/All/DeleteSelectedCompilationTasks.java
index 14539e7e..ff9b5dc1 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java
+++ b/src/Common/Passes/All/DeleteSelectedCompilationTasks.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import GlobalData.Tasks.CompilationTask.CompilationTask;
import GlobalData.Tasks.RunTask.RunTask;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
import java.util.Vector;
public class DeleteSelectedCompilationTasks extends Pass_2021> {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java b/src/Common/Passes/All/DeleteSelectedConfigurations.java
similarity index 52%
rename from src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java
rename to src/Common/Passes/All/DeleteSelectedConfigurations.java
index cff56ce4..91b5f948 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedConfigurations.java
+++ b/src/Common/Passes/All/DeleteSelectedConfigurations.java
@@ -1,6 +1,6 @@
-package Visual_DVM_2021.Passes.All;
-import TestingSystem.DVM.Configuration.Configuration;
-import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
+package Common.Passes.All;
+import Repository.TestingSystem.DVM.Configuration.Configuration;
+import Common.Passes.DeleteSelectedServerObjects;
public class DeleteSelectedConfigurations extends DeleteSelectedServerObjects {
public DeleteSelectedConfigurations() {
super(Configuration.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java b/src/Common/Passes/All/DeleteSelectedFiles.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
rename to src/Common/Passes/All/DeleteSelectedFiles.java
index 2610cf6d..de4c1953 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
+++ b/src/Common/Passes/All/DeleteSelectedFiles.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
public class DeleteSelectedFiles extends Pass_2021 {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java b/src/Common/Passes/All/DeleteSelectedRunTasks.java
similarity index 94%
rename from src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java
rename to src/Common/Passes/All/DeleteSelectedRunTasks.java
index 55e4b567..efc09a81 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java
+++ b/src/Common/Passes/All/DeleteSelectedRunTasks.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import GlobalData.Tasks.RunTask.RunTask;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
import java.util.Vector;
public class DeleteSelectedRunTasks extends Pass_2021> {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java b/src/Common/Passes/All/DeleteSelectedVersions.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
rename to src/Common/Passes/All/DeleteSelectedVersions.java
index 4a0d76f3..05dbe867 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
+++ b/src/Common/Passes/All/DeleteSelectedVersions.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.util.Vector;
public class DeleteSelectedVersions extends Pass_2021> {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java b/src/Common/Passes/All/DeleteServerSapfor.java
similarity index 51%
rename from src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
rename to src/Common/Passes/All/DeleteServerSapfor.java
index ec5d8419..b8e6ae12 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
+++ b/src/Common/Passes/All/DeleteServerSapfor.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
-import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
-import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+import Repository.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.Server.DeleteServerObject;
public class DeleteServerSapfor extends DeleteServerObject {
public DeleteServerSapfor() {
super(Global.testingServer, ServerSapfor.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java b/src/Common/Passes/All/DeleteSubscriber.java
similarity index 73%
rename from src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java
rename to src/Common/Passes/All/DeleteSubscriber.java
index b81e8aa0..6775ed2c 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java
+++ b/src/Common/Passes/All/DeleteSubscriber.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Common.Passes.DeleteObjectPass;
+import Common.Passes.PassCode_2021;
public class DeleteSubscriber extends DeleteObjectPass {
public DeleteSubscriber() {
super(Subscriber.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java b/src/Common/Passes/All/DeleteSubscriberOnServer.java
similarity index 67%
rename from src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java
rename to src/Common/Passes/All/DeleteSubscriberOnServer.java
index 42f2e8fb..9cd4e8db 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java
+++ b/src/Common/Passes/All/DeleteSubscriberOnServer.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+package Common.Passes.All;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
public class DeleteSubscriberOnServer extends ComponentsRepositoryPass {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSubversions.java b/src/Common/Passes/All/DeleteSubversions.java
similarity index 78%
rename from src/Visual_DVM_2021/Passes/All/DeleteSubversions.java
rename to src/Common/Passes/All/DeleteSubversions.java
index 430214e6..82eb7e25 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSubversions.java
+++ b/src/Common/Passes/All/DeleteSubversions.java
@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Common.Passes.CurrentProjectPass;
+import Common.Passes.PassCode_2021;
import java.util.Vector;
public class DeleteSubversions extends CurrentProjectPass {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteTest.java b/src/Common/Passes/All/DeleteTest.java
similarity index 50%
rename from src/Visual_DVM_2021/Passes/All/DeleteTest.java
rename to src/Common/Passes/All/DeleteTest.java
index 41c403aa..ffa29014 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteTest.java
+++ b/src/Common/Passes/All/DeleteTest.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
-import TestingSystem.Common.Test.Test;
-import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
+import Repository.TestingSystem.Common.Test.Test;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.Server.DeleteServerObject;
public class DeleteTest extends DeleteServerObject {
public DeleteTest() {
super(Global.testingServer, Test.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteUser.java b/src/Common/Passes/All/DeleteUser.java
similarity index 76%
rename from src/Visual_DVM_2021/Passes/All/DeleteUser.java
rename to src/Common/Passes/All/DeleteUser.java
index dcce3a7f..d1b4b484 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteUser.java
+++ b/src/Common/Passes/All/DeleteUser.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.User.User;
-import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Common.Passes.DeleteObjectPass;
public class DeleteUser extends DeleteObjectPass {
public DeleteUser() {
super(User.class);
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java b/src/Common/Passes/All/DeleteVersion.java
similarity index 94%
rename from src/Visual_DVM_2021/Passes/All/DeleteVersion.java
rename to src/Common/Passes/All/DeleteVersion.java
index 81dedd9d..24622ffd 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java
+++ b/src/Common/Passes/All/DeleteVersion.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
public class DeleteVersion extends Pass_2021 {
db_project_info parent;
boolean current;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java b/src/Common/Passes/All/DownloadAllBugReportsArchives.java
similarity index 89%
rename from src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java
rename to src/Common/Passes/All/DownloadAllBugReportsArchives.java
index 9fa13565..1232cd9e 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java
+++ b/src/Common/Passes/All/DownloadAllBugReportsArchives.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.Utils.Utils;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
import org.apache.commons.io.FileUtils;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java b/src/Common/Passes/All/DownloadBugReport.java
similarity index 73%
rename from src/Visual_DVM_2021/Passes/All/DownloadBugReport.java
rename to src/Common/Passes/All/DownloadBugReport.java
index 10252b7f..dabd6fd6 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java
+++ b/src/Common/Passes/All/DownloadBugReport.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import Common.Utils.Utils;
-import Repository.BugReport.BugReport;
-import Repository.BugReport.BugReportInterface;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Component.BugReport.BugReportInterface;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
public class DownloadBugReport extends ComponentsRepositoryPass {
@Override
protected boolean canStart(Object... args) {
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadComponent.java b/src/Common/Passes/All/DownloadComponent.java
similarity index 67%
rename from src/Visual_DVM_2021/Passes/All/DownloadComponent.java
rename to src/Common/Passes/All/DownloadComponent.java
index 2bf6a464..e9e26cf5 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadComponent.java
+++ b/src/Common/Passes/All/DownloadComponent.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Utils.Utils;
-import Repository.Component.Component;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Repository.ComponentsServer.Component.Component;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
public class DownloadComponent extends ComponentsRepositoryPass {
@Override
protected void ServerAction() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadProject.java b/src/Common/Passes/All/DownloadProject.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/DownloadProject.java
rename to src/Common/Passes/All/DownloadProject.java
index f62e44ae..d05d97e6 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadProject.java
+++ b/src/Common/Passes/All/DownloadProject.java
@@ -1,12 +1,12 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import GlobalData.RemoteFile.RemoteFile;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
+import Common.Passes.SSH.CurrentConnectionPass;
import java.io.File;
import java.nio.file.Paths;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadRepository.java b/src/Common/Passes/All/DownloadRepository.java
similarity index 94%
rename from src/Visual_DVM_2021/Passes/All/DownloadRepository.java
rename to src/Common/Passes/All/DownloadRepository.java
index 5021c1ce..df002017 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadRepository.java
+++ b/src/Common/Passes/All/DownloadRepository.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Constants;
import Common.Global;
import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.ProcessPass;
+import Common.Passes.ProcessPass;
import org.apache.commons.io.FileUtils;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java b/src/Common/Passes/All/DownloadSapforTasksPackage.java
similarity index 82%
rename from src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
rename to src/Common/Passes/All/DownloadSapforTasksPackage.java
index 1759be54..0902ef41 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
+++ b/src/Common/Passes/All/DownloadSapforTasksPackage.java
@@ -1,12 +1,12 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Utils.Utils;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.DVM.TasksPackage.TasksPackageState;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
+import Repository.TestingSystem.DVM.TasksPackage.TasksPackageState;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Server.TestingSystemPass;
import java.io.File;
public class DownloadSapforTasksPackage extends TestingSystemPass {
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java b/src/Common/Passes/All/DownloadTaskTest.java
similarity index 81%
rename from src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java
rename to src/Common/Passes/All/DownloadTaskTest.java
index 217ae78a..70651d72 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java
+++ b/src/Common/Passes/All/DownloadTaskTest.java
@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
-import TestingSystem.DVM.Tasks.TestRunTask;
-import TestingSystem.Common.Test.Test;
+import Repository.TestingSystem.DVM.Tasks.TestRunTask;
+import Repository.TestingSystem.Common.Test.Test;
public class DownloadTaskTest extends DownloadTest {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTest.java b/src/Common/Passes/All/DownloadTest.java
similarity index 87%
rename from src/Visual_DVM_2021/Passes/All/DownloadTest.java
rename to src/Common/Passes/All/DownloadTest.java
index 7b57005a..485f8420 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadTest.java
+++ b/src/Common/Passes/All/DownloadTest.java
@@ -1,13 +1,13 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Common.Test.Test;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.Common.Test.Test;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Server.TestingSystemPass;
public class DownloadTest extends TestingSystemPass {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/DropAnalyses.java b/src/Common/Passes/All/DropAnalyses.java
similarity index 76%
rename from src/Visual_DVM_2021/Passes/All/DropAnalyses.java
rename to src/Common/Passes/All/DropAnalyses.java
index 9afad1c7..25b996f0 100644
--- a/src/Visual_DVM_2021/Passes/All/DropAnalyses.java
+++ b/src/Common/Passes/All/DropAnalyses.java
@@ -1,7 +1,6 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
-import Common.UI.UI;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
+import Common.Passes.CurrentProjectPass;
public class DropAnalyses extends CurrentProjectPass {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DropFastAccess.java b/src/Common/Passes/All/DropFastAccess.java
similarity index 86%
rename from src/Visual_DVM_2021/Passes/All/DropFastAccess.java
rename to src/Common/Passes/All/DropFastAccess.java
index be17be18..8bd61846 100644
--- a/src/Visual_DVM_2021/Passes/All/DropFastAccess.java
+++ b/src/Common/Passes/All/DropFastAccess.java
@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import Common.UI.UI;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
public class DropFastAccess extends Pass_2021 {
@Override
public String getButtonText() {
diff --git a/src/Visual_DVM_2021/Passes/All/DropLastProjects.java b/src/Common/Passes/All/DropLastProjects.java
similarity index 75%
rename from src/Visual_DVM_2021/Passes/All/DropLastProjects.java
rename to src/Common/Passes/All/DropLastProjects.java
index 0ed0ec9f..543d6053 100644
--- a/src/Visual_DVM_2021/Passes/All/DropLastProjects.java
+++ b/src/Common/Passes/All/DropLastProjects.java
@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import GlobalData.DBLastProject.DBLastProject;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
public class DropLastProjects extends Pass_2021 {
@Override
protected void body() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DropSavedArrays.java b/src/Common/Passes/All/DropSavedArrays.java
similarity index 81%
rename from src/Visual_DVM_2021/Passes/All/DropSavedArrays.java
rename to src/Common/Passes/All/DropSavedArrays.java
index 23d4b828..e7283e99 100644
--- a/src/Visual_DVM_2021/Passes/All/DropSavedArrays.java
+++ b/src/Common/Passes/All/DropSavedArrays.java
@@ -1,6 +1,6 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import ProjectData.DBArray.DBArray;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
+import Common.Passes.CurrentProjectPass;
public class DropSavedArrays extends CurrentProjectPass {
@Override
public String getButtonText() {
diff --git a/src/Visual_DVM_2021/Passes/All/EditAccount.java b/src/Common/Passes/All/EditAccount.java
similarity index 94%
rename from src/Visual_DVM_2021/Passes/All/EditAccount.java
rename to src/Common/Passes/All/EditAccount.java
index d2c62d86..3dfaa468 100644
--- a/src/Visual_DVM_2021/Passes/All/EditAccount.java
+++ b/src/Common/Passes/All/EditAccount.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import Repository.EmailMessage;
-import Repository.Subscribes.Subscriber;
-import Repository.Subscribes.UI.SubscriberForm;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Repository.ComponentsServer.Subscribes.UI.SubscriberForm;
import javax.swing.*;
import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/EditCompiler.java b/src/Common/Passes/All/EditCompiler.java
similarity index 78%
rename from src/Visual_DVM_2021/Passes/All/EditCompiler.java
rename to src/Common/Passes/All/EditCompiler.java
index e1f89438..05680203 100644
--- a/src/Visual_DVM_2021/Passes/All/EditCompiler.java
+++ b/src/Common/Passes/All/EditCompiler.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.Compiler.Compiler;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
public class EditCompiler extends EditObjectPass {
public EditCompiler() {
super(Compiler.class);
diff --git a/src/Visual_DVM_2021/Passes/All/EditConfiguration.java b/src/Common/Passes/All/EditConfiguration.java
similarity index 81%
rename from src/Visual_DVM_2021/Passes/All/EditConfiguration.java
rename to src/Common/Passes/All/EditConfiguration.java
index fa588f56..2e5891e5 100644
--- a/src/Visual_DVM_2021/Passes/All/EditConfiguration.java
+++ b/src/Common/Passes/All/EditConfiguration.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
-import TestingSystem.DVM.Configuration.Configuration;
-import Visual_DVM_2021.Passes.EditObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.TestingSystem.DVM.Configuration.Configuration;
+import Common.Passes.EditObjectPass;
+import Common.Passes.PassCode_2021;
public class EditConfiguration extends EditObjectPass {
public EditConfiguration() {
super(Configuration.class);
diff --git a/src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java b/src/Common/Passes/All/EditConfigurationOnServer.java
similarity index 62%
rename from src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java
rename to src/Common/Passes/All/EditConfigurationOnServer.java
index 303e7897..7235d7c4 100644
--- a/src/Visual_DVM_2021/Passes/All/EditConfigurationOnServer.java
+++ b/src/Common/Passes/All/EditConfigurationOnServer.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.DVM.Configuration.Configuration;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+package Common.Passes.All;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.DVM.Configuration.Configuration;
+import Common.Passes.Server.TestingSystemPass;
public class EditConfigurationOnServer extends TestingSystemPass {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java b/src/Common/Passes/All/EditDVMParameter.java
similarity index 79%
rename from src/Visual_DVM_2021/Passes/All/EditDVMParameter.java
rename to src/Common/Passes/All/EditDVMParameter.java
index 4201adc3..238aff97 100644
--- a/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java
+++ b/src/Common/Passes/All/EditDVMParameter.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.DVMParameter.DVMParameter;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
public class EditDVMParameter extends EditObjectPass {
public EditDVMParameter() {
super(DVMParameter.class);
diff --git a/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java b/src/Common/Passes/All/EditEnvironmentValue.java
similarity index 80%
rename from src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java
rename to src/Common/Passes/All/EditEnvironmentValue.java
index f261c259..2ab9f358 100644
--- a/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java
+++ b/src/Common/Passes/All/EditEnvironmentValue.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.EnvironmentValue.EnvironmentValue;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
public class EditEnvironmentValue extends EditObjectPass {
public EditEnvironmentValue() {
super(EnvironmentValue.class);
diff --git a/src/Common/Passes/All/EditGroup.java b/src/Common/Passes/All/EditGroup.java
new file mode 100644
index 00000000..84ac694e
--- /dev/null
+++ b/src/Common/Passes/All/EditGroup.java
@@ -0,0 +1,10 @@
+package Common.Passes.All;
+import Common.Global;
+import Repository.TestingSystem.Common.Group.Group;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.Server.EditServerObject;
+public class EditGroup extends EditServerObject {
+ public EditGroup() {
+ super(Global.testingServer, Group.class);
+ }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/EditMachine.java b/src/Common/Passes/All/EditMachine.java
similarity index 78%
rename from src/Visual_DVM_2021/Passes/All/EditMachine.java
rename to src/Common/Passes/All/EditMachine.java
index 20a6a0df..d40b307a 100644
--- a/src/Visual_DVM_2021/Passes/All/EditMachine.java
+++ b/src/Common/Passes/All/EditMachine.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.Machine.Machine;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
public class EditMachine extends EditObjectPass {
public EditMachine() {
super(Machine.class);
diff --git a/src/Visual_DVM_2021/Passes/All/EditMakefile.java b/src/Common/Passes/All/EditMakefile.java
similarity index 78%
rename from src/Visual_DVM_2021/Passes/All/EditMakefile.java
rename to src/Common/Passes/All/EditMakefile.java
index c46102de..5018f4e2 100644
--- a/src/Visual_DVM_2021/Passes/All/EditMakefile.java
+++ b/src/Common/Passes/All/EditMakefile.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.Makefile.Makefile;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
public class EditMakefile extends EditObjectPass {
public EditMakefile() {
super(Makefile.class);
diff --git a/src/Visual_DVM_2021/Passes/All/EditModule.java b/src/Common/Passes/All/EditModule.java
similarity index 77%
rename from src/Visual_DVM_2021/Passes/All/EditModule.java
rename to src/Common/Passes/All/EditModule.java
index 62d9745e..f1267693 100644
--- a/src/Visual_DVM_2021/Passes/All/EditModule.java
+++ b/src/Common/Passes/All/EditModule.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.Module.Module;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
public class EditModule extends EditObjectPass {
public EditModule() {
super(Module.class);
diff --git a/src/Visual_DVM_2021/Passes/All/EditProfile.java b/src/Common/Passes/All/EditProfile.java
similarity index 79%
rename from src/Visual_DVM_2021/Passes/All/EditProfile.java
rename to src/Common/Passes/All/EditProfile.java
index 21ee60d1..ca0d6833 100644
--- a/src/Visual_DVM_2021/Passes/All/EditProfile.java
+++ b/src/Common/Passes/All/EditProfile.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.SapforProfile.SapforProfile;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
public class EditProfile extends EditObjectPass {
public EditProfile() {
super(SapforProfile.class);
diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java b/src/Common/Passes/All/EditProjectCompilationMaxtime.java
similarity index 90%
rename from src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java
rename to src/Common/Passes/All/EditProjectCompilationMaxtime.java
index 984eafb8..5a08056a 100644
--- a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java
+++ b/src/Common/Passes/All/EditProjectCompilationMaxtime.java
@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.Windows.Dialog.SessionMaxtimeDialog;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
+import Common.Passes.CurrentProjectPass;
public class EditProjectCompilationMaxtime extends CurrentProjectPass {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java b/src/Common/Passes/All/EditProjectRunMaxtime.java
similarity index 90%
rename from src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java
rename to src/Common/Passes/All/EditProjectRunMaxtime.java
index 6fd5e961..e484442c 100644
--- a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java
+++ b/src/Common/Passes/All/EditProjectRunMaxtime.java
@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.Windows.Dialog.SessionMaxtimeDialog;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
+import Common.Passes.CurrentProjectPass;
public class EditProjectRunMaxtime extends CurrentProjectPass {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java b/src/Common/Passes/All/EditRunConfiguration.java
similarity index 80%
rename from src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java
rename to src/Common/Passes/All/EditRunConfiguration.java
index 83fbd0ac..3bbdb7fd 100644
--- a/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java
+++ b/src/Common/Passes/All/EditRunConfiguration.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.RunConfiguration.RunConfiguration;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
public class EditRunConfiguration extends EditObjectPass {
public EditRunConfiguration() {
super(RunConfiguration.class);
diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java b/src/Common/Passes/All/EditSapforConfiguration.java
similarity index 52%
rename from src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java
rename to src/Common/Passes/All/EditSapforConfiguration.java
index 34f1024c..d111e493 100644
--- a/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java
+++ b/src/Common/Passes/All/EditSapforConfiguration.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import Visual_DVM_2021.Passes.Server.EditServerObject;
+import Repository.TestingSystem.Common.TestingServer;
+import Repository.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import Common.Passes.Server.EditServerObject;
public class EditSapforConfiguration extends EditServerObject {
public EditSapforConfiguration() {
super(Global.testingServer, SapforConfiguration.class);
diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java b/src/Common/Passes/All/EditSapforConfigurationCommand.java
similarity index 54%
rename from src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java
rename to src/Common/Passes/All/EditSapforConfigurationCommand.java
index b87c6d02..a710bd59 100644
--- a/src/Visual_DVM_2021/Passes/All/EditSapforConfigurationCommand.java
+++ b/src/Common/Passes/All/EditSapforConfigurationCommand.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
-import Visual_DVM_2021.Passes.Server.EditServerObject;
+import Repository.TestingSystem.Common.TestingServer;
+import Repository.TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
+import Common.Passes.Server.EditServerObject;
public class EditSapforConfigurationCommand extends EditServerObject {
public EditSapforConfigurationCommand() {
super(Global.testingServer,SapforConfigurationCommand.class);
diff --git a/src/Visual_DVM_2021/Passes/All/EditSubscriber.java b/src/Common/Passes/All/EditSubscriber.java
similarity index 82%
rename from src/Visual_DVM_2021/Passes/All/EditSubscriber.java
rename to src/Common/Passes/All/EditSubscriber.java
index 85e4feb8..8a0dddc2 100644
--- a/src/Visual_DVM_2021/Passes/All/EditSubscriber.java
+++ b/src/Common/Passes/All/EditSubscriber.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.EditObjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Common.Passes.EditObjectPass;
+import Common.Passes.PassCode_2021;
public class EditSubscriber extends EditObjectPass {
public EditSubscriber() {
super(Subscriber.class);
diff --git a/src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java b/src/Common/Passes/All/EditSubscriberOnServer.java
similarity index 72%
rename from src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java
rename to src/Common/Passes/All/EditSubscriberOnServer.java
index a0411732..5d4aed26 100644
--- a/src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java
+++ b/src/Common/Passes/All/EditSubscriberOnServer.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.Subscribes.Subscriber;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+package Common.Passes.All;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.ComponentsServer.Subscribes.Subscriber;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
public class EditSubscriberOnServer extends ComponentsRepositoryPass {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Common/Passes/All/EditTest.java b/src/Common/Passes/All/EditTest.java
new file mode 100644
index 00000000..5ffbe3ee
--- /dev/null
+++ b/src/Common/Passes/All/EditTest.java
@@ -0,0 +1,10 @@
+package Common.Passes.All;
+import Common.Global;
+import Repository.TestingSystem.Common.Test.Test;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.Server.EditServerObject;
+public class EditTest extends EditServerObject {
+ public EditTest() {
+ super(Global.testingServer, Test.class);
+ }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/EditUser.java b/src/Common/Passes/All/EditUser.java
similarity index 77%
rename from src/Visual_DVM_2021/Passes/All/EditUser.java
rename to src/Common/Passes/All/EditUser.java
index 4778b7d7..fd5c8c8c 100644
--- a/src/Visual_DVM_2021/Passes/All/EditUser.java
+++ b/src/Common/Passes/All/EditUser.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Database.Database;
import Common.Global;
import GlobalData.User.User;
-import Visual_DVM_2021.Passes.EditObjectPass;
+import Common.Passes.EditObjectPass;
public class EditUser extends EditObjectPass {
public EditUser() {
super(User.class);
diff --git a/src/Visual_DVM_2021/Passes/All/Email.java b/src/Common/Passes/All/Email.java
similarity index 86%
rename from src/Visual_DVM_2021/Passes/All/Email.java
rename to src/Common/Passes/All/Email.java
index 1f395a2f..e8eb223c 100644
--- a/src/Visual_DVM_2021/Passes/All/Email.java
+++ b/src/Common/Passes/All/Email.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Repository.EmailMessage;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
//http://java-online.ru/javax-mail.xhtml
//https://javarush.ru/groups/posts/1226-kak-otpravitjh-pisjhmo-iz-java-prilozhenija-s-primerom
public class Email extends ComponentsRepositoryPass {
diff --git a/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java b/src/Common/Passes/All/EraseBadSymbols.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java
rename to src/Common/Passes/All/EraseBadSymbols.java
index 1b571991..122c30f9 100644
--- a/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java
+++ b/src/Common/Passes/All/EraseBadSymbols.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.Transformation;
+import Common.Passes.Transformation;
import org.apache.commons.io.FileUtils;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/ExcludeFile.java b/src/Common/Passes/All/ExcludeFile.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/ExcludeFile.java
rename to src/Common/Passes/All/ExcludeFile.java
index 620680f3..9bd32739 100644
--- a/src/Visual_DVM_2021/Passes/All/ExcludeFile.java
+++ b/src/Common/Passes/All/ExcludeFile.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
import ProjectData.Files.DBProjectFile;
import ProjectData.Files.FileState;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
public class ExcludeFile extends Pass_2021 {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java b/src/Common/Passes/All/ExcludeSelectedFiles.java
similarity index 89%
rename from src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java
rename to src/Common/Passes/All/ExcludeSelectedFiles.java
index c79ac664..19ceb06e 100644
--- a/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java
+++ b/src/Common/Passes/All/ExcludeSelectedFiles.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.util.Vector;
public class ExcludeSelectedFiles extends Pass_2021> {
diff --git a/src/Visual_DVM_2021/Passes/All/ExtractRecipients.java b/src/Common/Passes/All/ExtractRecipients.java
similarity index 94%
rename from src/Visual_DVM_2021/Passes/All/ExtractRecipients.java
rename to src/Common/Passes/All/ExtractRecipients.java
index b8cb7396..30cdab05 100644
--- a/src/Visual_DVM_2021/Passes/All/ExtractRecipients.java
+++ b/src/Common/Passes/All/ExtractRecipients.java
@@ -1,5 +1,5 @@
-package Visual_DVM_2021.Passes.All;
-import Visual_DVM_2021.Passes.Pass_2021;
+package Common.Passes.All;
+import Common.Passes.Pass_2021;
import java.util.Vector;
public class ExtractRecipients extends Pass_2021 {
diff --git a/src/Visual_DVM_2021/Passes/All/FinishApplication.java b/src/Common/Passes/All/FinishApplication.java
similarity index 60%
rename from src/Visual_DVM_2021/Passes/All/FinishApplication.java
rename to src/Common/Passes/All/FinishApplication.java
index 98fb5140..2d13bc7f 100644
--- a/src/Visual_DVM_2021/Passes/All/FinishApplication.java
+++ b/src/Common/Passes/All/FinishApplication.java
@@ -1,5 +1,5 @@
-package Visual_DVM_2021.Passes.All;
-import Visual_DVM_2021.Passes.Pass_2021;
+package Common.Passes.All;
+import Common.Passes.Pass_2021;
public class FinishApplication extends Pass_2021 {
@Override
protected void body() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/GCOV.java b/src/Common/Passes/All/GCOV.java
similarity index 99%
rename from src/Visual_DVM_2021/Passes/All/GCOV.java
rename to src/Common/Passes/All/GCOV.java
index cb4fe298..93c874f9 100644
--- a/src/Visual_DVM_2021/Passes/All/GCOV.java
+++ b/src/Common/Passes/All/GCOV.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.Utils.Utils;
diff --git a/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java b/src/Common/Passes/All/GenerateParallelVariants.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
rename to src/Common/Passes/All/GenerateParallelVariants.java
index 1ef6cacb..653004ca 100644
--- a/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
+++ b/src/Common/Passes/All/GenerateParallelVariants.java
@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.UI.UI;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
+import Common.Passes.CurrentProjectPass;
+import Common.Passes.PassCode_2021;
import java.math.BigInteger;
public class GenerateParallelVariants extends CurrentProjectPass {
diff --git a/src/Visual_DVM_2021/Passes/All/GetComponentsActualVersions.java b/src/Common/Passes/All/GetComponentsActualVersions.java
similarity index 86%
rename from src/Visual_DVM_2021/Passes/All/GetComponentsActualVersions.java
rename to src/Common/Passes/All/GetComponentsActualVersions.java
index 995e17e3..aae616b6 100644
--- a/src/Visual_DVM_2021/Passes/All/GetComponentsActualVersions.java
+++ b/src/Common/Passes/All/GetComponentsActualVersions.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
-import Repository.Component.Component;
-import Repository.Component.ComponentType;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Repository.ComponentsServer.Component.Component;
+import Repository.ComponentsServer.Component.ComponentType;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
import java.util.LinkedHashMap;
import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java b/src/Common/Passes/All/GetComponentsBackupsFromServer.java
similarity index 83%
rename from src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java
rename to src/Common/Passes/All/GetComponentsBackupsFromServer.java
index b7000a18..3a7c8268 100644
--- a/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java
+++ b/src/Common/Passes/All/GetComponentsBackupsFromServer.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
import java.io.File;
import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/GetTestsQueueSize.java b/src/Common/Passes/All/GetTestsQueueSize.java
similarity index 81%
rename from src/Visual_DVM_2021/Passes/All/GetTestsQueueSize.java
rename to src/Common/Passes/All/GetTestsQueueSize.java
index 1927c861..4eed747c 100644
--- a/src/Visual_DVM_2021/Passes/All/GetTestsQueueSize.java
+++ b/src/Common/Passes/All/GetTestsQueueSize.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.TestingSystemPass;
public class GetTestsQueueSize extends TestingSystemPass {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/ImportFiles.java b/src/Common/Passes/All/ImportFiles.java
similarity index 86%
rename from src/Visual_DVM_2021/Passes/All/ImportFiles.java
rename to src/Common/Passes/All/ImportFiles.java
index be44554b..219bfc4a 100644
--- a/src/Visual_DVM_2021/Passes/All/ImportFiles.java
+++ b/src/Common/Passes/All/ImportFiles.java
@@ -1,7 +1,7 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Utils.Files.VFileChooser;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.io.File;
import java.util.Arrays;
diff --git a/src/Visual_DVM_2021/Passes/All/IncludeFile.java b/src/Common/Passes/All/IncludeFile.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/IncludeFile.java
rename to src/Common/Passes/All/IncludeFile.java
index d090a66e..6a413c3b 100644
--- a/src/Visual_DVM_2021/Passes/All/IncludeFile.java
+++ b/src/Common/Passes/All/IncludeFile.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
import ProjectData.Files.DBProjectFile;
import ProjectData.Files.FileState;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.Pass_2021;
public class IncludeFile extends Pass_2021 {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java b/src/Common/Passes/All/IncludeSelectedFiles.java
similarity index 89%
rename from src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java
rename to src/Common/Passes/All/IncludeSelectedFiles.java
index 624d3d9f..673cfcf3 100644
--- a/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java
+++ b/src/Common/Passes/All/IncludeSelectedFiles.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.util.Vector;
public class IncludeSelectedFiles extends Pass_2021> {
diff --git a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java b/src/Common/Passes/All/InitialiseUser.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/InitialiseUser.java
rename to src/Common/Passes/All/InitialiseUser.java
index 97ab90b9..30409928 100644
--- a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java
+++ b/src/Common/Passes/All/InitialiseUser.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import GlobalData.User.UserState;
-import Repository.SubscriberWorkspace.SubscriberWorkspace;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Repository.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
+import Common.Passes.Pass_2021;
public class InitialiseUser extends Pass_2021 {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java b/src/Common/Passes/All/InstallComponentFromFolder.java
similarity index 96%
rename from src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java
rename to src/Common/Passes/All/InstallComponentFromFolder.java
index c9d921bd..2409a717 100644
--- a/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java
+++ b/src/Common/Passes/All/InstallComponentFromFolder.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import Common.GlobalProperties;
import Common.Utils.Files.VFileChooser;
import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.CurrentComponentPass;
+import Common.Passes.CurrentComponentPass;
import java.io.File;
import java.nio.file.Files;
diff --git a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java b/src/Common/Passes/All/InstallServerSapfor.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
rename to src/Common/Passes/All/InstallServerSapfor.java
index b5065812..b768b0e4 100644
--- a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
+++ b/src/Common/Passes/All/InstallServerSapfor.java
@@ -1,15 +1,15 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Constants;
import Common.Current;
import Common.Utils.Utils;
import GlobalData.RemoteFile.RemoteFile;
import ProjectData.LanguageName;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
+import Common.Passes.PassCode_2021;
+import Common.Passes.SSH.ConnectionPass;
+import Common.Passes.Server.TestingSystemPass;
import java.util.Date;
import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/LinuxLocalCompilation.java b/src/Common/Passes/All/LinuxLocalCompilation.java
similarity index 94%
rename from src/Visual_DVM_2021/Passes/All/LinuxLocalCompilation.java
rename to src/Common/Passes/All/LinuxLocalCompilation.java
index 1dd9b803..0b396ff7 100644
--- a/src/Visual_DVM_2021/Passes/All/LinuxLocalCompilation.java
+++ b/src/Common/Passes/All/LinuxLocalCompilation.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import GlobalData.Tasks.CompilationTask.CompilationTask;
import GlobalData.Tasks.Passes.TaskLocalPass;
import GlobalData.Tasks.Supervisor.Local.Linux.LinuxLocalCompilationSupervisor;
diff --git a/src/Visual_DVM_2021/Passes/All/LinuxLocalRun.java b/src/Common/Passes/All/LinuxLocalRun.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/LinuxLocalRun.java
rename to src/Common/Passes/All/LinuxLocalRun.java
index 49d5e203..20d41582 100644
--- a/src/Visual_DVM_2021/Passes/All/LinuxLocalRun.java
+++ b/src/Common/Passes/All/LinuxLocalRun.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import GlobalData.Tasks.Passes.TaskLocalPass;
import GlobalData.Tasks.RunTask.RunTask;
import GlobalData.Tasks.Supervisor.Local.Linux.LinuxLocalRunSupervisor;
diff --git a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java b/src/Common/Passes/All/LocalInitaliseUser.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
rename to src/Common/Passes/All/LocalInitaliseUser.java
index e7ee20ea..dc89be77 100644
--- a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
+++ b/src/Common/Passes/All/LocalInitaliseUser.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.Utils.Utils;
import GlobalData.User.User;
import GlobalData.User.UserState;
-import Visual_DVM_2021.Passes.ProcessPass;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass;
+import Common.Passes.ProcessPass;
+import Common.Passes.SSH.ConnectionPass;
import org.apache.commons.io.FileUtils;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java b/src/Common/Passes/All/LocalSingleCommand.java
similarity index 83%
rename from src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java
rename to src/Common/Passes/All/LocalSingleCommand.java
index b8b36fc5..206613ae 100644
--- a/src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java
+++ b/src/Common/Passes/All/LocalSingleCommand.java
@@ -1,6 +1,6 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.ProcessPass;
+import Common.Passes.ProcessPass;
public class LocalSingleCommand extends ProcessPass {
String command = "";
@Override
diff --git a/src/Visual_DVM_2021/Passes/All/MVSRun.java b/src/Common/Passes/All/MVSRun.java
similarity index 82%
rename from src/Visual_DVM_2021/Passes/All/MVSRun.java
rename to src/Common/Passes/All/MVSRun.java
index a1946818..a0f8e0a5 100644
--- a/src/Visual_DVM_2021/Passes/All/MVSRun.java
+++ b/src/Common/Passes/All/MVSRun.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import GlobalData.Tasks.RunTask.RunTask;
import GlobalData.Tasks.Supervisor.Remote.MVSRunSupervisor;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.SSH.TaskConnectionPass;
+import Common.Passes.SSH.TaskConnectionPass;
public class MVSRun extends TaskConnectionPass {
public MVSRun() {
super(MVSRunSupervisor.class);
diff --git a/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java b/src/Common/Passes/All/MakeScreenShot.java
similarity index 94%
rename from src/Visual_DVM_2021/Passes/All/MakeScreenShot.java
rename to src/Common/Passes/All/MakeScreenShot.java
index 31f6b094..31200741 100644
--- a/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java
+++ b/src/Common/Passes/All/MakeScreenShot.java
@@ -1,6 +1,6 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.CurrentProjectPass;
+import Common.Passes.CurrentProjectPass;
import javax.imageio.ImageIO;
import java.awt.*;
diff --git a/src/Visual_DVM_2021/Passes/All/MassSelectArrays.java b/src/Common/Passes/All/MassSelectArrays.java
similarity index 94%
rename from src/Visual_DVM_2021/Passes/All/MassSelectArrays.java
rename to src/Common/Passes/All/MassSelectArrays.java
index da08ef3d..54fe7152 100644
--- a/src/Visual_DVM_2021/Passes/All/MassSelectArrays.java
+++ b/src/Common/Passes/All/MassSelectArrays.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import ProjectData.SapforData.Arrays.ArrayState;
import ProjectData.SapforData.Arrays.ProjectArray;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.SapforModification;
+import Common.Passes.PassCode_2021;
+import Common.Passes.SapforModification;
import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/OpenBugReport.java b/src/Common/Passes/All/OpenBugReport.java
similarity index 80%
rename from src/Visual_DVM_2021/Passes/All/OpenBugReport.java
rename to src/Common/Passes/All/OpenBugReport.java
index eec74057..aec7bee1 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenBugReport.java
+++ b/src/Common/Passes/All/OpenBugReport.java
@@ -1,5 +1,5 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.BugReport.BugReportState;
+package Common.Passes.All;
+import Repository.ComponentsServer.Component.BugReport.BugReportState;
public class OpenBugReport extends UpdateBugReportField {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java b/src/Common/Passes/All/OpenBugReportTestProject.java
similarity index 91%
rename from src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
rename to src/Common/Passes/All/OpenBugReportTestProject.java
index 2e8be7d5..a771384e 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
+++ b/src/Common/Passes/All/OpenBugReportTestProject.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.Utils.Utils;
-import Repository.BugReport.BugReport;
-import Repository.BugReport.BugReportInterface;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Component.BugReport.BugReportInterface;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.io.File;
import java.nio.file.Paths;
diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java b/src/Common/Passes/All/OpenCurrentFile.java
similarity index 89%
rename from src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java
rename to src/Common/Passes/All/OpenCurrentFile.java
index d6898517..9141c3ab 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java
+++ b/src/Common/Passes/All/OpenCurrentFile.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.UI;
import ProjectData.Files.DBProjectFile;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
public class OpenCurrentFile extends Pass_2021 {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java b/src/Common/Passes/All/OpenCurrentProject.java
similarity index 97%
rename from src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
rename to src/Common/Passes/All/OpenCurrentProject.java
index 1203fb1a..4c2ffda1 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
+++ b/src/Common/Passes/All/OpenCurrentProject.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Constants;
import Common.Current;
import Common.Global;
@@ -10,8 +10,8 @@ import GlobalData.DBLastProject.DBLastProject;
import GlobalData.Settings.SettingName;
import ProjectData.Files.LanguageStyle;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.io.File;
public class OpenCurrentProject extends Pass_2021 {
diff --git a/src/Visual_DVM_2021/Passes/All/OpenProject.java b/src/Common/Passes/All/OpenProject.java
similarity index 87%
rename from src/Visual_DVM_2021/Passes/All/OpenProject.java
rename to src/Common/Passes/All/OpenProject.java
index 938d6e91..7124666a 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenProject.java
+++ b/src/Common/Passes/All/OpenProject.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
public class OpenProject extends Pass_2021 {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java b/src/Common/Passes/All/OpenSapforEtalonVersion.java
similarity index 68%
rename from src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java
rename to src/Common/Passes/All/OpenSapforEtalonVersion.java
index 7962b37e..d31b0dba 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java
+++ b/src/Common/Passes/All/OpenSapforEtalonVersion.java
@@ -1,6 +1,6 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
-import Visual_DVM_2021.Passes.OpenSapforVersionPass;
+import Common.Passes.OpenSapforVersionPass;
public class OpenSapforEtalonVersion extends OpenSapforVersionPass {
@Override
public Current getCurrentName() {
diff --git a/src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java b/src/Common/Passes/All/OpenSapforVersion.java
similarity index 67%
rename from src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java
rename to src/Common/Passes/All/OpenSapforVersion.java
index 531a1683..db97fc43 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java
+++ b/src/Common/Passes/All/OpenSapforVersion.java
@@ -1,6 +1,6 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
-import Visual_DVM_2021.Passes.OpenSapforVersionPass;
+import Common.Passes.OpenSapforVersionPass;
public class OpenSapforVersion extends OpenSapforVersionPass {
@Override
public Current getCurrentName() {
diff --git a/src/Visual_DVM_2021/Passes/All/PauseTesting.java b/src/Common/Passes/All/PauseTesting.java
similarity index 74%
rename from src/Visual_DVM_2021/Passes/All/PauseTesting.java
rename to src/Common/Passes/All/PauseTesting.java
index 19499b51..fa928d0f 100644
--- a/src/Visual_DVM_2021/Passes/All/PauseTesting.java
+++ b/src/Common/Passes/All/PauseTesting.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import GlobalData.Settings.SettingName;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Common.TSetting.TSetting;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.Common.TSetting.TSetting;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Server.TestingSystemPass;
public class PauseTesting extends TestingSystemPass {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java b/src/Common/Passes/All/PickCompilerEnvironments.java
similarity index 97%
rename from src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
rename to src/Common/Passes/All/PickCompilerEnvironments.java
index 21824091..27b39d01 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
+++ b/src/Common/Passes/All/PickCompilerEnvironments.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Constants;
import Common.Current;
import Common.Global;
@@ -9,8 +9,8 @@ import GlobalData.CompilerEnvironment.CompilerEnvironment;
import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsFields;
import GlobalData.EnvironmentValue.EnvironmentValue;
import GlobalData.RunConfiguration.RunConfiguration;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import javax.swing.*;
import java.util.LinkedHashMap;
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java b/src/Common/Passes/All/PickCompilerEnvironmentsForTesting.java
similarity index 95%
rename from src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
rename to src/Common/Passes/All/PickCompilerEnvironmentsForTesting.java
index 404de1c6..96f09639 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
+++ b/src/Common/Passes/All/PickCompilerEnvironmentsForTesting.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.UI.Windows.Dialog.Dialog;
import Common.Utils.Utils;
@@ -6,8 +6,8 @@ import GlobalData.Compiler.Compiler;
import GlobalData.Compiler.CompilerType;
import GlobalData.CompilerEnvironment.CompilerEnvironment;
import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsFields;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import javax.swing.*;
import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java b/src/Common/Passes/All/PickCompilerOptions.java
similarity index 95%
rename from src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java
rename to src/Common/Passes/All/PickCompilerOptions.java
index 39dc5116..1862862b 100644
--- a/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java
+++ b/src/Common/Passes/All/PickCompilerOptions.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.UI.Windows.Dialog.Dialog;
import GlobalData.Compiler.Compiler;
import GlobalData.Compiler.CompilerType;
import GlobalData.CompilerOption.CompilerOption;
import GlobalData.CompilerOption.UI.CompilerOptionsFields;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import javax.swing.*;
import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/PlayTesting.java b/src/Common/Passes/All/PlayTesting.java
similarity index 74%
rename from src/Visual_DVM_2021/Passes/All/PlayTesting.java
rename to src/Common/Passes/All/PlayTesting.java
index d02ea131..24ecba9c 100644
--- a/src/Visual_DVM_2021/Passes/All/PlayTesting.java
+++ b/src/Common/Passes/All/PlayTesting.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import GlobalData.Settings.SettingName;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Common.TSetting.TSetting;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.Common.TSetting.TSetting;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Server.TestingSystemPass;
public class PlayTesting extends TestingSystemPass {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/Precompilation.java b/src/Common/Passes/All/Precompilation.java
similarity index 98%
rename from src/Visual_DVM_2021/Passes/All/Precompilation.java
rename to src/Common/Passes/All/Precompilation.java
index 2da5263d..6b37a7ef 100644
--- a/src/Visual_DVM_2021/Passes/All/Precompilation.java
+++ b/src/Common/Passes/All/Precompilation.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Constants;
import Common.Current;
import Common.Global;
@@ -12,9 +12,9 @@ import GlobalData.Settings.SettingName;
import ProjectData.Files.DBProjectFile;
import ProjectData.LanguageName;
import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
+import Common.Passes.Pass_2021;
import org.apache.commons.io.FileUtils;
import java.io.BufferedReader;
diff --git a/src/Visual_DVM_2021/Passes/All/PredictParallelVariants.java b/src/Common/Passes/All/PredictParallelVariants.java
similarity index 73%
rename from src/Visual_DVM_2021/Passes/All/PredictParallelVariants.java
rename to src/Common/Passes/All/PredictParallelVariants.java
index 864e1082..4cb655e0 100644
--- a/src/Visual_DVM_2021/Passes/All/PredictParallelVariants.java
+++ b/src/Common/Passes/All/PredictParallelVariants.java
@@ -1,6 +1,6 @@
-package Visual_DVM_2021.Passes.All;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.VariantsMassPass;
+package Common.Passes.All;
+import Common.Passes.PassCode_2021;
+import Common.Passes.VariantsMassPass;
public class PredictParallelVariants extends VariantsMassPass {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java b/src/Common/Passes/All/PrepareForModulesAssembly.java
similarity index 93%
rename from src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
rename to src/Common/Passes/All/PrepareForModulesAssembly.java
index a162ac6a..54aa06c2 100644
--- a/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
+++ b/src/Common/Passes/All/PrepareForModulesAssembly.java
@@ -1,11 +1,11 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.Files.FileType;
-import Repository.Component.Sapfor.TransformationPermission;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Transformation;
+import Repository.ComponentsServer.Component.Sapfor.TransformationPermission;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Transformation;
import org.apache.commons.io.FileUtils;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java b/src/Common/Passes/All/PublishBugReport.java
similarity index 90%
rename from src/Visual_DVM_2021/Passes/All/PublishBugReport.java
rename to src/Common/Passes/All/PublishBugReport.java
index f1b9598f..419f8064 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
+++ b/src/Common/Passes/All/PublishBugReport.java
@@ -1,14 +1,14 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
-import Repository.BugReport.BugReport;
-import Repository.BugReport.BugReportInterface;
-import Repository.BugReport.BugReportState;
+import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.ComponentsServer.Component.BugReport.BugReportInterface;
+import Repository.ComponentsServer.Component.BugReport.BugReportState;
import Repository.EmailMessage;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.io.File;
import java.util.Date;
diff --git a/src/Visual_DVM_2021/Passes/All/PublishComponent.java b/src/Common/Passes/All/PublishComponent.java
similarity index 92%
rename from src/Visual_DVM_2021/Passes/All/PublishComponent.java
rename to src/Common/Passes/All/PublishComponent.java
index 83d3ac95..1c832228 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishComponent.java
+++ b/src/Common/Passes/All/PublishComponent.java
@@ -1,19 +1,19 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import GlobalData.Account.AccountRole;
-import Repository.Component.Component;
-import Repository.Component.ComponentType;
-import Repository.Component.UI.PublishForm;
+import Repository.ComponentsServer.Component.Component;
+import Repository.ComponentsServer.Component.ComponentType;
+import Repository.ComponentsServer.Component.UI.PublishForm;
import Repository.EmailMessage;
import Repository.RepositoryServer;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.Server.ComponentsRepositoryPass;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Pass_2021;
import java.util.Date;
import java.util.Vector;
diff --git a/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java b/src/Common/Passes/All/PublishConfiguration.java
similarity index 80%
rename from src/Visual_DVM_2021/Passes/All/PublishConfiguration.java
rename to src/Common/Passes/All/PublishConfiguration.java
index 93430c23..e156b161 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java
+++ b/src/Common/Passes/All/PublishConfiguration.java
@@ -1,10 +1,10 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.DVM.Configuration.Configuration;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.TestingSystem.DVM.Configuration.Configuration;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Server.TestingSystemPass;
public class PublishConfiguration extends TestingSystemPass {
@Override
public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishGroup.java b/src/Common/Passes/All/PublishGroup.java
similarity index 50%
rename from src/Visual_DVM_2021/Passes/All/PublishGroup.java
rename to src/Common/Passes/All/PublishGroup.java
index 662d6016..030854f9 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishGroup.java
+++ b/src/Common/Passes/All/PublishGroup.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
-import TestingSystem.Common.Group.Group;
-import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.Server.PublishServerObject;
+import Repository.TestingSystem.Common.Group.Group;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.Server.PublishServerObject;
public class PublishGroup extends PublishServerObject {
public PublishGroup() {
super(Global.testingServer, Group.class);
diff --git a/src/Visual_DVM_2021/Passes/All/PublishRemoteWorkspace.java b/src/Common/Passes/All/PublishRemoteWorkspace.java
similarity index 62%
rename from src/Visual_DVM_2021/Passes/All/PublishRemoteWorkspace.java
rename to src/Common/Passes/All/PublishRemoteWorkspace.java
index 24b63ce2..3fbfd1e3 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishRemoteWorkspace.java
+++ b/src/Common/Passes/All/PublishRemoteWorkspace.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Repository.SubscriberWorkspace.SubscriberWorkspace;
-import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+package Common.Passes.All;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Repository.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
+import Common.Passes.Server.ComponentsRepositoryPass;
public class PublishRemoteWorkspace extends ComponentsRepositoryPass {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java b/src/Common/Passes/All/PublishSapforConfiguration.java
similarity index 53%
rename from src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java
rename to src/Common/Passes/All/PublishSapforConfiguration.java
index 8e539e16..bcb2af3d 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java
+++ b/src/Common/Passes/All/PublishSapforConfiguration.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import Visual_DVM_2021.Passes.Server.PublishServerObject;
+import Repository.TestingSystem.Common.TestingServer;
+import Repository.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import Common.Passes.Server.PublishServerObject;
public class PublishSapforConfiguration extends PublishServerObject {
public PublishSapforConfiguration() {
super(Global.testingServer, SapforConfiguration.class);
diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java b/src/Common/Passes/All/PublishSapforConfigurationCommand.java
similarity index 68%
rename from src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java
rename to src/Common/Passes/All/PublishSapforConfigurationCommand.java
index 61274614..80d45d16 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishSapforConfigurationCommand.java
+++ b/src/Common/Passes/All/PublishSapforConfigurationCommand.java
@@ -1,9 +1,9 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
-import Visual_DVM_2021.Passes.Server.PublishServerObject;
+import Repository.TestingSystem.Common.TestingServer;
+import Repository.TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
+import Common.Passes.Server.PublishServerObject;
public class PublishSapforConfigurationCommand extends PublishServerObject {
public PublishSapforConfigurationCommand() {
super(Global.testingServer, SapforConfigurationCommand.class);
diff --git a/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java b/src/Common/Passes/All/PublishServerSapfor.java
similarity index 64%
rename from src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java
rename to src/Common/Passes/All/PublishServerSapfor.java
index cf50f5ec..130dd945 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java
+++ b/src/Common/Passes/All/PublishServerSapfor.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Global;
-import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
-import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.Server.PublishServerObject;
+import Repository.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.Server.PublishServerObject;
public class PublishServerSapfor extends PublishServerObject {
public PublishServerSapfor() {
super(Global.testingServer, ServerSapfor.class);
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTest.java b/src/Common/Passes/All/PublishTest.java
similarity index 88%
rename from src/Visual_DVM_2021/Passes/All/PublishTest.java
rename to src/Common/Passes/All/PublishTest.java
index 88534b84..7e97ef52 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTest.java
+++ b/src/Common/Passes/All/PublishTest.java
@@ -1,13 +1,13 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Project.db_project_info;
-import TestingSystem.Common.Test.Test;
-import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.PublishServerObject;
+import Repository.TestingSystem.Common.Test.Test;
+import Repository.TestingSystem.Common.TestingServer;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Server.PublishServerObject;
public class PublishTest extends PublishServerObject {
public PublishTest() {
super(Global.testingServer, Test.class);
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTestProject.java b/src/Common/Passes/All/PublishTestProject.java
similarity index 85%
rename from src/Visual_DVM_2021/Passes/All/PublishTestProject.java
rename to src/Common/Passes/All/PublishTestProject.java
index 609fc713..0b0dc6f4 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTestProject.java
+++ b/src/Common/Passes/All/PublishTestProject.java
@@ -1,13 +1,13 @@
-package Visual_DVM_2021.Passes.All;
+package Common.Passes.All;
import Common.Constants;
import Common.Global;
import Common.Utils.Utils;
import ProjectData.Project.db_project_info;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.PassException;
+import Common.Passes.Server.TestingSystemPass;
import org.apache.commons.io.FileUtils;
import java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/All/RefreshDVMTests.java b/src/Common/Passes/All/RefreshDVMTests.java
similarity index 80%
rename from src/Visual_DVM_2021/Passes/All/RefreshDVMTests.java
rename to src/Common/Passes/All/RefreshDVMTests.java
index e76da83c..8edbc3d1 100644
--- a/src/Visual_DVM_2021/Passes/All/RefreshDVMTests.java
+++ b/src/Common/Passes/All/RefreshDVMTests.java
@@ -1,8 +1,8 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+package Common.Passes.All;
+import Repository.ServerCode;
+import Repository.ServerExchangeUnit_2021;
+import Common.Passes.PassCode_2021;
+import Common.Passes.Server.TestingSystemPass;
public class RefreshDVMTests extends TestingSystemPass