diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 392da958..0daeff2b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,23 +7,17 @@
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
@@ -45,8 +39,8 @@
-
+
diff --git a/src/GlobalData/FormsParams/DBForm.java b/src/Common/Database/Objects/DBForm/DBForm.java
similarity index 91%
rename from src/GlobalData/FormsParams/DBForm.java
rename to src/Common/Database/Objects/DBForm/DBForm.java
index 8b274867..d5d7a6cf 100644
--- a/src/GlobalData/FormsParams/DBForm.java
+++ b/src/Common/Database/Objects/DBForm/DBForm.java
@@ -1,6 +1,5 @@
-package GlobalData.FormsParams;
+package Common.Database.Objects.DBForm;
import Common.Database.Objects.DBObject;
-import Common_old.UI.Windows.FormType;
import com.sun.org.glassfish.gmbal.Description;
import java.awt.*;
diff --git a/src/GlobalData/FormsParams/FormsDBTable.java b/src/Common/Database/Objects/DBForm/FormsDBTable.java
similarity index 80%
rename from src/GlobalData/FormsParams/FormsDBTable.java
rename to src/Common/Database/Objects/DBForm/FormsDBTable.java
index b27a9845..43793f15 100644
--- a/src/GlobalData/FormsParams/FormsDBTable.java
+++ b/src/Common/Database/Objects/DBForm/FormsDBTable.java
@@ -1,6 +1,5 @@
-package GlobalData.FormsParams;
+package Common.Database.Objects.DBForm;
import Common.Database.Tables.DBTable;
-import Common_old.UI.Windows.FormType;
public class FormsDBTable extends DBTable {
public FormsDBTable() {
super(String.class, DBForm.class);
diff --git a/src/Common/Database/VisualiserDatabase.java b/src/Common/Database/VisualiserDatabase.java
index d0e50c39..4848a962 100644
--- a/src/Common/Database/VisualiserDatabase.java
+++ b/src/Common/Database/VisualiserDatabase.java
@@ -1,6 +1,6 @@
package Common.Database;
import Common.Database.SQLITE.SQLiteDatabase;
-import GlobalData.FormsParams.FormsDBTable;
+import Common.Database.Objects.DBForm.FormsDBTable;
import GlobalData.Grid.TablesVisualDatasDBTable;
import GlobalData.Splitter.SplittersDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
diff --git a/src/Common_old/UI/Windows/Form.java b/src/Common_old/UI/Windows/Form.java
index 83343742..c361b080 100644
--- a/src/Common_old/UI/Windows/Form.java
+++ b/src/Common_old/UI/Windows/Form.java
@@ -2,13 +2,12 @@ package Common_old.UI.Windows;
import Common.Utils.CommonUtils;
import GlobalData.GlobalDatabase;
import _VisualDVM.Syntax.ThemeElement;
-import GlobalData.FormsParams.DBForm;
+import Common.Database.Objects.DBForm.DBForm;
import javax.swing.*;
import java.awt.*;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.sql.SQLException;
public abstract class Form extends JFrame implements ThemeElement {
private DBForm info = null;
public Form() {
diff --git a/src/GlobalData/FormsParams/DBMainFormParams.java b/src/GlobalData/FormsParams/DBMainFormParams.java
deleted file mode 100644
index 8dc53de6..00000000
--- a/src/GlobalData/FormsParams/DBMainFormParams.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package GlobalData.FormsParams;
-import Common.Database.Objects.DBObject;
-import com.sun.org.glassfish.gmbal.Description;
-public class DBMainFormParams extends DBObject {
- //todo вместо этого кошмара сделать объект DBSC для сплит контейнера,
- // и включить туда все палки в проекте, а не только в главном окне.
- @Description("PRIMARY KEY,UNIQUE, NOT NULL")
- public int id;
- public int SC1 = -1;
- public int SC2 = -1;
- public int SC3 = -1;
- public int SC4 = -1;
- public int SC5 = -1;
- public int SC6 = -1;
- public int SC7 = -1;
- public int SC8 = -1;
- public int SC9 = -1;
- public int SC10 = -1;
- public int SC11 = -1;
- public DBMainFormParams() {
- }
- public DBMainFormParams(int SC1_, int SC2_, int SC3_, int SC4_, int SC5_, int SC6_, int SC7_, int SC8_, int SC9_, int SC10_, int SC11_) {
- id = 0;
- SC1 = SC1_;
- SC2 = SC2_;
- SC3 = SC3_;
- SC4 = SC4_;
- SC5 = SC5_;
- SC6 = SC6_;
- SC7 = SC7_;
- SC8 = SC8_;
- SC9 = SC9_;
- SC10 = SC10_;
- SC11 = SC11_;
- }
- public void Validate() {
- if (SC1 == 0) SC1 = -1;
- if (SC2 == 0) SC2 = -1;
- if (SC3 == 0) SC3 = -1;
- if (SC4 == 0) SC4 = -1;
- if (SC5 == 0) SC5 = -1;
- if (SC6 == 0) SC6 = -1;
- if (SC7 == 0) SC7 = -1;
- if (SC8 == 0) SC8 = -1;
- if (SC9 == 0) SC9 = -1;
- if (SC10 == 0) SC10 = -1;
- if (SC11 == 0) SC11 = -1;
- }
- @Override
- public Object getPK() {
- return id;
- }
-}
diff --git a/src/GlobalData/FormsParams/MainFormParamsDBTable.java b/src/GlobalData/FormsParams/MainFormParamsDBTable.java
deleted file mode 100644
index 1f38c046..00000000
--- a/src/GlobalData/FormsParams/MainFormParamsDBTable.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package GlobalData.FormsParams;
-import Common.Database.Tables.DBTable;
-public class MainFormParamsDBTable extends DBTable {
- public MainFormParamsDBTable() {
- super(Integer.class, DBMainFormParams.class);
- }
- @Override
- public String getSingleDescription() {
- return "параметры главного окна";
- }
-}
diff --git a/src/GlobalData/GlobalDatabase.java b/src/GlobalData/GlobalDatabase.java
index 79e57b3e..5ea4836b 100644
--- a/src/GlobalData/GlobalDatabase.java
+++ b/src/GlobalData/GlobalDatabase.java
@@ -13,8 +13,6 @@ import GlobalData.Credentials.CredentialsDBTable;
import GlobalData.DBLastProject.LastProjectsDBTable;
import GlobalData.DVMParameter.DVMParameterDBTable;
import GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
-import GlobalData.FormsParams.FormsDBTable;
-import GlobalData.FormsParams.MainFormParamsDBTable;
import GlobalData.Machine.MachinesDBTable;
import GlobalData.Makefile.MakefilesDBTable;
import GlobalData.Module.ModulesDBTable;
@@ -50,8 +48,6 @@ public class GlobalDatabase extends VisualiserDatabase {
public DVMParameterDBTable dvmParameters;
public CredentialsDBTable credentials;
//----- ДАННЫЕ ВИЗУАЛИЗАТОРА---------------------------------
-
- public MainFormParamsDBTable mainFormParams;
public SettingsDBTable settings;
public LastProjectsDBTable lastProjects;
public AccountsDBTable accounts;
@@ -78,7 +74,6 @@ public class GlobalDatabase extends VisualiserDatabase {
addTable(environmentValues = new EnvironmentValuesDBTable());
addTable(credentials = new CredentialsDBTable());
addTable(settings = new SettingsDBTable());
- addTable(mainFormParams = new MainFormParamsDBTable());
addTable(lastProjects = new LastProjectsDBTable());
addTable(accounts = new AccountsDBTable());
addTable(passStats = new PassStatsDBTable());
diff --git a/src/Visual_DVM_2021/UI/Main/ProfilesForm.java b/src/Visual_DVM_2021/UI/Main/ProfilesForm.java
index 95907c11..d56f3965 100644
--- a/src/Visual_DVM_2021/UI/Main/ProfilesForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ProfilesForm.java
@@ -2,7 +2,7 @@ package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common_old.UI.Windows.Dialog.Dialog;
import Common_old.UI.Windows.FormType;
-import GlobalData.FormsParams.DBForm;
+import Common.Database.Objects.DBForm.DBForm;
import GlobalData.GlobalDatabase;
//todo разобраться с DBform
public class ProfilesForm extends Dialog {