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

208
.idea/workspace.xml generated
View File

@@ -7,162 +7,96 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Common/CurrentAnchestor.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Current.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/ComboBox/StyledTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledTextComboBox.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/ControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/ControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/ControlWithCurrentForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/ControlWithCurrentForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/DataControl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataControl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/DataControl_OLD.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataControl_OLD.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/DBObjectRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/DataTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/DataTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/DataTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/DataTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectableTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectableTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/TreeForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/SettingsSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/SettingsSubmenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Form.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Form.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/CompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/CompilerOptionsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/DVMParameter/UI/DVMParameterFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/UI/DVMParameterFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosDataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Grid/Grid.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Grid/TableVisualData.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Grid/GridsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Grid/GridsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModulesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Grid/GridsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Grid/TablesVisualDatasDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/Machine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/Machine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/Makefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/Makefile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Module/Module.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/Module.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModuleAnchestor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModuleAnchestor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/FileGraphTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/FileGraphTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/MessagesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/CompilationTask/CompilationTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Task.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/RulesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/RulesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineTree2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/InlineTree2.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/RegionsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/VariantsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/AbortTestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddCompiler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddMachine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddMachine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddMakefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddMakefile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyProfile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteVersion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExcludeFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExcludeFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/IncludeFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/IncludeFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteMachine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteMachine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteProfile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropFastAccess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropFastAccess.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropLastProjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropLastProjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditCompiler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditMachine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditMachine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditMakefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditMakefile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditModule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProfile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InitialiseUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveProfile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/CurrentComponentPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/CurrentComponentPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforTransformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforTransformation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/StartTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/StartTestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/FormWithSplitters.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/FormWithSplitters.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TasksComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@@ -262,8 +196,8 @@
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
</key>
<key name="MoveMembersDialog.RECENTS_KEY">
<recent name="Common.CurrentAnchestor" />
<recent name="Common.Utils.CommonUtils" />
<recent name="Common.CurrentAnchestor" />
<recent name="Common.CommonConstants" />
<recent name="Common.Visual.CommonUI" />
<recent name="Common_old.Constants" />

23
src/Common/Database/VisualiserDatabase.java Normal file
View File

@@ -0,0 +1,23 @@
package Common.Database;
import Common.Database.SQLITE.SQLiteDatabase;
import GlobalData.Grid.TablesVisualDatasDBTable;
import GlobalData.Splitter.SplittersDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import java.io.File;
public class VisualiserDatabase extends SQLiteDatabase {
public TablesVisualDatasDBTable tablesVisualData;
public SplittersDBTable splitters;
public VisualiserDatabase(File file_in) {
super(file_in);
}
@Override
protected void initAllTables() throws Exception {
addTable(tablesVisualData = new TablesVisualDatasDBTable());
addTable(splitters = new SplittersDBTable());
}
@Override
public PassCode_2021 getSynchronizePassCode() {
return null;
}
}

5
src/Common/Utils/CommonUtils.java
View File

