M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

продолжение рефакторинга. создал предка для класса current

Browse Source
This commit is contained in:
02090095
2024-10-08 00:39:13 +03:00
parent 3516b58127
commit d0c08a2c7e
157 changed files with 648 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -2,7 +2,7 @@ package GlobalData.Compiler;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils;

2
src/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
View File

@@ -1,6 +1,6 @@
package GlobalData.CompilerEnvironment;
import Common.Database.Tables.DataSet;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Tables.TableEditors;
import Common_old.UI.Tables.TableRenderers;

2
src/GlobalData/CompilerOption/CompilerOptionsSet.java
View File

@@ -1,6 +1,6 @@
package GlobalData.CompilerOption;
import Common.Database.Tables.DataSet;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Tables.TableEditors;
import Common_old.UI.Tables.TableRenderers;

2
src/GlobalData/DVMParameter/DVMParameterDBTable.java
View File

@@ -4,7 +4,7 @@ import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import _VisualDVM.Global;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils;
import GlobalData.DVMParameter.UI.DVMParameterFields;

2
src/GlobalData/DVMParameter/UI/DVMParameterFields.java
View File

@@ -1,5 +1,5 @@
package GlobalData.DVMParameter.UI;
import Common_old.UI.ComboBox.StyledTextComboBox;
import Common.Visual.Controls.StyledTextComboBox;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;

2
src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
View File

@@ -4,7 +4,7 @@ import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import _VisualDVM.Global;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils;
import GlobalData.EnvironmentValue.UI.EnvironmentValueFields;

2
src/GlobalData/FileObject/DirInfosDataSet.java
View File

