diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4bfd0fb9..4130d001 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,107 +7,37 @@ - - - - - + + + + - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -120,233 +50,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/properties b/properties index 8d5e29f1..3b795484 100644 --- a/properties +++ b/properties @@ -22,7 +22,6 @@ "ConfirmPassesStart": true, "ShowPassesDone": true, "FocusPassesResult": true, - "GlobalDBName": "db7.sqlite", "ProjectDBName": "new_project_base.sqlite", "BugReportsDBName": "bug_reports.sqlite", "TestsDBName": "tests.sqlite", diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java index 2de01208..46dba46f 100644 --- a/src/Common/Passes/Pass.java +++ b/src/Common/Passes/Pass.java @@ -53,9 +53,9 @@ public class Pass { //важно. вызывать только если есть интерфейс. passstats делать частью общей бд.пусть будут. public static void CheckAllStats() throws Exception { for (Pass pass : FAPasses) { - if (!((GlobalDatabase) Utils_.db).passStats.Data.containsKey(pass.code().toString())) - Utils_.db.Insert(pass.stats = new PassStats(pass.code().toString())); - else pass.stats = ((GlobalDatabase) Utils_.db).passStats.Data.get(pass.code().toString()); + if (!(Global.mainModule.getDb()).passStats.Data.containsKey(pass.code().toString())) + Global.mainModule.getDb().Insert(pass.stats = new PassStats(pass.code().toString())); + else pass.stats = (Global.mainModule.getDb()).passStats.Data.get(pass.code().toString()); } FAPasses.sort(new SortPassesByStats()); } @@ -128,7 +128,7 @@ public class Pass { if (hasStats()) { stats.Inc(); try { - Utils_.db.Update(stats); + Global.mainModule.getDb().Update(stats); FAPasses.sort(new SortPassesByStats()); if (Current.HasProject()) UI.fastAccessMenuBar.Refresh(); diff --git a/src/Common/Utils/Utils_.java b/src/Common/Utils/Utils_.java index 121fcf6e..cd4b2678 100644 --- a/src/Common/Utils/Utils_.java +++ b/src/Common/Utils/Utils_.java @@ -42,7 +42,7 @@ public class Utils_ { public static long last_ticks = CommonConstants.Nan; //-------------------------------------------------- //главная база данных - public static VisualiserDatabase db = null; + // public static VisualiserDatabase db = null; //------------------------------------------------------------------------ public static Object requireNonNullElse(Object value, Object default_value) { return (value != null) ? value : default_value; diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java index 60a59c83..6895206b 100644 --- a/src/Common/Visual/DataSetControlForm.java +++ b/src/Common/Visual/DataSetControlForm.java @@ -6,6 +6,7 @@ import Common.Database.Objects.DBObject; import Common.Database.Tables.DBTable; import Common.Database.Tables.DataSet; import Common.Database.Tables.FKBehaviour; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Menus.TableMenu; import Common.Visual.Tables.ColumnInfo; @@ -64,21 +65,21 @@ public class DataSetControlForm extends ControlWithCurrentForm { return getDataSource().CurrentName(); } public void SaveColumns() { - if (Utils_.db != null) { + if (Global.mainModule.getDb() != null) { try { if ((CurrentName() != null)) { String tableName= CurrentName().toString(); Vector widths = IntStream.range(0, columns.size()).mapToObj(i -> String.valueOf(control.getColumnModel().getColumn(i).getWidth())).collect(Collectors.toCollection(Vector::new)); String packed = String.join("|", widths); TableVisualData tableVisualData; - if (Utils_.db.tablesVisualData.containsKey(tableName)) { - tableVisualData = Utils_.db.tablesVisualData.get(tableName); + if (Global.mainModule.getDb().tablesVisualData.containsKey(tableName)) { + tableVisualData = Global.mainModule.getDb().tablesVisualData.get(tableName); } else { tableVisualData = new TableVisualData(tableName); - Utils_.db.Insert(tableVisualData); + Global.mainModule.getDb().Insert(tableVisualData); } tableVisualData.sizes = packed; - Utils_.db.Update(tableVisualData); + Global.mainModule.getDb().Update(tableVisualData); } } catch (Exception ex) { ex.printStackTrace(); @@ -149,9 +150,11 @@ public class DataSetControlForm extends ControlWithCurrentForm { //-----------------------------NEW------------------------------------- @Override public void CorrectColumnsSizes() { - if ((Utils_.db != null) && CurrentName() != null && Utils_.db.tablesVisualData.containsKey(CurrentName().toString())) { + if ((Global.mainModule.getDb() != null) + && CurrentName() != null + && Global.mainModule.getDb().tablesVisualData.containsKey(CurrentName().toString())) { if (!getColumnsProfile().equalsIgnoreCase(colNamesAndSizes)) { - TableVisualData grid = Utils_.db.tablesVisualData.get(CurrentName().toString()); + TableVisualData grid = Global.mainModule.getDb().tablesVisualData.get(CurrentName().toString()); String[] data = grid.sizes.split("\\|"); for (int i = 0; i < columns.size(); ++i) { if (i <= (data.length - 1)) { diff --git a/src/Common/Visual/Windows/Form.java b/src/Common/Visual/Windows/Form.java index eac0343a..ec4c0367 100644 --- a/src/Common/Visual/Windows/Form.java +++ b/src/Common/Visual/Windows/Form.java @@ -2,6 +2,7 @@ package Common.Visual.Windows; import Common.Utils.Utils_; import Common.Visual.Themes.ThemeElement; import Common.Database.Objects.DBForm.DBForm; +import _VisualDVM.Global; import javax.swing.*; import java.awt.*; @@ -73,8 +74,8 @@ public abstract class Form extends JFrame implements ThemeElement { } public void LoadWindowParameters() throws Exception { if (getFormKey()!=null) - if (Utils_.db.forms.Data.containsKey(getFormKey())) { - dbInfo = Utils_.db.forms.Data.get(getFormKey()); + if (Global.mainModule.getDb().forms.Data.containsKey(getFormKey())) { + dbInfo = Global.mainModule.getDb().forms.Data.get(getFormKey()); dbInfo.Apply(this); return; } @@ -85,9 +86,9 @@ public abstract class Form extends JFrame implements ThemeElement { if (getFormKey()!=null) { if (dbInfo != null) { dbInfo.Init(this); - Utils_.db.Update(dbInfo); + Global.mainModule.getDb().Update(dbInfo); } else - Utils_.db.Insert(new DBForm(getFormKey(), this)); + Global.mainModule.getDb().Insert(new DBForm(getFormKey(), this)); } } @Override diff --git a/src/MainModule_/MainModule_.java b/src/MainModule_/MainModule_.java new file mode 100644 index 00000000..b71a950a --- /dev/null +++ b/src/MainModule_/MainModule_.java @@ -0,0 +1,33 @@ +package MainModule_; +import Common.Database.VisualiserDatabase; +import Common.Passes.Pass; +import Common.Passes.PassCode_; +import Common.Utils.Utils_; + +import java.util.LinkedHashMap; +//Основной объект визуализатора. +public abstract class MainModule_ { + protected D db; + protected Class db_class; + public LinkedHashMap passes; + public D getDb() { + return db; + } + public MainModule_(Class db_class_in) { + try { + db_class = db_class_in; + } catch (Exception ex) { + ex.printStackTrace(); + } + } + public void ActivateDB() throws Exception { + db = db_class.newInstance(); + db.Connect(); + db.CreateAllTables(); + db.prepareTablesStatements(); + db.Synchronize(); + } + public void DeactivateDB() throws Exception{ + if (db != null) db.Disconnect(); + } +} diff --git a/src/Visual_DVM_2021/Passes/All/AddBugReport.java b/src/Visual_DVM_2021/Passes/All/AddBugReport.java index f77fb3c5..d29e65a2 100644 --- a/src/Visual_DVM_2021/Passes/All/AddBugReport.java +++ b/src/Visual_DVM_2021/Passes/All/AddBugReport.java @@ -48,7 +48,7 @@ public class AddBugReport extends AddObjectPass { target.project_version = ""; target.visualiser_version = Global.visualiser.version; target.sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version; - target.sapfor_settings =((GlobalDatabase) Utils_.db).settings.getSapforSettingsText(); + target.sapfor_settings =(Global.mainModule.getDb()).settings.getSapforSettingsText(); target.percentage = 0; target.description = "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'"; target.date = new Date().getTime(); diff --git a/src/Visual_DVM_2021/Passes/All/AddCompiler.java b/src/Visual_DVM_2021/Passes/All/AddCompiler.java index 763331c9..5cffd9e8 100644 --- a/src/Visual_DVM_2021/Passes/All/AddCompiler.java +++ b/src/Visual_DVM_2021/Passes/All/AddCompiler.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Objects.DBObject; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Machine.Machine; import Common.Passes.AddObjectPass; @@ -11,7 +12,7 @@ public class AddCompiler extends AddObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } @Override public Class getOwner() { diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java b/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java index 3621ee60..7621eff6 100644 --- a/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java +++ b/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Objects.DBObject; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import Common.Passes.AddObjectPass; @@ -15,6 +16,6 @@ public class AddDVMParameter extends AddObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java b/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java index da36f6cc..6b96186a 100644 --- a/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java +++ b/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java @@ -1,14 +1,14 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; import Common.Passes.AddObjectPass; +import _VisualDVM.Global; +import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; public class AddEnvironmentValue extends AddObjectPass { public AddEnvironmentValue() { super(EnvironmentValue.class); } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/AddMachine.java b/src/Visual_DVM_2021/Passes/All/AddMachine.java index 2cea2711..e32f5958 100644 --- a/src/Visual_DVM_2021/Passes/All/AddMachine.java +++ b/src/Visual_DVM_2021/Passes/All/AddMachine.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.GlobalDatabase; @@ -14,12 +15,12 @@ public class AddMachine extends AddObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } @Override protected boolean canStart(Object... args) throws Exception { if (super.canStart(args)) { - if (target.type.equals(MachineType.Local) && ((GlobalDatabase) Utils_.db).machines.LocalMachineExists()) { + if (target.type.equals(MachineType.Local) && Global.mainModule.getDb().machines.LocalMachineExists()) { Log.Writeln_("Локальная машина уже добавлена."); return false; } diff --git a/src/Visual_DVM_2021/Passes/All/AddMakefile.java b/src/Visual_DVM_2021/Passes/All/AddMakefile.java index 16b45090..a748dada 100644 --- a/src/Visual_DVM_2021/Passes/All/AddMakefile.java +++ b/src/Visual_DVM_2021/Passes/All/AddMakefile.java @@ -1,12 +1,12 @@ package Visual_DVM_2021.Passes.All; -import Common.Database.Objects.DBObject; import Common.Database.Database; -import Common.Utils.Utils_; +import Common.Database.Objects.DBObject; +import Common.Passes.AddObjectPass; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Module.Module; import _VisualDVM.ProjectData.LanguageName; -import Common.Passes.AddObjectPass; public class AddMakefile extends AddObjectPass { public AddMakefile() { super(Makefile.class); @@ -25,6 +25,6 @@ public class AddMakefile extends AddObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java b/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java index e25deab8..c7e51069 100644 --- a/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java +++ b/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Objects.DBObject; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import Common.Passes.AddObjectPass; @@ -15,6 +16,6 @@ public class AddRunConfiguration extends AddObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/AddUser.java b/src/Visual_DVM_2021/Passes/All/AddUser.java index 5089eb94..1098355c 100644 --- a/src/Visual_DVM_2021/Passes/All/AddUser.java +++ b/src/Visual_DVM_2021/Passes/All/AddUser.java @@ -3,6 +3,7 @@ import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Database.Objects.DBObject; import Common.Database.Database; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.MachineType; import _VisualDVM.GlobalData.User.User; @@ -14,7 +15,7 @@ public class AddUser extends AddObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } @Override public Class getOwner() { diff --git a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java b/src/Visual_DVM_2021/Passes/All/ApplyProfile.java index 10f61004..d8b352d6 100644 --- a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java +++ b/src/Visual_DVM_2021/Passes/All/ApplyProfile.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting; @@ -33,12 +34,12 @@ public class ApplyProfile extends Pass { @Override protected void body() throws Exception { Vector settings = new Vector<>(); - for (SapforProfileSetting sapforProfileSetting : ((GlobalDatabase) Utils_.db).sapforProfilesSettings.Data.values()) + for (SapforProfileSetting sapforProfileSetting : Global.mainModule.getDb().sapforProfilesSettings.Data.values()) if (sapforProfileSetting.sapforprofile_id == target.id) settings.add(sapforProfileSetting); //-- for (SapforProfileSetting setting : settings) - if (((GlobalDatabase) Utils_.db).settings.containsKey(setting.name)) + if (Global.mainModule.getDb().settings.containsKey(setting.name)) passes.get(PassCode.UpdateSetting).Do(setting.name, setting.value); //-- } diff --git a/src/Visual_DVM_2021/Passes/All/Compile.java b/src/Visual_DVM_2021/Passes/All/Compile.java index 3633ebe1..6883f8d4 100644 --- a/src/Visual_DVM_2021/Passes/All/Compile.java +++ b/src/Visual_DVM_2021/Passes/All/Compile.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.GlobalData.GlobalDatabase; @@ -54,12 +55,12 @@ public class Compile extends Pass { //------------------------------------------ compilationTask.CompleteSummary(target.compilation_maxtime); compilationTask.state = TaskState.Inactive; - Utils_.db.Insert(compilationTask); + Global.mainModule.getDb().Insert(compilationTask); Utils.forceDeleteWithCheck(compilationTask.getLocalWorkspace()); } @Override protected void showPreparation() throws Exception { - ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(compilationTask.getPK()); + Global.mainModule.getDb().compilationTasks.ShowUI(compilationTask.getPK()); } @Override protected void body() throws Exception { @@ -86,7 +87,7 @@ public class Compile extends Pass { } @Override protected void showFinish() throws Exception { - ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(compilationTask.getPK()); + Global.mainModule.getDb().compilationTasks.ShowUI(compilationTask.getPK()); UI.getDebugWindow().ShowLastCompilationTask(); } } diff --git a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java index 5d427e39..f766d198 100644 --- a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java +++ b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java @@ -3,6 +3,7 @@ import Common.Current_; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.PassMenuItem; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; @@ -99,7 +100,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass Vector unit_args = new Vector<>(); unit_args.add(target.name); unit_args.add(target.languageName.toString()); - unit_args.add(((GlobalDatabase) Utils_.db).settings.get(SettingName.DVMConvertationOptions).toString()); + unit_args.add((Global.mainModule.getDb()).settings.get(SettingName.DVMConvertationOptions).toString()); unit_args.addAll(programsNames); unit.arg = String.join("\n", unit_args); Command(unit); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java b/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java index 0189bc71..a7da38f4 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java @@ -1,14 +1,14 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.GlobalData.Compiler.Compiler; import Common.Passes.DeleteObjectPass; +import _VisualDVM.Global; +import _VisualDVM.GlobalData.Compiler.Compiler; public class DeleteCompiler extends DeleteObjectPass { public DeleteCompiler() { super(Compiler.class); } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java b/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java index c764fd6a..a7166a06 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import Common.Passes.DeleteObjectPass; public class DeleteDVMParameter extends DeleteObjectPass { @@ -9,6 +10,6 @@ public class DeleteDVMParameter extends DeleteObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java b/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java index 1af2d87a..1bb6220d 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Tasks.Task; @@ -10,21 +11,21 @@ import java.util.stream.Collectors; public class DeleteDebugResults extends CurrentProjectPass { @Override protected void showPreparation() throws Exception { - ((GlobalDatabase) Utils_.db).compilationTasks.ClearUI(); - ((GlobalDatabase) Utils_.db).runTasks.ClearUI(); + Global.mainModule.getDb().compilationTasks.ClearUI(); + Global.mainModule.getDb().runTasks.ClearUI(); } @Override protected void body() throws Exception { - Vector toDelete = ((GlobalDatabase) Utils_.db).compilationTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).collect(Collectors.toCollection(Vector::new)); - ((GlobalDatabase) Utils_.db).runTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).forEach(toDelete::add); + Vector toDelete = Global.mainModule.getDb().compilationTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).collect(Collectors.toCollection(Vector::new)); + Global.mainModule.getDb().runTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).forEach(toDelete::add); for (Task task : toDelete) { Utils.forceDeleteWithCheck(task.getLocalWorkspace()); - Utils_.db.Delete(task); + Global.mainModule.getDb().Delete(task); } } @Override protected void showFinish() throws Exception { - ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(); - ((GlobalDatabase) Utils_.db).runTasks.ShowUI(); + Global.mainModule.getDb().compilationTasks.ShowUI(); + Global.mainModule.getDb().runTasks.ShowUI(); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java index 86950642..d6dd72c9 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.GlobalDatabase; import Common.Visual.Windows.Dialog.Dialog; import _VisualDVM.Utils; @@ -24,7 +25,7 @@ public class DeleteDownloadedBugReports extends Pass { target = (DirInfosDataSet) passes.get(PassCode.GetOldBugReports).target; if (target.Data.isEmpty()){ Log.Writeln_("Не найдено отчетов, не использовавшихся " + - ((GlobalDatabase) Utils_.db).settings.get(SettingName.BugReportsAgeLimit).toInt32() + + (Global.mainModule.getDb()).settings.get(SettingName.BugReportsAgeLimit).toInt32() + " месяцев и более!"); return false; } @@ -48,7 +49,7 @@ public class DeleteDownloadedBugReports extends Pass { } }; if (dialog.ShowDialog("Найдено "+target.size()+" отчетов, не использовавшихся " + - ((GlobalDatabase) Utils_.db).settings.get(SettingName.BugReportsAgeLimit).toInt32()+ + (Global.mainModule.getDb()).settings.get(SettingName.BugReportsAgeLimit).toInt32()+ " месяцев и более. Удалить?")) { return true; } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java b/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java index 96ce6d16..79a303a4 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java @@ -1,14 +1,14 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; import Common.Passes.DeleteObjectPass; +import _VisualDVM.Global; +import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; public class DeleteEnvironmentValue extends DeleteObjectPass { public DeleteEnvironmentValue() { super(EnvironmentValue.class); } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteMachine.java b/src/Visual_DVM_2021/Passes/All/DeleteMachine.java index 4d82b5d9..d21d1ce1 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteMachine.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteMachine.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import Common.Passes.DeleteObjectPass; public class DeleteMachine extends DeleteObjectPass { @@ -9,6 +10,6 @@ public class DeleteMachine extends DeleteObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } \ No newline at end of file diff --git a/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java b/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java index ba68a2b7..bea302d0 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Makefile.Makefile; import Common.Passes.DeleteObjectPass; public class DeleteMakefile extends DeleteObjectPass { @@ -9,6 +10,6 @@ public class DeleteMakefile extends DeleteObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteProfile.java b/src/Visual_DVM_2021/Passes/All/DeleteProfile.java index ad94e0c6..27fa8b3b 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteProfile.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteProfile.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import Common.Passes.DeleteObjectPass; public class DeleteProfile extends DeleteObjectPass { @@ -9,6 +10,6 @@ public class DeleteProfile extends DeleteObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java b/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java index 06175888..0fd23b33 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import Common.Passes.DeleteObjectPass; public class DeleteRunConfiguration extends DeleteObjectPass { @@ -9,6 +10,6 @@ public class DeleteRunConfiguration extends DeleteObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java index 796a0a52..188c4739 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask; @@ -19,7 +20,7 @@ public class DeleteSelectedCompilationTasks extends Pass @Override protected boolean canStart(Object... args) throws Exception { target = new Vector<>(); - ((GlobalDatabase) Utils_.db).compilationTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task)); + Global.mainModule.getDb().compilationTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task)); if (target.isEmpty()) { Log.Writeln_("Не отмечено ни одной задачи для удаления."); return false; @@ -27,21 +28,21 @@ public class DeleteSelectedCompilationTasks extends Pass } @Override protected void showPreparation() throws Exception { - ((GlobalDatabase) Utils_.db).compilationTasks.ClearUI(); + Global.mainModule.getDb().compilationTasks.ClearUI(); } @Override protected void body() throws Exception { for (CompilationTask task : target) { for (RunTask runTask : task.getRunTasks().values()) { - Utils_.db.Delete(runTask); + Global.mainModule.getDb().Delete(runTask); Utils.forceDeleteWithCheck(runTask.getLocalWorkspace()); } - Utils_.db.Delete(task); + Global.mainModule.getDb().Delete(task); Utils.forceDeleteWithCheck(task.getLocalWorkspace()); } } @Override protected void showFinish() throws Exception { - ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(); + Global.mainModule.getDb().compilationTasks.ShowUI(); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java index 114848b7..c06953b2 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; @@ -18,7 +19,7 @@ public class DeleteSelectedRunTasks extends Pass> { @Override protected boolean canStart(Object... args) throws Exception { target = new Vector<>(); - ((GlobalDatabase) Utils_.db).runTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task)); + (Global.mainModule.getDb()).runTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task)); if (target.isEmpty()) { Log.Writeln_("Не отмечено ни одной задачи для удаления."); return false; @@ -26,17 +27,17 @@ public class DeleteSelectedRunTasks extends Pass> { } @Override protected void showPreparation() throws Exception { - ((GlobalDatabase) Utils_.db).runTasks.ClearUI(); + Global.mainModule.getDb().runTasks.ClearUI(); } @Override protected void body() throws Exception { for (RunTask task : target) { - Utils_.db.Delete(task); + Global.mainModule.getDb().Delete(task); Utils.forceDeleteWithCheck(task.getLocalWorkspace()); } } @Override protected void showFinish() throws Exception { - ((GlobalDatabase) Utils_.db).runTasks.ShowUI(); + Global.mainModule.getDb().runTasks.ShowUI(); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteUser.java b/src/Visual_DVM_2021/Passes/All/DeleteUser.java index aeab3653..cd1de42a 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteUser.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteUser.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.User.User; import Common.Passes.DeleteObjectPass; public class DeleteUser extends DeleteObjectPass { @@ -9,6 +10,6 @@ public class DeleteUser extends DeleteObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/DropFastAccess.java b/src/Visual_DVM_2021/Passes/All/DropFastAccess.java index 68abf84b..5a6e8baf 100644 --- a/src/Visual_DVM_2021/Passes/All/DropFastAccess.java +++ b/src/Visual_DVM_2021/Passes/All/DropFastAccess.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Passes.Pass; public class DropFastAccess extends Pass { @@ -11,7 +12,7 @@ public class DropFastAccess extends Pass { protected void body() throws Exception { for (Pass pass : Pass.FAPasses) { pass.stats.Drop(); - Utils_.db.Update(pass.stats); + Global.mainModule.getDb().Update(pass.stats); } } @Override diff --git a/src/Visual_DVM_2021/Passes/All/DropLastProjects.java b/src/Visual_DVM_2021/Passes/All/DropLastProjects.java index 1398841b..0b5b67b2 100644 --- a/src/Visual_DVM_2021/Passes/All/DropLastProjects.java +++ b/src/Visual_DVM_2021/Passes/All/DropLastProjects.java @@ -1,10 +1,11 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.DBLastProject.DBLastProject; import Common.Passes.Pass; public class DropLastProjects extends Pass { @Override protected void body() throws Exception { - Utils_.db.DeleteAll(DBLastProject.class); + Global.mainModule.getDb().DeleteAll(DBLastProject.class); } } diff --git a/src/Visual_DVM_2021/Passes/All/EditAccount.java b/src/Visual_DVM_2021/Passes/All/EditAccount.java index 01453c17..a60aee43 100644 --- a/src/Visual_DVM_2021/Passes/All/EditAccount.java +++ b/src/Visual_DVM_2021/Passes/All/EditAccount.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.Subscribes.Subscriber; import _VisualDVM.Repository.Subscribes.UI.SubscriberForm; @@ -62,7 +63,7 @@ public class EditAccount extends Email { super.performDone(); Current.getAccount().name = name; Current.getAccount().email = email; - Utils_.db.Update(Current.getAccount()); + Global.mainModule.getDb().Update(Current.getAccount()); //это не регистрация. только заполнение почты в своей бд и ее подтверждение на реальность. } } diff --git a/src/Visual_DVM_2021/Passes/All/EditCompiler.java b/src/Visual_DVM_2021/Passes/All/EditCompiler.java index 9870154d..fdca8b74 100644 --- a/src/Visual_DVM_2021/Passes/All/EditCompiler.java +++ b/src/Visual_DVM_2021/Passes/All/EditCompiler.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import Common.Passes.EditObjectPass; public class EditCompiler extends EditObjectPass { @@ -9,6 +10,6 @@ public class EditCompiler extends EditObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java b/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java index 780e2c36..7f29b73b 100644 --- a/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java +++ b/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import Common.Passes.EditObjectPass; public class EditDVMParameter extends EditObjectPass { @@ -9,6 +10,6 @@ public class EditDVMParameter extends EditObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java b/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java index 961e60a3..dc71f967 100644 --- a/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java +++ b/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; import Common.Passes.EditObjectPass; public class EditEnvironmentValue extends EditObjectPass { @@ -9,6 +10,6 @@ public class EditEnvironmentValue extends EditObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/EditMachine.java b/src/Visual_DVM_2021/Passes/All/EditMachine.java index 9b5d7086..9361d9df 100644 --- a/src/Visual_DVM_2021/Passes/All/EditMachine.java +++ b/src/Visual_DVM_2021/Passes/All/EditMachine.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import Common.Passes.EditObjectPass; public class EditMachine extends EditObjectPass { @@ -9,6 +10,6 @@ public class EditMachine extends EditObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/EditMakefile.java b/src/Visual_DVM_2021/Passes/All/EditMakefile.java index 1e237476..75755fec 100644 --- a/src/Visual_DVM_2021/Passes/All/EditMakefile.java +++ b/src/Visual_DVM_2021/Passes/All/EditMakefile.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Makefile.Makefile; import Common.Passes.EditObjectPass; public class EditMakefile extends EditObjectPass { @@ -9,6 +10,6 @@ public class EditMakefile extends EditObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/EditModule.java b/src/Visual_DVM_2021/Passes/All/EditModule.java index bbca645c..c0dcdaaf 100644 --- a/src/Visual_DVM_2021/Passes/All/EditModule.java +++ b/src/Visual_DVM_2021/Passes/All/EditModule.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Module.Module; import Common.Passes.EditObjectPass; public class EditModule extends EditObjectPass { @@ -9,6 +10,6 @@ public class EditModule extends EditObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/EditProfile.java b/src/Visual_DVM_2021/Passes/All/EditProfile.java index 2e89f74e..a11cb356 100644 --- a/src/Visual_DVM_2021/Passes/All/EditProfile.java +++ b/src/Visual_DVM_2021/Passes/All/EditProfile.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import Common.Passes.EditObjectPass; public class EditProfile extends EditObjectPass { @@ -9,6 +10,6 @@ public class EditProfile extends EditObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java b/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java index a6b2d63a..54e09275 100644 --- a/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java +++ b/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import Common.Passes.EditObjectPass; public class EditRunConfiguration extends EditObjectPass { @@ -9,6 +10,6 @@ public class EditRunConfiguration extends EditObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/EditUser.java b/src/Visual_DVM_2021/Passes/All/EditUser.java index 90da402e..4a242151 100644 --- a/src/Visual_DVM_2021/Passes/All/EditUser.java +++ b/src/Visual_DVM_2021/Passes/All/EditUser.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.User.User; import Common.Passes.EditObjectPass; public class EditUser extends EditObjectPass { @@ -9,6 +10,6 @@ public class EditUser extends EditObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } } diff --git a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java b/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java index ce4ef26a..3fc05b26 100644 --- a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java +++ b/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java @@ -30,7 +30,7 @@ public class GetOldBugReports extends Pass { //--- Calendar c = new GregorianCalendar(); c.setTimeInMillis(System.currentTimeMillis()); - c.add(Calendar.MONTH, -((GlobalDatabase) Utils_.db).settings.get(SettingName.BugReportsAgeLimit).toInt32()); + c.add(Calendar.MONTH, -(Global.mainModule.getDb()).settings.get(SettingName.BugReportsAgeLimit).toInt32()); Date date = c.getTime(); System.out.println(date); long border = date.getTime(); diff --git a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java b/src/Visual_DVM_2021/Passes/All/InitialiseUser.java index 8e0bf09c..f4d51177 100644 --- a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java +++ b/src/Visual_DVM_2021/Passes/All/InitialiseUser.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.User.UserState; @@ -43,7 +44,7 @@ public class InitialiseUser extends Pass { if (passes.get(PassCode.PublishRemoteWorkspace).Do(workspace)) { Current.getUser().workspace = workspace.path; Current.getUser().state = UserState.ready_to_work; - Utils_.db.Update(Current.getUser()); + Global.mainModule.getDb().Update(Current.getUser()); } } } @@ -51,7 +52,7 @@ public class InitialiseUser extends Pass { //рега была. просто заносим то что там пользователю Current.getUser().workspace = workspace.path; Current.getUser().state = UserState.ready_to_work; - Utils_.db.Update(Current.getUser()); + Global.mainModule.getDb().Update(Current.getUser()); } } break; @@ -61,6 +62,6 @@ public class InitialiseUser extends Pass { } @Override protected void showFinish() throws Exception { - ((GlobalDatabase) Utils_.db).users.RefreshUI(); + Global.mainModule.getDb().users.RefreshUI(); } } diff --git a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java index beffa062..ec9d6d56 100644 --- a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java +++ b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.User.User; import _VisualDVM.GlobalData.User.UserState; @@ -47,6 +48,6 @@ public class LocalInitaliseUser extends ProcessPass { } //- target.state = UserState.ready_to_work; - Utils_.db.Update(target); + Global.mainModule.getDb().Update(target); } } diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java index c080c8c4..2c2fd9ce 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java +++ b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java @@ -3,6 +3,7 @@ import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.VDirectoryChooser; import _VisualDVM.Utils; @@ -114,13 +115,13 @@ public class OpenCurrentProject extends Pass { SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0") ; DBLastProject lastProject; - if (((GlobalDatabase) Utils_.db).lastProjects.containsKey(target.Home.getAbsolutePath())) { - lastProject = ((GlobalDatabase) Utils_.db).lastProjects.get(target.Home.getAbsolutePath()); + if ((Global.mainModule.getDb()).lastProjects.containsKey(target.Home.getAbsolutePath())) { + lastProject = Global.mainModule.getDb().lastProjects.get(target.Home.getAbsolutePath()); lastProject.RefreshOpenTime(); - Utils_.db.Update(lastProject); + Global.mainModule.getDb().Update(lastProject); } else { lastProject = new DBLastProject(target); - Utils_.db.Insert(lastProject); + Global.mainModule.getDb().Insert(lastProject); } target.setInfo(lastProject); } diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java index 99445b7d..55b3a0fe 100644 --- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java +++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java @@ -4,6 +4,7 @@ import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Dialog; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment; @@ -82,13 +83,13 @@ public class PickCompilerEnvironments extends Pass { confEnv.run_configuration_id = Current.getRunConfiguration().id; confEnv.name = compilerEnv.name; confEnv.value = compilerEnv.value; - Utils_.db.Insert(confEnv); + Global.mainModule.getDb().Insert(confEnv); } else { - confEnv = ((GlobalDatabase) Utils_.db).environmentValues.getEnvByName(compilerEnv.name); + confEnv = (Global.mainModule.getDb()).environmentValues.getEnvByName(compilerEnv.name); if (confEnv != null) { confEnv.name = compilerEnv.name; confEnv.value = compilerEnv.value; - Utils_.db.Update(confEnv); + Global.mainModule.getDb().Update(confEnv); } } } @@ -96,6 +97,6 @@ public class PickCompilerEnvironments extends Pass { } @Override protected void showDone() throws Exception { - ((GlobalDatabase) Utils_.db).environmentValues.ShowUI(); + (Global.mainModule.getDb()).environmentValues.ShowUI(); } } diff --git a/src/Visual_DVM_2021/Passes/All/Precompilation.java b/src/Visual_DVM_2021/Passes/All/Precompilation.java index a3919378..e865f346 100644 --- a/src/Visual_DVM_2021/Passes/All/Precompilation.java +++ b/src/Visual_DVM_2021/Passes/All/Precompilation.java @@ -52,7 +52,7 @@ public class Precompilation extends Pass { target = Current.getProject(); if (Utils_.isWindows()) { //-- - makepath = ((GlobalDatabase) Utils_.db).settings.get(SettingName.LocalMakePathWindows).toString(); + makepath = Global.mainModule.getDb().settings.get(SettingName.LocalMakePathWindows).toString(); if (makepath.isEmpty()) { Log.Writeln_("Не задан путь к make.exe.\n " + "Укажите его в меню глобальных настроек." + @@ -188,10 +188,10 @@ public class Precompilation extends Pass { protected void body() throws Exception { if (Utils_.isWindows()) { name_to_kill = "make.exe"; - StartProcess(Utils_.DQuotes(((GlobalDatabase) Utils_.db).settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + ((GlobalDatabase) Utils_.db).settings.get(SettingName.Kernels).toString(), + StartProcess(Utils_.DQuotes((Global.mainModule.getDb()).settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime); } else - StartProcess("make -j " + ((GlobalDatabase) Utils_.db).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime); + StartProcess("make -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime); } protected void StartProcess(String command, int TA) throws Exception { killed = false; diff --git a/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java b/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java index 87d4844c..876e1dea 100644 --- a/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java +++ b/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java @@ -4,6 +4,7 @@ import Common.Utils.Utils_; import _VisualDVM.Current; import Visual_DVM_2021.Passes.CurrentProjectPass; import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Global; public class ResetCurrentProject extends CurrentProjectPass { @Override protected void performPreparation() throws Exception { @@ -15,7 +16,7 @@ public class ResetCurrentProject extends CurrentProjectPass { protected void body() throws Exception { target.CleanVersions(); target.ResetDB(); - Utils_.db.Delete(target.getInfo()); + Global.mainModule.getDb().Delete(target.getInfo()); } @Override protected void performDone() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/Run.java b/src/Visual_DVM_2021/Passes/All/Run.java index ef66b5ce..7b33a68b 100644 --- a/src/Visual_DVM_2021/Passes/All/Run.java +++ b/src/Visual_DVM_2021/Passes/All/Run.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.GlobalData.GlobalDatabase; @@ -29,13 +30,13 @@ public class Run extends Pass { protected void performPreparation() throws Exception { runTasks = Current.getRunConfiguration().generateRunTasks(target, Current.getCompilationTask()); for (RunTask runTask : runTasks) { - Utils_.db.Insert(runTask); + Global.mainModule.getDb().Insert(runTask); Utils.forceDeleteWithCheck(runTask.getLocalWorkspace()); } } @Override protected void showPreparation() throws Exception { - ((GlobalDatabase) Utils_.db).runTasks.ShowUI(); + Global.mainModule.getDb().runTasks.ShowUI(); } @Override protected boolean canStart(Object... args) { @@ -84,8 +85,8 @@ public class Run extends Pass { boolean task_completed = false; task.setProgress(i, runTasks.size()); //- - ((GlobalDatabase) Utils_.db).runTasks.RefreshUI(); - ((GlobalDatabase) Utils_.db).runTasks.SetCurrentObjectUI(task.id); + Global.mainModule.getDb().runTasks.RefreshUI(); + Global.mainModule.getDb().runTasks.SetCurrentObjectUI(task.id); //- subpass.Do(task, target); //- @@ -105,7 +106,7 @@ public class Run extends Pass { break; } //- - ((GlobalDatabase) Utils_.db).runTasks.RefreshUI(); + Global.mainModule.getDb().runTasks.RefreshUI(); UI.getDebugWindow().ShowCurrentRunTask(); //- if (!task_completed) break; diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java index ea157b5e..c5b30d7e 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; @@ -30,7 +31,7 @@ public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalys } @Override protected boolean canStart(Object... args) throws Exception { - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.MPI_PROGRAM).toBoolean()) { + if (Global.mainModule.getDb().settings.get(SettingName.MPI_PROGRAM).toBoolean()) { UI_.Info("Включена настройка SAPFOR 'MPI программа'." + "\nПостроение распределения данных невозможно."); passes.get(PassCode.SPF_SharedMemoryParallelization).Do(); diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java index 59a619bb..2b828e6a 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.Visual.Controls.PassControl; import _VisualDVM.Visual.UI; import Common.Utils.Index; @@ -73,7 +74,7 @@ public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis { } @Override public String getDescription() { - return ((GlobalDatabase) Utils_.db).settings.get(SettingName.MPI_PROGRAM).toBoolean()? + return Global.mainModule.getDb().settings.get(SettingName.MPI_PROGRAM).toBoolean()? "Анализ кода (общая память)":"Анализ кода"; } public void RefreshControls(){ diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java b/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java index 19735c82..a7cf90af 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java @@ -45,7 +45,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis { precompilation_done = false; boolean res = ( silent || - (!((GlobalDatabase) Utils_.db).settings.get(SettingName.Precompilation).toBoolean() || + (!Global.mainModule.getDb().settings.get(SettingName.Precompilation).toBoolean() || (precompilation_done = passes.get(PassCode.Precompilation).Do()))) && super.canStart(args) && checkActiveFiles(); return res; diff --git a/src/Visual_DVM_2021/Passes/All/SaveProfile.java b/src/Visual_DVM_2021/Passes/All/SaveProfile.java index 79dd1aa9..0f835d3b 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveProfile.java +++ b/src/Visual_DVM_2021/Passes/All/SaveProfile.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Database.Database; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import Common.Passes.AddObjectPass; @@ -16,12 +17,12 @@ public class SaveProfile extends AddObjectPass { } @Override protected Database getDb() { - return Utils_.db; + return Global.mainModule.getDb(); } @Override protected boolean canStart(Object... args) throws Exception { //1. проверить нет ли уже такой последовательности настроек. - SapforProfile profile = ((GlobalDatabase) Utils_.db).checkProfileForCurrentSettings(); + SapforProfile profile = Global.mainModule.getDb().checkProfileForCurrentSettings(); if (profile != null) { Log.Writeln_("Текущий набор настроек уже сохранён как профиль " + Utils_.Brackets(profile.description)); return false; @@ -32,6 +33,6 @@ public class SaveProfile extends AddObjectPass { protected void body() throws Exception { target.creationDate = new Date().getTime(); super.body(); - ((GlobalDatabase) Utils_.db).insertProfileSettings(target); + Global.mainModule.getDb().insertProfileSettings(target); } } diff --git a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java b/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java index 98b92b20..d6ced659 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java +++ b/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java @@ -3,6 +3,7 @@ import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Machine.MachineType; @@ -61,7 +62,7 @@ public class ShowCompilerVersion extends Pass { @Override protected void showDone() throws Exception { if (needsShow) { - ((GlobalDatabase) Utils_.db).compilers.RefreshUI(); + (Global.mainModule.getDb()).compilers.RefreshUI(); ReadOnlyMultilineTextForm ff = new ReadOnlyMultilineTextForm(); ff.ShowDialog("Версия", target); } diff --git a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java index 0a8494c3..0f9811db 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java +++ b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java @@ -23,7 +23,7 @@ public class UpdateSetting extends Pass { VFileChooser fileChooser = new VFileChooser("", "exe"); @Override protected boolean canStart(Object... args) throws Exception { - target = ((GlobalDatabase) Utils_.db).settings.get(args[0]); + target = (Global.mainModule.getDb()).settings.get(args[0]); NewValue = target.Value; if (args.length == 1) { //интерфейсный режим. получение по клику на пункт меню. @@ -114,7 +114,7 @@ public class UpdateSetting extends Pass { @Override protected void body() throws Exception { target.Value = NewValue; - Utils_.db.Update(target); + Global.mainModule.getDb().Update(target); } @Override protected void showDone() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java index b28d067a..9a923840 100644 --- a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java +++ b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java @@ -3,6 +3,7 @@ import Common.Current_; import Common.Passes.Pass; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json; @@ -36,7 +37,7 @@ public abstract class OpenSapforVersionPass extends Pass { protected void body() throws Exception { SapforTask task = target.task; ShowMessage1("Построение дерева версий и создание баз данных..."); - File rootHome = Paths.get(((GlobalDatabase) Utils_.db).settings.get(SettingName.Workspace).Value, + File rootHome = Paths.get((Global.mainModule.getDb()).settings.get(SettingName.Workspace).Value, Utils_.getDateName(task.test_description)).toFile(); for (SapforVersion_json version_json : task.versions) { ShowMessage2(version_json.version); diff --git a/src/Visual_DVM_2021/Passes/SapforFilesModification.java b/src/Visual_DVM_2021/Passes/SapforFilesModification.java index 14457ae9..29a8daed 100644 --- a/src/Visual_DVM_2021/Passes/SapforFilesModification.java +++ b/src/Visual_DVM_2021/Passes/SapforFilesModification.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; public class SapforFilesModification extends SapforModification { @@ -11,7 +12,7 @@ public class SapforFilesModification extends SapforModification { @Override protected void performPreparation() throws Exception { super.performPreparation(); - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.SaveModifications).toBoolean()) { + if ((Global.mainModule.getDb()).settings.get(SettingName.SaveModifications).toBoolean()) { Current.getProject().createModification(); } } diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java index 55e98e39..96714885 100644 --- a/src/_VisualDVM/Constants.java +++ b/src/_VisualDVM/Constants.java @@ -68,7 +68,6 @@ public class Constants { public static final String attachments = "attachments"; public static final String statistic = "statistic"; public static final String unknown_metric = " — "; - public static final String old_tests_db_name = "tests2026"; public static final String tests_db_name = "tests2027"; public static final String dateNaN = "NaN"; //------ diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java index 5b93d5ea..f1b60e99 100644 --- a/src/_VisualDVM/Global.java +++ b/src/_VisualDVM/Global.java @@ -2,9 +2,11 @@ package _VisualDVM; import Common.Current_; import Common.Database.Tables.DataSet; import Common.Mode; -import Common.Utils.Utils_; +import Common.Passes.Pass; import Common.Utils.Loggable; +import Common.Utils.Utils_; import Common.Visual.UI_; +import Visual_DVM_2021.Passes.PassCode; import _VisualDVM.GlobalData.Account.Account; import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.GlobalData.GlobalDatabase; @@ -21,8 +23,6 @@ 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; -import Common.Passes.Pass; import _VisualDVM.Visual.Syntax.LightSPFEditorTheme; import _VisualDVM.Visual.UI; import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory; @@ -32,6 +32,7 @@ import java.io.File; import java.nio.file.Paths; import java.util.Vector; public class Global { + public static MainModule mainModule = null; //Режим public static Mode mode = Mode.Undefined; //-------------------------------------------------- @@ -74,7 +75,6 @@ public class Global { public static int bad_state = 0; public static int need_update = 0; public static int need_publish = 0; - public static void SynschronizeProperties() { try { File new_propertiesFile = new File(Utils_.getHomeDirectory(), "properties"); @@ -155,7 +155,8 @@ public class Global { //- public static void FinishApplication() { try { - if (Utils_.db != null) Utils_.db.Disconnect(); + // if (Utils_.db != null) Utils_.db.Disconnect(); + mainModule.DeactivateDB(); if (componentsServer.db != null) componentsServer.db.Disconnect(); if (testingServer.db != null) @@ -175,13 +176,6 @@ public class Global { } System.exit(0); } - public static void ActivateDB() throws Exception { - Utils_.db = new GlobalDatabase(); - Utils_.db.Connect(); - Utils_.db.CreateAllTables(); - Utils_.db.prepareTablesStatements(); - Utils_.db.Synchronize(); - } public static void RefreshUpdatesStatus() { Components.RefreshUI(); ValidateComponentsStates(); @@ -225,32 +219,20 @@ public class Global { forbidden.add(SettingName.Precompilation); forbidden.add(SettingName.DVMConvertationOptions); forbidden.add(SettingName.SaveModifications); - for (DBSetting setting : ((GlobalDatabase) Utils_.db).settings.getSettingsByOwner(ComponentType.SapforOptions)) { + for (DBSetting setting : mainModule.getDb().settings.getSettingsByOwner(ComponentType.SapforOptions)) { if (!forbidden.contains(setting.Name)) res_.add(setting.Value); } return String.join("|", res_); } //-- - public static void removeOldDatabases() { - File data = Paths.get(System.getProperty("user.dir"), "Data").toFile(); - File[] files = data.listFiles(); - if (files != null) { - for (File file : files) { - if (file.getName().contains(Constants.old_tests_db_name)) { - try { - Utils.forceDeleteWithCheck(file); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - } - } - } public static void NormalMode(int port) throws Exception { + mainModule= new MainModule(); + //-------------------------------->> + + //-------------------------------->> UI_.active = true; UI_.setTheme(new LightSPFEditorTheme()); - removeOldDatabases(); CheckVisualiserDirectories(); CreateLogAtComponentsPath(); //- @@ -307,7 +289,8 @@ public class Global { } while (flag); } //--- - ActivateDB(); //тут current getAccount; роль по умолчанию всегда неизвестна. + mainModule.ActivateDB(); + // ActivateDB(); //тут current getAccount; роль по умолчанию всегда неизвестна. ///-------------- Current_.set(Current.Account, new Account() { { @@ -322,10 +305,10 @@ public class Global { testingServer.ActivateDB(); //в проперти их! //-- чисто чтобы создать таблицы. соединения на стороне клиента не предвидится. - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.AutoBugReportsLoad).toBoolean()) + if (mainModule.getDb().settings.get(SettingName.AutoBugReportsLoad).toBoolean()) Pass.passes.get(PassCode.SynchronizeBugReports).Do(); //-- - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.AutoTestsLoad).toBoolean()) + if (mainModule.getDb().settings.get(SettingName.AutoTestsLoad).toBoolean()) Pass.passes.get(PassCode.SynchronizeTests).Do(); Pass.CheckAllStats(); Current.getSapfor().refreshPid(); //без сапфора сюда это все равно не дойдет. diff --git a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java index 7fd93823..e0000fe9 100644 --- a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java +++ b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java @@ -5,6 +5,7 @@ import _VisualDVM.Current; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Windows.Dialog.DBObjectDialog; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields; import _VisualDVM.GlobalData.GlobalDatabase; @@ -76,7 +77,7 @@ public class DVMParameterDBTable extends iDBTable { Log.Writeln("Значение переменной окружения не может содержать двойные кавычки"); } */ - for (DVMParameter par : ((GlobalDatabase) Utils_.db).dvmParameters.Data.values()) { + for (DVMParameter par : (Global.mainModule.getDb()).dvmParameters.Data.values()) { if (par.isVisible() && (Result.id != par.id) && (par.name.equals(name))) { Log.Writeln("В конфигурации запуска уже задан параметр DVM системы с именем " + Utils_.Brackets(name)); break; diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java index 47a288e8..ec523d9e 100644 --- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java +++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java @@ -5,6 +5,7 @@ import _VisualDVM.Current; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Windows.Dialog.DBObjectDialog; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields; import _VisualDVM.GlobalData.GlobalDatabase; @@ -43,7 +44,7 @@ public class EnvironmentValuesDBTable extends iDBTable { if (value.contains("\"")) { Log.Writeln("Значение переменной окружения не может содержать двойные кавычки"); } - for (EnvironmentValue env : ((GlobalDatabase) Utils_.db).environmentValues.Data.values()) { + for (EnvironmentValue env : (Global.mainModule.getDb()).environmentValues.Data.values()) { if (env.isVisible() && (Result.id != env.id) && (env.name.equals(name))) { Log.Writeln("В конфигурации запуска уже задана переменная окружения с именем " + Utils_.Brackets(name)); break; diff --git a/src/_VisualDVM/GlobalData/GlobalDatabase.java b/src/_VisualDVM/GlobalData/GlobalDatabase.java index 680ae34f..42098e1a 100644 --- a/src/_VisualDVM/GlobalData/GlobalDatabase.java +++ b/src/_VisualDVM/GlobalData/GlobalDatabase.java @@ -58,7 +58,7 @@ public class GlobalDatabase extends VisualiserDatabase { public SapforProfileSettingsDBTable sapforProfilesSettings = null; //- public GlobalDatabase() { - super(Paths.get(System.getProperty("user.dir"), "Data", Global.properties.GlobalDBName).toFile()); + super(Paths.get(System.getProperty("user.dir"), "Data", "db7.sqlite").toFile()); } @Override protected void initAllTables() throws Exception { diff --git a/src/_VisualDVM/GlobalData/Machine/Machine.java b/src/_VisualDVM/GlobalData/Machine/Machine.java index b357d9c8..de06cc32 100644 --- a/src/_VisualDVM/GlobalData/Machine/Machine.java +++ b/src/_VisualDVM/GlobalData/Machine/Machine.java @@ -1,6 +1,7 @@ package _VisualDVM.GlobalData.Machine; import Common.Database.Objects.iDBObject; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.User.User; @@ -26,10 +27,10 @@ public class Machine extends iDBObject { "Машина по адресу " + Utils_.Brackets(getURL()); } public LinkedHashMap getCompilers() { - return Utils_.db.getMapByFKi(this, Compiler.class); + return Global.mainModule.getDb().getMapByFKi(this, Compiler.class); } public LinkedHashMap getUsers() { - return Utils_.db.getMapByFKi(this, User.class); + return Global.mainModule.getDb().getMapByFKi(this, User.class); } @Override public String getDialogName() { diff --git a/src/_VisualDVM/GlobalData/Makefile/Makefile.java b/src/_VisualDVM/GlobalData/Makefile/Makefile.java index 2d6dc6c4..cd9d9e2c 100644 --- a/src/_VisualDVM/GlobalData/Makefile/Makefile.java +++ b/src/_VisualDVM/GlobalData/Makefile/Makefile.java @@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.Makefile; import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Utils.TextLog; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.CompilerType; @@ -25,10 +26,10 @@ public class Makefile extends ModuleAnchestor { return Current.HasMachine() && (machine_id == Current.getMachine().id); } public LinkedHashMap getActiveModules() { - return Utils_.db.getByFKAndGroupBy(this, Module.class, "language", LanguageName.class).values().stream().filter(Module::isSelected).collect(Collectors.toMap(module -> module.language, module -> module, (a, b) -> b, LinkedHashMap::new)); + return Global.mainModule.getDb().getByFKAndGroupBy(this, Module.class, "language", LanguageName.class).values().stream().filter(Module::isSelected).collect(Collectors.toMap(module -> module.language, module -> module, (a, b) -> b, LinkedHashMap::new)); } public LinkedHashMap getModules() { - return Utils_.db.getByFKAndGroupBy(this, Module.class, "language", LanguageName.class); + return Global.mainModule.getDb().getByFKAndGroupBy(this, Module.class, "language", LanguageName.class); } public String Generate(db_project_info project, boolean useFilesOrder, LinkedHashMap modules) throws Exception { Compiler linker = getCompiler(); @@ -159,7 +160,7 @@ public class Makefile extends ModuleAnchestor { //todo возможно улучшить //https://habr.com/ru/post/211751/ public Machine getMachine() { - return Utils_.db.getById(Machine.class, machine_id); + return Global.mainModule.getDb().getById(Machine.class, machine_id); } public boolean DependsToCompiler(Compiler compiler) { if (compiler_id == compiler.id) return true; diff --git a/src/_VisualDVM/GlobalData/Module/Module.java b/src/_VisualDVM/GlobalData/Module/Module.java index 8d5fc610..9d68988f 100644 --- a/src/_VisualDVM/GlobalData/Module/Module.java +++ b/src/_VisualDVM/GlobalData/Module/Module.java @@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.Module; import Common.CommonConstants; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.ProjectData.LanguageName; public class Module extends ModuleAnchestor { @@ -29,7 +30,7 @@ public class Module extends ModuleAnchestor { public void Select(boolean flag) { on = flag ? 1 : 0; try { - Utils_.db.Update(this); + Global.mainModule.getDb().Update(this); } catch (Exception e) { Utils_.MainLog.PrintException(e); } diff --git a/src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java b/src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java index 8817e434..2ba4eca7 100644 --- a/src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java +++ b/src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java @@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.Module; import Common.CommonConstants; import Common.Utils.Utils_; import Common.Database.Objects.iDBObject; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; public class ModuleAnchestor extends iDBObject { //-------------------------------------------------------------------------------------- @@ -16,7 +17,7 @@ public class ModuleAnchestor extends iDBObject { return ((compiler = getCompiler()) == null) ? "" : compiler.getDescription(); } public Compiler getCompiler() { - return Utils_.db.getById(Compiler.class, compiler_id); + return Global.mainModule.getDb().getById(Compiler.class, compiler_id); } public String getDescription() { String res = ""; diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java index c56a5079..6c63c592 100644 --- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java +++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java @@ -4,6 +4,7 @@ import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Database.Objects.iDBObject; import Common.Utils.TextLog; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; @@ -117,7 +118,7 @@ public class RunConfiguration extends iDBObject { } //----------------------------------------> public Compiler getCompiler() { - return Utils_.db.getById(Compiler.class, compiler_id); + return Global.mainModule.getDb().getById(Compiler.class, compiler_id); } public boolean isCube() { return cube != 0; @@ -189,13 +190,13 @@ public class RunConfiguration extends iDBObject { return "run_configuration_id"; } public Vector getEnvList() { - return Utils_.db.getVectorStringByFK(this, EnvironmentValue.class); + return Global.mainModule.getDb().getVectorStringByFK(this, EnvironmentValue.class); } public Vector getParList() { - return Utils_.db.getVectorStringByFK(this, DVMParameter.class); + return Global.mainModule.getDb().getVectorStringByFK(this, DVMParameter.class); } public LinkedHashMap getEnvMap() { - LinkedHashMap envs = Utils_.db.getMapByFKi(this, EnvironmentValue.class); + LinkedHashMap envs = Global.mainModule.getDb().getMapByFKi(this, EnvironmentValue.class); LinkedHashMap res = new LinkedHashMap<>(); for (EnvironmentValue e : envs.values()) { if (!res.containsKey(e.name)) diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java index d35872ec..ce054ef0 100644 --- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java +++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java @@ -10,6 +10,7 @@ import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKDataBehaviour; import Common.Database.Tables.iDBTable; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.DVMParameter.DVMParameter; @@ -40,7 +41,7 @@ public class RunConfigurationsDBTable extends iDBTable { return new DBObjectDialog(RunConfigurationFields.class) { @Override public void fillFields() { - for (Compiler compiler : ((GlobalDatabase) Utils_.db).compilers.Data.values()) { + for (Compiler compiler : (Global.mainModule.getDb()).compilers.Data.values()) { if (compiler.isVisible() && compiler.type.equals(CompilerType.dvm)) fields.cbLauncherCall.addItem(compiler); } diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java index 82471f84..c9bba1c1 100644 --- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java +++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java @@ -64,7 +64,7 @@ public class CompilationTask extends Task { break; } } - Utils_.db.Update(this); + Global.mainModule.getDb().Update(this); } //--------------------------------------------------- @Override @@ -80,7 +80,7 @@ public class CompilationTask extends Task { belongsToProject(Current.getProject()); } public Makefile getMakefile() { - return Utils_.db.getById(Makefile.class, makefile_id); + return Global.mainModule.getDb().getById(Makefile.class, makefile_id); } @Override public String getFullCommand() { @@ -90,7 +90,7 @@ public class CompilationTask extends Task { LinkedHashMap res = new LinkedHashMap<>(); //так не получится. не правильно назвал ключевое поле. F... // return Global.db.getMapByFKi(this, RunTask.class); - for (RunTask runTask : ((GlobalDatabase) Utils_.db).runTasks.Data.values()) { + for (RunTask runTask : (Global.mainModule.getDb()).runTasks.Data.values()) { if (runTask.compilation_task_id == id) res.put(runTask.id, runTask); } diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java index a133bde6..b4282aba 100644 --- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java +++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java @@ -39,7 +39,7 @@ public class RunTask extends Task { super.DropResults(); Utils.forceDeleteWithCheck(getLocalStsFile()); CleanTime = 0; - Utils_.db.Update(this); + Global.mainModule.getDb().Update(this); } @Override public File getHome() { @@ -62,16 +62,16 @@ public class RunTask extends Task { compilation_task_id == Current.getCompilationTask().id; } public RunConfiguration getRunConfiguration() { - return ((GlobalDatabase) Utils_.db).runConfigurations.Data.get(run_configuration_id); + return (Global.mainModule.getDb()).runConfigurations.Data.get(run_configuration_id); } public CompilationTask getCompilationTask() { - return ((GlobalDatabase) Utils_.db).compilationTasks.Data.get(compilation_task_id); + return (Global.mainModule.getDb()).compilationTasks.Data.get(compilation_task_id); } public void UpdateLastStsName(String file_name) { if (!last_sts_name.equals(file_name)) { last_sts_name = file_name; try { - Utils_.db.Update(this); + Global.mainModule.getDb().Update(this); } catch (Exception ex) { Utils_.MainLog.PrintException(ex); } diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java index 244b7fcb..9ebab50f 100644 --- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java +++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java @@ -1,5 +1,6 @@ package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Makefile.Makefile; @@ -19,7 +20,7 @@ public class WindowsLocalCompilationSupervisor extends WindowsLocalTaskSuperviso } @Override protected String getScriptText() { - return Utils_.DQuotes(((GlobalDatabase) Utils_.db).settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt"; + return Utils_.DQuotes((Global.mainModule.getDb()).settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt"; } //скорее всего как то выделить подготовку к компиляции как метод предка. @Override diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java index 8090b749..a0929f96 100644 --- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java +++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java @@ -1,5 +1,6 @@ package _VisualDVM.GlobalData.Tasks.Supervisor; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Tasks.Task; import _VisualDVM.GlobalData.Tasks.TaskState; @@ -16,7 +17,7 @@ public abstract class TaskSupervisor { public void ShowTaskState(){ - Utils_.db.tables.get(task.getClass()).ShowUI(task.getPK()); + Global.mainModule.getDb().tables.get(task.getClass()).ShowUI(task.getPK()); } public void Init(T task_in, P pass_in, db_project_info project_in) { task = task_in; @@ -132,6 +133,6 @@ public abstract class TaskSupervisor { } } public void UpdateTask() throws Exception { - Utils_.db.Update(task); + Global.mainModule.getDb().Update(task); } } diff --git a/src/_VisualDVM/GlobalData/Tasks/Task.java b/src/_VisualDVM/GlobalData/Tasks/Task.java index 2e46aecd..6d888fb2 100644 --- a/src/_VisualDVM/GlobalData/Tasks/Task.java +++ b/src/_VisualDVM/GlobalData/Tasks/Task.java @@ -3,6 +3,7 @@ import Common.CommonConstants; import Common.Utils.Utils_; import _VisualDVM.Constants; import Common.Database.Objects.iDBObject; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.User.User; @@ -44,7 +45,7 @@ public abstract class Task extends iDBObject { EndDate = 0; Time = 0; state = TaskState.Inactive; - Utils_.db.Update(this); + Global.mainModule.getDb().Update(this); } // // @@ -66,10 +67,10 @@ public abstract class Task extends iDBObject { return new Date(EndDate); } public Machine getMachine() { - return Utils_.db.getById(Machine.class, machine_id); + return Global.mainModule.getDb().getById(Machine.class, machine_id); } public User getUser() { - return Utils_.db.getById(User.class, user_id); + return Global.mainModule.getDb().getById(User.class, user_id); } protected String getTextResult(File file) { return (file.exists()) ? Utils.ReadAllText(file) : "файл не найден. Задача еще не выполнялась или была завершена некорректно"; @@ -92,7 +93,7 @@ public abstract class Task extends iDBObject { if (state != state_in) { state = state_in; try { - Utils_.db.Update(this); + Global.mainModule.getDb().Update(this); } catch (Exception ex) { Utils_.MainLog.PrintException(ex); } diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java index f512705a..204cf05c 100644 --- a/src/_VisualDVM/GlobalProperties.java +++ b/src/_VisualDVM/GlobalProperties.java @@ -57,8 +57,6 @@ public class GlobalProperties { @Expose public boolean FocusPassesResult = true; @Expose - public String GlobalDBName = "db7.sqlite"; - @Expose public String ProjectDBName = "new_project_base.sqlite"; @Expose public String BugReportsDBName = "bug_reports.sqlite"; @@ -134,7 +132,6 @@ public class GlobalProperties { ConfirmPassesStart = p.ConfirmPassesStart; ShowPassesDone = p.ShowPassesDone; FocusPassesResult = p.FocusPassesResult; - GlobalDBName = p.GlobalDBName; ProjectDBName = p.ProjectDBName; BugReportsDBName = p.BugReportsDBName; TestsDBName = p.TestsDBName; diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java new file mode 100644 index 00000000..23e357b1 --- /dev/null +++ b/src/_VisualDVM/MainModule.java @@ -0,0 +1,8 @@ +package _VisualDVM; +import MainModule_.MainModule_; +import _VisualDVM.GlobalData.GlobalDatabase; +public class MainModule extends MainModule_ { + public MainModule() { + super(GlobalDatabase.class); + } +} diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java index 25540063..03c434df 100644 --- a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java +++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java @@ -46,7 +46,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface { highlighter = (RSyntaxTextAreaHighlighter) getHighlighter(); autoComplete = new SapforAutoComplete(this); //------------------------- - float font_size = (float) ((GlobalDatabase) Utils_.db).settings.get(SettingName.EditorFontSize).toInt32(); + float font_size = (float) (Global.mainModule.getDb()).settings.get(SettingName.EditorFontSize).toInt32(); setFont(getFont().deriveFont(font_size)); //------------------------- setText(Utils.ReadAllText(file.file).replace("\r", " ")); @@ -167,7 +167,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface { Pair p = file.gcov_info.line_info.get(lineNum); Color color = never; if (p.getKey() > 0) { - color = (p.getValue() >= ((GlobalDatabase) Utils_.db).settings.get(SettingName.GCOVLimit).toInt32()) ? + color = (p.getValue() >= (Global.mainModule.getDb()).settings.get(SettingName.GCOVLimit).toInt32()) ? new Color(255, 255, (100 - p.getValue()), 90) : null; } if (color != null) { diff --git a/src/_VisualDVM/ProjectData/Messages/Message.java b/src/_VisualDVM/ProjectData/Messages/Message.java index 9a010fb9..45aa14cf 100644 --- a/src/_VisualDVM/ProjectData/Messages/Message.java +++ b/src/_VisualDVM/ProjectData/Messages/Message.java @@ -31,7 +31,7 @@ public class Message extends FileObject { (Global.mode != Mode.Normal)) { value = value_in; } else { - value = !((GlobalDatabase) Utils_.db).settings.get(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in); + value = !(Global.mainModule.getDb()).settings.get(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in); } } // last code - 183 diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java index c2e7d6ca..56f8466c 100644 --- a/src/_VisualDVM/ProjectData/Project/db_project_info.java +++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java @@ -172,7 +172,7 @@ public class db_project_info extends DBObject { parent = parent_in; name = parent.GenerateVersionName(letter_in); languageName = parent.languageName; - style = ((GlobalDatabase) Utils_.db).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed; + style = ((Global.mainModule.getDb()).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed); description = description_in; original = original_in; Home = Paths.get(parent_in.Home.getAbsolutePath(), name).toFile(); @@ -906,7 +906,7 @@ public class db_project_info extends DBObject { } } public void createEmptyVersion(String versionLetter, String versionDescription) throws Exception { - boolean needsM = ((GlobalDatabase) Utils_.db).settings.get(SettingName.SaveModifications).toBoolean(); + boolean needsM = (Global.mainModule.getDb()).settings.get(SettingName.SaveModifications).toBoolean(); if (needsM) createModification(); last_version = new db_project_info( diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java index f23351a5..430142fa 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java @@ -3,6 +3,7 @@ import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Database.Tables.DataSet; import Common.Visual.DataSetControlForm; +import _VisualDVM.Global; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; import Visual_DVM_2021.Passes.PassCode; @@ -39,7 +40,7 @@ public class ArraysSet extends DataSet { @Override protected void AdditionalInitColumns() { columns.get(0).setVisible(false); - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) { + if ((Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) { columns.get(4).setRenderer(RendererHyperlinks); columns.get(4).setEditor(EditorHyperlinks); } else { diff --git a/src/_VisualDVM/Repository/BugReport/BugReport.java b/src/_VisualDVM/Repository/BugReport/BugReport.java index 364e6969..1b7a0c94 100644 --- a/src/_VisualDVM/Repository/BugReport/BugReport.java +++ b/src/_VisualDVM/Repository/BugReport/BugReport.java @@ -64,7 +64,7 @@ public class BugReport extends rDBObject { project_version = version_in; visualiser_version = Global.visualiser.version; sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version; - sapfor_settings = ((GlobalDatabase) Utils_.db).settings.getSapforSettingsText(); + sapfor_settings = (Global.mainModule.getDb()).settings.getSapforSettingsText(); percentage = 0; description = description_in; date = new Date().getTime(); diff --git a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java index b5ee7ce8..79d6226f 100644 --- a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java +++ b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java @@ -366,7 +366,7 @@ public abstract class Sapfor extends OSDComponent { //временный (?) проход, по тихому получить размерность теста, предварительно выполнив тихий парс. //тут все одноразовое. считаем что таблицы бд уже заполнены как надо. public LanguageStyle getStyle() throws Exception { - return ((GlobalDatabase) Utils_.db).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed; + return (Global.mainModule.getDb()).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed; } //---------- public static Vector getScenariosCodes() { @@ -411,12 +411,12 @@ public abstract class Sapfor extends OSDComponent { //------------------------------------------------------------------------------------------------------------------ public String getConsoleFlags() throws Exception { Vector res = new Vector<>(); - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.FREE_FORM).toBoolean()) + if ((Global.mainModule.getDb()).settings.get(SettingName.FREE_FORM).toBoolean()) res.add("-f90"); - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.STATIC_SHADOW_ANALYSIS).toBoolean()) + if ((Global.mainModule.getDb()).settings.get(SettingName.STATIC_SHADOW_ANALYSIS).toBoolean()) res.add("-sh"); - res.add("-shwidth " + ((GlobalDatabase) Utils_.db).settings.get(SettingName.MAX_SHADOW_WIDTH)); - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.KEEP_SPF_DIRECTIVES).toBoolean()) + res.add("-shwidth " + (Global.mainModule.getDb()).settings.get(SettingName.MAX_SHADOW_WIDTH)); + if ((Global.mainModule.getDb()).settings.get(SettingName.KEEP_SPF_DIRECTIVES).toBoolean()) res.add("-keepSPF"); return String.join(" ", res); } diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java index 4be1fdf2..2f3c54e2 100644 --- a/src/_VisualDVM/Repository/Component/Visualiser.java +++ b/src/_VisualDVM/Repository/Component/Visualiser.java @@ -76,8 +76,8 @@ public class Visualiser extends Component { System.exit(0); } public File getWorkspace() { - if (!((GlobalDatabase) Utils_.db).settings.get(SettingName.Workspace).toString().isEmpty()) { - File workspace = new File(((GlobalDatabase) Utils_.db).settings.get(SettingName.Workspace).toString()); + if (!(Global.mainModule.getDb()).settings.get(SettingName.Workspace).toString().isEmpty()) { + File workspace = new File(Global.mainModule.getDb().settings.get(SettingName.Workspace).toString()); if (workspace.exists()) return workspace; else diff --git a/src/_VisualDVM/Utils.java b/src/_VisualDVM/Utils.java index de1ce854..cc8ad83d 100644 --- a/src/_VisualDVM/Utils.java +++ b/src/_VisualDVM/Utils.java @@ -665,7 +665,7 @@ public class Utils { } public static void RestoreSelectedDirectory(VFileChooser_ directoryChooser) { String last_dir_home = - ((GlobalDatabase) Utils_.db).settings.get(SettingName.ProjectsSearchDirectory).Value; + (Global.mainModule.getDb()).settings.get(SettingName.ProjectsSearchDirectory).Value; if (!last_dir_home.isEmpty()) directoryChooser.SetCurrentDirectory(last_dir_home); } @@ -713,11 +713,11 @@ public class Utils { break; case ' ': case '\t': - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.SpacesOn).toBoolean()) line.append(c); + if ((Global.mainModule.getDb()).settings.get(SettingName.SpacesOn).toBoolean()) line.append(c); v_line.append(c); break; case '\n': //конец строки - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.FortranWrapsOn).toBoolean()) { + if ((Global.mainModule.getDb()).settings.get(SettingName.FortranWrapsOn).toBoolean()) { //оракул. лезем в начало следующей строки //и анализируем первые 5 символов boolean hasWrap = false; @@ -743,7 +743,7 @@ public class Utils { break; } //добавление строки в результат. - if ((line.length() > 0) || ((GlobalDatabase) Utils_.db).settings.get(SettingName.EmptyLinesOn).toBoolean() + if ((line.length() > 0) || (Global.mainModule.getDb()).settings.get(SettingName.EmptyLinesOn).toBoolean() // Global.db.settings.get(SettingName.SpacesOn).toBoolean() ) { lines.add(line.toString()); @@ -762,7 +762,7 @@ public class Utils { if ((i > 0) && (c != '\n')) { //строка оборвалась на EOF //добавление строки в результат. - if ((line.length() > 0) ||((GlobalDatabase) Utils_.db).settings.get(SettingName.EmptyLinesOn).toBoolean() + if ((line.length() > 0) ||(Global.mainModule.getDb()).settings.get(SettingName.EmptyLinesOn).toBoolean() // && Global.db.settings.get(SettingName.SpacesOn).toBoolean() ) { lines.add(line.toString()); @@ -774,11 +774,11 @@ public class Utils { public static boolean CompareLines(String line1_raw, String line2_raw) { String line1 = line1_raw; String line2 = line2_raw; - if (!((GlobalDatabase) Utils_.db).settings.get(SettingName.RegisterOn).toBoolean()) { + if (!(Global.mainModule.getDb()).settings.get(SettingName.RegisterOn).toBoolean()) { line1 = line1.toUpperCase(); line2 = line2.toUpperCase(); } - if (!((GlobalDatabase) Utils_.db).settings.get(SettingName.SpacesOn).toBoolean()) { + if (!(Global.mainModule.getDb()).settings.get(SettingName.SpacesOn).toBoolean()) { line1 = Utils_.removeCharacters(line1, " ", "\t"); line2 = Utils_.removeCharacters(line2, " ", "\t"); } diff --git a/src/_VisualDVM/Visual/Interface/FormWithSplitters.java b/src/_VisualDVM/Visual/Interface/FormWithSplitters.java index c58d7b53..1f3d5fc7 100644 --- a/src/_VisualDVM/Visual/Interface/FormWithSplitters.java +++ b/src/_VisualDVM/Visual/Interface/FormWithSplitters.java @@ -1,10 +1,11 @@ package _VisualDVM.Visual.Interface; import Common.Utils.Utils_; +import _VisualDVM.Global; public interface FormWithSplitters { default void LoadSplitters() { - Utils_.db.splitters.Load(this); + Global.mainModule.getDb().splitters.Load(this); } default void SaveSplitters() { - Utils_.db.splitters.Save(this); + Global.mainModule.getDb().splitters.Save(this); } } diff --git a/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java b/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java index 90cb7479..6befad16 100644 --- a/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java +++ b/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java @@ -1,6 +1,7 @@ package _VisualDVM.Visual.Menus.FastAccessMenuBar; import Common.Utils.Utils_; import Common.Visual.UI_; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.VisualiserMenuBar; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; @@ -40,7 +41,7 @@ public class FastAccessMenuBar extends VisualiserMenuBar { if (pass.stats.HasUsages()) { showPass(pass); ++i; - if (i > (((GlobalDatabase) Utils_.db).settings.get(SettingName.FastAccessPassesCount).toInt32())) break; + if (i > ((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32())) break; } } } diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java index ea6f5142..32c697b5 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java @@ -1,6 +1,7 @@ package _VisualDVM.Visual.Menus.MainMenuBar; import Common.Utils.Utils_; import Common.Visual.Menus.VisualiserMenuItem; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.VisualiserMenu; import _VisualDVM.GlobalData.DBLastProject.DBLastProject; import _VisualDVM.GlobalData.GlobalDatabase; @@ -21,7 +22,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu { @Override public void menuSelected(MenuEvent e) { removeAll(); - Vector projects = ((GlobalDatabase) Utils_.db).lastProjects.getOrdered(); + Vector projects = (Global.mainModule.getDb()).lastProjects.getOrdered(); int k = 1; for (DBLastProject p : projects) { if (new File(p.HomePath).exists() && p.lastOpened != 0) { @@ -34,7 +35,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu { }); add(i); ++k; - if (k > (((GlobalDatabase) Utils_.db).settings.get(SettingName.LastOpenedProjectsCount).toInt32())) break; + if (k > ((Global.mainModule.getDb()).settings.get(SettingName.LastOpenedProjectsCount).toInt32())) break; } } } diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java index 565dbe13..659b1f93 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java @@ -1,5 +1,6 @@ package _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.PropertiesSubmenu; import _VisualDVM.Visual.Menus.SettingsSubmenu; import _VisualDVM.Visual.Menus.VisualiserMenu; @@ -37,7 +38,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu { SettingName.FortranWrapsOn, SettingName.ComparsionDiffMergeOn )); - add(((GlobalDatabase) Utils_.db).settings.get(SettingName.Workspace).getMenuItem()); - add(((GlobalDatabase) Utils_.db).settings.get(SettingName.BugReportsAgeLimit).getMenuItem()); + add((Global.mainModule.getDb()).settings.get(SettingName.Workspace).getMenuItem()); + add((Global.mainModule.getDb()).settings.get(SettingName.BugReportsAgeLimit).getMenuItem()); } } diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java index bb6a63d9..2a4e5451 100644 --- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java +++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java @@ -1,6 +1,7 @@ package _VisualDVM.Visual.Menus.ProjectMenuBar; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.LanguagesSubmenu; import _VisualDVM.Visual.Menus.SettingsSubmenu; import _VisualDVM.Visual.Menus.StylesSubmenu; @@ -60,9 +61,9 @@ public class ProjectSettingsMenu extends VisualiserMenu { SettingName.SaveModifications )); addSeparator(); - add(((GlobalDatabase) Utils_.db).settings.get(SettingName.TRANSLATE_MESSAGES).getMenuItem()); - add(((GlobalDatabase) Utils_.db).settings.get(SettingName.DEBUG_PRINT_ON).getMenuItem()); - add(((GlobalDatabase) Utils_.db).settings.get(SettingName.GCOVLimit).getMenuItem()); + add((Global.mainModule.getDb()).settings.get(SettingName.TRANSLATE_MESSAGES).getMenuItem()); + add((Global.mainModule.getDb()).settings.get(SettingName.DEBUG_PRINT_ON).getMenuItem()); + add((Global.mainModule.getDb()).settings.get(SettingName.GCOVLimit).getMenuItem()); } public void ShowLanguage() { mLanguage.setText("Язык: " + Current.getProject().languageName.getDescription()); diff --git a/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java b/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java index 0a920c02..3d044c2f 100644 --- a/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java +++ b/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java @@ -1,6 +1,7 @@ package _VisualDVM.Visual.Menus; import Common.Utils.Utils_; import Common.Visual.UI_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.GlobalDatabase; import Common.Visual.Fonts.VisualiserFonts; import _VisualDVM.GlobalData.Settings.SettingName; @@ -13,7 +14,7 @@ public class SettingsSubmenu extends JMenu { setIcon(Utils_.getIcon(icon)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu)); for (SettingName c : settings) { - add(((GlobalDatabase) Utils_.db).settings.get(c).getMenuItem()); + add((Global.mainModule.getDb()).settings.get(c).getMenuItem()); } } } diff --git a/src/_VisualDVM/Visual/UI.java b/src/_VisualDVM/Visual/UI.java index 2140895a..48a51958 100644 --- a/src/_VisualDVM/Visual/UI.java +++ b/src/_VisualDVM/Visual/UI.java @@ -4,6 +4,7 @@ import Common.Utils.Utils_; import Common.Visual.UI_; import Common.Visual.Menus.DataMenuBar; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsBar; import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar; import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar; @@ -260,7 +261,7 @@ public class UI { ShowTabsNames(tabs, 0); } public static void ShowTabsNames(JTabbedPane tabs, int startIndex) { - boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean(); + boolean flag = Global.mainModule.getDb().settings.get(SettingName.ShowFullTabsNames).toBoolean(); for (int i = startIndex; i < tabs.getTabCount(); ++i) tabs.setTitleAt(i, flag ? tabs.getToolTipTextAt(i) : ""); } diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java index 1904784f..3f6d8637 100644 --- a/src/_VisualDVM/Visual/Windows/CallbackForm.java +++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java @@ -163,7 +163,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { BugReportCommentAddition.setWrapStyleWord(true); //---------------------------------------------- //тут развилка на то вкладки или поля. - SwitchScreen(((GlobalDatabase) Utils_.db).settings.get(SettingName.SmallScreen).toBoolean()); + SwitchScreen((Global.mainModule.getDb()).settings.get(SettingName.SmallScreen).toBoolean()); //- Global.componentsServer.db.bugReports.mountUI(bugReportsPanel); Global.componentsServer.db.subscribers.mountUI(subscribersPanel); diff --git a/src/_VisualDVM/Visual/Windows/DebugForm.java b/src/_VisualDVM/Visual/Windows/DebugForm.java index 34ed67f4..ac975af3 100644 --- a/src/_VisualDVM/Visual/Windows/DebugForm.java +++ b/src/_VisualDVM/Visual/Windows/DebugForm.java @@ -1,5 +1,6 @@ package _VisualDVM.Visual.Windows; import Common.Utils.Utils_; +import _VisualDVM.Global; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Visual.Interface.DebugWindow; import _VisualDVM.Visual.Interface.FormWithSplitters; @@ -68,22 +69,22 @@ public class DebugForm implements DebugWindow, FormWithSplitters { //- @Override public void ShowAll() { - ((GlobalDatabase) Utils_.db).makefiles.ShowUI(); - ((GlobalDatabase) Utils_.db).runConfigurations.ShowUI(); - ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(); //их видимость зависит от текущего проекта. - ((GlobalDatabase) Utils_.db).runTasks.ShowUI(); + Global.mainModule.getDb().makefiles.ShowUI(); + Global.mainModule.getDb().runConfigurations.ShowUI(); + Global.mainModule.getDb().compilationTasks.ShowUI(); //их видимость зависит от текущего проекта. + Global.mainModule.getDb().runTasks.ShowUI(); } public DebugForm(){ LoadSplitters(); //-- - ((GlobalDatabase) Utils_.db).makefiles.mountUI(makefilesPanel); - ((GlobalDatabase) Utils_.db).modules.mountUI(modulesPanel); - ((GlobalDatabase) Utils_.db).runConfigurations.mountUI(runConfigurationsPanel); - ((GlobalDatabase) Utils_.db).environmentValues.mountUI(environmentsPanel); - ((GlobalDatabase) Utils_.db).dvmParameters.mountUI(dvmParametersPanel); + Global.mainModule.getDb().makefiles.mountUI(makefilesPanel); + Global.mainModule.getDb().modules.mountUI(modulesPanel); + Global.mainModule.getDb().runConfigurations.mountUI(runConfigurationsPanel); + Global.mainModule.getDb().environmentValues.mountUI(environmentsPanel); + Global.mainModule.getDb().dvmParameters.mountUI(dvmParametersPanel); //- - ((GlobalDatabase) Utils_.db).compilationTasks.mountUI(compilationTasksPanel); - ((GlobalDatabase) Utils_.db).runTasks.mountUI(runTasksPanel); + Global.mainModule.getDb().compilationTasks.mountUI(compilationTasksPanel); + Global.mainModule.getDb().runTasks.mountUI(runTasksPanel); //-- singleCompilationTaskMaster = new CompilationTasksComparisonForm(singleCompilationTaskSlave = new CompilationTasksComparisonForm(null)); singleRunTaskMaster = new RunTasksComparisonForm(singleRunTaskSlave = new RunTasksComparisonForm(null)); diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java index 2307107b..0b73001f 100644 --- a/src/_VisualDVM/Visual/Windows/FileForm.java +++ b/src/_VisualDVM/Visual/Windows/FileForm.java @@ -173,29 +173,29 @@ public class FileForm implements FileWindow, FormWithSplitters { //---- @Override public void ShowWarningsCount() { - boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean(); + boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean(); messagesTabs.setTitleAt(1, (flag ? "Предупреждения: " : "") + file.father.db.warnings.getVisibleKeys().size()); } @Override public void ShowErrorsCount() { - boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean(); + boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean(); messagesTabs.setTitleAt(2, (flag ? "Ошибки: " : "") + file.father.db.errors.getVisibleKeys().size()); } @Override public void ShowNotesCount() { - boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean(); + boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean(); messagesTabs.setTitleAt(0, (flag ? "Примечания: " : "") + file.father.db.notes.getVisibleKeys().size()); } @Override public void ShowRecommendationsCount() { - boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean(); + boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean(); messagesTabs.setTitleAt(3, (flag ? "Рекомендации: " : "") + file.father.db.recommendations.getVisibleKeys().size()); } //--- @Override public void RefreshTabsNames() { UI.ShowTabsNames(graphsTabs); - boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean(); + boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean(); //-- ShowNotesCount(); ShowWarningsCount(); @@ -235,7 +235,7 @@ public class FileForm implements FileWindow, FormWithSplitters { } @Override public void ShowNoMessages() { - boolean full_tiles = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean(); + boolean full_tiles = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean(); file.father.db.notes.ClearUI(); file.father.db.warnings.ClearUI(); file.father.db.errors.ClearUI(); @@ -367,7 +367,7 @@ public class FileForm implements FileWindow, FormWithSplitters { //-- @Override public void CollapseGraphs() { - Utils_.db.splitters.get("SC12").position = SC12.getDividerLocation(); + Global.mainModule.getDb().splitters.get("SC12").position = SC12.getDividerLocation(); UI_.Clear(editorBackground); editorBackground.add(editorPanel); } @@ -377,12 +377,12 @@ public class FileForm implements FileWindow, FormWithSplitters { SC12.setRightComponent(editorPanel); editorBackground.add(SC12); //-- - SC12.setDividerLocation(Utils_.db.splitters.get("SC12").position); + SC12.setDividerLocation(Global.mainModule.getDb().splitters.get("SC12").position); SC12.updateUI(); } @Override public void CollapseMessages() { - Utils_.db.splitters.get("SC1").position = SC1.getDividerLocation(); + Global.mainModule.getDb().splitters.get("SC1").position = SC1.getDividerLocation(); UI_.Clear(content); content.add(editorBackground); } @@ -391,7 +391,7 @@ public class FileForm implements FileWindow, FormWithSplitters { UI_.Clear(content); SC1.setLeftComponent(editorBackground); content.add(SC1); - SC1.setDividerLocation(Utils_.db.splitters.get("SC1").position); + SC1.setDividerLocation(Global.mainModule.getDb().splitters.get("SC1").position); SC1.updateUI(); } } diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java index 7873a878..b1e869a3 100644 --- a/src/_VisualDVM/Visual/Windows/MainForm.java +++ b/src/_VisualDVM/Visual/Windows/MainForm.java @@ -61,7 +61,7 @@ public class MainForm extends Form implements MainWindow { if (UI.getDebugWindow() != null) ((FormWithSplitters) UI.getDebugWindow()).SaveSplitters(); //-- - ((GlobalDatabase) Utils_.db).SaveCredentials(); + Global.mainModule.getDb().SaveCredentials(); //-- Global.FinishApplication(); } diff --git a/src/_VisualDVM/Visual/Windows/ProfilesFields.java b/src/_VisualDVM/Visual/Windows/ProfilesFields.java index 85716597..bbc21b08 100644 --- a/src/_VisualDVM/Visual/Windows/ProfilesFields.java +++ b/src/_VisualDVM/Visual/Windows/ProfilesFields.java @@ -1,6 +1,7 @@ package _VisualDVM.Visual.Windows; import Common.Utils.Utils_; import Common.Visual.Windows.Dialog.DialogFields; +import _VisualDVM.Global; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Visual.Interface.FormWithSplitters; @@ -16,7 +17,7 @@ public class ProfilesFields implements DialogFields, FormWithSplitters { return content; } public ProfilesFields(){ - ((GlobalDatabase) Utils_.db).sapforProfiles.mountUI(profilesPanel); - ((GlobalDatabase) Utils_.db).sapforProfilesSettings.mountUI(settingsPanel); + (Global.mainModule.getDb()).sapforProfiles.mountUI(profilesPanel); + (Global.mainModule.getDb()).sapforProfilesSettings.mountUI(settingsPanel); } } diff --git a/src/_VisualDVM/Visual/Windows/ProfilesForm.java b/src/_VisualDVM/Visual/Windows/ProfilesForm.java index 0f0ed849..cddb1462 100644 --- a/src/_VisualDVM/Visual/Windows/ProfilesForm.java +++ b/src/_VisualDVM/Visual/Windows/ProfilesForm.java @@ -2,6 +2,7 @@ package _VisualDVM.Visual.Windows; import Common.Utils.Utils_; import Common.Visual.Windows.Dialog.Dialog; import Common.Database.Objects.DBForm.DBForm; +import _VisualDVM.Global; import _VisualDVM.GlobalData.GlobalDatabase; //todo разобраться с DBform public class ProfilesForm extends Dialog { @@ -18,13 +19,13 @@ public class ProfilesForm extends Dialog { } @Override public void Init(Object... params) { - if (((GlobalDatabase) Utils_.db).sapforProfiles.size() > 0) { - for (Object key : ((GlobalDatabase) Utils_.db).sapforProfiles.Data.keySet()) { - ((GlobalDatabase) Utils_.db).sapforProfiles.ShowUI(key); + if ((Global.mainModule.getDb()).sapforProfiles.size() > 0) { + for (Object key : (Global.mainModule.getDb()).sapforProfiles.Data.keySet()) { + (Global.mainModule.getDb()).sapforProfiles.ShowUI(key); return; } } else { - ((GlobalDatabase) Utils_.db).sapforProfiles.ShowUI(); + (Global.mainModule.getDb()).sapforProfiles.ShowUI(); } } @Override @@ -58,8 +59,8 @@ public class ProfilesForm extends Dialog { return "Profiles"; //можно было бы через имя класса } public void LoadWindowParameters() throws Exception { - if (((GlobalDatabase) Utils_.db).forms.Data.containsKey(getFormKey())) { - info = ((GlobalDatabase) Utils_.db).forms.Data.get(getFormKey()); + if ((Global.mainModule.getDb()).forms.Data.containsKey(getFormKey())) { + info = (Global.mainModule.getDb()).forms.Data.get(getFormKey()); info.Apply(this); return; } @@ -68,8 +69,8 @@ public class ProfilesForm extends Dialog { public void SaveWindowParameters() throws Exception { if (info != null) { info.Init(this); - Utils_.db.Update(info); + Global.mainModule.getDb().Update(info); } else - Utils_.db.Insert(new DBForm(getFormKey(), this)); + Global.mainModule.getDb().Insert(new DBForm(getFormKey(), this)); } } diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java index 7feb44f6..15e07e7d 100644 --- a/src/_VisualDVM/Visual/Windows/ProjectForm.java +++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java @@ -84,7 +84,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { UI.getDebugWindow().ShowAll(); ShowAllAnalyses(); ShowProjectView(); - SwitchScreen(((GlobalDatabase) Utils_.db).settings.get(SettingName.SmallScreen).toBoolean()); + SwitchScreen((Global.mainModule.getDb()).settings.get(SettingName.SmallScreen).toBoolean()); RefreshTabsNames(); //-- if (Global.properties.collapseProjectTrees) @@ -294,7 +294,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { //-- @Override public void CollapseProjectTrees() { - Utils_.db.splitters.get("SC3").position = SC3.getDividerLocation(); + Global.mainModule.getDb().splitters.get("SC3").position = SC3.getDividerLocation(); //--- UI_.Clear(projectBackground); projectBackground.add(fileBackground); @@ -303,7 +303,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { public void ExpandProjectTrees() { SC3.setLeftComponent(fileBackground); projectBackground.add(SC3); - SC3.setDividerLocation(Utils_.db.splitters.get("SC3").position); + SC3.setDividerLocation(Global.mainModule.getDb().splitters.get("SC3").position); SC3.updateUI(); } } \ No newline at end of file diff --git a/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java index a8fa4bc9..e123d992 100644 --- a/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java +++ b/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java @@ -3,6 +3,7 @@ import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Current; import Common.Visual.Controls.MenuBarButton; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; @@ -82,10 +83,10 @@ public class SapforVersionsComparisonForm extends ComparisonForm extends Comparison //в отличие от комбо боксов, тут события нажатия на кнопку, нет. if (isReady()) { if (slave.isReady()) { - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) { + if ((Global.mainModule.getDb()).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) { DoComparePass(true); } else DoShowPass(true); @@ -40,7 +41,7 @@ public abstract class TasksComparisonForm extends Comparison } else { if (isReady()) { if (master.isReady()) { - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) { + if ((Global.mainModule.getDb()).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) { master.DoComparePass(true); } else master.DoShowPass(true); diff --git a/src/_VisualDVM/Visual/Windows/TestingForm.java b/src/_VisualDVM/Visual/Windows/TestingForm.java index 759709a1..8bd2d84d 100644 --- a/src/_VisualDVM/Visual/Windows/TestingForm.java +++ b/src/_VisualDVM/Visual/Windows/TestingForm.java @@ -130,9 +130,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow { SC65.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc65Listener); SC66.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc66Listener); //- - ((GlobalDatabase) Utils_.db).machines.mountUI(machinesPanel); - ((GlobalDatabase) Utils_.db).users.mountUI(usersPanel); - ((GlobalDatabase) Utils_.db).compilers.mountUI(compilersPanel); + Global.mainModule.getDb().machines.mountUI(machinesPanel); + Global.mainModule.getDb().users.mountUI(usersPanel); + Global.mainModule.getDb().compilers.mountUI(compilersPanel); //- Global.testingServer.db.dvm_configurations.mountUI(configurationsPanel); Global.testingServer.db.dvmPackages.mountUI(dvmPackagesPanel); @@ -150,7 +150,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow { //- @Override public void ShowAll() { - ((GlobalDatabase) Utils_.db).machines.ShowUI(); + Global.mainModule.getDb().machines.ShowUI(); Global.testingServer.db.dvm_configurations.ShowUI(); Global.testingServer.db.dvmPackages.ShowUI(); Global.testingServer.db.sapforPackages.ShowUI(); @@ -273,33 +273,33 @@ public class TestingForm implements FormWithSplitters, TestingWindow { public void RestoreLastCredentials() { Credentials credentials = (Credentials) Current_.get(Current.Credentials); if (credentials.machine_id != CommonConstants.Nan) { - if (((GlobalDatabase) Utils_.db).machines.containsKey(credentials.machine_id)) { - ((GlobalDatabase) Utils_.db).machines.ShowUI(credentials.machine_id); - if (((GlobalDatabase) Utils_.db).users.containsKey(credentials.user_id)) { - ((GlobalDatabase) Utils_.db).users.ShowUI(credentials.user_id); + if (Global.mainModule.getDb().machines.containsKey(credentials.machine_id)) { + (Global.mainModule.getDb()).machines.ShowUI(credentials.machine_id); + if ((Global.mainModule.getDb()).users.containsKey(credentials.user_id)) { + (Global.mainModule.getDb()).users.ShowUI(credentials.user_id); } else { credentials.user_id = CommonConstants.Nan; - ((GlobalDatabase) Utils_.db).UpdateCredentials(); + (Global.mainModule.getDb()).UpdateCredentials(); } - if (((GlobalDatabase) Utils_.db).compilers.containsKey(credentials.compiler_id)) { - ((GlobalDatabase) Utils_.db).compilers.ShowUI(credentials.compiler_id); + if ((Global.mainModule.getDb()).compilers.containsKey(credentials.compiler_id)) { + (Global.mainModule.getDb()).compilers.ShowUI(credentials.compiler_id); } else { credentials.compiler_id = CommonConstants.Nan; - ((GlobalDatabase) Utils_.db).UpdateCredentials(); + (Global.mainModule.getDb()).UpdateCredentials(); } //- - if (((GlobalDatabase) Utils_.db).makefiles.containsKey(credentials.makefile_id)) { - ((GlobalDatabase) Utils_.db).makefiles.ShowUI(credentials.makefile_id); + if ((Global.mainModule.getDb()).makefiles.containsKey(credentials.makefile_id)) { + (Global.mainModule.getDb()).makefiles.ShowUI(credentials.makefile_id); } else { credentials.makefile_id = CommonConstants.Nan; - ((GlobalDatabase) Utils_.db).UpdateCredentials(); + (Global.mainModule.getDb()).UpdateCredentials(); } //- - if (((GlobalDatabase) Utils_.db).runConfigurations.containsKey(credentials.runconfiguration_id)) { - ((GlobalDatabase) Utils_.db).runConfigurations.ShowUI(credentials.runconfiguration_id); + if ((Global.mainModule.getDb()).runConfigurations.containsKey(credentials.runconfiguration_id)) { + (Global.mainModule.getDb()).runConfigurations.ShowUI(credentials.runconfiguration_id); } else { credentials.runconfiguration_id = CommonConstants.Nan; - ((GlobalDatabase) Utils_.db).UpdateCredentials(); + (Global.mainModule.getDb()).UpdateCredentials(); } } else { credentials.machine_id = CommonConstants.Nan; @@ -308,13 +308,13 @@ public class TestingForm implements FormWithSplitters, TestingWindow { credentials.remotesapfor_id = CommonConstants.Nan; credentials.makefile_id = CommonConstants.Nan; credentials.runconfiguration_id = CommonConstants.Nan; - ((GlobalDatabase) Utils_.db).UpdateCredentials(); + (Global.mainModule.getDb()).UpdateCredentials(); } } } @Override public void CollapseCredentials() { - Utils_.db.splitters.get("SC71").position = SC71.getDividerLocation(); + Global.mainModule.getDb().splitters.get("SC71").position = SC71.getDividerLocation(); UI_.Clear(credentialsPanel); credentialsPanel.add(UI.credentialsBar); SC71.setDividerLocation(30); diff --git a/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java b/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java index 88cd2173..52b3c5c9 100644 --- a/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java +++ b/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java @@ -1,6 +1,7 @@ package _VisualDVM.Visual.Windows; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; @@ -35,10 +36,10 @@ public class VersionsComparisonForm extends ComparisonForm { } else { if (isReady()) { if (getMaster().isReady()) { - boolean ExtensionsOn = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean(); + boolean ExtensionsOn = (Global.mainModule.getDb()).settings.get(SettingName.ExtensionsOn).toBoolean(); String name1 = ExtensionsOn ? getMaster().file.file.getName() : Utils_.getFileNameWithoutExtension(getMaster().file.file); String name2 = ExtensionsOn ? file.file.getName() : Utils_.getFileNameWithoutExtension(file.file); - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) { + if ((Global.mainModule.getDb()).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) { if (name1.equalsIgnoreCase(name2)) master.DoComparePass(true); } else @@ -83,7 +84,7 @@ public class VersionsComparisonForm extends ComparisonForm { cbFile.setSelectedIndex(-1); for (int i = 0; i < cbFile.getItemCount(); ++i) { ProjectFile projectFile = cbFile.getItemAt(i); - if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean()) { + if ((Global.mainModule.getDb()).settings.get(SettingName.ExtensionsOn).toBoolean()) { //если учитываем расширения, ищем полное совпадение if (projectFile.file.getName().equals(file_in.file.getName())) { cbFile.setSelectedIndex(i); @@ -106,6 +107,6 @@ public class VersionsComparisonForm extends ComparisonForm { } @Override protected boolean fortranWrapsOn() { - return ((GlobalDatabase) Utils_.db).settings.get(SettingName.FortranWrapsOn).toBoolean(); + return (Global.mainModule.getDb()).settings.get(SettingName.FortranWrapsOn).toBoolean(); } }