@@ -1,5 +1,7 @@
package Common.Utils;
import Common.CommonConstants;
import Common.Database.Database;
import Common.Database.VisualiserDatabase;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.commons.io.FileUtils;
@@ -29,6 +31,9 @@ public class CommonUtils {
public static Loggable MainLog;
public static Semaphore date_semaphore = new Semaphore(1);
public static long last_ticks = CommonConstants.Nan;
//--------------------------------------------------
//главная база данных
public static VisualiserDatabase db = null;
//------------------------------------------------------------------------
public static Object requireNonNullElse(Object value, Object default_value) {
return (value != null) ? value : default_value;

18
src/Common/Visual/DataSetControlForm.java
View File

@@ -7,7 +7,6 @@ import Common.Database.Tables.DBTable;
import Common.Database.Tables.DataSet;
import Common.Database.Tables.FKBehaviour;
import Common_old.UI.UI;
import _VisualDVM.Global;
import Common_old.UI.Menus.TableMenu;
import Common_old.UI.Tables.ColumnInfo;
import Common_old.UI.Tables.DataTable;
@@ -65,21 +64,23 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
return getDataSource().CurrentName();
}
public void SaveColumns() {
if (Global.db != null) {
if (CommonUtils.db != null) {
try {
if ((CurrentName() != null)) {
String tableName= CurrentName().toString();
System.out.println(tableName+" savingColumns...");
Vector<String> 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 (Global.db.tablesVisualData.containsKey(tableName)) {
tableVisualData = Global.db.tablesVisualData.get(tableName);
if (CommonUtils.db.tablesVisualData.containsKey(tableName)) {
tableVisualData = CommonUtils.db.tablesVisualData.get(tableName);
} else {
tableVisualData = new TableVisualData(tableName);
Global.db.Insert(tableVisualData);
CommonUtils.db.Insert(tableVisualData);
}
tableVisualData.sizes = packed;
Global.db.Update(tableVisualData);
CommonUtils.db.Update(tableVisualData);
System.out.println("done");
}
} catch (Exception ex) {
ex.printStackTrace();
@@ -150,10 +151,9 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
//-----------------------------NEW-------------------------------------
@Override
public void CorrectColumnsSizes() {
if ((Global.db != null) && CurrentName() != null && Global.db.tablesVisualData.containsKey(CurrentName())) {
//Undefined может оказаться в таблице, например если енум устарел. Поэтому надо проверять.
if ((CommonUtils.db != null) && CurrentName() != null && CommonUtils.db.tablesVisualData.containsKey(CurrentName().toString())) {
if (!getColumnsProfile().equalsIgnoreCase(colNamesAndSizes)) {
TableVisualData grid = Global.db.tablesVisualData.get(CurrentName());
TableVisualData grid = CommonUtils.db.tablesVisualData.get(CurrentName().toString());
String[] data = grid.sizes.split("\\|");
for (int i = 0; i < columns.size(); ++i) {
if (i <= (data.length - 1)) {

5
src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java
View File

@@ -1,7 +1,8 @@
package Common_old.UI.Menus_2023.FastAccessMenuBar;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.VisualiserMenuBar;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -39,7 +40,7 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
if (pass.stats.HasUsages()) {
showPass(pass);
++i;
if (i > (Global.db.settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
if (i > (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
}
}
}

7
src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java
View File

@@ -1,8 +1,9 @@
package Common_old.UI.Menus_2023.MainMenuBar;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus.VisualiserMenuItem;
import Common_old.UI.Menus_2023.VisualiserMenu;
import GlobalData.DBLastProject.DBLastProject;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -20,7 +21,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
@Override
public void menuSelected(MenuEvent e) {
removeAll();
Vector<DBLastProject> projects = Global.db.lastProjects.getOrdered();
Vector<DBLastProject> projects = ((GlobalDatabase)CommonUtils.db).lastProjects.getOrdered();
int k = 1;
for (DBLastProject p : projects) {
if (new File(p.HomePath).exists() && p.lastOpened != 0) {
@@ -33,7 +34,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
});
add(i);
++k;
if (k > (Global.db.settings.get(SettingName.LastOpenedProjectsCount).toInt32())) break;
if (k > (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LastOpenedProjectsCount).toInt32())) break;
}
}
}

6
src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
View File

@@ -1,9 +1,9 @@
package Common_old.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu;
import Common.Utils.CommonUtils;
import _VisualDVM.Global;
import Common_old.UI.Menus.PropertiesSubmenu;
import Common_old.UI.Menus_2023.SettingsSubmenu;
import Common_old.UI.Menus_2023.VisualiserMenu;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
public class VisualiserSettingsMenu extends VisualiserMenu {
public VisualiserSettingsMenu() {
@@ -37,7 +37,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
SettingName.FortranWrapsOn,
SettingName.ComparsionDiffMergeOn
));
add(Global.db.settings.get(SettingName.Workspace).getMenuItem());
add(Global.db.settings.get(SettingName.BugReportsAgeLimit).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).getMenuItem());
}
}

9
src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectSettingsMenu.java
View File

@@ -1,10 +1,11 @@
package Common_old.UI.Menus_2023.ProjectMenuBar;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.LanguagesSubmenu;
import Common_old.UI.Menus_2023.SettingsSubmenu;
import Common_old.UI.Menus_2023.StylesSubmenu;
import Common_old.UI.Menus_2023.VisualiserMenu;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import ProjectData.Files.LanguageStyle;
import ProjectData.LanguageName;
@@ -59,9 +60,9 @@ public class ProjectSettingsMenu extends VisualiserMenu {
SettingName.SaveModifications
));
addSeparator();
add(Global.db.settings.get(SettingName.TRANSLATE_MESSAGES).getMenuItem());
add(Global.db.settings.get(SettingName.DEBUG_PRINT_ON).getMenuItem());
add(Global.db.settings.get(SettingName.GCOVLimit).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.TRANSLATE_MESSAGES).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.DEBUG_PRINT_ON).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.GCOVLimit).getMenuItem());
}
public void ShowLanguage() {
mLanguage.setText("Язык: " + Current.getProject().languageName.getDescription());

4
src/Common_old/UI/Menus_2023/SettingsSubmenu.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import GlobalData.GlobalDatabase;
import _VisualDVM.Syntax.VisualiserFonts;
import GlobalData.Settings.SettingName;
@@ -13,7 +13,7 @@ public class SettingsSubmenu extends JMenu {
setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
for (SettingName c : settings) {
add(Global.db.settings.get(c).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(c).getMenuItem());
}
}
}

4
src/Common_old/UI/UI.java
View File

@@ -28,6 +28,7 @@ import GlobalData.DVMParameter.DVMParameterDBTable;
import GlobalData.DVMParameter.DVMParametersMenuBar;
import GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
import GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
import GlobalData.GlobalDatabase;
import GlobalData.Machine.MachinesDBTable;
import GlobalData.Machine.MachinesMenuBar;
import GlobalData.Makefile.MakefilesDBTable;
@@ -92,7 +93,6 @@ import Visual_DVM_2021.UI.Main.DebugForm;
import Visual_DVM_2021.UI.Main.MainForm;
import Visual_DVM_2021.UI.Main.ProfilesForm;
import Visual_DVM_2021.UI.Main.VersionsForm;
import _VisualDVM.Global;
import _VisualDVM.Syntax.*;
import _VisualDVM.Syntax.VisualiserTheme;
@@ -299,7 +299,7 @@ public class UI {
ShowTabsNames(tabs, 0);
}
public static void ShowTabsNames(JTabbedPane tabs, int startIndex) {
boolean flag = Global.db.settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
for (int i = startIndex; i < tabs.getTabCount(); ++i)
tabs.setTitleAt(i, flag ? tabs.getToolTipTextAt(i) : "");
}

10
src/Common_old/UI/Windows/Form.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Windows;
import Common.Utils.CommonUtils;
import _VisualDVM.Global;
import GlobalData.GlobalDatabase;
import _VisualDVM.Syntax.ThemeElement;
import GlobalData.FormsParams.DBForm;
@@ -75,8 +75,8 @@ public abstract class Form extends JFrame implements ThemeElement {
}
public void LoadWindowParameters() throws SQLException, InstantiationException, IllegalAccessException, NoSuchFieldException {
if (!getFormType().equals(FormType.Undefined))
if (Global.db.forms.Data.containsKey(getFormType())) {
info = Global.db.forms.Data.get(getFormType());
if (((GlobalDatabase)CommonUtils.db).forms.Data.containsKey(getFormType())) {
info = ((GlobalDatabase)CommonUtils.db).forms.Data.get(getFormType());
info.Apply(this);
return;
}
@@ -87,9 +87,9 @@ public abstract class Form extends JFrame implements ThemeElement {
if (!getFormType().equals(FormType.Undefined)) {
if (info != null) {
info.Init(this);
Global.db.Update(info);
CommonUtils.db.Update(info);
} else
Global.db.Insert(new DBForm(getFormType(), this));
CommonUtils.db.Insert(new DBForm(getFormType(), this));
}
}
@Override

15
src/Common_old/Utils/Utils.java
View File

@@ -4,6 +4,7 @@ import Common.Utils.Index;
import Common.Utils.StringTemplate;
import Common.Utils.TextLog;
import Common_old.Constants;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.Utils.Files.VFileChooser_;
@@ -660,7 +661,7 @@ public class Utils {
}
public static void RestoreSelectedDirectory(VFileChooser_ directoryChooser) {
String last_dir_home =
Global.db.settings.get(SettingName.ProjectsSearchDirectory).Value;
((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ProjectsSearchDirectory).Value;
if (!last_dir_home.isEmpty())
directoryChooser.SetCurrentDirectory(last_dir_home);
}
@@ -708,11 +709,11 @@ public class Utils {
break;
case ' ':
case '\t':
if (Global.db.settings.get(SettingName.SpacesOn).toBoolean()) line.append(c);
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SpacesOn).toBoolean()) line.append(c);
v_line.append(c);
break;
case '\n': //конец строки
if (Global.db.settings.get(SettingName.FortranWrapsOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FortranWrapsOn).toBoolean()) {
//оракул. лезем в начало следующей строки
//и анализируем первые 5 символов
boolean hasWrap = false;
@@ -738,7 +739,7 @@ public class Utils {
break;
}
//добавление строки в результат.
if ((line.length() > 0) || Global.db.settings.get(SettingName.EmptyLinesOn).toBoolean()
if ((line.length() > 0) || ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.EmptyLinesOn).toBoolean()
// Global.db.settings.get(SettingName.SpacesOn).toBoolean()
) {
lines.add(line.toString());
@@ -757,7 +758,7 @@ public class Utils {
if ((i > 0) && (c != '\n')) {
//строка оборвалась на EOF
//добавление строки в результат.
if ((line.length() > 0) || Global.db.settings.get(SettingName.EmptyLinesOn).toBoolean()
if ((line.length() > 0) ||((GlobalDatabase)CommonUtils.db).settings.get(SettingName.EmptyLinesOn).toBoolean()
// && Global.db.settings.get(SettingName.SpacesOn).toBoolean()
) {
lines.add(line.toString());
@@ -769,11 +770,11 @@ public class Utils {
public static boolean CompareLines(String line1_raw, String line2_raw) {
String line1 = line1_raw;
String line2 = line2_raw;
if (!Global.db.settings.get(SettingName.RegisterOn).toBoolean()) {
if (!((GlobalDatabase)CommonUtils.db).settings.get(SettingName.RegisterOn).toBoolean()) {
line1 = line1.toUpperCase();
line2 = line2.toUpperCase();
}
if (!Global.db.settings.get(SettingName.SpacesOn).toBoolean()) {
if (!((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SpacesOn).toBoolean()) {
line1 = CommonUtils.removeCharacters(line1, " ", "\t");
line2 = CommonUtils.removeCharacters(line2, " ", "\t");
}

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

@@ -3,11 +3,11 @@ import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import _VisualDVM.Global;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils;
import GlobalData.DVMParameter.UI.DVMParameterFields;
import GlobalData.GlobalDatabase;
public class DVMParameterDBTable extends iDBTable<DVMParameter> {
public DVMParameterDBTable() {
super(DVMParameter.class);
@@ -76,7 +76,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
Log.Writeln("Значение переменной окружения не может содержать двойные кавычки");
}
*/
for (DVMParameter par : Global.db.dvmParameters.Data.values()) {
for (DVMParameter par : ((GlobalDatabase)CommonUtils.db).dvmParameters.Data.values()) {
if (par.isVisible() && (Result.id != par.id) && (par.name.equals(name))) {
Log.Writeln("В конфигурации запуска уже задан параметр DVM системы с именем " + CommonUtils.Brackets(name));
break;

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

@@ -3,11 +3,11 @@ import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import _VisualDVM.Global;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils;
import GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
import GlobalData.GlobalDatabase;
public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
public EnvironmentValuesDBTable() {
super(EnvironmentValue.class);
@@ -43,7 +43,7 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
if (value.contains("\"")) {
Log.Writeln("Значение переменной окружения не может содержать двойные кавычки");
}
for (EnvironmentValue env : Global.db.environmentValues.Data.values()) {
for (EnvironmentValue env : ((GlobalDatabase)CommonUtils.db).environmentValues.Data.values()) {
if (env.isVisible() && (Result.id != env.id) && (env.name.equals(name))) {
Log.Writeln("В конфигурации запуска уже задана переменная окружения с именем " + CommonUtils.Brackets(name));
break;

31
src/GlobalData/GlobalDatabase.java
View File

@@ -1,9 +1,9 @@
package GlobalData;
import Common.CurrentAnchestor;
import Common.Database.VisualiserDatabase;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Database.SQLITE.SQLiteDatabase;
import _VisualDVM.Global;
import GlobalData.Account.Account;
import GlobalData.Account.AccountsDBTable;
@@ -15,7 +15,6 @@ import GlobalData.DVMParameter.DVMParameterDBTable;
import GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
import GlobalData.FormsParams.FormsDBTable;
import GlobalData.FormsParams.MainFormParamsDBTable;
import GlobalData.Grid.GridsDBTable;
import GlobalData.Machine.MachinesDBTable;
import GlobalData.Makefile.MakefilesDBTable;
import GlobalData.Module.ModulesDBTable;
@@ -27,7 +26,6 @@ import GlobalData.SapforProfileSetting.SapforProfileSettingsDBTable;
import GlobalData.Settings.DBSetting;
import GlobalData.Settings.SettingName;
import GlobalData.Settings.SettingsDBTable;
import GlobalData.Splitter.SplittersDBTable;
import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable;
@@ -38,7 +36,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
import java.nio.file.Paths;
import java.util.Date;
import java.util.LinkedHashMap;
public class GlobalDatabase extends SQLiteDatabase {
public class GlobalDatabase extends VisualiserDatabase {
//---------СЕАНС----------------------------------------------
public MachinesDBTable machines;
public UsersDBTable users;
@@ -58,8 +56,6 @@ public class GlobalDatabase extends SQLiteDatabase {
public LastProjectsDBTable lastProjects;
public AccountsDBTable accounts;
public PassStatsDBTable passStats;
public SplittersDBTable splitters;
public GridsDBTable tablesVisualData;
//-
public SapforProfilesDBTable sapforProfiles = null;
//---------
@@ -70,6 +66,7 @@ public class GlobalDatabase extends SQLiteDatabase {
}
@Override
protected void initAllTables() throws Exception {
super.initAllTables();
addTable(machines = new MachinesDBTable());
addTable(users = new UsersDBTable());
addTable(compilers = new CompilersDBTable());
@@ -86,9 +83,7 @@ public class GlobalDatabase extends SQLiteDatabase {
addTable(lastProjects = new LastProjectsDBTable());
addTable(accounts = new AccountsDBTable());
addTable(passStats = new PassStatsDBTable());
addTable(splitters = new SplittersDBTable());
addTable(dvmParameters = new DVMParameterDBTable());
addTable(tablesVisualData = new GridsDBTable());
addTable(sapforProfiles = new SapforProfilesDBTable());
addTable(sapforProfilesSettings = new SapforProfileSettingsDBTable());
}
@@ -131,7 +126,7 @@ public class GlobalDatabase extends SQLiteDatabase {
}
public void UpdateCredentials() {
try {
Global.db.Update((DBObject) CurrentAnchestor.get(Current.Credentials));
Update((DBObject) CurrentAnchestor.get(Current.Credentials));
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
}
@@ -139,7 +134,7 @@ public class GlobalDatabase extends SQLiteDatabase {
//--
public LinkedHashMap<SettingName, String> getSapforSettingsForProfile() {
LinkedHashMap<SettingName, String> res = new LinkedHashMap<>();
for (DBSetting setting : Global.db.settings.getSettingsByOwner(ComponentType.SapforOptions))
for (DBSetting setting : settings.getSettingsByOwner(ComponentType.SapforOptions))
if (setting.Visible)
res.put(setting.Name, setting.Value);
return res;
@@ -170,18 +165,18 @@ public class GlobalDatabase extends SQLiteDatabase {
}
}
public void saveCurrentProfile(String name_in) throws Exception {
if (Global.db.checkProfileForCurrentSettings() == null) {
if (checkProfileForCurrentSettings() == null) {
SapforProfile profile = new SapforProfile();
profile.description = name_in;
profile.creationDate = new Date().getTime();
Global.db.Insert(profile);
Global.db.insertProfileSettings(profile);
Insert(profile);
insertProfileSettings(profile);
}
}
public void rewriteProfileByDescription(String description_in) throws Exception {
SapforProfile old = null;
//ищем профиль с именем бага
for (SapforProfile p : Global.db.sapforProfiles.Data.values())
for (SapforProfile p : sapforProfiles.Data.values())
if (p.description.equalsIgnoreCase(description_in)) {
old = p;
break;
@@ -189,14 +184,14 @@ public class GlobalDatabase extends SQLiteDatabase {
if (old != null) {
//удалить профиль с именем бага,если есть, чтобы не множить кроликов.
//при условии что не видно окна профилей!!
Global.db.Delete(old);
Global.db.DeleteByFK(old, SapforProfileSetting.class);
Delete(old);
DeleteByFK(old, SapforProfileSetting.class);
}
//---
SapforProfile profile = new SapforProfile();
profile.description = description_in;
profile.creationDate = new Date().getTime();
Global.db.Insert(profile);
Global.db.insertProfileSettings(profile);
Insert(profile);
insertProfileSettings(profile);
}
}

4
src/GlobalData/Grid/GridsDBTable.java → src/GlobalData/Grid/TablesVisualDatasDBTable.java
View File

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

5
src/GlobalData/Machine/Machine.java
View File

@@ -1,7 +1,6 @@
package GlobalData.Machine;
import Common.Database.Objects.iDBObject;
import Common.Utils.CommonUtils;
import _VisualDVM.Global;
import GlobalData.Compiler.Compiler;
import GlobalData.User.User;
@@ -27,10 +26,10 @@ public class Machine extends iDBObject {
"Машина по адресу " + CommonUtils.Brackets(getURL());
}
public LinkedHashMap<Integer, Compiler> getCompilers() {
return Global.db.getMapByFKi(this, Compiler.class);
return CommonUtils.db.getMapByFKi(this, Compiler.class);
}
public LinkedHashMap<Integer, User> getUsers() {
return Global.db.getMapByFKi(this, User.class);
return CommonUtils.db.getMapByFKi(this, User.class);
}
@Override
public String getDialogName() {

7
src/GlobalData/Makefile/Makefile.java
View File

@@ -1,7 +1,6 @@
package GlobalData.Makefile;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common.Utils.TextLog;
import Common_old.Utils.Utils;
import GlobalData.Compiler.Compiler;
@@ -26,10 +25,10 @@ public class Makefile extends ModuleAnchestor {
return Current.HasMachine() && (machine_id == Current.getMachine().id);
}
public LinkedHashMap<LanguageName, Module> getActiveModules() {
return Global.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 CommonUtils.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));
}
public LinkedHashMap<LanguageName, Module> getModules() {
return Global.db.getByFKAndGroupBy(this, Module.class, "language", LanguageName.class);
return CommonUtils.db.getByFKAndGroupBy(this, Module.class, "language", LanguageName.class);
}
public String Generate(db_project_info project, boolean useFilesOrder, LinkedHashMap<LanguageName, Module> modules) throws Exception {
Compiler linker = getCompiler();
@@ -160,7 +159,7 @@ public class Makefile extends ModuleAnchestor {
//todo возможно улучшить
//https://habr.com/ru/post/211751/
public Machine getMachine() {
return Global.db.getById(Machine.class, machine_id);
return CommonUtils.db.getById(Machine.class, machine_id);
}
public boolean DependsToCompiler(Compiler compiler) {
if (compiler_id == compiler.id) return true;

3
src/GlobalData/Module/Module.java
View File

@@ -2,7 +2,6 @@ package GlobalData.Module;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import GlobalData.Makefile.Makefile;
import ProjectData.LanguageName;
public class Module extends ModuleAnchestor {
@@ -30,7 +29,7 @@ public class Module extends ModuleAnchestor {
public void Select(boolean flag) {
on = flag ? 1 : 0;
try {
Global.db.Update(this);
CommonUtils.db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
}

3
src/GlobalData/Module/ModuleAnchestor.java
View File

@@ -2,7 +2,6 @@ package GlobalData.Module;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
import GlobalData.Compiler.Compiler;
public class ModuleAnchestor extends iDBObject {
//--------------------------------------------------------------------------------------
@@ -17,7 +16,7 @@ public class ModuleAnchestor extends iDBObject {
return ((compiler = getCompiler()) == null) ? "" : compiler.getDescription();
}
public Compiler getCompiler() {
return Global.db.getById(Compiler.class, compiler_id);
return CommonUtils.db.getById(Compiler.class, compiler_id);
}
public String getDescription() {
String res = "";

9
src/GlobalData/RunConfiguration/RunConfiguration.java
View File

@@ -3,7 +3,6 @@ import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
import Common.Utils.TextLog;
import GlobalData.Compiler.Compiler;
import GlobalData.DVMParameter.DVMParameter;
@@ -118,7 +117,7 @@ public class RunConfiguration extends iDBObject {
}
//---------------------------------------->
public Compiler getCompiler() {
return Global.db.getById(Compiler.class, compiler_id);
return CommonUtils.db.getById(Compiler.class, compiler_id);
}
public boolean isCube() {
return cube != 0;
@@ -190,13 +189,13 @@ public class RunConfiguration extends iDBObject {
return "run_configuration_id";
}
public Vector<String> getEnvList() {
return Global.db.getVectorStringByFK(this, EnvironmentValue.class);
return CommonUtils.db.getVectorStringByFK(this, EnvironmentValue.class);
}
public Vector<String> getParList() {
return Global.db.getVectorStringByFK(this, DVMParameter.class);
return CommonUtils.db.getVectorStringByFK(this, DVMParameter.class);
}
public LinkedHashMap<String, String> getEnvMap() {
LinkedHashMap<Integer, EnvironmentValue> envs = Global.db.getMapByFKi(this, EnvironmentValue.class);
LinkedHashMap<Integer, EnvironmentValue> envs = CommonUtils.db.getMapByFKi(this, EnvironmentValue.class);
LinkedHashMap<String, String> res = new LinkedHashMap<>();
for (EnvironmentValue e : envs.values()) {
if (!res.containsKey(e.name))

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

@@ -1,8 +1,8 @@
package GlobalData.RunConfiguration;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import _VisualDVM.Global;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
@@ -14,6 +14,7 @@ import GlobalData.Compiler.Compiler;
import GlobalData.Compiler.CompilerType;
import GlobalData.DVMParameter.DVMParameter;
import GlobalData.EnvironmentValue.EnvironmentValue;
import GlobalData.GlobalDatabase;
import GlobalData.RunConfiguration.UI.MatrixBar;
import GlobalData.RunConfiguration.UI.RunConfigurationFields;
import GlobalData.Tasks.RunTask.RunTask;
@@ -39,7 +40,7 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
return new DBObjectDialog<RunConfiguration, RunConfigurationFields>(RunConfigurationFields.class) {
@Override
public void fillFields() {
for (Compiler compiler : Global.db.compilers.Data.values()) {
for (Compiler compiler : ((GlobalDatabase)CommonUtils.db).compilers.Data.values()) {
if (compiler.isVisible() && compiler.type.equals(CompilerType.dvm))
fields.cbLauncherCall.addItem(compiler);
}

7
src/GlobalData/Tasks/CompilationTask/CompilationTask.java
View File

@@ -2,6 +2,7 @@ package GlobalData.Tasks.CompilationTask;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Current;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import GlobalData.Makefile.Makefile;
import GlobalData.Module.Module;
@@ -62,7 +63,7 @@ public class CompilationTask extends Task {
break;
}
}
Global.db.Update(this);
CommonUtils.db.Update(this);
}
//---------------------------------------------------
@Override
@@ -78,7 +79,7 @@ public class CompilationTask extends Task {
belongsToProject(Current.getProject());
}
public Makefile getMakefile() {
return Global.db.getById(Makefile.class, makefile_id);
return CommonUtils.db.getById(Makefile.class, makefile_id);
}
@Override
public String getFullCommand() {
@@ -88,7 +89,7 @@ public class CompilationTask extends Task {
LinkedHashMap<Integer, RunTask> res = new LinkedHashMap<>();
//так не получится. не правильно назвал ключевое поле. F...
// return Global.db.getMapByFKi(this, RunTask.class);
for (RunTask runTask : Global.db.runTasks.Data.values()) {
for (RunTask runTask : ((GlobalDatabase)CommonUtils.db).runTasks.Data.values()) {
if (runTask.compilation_task_id == id)
res.put(runTask.id, runTask);
}

9
src/GlobalData/Tasks/RunTask/RunTask.java
View File

@@ -2,6 +2,7 @@ package GlobalData.Tasks.RunTask;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Current;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common.Utils.StringTemplate;
import Common_old.Utils.Utils;
@@ -37,7 +38,7 @@ public class RunTask extends Task {
super.DropResults();
Utils.forceDeleteWithCheck(getLocalStsFile());
CleanTime = 0;
Global.db.Update(this);
CommonUtils.db.Update(this);
}
@Override
public File getHome() {
@@ -60,16 +61,16 @@ public class RunTask extends Task {
compilation_task_id == Current.getCompilationTask().id;
}
public RunConfiguration getRunConfiguration() {
return Global.db.runConfigurations.Data.get(run_configuration_id);
return ((GlobalDatabase)CommonUtils.db).runConfigurations.Data.get(run_configuration_id);
}
public CompilationTask getCompilationTask() {
return Global.db.compilationTasks.Data.get(compilation_task_id);
return ((GlobalDatabase)CommonUtils.db).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 {
Global.db.Update(this);
CommonUtils.db.Update(this);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
}

4
src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
View File

@@ -1,7 +1,7 @@
package GlobalData.Tasks.Supervisor.Local.Windows;
import Common.Utils.CommonUtils;
import _VisualDVM.Global;
import Common_old.Utils.Utils;
import GlobalData.GlobalDatabase;
import GlobalData.Makefile.Makefile;
import GlobalData.Settings.SettingName;
import GlobalData.Tasks.CompilationTask.CompilationTask;
@@ -19,7 +19,7 @@ public class WindowsLocalCompilationSupervisor extends WindowsLocalTaskSuperviso
}
@Override
protected String getScriptText() {
return CommonUtils.DQuotes(Global.db.settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt";
return CommonUtils.DQuotes(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt";
}
//скорее всего как то выделить подготовку к компиляции как метод предка.
@Override

5
src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
View File

@@ -1,6 +1,5 @@
package GlobalData.Tasks.Supervisor;
import Common.Utils.CommonUtils;
import _VisualDVM.Global;
import Common_old.Utils.Utils;
import GlobalData.Tasks.Task;
import GlobalData.Tasks.TaskState;
@@ -17,7 +16,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass_2021> {
public void ShowTaskState(){
Global.db.tables.get(task.getClass()).ShowUI(task.getPK());
CommonUtils.db.tables.get(task.getClass()).ShowUI(task.getPK());
}
public void Init(T task_in, P pass_in, db_project_info project_in) {
task = task_in;
@@ -133,6 +132,6 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass_2021> {
}
}
public void UpdateTask() throws Exception {
Global.db.Update(task);
CommonUtils.db.Update(task);
}
}

9
src/GlobalData/Tasks/Task.java
View File

@@ -3,7 +3,6 @@ import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
import Common_old.Utils.Utils;
import GlobalData.Machine.Machine;
import GlobalData.User.User;
@@ -45,7 +44,7 @@ public abstract class Task extends iDBObject {
EndDate = 0;
Time = 0;
state = TaskState.Inactive;
Global.db.Update(this);
CommonUtils.db.Update(this);
}
//</editor-fold>
//<editor-fold desc="локальные файлы">
@@ -67,10 +66,10 @@ public abstract class Task extends iDBObject {
return new Date(EndDate);
}
public Machine getMachine() {
return Global.db.getById(Machine.class, machine_id);
return CommonUtils.db.getById(Machine.class, machine_id);
}
public User getUser() {
return Global.db.getById(User.class, user_id);
return CommonUtils.db.getById(User.class, user_id);
}
protected String getTextResult(File file) {
return (file.exists()) ? Utils.ReadAllText(file) : "файл не найден. Задача еще не выполнялась или была завершена некорректно";
@@ -93,7 +92,7 @@ public abstract class Task extends iDBObject {
if (state != state_in) {
state = state_in;
try {
Global.db.Update(this);
CommonUtils.db.Update(this);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
}

5
src/ProjectData/Files/UI/Editor/SPFEditor.java
View File

@@ -1,6 +1,7 @@
package ProjectData.Files.UI.Editor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.Editor.BaseEditor;
import Common_old.UI.Editor.CaretInfo;
@@ -45,7 +46,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
highlighter = (RSyntaxTextAreaHighlighter) getHighlighter();
autoComplete = new SapforAutoComplete(this);
//-------------------------
float font_size = (float) Global.db.settings.get(SettingName.EditorFontSize).toInt32();
float font_size = (float) ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.EditorFontSize).toInt32();
setFont(getFont().deriveFont(font_size));
//-------------------------
setText(Utils.ReadAllText(file.file).replace("\r", " "));
@@ -166,7 +167,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
Pair<Long, Integer> p = file.gcov_info.line_info.get(lineNum);
Color color = never;
if (p.getKey() > 0) {
color = (p.getValue() >= Global.db.settings.get(SettingName.GCOVLimit).toInt32()) ?
color = (p.getValue() >= ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.GCOVLimit).toInt32()) ?
new Color(255, 255, (100 - p.getValue()), 90) : null;
}
if (color != null) {

5
src/ProjectData/SapforData/Arrays/ArraysSet.java
View File

@@ -1,8 +1,9 @@
package ProjectData.SapforData.Arrays;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Tables.DataSet;
import _VisualDVM.Global;
import Common.Visual.DataSetControlForm;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -38,7 +39,7 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
if (Global.db.settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
columns.get(4).setRenderer(RendererHyperlinks);
columns.get(4).setEditor(EditorHyperlinks);
} else {

4
src/Repository/BugReport/BugReport.java
View File

@@ -1,7 +1,9 @@
package Repository.BugReport;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.rDBObject;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Repository.Component.ComponentType;
import com.sun.org.glassfish.gmbal.Description;
@@ -62,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 = Global.db.settings.getSapforSettingsText();
sapfor_settings = ((GlobalDatabase)CommonUtils.db).settings.getSapforSettingsText();
percentage = 0;
description = description_in;
date = new Date().getTime();

6
src/Repository/Component/Visualiser.java
View File

@@ -1,4 +1,6 @@
package Repository.Component;
import Common.Utils.CommonUtils;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -74,8 +76,8 @@ public class Visualiser extends Component {
System.exit(0);
}
public File getWorkspace() {
if (!Global.db.settings.get(SettingName.Workspace).toString().isEmpty()) {
File workspace = new File(Global.db.settings.get(SettingName.Workspace).toString());
if (!((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).toString().isEmpty()) {
File workspace = new File(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).toString());
if (workspace.exists())
return workspace;
else

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();
}
}

29
src/_VisualDVM/Global.java
View File

@@ -1,13 +1,14 @@
package _VisualDVM;
import Common.CurrentAnchestor;
import Common.Database.Tables.DataSet;
import Common.Utils.CommonUtils;
import Common.Utils.Loggable;
import Common.Visual.CommonUI;
import Common_old.Constants;
import Common_old.Current;
import Common_old.GlobalProperties;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Common.Database.Tables.DataSet;
import Common.Visual.CommonUI;
import GlobalData.Account.Account;
import GlobalData.Account.AccountRole;
import GlobalData.GlobalDatabase;
@@ -26,7 +27,6 @@ import TestingSystem.DVM.RemoteDVMTestingPlanner;
import TestingSystem.SAPFOR.PackageModeSupervisor;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Common.Utils.Loggable;
import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
@@ -47,8 +47,6 @@ public class Global {
//??
public static DataSet<ComponentType, Component> Components = null;
public static MessagesServer messagesServer = null;
//--------------------------------------------------
public static GlobalDatabase db = null;
public static File ComponentsDirectory;
public static File DataDirectory;
public static File BugReportsDirectory;
@@ -156,7 +154,7 @@ public class Global {
//-
public static void FinishApplication() {
try {
if (db != null) db.Disconnect();
if (CommonUtils.db != null) CommonUtils.db.Disconnect();
if (componentsServer.db != null)
componentsServer.db.Disconnect();
if (testingServer.db != null)
@@ -177,11 +175,11 @@ public class Global {
System.exit(0);
}
public static void ActivateDB() throws Exception {
db = new GlobalDatabase();
db.Connect();
db.CreateAllTables();
db.prepareTablesStatements();
db.Synchronize();
CommonUtils.db = new GlobalDatabase();
CommonUtils.db.Connect();
CommonUtils.db.CreateAllTables();
CommonUtils.db.prepareTablesStatements();
CommonUtils.db.Synchronize();
}
public static void RefreshUpdatesStatus() {
Components.RefreshUI();
@@ -220,7 +218,7 @@ public class Global {
public static DBSetting getSetting(SettingName settingName) throws Exception {
switch (Current.mode) {
case Normal:
return db.settings.get(settingName);
return ((GlobalDatabase)CommonUtils.db).settings.get(settingName);
default:
return null;
}
@@ -235,7 +233,7 @@ public class Global {
forbidden.add(SettingName.Precompilation);
forbidden.add(SettingName.DVMConvertationOptions);
forbidden.add(SettingName.SaveModifications);
for (DBSetting setting : db.settings.getSettingsByOwner(ComponentType.SapforOptions)) {
for (DBSetting setting : ((GlobalDatabase)CommonUtils.db).settings.getSettingsByOwner(ComponentType.SapforOptions)) {
if (!forbidden.contains(setting.Name))
res_.add(setting.Value);
}
@@ -330,11 +328,12 @@ public class Global {
//---------------
componentsServer.ActivateDB();
testingServer.ActivateDB();
//в проперти их!
//-- чисто чтобы создать таблицы. соединения на стороне клиента не предвидится.
if (db.settings.get(SettingName.AutoBugReportsLoad).toBoolean())
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.AutoBugReportsLoad).toBoolean())
Pass_2021.passes.get(PassCode_2021.SynchronizeBugReports).Do();
//--
if (db.settings.get(SettingName.AutoTestsLoad).toBoolean())
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.AutoTestsLoad).toBoolean())
Pass_2021.passes.get(PassCode_2021.SynchronizeTests).Do();
Pass_2021.CheckAllStats();
Current.getSapfor().refreshPid(); //без сапфора сюда это все равно не дойдет.