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

рефакторинг. вынес в обобщенную часть бд, но еще не все

Browse Source
This commit is contained in:
02090095
2024-10-08 01:30:25 +03:00
parent d0c08a2c7e
commit 18ceb04325
91 changed files with 442 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Visual_DVM_2021/Passes/All/AddBugReport.java
View File

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Database;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.UI;
import GlobalData.Account.AccountRole;
@@ -47,7 +48,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
target.project_version = "";
target.visualiser_version = Global.visualiser.version;
target.sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version;
target.sapfor_settings = Global.db.settings.getSapforSettingsText();
target.sapfor_settings =((GlobalDatabase)CommonUtils.db).settings.getSapforSettingsText();
target.percentage = 0;
target.description = "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'";
target.date = new Date().getTime();

4
src/Visual_DVM_2021/Passes/All/AddCompiler.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Objects.DBObject;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.Compiler.Compiler;
import GlobalData.Machine.Machine;
import Visual_DVM_2021.Passes.AddObjectPass;
@@ -11,7 +11,7 @@ public class AddCompiler extends AddObjectPass<Compiler> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
@Override
public Class<? extends DBObject> getOwner() {

4
src/Visual_DVM_2021/Passes/All/AddDVMParameter.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Objects.DBObject;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.DVMParameter.DVMParameter;
import GlobalData.RunConfiguration.RunConfiguration;
import Visual_DVM_2021.Passes.AddObjectPass;
@@ -15,6 +15,6 @@ public class AddDVMParameter extends AddObjectPass<DVMParameter> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.EnvironmentValue.EnvironmentValue;
import Visual_DVM_2021.Passes.AddObjectPass;
public class AddEnvironmentValue extends AddObjectPass<EnvironmentValue> {
@@ -9,6 +9,6 @@ public class AddEnvironmentValue extends AddObjectPass<EnvironmentValue> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

7
src/Visual_DVM_2021/Passes/All/AddMachine.java
View File

@@ -1,8 +1,9 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.Compiler.Compiler;
import GlobalData.Compiler.CompilerType;
import GlobalData.GlobalDatabase;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;
import GlobalData.User.User;
@@ -13,12 +14,12 @@ public class AddMachine extends AddObjectPass<Machine> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (super.canStart(args)) {
if (target.type.equals(MachineType.Local) && Global.db.machines.LocalMachineExists()) {
if (target.type.equals(MachineType.Local) && ((GlobalDatabase)CommonUtils.db).machines.LocalMachineExists()) {
Log.Writeln_("Локальная машина уже добавлена.");
return false;
}

4
src/Visual_DVM_2021/Passes/All/AddMakefile.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Objects.DBObject;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.Machine.Machine;
import GlobalData.Makefile.Makefile;
import GlobalData.Module.Module;
@@ -25,6 +25,6 @@ public class AddMakefile extends AddObjectPass<Makefile> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Objects.DBObject;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.Machine.Machine;
import GlobalData.RunConfiguration.RunConfiguration;
import Visual_DVM_2021.Passes.AddObjectPass;
@@ -15,6 +15,6 @@ public class AddRunConfiguration extends AddObjectPass<RunConfiguration> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/AddUser.java
View File

@@ -1,8 +1,8 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Database;
import _VisualDVM.Global;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;
import GlobalData.User.User;
@@ -14,7 +14,7 @@ public class AddUser extends AddObjectPass<User> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
@Override
public Class<? extends DBObject> getOwner() {

7
src/Visual_DVM_2021/Passes/All/ApplyProfile.java
View File

@@ -1,7 +1,8 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import GlobalData.GlobalDatabase;
import GlobalData.SapforProfile.SapforProfile;
import GlobalData.SapforProfileSetting.SapforProfileSetting;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -32,12 +33,12 @@ public class ApplyProfile extends Pass_2021<SapforProfile> {
@Override
protected void body() throws Exception {
Vector<SapforProfileSetting> settings = new Vector<>();
for (SapforProfileSetting sapforProfileSetting : Global.db.sapforProfilesSettings.Data.values())
for (SapforProfileSetting sapforProfileSetting : ((GlobalDatabase)CommonUtils.db).sapforProfilesSettings.Data.values())
if (sapforProfileSetting.sapforprofile_id == target.id)
settings.add(sapforProfileSetting);
//--
for (SapforProfileSetting setting : settings)
if (Global.db.settings.containsKey(setting.name))
if (((GlobalDatabase)CommonUtils.db).settings.containsKey(setting.name))
passes.get(PassCode_2021.UpdateSetting).Do(setting.name, setting.value);
//--
}

8
src/Visual_DVM_2021/Passes/All/Compile.java
View File

@@ -2,9 +2,9 @@ package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import GlobalData.GlobalDatabase;
import GlobalData.Tasks.CompilationTask.CompilationTask;
import GlobalData.Tasks.TaskState;
import GlobalData.User.UserState;
@@ -54,12 +54,12 @@ public class Compile extends Pass_2021<db_project_info> {
//------------------------------------------
compilationTask.CompleteSummary(target.compilation_maxtime);
compilationTask.state = TaskState.Inactive;
Global.db.Insert(compilationTask);
CommonUtils.db.Insert(compilationTask);
Utils.forceDeleteWithCheck(compilationTask.getLocalWorkspace());
}
@Override
protected void showPreparation() throws Exception {
Global.db.compilationTasks.ShowUI(compilationTask.getPK());
((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI(compilationTask.getPK());
}
@Override
protected void body() throws Exception {
@@ -86,7 +86,7 @@ public class Compile extends Pass_2021<db_project_info> {
}
@Override
protected void showFinish() throws Exception {
Global.db.compilationTasks.ShowUI(compilationTask.getPK());
((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI(compilationTask.getPK());
UI.getDebugWindow().ShowLastCompilationTask();
}
}

4
src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
View File

@@ -2,10 +2,10 @@ package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.PassMenuItem;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import ProjectData.Files.DBProjectFile;
import ProjectData.Project.db_project_info;
@@ -98,7 +98,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
Vector<String> unit_args = new Vector<>();
unit_args.add(target.name);
unit_args.add(target.languageName.toString());
unit_args.add(Global.db.settings.get(SettingName.DVMConvertationOptions).toString());
unit_args.add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.DVMConvertationOptions).toString());
unit_args.addAll(programsNames);
unit.arg = String.join("\n", unit_args);
Command(unit);

4
src/Visual_DVM_2021/Passes/All/DeleteCompiler.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.Compiler.Compiler;
import Visual_DVM_2021.Passes.DeleteObjectPass;
public class DeleteCompiler extends DeleteObjectPass<Compiler> {
@@ -9,6 +9,6 @@ public class DeleteCompiler extends DeleteObjectPass<Compiler> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.DVMParameter.DVMParameter;
import Visual_DVM_2021.Passes.DeleteObjectPass;
public class DeleteDVMParameter extends DeleteObjectPass<DVMParameter> {
@@ -9,6 +9,6 @@ public class DeleteDVMParameter extends DeleteObjectPass<DVMParameter> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

17
src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java
View File

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.Utils.Utils;
import GlobalData.GlobalDatabase;
import GlobalData.Tasks.Task;
import Visual_DVM_2021.Passes.CurrentProjectPass;
@@ -9,21 +10,21 @@ import java.util.stream.Collectors;
public class DeleteDebugResults extends CurrentProjectPass {
@Override
protected void showPreparation() throws Exception {
Global.db.compilationTasks.ClearUI();
Global.db.runTasks.ClearUI();
((GlobalDatabase)CommonUtils.db).compilationTasks.ClearUI();
((GlobalDatabase)CommonUtils.db).runTasks.ClearUI();
}
@Override
protected void body() throws Exception {
Vector<Task> toDelete = Global.db.compilationTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).collect(Collectors.toCollection(Vector::new));
Global.db.runTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).forEach(toDelete::add);
Vector<Task> toDelete = ((GlobalDatabase)CommonUtils.db).compilationTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).collect(Collectors.toCollection(Vector::new));
((GlobalDatabase)CommonUtils.db).runTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).forEach(toDelete::add);
for (Task task : toDelete) {
Utils.forceDeleteWithCheck(task.getLocalWorkspace());
Global.db.Delete(task);
CommonUtils.db.Delete(task);
}
}
@Override
protected void showFinish() throws Exception {
Global.db.compilationTasks.ShowUI();
Global.db.runTasks.ShowUI();
((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI();
((GlobalDatabase)CommonUtils.db).runTasks.ShowUI();
}
}

4
src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.EnvironmentValue.EnvironmentValue;
import Visual_DVM_2021.Passes.DeleteObjectPass;
public class DeleteEnvironmentValue extends DeleteObjectPass<EnvironmentValue> {
@@ -9,6 +9,6 @@ public class DeleteEnvironmentValue extends DeleteObjectPass<EnvironmentValue> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/DeleteMachine.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.Machine.Machine;
import Visual_DVM_2021.Passes.DeleteObjectPass;
public class DeleteMachine extends DeleteObjectPass<Machine> {
@@ -9,6 +9,6 @@ public class DeleteMachine extends DeleteObjectPass<Machine> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/DeleteMakefile.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.Makefile.Makefile;
import Visual_DVM_2021.Passes.DeleteObjectPass;
public class DeleteMakefile extends DeleteObjectPass<Makefile> {
@@ -9,6 +9,6 @@ public class DeleteMakefile extends DeleteObjectPass<Makefile> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/DeleteProfile.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.SapforProfile.SapforProfile;
import Visual_DVM_2021.Passes.DeleteObjectPass;
public class DeleteProfile extends DeleteObjectPass<SapforProfile> {
@@ -9,6 +9,6 @@ public class DeleteProfile extends DeleteObjectPass<SapforProfile> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.RunConfiguration.RunConfiguration;
import Visual_DVM_2021.Passes.DeleteObjectPass;
public class DeleteRunConfiguration extends DeleteObjectPass<RunConfiguration> {
@@ -9,6 +9,6 @@ public class DeleteRunConfiguration extends DeleteObjectPass<RunConfiguration> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

13
src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java
View File

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.Utils.Utils;
import GlobalData.GlobalDatabase;
import GlobalData.Tasks.CompilationTask.CompilationTask;
import GlobalData.Tasks.RunTask.RunTask;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -18,7 +19,7 @@ public class DeleteSelectedCompilationTasks extends Pass_2021<Vector<Compilation
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
Global.db.compilationTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
((GlobalDatabase)CommonUtils.db).compilationTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
if (target.isEmpty()) {
Log.Writeln_("Не отмечено ни одной задачи для удаления.");
return false;
@@ -26,21 +27,21 @@ public class DeleteSelectedCompilationTasks extends Pass_2021<Vector<Compilation
}
@Override
protected void showPreparation() throws Exception {
Global.db.compilationTasks.ClearUI();
((GlobalDatabase)CommonUtils.db).compilationTasks.ClearUI();
}
@Override
protected void body() throws Exception {
for (CompilationTask task : target) {
for (RunTask runTask : task.getRunTasks().values()) {
Global.db.Delete(runTask);
CommonUtils.db.Delete(runTask);
Utils.forceDeleteWithCheck(runTask.getLocalWorkspace());
}
Global.db.Delete(task);
CommonUtils.db.Delete(task);
Utils.forceDeleteWithCheck(task.getLocalWorkspace());
}
}
@Override
protected void showFinish() throws Exception {
Global.db.compilationTasks.ShowUI();
((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI();
}
}

11
src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java
View File

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.Utils.Utils;
import GlobalData.GlobalDatabase;
import GlobalData.Tasks.RunTask.RunTask;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -17,7 +18,7 @@ public class DeleteSelectedRunTasks extends Pass_2021<Vector<RunTask>> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
Global.db.runTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
((GlobalDatabase)CommonUtils.db).runTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
if (target.isEmpty()) {
Log.Writeln_("Не отмечено ни одной задачи для удаления.");
return false;
@@ -25,17 +26,17 @@ public class DeleteSelectedRunTasks extends Pass_2021<Vector<RunTask>> {
}
@Override
protected void showPreparation() throws Exception {
Global.db.runTasks.ClearUI();
((GlobalDatabase)CommonUtils.db).runTasks.ClearUI();
}
@Override
protected void body() throws Exception {
for (RunTask task : target) {
Global.db.Delete(task);
CommonUtils.db.Delete(task);
Utils.forceDeleteWithCheck(task.getLocalWorkspace());
}
}
@Override
protected void showFinish() throws Exception {
Global.db.runTasks.ShowUI();
((GlobalDatabase)CommonUtils.db).runTasks.ShowUI();
}
}

4
src/Visual_DVM_2021/Passes/All/DeleteUser.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.User.User;
import Visual_DVM_2021.Passes.DeleteObjectPass;
public class DeleteUser extends DeleteObjectPass<User> {
@@ -9,6 +9,6 @@ public class DeleteUser extends DeleteObjectPass<User> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/DropFastAccess.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.UI.UI;
import Visual_DVM_2021.Passes.Pass_2021;
public class DropFastAccess extends Pass_2021 {
@@ -11,7 +11,7 @@ public class DropFastAccess extends Pass_2021 {
protected void body() throws Exception {
for (Pass_2021 pass : Pass_2021.FAPasses) {
pass.stats.Drop();
Global.db.Update(pass.stats);
CommonUtils.db.Update(pass.stats);
}
}
@Override

4
src/Visual_DVM_2021/Passes/All/DropLastProjects.java
View File

@@ -1,10 +1,10 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.DBLastProject.DBLastProject;
import Visual_DVM_2021.Passes.Pass_2021;
public class DropLastProjects extends Pass_2021 {
@Override
protected void body() throws Exception {
Global.db.DeleteAll(DBLastProject.class);
CommonUtils.db.DeleteAll(DBLastProject.class);
}
}

3
src/Visual_DVM_2021/Passes/All/EditAccount.java
View File

@@ -1,7 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Repository.EmailMessage;
import Repository.Subscribes.Subscriber;
@@ -63,7 +62,7 @@ public class EditAccount extends Email {
super.performDone();
Current.getAccount().name = name;
Current.getAccount().email = email;
Global.db.Update(Current.getAccount());
CommonUtils.db.Update(Current.getAccount());
//это не регистрация. только заполнение почты в своей бд и ее подтверждение на реальность.
}
}

4
src/Visual_DVM_2021/Passes/All/EditCompiler.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.Compiler.Compiler;
import Visual_DVM_2021.Passes.EditObjectPass;
public class EditCompiler extends EditObjectPass<Compiler> {
@@ -9,6 +9,6 @@ public class EditCompiler extends EditObjectPass<Compiler> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/EditDVMParameter.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.DVMParameter.DVMParameter;
import Visual_DVM_2021.Passes.EditObjectPass;
public class EditDVMParameter extends EditObjectPass<DVMParameter> {
@@ -9,6 +9,6 @@ public class EditDVMParameter extends EditObjectPass<DVMParameter> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.EnvironmentValue.EnvironmentValue;
import Visual_DVM_2021.Passes.EditObjectPass;
public class EditEnvironmentValue extends EditObjectPass<EnvironmentValue> {
@@ -9,6 +9,6 @@ public class EditEnvironmentValue extends EditObjectPass<EnvironmentValue> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/EditMachine.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.Machine.Machine;
import Visual_DVM_2021.Passes.EditObjectPass;
public class EditMachine extends EditObjectPass<Machine> {
@@ -9,6 +9,6 @@ public class EditMachine extends EditObjectPass<Machine> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/EditMakefile.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.Makefile.Makefile;
import Visual_DVM_2021.Passes.EditObjectPass;
public class EditMakefile extends EditObjectPass<Makefile> {
@@ -9,6 +9,6 @@ public class EditMakefile extends EditObjectPass<Makefile> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/EditModule.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.Module.Module;
import Visual_DVM_2021.Passes.EditObjectPass;
public class EditModule extends EditObjectPass<Module> {
@@ -9,6 +9,6 @@ public class EditModule extends EditObjectPass<Module> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/EditProfile.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.SapforProfile.SapforProfile;
import Visual_DVM_2021.Passes.EditObjectPass;
public class EditProfile extends EditObjectPass<SapforProfile> {
@@ -9,6 +9,6 @@ public class EditProfile extends EditObjectPass<SapforProfile> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.RunConfiguration.RunConfiguration;
import Visual_DVM_2021.Passes.EditObjectPass;
public class EditRunConfiguration extends EditObjectPass<RunConfiguration> {
@@ -9,6 +9,6 @@ public class EditRunConfiguration extends EditObjectPass<RunConfiguration> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

4
src/Visual_DVM_2021/Passes/All/EditUser.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.User.User;
import Visual_DVM_2021.Passes.EditObjectPass;
public class EditUser extends EditObjectPass<User> {
@@ -9,6 +9,6 @@ public class EditUser extends EditObjectPass<User> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
}

9
src/Visual_DVM_2021/Passes/All/InitialiseUser.java
View File

@@ -1,7 +1,8 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import GlobalData.GlobalDatabase;
import GlobalData.RemoteFile.RemoteFile;
import GlobalData.User.UserState;
import Repository.SubscriberWorkspace.SubscriberWorkspace;
@@ -42,7 +43,7 @@ public class InitialiseUser extends Pass_2021 {
if (passes.get(PassCode_2021.PublishRemoteWorkspace).Do(workspace)) {
Current.getUser().workspace = workspace.path;
Current.getUser().state = UserState.ready_to_work;
Global.db.Update(Current.getUser());
CommonUtils.db.Update(Current.getUser());
}
}
}
@@ -50,7 +51,7 @@ public class InitialiseUser extends Pass_2021 {
//рега была. просто заносим то что там пользователю
Current.getUser().workspace = workspace.path;
Current.getUser().state = UserState.ready_to_work;
Global.db.Update(Current.getUser());
CommonUtils.db.Update(Current.getUser());
}
}
break;
@@ -60,6 +61,6 @@ public class InitialiseUser extends Pass_2021 {
}
@Override
protected void showFinish() throws Exception {
Global.db.users.RefreshUI();
((GlobalDatabase)CommonUtils.db).users.RefreshUI();
}
}

3
src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java
View File

@@ -1,7 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.Utils.Utils;
import GlobalData.User.User;
import GlobalData.User.UserState;
@@ -49,6 +48,6 @@ public class LocalInitaliseUser extends ProcessPass<User> {
}
//-
target.state = UserState.ready_to_work;
Global.db.Update(target);
CommonUtils.db.Update(target);
}
}

10
src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
View File

@@ -3,12 +3,12 @@ import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.DebugPrintLevel;
import Common_old.UI.UI;
import Common_old.Utils.Files.VDirectoryChooser;
import Common_old.Utils.Utils;
import GlobalData.DBLastProject.DBLastProject;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import ProjectData.Files.LanguageStyle;
import ProjectData.Project.db_project_info;
@@ -118,13 +118,13 @@ public class OpenCurrentProject extends Pass_2021<db_project_info> {
SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0")
;
DBLastProject lastProject;
if (Global.db.lastProjects.containsKey(target.Home.getAbsolutePath())) {
lastProject = Global.db.lastProjects.get(target.Home.getAbsolutePath());
if (((GlobalDatabase)CommonUtils.db).lastProjects.containsKey(target.Home.getAbsolutePath())) {
lastProject = ((GlobalDatabase)CommonUtils.db).lastProjects.get(target.Home.getAbsolutePath());
lastProject.RefreshOpenTime();
Global.db.Update(lastProject);
CommonUtils.db.Update(lastProject);
} else {
lastProject = new DBLastProject(target);
Global.db.Insert(lastProject);
CommonUtils.db.Insert(lastProject);
}
target.setInfo(lastProject);
}

11
src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
View File

@@ -1,14 +1,15 @@
package Visual_DVM_2021.Passes.All;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.Windows.Dialog.Dialog;
import GlobalData.Compiler.Compiler;
import GlobalData.Compiler.CompilerType;
import GlobalData.CompilerEnvironment.CompilerEnvironment;
import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsFields;
import GlobalData.EnvironmentValue.EnvironmentValue;
import GlobalData.GlobalDatabase;
import GlobalData.RunConfiguration.RunConfiguration;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -81,13 +82,13 @@ public class PickCompilerEnvironments extends Pass_2021<String> {
confEnv.run_configuration_id = Current.getRunConfiguration().id;
confEnv.name = compilerEnv.name;
confEnv.value = compilerEnv.value;
Global.db.Insert(confEnv);
CommonUtils.db.Insert(confEnv);
} else {
confEnv = Global.db.environmentValues.getEnvByName(compilerEnv.name);
confEnv = ((GlobalDatabase)CommonUtils.db).environmentValues.getEnvByName(compilerEnv.name);
if (confEnv != null) {
confEnv.name = compilerEnv.name;
confEnv.value = compilerEnv.value;
Global.db.Update(confEnv);
CommonUtils.db.Update(confEnv);
}
}
}
@@ -95,6 +96,6 @@ public class PickCompilerEnvironments extends Pass_2021<String> {
}
@Override
protected void showDone() throws Exception {
Global.db.environmentValues.ShowUI();
((GlobalDatabase)CommonUtils.db).environmentValues.ShowUI();
}
}

7
src/Visual_DVM_2021/Passes/All/Precompilation.java
View File

@@ -3,6 +3,7 @@ import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common_old.Current;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
@@ -50,7 +51,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
target = Current.getProject();
if (CommonUtils.isWindows) {
//--
makepath = Global.db.settings.get(SettingName.LocalMakePathWindows).toString();
makepath = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LocalMakePathWindows).toString();
if (makepath.isEmpty()) {
Log.Writeln_("Не задан путь к make.exe.\n " +
"Укажите его в меню глобальных настроек." +
@@ -186,10 +187,10 @@ public class Precompilation extends Pass_2021<db_project_info> {
protected void body() throws Exception {
if (CommonUtils.isWindows) {
name_to_kill = "make.exe";
StartProcess(CommonUtils.DQuotes(Global.db.settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + Global.db.settings.get(SettingName.Kernels).toString(),
StartProcess(CommonUtils.DQuotes(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Kernels).toString(),
target.compilation_maxtime);
} else
StartProcess("make -j " + Global.db.settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);
StartProcess("make -j " + ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);
}
protected void StartProcess(String command, int TA) throws Exception {
killed = false;

4
src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Visual_DVM_2021.Passes.CurrentProjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
public class ResetCurrentProject extends CurrentProjectPass {
@@ -15,7 +15,7 @@ public class ResetCurrentProject extends CurrentProjectPass {
protected void body() throws Exception {
target.CleanVersions();
target.ResetDB();
Global.db.Delete(target.getInfo());
CommonUtils.db.Delete(target.getInfo());
}
@Override
protected void performDone() throws Exception {

12
src/Visual_DVM_2021/Passes/All/Run.java
View File

@@ -2,9 +2,9 @@ package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import GlobalData.GlobalDatabase;
import GlobalData.Machine.MachineType;
import GlobalData.Tasks.RunTask.RunTask;
import GlobalData.Tasks.TaskState;
@@ -29,13 +29,13 @@ public class Run extends Pass_2021<db_project_info> {
protected void performPreparation() throws Exception {
runTasks = Current.getRunConfiguration().generateRunTasks(target, Current.getCompilationTask());
for (RunTask runTask : runTasks) {
Global.db.Insert(runTask);
CommonUtils.db.Insert(runTask);
Utils.forceDeleteWithCheck(runTask.getLocalWorkspace());
}
}
@Override
protected void showPreparation() throws Exception {
Global.db.runTasks.ShowUI();
((GlobalDatabase)CommonUtils.db).runTasks.ShowUI();
}
@Override
protected boolean canStart(Object... args) {
@@ -84,8 +84,8 @@ public class Run extends Pass_2021<db_project_info> {
boolean task_completed = false;
task.setProgress(i, runTasks.size());
//-
Global.db.runTasks.RefreshUI();
Global.db.runTasks.SetCurrentObjectUI(task.id);
((GlobalDatabase)CommonUtils.db).runTasks.RefreshUI();
((GlobalDatabase)CommonUtils.db).runTasks.SetCurrentObjectUI(task.id);
//-
subpass.Do(task, target);
//-
@@ -105,7 +105,7 @@ public class Run extends Pass_2021<db_project_info> {
break;
}
//-
Global.db.runTasks.RefreshUI();
((GlobalDatabase)CommonUtils.db).runTasks.RefreshUI();
UI.getDebugWindow().ShowCurrentRunTask();
//-
if (!task_completed) break;

5
src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
View File

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.UI.UI;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.SapforAnalysis;
@@ -28,7 +29,7 @@ public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalys
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Global.db.settings.get(SettingName.MPI_PROGRAM).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.MPI_PROGRAM).toBoolean()) {
UI.Info("Включена настройка SAPFOR 'MPI программа'." +
"\nПостроение распределения данных невозможно.");
passes.get(PassCode_2021.SPF_SharedMemoryParallelization).Do();

5
src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
View File

@@ -1,8 +1,9 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus_2023.PassControl;
import Common_old.UI.UI;
import Common.Utils.Index;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import ProjectData.SapforData.Regions.ParallelRegion;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -72,7 +73,7 @@ public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis {
}
@Override
public String getDescription() {
return Global.db.settings.get(SettingName.MPI_PROGRAM).toBoolean()?
return ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.MPI_PROGRAM).toBoolean()?
"Анализ кода (общая память)":"Анализ кода";
}
public void RefreshControls(){

8
src/Visual_DVM_2021/Passes/All/SaveProfile.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import Common.Utils.CommonUtils;
import _VisualDVM.Global;
import GlobalData.GlobalDatabase;
import GlobalData.SapforProfile.SapforProfile;
import Visual_DVM_2021.Passes.AddObjectPass;
@@ -16,12 +16,12 @@ public class SaveProfile extends AddObjectPass<SapforProfile> {
}
@Override
protected Database getDb() {
return Global.db;
return CommonUtils.db;
}
@Override
protected boolean canStart(Object... args) throws Exception {
//1. проверить нет ли уже такой последовательности настроек.
SapforProfile profile = Global.db.checkProfileForCurrentSettings();
SapforProfile profile = ((GlobalDatabase)CommonUtils.db).checkProfileForCurrentSettings();
if (profile != null) {
Log.Writeln_("Текущий набор настроек уже сохранён как профиль " + CommonUtils.Brackets(profile.description));
return false;
@@ -32,6 +32,6 @@ public class SaveProfile extends AddObjectPass<SapforProfile> {
protected void body() throws Exception {
target.creationDate = new Date().getTime();
super.body();
Global.db.insertProfileSettings(target);
((GlobalDatabase)CommonUtils.db).insertProfileSettings(target);
}
}

5
src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java
View File

@@ -1,9 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
import GlobalData.Compiler.Compiler;
import GlobalData.GlobalDatabase;
import GlobalData.Machine.MachineType;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -60,7 +61,7 @@ public class ShowCompilerVersion extends Pass_2021<String> {
@Override
protected void showDone() throws Exception {
if (needsShow) {
Global.db.compilers.RefreshUI();
((GlobalDatabase)CommonUtils.db).compilers.RefreshUI();
ReadOnlyMultilineTextForm ff = new ReadOnlyMultilineTextForm();
ff.ShowDialog("Версия", target);
}

6
src/Visual_DVM_2021/Passes/All/UpdateSetting.java
View File

@@ -1,5 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils;
import Common_old.Current;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.PercentsForm;
@@ -21,7 +23,7 @@ public class UpdateSetting extends Pass_2021<DBSetting> {
VFileChooser fileChooser = new VFileChooser("", "exe");
@Override
protected boolean canStart(Object... args) throws Exception {
target = Global.db.settings.get(args[0]);
target = ((GlobalDatabase)CommonUtils.db).settings.get(args[0]);
NewValue = target.Value;
if (args.length == 1) {
//интерфейсный режим. получение по клику на пункт меню.
@@ -112,7 +114,7 @@ public class UpdateSetting extends Pass_2021<DBSetting> {
@Override
protected void body() throws Exception {
target.Value = NewValue;
Global.db.Update(target);
CommonUtils.db.Update(target);
}
@Override
protected void showDone() throws Exception {

9
src/Visual_DVM_2021/Passes/Pass_2021.java
View File

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.DebugPrintLevel;
import Common_old.UI.Menus_2023.PassButton;
@@ -51,9 +52,9 @@ public class Pass_2021<T> {
//важно. вызывать только если есть интерфейс.
public static void CheckAllStats() throws Exception {
for (Pass_2021 pass : FAPasses) {
if (!Global.db.passStats.Data.containsKey(pass.code()))
Global.db.Insert(pass.stats = new PassStats(pass));
else pass.stats = Global.db.passStats.Data.get(pass.code());
if (!((GlobalDatabase)CommonUtils.db).passStats.Data.containsKey(pass.code()))
CommonUtils.db.Insert(pass.stats = new PassStats(pass));
else pass.stats = ((GlobalDatabase)CommonUtils.db).passStats.Data.get(pass.code());
}
FAPasses.sort(new SortPassesByStats());
}
@@ -128,7 +129,7 @@ public class Pass_2021<T> {
if (hasStats()) {
stats.Inc();
try {
Global.db.Update(stats);
CommonUtils.db.Update(stats);
FAPasses.sort(new SortPassesByStats());
if (Current.HasProject())
UI.fastAccessMenuBar.Refresh();

6
src/Visual_DVM_2021/UI/Interface/FormWithSplitters.java
View File

@@ -1,10 +1,10 @@
package Visual_DVM_2021.UI.Interface;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
public interface FormWithSplitters {
default void LoadSplitters() {
Global.db.splitters.Load(this);
CommonUtils.db.splitters.Load(this);
}
default void SaveSplitters() {
Global.db.splitters.Save(this);
CommonUtils.db.splitters.Save(this);
}
}

3
src/Visual_DVM_2021/UI/Main/CallbackForm.java
View File

@@ -2,6 +2,7 @@ package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.Editor.BaseEditor;
import Common_old.UI.Editor.Viewer;
@@ -162,7 +163,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
BugReportCommentAddition.setWrapStyleWord(true);
//----------------------------------------------
//тут развилка на то вкладки или поля.
SwitchScreen(Global.db.settings.get(SettingName.SmallScreen).toBoolean());
SwitchScreen(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SmallScreen).toBoolean());
//-
Global.componentsServer.db.bugReports.mountUI(bugReportsPanel);
Global.componentsServer.db.subscribers.mountUI(subscribersPanel);

25
src/Visual_DVM_2021/UI/Main/DebugForm.java
View File

@@ -1,5 +1,6 @@
package Visual_DVM_2021.UI.Main;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import GlobalData.GlobalDatabase;
import Visual_DVM_2021.UI.Interface.DebugWindow;
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
@@ -67,22 +68,22 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
//-
@Override
public void ShowAll() {
Global.db.makefiles.ShowUI();
Global.db.runConfigurations.ShowUI();
Global.db.compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
Global.db.runTasks.ShowUI();
((GlobalDatabase)CommonUtils.db).makefiles.ShowUI();
((GlobalDatabase)CommonUtils.db).runConfigurations.ShowUI();
((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
((GlobalDatabase)CommonUtils.db).runTasks.ShowUI();
}
public DebugForm(){
LoadSplitters();
//--
Global.db.makefiles.mountUI(makefilesPanel);
Global.db.modules.mountUI(modulesPanel);
Global.db.runConfigurations.mountUI(runConfigurationsPanel);
Global.db.environmentValues.mountUI(environmentsPanel);
Global.db.dvmParameters.mountUI(dvmParametersPanel);
((GlobalDatabase)CommonUtils.db).makefiles.mountUI(makefilesPanel);
((GlobalDatabase)CommonUtils.db).modules.mountUI(modulesPanel);
((GlobalDatabase)CommonUtils.db).runConfigurations.mountUI(runConfigurationsPanel);
((GlobalDatabase)CommonUtils.db).environmentValues.mountUI(environmentsPanel);
((GlobalDatabase)CommonUtils.db).dvmParameters.mountUI(dvmParametersPanel);
//-
Global.db.compilationTasks.mountUI(compilationTasksPanel);
Global.db.runTasks.mountUI(runTasksPanel);
((GlobalDatabase)CommonUtils.db).compilationTasks.mountUI(compilationTasksPanel);
((GlobalDatabase)CommonUtils.db).runTasks.mountUI(runTasksPanel);
//--
singleCompilationTaskMaster = new CompilationTasksComparisonForm(singleCompilationTaskSlave = new CompilationTasksComparisonForm(null));
singleRunTaskMaster = new RunTasksComparisonForm(singleRunTaskSlave = new RunTasksComparisonForm(null));

22
src/Visual_DVM_2021/UI/Main/FileForm.java
View File

@@ -1,6 +1,8 @@
package Visual_DVM_2021.UI.Main;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.Editor.Viewer;
import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar;
@@ -171,29 +173,29 @@ public class FileForm implements FileWindow, FormWithSplitters {
//----
@Override
public void ShowWarningsCount() {
boolean flag = Global.db.settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(1, (flag ? "Предупреждения: " : "") + file.father.db.warnings.getVisibleKeys().size());
}
@Override
public void ShowErrorsCount() {
boolean flag = Global.db.settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(2, (flag ? "Ошибки: " : "") + file.father.db.errors.getVisibleKeys().size());
}
@Override
public void ShowNotesCount() {
boolean flag = Global.db.settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(0, (flag ? "Примечания: " : "") + file.father.db.notes.getVisibleKeys().size());
}
@Override
public void ShowRecommendationsCount() {
boolean flag = Global.db.settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(3, (flag ? "Рекомендации: " : "") + file.father.db.recommendations.getVisibleKeys().size());
}
//---
@Override
public void RefreshTabsNames() {
UI.ShowTabsNames(graphsTabs);
boolean flag = Global.db.settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
//--
ShowNotesCount();
ShowWarningsCount();
@@ -235,7 +237,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
}
@Override
public void ShowNoMessages() {
boolean full_tiles = Global.db.settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean full_tiles = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
file.father.db.notes.ClearUI();
file.father.db.warnings.ClearUI();
file.father.db.errors.ClearUI();
@@ -367,7 +369,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
//--
@Override
public void CollapseGraphs() {
Global.db.splitters.get("SC12").position = SC12.getDividerLocation();
CommonUtils.db.splitters.get("SC12").position = SC12.getDividerLocation();
CommonUI.Clear(editorBackground);
editorBackground.add(editorPanel);
}
@@ -377,12 +379,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
SC12.setRightComponent(editorPanel);
editorBackground.add(SC12);
//--
SC12.setDividerLocation(Global.db.splitters.get("SC12").position);
SC12.setDividerLocation(CommonUtils.db.splitters.get("SC12").position);
SC12.updateUI();
}
@Override
public void CollapseMessages() {
Global.db.splitters.get("SC1").position = SC1.getDividerLocation();
CommonUtils.db.splitters.get("SC1").position = SC1.getDividerLocation();
CommonUI.Clear(content);
content.add(editorBackground);
}
@@ -391,7 +393,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
CommonUI.Clear(content);
SC1.setLeftComponent(editorBackground);
content.add(SC1);
SC1.setDividerLocation(Global.db.splitters.get("SC1").position);
SC1.setDividerLocation(CommonUtils.db.splitters.get("SC1").position);
SC1.updateUI();
}
}

3
src/Visual_DVM_2021/UI/Main/MainForm.java
View File

@@ -2,6 +2,7 @@ package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.MainMenuBar.MainWindow;
import Common_old.UI.UI;
@@ -61,7 +62,7 @@ public class MainForm extends Form implements MainWindow {
if (UI.debugWindow != null)
((FormWithSplitters) UI.debugWindow).SaveSplitters();
//--
Global.db.SaveCredentials();
((GlobalDatabase)CommonUtils.db).SaveCredentials();
//--
Global.FinishApplication();
}

7
src/Visual_DVM_2021/UI/Main/ProfilesFields.java
View File

@@ -1,6 +1,7 @@
package Visual_DVM_2021.UI.Main;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.UI.Windows.Dialog.DialogFields;
import GlobalData.GlobalDatabase;
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
import javax.swing.*;
@@ -15,7 +16,7 @@ public class ProfilesFields implements DialogFields, FormWithSplitters {
return content;
}
public ProfilesFields(){
Global.db.sapforProfiles.mountUI(profilesPanel);
Global.db.sapforProfilesSettings.mountUI(settingsPanel);
((GlobalDatabase)CommonUtils.db).sapforProfiles.mountUI(profilesPanel);
((GlobalDatabase)CommonUtils.db).sapforProfilesSettings.mountUI(settingsPanel);
}
}

19
src/Visual_DVM_2021/UI/Main/ProfilesForm.java
View File

@@ -1,8 +1,9 @@
package Visual_DVM_2021.UI.Main;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.UI.Windows.Dialog.Dialog;
import Common_old.UI.Windows.FormType;
import GlobalData.FormsParams.DBForm;
import GlobalData.GlobalDatabase;
public class ProfilesForm extends Dialog<Object, ProfilesFields> {
private DBForm info = null;
public ProfilesForm() {
@@ -17,13 +18,13 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
}
@Override
public void Init(Object... params) {
if (Global.db.sapforProfiles.size() > 0) {
for (Object key : Global.db.sapforProfiles.Data.keySet()) {
Global.db.sapforProfiles.ShowUI(key);
if (((GlobalDatabase)CommonUtils.db).sapforProfiles.size() > 0) {
for (Object key : ((GlobalDatabase)CommonUtils.db).sapforProfiles.Data.keySet()) {
((GlobalDatabase)CommonUtils.db).sapforProfiles.ShowUI(key);
return;
}
} else {
Global.db.sapforProfiles.ShowUI();
((GlobalDatabase)CommonUtils.db).sapforProfiles.ShowUI();
}
}
@Override
@@ -54,8 +55,8 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
}
}
public void LoadWindowParameters() throws Exception {
if (Global.db.forms.Data.containsKey(FormType.Profiles)) {
info = Global.db.forms.Data.get(FormType.Profiles);
if (((GlobalDatabase)CommonUtils.db).forms.Data.containsKey(FormType.Profiles)) {
info = ((GlobalDatabase)CommonUtils.db).forms.Data.get(FormType.Profiles);
info.Apply(this);
return;
}
@@ -64,8 +65,8 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
public void SaveWindowParameters() throws Exception {
if (info != null) {
info.Init(this);
Global.db.Update(info);
CommonUtils.db.Update(info);
} else
Global.db.Insert(new DBForm(FormType.Profiles, this));
CommonUtils.db.Insert(new DBForm(FormType.Profiles, this));
}
}

7
src/Visual_DVM_2021/UI/Main/ProjectForm.java
View File

@@ -2,6 +2,7 @@ package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.Editor.Viewer;
import Common_old.UI.Menus_2023.ProjectMenuBar.ProjectMenuBar;
@@ -83,7 +84,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
UI.getDebugWindow().ShowAll();
ShowAllAnalyses();
ShowProjectView();
SwitchScreen(Global.db.settings.get(SettingName.SmallScreen).toBoolean());
SwitchScreen(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SmallScreen).toBoolean());
RefreshTabsNames();
//--
if (Global.properties.collapseProjectTrees)
@@ -293,7 +294,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
//--
@Override
public void CollapseProjectTrees() {
Global.db.splitters.get("SC3").position = SC3.getDividerLocation();
CommonUtils.db.splitters.get("SC3").position = SC3.getDividerLocation();
//---
CommonUI.Clear(projectBackground);
projectBackground.add(fileBackground);
@@ -302,7 +303,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
public void ExpandProjectTrees() {
SC3.setLeftComponent(fileBackground);
projectBackground.add(SC3);
SC3.setDividerLocation(Global.db.splitters.get("SC3").position);
SC3.setDividerLocation(CommonUtils.db.splitters.get("SC3").position);
SC3.updateUI();
}
}

8
src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
View File

@@ -2,9 +2,9 @@ package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.Utils.Utils;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import ProjectData.Files.ProjectFile;
import TestingSystem.SAPFOR.Json.SapforVersion_json;
@@ -82,10 +82,10 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
} else {
if (isReady()) {
if (getMaster().isReady()) {
boolean ExtensionsOn = Global.db.settings.get(SettingName.ExtensionsOn).toBoolean();
boolean ExtensionsOn = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean();
String name1 = ExtensionsOn ? getMaster().file.file.getName() : CommonUtils.getFileNameWithoutExtension(getMaster().file.file);
String name2 = ExtensionsOn ? file.file.getName() : CommonUtils.getFileNameWithoutExtension(file.file);
if (Global.db.settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (name1.equalsIgnoreCase(name2))
master.DoComparePass(true);
} else
@@ -155,7 +155,7 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
cbFile.setSelectedIndex(-1);
for (int i = 0; i < cbFile.getItemCount(); ++i) {
ProjectFile projectFile = cbFile.getItemAt(i);
if (Global.db.settings.get(SettingName.ExtensionsOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
//если учитываем расширения, ищем полное совпадение
if (projectFile.file.getName().equals(file_name)) {
cbFile.setSelectedIndex(i);

7
src/Visual_DVM_2021/UI/Main/TasksComparisonForm.java
View File

@@ -1,7 +1,8 @@
package Visual_DVM_2021.UI.Main;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus_2023.MenuBarButton;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import javax.swing.*;
@@ -28,7 +29,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
//в отличие от комбо боксов, тут события нажатия на кнопку, нет.
if (isReady()) {
if (slave.isReady()) {
if (Global.db.settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
DoComparePass(true);
} else
DoShowPass(true);
@@ -39,7 +40,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
} else {
if (isReady()) {
if (master.isReady()) {
if (Global.db.settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
master.DoComparePass(true);
} else
master.DoShowPass(true);

42
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -1,8 +1,10 @@
package Visual_DVM_2021.UI.Main;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.UI;
@@ -128,9 +130,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
SC65.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc65Listener);
SC66.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc66Listener);
//-
Global.db.machines.mountUI(machinesPanel);
Global.db.users.mountUI(usersPanel);
Global.db.compilers.mountUI(compilersPanel);
((GlobalDatabase)CommonUtils.db).machines.mountUI(machinesPanel);
((GlobalDatabase)CommonUtils.db).users.mountUI(usersPanel);
((GlobalDatabase)CommonUtils.db).compilers.mountUI(compilersPanel);
//-
Global.testingServer.db.dvm_configurations.mountUI(configurationsPanel);
Global.testingServer.db.dvmPackages.mountUI(dvmPackagesPanel);
@@ -148,7 +150,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
//-
@Override
public void ShowAll() {
Global.db.machines.ShowUI();
((GlobalDatabase)CommonUtils.db).machines.ShowUI();
Global.testingServer.db.dvm_configurations.ShowUI();
Global.testingServer.db.dvmPackages.ShowUI();
Global.testingServer.db.sapforPackages.ShowUI();
@@ -271,33 +273,33 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public void RestoreLastCredentials() {
Credentials credentials = (Credentials) CurrentAnchestor.get(Current.Credentials);
if (credentials.machine_id != CommonConstants.Nan) {
if (Global.db.machines.containsKey(credentials.machine_id)) {
Global.db.machines.ShowUI(credentials.machine_id);
if (Global.db.users.containsKey(credentials.user_id)) {
Global.db.users.ShowUI(credentials.user_id);
if (((GlobalDatabase)CommonUtils.db).machines.containsKey(credentials.machine_id)) {
((GlobalDatabase)CommonUtils.db).machines.ShowUI(credentials.machine_id);
if (((GlobalDatabase)CommonUtils.db).users.containsKey(credentials.user_id)) {
((GlobalDatabase)CommonUtils.db).users.ShowUI(credentials.user_id);
} else {
credentials.user_id = CommonConstants.Nan;
Global.db.UpdateCredentials();
((GlobalDatabase)CommonUtils.db).UpdateCredentials();
}
if (Global.db.compilers.containsKey(credentials.compiler_id)) {
Global.db.compilers.ShowUI(credentials.compiler_id);
if (((GlobalDatabase)CommonUtils.db).compilers.containsKey(credentials.compiler_id)) {
((GlobalDatabase)CommonUtils.db).compilers.ShowUI(credentials.compiler_id);
} else {
credentials.compiler_id = CommonConstants.Nan;
Global.db.UpdateCredentials();
((GlobalDatabase)CommonUtils.db).UpdateCredentials();
}
//-
if (Global.db.makefiles.containsKey(credentials.makefile_id)) {
Global.db.makefiles.ShowUI(credentials.makefile_id);
if (((GlobalDatabase)CommonUtils.db).makefiles.containsKey(credentials.makefile_id)) {
((GlobalDatabase)CommonUtils.db).makefiles.ShowUI(credentials.makefile_id);
} else {
credentials.makefile_id = CommonConstants.Nan;
Global.db.UpdateCredentials();
((GlobalDatabase)CommonUtils.db).UpdateCredentials();
}
//-
if (Global.db.runConfigurations.containsKey(credentials.runconfiguration_id)) {
Global.db.runConfigurations.ShowUI(credentials.runconfiguration_id);
if (((GlobalDatabase)CommonUtils.db).runConfigurations.containsKey(credentials.runconfiguration_id)) {
((GlobalDatabase)CommonUtils.db).runConfigurations.ShowUI(credentials.runconfiguration_id);
} else {
credentials.runconfiguration_id = CommonConstants.Nan;
Global.db.UpdateCredentials();
((GlobalDatabase)CommonUtils.db).UpdateCredentials();
}
} else {
credentials.machine_id = CommonConstants.Nan;
@@ -306,13 +308,13 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
credentials.remotesapfor_id = CommonConstants.Nan;
credentials.makefile_id = CommonConstants.Nan;
credentials.runconfiguration_id = CommonConstants.Nan;
Global.db.UpdateCredentials();
((GlobalDatabase)CommonUtils.db).UpdateCredentials();
}
}
}
@Override
public void CollapseCredentials() {
Global.db.splitters.get("SC71").position = SC71.getDividerLocation();
CommonUtils.db.splitters.get("SC71").position = SC71.getDividerLocation();
CommonUI.Clear(credentialsPanel);
credentialsPanel.add(UI.credentialsBar);
SC71.setDividerLocation(30);

10
src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java
View File

@@ -1,8 +1,8 @@
package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.Utils.Utils;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import ProjectData.Files.DBProjectFile;
import ProjectData.Files.ProjectFile;
@@ -35,10 +35,10 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
} else {
if (isReady()) {
if (getMaster().isReady()) {
boolean ExtensionsOn = Global.db.settings.get(SettingName.ExtensionsOn).toBoolean();
boolean ExtensionsOn = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean();
String name1 = ExtensionsOn ? getMaster().file.file.getName() : CommonUtils.getFileNameWithoutExtension(getMaster().file.file);
String name2 = ExtensionsOn ? file.file.getName() : CommonUtils.getFileNameWithoutExtension(file.file);
if (Global.db.settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (name1.equalsIgnoreCase(name2))
master.DoComparePass(true);
} else
@@ -83,7 +83,7 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
cbFile.setSelectedIndex(-1);
for (int i = 0; i < cbFile.getItemCount(); ++i) {
ProjectFile projectFile = cbFile.getItemAt(i);
if (Global.db.settings.get(SettingName.ExtensionsOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
//если учитываем расширения, ищем полное совпадение
if (projectFile.file.getName().equals(file_in.file.getName())) {
cbFile.setSelectedIndex(i);
@@ -106,6 +106,6 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
}
@Override
protected boolean fortranWrapsOn() {
return Global.db.settings.get(SettingName.FortranWrapsOn).toBoolean();
return ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FortranWrapsOn).toBoolean();
}
}