@@ -1,6 +1,6 @@
package GlobalData.FileObject;
import Common.Database.Tables.DataSet;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import static Common_old.UI.Tables.TableRenderers.*;
public class DirInfosDataSet extends DataSet<String, DirInfo> {

13
src/GlobalData/GlobalDatabase.java
View File

@@ -1,4 +1,5 @@
package GlobalData;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.DBObject;
@@ -58,7 +59,7 @@ public class GlobalDatabase extends SQLiteDatabase {
public AccountsDBTable accounts;
public PassStatsDBTable passStats;
public SplittersDBTable splitters;
public GridsDBTable grids;
public GridsDBTable tablesVisualData;
//-
public SapforProfilesDBTable sapforProfiles = null;
//---------
@@ -87,18 +88,18 @@ public class GlobalDatabase extends SQLiteDatabase {
addTable(passStats = new PassStatsDBTable());
addTable(splitters = new SplittersDBTable());
addTable(dvmParameters = new DVMParameterDBTable());
addTable(grids = new GridsDBTable());
addTable(tablesVisualData = new GridsDBTable());
addTable(sapforProfiles = new SapforProfilesDBTable());
addTable(sapforProfilesSettings = new SapforProfileSettingsDBTable());
}
//---------------------------------------------------------------------------------
@Override
public void Init() throws Exception {
Current.set(Current.Account,
CurrentAnchestor.set(Current.Account,
accounts.Data.isEmpty() ? Insert(new Account()) :
accounts.getFirstRecord()
);
Current.set(Current.Credentials,
CurrentAnchestor.set(Current.Credentials,
credentials.Data.isEmpty() ? Insert(new Credentials()) :
credentials.getFirstRecord());
//настройки компонент
@@ -111,7 +112,7 @@ public class GlobalDatabase extends SQLiteDatabase {
}
public void SaveCredentials(){
try {
Credentials credentials = (Credentials) Current.get(Current.Credentials);
Credentials credentials = (Credentials) CurrentAnchestor.get(Current.Credentials);
if (Current.HasMachine())
credentials.machine_id = Current.getMachine().id;
if (Current.HasUser())
@@ -130,7 +131,7 @@ public class GlobalDatabase extends SQLiteDatabase {
}
public void UpdateCredentials() {
try {
Global.db.Update((DBObject) Current.get(Current.Credentials));
Global.db.Update((DBObject) CurrentAnchestor.get(Current.Credentials));
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
}

5
src/GlobalData/Grid/GridsDBTable.java
View File

@@ -1,8 +1,7 @@
package GlobalData.Grid;
import Common_old.Current;
import Common.Database.Tables.DBTable;
public class GridsDBTable extends DBTable<Current, Grid> {
public class GridsDBTable extends DBTable<String, TableVisualData> {
public GridsDBTable() {
super(Current.class, Grid.class);
super(String.class, TableVisualData.class);
}
}

10
src/GlobalData/Grid/Grid.java → src/GlobalData/Grid/TableVisualData.java
View File

@@ -1,19 +1,19 @@
package GlobalData.Grid;
import Common_old.Current;
import Common.CurrentAnchestor;
import Common.Database.Objects.DBObject;
import com.sun.org.glassfish.gmbal.Description;
import java.util.Arrays;
import java.util.Vector;
import java.util.stream.Collectors;
public class Grid extends DBObject {
public class TableVisualData extends DBObject {
@Description("PRIMARY KEY, UNIQUE") //имя таблицы
public Current name = Current.Undefined;
public String name = null;
@Description("DEFAULT ''")
public String sizes = ""; //ширины столбцов запакованные через |. вводить объекты ради них нецелесообразно.
public Grid() {
public TableVisualData() {
}
public Grid(Current name_in) {
public TableVisualData(String name_in) {
name = name_in;
sizes = "";
}

2
src/GlobalData/Machine/MachinesDBTable.java
View File

@@ -1,7 +1,7 @@
package GlobalData.Machine;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;

2
src/GlobalData/Makefile/MakefilesDBTable.java
View File

@@ -1,6 +1,6 @@
package GlobalData.Makefile;
import Common_old.Current;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;

2
src/GlobalData/Module/ModulesDBTable.java
View File

@@ -1,7 +1,7 @@
package GlobalData.Module;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.UI.Windows.Dialog.DialogFields;
import GlobalData.Module.UI.ModuleAnchestorForm;

2
src/GlobalData/Module/UI/ModuleAnchestorFields.java
View File

@@ -1,7 +1,7 @@
package GlobalData.Module.UI;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.ComboBox.StyledTextComboBox;
import Common.Visual.Controls.StyledTextComboBox;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DialogFields;
import GlobalData.Compiler.Compiler;

3
src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
View File

@@ -1,4 +1,5 @@
package GlobalData.RemoteFile.UI;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common_old.UI.UI;
@@ -39,7 +40,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
}
public void Refresh(String path) {
try {
Current.set(Current.RemoteFile, null);//сброс текущего файла перед любым обновлением.
CurrentAnchestor.set(Current.RemoteFile, null);//сброс текущего файла перед любым обновлением.
fields.lCurrentFile.setText("?");
//-------------------------------------------------------------------
root_file = new RemoteFile(path, true);

2
src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -3,7 +3,7 @@ import Common.CommonConstants;
import Common.Visual.CommonUI;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;

2
src/GlobalData/SapforProfile/SapforProfilesDBTable.java
View File

@@ -1,6 +1,6 @@
package GlobalData.SapforProfile;
import Common_old.Current;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;

2
src/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
View File

@@ -1,7 +1,7 @@
package GlobalData.SapforProfileSetting;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting> {
public SapforProfileSettingsDBTable() {
super(SapforProfileSetting.class);

2
src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
View File

@@ -1,6 +1,6 @@
package GlobalData.Tasks.CompilationTask;
import Common_old.Current;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Menus.TableMenu;
import Common_old.UI.UI;
import Common.Database.Objects.DBObject;

2
src/GlobalData/Tasks/RunTask/RunTasksDBTable.java
View File

@@ -1,7 +1,7 @@
package GlobalData.Tasks.RunTask;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Menus.TableMenu;
import Common_old.UI.UI;
import Visual_DVM_2021.Passes.PassCode_2021;

2
src/GlobalData/User/UsersDBTable.java
View File

@@ -1,6 +1,6 @@
package GlobalData.User;
import Common_old.Current;
import Common_old.UI.DataSetControlForm;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Tables.TableRenderers;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;