no message
This commit is contained in:
@@ -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.*;
|
||||
@@ -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<String, DBForm> {
|
||||
public FormsDBTable() {
|
||||
super(String.class, DBForm.class);
|
||||
@@ -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;
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package GlobalData.FormsParams;
|
||||
import Common.Database.Tables.DBTable;
|
||||
public class MainFormParamsDBTable extends DBTable<Integer, DBMainFormParams> {
|
||||
public MainFormParamsDBTable() {
|
||||
super(Integer.class, DBMainFormParams.class);
|
||||
}
|
||||
@Override
|
||||
public String getSingleDescription() {
|
||||
return "параметры главного окна";
|
||||
}
|
||||
}
|
||||
@@ -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());
|
||||
|
||||
@@ -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<Object, ProfilesFields> {
|
||||
|
||||
Reference in New Issue
Block a user