diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e43ea06..7589e077 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,601 +7,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -640,10 +48,10 @@
-
-
-
-
+
+
+
+
diff --git a/PerformanceAnalyzer/1049392283/stat.json b/PerformanceAnalyzer/1049392283/stat.json
new file mode 100644
index 00000000..ded4cdb9
--- /dev/null
+++ b/PerformanceAnalyzer/1049392283/stat.json
@@ -0,0 +1 @@
+{"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
new file mode 100644
index 00000000..519065e8
--- /dev/null
+++ b/PerformanceAnalyzer/139606632/stat.json
@@ -0,0 +1 @@
+{"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
new file mode 100644
index 00000000..f96aaa5a
--- /dev/null
+++ b/PerformanceAnalyzer/1664247100/stat.json
@@ -0,0 +1 @@
+{"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
new file mode 100644
index 00000000..cfb1ec1e
--- /dev/null
+++ b/PerformanceAnalyzer/535943622/stat.json
@@ -0,0 +1 @@
+{"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
new file mode 100644
index 00000000..d4769aa2
--- /dev/null
+++ b/PerformanceAnalyzer/622828792/stat.json
@@ -0,0 +1 @@
+{"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 e6c512ae..84ccc784 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 Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
import java.util.regex.Pattern;
public class Constants {
diff --git a/src/Common/Current.java b/src/Common/Current.java
index d00447f7..9d9f44ca 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.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 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 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.ComponentsServer.Component.Component getComponent() {
- return (Repository.ComponentsServer.Component.Component) get(Component);
+ public static Repository.Component.Component getComponent() {
+ return (Repository.Component.Component) get(Component);
}
- public static Repository.ComponentsServer.Component.BugReport.BugReport getBugReport() {
+ public static Repository.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.ComponentsServer.Subscribes.Subscriber getSubscriber() {
+ public static Repository.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.ComponentsServer.Component.Sapfor.Sapfor getSapfor() {
- return (Repository.ComponentsServer.Component.Sapfor.Sapfor) get(Current.Sapfor);
+ public static Repository.Component.Sapfor.Sapfor getSapfor() {
+ return (Repository.Component.Sapfor.Sapfor) get(Current.Sapfor);
}
public static boolean HasGroup() {
return get(Current.Group) != null;
}
- public static Repository.TestingSystem.Common.Group.Group getGroup() {
- return (Repository.TestingSystem.Common.Group.Group) get(Current.Group);
+ public static TestingSystem.Common.Group.Group getGroup() {
+ return (TestingSystem.Common.Group.Group) get(Current.Group);
}
//--
public static boolean HasConfiguration() {
return get(Current.Configuration) != null;
}
- public static Repository.TestingSystem.DVM.Configuration.Configuration getConfiguration() {
+ public static TestingSystem.DVM.Configuration.Configuration getConfiguration() {
return (Configuration) get(Current.Configuration);
}
public static SapforConfiguration getSapforConfiguration() {
- return (Repository.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
+ return (TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
}
//--
public static Test getTest() {
- return (Repository.TestingSystem.Common.Test.Test) get(Current.Test);
+ return (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 (Repository.TestingSystem.DVM.Tasks.TestCompilationTask) get(Current.TestCompilationTask);
+ return (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 (Repository.TestingSystem.DVM.Tasks.TestRunTask) get(Current.TestRunTask);
+ return (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 (Common.Passes.UI.PassForm) get(Current.PassForm);
+ return (Visual_DVM_2021.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 Repository.TestingSystem.SAPFOR.SapforTask.SapforTask getSapforTask() {
- return (Repository.TestingSystem.SAPFOR.SapforTask.SapforTask) get(Current.SapforTask);
+ public static TestingSystem.SAPFOR.SapforTask.SapforTask getSapforTask() {
+ return (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 Repository.TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
- return (Repository.TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
+ public static TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
+ return (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 Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
- return (Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
+ public static TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
+ return (TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
}
//сапфоры установленные на тестовый сервер.
public static boolean HasServerSapfor() {
return get(Current.ServerSapfor) != null;
}
- public static Repository.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
- return (Repository.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
+ public static TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
+ return (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 07b2dbce..3d4fc6d7 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 Common.UI.Windows.Interface.FilterWindow;
+import Visual_DVM_2021.UI.Interface.FilterWindow;
import javax.swing.*;
import java.awt.*;
diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java
index a996b4b3..92a03369 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 Common.Passes.PassCode_2021;
+import Visual_DVM_2021.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 b7b30414..0449b873 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 Common.Passes.PassException;
+import Visual_DVM_2021.Passes.PassException;
import javafx.util.Pair;
import java.io.File;
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 6f0694d6..3613eed8 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.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 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 org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
diff --git a/src/Common/Passes/All/EditGroup.java b/src/Common/Passes/All/EditGroup.java
deleted file mode 100644
index 84ac694e..00000000
--- a/src/Common/Passes/All/EditGroup.java
+++ /dev/null
@@ -1,10 +0,0 @@
-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/Common/Passes/All/EditTest.java b/src/Common/Passes/All/EditTest.java
deleted file mode 100644
index 5ffbe3ee..00000000
--- a/src/Common/Passes/All/EditTest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-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/Common/Passes/All/SPF_ConvertStructures.java b/src/Common/Passes/All/SPF_ConvertStructures.java
deleted file mode 100644
index af067f80..00000000
--- a/src/Common/Passes/All/SPF_ConvertStructures.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_ConvertStructures extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_CorrectCodeStylePass.java b/src/Common/Passes/All/SPF_CorrectCodeStylePass.java
deleted file mode 100644
index f90ee918..00000000
--- a/src/Common/Passes/All/SPF_CorrectCodeStylePass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_CorrectCodeStylePass extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_CreateCheckpoints.java b/src/Common/Passes/All/SPF_CreateCheckpoints.java
deleted file mode 100644
index a24795c3..00000000
--- a/src/Common/Passes/All/SPF_CreateCheckpoints.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_CreateCheckpoints extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_CreateIntervalsTree.java b/src/Common/Passes/All/SPF_CreateIntervalsTree.java
deleted file mode 100644
index 2a43073e..00000000
--- a/src/Common/Passes/All/SPF_CreateIntervalsTree.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_CreateIntervalsTree extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_DuplicateFunctionChains.java b/src/Common/Passes/All/SPF_DuplicateFunctionChains.java
deleted file mode 100644
index d59d9e91..00000000
--- a/src/Common/Passes/All/SPF_DuplicateFunctionChains.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_DuplicateFunctionChains extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_ExpressionSubstitution.java b/src/Common/Passes/All/SPF_ExpressionSubstitution.java
deleted file mode 100644
index 828d9330..00000000
--- a/src/Common/Passes/All/SPF_ExpressionSubstitution.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_ExpressionSubstitution extends SapforTransformation {}
diff --git a/src/Common/Passes/All/SPF_InitDeclsWithZero.java b/src/Common/Passes/All/SPF_InitDeclsWithZero.java
deleted file mode 100644
index ee590d16..00000000
--- a/src/Common/Passes/All/SPF_InitDeclsWithZero.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_InitDeclsWithZero extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_InsertDvmhRegions.java b/src/Common/Passes/All/SPF_InsertDvmhRegions.java
deleted file mode 100644
index 2e6d67f1..00000000
--- a/src/Common/Passes/All/SPF_InsertDvmhRegions.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_InsertDvmhRegions extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_LoopEndDoConverterPass.java b/src/Common/Passes/All/SPF_LoopEndDoConverterPass.java
deleted file mode 100644
index e7f903bb..00000000
--- a/src/Common/Passes/All/SPF_LoopEndDoConverterPass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_LoopEndDoConverterPass extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_LoopFission.java b/src/Common/Passes/All/SPF_LoopFission.java
deleted file mode 100644
index 2c817724..00000000
--- a/src/Common/Passes/All/SPF_LoopFission.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_LoopFission extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_LoopUnion.java b/src/Common/Passes/All/SPF_LoopUnion.java
deleted file mode 100644
index d87cdc85..00000000
--- a/src/Common/Passes/All/SPF_LoopUnion.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_LoopUnion extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_LoopUnrolling.java b/src/Common/Passes/All/SPF_LoopUnrolling.java
deleted file mode 100644
index 3ee92ccb..00000000
--- a/src/Common/Passes/All/SPF_LoopUnrolling.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_LoopUnrolling extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_PrivateExpansion.java b/src/Common/Passes/All/SPF_PrivateExpansion.java
deleted file mode 100644
index bc744807..00000000
--- a/src/Common/Passes/All/SPF_PrivateExpansion.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_PrivateExpansion extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_PrivateRemoving.java b/src/Common/Passes/All/SPF_PrivateRemoving.java
deleted file mode 100644
index edca46d2..00000000
--- a/src/Common/Passes/All/SPF_PrivateRemoving.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_PrivateRemoving extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_PrivateShrinking.java b/src/Common/Passes/All/SPF_PrivateShrinking.java
deleted file mode 100644
index 227612ca..00000000
--- a/src/Common/Passes/All/SPF_PrivateShrinking.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_PrivateShrinking extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_RemoveDvmDirectives.java b/src/Common/Passes/All/SPF_RemoveDvmDirectives.java
deleted file mode 100644
index 0f674e1e..00000000
--- a/src/Common/Passes/All/SPF_RemoveDvmDirectives.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_RemoveDvmDirectives extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_RemoveDvmDirectivesToComments.java b/src/Common/Passes/All/SPF_RemoveDvmDirectivesToComments.java
deleted file mode 100644
index 74cebb55..00000000
--- a/src/Common/Passes/All/SPF_RemoveDvmDirectivesToComments.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_RemoveDvmDirectivesToComments extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_RemoveDvmIntervals.java b/src/Common/Passes/All/SPF_RemoveDvmIntervals.java
deleted file mode 100644
index 971db420..00000000
--- a/src/Common/Passes/All/SPF_RemoveDvmIntervals.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_RemoveDvmIntervals extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_RemoveUnusedFunctions.java b/src/Common/Passes/All/SPF_RemoveUnusedFunctions.java
deleted file mode 100644
index 1d9b9224..00000000
--- a/src/Common/Passes/All/SPF_RemoveUnusedFunctions.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_RemoveUnusedFunctions extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_ResolveCommonBlockConflicts.java b/src/Common/Passes/All/SPF_ResolveCommonBlockConflicts.java
deleted file mode 100644
index 5f6c104e..00000000
--- a/src/Common/Passes/All/SPF_ResolveCommonBlockConflicts.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_ResolveCommonBlockConflicts extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_ResolveParallelRegionConflicts.java b/src/Common/Passes/All/SPF_ResolveParallelRegionConflicts.java
deleted file mode 100644
index a2fb1448..00000000
--- a/src/Common/Passes/All/SPF_ResolveParallelRegionConflicts.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_ResolveParallelRegionConflicts extends SapforTransformation {
-}
diff --git a/src/Common/Passes/All/SPF_SharedMemoryParallelization.java b/src/Common/Passes/All/SPF_SharedMemoryParallelization.java
deleted file mode 100644
index 80806a65..00000000
--- a/src/Common/Passes/All/SPF_SharedMemoryParallelization.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package Common.Passes.All;
-import Common.Passes.SapforTransformation;
-public class SPF_SharedMemoryParallelization extends SapforTransformation {
-}
diff --git a/src/Common/UI/Menus/AttachementsMenu.java b/src/Common/UI/Menus/AttachementsMenu.java
index 8bb858d7..1957206a 100644
--- a/src/Common/UI/Menus/AttachementsMenu.java
+++ b/src/Common/UI/Menus/AttachementsMenu.java
@@ -1,8 +1,8 @@
package Common.UI.Menus;
import Common.Current;
import Common.Global;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import java.awt.*;
diff --git a/src/Common/UI/Menus/MainEditorMenu.java b/src/Common/UI/Menus/MainEditorMenu.java
index 225a1acf..0c61f235 100644
--- a/src/Common/UI/Menus/MainEditorMenu.java
+++ b/src/Common/UI/Menus/MainEditorMenu.java
@@ -9,8 +9,8 @@ import ProjectData.SapforData.Functions.FuncCall;
import ProjectData.SapforData.Functions.FuncInfo;
import ProjectData.SapforData.Functions.FunctionType;
import ProjectData.SapforData.Loops.Loop;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import javax.swing.*;
diff --git a/src/Common/UI/Menus/PassesSubMenu.java b/src/Common/UI/Menus/PassesSubMenu.java
index f4252bae..abd1e915 100644
--- a/src/Common/UI/Menus/PassesSubMenu.java
+++ b/src/Common/UI/Menus/PassesSubMenu.java
@@ -2,8 +2,8 @@ package Common.UI.Menus;
import Common.Current;
import Common.UI.Themes.VisualiserFonts;
import Common.Utils.Utils;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
public class PassesSubMenu extends JMenu {
diff --git a/src/Common/UI/Menus/ProjectFilesMenu.java b/src/Common/UI/Menus/ProjectFilesMenu.java
index 94bb72f4..a102e60c 100644
--- a/src/Common/UI/Menus/ProjectFilesMenu.java
+++ b/src/Common/UI/Menus/ProjectFilesMenu.java
@@ -11,8 +11,8 @@ import Common.Utils.Utils;
import ProjectData.Files.FileType;
import ProjectData.Files.LanguageStyle;
import ProjectData.LanguageName;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import java.awt.*;
diff --git a/src/Common/UI/Menus/VersionsMenu.java b/src/Common/UI/Menus/VersionsMenu.java
index bf237402..ee93ecc4 100644
--- a/src/Common/UI/Menus/VersionsMenu.java
+++ b/src/Common/UI/Menus/VersionsMenu.java
@@ -5,8 +5,8 @@ import Common.UI.Menus_2023.StableMenuItem;
import Common.UI.Trees.DataTree;
import Common.UI.UI;
import Common.Utils.Utils;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
public class VersionsMenu extends GraphMenu {
VisualiserMenuItem m_select_all;
VisualiserMenuItem m_unselect_all;
diff --git a/src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java b/src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java
index 4cdd0971..74e69199 100644
--- a/src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java
+++ b/src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.BugReportsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class BugReportsMenuBar extends DataMenuBar {
public BugReportsMenuBar() {
super("отчёты об ошибках",
diff --git a/src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java b/src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java
index b2f73b85..96adb6d1 100644
--- a/src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java
+++ b/src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.CompilersMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class CompilersMenuBar extends DataMenuBar {
public CompilersMenuBar() {
super("компиляторы",
diff --git a/src/Common/UI/Menus_2023/ComponentsMenuBar/ComponentsMenuBar.java b/src/Common/UI/Menus_2023/ComponentsMenuBar/ComponentsMenuBar.java
index 647d5af5..a979cefc 100644
--- a/src/Common/UI/Menus_2023/ComponentsMenuBar/ComponentsMenuBar.java
+++ b/src/Common/UI/Menus_2023/ComponentsMenuBar/ComponentsMenuBar.java
@@ -3,8 +3,8 @@ import Common.Current;
import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.VisualiserMenu;
import Common.UI.Themes.VisualiserFonts;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
public class ComponentsMenuBar extends DataMenuBar {
public ComponentsMenuBar() {
super("компоненты");
diff --git a/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java b/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
index 8da930ac..305fe84f 100644
--- a/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
+++ b/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.ConfigurationsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class ConfigurationsMenuBar extends DataMenuBar {
public ConfigurationsMenuBar() {
super("конфигурации");
diff --git a/src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java b/src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java
index d4071e74..142234aa 100644
--- a/src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java
+++ b/src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.DVMParametersMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class DVMParametersMenuBar extends DataMenuBar {
public DVMParametersMenuBar() {
super("параметры",
diff --git a/src/Common/UI/Menus_2023/DataMenuBar.java b/src/Common/UI/Menus_2023/DataMenuBar.java
index 106280bc..0cff6534 100644
--- a/src/Common/UI/Menus_2023/DataMenuBar.java
+++ b/src/Common/UI/Menus_2023/DataMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023;
import Common.Database.DataSet;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
import java.awt.*;
diff --git a/src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java b/src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java
index fdc1e9ec..463c8c23 100644
--- a/src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java
+++ b/src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.EnvironmentValuesMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class EnvironmentValuesMenuBar extends DataMenuBar {
public EnvironmentValuesMenuBar() {
super("переменные окружения", PassCode_2021.AddEnvironmentValue,
diff --git a/src/Common/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java b/src/Common/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java
index 4e9d5431..40c31d1d 100644
--- a/src/Common/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java
+++ b/src/Common/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java
@@ -3,8 +3,8 @@ import Common.Global;
import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.UI;
import GlobalData.Settings.SettingName;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import java.awt.*;
diff --git a/src/Common/UI/Menus_2023/FileMenuBar/FileMenuBar.java b/src/Common/UI/Menus_2023/FileMenuBar/FileMenuBar.java
index b605ab4b..2ea937c8 100644
--- a/src/Common/UI/Menus_2023/FileMenuBar/FileMenuBar.java
+++ b/src/Common/UI/Menus_2023/FileMenuBar/FileMenuBar.java
@@ -3,7 +3,7 @@ import Common.UI.Menus_2023.MenuBarButton;
import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.UI;
import ProjectData.Files.UI.Editor.SPFEditor;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
import java.awt.*;
diff --git a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
index 27abc586..c37f0819 100644
--- a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
+++ b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
@@ -3,8 +3,8 @@ import Common.Global;
import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.MenuBarButton;
import Common.Utils.Utils;
-import Repository.TestingSystem.Common.Group.GroupsDBTable;
-import Common.Passes.PassCode_2021;
+import TestingSystem.Common.Group.GroupsDBTable;
+import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
public class GroupsMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java b/src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java
index c3d4aae5..1eadd19d 100644
--- a/src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java
+++ b/src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.MachinesMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class MachinesMenuBar extends DataMenuBar {
public MachinesMenuBar() {
super("машины",
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/AnalysesMenu.java b/src/Common/UI/Menus_2023/MainMenuBar/AnalysesMenu.java
index 23f6ad5a..bc997d69 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/AnalysesMenu.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/AnalysesMenu.java
@@ -1,8 +1,8 @@
package Common.UI.Menus_2023.MainMenuBar;
import Common.UI.Menus_2023.VisualiserMenu;
-import Repository.ComponentsServer.Component.Sapfor.Sapfor;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Repository.Component.Sapfor.Sapfor;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
public class AnalysesMenu extends VisualiserMenu {
public AnalysesMenu() {
super("Анализаторы","/icons/Analyses.png" );
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/GlobalCleaningMenu.java b/src/Common/UI/Menus_2023/MainMenuBar/GlobalCleaningMenu.java
index e3884b12..5d6d8aa4 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/GlobalCleaningMenu.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/GlobalCleaningMenu.java
@@ -1,7 +1,7 @@
package Common.UI.Menus_2023.MainMenuBar;
import Common.UI.Menus_2023.VisualiserMenu;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
public class GlobalCleaningMenu extends VisualiserMenu {
public GlobalCleaningMenu() {
super("Очистка", "/icons/Clean.png", false);
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java b/src/Common/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java
index 247fb6d8..1f4e8d1d 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java
@@ -4,8 +4,8 @@ import Common.UI.Menus.VisualiserMenuItem;
import Common.UI.Menus_2023.VisualiserMenu;
import GlobalData.DBLastProject.DBLastProject;
import GlobalData.Settings.SettingName;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import javax.swing.event.MenuEvent;
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java b/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
index 13e27265..aeb03761 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
@@ -3,9 +3,9 @@ import Common.Global;
import Common.UI.Menus_2023.MenuBarButton;
import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.UI;
-import Repository.ComponentsServer.Component.PerformanceAnalyzer.PerformanceAnalyzer;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import java.awt.*;
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java b/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
index 63c972cd..59616231 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
@@ -1,5 +1,5 @@
package Common.UI.Menus_2023.MainMenuBar;
-import Common.UI.Windows.Interface.*;
+import Visual_DVM_2021.UI.Interface.*;
public interface MainWindow {
void Show();
void ShowProject();
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java b/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java
index 5e710325..4a1b45f5 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java
@@ -1,9 +1,9 @@
package Common.UI.Menus_2023.MainMenuBar;
import Common.UI.Menus.PassesSubMenu;
import Common.UI.Menus_2023.VisualiserMenu;
-import Repository.ComponentsServer.Component.Sapfor.Sapfor;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Repository.Component.Sapfor.Sapfor;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
public class TransformationsMenu extends VisualiserMenu {
public TransformationsMenu() {
super("Преобразования", "/icons/Transformations.png");
diff --git a/src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java b/src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java
index 8f45edd2..4dc80800 100644
--- a/src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java
+++ b/src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.MakefilesMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class MakefilesMenuBar extends DataMenuBar {
public MakefilesMenuBar() {
super("мейкфайлы",
diff --git a/src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java b/src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java
index 5e9cd392..bca2de3b 100644
--- a/src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java
+++ b/src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.ModulesMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class ModulesMenuBar extends DataMenuBar {
public ModulesMenuBar() {
super("языковые модули", PassCode_2021.EditModule);
diff --git a/src/Common/UI/Menus_2023/PassButton.java b/src/Common/UI/Menus_2023/PassButton.java
index b54ec5b2..43f05d35 100644
--- a/src/Common/UI/Menus_2023/PassButton.java
+++ b/src/Common/UI/Menus_2023/PassButton.java
@@ -1,5 +1,5 @@
package Common.UI.Menus_2023;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import java.awt.*;
public class PassButton extends MenuBarButton implements PassControl {
diff --git a/src/Common/UI/Menus_2023/PassMenuItem.java b/src/Common/UI/Menus_2023/PassMenuItem.java
index c6dea58f..15a2c5c1 100644
--- a/src/Common/UI/Menus_2023/PassMenuItem.java
+++ b/src/Common/UI/Menus_2023/PassMenuItem.java
@@ -1,7 +1,7 @@
package Common.UI.Menus_2023;
import Common.UI.Menus.VisualiserMenuItem;
import Common.Utils.Utils;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
public class PassMenuItem extends VisualiserMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
diff --git a/src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java b/src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java
index af7a5cc0..c8689e12 100644
--- a/src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java
+++ b/src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.RunConfigurationsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
public class RunConfigurationsMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java b/src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java
index 7585c1cc..ae1e7cd1 100644
--- a/src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java
+++ b/src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforConfigurationCommandsMenuBar extends DataMenuBar {
public SapforConfigurationCommandsMenuBar() {
super("команды",
diff --git a/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java b/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java
index d26b5dc4..abb7aa17 100644
--- a/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java
+++ b/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.SapforConfigurationsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforConfigurationsMenuBar extends DataMenuBar {
public SapforConfigurationsMenuBar() {
super("конфигурации", PassCode_2021.StartSapforTests,
diff --git a/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java b/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
index a8d4dacb..527f9283 100644
--- a/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
+++ b/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.SapforTasksPackagesBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforTasksPackagesBar extends DataMenuBar {
public SapforTasksPackagesBar() {
super("пакеты задач",
diff --git a/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java b/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java
index 6d4a06fe..727b6258 100644
--- a/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java
+++ b/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.ServerSapforsBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class ServerSapforsBar extends DataMenuBar {
public ServerSapforsBar() {
super("версии SAPFOR", PassCode_2021.InstallServerSapfor, PassCode_2021.DeleteServerSapfor);
diff --git a/src/Common/UI/Menus_2023/StablePassMenuItem.java b/src/Common/UI/Menus_2023/StablePassMenuItem.java
index e045357d..1474b20e 100644
--- a/src/Common/UI/Menus_2023/StablePassMenuItem.java
+++ b/src/Common/UI/Menus_2023/StablePassMenuItem.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023;
import Common.Utils.Utils;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
public class StablePassMenuItem extends StableMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
diff --git a/src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java b/src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java
index afc8183d..0c0edb5e 100644
--- a/src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java
+++ b/src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.SubscribersMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class SubscribersMenuBar extends DataMenuBar {
public SubscribersMenuBar() {
super("Адресаты",
diff --git a/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java b/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java
index 0fa53e79..9b092268 100644
--- a/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java
+++ b/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.TasksPackagesMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class TasksPackagesMenuBar extends DataMenuBar {
public TasksPackagesMenuBar() {
super("пакеты задач", PassCode_2021.AbortSelectedPackages);
diff --git a/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java b/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java
index bbbbac55..7aed90cc 100644
--- a/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java
+++ b/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.TestRunTasksMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
public class TestRunTasksMenuBar extends DataMenuBar {
diff --git a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
index 9cec6911..c54a3705 100644
--- a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
+++ b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
@@ -6,8 +6,8 @@ import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.Themes.VisualiserFonts;
import Common.UI.UI;
import Common.Utils.Utils;
-import Repository.TestingSystem.Common.TestingServer;
-import Common.Passes.PassCode_2021;
+import TestingSystem.Common.TestingServer;
+import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
import java.awt.*;
diff --git a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java b/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
index b1281e01..5c4a283f 100644
--- a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
+++ b/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.TestsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class TestsMenuBar extends DataMenuBar {
public TestsMenuBar() {
super("тесты",
diff --git a/src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java b/src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java
index 1e948dd6..d57fb2cf 100644
--- a/src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java
+++ b/src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.UsersMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class UsersMenuBar extends DataMenuBar {
public UsersMenuBar() {
super("пользователи", PassCode_2021.AddUser,
diff --git a/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java b/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
index cc8c8443..91289a36 100644
--- a/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
+++ b/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.VariantsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class VariantsMenuBar extends DataMenuBar {
public VariantsMenuBar() {
super("варианты");
diff --git a/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java b/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java
index 0b38e01a..f436acd1 100644
--- a/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java
+++ b/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023.VersionsMenuBar;
import Common.UI.Menus_2023.VisualiserMenuBar;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class VersionsMenuBar extends VisualiserMenuBar {
public VersionsMenuBar(){
addPasses(PassCode_2021.CreateTestsGroupFromSelectedVersions);
diff --git a/src/Common/UI/Menus_2023/VisualiserMenuBar.java b/src/Common/UI/Menus_2023/VisualiserMenuBar.java
index a8362910..036bd01e 100644
--- a/src/Common/UI/Menus_2023/VisualiserMenuBar.java
+++ b/src/Common/UI/Menus_2023/VisualiserMenuBar.java
@@ -1,6 +1,6 @@
package Common.UI.Menus_2023;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import java.awt.*;
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index 1a3bc71e..ffab07d2 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -57,7 +57,7 @@ import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable;
import ProjectData.DBArray.ArraysDBTable;
import ProjectData.Files.UI.FilesTreeCellRenderer;
-import Repository.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
import ProjectData.Project.UI.VersionsTreeCellRenderer;
import ProjectData.SapforData.Arrays.ArraysSet;
import ProjectData.SapforData.Arrays.UI.DimensionRenderer;
@@ -66,23 +66,23 @@ import ProjectData.SapforData.Arrays.UI.RulesTreeCellRenderer;
import ProjectData.SapforData.Regions.RegionsSet;
import ProjectData.SapforData.Variants.UI.VariantRankRenderer;
import ProjectData.SapforData.Variants.VariantsSet;
-import Repository.ComponentsServer.Component.BugReport.BugReportsDBTable;
-import Repository.ComponentsServer.Component.UI.ComponentsForm;
-import Repository.ComponentsServer.Subscribes.SubsribersDBTable;
-import Repository.TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
-import Repository.TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
-import Repository.TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
-import Repository.TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
-import Repository.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
-import Repository.TestingSystem.DVM.Configuration.UI.ConfigurationDBTable;
-import Repository.TestingSystem.Common.Group.GroupsDBTable;
-import Repository.TestingSystem.DVM.Tasks.TestRunTasksDBTable;
-import Repository.TestingSystem.DVM.TasksPackage.TasksPackageDBTable;
-import Repository.TestingSystem.Common.Test.TestDBTable;
-import Common.Passes.PassCode_2021;
-import Common.UI.Windows.Interface.DebugWindow;
-import Common.UI.Windows.Interface.VersionsWindow;
-import Common.UI.Windows.Main.*;
+import Repository.BugReport.BugReportsDBTable;
+import Repository.Component.UI.ComponentsForm;
+import Repository.Subscribes.SubsribersDBTable;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
+import TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
+import TestingSystem.DVM.Configuration.UI.ConfigurationDBTable;
+import TestingSystem.Common.Group.GroupsDBTable;
+import TestingSystem.DVM.Tasks.TestRunTasksDBTable;
+import TestingSystem.DVM.TasksPackage.TasksPackageDBTable;
+import TestingSystem.Common.Test.TestDBTable;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.UI.Interface.DebugWindow;
+import Visual_DVM_2021.UI.Interface.VersionsWindow;
+import Visual_DVM_2021.UI.Main.*;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
diff --git a/src/Common/UI/Windows/Main/buffer_.java b/src/Common/UI/Windows/Main/buffer_.java
deleted file mode 100644
index 85454d87..00000000
--- a/src/Common/UI/Windows/Main/buffer_.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package Common.UI.Windows.Main;
-public class buffer_ {
-}
diff --git a/src/Common/UI/Windows/SearchReplaceForm.java b/src/Common/UI/Windows/SearchReplaceForm.java
index a413bcbe..456e10c2 100644
--- a/src/Common/UI/Windows/SearchReplaceForm.java
+++ b/src/Common/UI/Windows/SearchReplaceForm.java
@@ -4,8 +4,8 @@ import Common.UI.TextField.StyledTextField;
import Common.UI.Trees.StyledTree;
import Common.UI.UI;
import Common.Utils.Utils;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.fife.ui.rtextarea.SearchContext;
diff --git a/src/Common/Utils/Utils.java b/src/Common/Utils/Utils.java
index 6bf50df2..0b7009df 100644
--- a/src/Common/Utils/Utils.java
+++ b/src/Common/Utils/Utils.java
@@ -5,7 +5,7 @@ import Common.Global;
import Common.UI.UI;
import ProjectData.Files.DBProjectFile;
import ProjectData.Project.db_project_info;
-import Common.Passes.PassException;
+import Visual_DVM_2021.Passes.PassException;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
diff --git a/src/GlobalData/Account/Account.java b/src/GlobalData/Account/Account.java
index ad249855..fff6c48f 100644
--- a/src/GlobalData/Account/Account.java
+++ b/src/GlobalData/Account/Account.java
@@ -2,7 +2,7 @@ package GlobalData.Account;
import Common.Database.DBObject;
import Common.UI.UI;
import Common.Utils.TextLog;
-import Repository.ComponentsServer.Component.BugReport.BugReport;
+import Repository.BugReport.BugReport;
import com.sun.org.glassfish.gmbal.Description;
public class Account extends DBObject {
@Description("PRIMARY KEY,NOT NULL")
diff --git a/src/GlobalData/Compiler/UI/CompilerFields.java b/src/GlobalData/Compiler/UI/CompilerFields.java
index 4eea7b6c..1ee43dd8 100644
--- a/src/GlobalData/Compiler/UI/CompilerFields.java
+++ b/src/GlobalData/Compiler/UI/CompilerFields.java
@@ -6,8 +6,8 @@ import Common.UI.Windows.Dialog.DialogFields;
import Common.Utils.Files.VDirectoryChooser;
import GlobalData.Compiler.CompilerType;
import GlobalData.Machine.MachineType;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
diff --git a/src/GlobalData/GlobalDatabase.java b/src/GlobalData/GlobalDatabase.java
index 14429bd2..e1921c7e 100644
--- a/src/GlobalData/GlobalDatabase.java
+++ b/src/GlobalData/GlobalDatabase.java
@@ -29,9 +29,9 @@ import GlobalData.Splitter.SplittersDBTable;
import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable;
-import Repository.ComponentsServer.Component.ComponentType;
-import GlobalData.PassStats.PassStatsDBTable;
-import Common.Passes.PassCode_2021;
+import Repository.Component.ComponentType;
+import Visual_DVM_2021.PassStats.PassStatsDBTable;
+import Visual_DVM_2021.Passes.PassCode_2021;
import java.nio.file.Paths;
import java.util.Date;
diff --git a/src/GlobalData/Module/UI/ModuleAnchestorFields.java b/src/GlobalData/Module/UI/ModuleAnchestorFields.java
index bc59dd9b..502b7940 100644
--- a/src/GlobalData/Module/UI/ModuleAnchestorFields.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorFields.java
@@ -8,8 +8,8 @@ import GlobalData.Makefile.Makefile;
import GlobalData.Module.Module;
import GlobalData.Module.ModuleAnchestor;
import ProjectData.LanguageName;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import java.awt.*;
diff --git a/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java b/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
index 2cf330aa..ade860ad 100644
--- a/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
@@ -4,7 +4,7 @@ import Common.Global;
import Common.UI.UI;
import Common.UI.Windows.Dialog.Dialog;
import GlobalData.RemoteFile.RemoteFile;
-import Common.Passes.SSH.ConnectionPass;
+import Visual_DVM_2021.Passes.SSH.ConnectionPass;
import com.jcraft.jsch.ChannelSftp.LsEntry;
import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/GlobalData/RunConfiguration/RunConfiguration.java b/src/GlobalData/RunConfiguration/RunConfiguration.java
index 531d56c5..6b160d79 100644
--- a/src/GlobalData/RunConfiguration/RunConfiguration.java
+++ b/src/GlobalData/RunConfiguration/RunConfiguration.java
@@ -12,7 +12,7 @@ import GlobalData.Tasks.CompilationTask.CompilationTask;
import GlobalData.Tasks.RunTask.RunTask;
import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info;
-import Common.Passes.PassException;
+import Visual_DVM_2021.Passes.PassException;
import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap;
diff --git a/src/GlobalData/Settings/DBSetting.java b/src/GlobalData/Settings/DBSetting.java
index 07ca78d1..35f572a1 100644
--- a/src/GlobalData/Settings/DBSetting.java
+++ b/src/GlobalData/Settings/DBSetting.java
@@ -2,9 +2,9 @@ package GlobalData.Settings;
import Common.Database.DBObject;
import Common.UI.Menus_2023.StableMenuItem;
import Common.Utils.Utils;
-import Repository.ComponentsServer.Component.ComponentType;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Repository.Component.ComponentType;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import com.sun.org.glassfish.gmbal.Description;
import javax.swing.*;
diff --git a/src/GlobalData/Settings/SettingsDBTable.java b/src/GlobalData/Settings/SettingsDBTable.java
index 9be0a478..32602678 100644
--- a/src/GlobalData/Settings/SettingsDBTable.java
+++ b/src/GlobalData/Settings/SettingsDBTable.java
@@ -2,7 +2,7 @@ package GlobalData.Settings;
import Common.Database.DBTable;
import Common.Global;
import Common.Utils.Utils;
-import Repository.ComponentsServer.Component.ComponentType;
+import Repository.Component.ComponentType;
import java.util.Vector;
import java.util.stream.Collectors;
diff --git a/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
index ed6d2a68..039eb663 100644
--- a/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
+++ b/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
@@ -5,8 +5,8 @@ import Common.UI.DataSetControlForm;
import Common.UI.Menus.TableMenu;
import Common.UI.UI;
import GlobalData.Tasks.RunTask.RunTask;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import java.util.LinkedHashMap;
diff --git a/src/GlobalData/Tasks/Passes/TaskLocalPass.java b/src/GlobalData/Tasks/Passes/TaskLocalPass.java
index 40ba2a0f..6e2d2728 100644
--- a/src/GlobalData/Tasks/Passes/TaskLocalPass.java
+++ b/src/GlobalData/Tasks/Passes/TaskLocalPass.java
@@ -2,7 +2,7 @@ package GlobalData.Tasks.Passes;
import Common.Current;
import Common.Global;
import GlobalData.Tasks.Supervisor.TaskSupervisor;
-import Common.Passes.ProcessPass;
+import Visual_DVM_2021.Passes.ProcessPass;
public abstract class TaskLocalPass extends ProcessPass {
public S supervisor; //инициализация идет в конструкторе потомка.
public TaskLocalPass(Class s_class) {
diff --git a/src/GlobalData/Tasks/RunTask/RunTask.java b/src/GlobalData/Tasks/RunTask/RunTask.java
index 8ca62783..94b4c015 100644
--- a/src/GlobalData/Tasks/RunTask/RunTask.java
+++ b/src/GlobalData/Tasks/RunTask/RunTask.java
@@ -10,7 +10,7 @@ import GlobalData.Tasks.CompilationTask.CompilationTask;
import GlobalData.Tasks.Task;
import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info;
-import Repository.TestingSystem.DVM.Tasks.TestRunTaskInterface;
+import TestingSystem.DVM.Tasks.TestRunTaskInterface;
import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils;
diff --git a/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
index d53518c9..ff0c108f 100644
--- a/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
+++ b/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
@@ -4,8 +4,8 @@ import Common.Database.iDBTable;
import Common.UI.DataSetControlForm;
import Common.UI.Menus.TableMenu;
import Common.UI.UI;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import static Common.UI.Tables.TableRenderers.RendererDate;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
diff --git a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
index 6bb56ac1..87e2de26 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
@@ -5,7 +5,7 @@ import GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
import GlobalData.Tasks.Task;
import GlobalData.Tasks.TaskState;
import GlobalData.User.User;
-import Common.Passes.PassException;
+import Visual_DVM_2021.Passes.PassException;
import java.io.File;
import java.nio.file.Files;
diff --git a/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
index 3fbf046e..ae65f5c9 100644
--- a/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
@@ -6,7 +6,7 @@ import GlobalData.Tasks.RunTask.RunTask;
import GlobalData.Tasks.Supervisor.TaskSupervisor;
import GlobalData.Tasks.Task;
import GlobalData.Tasks.TaskState;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import org.apache.commons.io.FileUtils;
import java.io.File;
diff --git a/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
index 3e0fbedb..b9136a9b 100644
--- a/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
@@ -5,7 +5,7 @@ import GlobalData.RemoteFile.RemoteFile;
import GlobalData.Tasks.Supervisor.TaskSupervisor;
import GlobalData.Tasks.Task;
import GlobalData.Tasks.TaskState;
-import Common.Passes.SSH.ConnectionPass;
+import Visual_DVM_2021.Passes.SSH.ConnectionPass;
public abstract class RemoteTaskSupervisor extends TaskSupervisor {
protected RemoteFile getRemoteProjectsPath() {
return new RemoteFile(pass.user.getRemoteProjectsPath(), true);
diff --git a/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java b/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
index 7cdd4f49..63aee78a 100644
--- a/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
@@ -4,8 +4,8 @@ import Common.Utils.Utils;
import GlobalData.Tasks.Task;
import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info;
-import Common.Passes.PassException;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassException;
+import Visual_DVM_2021.Passes.Pass_2021;
import java.util.Date;
public abstract class TaskSupervisor {
diff --git a/src/GlobalData/User/User.java b/src/GlobalData/User/User.java
index ec12493a..a5c27c5a 100644
--- a/src/GlobalData/User/User.java
+++ b/src/GlobalData/User/User.java
@@ -3,8 +3,8 @@ import Common.Constants;
import Common.Current;
import Common.Database.iDBObject;
import GlobalData.Machine.Machine;
-import Repository.TestingSystem.DVM.UserConnection;
-import Common.Passes.SSH.ConnectionPass;
+import TestingSystem.DVM.UserConnection;
+import Visual_DVM_2021.Passes.SSH.ConnectionPass;
import com.sun.org.glassfish.gmbal.Description;
import java.io.File;
diff --git a/src/ProjectData/Files/DBProjectFile.java b/src/ProjectData/Files/DBProjectFile.java
index 1865af7a..c301a693 100644
--- a/src/ProjectData/Files/DBProjectFile.java
+++ b/src/ProjectData/Files/DBProjectFile.java
@@ -15,7 +15,7 @@ import ProjectData.SapforData.FileObjectWithMessages;
import ProjectData.SapforData.Functions.FuncCall;
import ProjectData.SapforData.Functions.FuncInfo;
import ProjectData.SapforData.Loops.Loop;
-import Common.UI.Windows.Main.FileForm;
+import Visual_DVM_2021.UI.Main.FileForm;
import com.sun.org.glassfish.gmbal.Description;
import javafx.util.Pair;
diff --git a/src/ProjectData/Files/UI/Editor/SPFEditor.java b/src/ProjectData/Files/UI/Editor/SPFEditor.java
index 50cb26ea..e3a2eb56 100644
--- a/src/ProjectData/Files/UI/Editor/SPFEditor.java
+++ b/src/ProjectData/Files/UI/Editor/SPFEditor.java
@@ -12,9 +12,9 @@ import ProjectData.Files.FileState;
import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
import Common.UI.Menus.MainEditorMenu;
import ProjectData.SapforData.Loops.Loop;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
-import Common.UI.Windows.Interface.SPFEditorInterface;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
+import Visual_DVM_2021.UI.Interface.SPFEditorInterface;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
diff --git a/src/ProjectData/Files/UI/FilesTree.java b/src/ProjectData/Files/UI/FilesTree.java
index 9c643eba..25b01fad 100644
--- a/src/ProjectData/Files/UI/FilesTree.java
+++ b/src/ProjectData/Files/UI/FilesTree.java
@@ -8,8 +8,8 @@ import Common.UI.UI;
import Common.UI.Trees.StyledTree;
import Common.UI.Trees.TreeRenderers;
import ProjectData.Files.DBProjectFile;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;
diff --git a/src/ProjectData/Messages/Message.java b/src/ProjectData/Messages/Message.java
index d69aa721..d609668b 100644
--- a/src/ProjectData/Messages/Message.java
+++ b/src/ProjectData/Messages/Message.java
@@ -6,7 +6,7 @@ import Common.Utils.Utils;
import GlobalData.Settings.SettingName;
import ProjectData.SapforData.FileObject;
import ProjectData.SapforData.FileObjectWithMessages;
-import Common.Passes.PassException;
+import Visual_DVM_2021.Passes.PassException;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/ProjectData/Messages/Recommendations/MessageRecommendation.java b/src/ProjectData/Messages/Recommendations/MessageRecommendation.java
index 173d05e8..2ffa00cd 100644
--- a/src/ProjectData/Messages/Recommendations/MessageRecommendation.java
+++ b/src/ProjectData/Messages/Recommendations/MessageRecommendation.java
@@ -2,7 +2,7 @@ package ProjectData.Messages.Recommendations;
import Common.Database.iDBObject;
import Common.Utils.Utils;
import GlobalData.Settings.SettingName;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
import com.sun.org.glassfish.gmbal.Description;
public class MessageRecommendation extends iDBObject {
//рекомендация может касаться, либо настройки либо прохода. так же может быть просто текстовой.
diff --git a/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java b/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
index 61250776..2352a1d2 100644
--- a/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
+++ b/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
@@ -4,7 +4,7 @@ import Common.Database.iDBTable;
import Common.UI.DataSetControlForm;
import Common.UI.Tables.TableRenderers;
import GlobalData.Settings.SettingName;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
public class RecommendationsDBTable extends iDBTable {
//group=1 - настройка
//group=2 - преобразование
diff --git a/src/ProjectData/Project/ChangeSettingPass.java b/src/ProjectData/Project/ChangeSettingPass.java
index 34440464..9384711f 100644
--- a/src/ProjectData/Project/ChangeSettingPass.java
+++ b/src/ProjectData/Project/ChangeSettingPass.java
@@ -1,6 +1,6 @@
package ProjectData.Project;
import GlobalData.Settings.DBSetting;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
public class ChangeSettingPass extends Pass_2021 {
@Override
protected boolean canStart(Object... args) throws Exception {
diff --git a/src/ProjectData/Project/UI/VersionsTree.java b/src/ProjectData/Project/UI/VersionsTree.java
index 36a6539e..b18c3a98 100644
--- a/src/ProjectData/Project/UI/VersionsTree.java
+++ b/src/ProjectData/Project/UI/VersionsTree.java
@@ -6,8 +6,8 @@ import Common.UI.Menus.VersionsMenu;
import Common.UI.Selectable;
import Common.UI.Trees.DataTree;
import Common.UI.Trees.TreeRenderers;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.tree.TreePath;
import java.awt.event.KeyAdapter;
diff --git a/src/ProjectData/Project/db_project_info.java b/src/ProjectData/Project/db_project_info.java
index 39f7ac0a..69084b60 100644
--- a/src/ProjectData/Project/db_project_info.java
+++ b/src/ProjectData/Project/db_project_info.java
@@ -31,10 +31,10 @@ import ProjectData.SapforData.Regions.ParallelRegion;
import ProjectData.SapforData.Regions.RegionsSet;
import ProjectData.SapforData.Variants.ParallelVariant;
import ProjectData.SapforData.Variants.VariantsSet;
-import Repository.TestingSystem.Common.Test.ProjectFiles_json;
-import Repository.TestingSystem.Common.Test.Test;
-import Common.Passes.PassCode_2021;
-import Common.Passes.PassException;
+import TestingSystem.Common.Test.ProjectFiles_json;
+import TestingSystem.Common.Test.Test;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassException;
import com.mxgraph.swing.mxGraphComponent;
import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils;
diff --git a/src/ProjectData/ProjectDatabase.java b/src/ProjectData/ProjectDatabase.java
index 596cba0c..3151f3d3 100644
--- a/src/ProjectData/ProjectDatabase.java
+++ b/src/ProjectData/ProjectDatabase.java
@@ -12,7 +12,7 @@ import ProjectData.PredictorStatistic.PredictorStatisticsDBTable;
import ProjectData.Project.ProjectInfoDBTable;
import ProjectData.Project.db_project_info;
import ProjectData.SapforData.Functions.FuncCoordinatesDBTable;
-import Common.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
diff --git a/src/ProjectData/SapforData/Arrays/ArraysSet.java b/src/ProjectData/SapforData/Arrays/ArraysSet.java
index 2c2e8c8f..2ab50759 100644
--- a/src/ProjectData/SapforData/Arrays/ArraysSet.java
+++ b/src/ProjectData/SapforData/Arrays/ArraysSet.java
@@ -4,8 +4,8 @@ import Common.Database.DataSet;
import Common.Global;
import Common.UI.DataSetControlForm;
import GlobalData.Settings.SettingName;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import java.util.Vector;
diff --git a/src/ProjectData/SapforData/Arrays/ProjectArray.java b/src/ProjectData/SapforData/Arrays/ProjectArray.java
index b1823027..7afa0ed0 100644
--- a/src/ProjectData/SapforData/Arrays/ProjectArray.java
+++ b/src/ProjectData/SapforData/Arrays/ProjectArray.java
@@ -11,8 +11,8 @@ import ProjectData.SapforData.Arrays.Templates.TemplateDimensionState;
import ProjectData.SapforData.Arrays.Templates.TemplateLink;
import ProjectData.SapforData.Regions.ParallelRegion;
import ProjectData.SapforData.Regions.UI.ArrayAlignmentBar;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javafx.util.Pair;
import javax.swing.*;
diff --git a/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java b/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
index 2b63766a..5226b11b 100644
--- a/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
+++ b/src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
@@ -1,8 +1,8 @@
package ProjectData.SapforData.Arrays.UI;
import Common.UI.Menus.GraphMenu;
import Common.UI.Trees.StyledTree;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
public class DistributionMenu extends GraphMenu {
diff --git a/src/ProjectData/SapforData/Functions/FuncCall.java b/src/ProjectData/SapforData/Functions/FuncCall.java
index a7e6fbbd..80ac91fc 100644
--- a/src/ProjectData/SapforData/Functions/FuncCall.java
+++ b/src/ProjectData/SapforData/Functions/FuncCall.java
@@ -3,8 +3,8 @@ import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
public class FuncCall extends FileObjectWithMessages {
public String funcName = ""; //не нужны дополнительные поля.имя функции это уже ключ.
public boolean canBeInlined = false;
diff --git a/src/ProjectData/SapforData/Functions/FuncCallH.java b/src/ProjectData/SapforData/Functions/FuncCallH.java
index 45818934..5e03385f 100644
--- a/src/ProjectData/SapforData/Functions/FuncCallH.java
+++ b/src/ProjectData/SapforData/Functions/FuncCallH.java
@@ -1,8 +1,8 @@
package ProjectData.SapforData.Functions;
import Common.UI.UI;
import Common.Utils.Utils;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import java.util.Vector;
public class FuncCallH extends FuncCall {
diff --git a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
index 112f7f54..21caa7d0 100644
--- a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
+++ b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
@@ -4,9 +4,9 @@ import Common.UI.Menus.VisualiserMenuItem;
import Common.UI.Menus.StyledPopupMenu;
import Common.UI.UI;
import Common.Utils.Utils;
-import Common.Passes.All.SPF_GetGraphFunctionPositions;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import java.awt.event.ActionEvent;
diff --git a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
index 5c5c4625..cd90ee30 100644
--- a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
+++ b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
@@ -5,9 +5,9 @@ import Common.Utils.Utils;
import ProjectData.SapforData.Functions.FuncCoordinates;
import ProjectData.SapforData.Functions.FuncInfo;
import ProjectData.SapforData.Functions.FunctionType;
-import Common.Passes.All.SPF_GetGraphFunctionPositions;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import com.mxgraph.model.mxCell;
import com.mxgraph.model.mxGeometry;
import com.mxgraph.swing.mxGraphComponent;
diff --git a/src/Repository/ComponentsServer/Component/BugReport/BugReport.java b/src/Repository/BugReport/BugReport.java
similarity index 95%
rename from src/Repository/ComponentsServer/Component/BugReport/BugReport.java
rename to src/Repository/BugReport/BugReport.java
index 823d9e1d..3c2fbd09 100644
--- a/src/Repository/ComponentsServer/Component/BugReport/BugReport.java
+++ b/src/Repository/BugReport/BugReport.java
@@ -1,9 +1,9 @@
-package Repository.ComponentsServer.Component.BugReport;
+package Repository.BugReport;
import Common.Current;
import Common.Database.DBObject;
import Common.Database.rDBObject;
import Common.Global;
-import Repository.ComponentsServer.Component.ComponentType;
+import Repository.Component.ComponentType;
import com.sun.org.glassfish.gmbal.Description;
import java.io.File;
diff --git a/src/Repository/ComponentsServer/Component/BugReport/BugReportInterface.java b/src/Repository/BugReport/BugReportInterface.java
similarity index 98%
rename from src/Repository/ComponentsServer/Component/BugReport/BugReportInterface.java
rename to src/Repository/BugReport/BugReportInterface.java
index cf8c55fb..dc0bbf0e 100644
--- a/src/Repository/ComponentsServer/Component/BugReport/BugReportInterface.java
+++ b/src/Repository/BugReport/BugReportInterface.java
@@ -1,10 +1,10 @@
-package Repository.ComponentsServer.Component.BugReport;
+package Repository.BugReport;
import Common.Current;
import Common.Global;
import Common.Utils.TextLog;
import Common.Utils.Utils;
import Repository.RepositoryServer;
-import Repository.ComponentsServer.Subscribes.Subscriber;
+import Repository.Subscribes.Subscriber;
import java.io.File;
import java.nio.file.Paths;
diff --git a/src/Repository/ComponentsServer/Component/BugReport/BugReportState.java b/src/Repository/BugReport/BugReportState.java
similarity index 94%
rename from src/Repository/ComponentsServer/Component/BugReport/BugReportState.java
rename to src/Repository/BugReport/BugReportState.java
index e0bd293b..9e78bb36 100644
--- a/src/Repository/ComponentsServer/Component/BugReport/BugReportState.java
+++ b/src/Repository/BugReport/BugReportState.java
@@ -1,4 +1,4 @@
-package Repository.ComponentsServer.Component.BugReport;
+package Repository.BugReport;
import Common.Current;
import Common.UI.StatusEnum;
import Common.UI.Themes.VisualiserFonts;
diff --git a/src/Repository/ComponentsServer/Component/BugReport/BugReportsDBTable.java b/src/Repository/BugReport/BugReportsDBTable.java
similarity index 97%
rename from src/Repository/ComponentsServer/Component/BugReport/BugReportsDBTable.java
rename to src/Repository/BugReport/BugReportsDBTable.java
index c06392ee..40bf3d49 100644
--- a/src/Repository/ComponentsServer/Component/BugReport/BugReportsDBTable.java
+++ b/src/Repository/BugReport/BugReportsDBTable.java
@@ -1,10 +1,10 @@
-package Repository.ComponentsServer.Component.BugReport;
+package Repository.BugReport;
import Common.Current;
import Common.Database.DBTable;
import Common.UI.DataSetControlForm;
import Common.UI.UI;
-import Common.Passes.PassCode_2021;
-import Common.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*;
import java.awt.event.ActionEvent;
diff --git a/src/Repository/ComponentsServer/BugReportsDatabase.java b/src/Repository/BugReportsDatabase.java
similarity index 76%
rename from src/Repository/ComponentsServer/BugReportsDatabase.java
rename to src/Repository/BugReportsDatabase.java
index 90d030c1..cdf9ae91 100644
--- a/src/Repository/ComponentsServer/BugReportsDatabase.java
+++ b/src/Repository/BugReportsDatabase.java
@@ -1,11 +1,11 @@
-package Repository.ComponentsServer;
+package Repository;
import Common.Database.SQLITE.SQLiteDatabase;
import Common.Global;
-import Repository.ComponentsServer.Component.BugReport.BugReport;
-import Repository.ComponentsServer.Component.BugReport.BugReportsDBTable;
-import Repository.ComponentsServer.SubscriberWorkspace.SubscriberWorkspaceDBTable;
-import Repository.ComponentsServer.Subscribes.SubsribersDBTable;
-import Common.Passes.PassCode_2021;
+import Repository.BugReport.BugReport;
+import Repository.BugReport.BugReportsDBTable;
+import Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
+import Repository.Subscribes.SubsribersDBTable;
+import Visual_DVM_2021.Passes.PassCode_2021;
import java.nio.file.Paths;
import java.util.Vector;
diff --git a/src/Repository/ComponentsServer/Component/Component.java b/src/Repository/Component/Component.java
similarity index 97%
rename from src/Repository/ComponentsServer/Component/Component.java
rename to src/Repository/Component/Component.java
index eaf164ea..8371f69a 100644
--- a/src/Repository/ComponentsServer/Component/Component.java
+++ b/src/Repository/Component/Component.java
@@ -1,12 +1,12 @@
-package Repository.ComponentsServer.Component;
+package Repository.Component;
import Common.Constants;
import Common.Database.DBObject;
import Common.Global;
import Common.Utils.Files.VFileChooser;
import Common.Utils.TextLog;
import Common.Utils.Utils;
-import Common.Passes.PassException;
-import Common.UI.Windows.Interface.Loggable;
+import Visual_DVM_2021.Passes.PassException;
+import Visual_DVM_2021.UI.Interface.Loggable;
import java.io.File;
import java.nio.file.Files;
diff --git a/src/Repository/ComponentsServer/Component/ComponentState.java b/src/Repository/Component/ComponentState.java
similarity index 97%
rename from src/Repository/ComponentsServer/Component/ComponentState.java
rename to src/Repository/Component/ComponentState.java
index 06eb88f8..78a01256 100644
--- a/src/Repository/ComponentsServer/Component/ComponentState.java
+++ b/src/Repository/Component/ComponentState.java
@@ -1,4 +1,4 @@
-package Repository.ComponentsServer.Component;
+package Repository.Component;
import Common.Current;
import Common.UI.StatusEnum;
import Common.UI.Themes.VisualiserFonts;
diff --git a/src/Repository/ComponentsServer/Component/ComponentType.java b/src/Repository/Component/ComponentType.java
similarity index 95%
rename from src/Repository/ComponentsServer/Component/ComponentType.java
rename to src/Repository/Component/ComponentType.java
index f8a2b3af..af0b8c84 100644
--- a/src/Repository/ComponentsServer/Component/ComponentType.java
+++ b/src/Repository/Component/ComponentType.java
@@ -1,4 +1,4 @@
-package Repository.ComponentsServer.Component;
+package Repository.Component;
import java.io.Serializable;
public enum ComponentType implements Serializable {
Undefined,
diff --git a/src/Repository/ComponentsServer/Component/ComponentsSet.java b/src/Repository/Component/ComponentsSet.java
similarity index 98%
rename from src/Repository/ComponentsServer/Component/ComponentsSet.java
rename to src/Repository/Component/ComponentsSet.java
index 7e26b3ec..9ec7724d 100644
--- a/src/Repository/ComponentsServer/Component/ComponentsSet.java
+++ b/src/Repository/Component/ComponentsSet.java
@@ -1,4 +1,4 @@
-package Repository.ComponentsServer.Component;
+package Repository.Component;
import Common.Current;
import Common.Database.DataSet;
import Common.UI.DataSetControlForm;
diff --git a/src/Repository/ComponentsServer/Component/Instruction.java b/src/Repository/Component/Instruction.java
similarity index 97%
rename from src/Repository/ComponentsServer/Component/Instruction.java
rename to src/Repository/Component/Instruction.java
index 8e735a0c..ed3e564d 100644
--- a/src/Repository/ComponentsServer/Component/Instruction.java
+++ b/src/Repository/Component/Instruction.java
@@ -1,4 +1,4 @@
-package Repository.ComponentsServer.Component;
+package Repository.Component;
import Common.Global;
import Common.Utils.Utils;
diff --git a/src/Repository/ComponentsServer/Component/OSDComponent.java b/src/Repository/Component/OSDComponent.java
similarity index 88%
rename from src/Repository/ComponentsServer/Component/OSDComponent.java
rename to src/Repository/Component/OSDComponent.java
index 2ae8c66d..55ac227d 100644
--- a/src/Repository/ComponentsServer/Component/OSDComponent.java
+++ b/src/Repository/Component/OSDComponent.java
@@ -1,4 +1,4 @@
-package Repository.ComponentsServer.Component;
+package Repository.Component;
import Common.Global;
public abstract class OSDComponent extends Component {
@Override
diff --git a/src/Repository/ComponentsServer/Component/PerformanceAnalyzer/PerformanceAnalyzer.java b/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
similarity index 97%
rename from src/Repository/ComponentsServer/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
rename to src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
index d26684ef..b5c1e74d 100644
--- a/src/Repository/ComponentsServer/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
+++ b/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
@@ -1,11 +1,11 @@
-package Repository.ComponentsServer.Component.PerformanceAnalyzer;
+package Repository.Component.PerformanceAnalyzer;
import Common.Current;
import Common.Global;
import analyzer.common.MessageJtoJ;
import Common.UI.UI;
import Common.Utils.Utils;
-import Repository.ComponentsServer.Component.Component;
-import Repository.ComponentsServer.Component.ComponentType;
+import Repository.Component.Component;
+import Repository.Component.ComponentType;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
diff --git a/src/Repository/ComponentsServer/Component/Sapfor/MessagesServer.java b/src/Repository/Component/Sapfor/MessagesServer.java
similarity index 97%
rename from src/Repository/ComponentsServer/Component/Sapfor/MessagesServer.java
rename to src/Repository/Component/Sapfor/MessagesServer.java
index 9dd9bde5..e3ec15d5 100644
--- a/src/Repository/ComponentsServer/Component/Sapfor/MessagesServer.java
+++ b/src/Repository/Component/Sapfor/MessagesServer.java
@@ -1,4 +1,4 @@
-package Repository.ComponentsServer.Component.Sapfor;
+package Repository.Component.Sapfor;
import Common.Current;
import Common.Global;
diff --git a/src/Repository/ComponentsServer/Component/Sapfor/Sapfor.java b/src/Repository/Component/Sapfor/Sapfor.java
similarity index 97%
rename from src/Repository/ComponentsServer/Component/Sapfor/Sapfor.java
rename to src/Repository/Component/Sapfor/Sapfor.java
index ba4c19f4..8ad6cb66 100644
--- a/src/Repository/ComponentsServer/Component/Sapfor/Sapfor.java
+++ b/src/Repository/Component/Sapfor/Sapfor.java
@@ -1,4 +1,4 @@
-package Repository.ComponentsServer.Component.Sapfor;
+package Repository.Component.Sapfor;
import Common.Constants;
import Common.Current;
import Common.Global;
@@ -9,11 +9,11 @@ import ProjectData.Files.DBProjectFile;
import ProjectData.Files.FileState;
import ProjectData.Files.LanguageStyle;
import ProjectData.Project.db_project_info;
-import Repository.ComponentsServer.Component.OSDComponent;
-import Repository.ComponentsServer.Component.Visualizer_2;
-import Common.Passes.PassCode_2021;
-import Common.Passes.PassException;
-import Common.Passes.Pass_2021;
+import Repository.Component.OSDComponent;
+import Repository.Component.Visualizer_2;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassException;
+import Visual_DVM_2021.Passes.Pass_2021;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -342,9 +342,9 @@ public abstract class Sapfor extends OSDComponent {
Pass_2021.passes.get(PassCode_2021.OpenCurrentFile).Do(cuf);
}
//
- public Common.Passes.SapforAnalysis getAnalysisByPhase(String phase) {
+ public Visual_DVM_2021.Passes.SapforAnalysis getAnalysisByPhase(String phase) {
for (PassCode_2021 analysis_code : getAnalysesCodes()) {
- Common.Passes.SapforAnalysis analysis = (Common.Passes.SapforAnalysis) Pass_2021.passes.get(analysis_code);
+ Visual_DVM_2021.Passes.SapforAnalysis analysis = (Visual_DVM_2021.Passes.SapforAnalysis) Pass_2021.passes.get(analysis_code);
if (analysis.phase().equals(phase)) return analysis;
}
return null;
diff --git a/src/Repository/ComponentsServer/Component/Sapfor/Sapfor_F.java b/src/Repository/Component/Sapfor/Sapfor_F.java
similarity index 87%
rename from src/Repository/ComponentsServer/Component/Sapfor/Sapfor_F.java
rename to src/Repository/Component/Sapfor/Sapfor_F.java
index c70cd089..3fc89df2 100644
--- a/src/Repository/ComponentsServer/Component/Sapfor/Sapfor_F.java
+++ b/src/Repository/Component/Sapfor/Sapfor_F.java
@@ -1,6 +1,6 @@
-package Repository.ComponentsServer.Component.Sapfor;
+package Repository.Component.Sapfor;
import Common.Global;
-import Repository.ComponentsServer.Component.ComponentType;
+import Repository.Component.ComponentType;
import java.io.File;
import java.nio.file.Paths;
diff --git a/src/Repository/ComponentsServer/Component/Sapfor/TransformationPermission.java b/src/Repository/Component/Sapfor/TransformationPermission.java
similarity index 58%
rename from src/Repository/ComponentsServer/Component/Sapfor/TransformationPermission.java
rename to src/Repository/Component/Sapfor/TransformationPermission.java
index 80e5c5f0..5cff906e 100644
--- a/src/Repository/ComponentsServer/Component/Sapfor/TransformationPermission.java
+++ b/src/Repository/Component/Sapfor/TransformationPermission.java
@@ -1,4 +1,4 @@
-package Repository.ComponentsServer.Component.Sapfor;
+package Repository.Component.Sapfor;
public enum TransformationPermission {
None,
All,
diff --git a/src/Repository/ComponentsServer/Component/UI/ComponentsFields.form b/src/Repository/Component/UI/ComponentsFields.form
similarity index 88%
rename from src/Repository/ComponentsServer/Component/UI/ComponentsFields.form
rename to src/Repository/Component/UI/ComponentsFields.form
index f2bc54d5..89686a8f 100644
--- a/src/Repository/ComponentsServer/Component/UI/ComponentsFields.form
+++ b/src/Repository/Component/UI/ComponentsFields.form
@@ -1,5 +1,5 @@
-