промежуточный. частичный рефакторинг с прицелом на библиотечную часть

2024-10-07 00:58:29 +03:00
parent c211ffb82b
commit 6b1576461d
798 changed files with 3007 additions and 2344 deletions
--- a/src/GlobalData/Account/Account.java
+++ b/src/GlobalData/Account/Account.java
@@ -1,6 +1,6 @@
 package GlobalData.Account;
-import Common.Database.DBObject;
-import Common.UI.UI;
+import Common.Database.Objects.DBObject;
+import Common_old.UI.UI;
 import Common.Utils.TextLog;
 import Repository.BugReport.BugReport;
 import com.sun.org.glassfish.gmbal.Description;
--- a/src/GlobalData/Account/AccountsDBTable.java
+++ b/src/GlobalData/Account/AccountsDBTable.java
@@ -1,5 +1,5 @@
 package GlobalData.Account;
-import Common.Database.DBTable;
+import Common.Database.Tables.DBTable;
 public class AccountsDBTable extends DBTable<Integer, Account> {
    public AccountsDBTable() {
        super(Integer.class, Account.class);
--- a/src/GlobalData/Compiler/Compiler.java
+++ b/src/GlobalData/Compiler/Compiler.java
@@ -1,8 +1,8 @@
 package GlobalData.Compiler;
-import Common.Current;
-import Common.Database.iDBObject;
-import Common.Utils.Utils;
-import Common.Utils.Validators.DVMHelpParser;
+import Common_old.Current;
+import Common.Database.Objects.iDBObject;
+import Common_old.Utils.Utils;
+import Common_old.Utils.Validators.DVMHelpParser;
 import GlobalData.CompilerEnvironment.CompilerEnvironmentsSet;
 import GlobalData.CompilerOption.CompilerOptionsSet;
 import GlobalData.Machine.Machine;
--- a/src/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/GlobalData/Compiler/CompilersDBTable.java
@@ -1,11 +1,15 @@
 package GlobalData.Compiler;
-import Common.Current;
-import Common.Database.*;
-import Common.UI.DataSetControlForm;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DBObjectDialog;
-import Common.Utils.Utils;
-import Common.Utils.Validators.PathValidator;
+import Common_old.Current;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common_old.Utils.Utils;
+import Common_old.Utils.Validators.PathValidator;
+import Common.Database.Objects.DBObject;
+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;
--- a/src/GlobalData/Compiler/CompilersMenuBar.java
+++ b/src/GlobalData/Compiler/CompilersMenuBar.java
@@ -1,11 +1,6 @@
 package GlobalData.Compiler;
-import Common.UI.Menus_2023.DataMenuBar;
-import Common.UI.Menus_2023.MenuBarButton;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.UI;
+import Common_old.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
-
-import javax.swing.*;
 public class CompilersMenuBar extends DataMenuBar {
    public CompilersMenuBar() {
        super("компиляторы",
--- a/src/GlobalData/Compiler/UI/CompilerFields.java
+++ b/src/GlobalData/Compiler/UI/CompilerFields.java
@@ -1,9 +1,9 @@
 package GlobalData.Compiler.UI;
-import Common.Current;
-import Common.UI.TextField.StyledTextField;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DialogFields;
-import Common.Utils.Files.VDirectoryChooser;
+import Common_old.Current;
+import Common_old.UI.TextField.StyledTextField;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DialogFields;
+import Common_old.Utils.Files.VDirectoryChooser;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Machine.MachineType;
 import Visual_DVM_2021.Passes.PassCode_2021;
--- a/src/GlobalData/CompilerEnvironment/CompilerEnvironment.java
+++ b/src/GlobalData/CompilerEnvironment/CompilerEnvironment.java
@@ -1,5 +1,5 @@
 package GlobalData.CompilerEnvironment;
-import Common.Database.DBObject;
+import Common.Database.Objects.DBObject;
 import Common.Utils.TextLog;
 import com.sun.org.glassfish.gmbal.Description;

--- a/src/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
+++ b/src/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
@@ -1,10 +1,10 @@
 package GlobalData.CompilerEnvironment;
-import Common.Database.DataSet;
-import Common.UI.DataSetControlForm;
-import Common.UI.Tables.TableEditors;
-import Common.UI.Tables.TableRenderers;
+import Common.Database.Tables.DataSet;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.Tables.TableEditors;
+import Common_old.UI.Tables.TableRenderers;

-import static Common.UI.Tables.TableRenderers.RendererMultiline;
+import static Common_old.UI.Tables.TableRenderers.RendererMultiline;
 public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
    public CompilerEnvironmentsSet() {
        super(String.class, CompilerEnvironment.class);
--- a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
+++ b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
@@ -1,9 +1,9 @@
 package GlobalData.CompilerEnvironment.UI;
-import Common.Current;
-import Common.UI.Tables.DBObjectEditor;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.Text.ComboTextDialog;
+import Common_old.Current;
+import Common_old.UI.Tables.DBObjectEditor;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
 public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
    @Override
--- a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
+++ b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
@@ -1,7 +1,7 @@
 package GlobalData.CompilerEnvironment.UI;
-import Common.Current;
-import Common.UI.Tables.DBObjectRenderer;
-import Common.UI.Themes.VisualiserFonts;
+import Common_old.Current;
+import Common_old.UI.Tables.DBObjectRenderer;
+import Common_old.UI.Themes.VisualiserFonts;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
 public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
    @Override
--- a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java
+++ b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java
@@ -1,5 +1,5 @@
 package GlobalData.CompilerEnvironment.UI;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common_old.UI.Windows.Dialog.DialogFields;

 import javax.swing.*;
 import java.awt.*;
--- a/src/GlobalData/CompilerOption/CompilerOption.java
+++ b/src/GlobalData/CompilerOption/CompilerOption.java
@@ -1,6 +1,6 @@
 package GlobalData.CompilerOption;
-import Common.Database.DBObject;
-import Common.Utils.Utils;
+import Common.Database.Objects.DBObject;
+import Common_old.Utils.Utils;
 import com.sun.org.glassfish.gmbal.Description;

 import java.util.Arrays;
--- a/src/GlobalData/CompilerOption/CompilerOptionsSet.java
+++ b/src/GlobalData/CompilerOption/CompilerOptionsSet.java
@@ -1,10 +1,10 @@
 package GlobalData.CompilerOption;
-import Common.Database.DataSet;
-import Common.UI.DataSetControlForm;
-import Common.UI.Tables.TableEditors;
-import Common.UI.Tables.TableRenderers;
+import Common.Database.Tables.DataSet;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.Tables.TableEditors;
+import Common_old.UI.Tables.TableRenderers;

-import static Common.UI.Tables.TableRenderers.RendererMultiline;
+import static Common_old.UI.Tables.TableRenderers.RendererMultiline;
 public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
    public CompilerOptionsSet() {
        super(String.class, CompilerOption.class);
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
@@ -1,7 +1,7 @@
 package GlobalData.CompilerOption.UI;
-import Common.Current;
-import Common.UI.Tables.DBObjectRenderer;
-import Common.UI.Themes.VisualiserFonts;
+import Common_old.Current;
+import Common_old.UI.Tables.DBObjectRenderer;
+import Common_old.UI.Themes.VisualiserFonts;
 import GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
    @Override
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
@@ -1,9 +1,9 @@
 package GlobalData.CompilerOption.UI;
-import Common.Current;
-import Common.UI.Tables.DBObjectEditor;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.Text.ComboTextDialog;
+import Common_old.Current;
+import Common_old.UI.Tables.DBObjectEditor;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
 import GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> {
    @Override
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
@@ -1,7 +1,7 @@
 package GlobalData.CompilerOption.UI;
-import Common.Current;
-import Common.UI.Tables.DBObjectRenderer;
-import Common.UI.Themes.VisualiserFonts;
+import Common_old.Current;
+import Common_old.UI.Tables.DBObjectRenderer;
+import Common_old.UI.Themes.VisualiserFonts;
 import GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
    @Override
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java
@@ -1,5 +1,5 @@
 package GlobalData.CompilerOption.UI;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common_old.UI.Windows.Dialog.DialogFields;

 import javax.swing.*;
 import java.awt.*;
--- a/src/GlobalData/Credentials/Credentials.java
+++ b/src/GlobalData/Credentials/Credentials.java
@@ -1,6 +1,6 @@
 package GlobalData.Credentials;
-import Common.Constants;
-import Common.Database.iDBObject;
+import Common_old.Constants;
+import Common.Database.Objects.iDBObject;
 import com.sun.org.glassfish.gmbal.Description;
 public class Credentials extends iDBObject {
    @Description("DEFAULT -1")
--- a/src/GlobalData/Credentials/CredentialsDBTable.java
+++ b/src/GlobalData/Credentials/CredentialsDBTable.java
@@ -1,5 +1,5 @@
 package GlobalData.Credentials;
-import Common.Database.iDBTable;
+import Common.Database.Tables.iDBTable;
 public class CredentialsDBTable extends iDBTable<Credentials> {
    public CredentialsDBTable() {
        super(Credentials.class);
--- a/src/GlobalData/DBLastProject/DBLastProject.java
+++ b/src/GlobalData/DBLastProject/DBLastProject.java
@@ -1,5 +1,5 @@
 package GlobalData.DBLastProject;
-import Common.Database.DBObject;
+import Common.Database.Objects.DBObject;
 import ProjectData.Project.db_project_info;
 import com.sun.org.glassfish.gmbal.Description;

--- a/src/GlobalData/DBLastProject/LastProjectsDBTable.java
+++ b/src/GlobalData/DBLastProject/LastProjectsDBTable.java
@@ -1,5 +1,5 @@
 package GlobalData.DBLastProject;
-import Common.Database.DBTable;
+import Common.Database.Tables.DBTable;

 import java.util.Comparator;
 import java.util.Vector;
--- a/src/GlobalData/DVMParameter/DVMParameterDBTable.java
+++ b/src/GlobalData/DVMParameter/DVMParameterDBTable.java
@@ -1,11 +1,11 @@
 package GlobalData.DVMParameter;
-import Common.Current;
-import Common.Database.iDBTable;
-import Common.Global;
-import Common.UI.DataSetControlForm;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DBObjectDialog;
-import Common.Utils.Utils;
+import Common_old.Current;
+import Common.Database.Tables.iDBTable;
+import _VisualDVM.Global;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common_old.Utils.Utils;
 import GlobalData.DVMParameter.UI.DVMParameterFields;
 public class DVMParameterDBTable extends iDBTable<DVMParameter> {
    public DVMParameterDBTable() {
--- a/src/GlobalData/DVMParameter/DVMParametersMenuBar.java
+++ b/src/GlobalData/DVMParameter/DVMParametersMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.DVMParameter;
-import Common.UI.Menus_2023.DataMenuBar;
+import Common_old.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMParametersMenuBar extends DataMenuBar {
    public DVMParametersMenuBar() {
--- a/src/GlobalData/DVMParameter/UI/DVMParameterFields.java
+++ b/src/GlobalData/DVMParameter/UI/DVMParameterFields.java
@@ -1,7 +1,7 @@
 package GlobalData.DVMParameter.UI;
-import Common.UI.ComboBox.StyledTextComboBox;
-import Common.UI.TextField.StyledTextField;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common_old.UI.ComboBox.StyledTextComboBox;
+import Common_old.UI.TextField.StyledTextField;
+import Common_old.UI.Windows.Dialog.DialogFields;

 import javax.swing.*;
 import java.awt.*;
--- a/src/GlobalData/EnvironmentValue/EnvironmentValue.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValue.java
@@ -1,8 +1,8 @@
 package GlobalData.EnvironmentValue;
-import Common.Constants;
-import Common.Current;
-import Common.Database.iDBObject;
-import Common.Utils.Utils;
+import Common_old.Constants;
+import Common_old.Current;
+import Common.Database.Objects.iDBObject;
+import Common_old.Utils.Utils;
 public class EnvironmentValue extends iDBObject {
    public String name = "";
    public String value = "";
--- a/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
@@ -1,11 +1,11 @@
 package GlobalData.EnvironmentValue;
-import Common.Current;
-import Common.Database.iDBTable;
-import Common.Global;
-import Common.UI.DataSetControlForm;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DBObjectDialog;
-import Common.Utils.Utils;
+import Common_old.Current;
+import Common.Database.Tables.iDBTable;
+import _VisualDVM.Global;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common_old.Utils.Utils;
 import GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
 public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
    public EnvironmentValuesDBTable() {
--- a/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.EnvironmentValue;
-import Common.UI.Menus_2023.DataMenuBar;
+import Common_old.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EnvironmentValuesMenuBar extends DataMenuBar {
    public EnvironmentValuesMenuBar() {
--- a/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java
+++ b/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java
@@ -1,6 +1,6 @@
 package GlobalData.EnvironmentValue.UI;
-import Common.UI.TextField.StyledTextField;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common_old.UI.TextField.StyledTextField;
+import Common_old.UI.Windows.Dialog.DialogFields;

 import javax.swing.*;
 import java.awt.*;
--- a/src/GlobalData/FileObject/DirInfo.java
+++ b/src/GlobalData/FileObject/DirInfo.java
@@ -1,5 +1,5 @@
 package GlobalData.FileObject;
-import Common.Database.DBObject;
+import Common.Database.Objects.DBObject;

 import java.io.File;
 import java.util.Date;
--- a/src/GlobalData/FileObject/DirInfosDataSet.java
+++ b/src/GlobalData/FileObject/DirInfosDataSet.java
@@ -1,8 +1,8 @@
 package GlobalData.FileObject;
-import Common.Database.DataSet;
-import Common.UI.DataSetControlForm;
+import Common.Database.Tables.DataSet;
+import Common_old.UI.DataSetControlForm;

-import static Common.UI.Tables.TableRenderers.*;
+import static Common_old.UI.Tables.TableRenderers.*;
 public class DirInfosDataSet extends DataSet<String, DirInfo> {
    public DirInfosDataSet() {
        super(String.class, DirInfo.class);
--- a/src/GlobalData/FileObject/DirInfosFields.java
+++ b/src/GlobalData/FileObject/DirInfosFields.java
@@ -1,5 +1,5 @@
 package GlobalData.FileObject;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common_old.UI.Windows.Dialog.DialogFields;

 import javax.swing.*;
 import java.awt.*;
--- a/src/GlobalData/FormsParams/DBForm.java
+++ b/src/GlobalData/FormsParams/DBForm.java
@@ -1,6 +1,6 @@
 package GlobalData.FormsParams;
-import Common.Database.DBObject;
-import Common.UI.Windows.FormType;
+import Common.Database.Objects.DBObject;
+import Common_old.UI.Windows.FormType;
 import com.sun.org.glassfish.gmbal.Description;

 import java.awt.*;
--- a/src/GlobalData/FormsParams/DBMainFormParams.java
+++ b/src/GlobalData/FormsParams/DBMainFormParams.java
@@ -1,5 +1,5 @@
 package GlobalData.FormsParams;
-import Common.Database.DBObject;
+import Common.Database.Objects.DBObject;
 import com.sun.org.glassfish.gmbal.Description;
 public class DBMainFormParams extends DBObject {
    //todo вместо этого кошмара сделать объект DBSC для сплит контейнера,
--- a/src/GlobalData/FormsParams/FormsDBTable.java
+++ b/src/GlobalData/FormsParams/FormsDBTable.java
@@ -1,6 +1,6 @@
 package GlobalData.FormsParams;
-import Common.Database.DBTable;
-import Common.UI.Windows.FormType;
+import Common.Database.Tables.DBTable;
+import Common_old.UI.Windows.FormType;
 public class FormsDBTable extends DBTable<FormType, DBForm> {
    public FormsDBTable() {
        super(FormType.class, DBForm.class);
--- a/src/GlobalData/FormsParams/MainFormParamsDBTable.java
+++ b/src/GlobalData/FormsParams/MainFormParamsDBTable.java
@@ -1,5 +1,5 @@
 package GlobalData.FormsParams;
-import Common.Database.DBTable;
+import Common.Database.Tables.DBTable;
 public class MainFormParamsDBTable extends DBTable<Integer, DBMainFormParams> {
    public MainFormParamsDBTable() {
        super(Integer.class, DBMainFormParams.class);
--- a/src/GlobalData/GlobalDatabase.java
+++ b/src/GlobalData/GlobalDatabase.java
@@ -1,8 +1,8 @@
 package GlobalData;
-import Common.Current;
-import Common.Database.DBObject;
+import Common_old.Current;
+import Common.Database.Objects.DBObject;
 import Common.Database.SQLITE.SQLiteDatabase;
-import Common.Global;
+import _VisualDVM.Global;
 import GlobalData.Account.Account;
 import GlobalData.Account.AccountsDBTable;
 import GlobalData.Compiler.CompilersDBTable;
--- a/src/GlobalData/Grid/Grid.java
+++ b/src/GlobalData/Grid/Grid.java
@@ -1,6 +1,6 @@
 package GlobalData.Grid;
-import Common.Current;
-import Common.Database.DBObject;
+import Common_old.Current;
+import Common.Database.Objects.DBObject;
 import com.sun.org.glassfish.gmbal.Description;

 import java.util.Arrays;
--- a/src/GlobalData/Grid/GridsDBTable.java
+++ b/src/GlobalData/Grid/GridsDBTable.java
@@ -1,6 +1,6 @@
 package GlobalData.Grid;
-import Common.Current;
-import Common.Database.DBTable;
+import Common_old.Current;
+import Common.Database.Tables.DBTable;
 public class GridsDBTable extends DBTable<Current, Grid> {
    public GridsDBTable() {
        super(Current.class, Grid.class);
--- a/src/GlobalData/Machine/Machine.java
+++ b/src/GlobalData/Machine/Machine.java
@@ -1,8 +1,7 @@
 package GlobalData.Machine;
-import Common.Constants;
-import Common.Database.iDBObject;
-import Common.Global;
-import Common.Utils.Utils;
+import Common.Database.Objects.iDBObject;
+import _VisualDVM.Global;
+import Common_old.Utils.Utils;
 import GlobalData.Compiler.Compiler;
 import GlobalData.User.User;

--- a/src/GlobalData/Machine/MachinesDBTable.java
+++ b/src/GlobalData/Machine/MachinesDBTable.java
@@ -1,9 +1,13 @@
 package GlobalData.Machine;
-import Common.Current;
-import Common.Database.*;
-import Common.UI.DataSetControlForm;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DBObjectDialog;
+import Common_old.Current;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Database.Objects.DBObject;
+import Common.Database.Tables.FKBehaviour;
+import Common.Database.Tables.FKCurrentObjectBehaviuor;
+import Common.Database.Tables.FKDataBehaviour;
+import Common.Database.Tables.iDBTable;
 import GlobalData.Compiler.Compiler;
 import GlobalData.DVMParameter.DVMParameter;
 import GlobalData.EnvironmentValue.EnvironmentValue;
--- a/src/GlobalData/Machine/MachinesMenuBar.java
+++ b/src/GlobalData/Machine/MachinesMenuBar.java
@@ -1,6 +1,6 @@
 package GlobalData.Machine;
-import Common.UI.Menus_2023.DataMenuBar;
-import Common.UI.Menus_2023.MenuBarButton;
+import Common_old.UI.Menus_2023.DataMenuBar;
+import Common_old.UI.Menus_2023.MenuBarButton;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;

--- a/src/GlobalData/Machine/UI/MachineFields.java
+++ b/src/GlobalData/Machine/UI/MachineFields.java
@@ -1,6 +1,6 @@
 package GlobalData.Machine.UI;
-import Common.UI.TextField.StyledTextField;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common_old.UI.TextField.StyledTextField;
+import Common_old.UI.Windows.Dialog.DialogFields;
 import GlobalData.Machine.MachineType;

 import javax.swing.*;
--- a/src/GlobalData/Makefile/Makefile.java
+++ b/src/GlobalData/Makefile/Makefile.java
@@ -1,8 +1,8 @@
 package GlobalData.Makefile;
-import Common.Current;
-import Common.Global;
+import Common_old.Current;
+import _VisualDVM.Global;
 import Common.Utils.TextLog;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Machine.Machine;
--- a/src/GlobalData/Makefile/MakefilesDBTable.java
+++ b/src/GlobalData/Makefile/MakefilesDBTable.java
@@ -1,8 +1,12 @@
 package GlobalData.Makefile;
-import Common.Current;
-import Common.Database.*;
-import Common.UI.DataSetControlForm;
-import Common.UI.Windows.Dialog.DBObjectDialog;
+import Common_old.Current;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Database.Objects.DBObject;
+import Common.Database.Tables.FKBehaviour;
+import Common.Database.Tables.FKCurrentObjectBehaviuor;
+import Common.Database.Tables.FKDataBehaviour;
+import Common.Database.Tables.iDBTable;
 import GlobalData.Module.Module;
 import GlobalData.Module.UI.ModuleAnchestorFields;
 import GlobalData.Module.UI.ModuleAnchestorForm;
--- a/src/GlobalData/Makefile/MakefilesMenuBar.java
+++ b/src/GlobalData/Makefile/MakefilesMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.Makefile;
-import Common.UI.Menus_2023.DataMenuBar;
+import Common_old.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class MakefilesMenuBar extends DataMenuBar {
    public MakefilesMenuBar() {
--- a/src/GlobalData/Makefile/UI/MakefilePreviewForm.java
+++ b/src/GlobalData/Makefile/UI/MakefilePreviewForm.java
@@ -1,6 +1,6 @@
 package GlobalData.Makefile.UI;
-import Common.UI.Editor.Viewer;
-import Common.UI.Windows.Dialog.Text.TextDialog;
+import Common_old.UI.Editor.Viewer;
+import Common_old.UI.Windows.Dialog.Text.TextDialog;
 public class MakefilePreviewForm extends TextDialog<Viewer> {
    public MakefilePreviewForm() {
        super(Viewer.class);
--- a/src/GlobalData/Module/Module.java
+++ b/src/GlobalData/Module/Module.java
@@ -1,7 +1,7 @@
 package GlobalData.Module;
-import Common.Constants;
-import Common.Current;
-import Common.Global;
+import Common_old.Constants;
+import Common_old.Current;
+import _VisualDVM.Global;
 import GlobalData.Makefile.Makefile;
 import ProjectData.LanguageName;
 public class Module extends ModuleAnchestor {
--- a/src/GlobalData/Module/ModuleAnchestor.java
+++ b/src/GlobalData/Module/ModuleAnchestor.java
@@ -1,8 +1,8 @@
 package GlobalData.Module;
-import Common.Constants;
-import Common.Database.iDBObject;
-import Common.Global;
-import Common.Utils.Utils;
+import Common_old.Constants;
+import Common.Database.Objects.iDBObject;
+import _VisualDVM.Global;
+import Common_old.Utils.Utils;
 import GlobalData.Compiler.Compiler;
 public class ModuleAnchestor extends iDBObject {
    //--------------------------------------------------------------------------------------
--- a/src/GlobalData/Module/ModulesDBTable.java
+++ b/src/GlobalData/Module/ModulesDBTable.java
@@ -1,9 +1,9 @@
 package GlobalData.Module;
-import Common.Current;
-import Common.Database.iDBTable;
-import Common.UI.DataSetControlForm;
-import Common.UI.Windows.Dialog.DBObjectDialog;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common_old.Current;
+import Common.Database.Tables.iDBTable;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common_old.UI.Windows.Dialog.DialogFields;
 import GlobalData.Module.UI.ModuleAnchestorForm;
 public class ModulesDBTable extends iDBTable<Module> {
    public ModulesDBTable() {
--- a/src/GlobalData/Module/ModulesMenuBar.java
+++ b/src/GlobalData/Module/ModulesMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.Module;
-import Common.UI.Menus_2023.DataMenuBar;
+import Common_old.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class ModulesMenuBar extends DataMenuBar {
    public ModulesMenuBar() {
--- a/src/GlobalData/Module/UI/ModuleAnchestorFields.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorFields.java
@@ -1,8 +1,8 @@
 package GlobalData.Module.UI;
-import Common.Current;
-import Common.UI.ComboBox.StyledTextComboBox;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common_old.Current;
+import Common_old.UI.ComboBox.StyledTextComboBox;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DialogFields;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Makefile.Makefile;
 import GlobalData.Module.Module;
--- a/src/GlobalData/Module/UI/ModuleAnchestorForm.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
@@ -1,8 +1,8 @@
 package GlobalData.Module.UI;
-import Common.Constants;
-import Common.Current;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DBObjectDialog;
+import Common_old.Constants;
+import Common_old.Current;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DBObjectDialog;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Makefile.Makefile;
--- a/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
@@ -1,8 +1,8 @@
 package GlobalData.RemoteFile.UI;
-import Common.Current;
-import Common.Global;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.Dialog;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.Dialog;
 import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 import com.jcraft.jsch.ChannelSftp.LsEntry;
--- a/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
@@ -1,7 +1,7 @@
 package GlobalData.RemoteFile.UI;
-import Common.UI.Trees.TreeForm;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common_old.UI.Trees.TreeForm;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DialogFields;

 import javax.swing.*;
 import java.awt.*;
--- a/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
@@ -1,7 +1,7 @@
 package GlobalData.RemoteFile.UI;
-import Common.Current;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.Trees.StyledTreeCellRenderer;
+import Common_old.Current;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.UI.Trees.StyledTreeCellRenderer;
 import GlobalData.RemoteFile.RemoteFile;

 import javax.swing.*;
--- a/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java
+++ b/src/GlobalData/RemoteFile/UI/RemoteFilesTree.java
@@ -1,8 +1,8 @@
 package GlobalData.RemoteFile.UI;
-import Common.Current;
-import Common.UI.Trees.DataTree;
-import Common.UI.Trees.TreeRenderers;
-import Common.UI.UI;
+import Common_old.Current;
+import Common_old.UI.Trees.DataTree;
+import Common_old.UI.Trees.TreeRenderers;
+import Common_old.UI.UI;
 public class RemoteFilesTree extends DataTree {
    public RemoteFilesTree() {
        super(UI.getRemoteFileChooser().root);
--- a/src/GlobalData/RunConfiguration/RunConfiguration.java
+++ b/src/GlobalData/RunConfiguration/RunConfiguration.java
@@ -1,10 +1,10 @@
 package GlobalData.RunConfiguration;
-import Common.Constants;
-import Common.Current;
-import Common.Database.iDBObject;
-import Common.Global;
+import Common_old.Constants;
+import Common_old.Current;
+import Common.Database.Objects.iDBObject;
+import _VisualDVM.Global;
 import Common.Utils.TextLog;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import GlobalData.Compiler.Compiler;
 import GlobalData.DVMParameter.DVMParameter;
 import GlobalData.EnvironmentValue.EnvironmentValue;
--- a/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -1,11 +1,15 @@
 package GlobalData.RunConfiguration;
-import Common.Constants;
-import Common.Current;
-import Common.Database.*;
-import Common.Global;
-import Common.UI.DataSetControlForm;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DBObjectDialog;
+import Common_old.Constants;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Database.Objects.DBObject;
+import Common.Database.Tables.FKBehaviour;
+import Common.Database.Tables.FKCurrentObjectBehaviuor;
+import Common.Database.Tables.FKDataBehaviour;
+import Common.Database.Tables.iDBTable;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.DVMParameter.DVMParameter;
--- a/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
+++ b/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.RunConfiguration;
-import Common.UI.Menus_2023.DataMenuBar;
+import Common_old.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;

 import javax.swing.*;
--- a/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java
+++ b/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java
@@ -1,6 +1,6 @@
 package GlobalData.RunConfiguration.UI;
-import Common.UI.TextField.StyledTextField;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common_old.UI.TextField.StyledTextField;
+import Common_old.UI.Windows.Dialog.DialogFields;

 import javax.swing.*;
 import java.awt.*;
--- a/src/GlobalData/SapforProfile/SapforProfile.java
+++ b/src/GlobalData/SapforProfile/SapforProfile.java
@@ -1,5 +1,5 @@
 package GlobalData.SapforProfile;
-import Common.Database.iDBObject;
+import Common.Database.Objects.iDBObject;
 import com.sun.org.glassfish.gmbal.Description;
 public class SapforProfile extends iDBObject {
    @Description("DEFAULT ''")
--- a/src/GlobalData/SapforProfile/SapforProfilesDBTable.java
+++ b/src/GlobalData/SapforProfile/SapforProfilesDBTable.java
@@ -1,8 +1,12 @@
 package GlobalData.SapforProfile;
-import Common.Current;
-import Common.Database.*;
-import Common.UI.DataSetControlForm;
-import Common.UI.Windows.Dialog.DBObjectDialog;
+import Common_old.Current;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Database.Objects.DBObject;
+import Common.Database.Tables.FKBehaviour;
+import Common.Database.Tables.FKCurrentObjectBehaviuor;
+import Common.Database.Tables.FKDataBehaviour;
+import Common.Database.Tables.iDBTable;
 import GlobalData.SapforProfile.UI.SapforProfileFields;
 import GlobalData.SapforProfileSetting.SapforProfileSetting;

--- a/src/GlobalData/SapforProfile/UI/SapforProfileFields.java
+++ b/src/GlobalData/SapforProfile/UI/SapforProfileFields.java
@@ -1,6 +1,6 @@
 package GlobalData.SapforProfile.UI;
-import Common.UI.TextField.StyledTextField;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common_old.UI.TextField.StyledTextField;
+import Common_old.UI.Windows.Dialog.DialogFields;

 import javax.swing.*;
 import java.awt.*;
--- a/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java
+++ b/src/GlobalData/SapforProfileSetting/SapforProfileSetting.java
@@ -1,7 +1,7 @@
 package GlobalData.SapforProfileSetting;
-import Common.Constants;
-import Common.Current;
-import Common.Database.iDBObject;
+import Common_old.Constants;
+import Common_old.Current;
+import Common.Database.Objects.iDBObject;
 import GlobalData.Settings.SettingName;
 import com.sun.org.glassfish.gmbal.Description;
 public class SapforProfileSetting extends iDBObject {
--- a/src/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
+++ b/src/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
@@ -1,7 +1,7 @@
 package GlobalData.SapforProfileSetting;
-import Common.Current;
-import Common.Database.iDBTable;
-import Common.UI.DataSetControlForm;
+import Common_old.Current;
+import Common.Database.Tables.iDBTable;
+import Common_old.UI.DataSetControlForm;
 public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting> {
    public SapforProfileSettingsDBTable() {
        super(SapforProfileSetting.class);
--- a/src/GlobalData/Settings/DBSetting.java
+++ b/src/GlobalData/Settings/DBSetting.java
@@ -1,7 +1,7 @@
 package GlobalData.Settings;
-import Common.Database.DBObject;
-import Common.UI.Menus_2023.StableMenuItem;
-import Common.Utils.Utils;
+import Common.Database.Objects.DBObject;
+import Common_old.UI.Menus_2023.StableMenuItem;
+import Common_old.Utils.Utils;
 import Repository.Component.ComponentType;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
--- a/src/GlobalData/Settings/SettingsDBTable.java
+++ b/src/GlobalData/Settings/SettingsDBTable.java
@@ -1,7 +1,7 @@
 package GlobalData.Settings;
-import Common.Database.DBTable;
-import Common.Global;
-import Common.Utils.Utils;
+import Common.Database.Tables.DBTable;
+import _VisualDVM.Global;
+import Common_old.Utils.Utils;
 import Repository.Component.ComponentType;

 import java.util.Vector;
--- a/src/GlobalData/Splitter/Splitter.java
+++ b/src/GlobalData/Splitter/Splitter.java
@@ -1,6 +1,6 @@
 package GlobalData.Splitter;
-import Common.Constants;
-import Common.Database.DBObject;
+import Common_old.Constants;
+import Common.Database.Objects.DBObject;
 import com.sun.org.glassfish.gmbal.Description;

 import javax.swing.*;
--- a/src/GlobalData/Splitter/SplittersDBTable.java
+++ b/src/GlobalData/Splitter/SplittersDBTable.java
@@ -1,6 +1,6 @@
 package GlobalData.Splitter;
-import Common.Database.DBTable;
-import Common.Global;
+import Common.Database.Tables.DBTable;
+import _VisualDVM.Global;

 import javax.swing.*;
 import java.lang.reflect.Field;
--- a/src/GlobalData/Tasks/CompilationTask/CompilationTask.java
+++ b/src/GlobalData/Tasks/CompilationTask/CompilationTask.java
@@ -1,8 +1,8 @@
 package GlobalData.Tasks.CompilationTask;
-import Common.Constants;
-import Common.Current;
-import Common.Global;
-import Common.Utils.Utils;
+import Common_old.Constants;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.Utils.Utils;
 import GlobalData.Makefile.Makefile;
 import GlobalData.Module.Module;
 import GlobalData.Tasks.RunTask.RunTask;
--- a/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
+++ b/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
@@ -1,17 +1,21 @@
 package GlobalData.Tasks.CompilationTask;
-import Common.Current;
-import Common.Database.*;
-import Common.UI.DataSetControlForm;
-import Common.UI.Menus.TableMenu;
-import Common.UI.UI;
+import Common_old.Current;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.Menus.TableMenu;
+import Common_old.UI.UI;
+import Common.Database.Objects.DBObject;
+import Common.Database.Tables.FKBehaviour;
+import Common.Database.Tables.FKCurrentObjectBehaviuor;
+import Common.Database.Tables.FKDataBehaviour;
+import Common.Database.Tables.iDBTable;
 import GlobalData.Tasks.RunTask.RunTask;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;

 import java.util.LinkedHashMap;

-import static Common.UI.Tables.TableRenderers.RendererDate;
-import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
+import static Common_old.UI.Tables.TableRenderers.RendererDate;
+import static Common_old.UI.Tables.TableRenderers.RendererStatusEnum;
 public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
    public CompilationTasksDBTable() {
        super(CompilationTask.class);
--- a/src/GlobalData/Tasks/Passes/TaskLocalPass.java
+++ b/src/GlobalData/Tasks/Passes/TaskLocalPass.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Passes;
-import Common.Current;
-import Common.Global;
+import Common_old.Current;
+import _VisualDVM.Global;
 import GlobalData.Tasks.Supervisor.TaskSupervisor;
 import Visual_DVM_2021.Passes.ProcessPass;
 public abstract class TaskLocalPass<S extends TaskSupervisor> extends ProcessPass {
--- a/src/GlobalData/Tasks/QueueSystem/QueueSystem.java
+++ b/src/GlobalData/Tasks/QueueSystem/QueueSystem.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.QueueSystem;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
 public class QueueSystem {
--- a/src/GlobalData/Tasks/RunTask/RunTask.java
+++ b/src/GlobalData/Tasks/RunTask/RunTask.java
@@ -1,9 +1,9 @@
 package GlobalData.Tasks.RunTask;
-import Common.Constants;
-import Common.Current;
-import Common.Global;
+import Common_old.Constants;
+import Common_old.Current;
+import _VisualDVM.Global;
 import Common.Utils.StringTemplate;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.RunConfiguration.RunConfiguration;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
--- a/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
+++ b/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
@@ -1,14 +1,14 @@
 package GlobalData.Tasks.RunTask;
-import Common.Current;
-import Common.Database.iDBTable;
-import Common.UI.DataSetControlForm;
-import Common.UI.Menus.TableMenu;
-import Common.UI.UI;
+import Common_old.Current;
+import Common.Database.Tables.iDBTable;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.Menus.TableMenu;
+import Common_old.UI.UI;
 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;
+import static Common_old.UI.Tables.TableRenderers.RendererDate;
+import static Common_old.UI.Tables.TableRenderers.RendererStatusEnum;
 public class RunTasksDBTable extends iDBTable<RunTask> {
    public RunTasksDBTable() {
        super(RunTask.class);
--- a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.Supervisor.Local.Linux;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import GlobalData.Makefile.Makefile;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
 import GlobalData.Tasks.TaskState;
--- a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.Supervisor.Local.Linux;
-import Common.Current;
+import Common_old.Current;
 import GlobalData.Tasks.RunTask.RunTask;

 import java.util.Map;
--- a/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor.Local.Linux;
-import Common.Constants;
-import Common.Utils.Utils;
+import Common_old.Constants;
+import Common_old.Utils.Utils;
 import GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
--- a/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
@@ -1,7 +1,7 @@
 package GlobalData.Tasks.Supervisor.Local;
-import Common.Constants;
-import Common.Global;
-import Common.Utils.Utils;
+import Common_old.Constants;
+import _VisualDVM.Global;
+import Common_old.Utils.Utils;
 import GlobalData.Tasks.RunTask.RunTask;
 import GlobalData.Tasks.Supervisor.TaskSupervisor;
 import GlobalData.Tasks.Task;
--- a/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor.Local.Windows;
-import Common.Global;
-import Common.Utils.Utils;
+import _VisualDVM.Global;
+import Common_old.Utils.Utils;
 import GlobalData.Makefile.Makefile;
 import GlobalData.Settings.SettingName;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
--- a/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.Supervisor.Local.Windows;
-import Common.Current;
+import Common_old.Current;
 import GlobalData.Tasks.RunTask.RunTask;

 import java.util.Map;
--- a/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.Supervisor.Local.Windows;
-import Common.Global;
+import _VisualDVM.Global;
 import GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
--- a/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor.Remote;
-import Common.Current;
-import Common.Utils.Utils;
+import Common_old.Current;
+import Common_old.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.QueueSystem.MVS;
 import GlobalData.Tasks.TaskState;
--- a/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks.Supervisor.Remote;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import GlobalData.Makefile.Makefile;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
--- a/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor.Remote;
-import Common.Constants;
-import Common.Utils.Utils;
+import Common_old.Constants;
+import Common_old.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.Supervisor.TaskSupervisor;
 import GlobalData.Tasks.Task;
--- a/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor.Remote;
-import Common.Current;
-import Common.Utils.Utils;
+import Common_old.Current;
+import Common_old.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.RunTask.RunTask;
 import GlobalData.Tasks.TaskState;
--- a/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
+++ b/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
@@ -1,6 +1,6 @@
 package GlobalData.Tasks.Supervisor;
-import Common.Global;
-import Common.Utils.Utils;
+import _VisualDVM.Global;
+import Common_old.Utils.Utils;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Project.db_project_info;
--- a/src/GlobalData/Tasks/Task.java
+++ b/src/GlobalData/Tasks/Task.java
@@ -1,8 +1,8 @@
 package GlobalData.Tasks;
-import Common.Constants;
-import Common.Database.iDBObject;
-import Common.Global;
-import Common.Utils.Utils;
+import Common_old.Constants;
+import Common.Database.Objects.iDBObject;
+import _VisualDVM.Global;
+import Common_old.Utils.Utils;
 import GlobalData.Machine.Machine;
 import GlobalData.User.User;
 import ProjectData.Project.db_project_info;
--- a/src/GlobalData/Tasks/TaskState.java
+++ b/src/GlobalData/Tasks/TaskState.java
@@ -1,9 +1,6 @@
 package GlobalData.Tasks;
-import Common.Current;
-import Common.UI.StatusEnum;
-import Common.UI.Themes.VisualiserFonts;
-
-import java.awt.*;
+import Common_old.UI.StatusEnum;
+import Common_old.UI.Themes.VisualiserFonts;
 public enum TaskState implements StatusEnum {
    Inactive,
    //--
--- a/src/GlobalData/User/UI/UserFields.java
+++ b/src/GlobalData/User/UI/UserFields.java
@@ -1,9 +1,9 @@
 package GlobalData.User.UI;
-import Common.UI.Menus.TextEditorMenu;
-import Common.UI.TextField.StyledPasswordField;
-import Common.UI.TextField.StyledTextField;
-import Common.UI.Windows.Dialog.DialogFields;
-import Common.Utils.Utils;
+import Common_old.UI.Menus.TextEditorMenu;
+import Common_old.UI.TextField.StyledPasswordField;
+import Common_old.UI.TextField.StyledTextField;
+import Common_old.UI.Windows.Dialog.DialogFields;
+import Common_old.Utils.Utils;

 import javax.swing.*;
 import java.awt.*;
--- a/src/GlobalData/User/User.java
+++ b/src/GlobalData/User/User.java
@@ -1,7 +1,7 @@
 package GlobalData.User;
-import Common.Constants;
-import Common.Current;
-import Common.Database.iDBObject;
+import Common_old.Constants;
+import Common_old.Current;
+import Common.Database.Objects.iDBObject;
 import GlobalData.Machine.Machine;
 import TestingSystem.DVM.UserConnection;
 import com.sun.org.glassfish.gmbal.Description;
--- a/src/GlobalData/User/UserState.java
+++ b/src/GlobalData/User/UserState.java
@@ -1,9 +1,6 @@
 package GlobalData.User;
-import Common.Current;
-import Common.UI.StatusEnum;
-import Common.UI.Themes.VisualiserFonts;
-
-import java.awt.*;
+import Common_old.UI.StatusEnum;
+import Common_old.UI.Themes.VisualiserFonts;
 public enum UserState implements StatusEnum {
    initial, //на пользователя еще не заходили.
    ready,   //рудимент.
--- a/src/GlobalData/User/UsersDBTable.java
+++ b/src/GlobalData/User/UsersDBTable.java
@@ -1,10 +1,14 @@
 package GlobalData.User;
-import Common.Current;
-import Common.Database.*;
-import Common.UI.DataSetControlForm;
-import Common.UI.Tables.TableRenderers;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DBObjectDialog;
+import Common_old.Current;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.Tables.TableRenderers;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DBObjectDialog;
+import Common.Database.Objects.DBObject;
+import Common.Database.Tables.FKBehaviour;
+import Common.Database.Tables.FKCurrentObjectBehaviuor;
+import Common.Database.Tables.FKDataBehaviour;
+import Common.Database.Tables.iDBTable;
 import GlobalData.Machine.MachineType;
 import GlobalData.Tasks.CompilationTask.CompilationTask;
 import GlobalData.Tasks.RunTask.RunTask;
--- a/src/GlobalData/User/UsersMenuBar.java
+++ b/src/GlobalData/User/UsersMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.User;
-import Common.UI.Menus_2023.DataMenuBar;
+import Common_old.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class UsersMenuBar extends DataMenuBar {
    public UsersMenuBar() {