{
diff --git a/src/Visual_DVM_2021/Passes/SilentSapforPass.java b/src/Visual_DVM_2021/Passes/SilentSapforPass.java
index 0b7b8a1d..4e35c5db 100644
--- a/src/Visual_DVM_2021/Passes/SilentSapforPass.java
+++ b/src/Visual_DVM_2021/Passes/SilentSapforPass.java
@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes;
import _VisualDVM.Current;
-import Repository.Component.Sapfor.Sapfor;
+import _VisualDVM.Repository.Component.Sapfor.Sapfor;
public class SilentSapforPass extends CurrentProjectPass {
protected Sapfor sapfor;
@Override
diff --git a/src/Visual_DVM_2021/Passes/StartTestingPackage.java b/src/Visual_DVM_2021/Passes/StartTestingPackage.java
index 3887451f..e7da897a 100644
--- a/src/Visual_DVM_2021/Passes/StartTestingPackage.java
+++ b/src/Visual_DVM_2021/Passes/StartTestingPackage.java
@@ -3,9 +3,9 @@ import Common.CurrentAnchestor;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
import _VisualDVM.Global;
-import TestingSystem.Common.TestingPackage.TestingPackage;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.Common.TasksPackageState;
+import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
+import _VisualDVM.TestingSystem.Common.TestingServer;
+import _VisualDVM.TestingSystem.Common.TasksPackageState;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
public abstract class StartTestingPackage extends PublishServerObject {
public StartTestingPackage(Class p_in) {
diff --git a/src/Visual_DVM_2021/Passes/Transformation.java b/src/Visual_DVM_2021/Passes/Transformation.java
index 772d371d..3958d47f 100644
--- a/src/Visual_DVM_2021/Passes/Transformation.java
+++ b/src/Visual_DVM_2021/Passes/Transformation.java
@@ -3,9 +3,9 @@ import Common.CurrentAnchestor;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.PassMenuItem;
import _VisualDVM.Visual.UI;
-import ProjectData.Project.db_project_info;
-import ProjectData.ProjectView;
-import Repository.Component.Sapfor.TransformationPermission;
+import _VisualDVM.ProjectData.Project.db_project_info;
+import _VisualDVM.ProjectData.ProjectView;
+import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import javax.swing.*;
public class Transformation extends CurrentProjectPass {
diff --git a/src/Visual_DVM_2021/Passes/VariantsMassPass.java b/src/Visual_DVM_2021/Passes/VariantsMassPass.java
index 6992687e..2852be5b 100644
--- a/src/Visual_DVM_2021/Passes/VariantsMassPass.java
+++ b/src/Visual_DVM_2021/Passes/VariantsMassPass.java
@@ -1,9 +1,9 @@
package Visual_DVM_2021.Passes;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
-import ProjectData.Files.DBProjectFile;
-import ProjectData.SapforData.Variants.ParallelVariant;
-import Repository.Component.Sapfor.Sapfor;
+import _VisualDVM.ProjectData.Files.DBProjectFile;
+import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
+import _VisualDVM.Repository.Component.Sapfor.Sapfor;
public abstract class VariantsMassPass extends CurrentProjectPass {
public abstract PassCode_2021 getSubPassCode();
int count;
diff --git a/src/_VisualDVM/Current.java b/src/_VisualDVM/Current.java
index 738d636f..ed302e10 100644
--- a/src/_VisualDVM/Current.java
+++ b/src/_VisualDVM/Current.java
@@ -1,25 +1,25 @@
package _VisualDVM;
import Common.CurrentAnchestor;
-import GlobalData.Account.Account;
-import GlobalData.Compiler.Compiler;
-import GlobalData.Machine.Machine;
-import GlobalData.Makefile.Makefile;
-import GlobalData.Module.Module;
-import GlobalData.RemoteFile.RemoteFile;
-import GlobalData.RunConfiguration.RunConfiguration;
-import GlobalData.Tasks.CompilationTask.CompilationTask;
-import GlobalData.Tasks.RunTask.RunTask;
-import GlobalData.User.User;
-import ProjectData.Files.DBProjectFile;
-import ProjectData.Project.db_project_info;
-import ProjectData.SapforData.Functions.FuncInfo;
-import ProjectData.SapforData.Regions.ParallelRegion;
-import Repository.BugReport.BugReport;
-import Repository.Subscribes.Subscriber;
-import TestingSystem.Common.Test.Test;
-import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
-import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
+import _VisualDVM.GlobalData.Account.Account;
+import _VisualDVM.GlobalData.Compiler.Compiler;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.GlobalData.Makefile.Makefile;
+import _VisualDVM.GlobalData.Module.Module;
+import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
+import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
+import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
+import _VisualDVM.GlobalData.User.User;
+import _VisualDVM.ProjectData.Files.DBProjectFile;
+import _VisualDVM.ProjectData.Project.db_project_info;
+import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
+import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
+import _VisualDVM.Repository.BugReport.BugReport;
+import _VisualDVM.Repository.Subscribes.Subscriber;
+import _VisualDVM.TestingSystem.Common.Test.Test;
+import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
+import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import Visual_DVM_2021.Passes.UI.PassForm;
import javax.swing.tree.DefaultMutableTreeNode;
@@ -258,10 +258,10 @@ public enum Current implements CurrentAnchestor {
public static DBProjectFile getFile() {
return (DBProjectFile) CurrentAnchestor.get(File);
}
- public static Repository.Component.Component getComponent() {
- return (Repository.Component.Component) CurrentAnchestor.get(Component);
+ public static _VisualDVM.Repository.Component.Component getComponent() {
+ return (_VisualDVM.Repository.Component.Component) CurrentAnchestor.get(Component);
}
- public static Repository.BugReport.BugReport getBugReport() {
+ public static _VisualDVM.Repository.BugReport.BugReport getBugReport() {
return (BugReport) CurrentAnchestor.get(BugReport);
}
public static db_project_info getRoot() {
@@ -279,7 +279,7 @@ public enum Current implements CurrentAnchestor {
public static boolean HasSubscriber() {
return CurrentAnchestor.get(Current.Subscriber) != null;
}
- public static Repository.Subscribes.Subscriber getSubscriber() {
+ public static _VisualDVM.Repository.Subscribes.Subscriber getSubscriber() {
return (Subscriber) CurrentAnchestor.get(Current.Subscriber);
}
public static Machine getMachine() {
@@ -309,14 +309,14 @@ public enum Current implements CurrentAnchestor {
public static RunConfiguration getRunConfiguration() {
return (RunConfiguration) CurrentAnchestor.get(Current.RunConfiguration);
}
- public static Repository.Component.Sapfor.Sapfor getSapfor() {
- return (Repository.Component.Sapfor.Sapfor) CurrentAnchestor.get(Current.Sapfor);
+ public static _VisualDVM.Repository.Component.Sapfor.Sapfor getSapfor() {
+ return (_VisualDVM.Repository.Component.Sapfor.Sapfor) CurrentAnchestor.get(Current.Sapfor);
}
public static boolean HasGroup() {
return CurrentAnchestor.get(Current.Group) != null;
}
- public static TestingSystem.Common.Group.Group getGroup() {
- return (TestingSystem.Common.Group.Group) CurrentAnchestor.get(Current.Group);
+ public static _VisualDVM.TestingSystem.Common.Group.Group getGroup() {
+ return (_VisualDVM.TestingSystem.Common.Group.Group) CurrentAnchestor.get(Current.Group);
}
public static boolean HasConfiguration() {
return CurrentAnchestor.get(Current.DVMConfiguration) != null;
@@ -325,10 +325,10 @@ public enum Current implements CurrentAnchestor {
return (DVMConfiguration) CurrentAnchestor.get(Current.DVMConfiguration);
}
public static SapforConfiguration getSapforConfiguration() {
- return (TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) CurrentAnchestor.get(Current.SapforConfiguration);
+ return (_VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) CurrentAnchestor.get(Current.SapforConfiguration);
}
public static Test getTest() {
- return (TestingSystem.Common.Test.Test) CurrentAnchestor.get(Current.Test);
+ return (_VisualDVM.TestingSystem.Common.Test.Test) CurrentAnchestor.get(Current.Test);
}
public static boolean HasTest() {
return CurrentAnchestor.get(Current.Test) != null;
@@ -394,43 +394,43 @@ public enum Current implements CurrentAnchestor {
public static boolean HasSapforConfiguration() {
return CurrentAnchestor.get(Current.SapforConfiguration) != null;
}
- public static ProjectData.ProjectView getProjectView() {
- return (ProjectData.ProjectView) CurrentAnchestor.get(ProjectView);
+ public static _VisualDVM.ProjectData.ProjectView getProjectView() {
+ return (_VisualDVM.ProjectData.ProjectView) CurrentAnchestor.get(ProjectView);
}
public static boolean HasSapforProfile() {
return CurrentAnchestor.get(Current.SapforProfile) != null;
}
- public static GlobalData.SapforProfile.SapforProfile getSapforProfile() {
- return (GlobalData.SapforProfile.SapforProfile) CurrentAnchestor.get(Current.SapforProfile);
+ public static _VisualDVM.GlobalData.SapforProfile.SapforProfile getSapforProfile() {
+ return (_VisualDVM.GlobalData.SapforProfile.SapforProfile) CurrentAnchestor.get(Current.SapforProfile);
}
public static boolean HasServerSapfor() {
return CurrentAnchestor.get(Current.ServerSapfor) != null;
}
- public static TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
- return (TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) CurrentAnchestor.get(Current.ServerSapfor);
+ public static _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
+ return (_VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) CurrentAnchestor.get(Current.ServerSapfor);
}
public static boolean HasSubscriberWorkspace() {
return CurrentAnchestor.get(Current.SubscriberWorkspace) != null;
}
- public static Repository.SubscriberWorkspace.SubscriberWorkspace getSubscriberWorkspace() {
- return (Repository.SubscriberWorkspace.SubscriberWorkspace) CurrentAnchestor.get(Current.SubscriberWorkspace);
+ public static _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace getSubscriberWorkspace() {
+ return (_VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace) CurrentAnchestor.get(Current.SubscriberWorkspace);
}
public static boolean HasDVMPackage() {
return CurrentAnchestor.get(Current.DVMPackage) != null;
}
- public static TestingSystem.DVM.DVMPackage.DVMPackage getDVMPackage() {
- return (TestingSystem.DVM.DVMPackage.DVMPackage) CurrentAnchestor.get(Current.DVMPackage);
+ public static _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage getDVMPackage() {
+ return (_VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage) CurrentAnchestor.get(Current.DVMPackage);
}
public static boolean HasSapforPackage() {
return CurrentAnchestor.get(Current.SapforPackage) != null;
}
- public static TestingSystem.SAPFOR.SapforPackage.SapforPackage getSapforPackage() {
- return (TestingSystem.SAPFOR.SapforPackage.SapforPackage) CurrentAnchestor.get(Current.SapforPackage);
+ public static _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage getSapforPackage() {
+ return (_VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage) CurrentAnchestor.get(Current.SapforPackage);
}
public static boolean HasDVMRunTask() {
return CurrentAnchestor.get(Current.DVMRunTask) != null;
}
- public static TestingSystem.DVM.DVMTasks.DVMRunTask getDVMRunTask() {
- return (TestingSystem.DVM.DVMTasks.DVMRunTask) CurrentAnchestor.get(Current.DVMRunTask);
+ public static _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask getDVMRunTask() {
+ return (_VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask) CurrentAnchestor.get(Current.DVMRunTask);
}
}
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index a9b82fb9..60e45955 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -5,22 +5,22 @@ import Common.Mode;
import Common.Utils.CommonUtils;
import Common.Utils.Loggable;
import Common.Visual.CommonUI;
-import GlobalData.Account.Account;
-import GlobalData.Account.AccountRole;
-import GlobalData.GlobalDatabase;
-import GlobalData.Settings.DBSetting;
-import GlobalData.Settings.SettingName;
-import ProjectData.ProjectView;
-import Repository.Component.*;
-import Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
-import Repository.Component.Sapfor.MessagesServer;
-import Repository.Component.Sapfor.Sapfor_F;
-import Repository.Component.Sapfor.TransformationPermission;
-import Repository.Server.ComponentsServer;
-import TestingSystem.Common.TestingServer;
-import TestingSystem.DVM.LocalDVMTestingPlanner;
-import TestingSystem.DVM.RemoteDVMTestingPlanner;
-import TestingSystem.SAPFOR.PackageModeSupervisor;
+import _VisualDVM.GlobalData.Account.Account;
+import _VisualDVM.GlobalData.Account.AccountRole;
+import _VisualDVM.GlobalData.GlobalDatabase;
+import _VisualDVM.GlobalData.Settings.DBSetting;
+import _VisualDVM.GlobalData.Settings.SettingName;
+import _VisualDVM.ProjectData.ProjectView;
+import _VisualDVM.Repository.Component.*;
+import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
+import _VisualDVM.Repository.Component.Sapfor.MessagesServer;
+import _VisualDVM.Repository.Component.Sapfor.Sapfor_F;
+import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
+import _VisualDVM.Repository.Server.ComponentsServer;
+import _VisualDVM.TestingSystem.Common.TestingServer;
+import _VisualDVM.TestingSystem.DVM.LocalDVMTestingPlanner;
+import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
+import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
diff --git a/src/GlobalData/Account/Account.java b/src/_VisualDVM/GlobalData/Account/Account.java
similarity index 96%
rename from src/GlobalData/Account/Account.java
rename to src/_VisualDVM/GlobalData/Account/Account.java
index 7a366f0c..e971dbc4 100644
--- a/src/GlobalData/Account/Account.java
+++ b/src/_VisualDVM/GlobalData/Account/Account.java
@@ -1,8 +1,8 @@
-package GlobalData.Account;
+package _VisualDVM.GlobalData.Account;
import Common.Database.Objects.DBObject;
import _VisualDVM.Visual.UI;
import Common.Utils.TextLog;
-import Repository.BugReport.BugReport;
+import _VisualDVM.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/Account/AccountRole.java b/src/_VisualDVM/GlobalData/Account/AccountRole.java
similarity index 93%
rename from src/GlobalData/Account/AccountRole.java
rename to src/_VisualDVM/GlobalData/Account/AccountRole.java
index e636dccc..806e5c28 100644
--- a/src/GlobalData/Account/AccountRole.java
+++ b/src/_VisualDVM/GlobalData/Account/AccountRole.java
@@ -1,4 +1,4 @@
-package GlobalData.Account;
+package _VisualDVM.GlobalData.Account;
public enum AccountRole {
Undefined,
User,
diff --git a/src/GlobalData/Account/AccountSubscribeState.java b/src/_VisualDVM/GlobalData/Account/AccountSubscribeState.java
similarity index 92%
rename from src/GlobalData/Account/AccountSubscribeState.java
rename to src/_VisualDVM/GlobalData/Account/AccountSubscribeState.java
index 3a84612b..bfdbb206 100644
--- a/src/GlobalData/Account/AccountSubscribeState.java
+++ b/src/_VisualDVM/GlobalData/Account/AccountSubscribeState.java
@@ -1,4 +1,4 @@
-package GlobalData.Account;
+package _VisualDVM.GlobalData.Account;
public enum AccountSubscribeState {
Undefined,
None,
diff --git a/src/GlobalData/Account/AccountsDBTable.java b/src/_VisualDVM/GlobalData/Account/AccountsDBTable.java
similarity index 87%
rename from src/GlobalData/Account/AccountsDBTable.java
rename to src/_VisualDVM/GlobalData/Account/AccountsDBTable.java
index 8b987c13..e778385b 100644
--- a/src/GlobalData/Account/AccountsDBTable.java
+++ b/src/_VisualDVM/GlobalData/Account/AccountsDBTable.java
@@ -1,4 +1,4 @@
-package GlobalData.Account;
+package _VisualDVM.GlobalData.Account;
import Common.Database.Tables.DBTable;
public class AccountsDBTable extends DBTable {
public AccountsDBTable() {
diff --git a/src/GlobalData/Compiler/Compiler.java b/src/_VisualDVM/GlobalData/Compiler/Compiler.java
similarity index 95%
rename from src/GlobalData/Compiler/Compiler.java
rename to src/_VisualDVM/GlobalData/Compiler/Compiler.java
index f537c0f2..67a49671 100644
--- a/src/GlobalData/Compiler/Compiler.java
+++ b/src/_VisualDVM/GlobalData/Compiler/Compiler.java
@@ -1,13 +1,13 @@
-package GlobalData.Compiler;
+package _VisualDVM.GlobalData.Compiler;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Validators.DVMHelpParser;
-import GlobalData.CompilerEnvironment.CompilerEnvironmentsSet;
-import GlobalData.CompilerOption.CompilerOptionsSet;
-import GlobalData.Machine.Machine;
-import ProjectData.Files.DBProjectFile;
-import ProjectData.LanguageName;
+import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironmentsSet;
+import _VisualDVM.GlobalData.CompilerOption.CompilerOptionsSet;
+import _VisualDVM.GlobalData.Machine.Machine;
+import _VisualDVM.ProjectData.Files.DBProjectFile;
+import _VisualDVM.ProjectData.LanguageName;
import com.sun.org.glassfish.gmbal.Description;
public class Compiler extends iDBObject {
public int machine_id = -1;
diff --git a/src/GlobalData/Compiler/CompilerType.java b/src/_VisualDVM/GlobalData/Compiler/CompilerType.java
similarity index 73%
rename from src/GlobalData/Compiler/CompilerType.java
rename to src/_VisualDVM/GlobalData/Compiler/CompilerType.java
index 25d39c5a..87e77b1a 100644
--- a/src/GlobalData/Compiler/CompilerType.java
+++ b/src/_VisualDVM/GlobalData/Compiler/CompilerType.java
@@ -1,4 +1,4 @@
-package GlobalData.Compiler;
+package _VisualDVM.GlobalData.Compiler;
public enum CompilerType {
Undefined,
//----------------------
diff --git a/src/GlobalData/Compiler/CompilersDBTable.java b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
similarity index 96%
rename from src/GlobalData/Compiler/CompilersDBTable.java
rename to src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
index a0cc39c0..49d3dfd0 100644
--- a/src/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
@@ -1,4 +1,4 @@
-package GlobalData.Compiler;
+package _VisualDVM.GlobalData.Compiler;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -12,10 +12,10 @@ import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
-import GlobalData.Compiler.UI.CompilerFields;
-import GlobalData.Makefile.Makefile;
-import GlobalData.Module.Module;
-import GlobalData.RunConfiguration.RunConfiguration;
+import _VisualDVM.GlobalData.Compiler.UI.CompilerFields;
+import _VisualDVM.GlobalData.Makefile.Makefile;
+import _VisualDVM.GlobalData.Module.Module;
+import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import java.util.LinkedHashMap;
public class CompilersDBTable extends iDBTable {
diff --git a/src/GlobalData/Compiler/CompilersMenuBar.java b/src/_VisualDVM/GlobalData/Compiler/CompilersMenuBar.java
similarity index 91%
rename from src/GlobalData/Compiler/CompilersMenuBar.java
rename to src/_VisualDVM/GlobalData/Compiler/CompilersMenuBar.java
index ca590f97..c9ad73e1 100644
--- a/src/GlobalData/Compiler/CompilersMenuBar.java
+++ b/src/_VisualDVM/GlobalData/Compiler/CompilersMenuBar.java
@@ -1,4 +1,4 @@
-package GlobalData.Compiler;
+package _VisualDVM.GlobalData.Compiler;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class CompilersMenuBar extends DataMenuBar {
diff --git a/src/GlobalData/Compiler/UI/CompilerFields.form b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.form
similarity index 98%
rename from src/GlobalData/Compiler/UI/CompilerFields.form
rename to src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.form
index 8d0dccf7..cdeefeb7 100644
--- a/src/GlobalData/Compiler/UI/CompilerFields.form
+++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.form
@@ -1,5 +1,5 @@
-