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-13 22:08:13 +03:00
parent 09b64218bd
commit 6afa2dc892
240 changed files with 1472 additions and 1518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

265
.idea/workspace.xml generated
View File

@@ -8,32 +8,245 @@
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.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/Common/Current_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current_.java" 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/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/DataTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/DataTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectableTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectableTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/MainModule_/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/MainModule_/MainModule_.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/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/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddFile.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/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/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/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/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/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/AppendBugReportComment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.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/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/BuildComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/BuildComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="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/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.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/CreateEmptyDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.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/CreateTestFromFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.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/DeleteBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteBugReport.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/DeleteDownloadedBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.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/DeleteServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.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/DownloadComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadComponent.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/DropAnalyses.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropAnalyses.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/EditProjectCompilationMaxtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.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/ExcludeSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.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/GCOV.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GCOV.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/IncludeSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.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/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/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/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/PickCompilerEnvironmentsForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.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/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/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_GetAllDeclaratedArrays.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.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_GetGraphLoops.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.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/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Save.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Save.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/SaveFunctionsGraphCoordinates.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveGraph.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/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SendBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.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/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/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.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/All/UpdateComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateProperty.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/ChangeFilePass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ChangeFilePass.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/CurrentProjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/CurrentProjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/FilesMassPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/FilesMassPass.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/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProjectPass.java" beforeDir="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/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforFilesModification.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforFilesModification.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.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/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.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/SilentSapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SilentSapforPass.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/Passes/UI/CopyProjectFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/VariantsMassPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/VariantsMassPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Current.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/Compiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/Compiler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/Makefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/Makefile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/Module.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/Module.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/User.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/FileArraysTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/FileArraysTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/UI/FileLoopsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/UI/FileLoopsTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Group.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/AttachementsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/AttachementsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileStyleMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileStyleMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainEditorMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AnalysisForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AnalysisForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CombineFilesDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CombineFilesDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -84,7 +297,7 @@
<option name="stateVersion" value="1" />
</component>
<component name="ProblemsViewState">
<option name="selectedTabId" value="CurrentFile" />
<option name="selectedTabId" value="ProjectErrors" />
</component>
<component name="ProjectId" id="1UqWSAGBQQNofrCLxSPPtOZrGP7" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">

22
src/Common/Current_.java
View File

@@ -7,26 +7,4 @@ public interface Current_ {
default String getDescription(){
return "?";
}
LinkedHashMap<Current_, Object> objects = new LinkedHashMap<>();
static Object get(Current_ name) {
if (!objects.containsKey(name))
objects.put(name,null);
return objects.get(name);
}
static Object set(Current_ name, Object object) {
if (objects.containsKey(name))
objects.replace(name, object);
else objects.put(name, object);
return object;
}
static boolean Check(TextLog Log, Current_... names) {
for (Current_ name : names)
if (Current_.get(name) == null)
Log.Writeln_(name.getDescription() + " не выбран(а)");
return Log.isEmpty();
}
//применять только для наследников iDBObject
static boolean matchCurrentID(Current_ name, int id) {
return (Current_.get(name) != null) && (((iDBObject) Current_.get(name)).id == id);
}
}

11
src/Common/Database/Tables/DataSet.java
View File

@@ -10,6 +10,7 @@ import Common.Utils.TextLog;
import Common.Database.Objects.DBObject;
import Common.Visual.UI_;
import Common.Visual.FilterInterface;
import _VisualDVM.Global;
import javax.swing.*;
import java.awt.*;
@@ -244,19 +245,19 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return null;
}
public boolean CheckCurrent(TextLog log) {
return Current_.Check(log, CurrentName());
return Global.mainModule.Check(log, CurrentName());
}
public boolean hasCurrent() {
return Current_.get(CurrentName()) != null;
return Global.mainModule.get(CurrentName()) != null;
}
public void dropCurrent() {
Current_.set(CurrentName(), null);
Global.mainModule.set(CurrentName(), null);
}
public D getCurrent() {
return (D) Current_.get(CurrentName());
return (D) Global.mainModule.get(CurrentName());
}
public void setCurrent(D o) {
Current_.set(CurrentName(), o);
Global.mainModule.set(CurrentName(), o);
}
public Vector<D> getCheckedOrCurrent() {
Vector<D> res = new Vector<>();

6
src/Common/Passes/Pass.java
View File

@@ -130,7 +130,7 @@ public class Pass<T> {
try {
Global.mainModule.getDb().Update(stats);
FAPasses.sort(new SortPassesByStats());
if (Current.HasProject())
if (Global.mainModule.HasProject())
UI.fastAccessMenuBar.Refresh();
} catch (Exception ex) {
Utils_.MainLog.PrintException(ex);
@@ -306,10 +306,10 @@ public class Pass<T> {
animation_sem.acquire();
//---
form = null;
Current_.set(Current.PassForm, null);
Global.mainModule.set(Current.PassForm, null);
System.gc();
//--
Current_.set(Current.PassForm, form = new PassForm(this));
Global.mainModule.set(Current.PassForm, form = new PassForm(this));
dispatcher = new SwingWorker() {
@Override
protected Object doInBackground() {

3
src/Common/Visual/Trees/DataTree.java
View File

@@ -2,6 +2,7 @@ package Common.Visual.Trees;
import Common.Current_;
import Common.Utils.Utils_;
import Common.Visual.DataControl_OLD;
import _VisualDVM.Global;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;
@@ -11,7 +12,7 @@ public class DataTree extends StyledTree implements DataControl_OLD {
}
public void ChangeCurrentObject(DefaultMutableTreeNode node) {
if (getCurrent() != null)
Current_.set(getCurrent(), node.getUserObject());
Global.mainModule.set(getCurrent(), node.getUserObject());
}
@Override
public void ShowCurrentObject() throws Exception {

3
src/Common/Visual/Trees/SelectableTree.java
View File

@@ -1,6 +1,7 @@
package Common.Visual.Trees;
import Common.Current_;
import Common.Visual.Selectable;
import _VisualDVM.Global;
import javax.swing.tree.DefaultMutableTreeNode;
public class SelectableTree extends DataTree {
@@ -9,7 +10,7 @@ public class SelectableTree extends DataTree {
}
@Override
public void LeftMouseAction1() {
Object element = Current_.get(getCurrent());
Object element = Global.mainModule.get(getCurrent());
if ((element instanceof Selectable)) {
((Selectable) element).SwitchSelection();
updateUI();

34
src/MainModule_/MainModule_.java
View File

@@ -1,19 +1,23 @@
package MainModule_;
import Common.Current_;
import Common.Database.Objects.iDBObject;
import Common.Database.VisualiserDatabase;
import Common.Passes.Pass;
import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Utils.TextLog;
import java.util.LinkedHashMap;
//Основной объект визуализатора.
public abstract class MainModule_<D extends VisualiserDatabase> {
protected D db;
protected Class<D> db_class;
public LinkedHashMap<PassCode_, Pass> passes;
D db;
Class<D> db_class;
LinkedHashMap<PassCode_, Pass> passes;
LinkedHashMap<Current_, Object> objects;
public D getDb() {
return db;
}
public MainModule_(Class<D> db_class_in) {
objects = new LinkedHashMap<>();
try {
db_class = db_class_in;
} catch (Exception ex) {
@@ -30,4 +34,26 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
public void DeactivateDB() throws Exception{
if (db != null) db.Disconnect();
}
//--
public Object get(Current_ name) {
if (!objects.containsKey(name))
objects.put(name,null);
return objects.get(name);
}
public Object set(Current_ name, Object object) {
if (objects.containsKey(name))
objects.replace(name, object);
else objects.put(name, object);
return object;
}
public boolean Check(TextLog Log, Current_... names) {
for (Current_ name : names)
if (get(name) == null)
Log.Writeln_(name.getDescription() + " не выбран(а)");
return Log.isEmpty();
}
//применять только для наследников iDBObject
public boolean matchCurrentID(Current_ name, int id) {
return (get(name) != null) && (((iDBObject) get(name)).id == id);
}
}

5
src/Visual_DVM_2021/Passes/AbortTestingPackage.java
View File

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
@@ -21,8 +22,8 @@ public abstract class AbortTestingPackage extends TestingSystemPass<TestingPacka
@Override
protected boolean canStart(Object... args) throws Exception {
packageToKill = null;
if (Current_.Check(Log, currentName())) {
target = (TestingPackage) Current_.get(currentName());
if (Global.mainModule.Check(Log, currentName())) {
target = (TestingPackage) Global.mainModule.get(currentName());
switch (target.state) {
case Done:
case Aborted:

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

@@ -29,22 +29,22 @@ public class AddBugReport extends AddObjectPass<BugReport> {
}
@Override
public boolean canStart(Object... args) throws Exception {
if (Current.getAccount().role.equals(AccountRole.Undefined)) {
if (Global.mainModule.getAccount().role.equals(AccountRole.Undefined)) {
Log.Writeln_("Для создания отчёта требуется регистрация");
return false;
}
if (Current.HasProject()) {
String version = Current.getProject().Home.getAbsolutePath().substring(Current.getRoot().Home.getParent().length());
if (Global.mainModule.HasProject()) {
String version = Global.mainModule.getProject().Home.getAbsolutePath().substring(Global.mainModule.getRoot().Home.getParent().length());
if (version.toCharArray()[0] == '\\') version = version.substring(1);
target = new BugReport(Current.getAccount().name, Current.getAccount().email,
target = new BugReport(Global.mainModule.getAccount().name, Global.mainModule.getAccount().email,
"Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'", version);
return true;
} else {
if (UI_.Warning("Создать отчёт об ошибке без прикрепления проекта.")) {
target = new BugReport();
target.genName();
target.sender_name = Current.getAccount().name;
target.sender_address = Current.getAccount().email;
target.sender_name = Global.mainModule.getAccount().name;
target.sender_address = Global.mainModule.getAccount().email;
target.project_version = "";
target.visualiser_version = Global.visualiser.version;
target.sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version;
@@ -62,15 +62,15 @@ public class AddBugReport extends AddObjectPass<BugReport> {
}
@Override
protected void performPreparation() throws Exception {
Current.getSapfor().ResetAllAnalyses();
Global.mainModule.getSapfor().ResetAllAnalyses();
}
@Override
protected void body() throws Exception {
super.body();
if (!target.project_version.isEmpty()) {
Current.getRoot().cleanDepAndGCOVR(); //удаление депов и гкова
Global.mainModule.getRoot().cleanDepAndGCOVR(); //удаление депов и гкова
//логи во вложения.
File attachementsDir = Current.getProject().getAttachmentsDirectory();
File attachementsDir = Global.mainModule.getProject().getAttachmentsDirectory();
Vector<File> logs = new Vector<>();
logs.add(Utils_.MainLog.getLogFile());
logs.add(Paths.get(Global.ComponentsDirectory.getAbsolutePath(), "Sapfor_log.txt").toFile());
@@ -81,7 +81,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
Files.copy(file.toPath(), Paths.get(attachementsDir.getAbsolutePath(), file.getName()), StandardCopyOption.REPLACE_EXISTING);
}
//запаковка рута
passes.get(PassCode.ZipFolderPass).Do(Current.getRoot().Home.getAbsolutePath(), BugReportInterface.getArchiveFile(target).getAbsolutePath());
passes.get(PassCode.ZipFolderPass).Do(Global.mainModule.getRoot().Home.getAbsolutePath(), BugReportInterface.getArchiveFile(target).getAbsolutePath());
}
}
@Override

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.Utils;
@@ -41,7 +42,7 @@ public class AddFile extends ChangeFilePass<DBProjectFile> {
}
if (fileName != null) {
//->
parent_node = Current.getProjectCurrentParentNode();
parent_node = Global.mainModule.getProjectCurrentParentNode();
target_dir = (File) parent_node.getUserObject();
//->
dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile();

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

@@ -20,7 +20,7 @@ public class AddUser extends AddObjectPass<User> {
@Override
protected boolean canStart(Object... args) throws Exception {
if (super.canStart(args)) {
Machine machine = Current.getMachine();
Machine machine = Global.mainModule.getMachine();
if (machine.type.equals(MachineType.Local) && (machine.getUsers().size() > 0)) {
Log.Writeln_("У локальной машины может быть только один пользователь");
return false;

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

@@ -1,5 +1,6 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class AppendBugReportComment extends AppendBugReportField {
@Override
@@ -14,6 +15,6 @@ public class AppendBugReportComment extends AppendBugReportField {
}
@Override
protected boolean canUpdate() {
return Current.getAccount().ExtendedCheckAccessRights(target, Log);
return Global.mainModule.getAccount().ExtendedCheckAccessRights(target, Log);
}
}

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current_;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
@@ -27,12 +28,12 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
return "";
}
protected boolean canUpdate() {
return Current.getAccount().CheckAccessRights(target.sender_address, Log);
return Global.mainModule.getAccount().CheckAccessRights(target.sender_address, Log);
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current_.Check(Log, Current.BugReport)) {
target = Current.getBugReport();
if (Global.mainModule.Check(Log, Current.BugReport)) {
target = Global.mainModule.getBugReport();
if (!BugReportInterface.CheckNotDraft(target,Log))
return false;
fieldName = (String) args[0];
@@ -51,7 +52,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
target.SynchronizeFields((BugReport) response.object);
oldValue = (String) BugReport.class.getField(fieldName).get(target);
newValue = oldValue + "\n" + Utils_.Brackets(Utils_.print_date(
new Date())) + " " + Current.getAccount().name
new Date())) + " " + Global.mainModule.getAccount().name
+ " : " + addition;
//2. дописываем нужное поле.
BugReport.class.getField(fieldName).set(target, newValue);
@@ -85,7 +86,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
}
passes.get(PassCode.Email).Do(
new EmailMessage(
message_header + " " + Utils_.Brackets(Current.getAccount().name),
message_header + " " + Utils_.Brackets(Global.mainModule.getAccount().name),
message_text,
BugReportInterface.getRecipients(target)
)

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Repository.BugReport.BugReport;
import Visual_DVM_2021.Passes.PassCode;
@@ -22,8 +23,8 @@ public class ApplyBugReportSettings extends Pass<BugReport> {
}
@Override
protected boolean canStart(Object... args) {
if (Current_.Check(Log, Current.BugReport)) {
target = Current.getBugReport();
if (Global.mainModule.Check(Log, Current.BugReport)) {
target = Global.mainModule.getBugReport();
long vv = target.visualiser_version;
if (vv < 500) {
Log.Writeln_("Автоматическое применение настроек поддерживается только в отчётах об ошибках,\n" +

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current_;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
@@ -23,13 +24,13 @@ public class ApplyCurrentFunction extends Pass {
protected boolean canStart(Object... args) throws Exception {
if (passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
ComboTextDialog ff = new ComboTextDialog();
Vector<String> names = new Vector<>(Current.getProject().allFunctions.keySet());
Vector<String> names = new Vector<>(Global.mainModule.getProject().allFunctions.keySet());
names.sort(Comparator.naturalOrder());
if (ff.ShowDialog("Выберите имя текущей процедуры", names)) {
String func_name = ff.Result;
if (Current.getProject().allFunctions.containsKey(func_name)) {
FuncInfo fi = Current.getProject().allFunctions.get(func_name);
Current_.set(Current.Function, fi);
if (Global.mainModule.getProject().allFunctions.containsKey(func_name)) {
FuncInfo fi = Global.mainModule.getProject().allFunctions.get(func_name);
Global.mainModule.set(Current.Function, fi);
return true;
} else {
Log.Writeln_("Проект не содержит процедуры с именем " + Utils_.Brackets(func_name));

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

@@ -25,8 +25,8 @@ public class ApplyProfile extends Pass<SapforProfile> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current_.Check(Log, Current.SapforProfile)) {
target = (SapforProfile) Current_.get(Current.SapforProfile);
if (Global.mainModule.Check(Log, Current.SapforProfile)) {
target = (SapforProfile) Global.mainModule.get(Current.SapforProfile);
return true;
}
return false;

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

@@ -1,5 +1,6 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.Repository.Component.Component;
import Visual_DVM_2021.Passes.PassCode;
@@ -19,7 +20,7 @@ public class BuildComponent extends ProcessPass<Component> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = Current.getComponent();
target = Global.mainModule.getComponent();
return true;
}
@Override

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

@@ -1,5 +1,6 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
@@ -46,7 +47,7 @@ public class CheckAccount extends Pass<Boolean> {
//временно. оффлайн проверка по почте
target = Current.getAccount().email.equals("?") ?
target = Global.mainModule.getAccount().email.equals("?") ?
(Pass.passes.get(PassCode.EditAccount).Do() &&
Pass.passes.get(PassCode.CheckRegistrationOnServer).Do()) :
(Pass.passes.get(PassCode.CheckRegistrationOnServer).Do());
@@ -59,10 +60,10 @@ public class CheckAccount extends Pass<Boolean> {
protected void showDone() throws Exception {
if (UI.getMainWindow() != null) {
UI.getMainWindow().getCallbackWindow().ShowAccount();
if (Current.HasBugReport())
if (Global.mainModule.HasBugReport())
UI.getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
if (Current.getAccount().isAdmin())
if (Global.mainModule.getAccount().isAdmin())
Pass.passes.get(PassCode.PublishComponent).setControlsVisible(true);
setControlsVisible(false); //если проверка успешна, кнопку больше не показывать.
}

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

@@ -1,5 +1,6 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.Subscribes.Subscriber;
@@ -7,8 +8,8 @@ import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
public class CheckRegistrationOnServer extends ComponentsRepositoryPass<Subscriber> {
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.CheckSubscriberRole, "", Current.getAccount()));
Command(new ServerExchangeUnit_2021(ServerCode.CheckSubscriberRole, "", Global.mainModule.getAccount()));
target = (Subscriber) response.object;
Current.getAccount().role = target.role;
Global.mainModule.getAccount().role = target.role;
}
}

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

@@ -1,5 +1,6 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
@@ -8,13 +9,13 @@ public class CheckRemoteWorkspace extends ComponentsRepositoryPass<SubscriberWor
@Override
protected boolean canStart(Object... args) throws Exception {
target=null;
return Current.getAccount().CheckRegistered(Log);
return Global.mainModule.getAccount().CheckRegistered(Log);
}
@Override
protected void ServerAction() throws Exception {
String email = Current.getAccount().email;
String machineURL = Current.getMachine().getURL();
String login = Current.getUser().login;
String email = Global.mainModule.getAccount().email;
String machineURL = Global.mainModule.getMachine().getURL();
String login = Global.mainModule.getUser().login;
Command(new ServerExchangeUnit_2021(ServerCode.CheckURLRegistered,
email+"\n"+machineURL+"\n"+login));
target = (SubscriberWorkspace) response.object;

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

@@ -1,15 +1,16 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.CurrentProjectPass;
public class CleanAnalyses extends CurrentProjectPass {
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart(args) && (Current.getSapfor() != null);
return super.canStart(args) && (Global.mainModule.getSapfor() != null);
}
@Override
protected void body() throws Exception {
Current.getSapfor().ResetAllAnalyses();
Global.mainModule.getSapfor().ResetAllAnalyses();
target.CleanAnalyses();
target.CreateParserOptionsDirs();
target.ClearGCOV();
@@ -20,10 +21,10 @@ public class CleanAnalyses extends CurrentProjectPass {
UI.getMainWindow().getProjectWindow().RefreshProjectFiles();
UI.getMainWindow().getProjectWindow().ShowNoAnalyses();
UI.getMainWindow().getProjectWindow().ShowProjectSapforLog();
if (Current.HasFile()) {
Current.getFile().form.ShowNoMessages();
Current.getFile().form.ShowNoAnalyses();
Current.getFile().form.ShowNoGCOVLog();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowNoMessages();
Global.mainModule.getFile().form.ShowNoAnalyses();
Global.mainModule.getFile().form.ShowNoGCOVLog();
}
}
}

224
src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
View File

@@ -1,224 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.CommonConstants;
import Common.Current_;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Database.Database;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.GlobalData.User.UserState;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage_json;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import Common.Passes.AddObjectPass;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.util.Vector;
public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
Vector<DVMPackage> srcPackages;
Vector<String> inexistingTests;
Vector<String> inexistingConfigurations;
//-
Vector<Integer> src_ids;
Vector<DVMPackage_json> src_jsons;
//-
public CloneDVMPackage() {
super(DVMPackage.class);
}
@Override
public String getIconPath() {
return "/icons/MultiFiles.png";
}
@Override
protected Database getDb() {
return Global.testingServer.db;
}
protected void createTarget() {
target = new DVMPackage();
target.id = CommonConstants.Nan;
//-
target.sender_name = Current.getAccount().name;
target.sender_address = Current.getAccount().email;
//-
target.machine_name = Current.getMachine().name;
target.machine_address = Current.getMachine().address;
target.machine_port = Current.getMachine().port;
//-
target.user_name = Current.getUser().login;
target.user_password = Current.getUser().password;
target.user_workspace = Current.getUser().workspace;
//--
target.drv = Current.getCompiler().call_command;
target.version = Current.getCompiler().getVersionInfo();
//--
target.kernels = 1; //Global.properties.TestingKernels;
target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
//--
target.tasksCount = 0;
//--
target.package_json = new DVMPackage_json();
}
protected void CloneTasks(DVMPackage_json src_json, DVMPackage_json dst_json) throws Exception {
for (DVMCompilationTask src_compilationTask : src_json.compilationTasks) {
if (Global.testingServer.db.tests.containsKey(src_compilationTask.test_id)
) {
Group group = Global.testingServer.db.groups.get(src_compilationTask.group_id);
Test test = Global.testingServer.db.tests.get(src_compilationTask.test_id);
//--
DVMCompilationTask compilationTask = new DVMCompilationTask();
//--
compilationTask.group_id = group.id;
compilationTask.group_description = group.description;
compilationTask.language = src_compilationTask.language;
//--
compilationTask.test_id = test.id;
compilationTask.test_description = test.description;
compilationTask.test_type = group.type;
//--
compilationTask.maxtime = src_compilationTask.maxtime;
//--
compilationTask.flags = src_compilationTask.flags;
compilationTask.kernels = 1;
//---
for (DVMRunTask src_runTask : src_compilationTask.runTasks) {
DVMRunTask runTask = new DVMRunTask();
//--
runTask.group_id = group.id;
runTask.group_description = group.description;
runTask.language = src_runTask.language;
//--
runTask.test_id = test.id;
runTask.test_description = test.description;
runTask.test_type = group.type;
//--
runTask.compilation_maxtime = src_runTask.compilation_maxtime;
runTask.compilation_state = TaskState.Waiting;
runTask.maxtime = src_runTask.maxtime;
//--
runTask.cube = src_runTask.cube;
runTask.min_dim = src_runTask.min_dim;
runTask.max_dim = src_runTask.max_dim;
runTask.matrix = src_runTask.matrix;
runTask.environments = src_runTask.environments;
runTask.usr_par = src_runTask.usr_par;
runTask.args = test.args;
//--
runTask.flags = src_runTask.flags;
runTask.kernels = (group.type == TestType.Performance) ? target.kernels :
Math.min(Utils.getMatrixProcessors(src_runTask.matrix), target.kernels);
compilationTask.runTasks.add(runTask);
}
//--
dst_json.compilationTasks.add(compilationTask);
//-
} else {
inexistingTests.add(String.valueOf(src_compilationTask.test_id));
}
}
}
@Override
protected boolean canStart(Object... args) throws Exception {
srcPackages = new Vector<>();
if (!Current.getAccount().CheckRegistered(Log))
return false;
//----
srcPackages = Global.testingServer.db.dvmPackages.getCheckedOrCurrent();
if (srcPackages.isEmpty()){
Log.Writeln_("Не отмечено или не выбрано ни одного пакета DVM");
return false;
}
//-
if (!Current_.Check(Log, Current.Machine, Current.User, Current.Compiler))
return false;
//---
if (!Current.getMachine().type.equals(MachineType.Server)) {
Log.Writeln_("Тестирование поддерживается только на одиночном удалённом сервере.");
return false;
}
if (!Current.getUser().state.equals(UserState.ready_to_work)) {
Log.Writeln_("Пользователь не готов к работе. Выполните инициализацию пользователя!");
return false;
}
if (!Current.getCompiler().type.equals(CompilerType.dvm)) {
Log.Writeln_("Тестирование поддерживается только для DVM компиляторов.");
return false;
}
if (!Current.getCompiler().versionLoaded)
passes.get(PassCode.ShowCompilerVersion).Do(Current.getCompiler(), false);
//-
for (DVMPackage dvmPackage : Global.testingServer.db.dvmPackages.Data.values()) {
if (dvmPackage.state.equals(TasksPackageState.Draft)) {
Log.Writeln_("Может существовать только один пакет, готовящийся к публикации.");
return false;
}
}
//--
src_ids = new Vector<>();
src_jsons = new Vector<>();
for (DVMPackage src : srcPackages) {
if (src.state.equals(TasksPackageState.Draft)) {
Log.Writeln_("Пакет " + Utils_.Brackets(src.id) + " является черновиком.");
return false;
}
src_ids.add(src.id);
}
//--
TestingSystemPass getJsonsPass = new TestingSystemPass() {
@Override
public String getDescription() {
return "Получить информацию о задачах исходных пакетов";
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.GetDVMPackagesJson, null, src_ids));
src_jsons.addAll((Vector<DVMPackage_json>) response.object);
}
};
if (!getJsonsPass.Do())
return false;
//--
createTarget();
//--
inexistingTests = new Vector<>();
inexistingConfigurations = new Vector<>(); //не нужно.
//--
for (DVMPackage_json srcJson: src_jsons){
CloneTasks(srcJson, target.package_json);
}
///-
//инициализируем идентификаторы задач.
for (DVMCompilationTask compilationTask : target.package_json.compilationTasks) {
//--
compilationTask.id = target.package_json.getMaxTaskId();
//-
for (DVMRunTask runTask : compilationTask.runTasks) {
runTask.id = target.package_json.getMaxTaskId();
runTask.dvmcompilationtask_id = compilationTask.id;
target.tasksCount++;
}
}
return inexistingTests.isEmpty() || UI_.Question(inexistingTests.size() + " тестов отсутствует. Продолжить");
}
@Override
protected void body() throws Exception {
//черновик не вставляется в бд. идет только как элемент списка.
Global.testingServer.db.dvmPackages.Data.put(target.id, target);
}
@Override
protected void showDone() throws Exception {
super.showDone();
Global.testingServer.db.dvmRunTasks.ShowDVMPackage(target);
}
}

187
src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
View File

@@ -1,187 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.CommonConstants;
import Common.Current_;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Database.Database;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforConfiguration_json;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforPackage_json;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforTest_json;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforTestingSet_json;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import Common.Passes.AddObjectPass;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.util.Vector;
public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
Vector<SapforPackage> srcPackages;
//--
Vector<String> inexistingTests;
Vector<String> inexistingConfigurations;
//--
public CloneSapforPackage() {
super(SapforPackage.class);
}
protected SapforTestingSet_json cloneTestingSet(SapforTestingSet_json src) {
SapforTestingSet_json dst = new SapforTestingSet_json();
dst.id = target.package_json.getMaxSetId();
//--
for (SapforTest_json src_TestJson : src.tests) {
if (Global.testingServer.db.tests.containsKey(src_TestJson.id)) {
Test test = Global.testingServer.db.tests.get(src_TestJson.id);
SapforTest_json testJson = new SapforTest_json();
//--
testJson.id = test.id;
testJson.description = test.description;
testJson.group_description = src_TestJson.group_description;
//--
dst.tests.add(testJson);
//--
} else {
inexistingTests.add(String.valueOf(src_TestJson.id));
}
}
//--
for (SapforConfiguration_json src_configuration : src.configurations) {
if (Global.testingServer.db.sapforConfigurations.containsKey(src_configuration.id)) {
SapforConfiguration configuration = Global.testingServer.db.sapforConfigurations.get(src_configuration.id);
SapforConfiguration_json configurationJson = new SapforConfiguration_json();
//--
configurationJson.id = configuration.id;
configurationJson.name = configuration.description;
configurationJson.flags = src_configuration.flags;
configurationJson.codes.addAll(src_configuration.codes);
//--
dst.configurations.add(configurationJson);
} else {
inexistingConfigurations.add(String.valueOf(src_configuration.id));
}
}
return dst;
}
@Override
public String getIconPath() {
return "/icons/MultiFiles.png";
}
@Override
protected Database getDb() {
return Global.testingServer.db;
}
@Override
protected boolean canStart(Object... args) throws Exception {
srcPackages = new Vector<>();
if (!Current.getAccount().CheckRegistered(Log))
return false;
//--
if (!Current_.Check(Log, Current.ServerSapfor))
return false;
if (!Current.getServerSapfor().state.equals(ServerSapforState.Done)) {
Log.Writeln_("Выбранная версия SAPFOR не собрана!");
return false;
}
//--
srcPackages = Global.testingServer.db.sapforPackages.getCheckedOrCurrent();
if (srcPackages.isEmpty()) {
Log.Writeln_("Не отмечено или не выбрано ни одного пакета SAPFOR");
return false;
}
// todo изменить чтобы можно было.
for (SapforPackage sapforPackage : Global.testingServer.db.sapforPackages.Data.values()) {
if (sapforPackage.state.equals(TasksPackageState.Draft)) {
Log.Writeln_("Может существовать только один пакет, готовящийся к публикации.");
return false;
}
}
//--
Vector<Integer> src_ids = new Vector<>();
Vector<SapforPackage_json> src_jsons = new Vector<>();
for (SapforPackage src : srcPackages) {
if (src.state.equals(TasksPackageState.Draft)) {
Log.Writeln_("Пакет " + Utils_.Brackets(src.id) + " является черновиком.");
return false;
}
src_ids.add(src.id);
}
TestingSystemPass getJsonsPass = new TestingSystemPass() {
@Override
public String getDescription() {
return "Получить информацию о задачах исходных пакетов";
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.GetSapforPackagesJson, null, src_ids));
src_jsons.addAll((Vector<SapforPackage_json>) response.object);
}
};
if (!getJsonsPass.Do())
return false;
//--
inexistingTests = new Vector<>();
inexistingConfigurations = new Vector<>();
//--
target = new SapforPackage();
target.id = CommonConstants.Nan;
//-
target.sender_name = Current.getAccount().name;
target.sender_address = Current.getAccount().email;
//-
target.drv = Current.getServerSapfor().call_command;
target.version = Current.getServerSapfor().version;
target.kernels = 1; //Global.properties.TestingKernels;
target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
//--
target.sapforId = Current.getServerSapfor().id;
//--
target.kernels =1; // Global.properties.TestingKernels;
target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
//--
target.package_json = new SapforPackage_json();
///-------------------------------
target.package_json.kernels = target.kernels;
target.package_json.sapfor_drv = target.drv;
//--
//- заполнение testing_set
/*
for (SapforPackage_json srcPackage : src_jsons) {
//--
for (SapforTestingSet_json src : srcPackage.testingSets) {
SapforTestingSet_json dst = cloneTestingSet(src);
//--
Vector<SapforTask> new_tasks = target.getActualTestingSetTasks(dst);
if (!new_tasks.isEmpty()) {
target.package_json.testingSets.add(dst);
target.package_json.tasks.addAll(new_tasks);
} PerformAutoSapforTesting
}
}
*/
for (SapforTask task : target.package_json.tasks) {
task.id = target.package_json.getMaxTaskId();
}
target.tasksCount = target.package_json.tasks.size();
/*
target.testsNames = String.join(";", target.package_json.getTestsNames());
target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames());
*/
//--
return inexistingTests.isEmpty() && inexistingConfigurations.isEmpty() ||
UI_.Question(
(inexistingTests.isEmpty() ? "" : (inexistingTests.size() + " тестов отсутствует;")) +
(inexistingConfigurations.isEmpty() ? "" : (inexistingConfigurations.size() + " конфигураций отсутствует;")) +
"Будет добавлено " + target.package_json.tasks.size() + " задач. Продолжить"
);
}
@Override
protected void body() throws Exception {
Global.testingServer.db.sapforPackages.Data.put(target.id, target);
}
}

21
src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
View File

@@ -1,11 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Visual_DVM_2021.Passes.PassCode;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class CloseCurrentFile extends Pass<DBProjectFile> {
@@ -23,7 +22,7 @@ public class CloseCurrentFile extends Pass<DBProjectFile> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return (target = Current.getFile()) != null;
return (target = Global.mainModule.getFile()) != null;
}
@Override
protected void body() throws Exception {
@@ -36,13 +35,7 @@ public class CloseCurrentFile extends Pass<DBProjectFile> {
}
@Override
protected void performDone() throws Exception {
Current_.set(Current.File, null);
Current_.set(Current.FileGraphElement, null);
//-
Current_.set(Current.Notes, null);
Current_.set(Current.Warnings, null);
Current_.set(Current.Errors, null);
//-
Global.mainModule.DropCurrentFile();
}
@Override
protected void showDone() throws Exception {

19
src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
View File

@@ -24,7 +24,7 @@ public class CloseCurrentProject extends Pass<db_project_info> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return (target = Current.getProject()) != null;
return (target = Global.mainModule.getProject()) != null;
}
@Override
protected void performPreparation() throws Exception {
@@ -39,20 +39,9 @@ public class CloseCurrentProject extends Pass<db_project_info> {
protected void performDone() throws Exception {
Global.files_multiselection = false;
//--
Current.getSapfor().ResetAllAnalyses();
Current.getSapfor().cd(Utils_.getHomeDirectory());
Current_.set(Current.Project, null);
Current_.set(Current.File, null);
Current_.set(Current.Function, null);
Current_.set(Current.SelectedFunction,null);
Current_.set(Current.ProjectNode, null);
Current_.set(Current.SelectedFile, null);
Current_.set(Current.SelectedDirectory, null);
//-мб перестраховка. мб и нет.
Current_.set(Current.ParallelVariant, null);
Current_.set(Current.Dimensions, null);
Current_.set(Current.Array, null);
Current_.set(Current.DBArray, null);
Global.mainModule.getSapfor().ResetAllAnalyses();
Global.mainModule.getSapfor().cd(Utils_.getHomeDirectory());
Global.mainModule.DropCurrentProject();
//-
}
@Override

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

@@ -2,12 +2,13 @@ package Visual_DVM_2021.Passes.All;
import Common.Current_;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.db_project_info;
import Common.Passes.Pass;
public class CloseProject extends Pass<db_project_info> {
@Override
protected boolean canStart(Object... args) throws Exception {
return (target = Current.getProject()) != null;
return (target = Global.mainModule.getProject()) != null;
}
@Override
protected void body() throws Exception {
@@ -15,9 +16,9 @@ public class CloseProject extends Pass<db_project_info> {
}
@Override
protected void performDone() throws Exception {
Current.getSapfor().ResetAllAnalyses();
Current.getSapfor().cd(Utils_.getHomeDirectory());
Current_.set(Current.Project, null);
Global.mainModule.getSapfor().ResetAllAnalyses();
Global.mainModule.getSapfor().cd(Utils_.getHomeDirectory());
Global.mainModule.set(Current.Project, null);
//-
}
}

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

@@ -39,8 +39,8 @@ public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
master = target.get(0);
slave = null;
return UI_.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));
} else if ((target.size() == 0) && (Current.HasDVMRunTask())) {
master = Current.getDVMRunTask();
} else if ((target.size() == 0) && (Global.mainModule.HasDVMRunTask())) {
master = Global.mainModule.getDVMRunTask();
slave = null;
return UI_.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));
} else {

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

@@ -39,8 +39,8 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
master = target.get(0);
slave = null;
return UI_.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));
} else if ((target.size() == 0) && (Current.HasSapforPackage())) {
master = Current.getSapforPackage();
} else if ((target.size() == 0) && (Global.mainModule.HasSapforPackage())) {
master =Global.mainModule.getSapforPackage();
slave = null;
return UI_.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));
} else {

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

@@ -19,7 +19,7 @@ public class Compile extends Pass<db_project_info> {
CompilationTask compilationTask = null;
@Override
protected PassCode necessary() {
return Current.getProject().languageName.equals(LanguageName.fortran) ? PassCode.SPF_ParseFilesWithOrder : null;
return Global.mainModule.getProject().languageName.equals(LanguageName.fortran) ? PassCode.SPF_ParseFilesWithOrder : null;
}
@Override
public String getIconPath() {
@@ -31,15 +31,15 @@ public class Compile extends Pass<db_project_info> {
}
@Override
protected boolean canStart(Object... args) {
if (Current_.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile)) {
target = Current.getProject();
if (Global.mainModule.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile)) {
target = Global.mainModule.getProject();
subpass = null;
compilationTask = null;
if (Current.getUser().state != UserState.ready_to_work)
Log.Writeln_("Пользователь " + Utils_.Brackets(Current.getUser().login) +
if (Global.mainModule.getUser().state != UserState.ready_to_work)
Log.Writeln_("Пользователь " + Utils_.Brackets(Global.mainModule.getUser().login) +
" не проинициализирован\nПерейдите на вкладку 'Настройки компиляции и запуска',\n" +
" и выполните команду 'Инициализация пользователя'\n");
Current.getMakefile().Validate(Log);
Global.mainModule.getMakefile().Validate(Log);
return Log.isEmpty();
}
return false;
@@ -47,9 +47,9 @@ public class Compile extends Pass<db_project_info> {
@Override
protected void performPreparation() throws Exception {
compilationTask = new CompilationTask();
compilationTask.machine_id = Current.getMachine().id;
compilationTask.user_id = Current.getUser().id;
compilationTask.makefile_id = Current.getMakefile().id;
compilationTask.machine_id = Global.mainModule.getMachine().id;
compilationTask.user_id = Global.mainModule.getUser().id;
compilationTask.makefile_id = Global.mainModule.getMakefile().id;
compilationTask.project_path = target.Home.getAbsolutePath();
compilationTask.project_description = target.description;
//------------------------------------------
@@ -65,7 +65,7 @@ public class Compile extends Pass<db_project_info> {
@Override
protected void body() throws Exception {
switch (Current.getMachine().type) {
switch (Global.mainModule.getMachine().type) {
case Local:
if (Utils_.isWindows()) {
subpass = passes.get(PassCode.WindowsLocalCompilation);
@@ -74,12 +74,12 @@ public class Compile extends Pass<db_project_info> {
break;
case Undefined:
case MVS_cluster:
throw new PassException("Компиляция не реализована для типа машины " + Utils_.DQuotes(Current.getMachine().type));
throw new PassException("Компиляция не реализована для типа машины " + Utils_.DQuotes(Global.mainModule.getMachine().type));
default:
subpass = passes.get(PassCode.RemoteCompilation);
break;
}
subpass.Do(Current.getCompilationTask(), Current.getProject());
subpass.Do(Global.mainModule.getCompilationTask(), Global.mainModule.getProject());
}
@Override
protected boolean validate() {

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -24,11 +25,11 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Current.getAccount().isAdmin()) {
if (!Global.mainModule.getAccount().isAdmin()) {
Log.Writeln_("Вы не являетесь администратором");
return false;
}
if (!Current_.Check(Log, Current.ServerSapfor)){
if (!Global.mainModule.Check(Log, Current.ServerSapfor)){
return false;
}
return UI_.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");
@@ -40,8 +41,8 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode.CloseCurrentProject);
Current_.set(Current.Root, null);
Current_.set(Current.Version, null);
Global.mainModule.set(Current.Root, null);
Global.mainModule.set(Current.Version, null);
}
@Override
protected void showPreparation() throws Exception {
@@ -49,7 +50,8 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.RefreshDVMTests, String.valueOf(Current.getServerSapfor().id), Current.getAccount()));
Command(new ServerExchangeUnit_2021(ServerCode.RefreshDVMTests,
String.valueOf(Global.mainModule.getServerSapfor().id), Global.mainModule.getAccount()));
}
@Override
protected void performFinish() throws Exception {

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.Text.FileNameForm;
import Visual_DVM_2021.Passes.ChangeFilePass;
@@ -17,7 +18,7 @@ public class CreateEmptyDirectory extends ChangeFilePass {
if ((ff = new FileNameForm()).ShowDialog("Введите имя создаваемой папки")) {
fileName = ff.Result;
//->
parent_node = Current.getProjectCurrentParentNode();
parent_node = Global.mainModule.getProjectCurrentParentNode();
target_dir = (File) parent_node.getUserObject();
//->
dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile();

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

@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode;
@@ -59,7 +60,7 @@ public class CreateGroupFromDirectory extends PublishTests {
return false;
}
if (passes.get(PassCode.PublishGroup).Do(dir.getName().toUpperCase())) {
group = Current.getGroup();
group = Global.mainModule.getGroup();
} else return false;
//---------------
Vector<File> files = new Vector<>(Arrays.asList(files_));

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

@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.TestingSystem.Common.Group.Group;
@@ -45,7 +46,7 @@ public class CreateGroupFromFiles extends PublishTests{
return false;
}
if (passes.get(PassCode.PublishGroup).Do(dir.getName().toUpperCase())) {
group = Current.getGroup();
group = Global.mainModule.getGroup();
} else return false;
//--
return super.canStart(files, group);

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

@@ -4,6 +4,7 @@ import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.Files.ProjectFile;
@@ -59,8 +60,8 @@ public class CreateTestFromDirectory extends Pass<Test> {
Vector<ProjectFile> project_files = new Vector<>();
protected boolean initTarget() throws Exception {
target = new Test();
target.sender_address = Current.getAccount().email;
target.sender_name = Current.getAccount().name;
target.sender_address = Global.mainModule.getAccount().email;
target.sender_name = Global.mainModule.getAccount().name;
target.group_id = group.id;
target.description = dir.getName();
return true;
@@ -71,9 +72,9 @@ public class CreateTestFromDirectory extends Pass<Test> {
if (args.length == 0) {
//--
from_files_chooser = true;
if (!Current_.Check(Log, Current.Group))
if (!Global.mainModule.Check(Log, Current.Group))
return false;
group = Current.getGroup();
group = Global.mainModule.getGroup();
if (!selectFiles())
return false;
//-
@@ -203,7 +204,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
//-- получить размерность консольным сапфором. папка уже отправлена и чистить ее не нужно!!
ShowMessage2("Синтаксический анализ и определение размерности");
if (group.language == LanguageName.fortran) {//если не определит, будут нули.
Sapfor.getMinMaxDim(Sapfor.getTempCopy(Current.getSapfor().getFile()), tempProject, target);
Sapfor.getMinMaxDim(Sapfor.getTempCopy(Global.mainModule.getSapfor().getFile()), tempProject, target);
}
}
@Override

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.ProjectFile;
@@ -51,8 +52,8 @@ public class CreateTestFromFile extends Pass<Test> {
}
//--
target = new Test();
target.sender_address = Current.getAccount().email;
target.sender_name = Current.getAccount().name;
target.sender_address = Global.mainModule.getAccount().email;
target.sender_name = Global.mainModule.getAccount().name;
target.group_id = group.id;
target.description = Utils_.getNameWithoutExtension(file_in.getName());
target.files = file_in.getName();
@@ -84,6 +85,6 @@ public class CreateTestFromFile extends Pass<Test> {
File tempProject = packTestCode();
ShowMessage2("Синтаксический анализ и определение размерности");
if (group.language == LanguageName.fortran)
Sapfor.getMinMaxDim(Sapfor.getTempCopy(Current.getSapfor().getFile()), tempProject, target);
Sapfor.getMinMaxDim(Sapfor.getTempCopy(Global.mainModule.getSapfor().getFile()), tempProject, target);
}
}

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.Project.db_project_info;
@@ -15,9 +16,9 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
@Override
protected boolean canStart(Object... args) throws Exception {
if (args.length == 0) {
if (Current_.Check(Log, Current.Group, Current.Project)) {
project = Current.getProject();
if (super.canStart(Current.getProject().Home, Current.getGroup())){
if (Global.mainModule.Check(Log, Current.Group, Current.Project)) {
project = Global.mainModule.getProject();
if (super.canStart(Global.mainModule.getProject().Home, Global.mainModule.getGroup())){
from_files_chooser = true; //чтобы опубликовал.
return true;
}
@@ -26,7 +27,7 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
project = (db_project_info) args[0];
group = (Group) args[1];
//если проект не текущий, освежить его бд.
if (!Current.HasProject() || !Current.getProject().Home.equals(project.Home)) {
if (!Global.mainModule.HasProject() || !Global.mainModule.getProject().Home.equals(project.Home)) {
project.Open();
project.Close();
}

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode;
@@ -21,7 +22,7 @@ public class CreateTestsFromFiles extends PublishTests {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current_.Check(Log, Current.Group)){
if (Global.mainModule.Check(Log, Current.Group)){
Utils.RestoreSelectedDirectory(fileChooser);
Vector<File> files = fileChooser.ShowMultiDialog();
if (files.isEmpty()){
@@ -29,7 +30,7 @@ public class CreateTestsFromFiles extends PublishTests {
return false;
}
Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, fileChooser.getCurrentDirectory());
return super.canStart(files, Current.getGroup());
return super.canStart(files, Global.mainModule.getGroup());
}
return false;
}

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

@@ -3,6 +3,7 @@ import Common.Current_;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode;
@@ -22,13 +23,13 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
//---
if (Current_.Check(Log, Current.Group)) {
group = Current.getGroup();
if (Global.mainModule.Check(Log, Current.Group)) {
group = Global.mainModule.getGroup();
} else
return false;
//---------------------
Vector<db_project_info> versions = new Vector<>();
Current.getRoot().getSelectedVersions(versions);
Global.mainModule.getRoot().getSelectedVersions(versions);
if (versions.isEmpty()) {
Log.Writeln_("Не отмечено ни одной версии.");
return false;

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

@@ -42,8 +42,8 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
version = null;
badFiles = "";
//--
if (Current_.Check(Log, Current.Project)) {
target = Current.getProject();
if (Global.mainModule.Check(Log, Current.Project)) {
target = Global.mainModule.getProject();
programsToConvert = target.getPrograms().get(target.languageName);
programsNames = new Vector<>();
if (programsToConvert.size() > 100) {
@@ -136,10 +136,10 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
@Override
protected void showFinish() throws Exception {
UI.getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages();
if (Current.HasFile()) {
Current.getFile().form.ShowCompilationOutput();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowCompilationOutput();
if (!output.isEmpty())
Current.getFile().form.FocusCompilationOut();
Global.mainModule.getFile().form.FocusCompilationOut();
}
if (!badFiles.isEmpty())
UI_.Error(badFiles);

2
src/Visual_DVM_2021/Passes/All/DeleteBugReport.java
View File

@@ -11,7 +11,7 @@ public class DeleteBugReport extends DeleteObjectPass<BugReport> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart(args) && Current.getAccount().CheckAccessRights(target.sender_address, Log);
return super.canStart(args) && Global.mainModule.getAccount().CheckAccessRights(target.sender_address, Log);
}
@Override
protected void performDone() throws Exception {

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

@@ -3,6 +3,7 @@ import Common.Current_;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -21,9 +22,9 @@ public class DeleteDirectory extends ChangeFilePass {
@Override
protected boolean canStart(Object... args) {
resetArgs();
dst_node = Current.getProjectNode();
dst_node = Global.mainModule.getProjectNode();
if ((dst_node != null) && (dst_node.getUserObject() instanceof File)) {
target_dir = Current.getSelectedDirectory();
target_dir = Global.mainModule.getSelectedDirectory();
if (target_dir.equals(project.Home)) {
Log.Writeln("Нельзя удалять домашнюю папку проекта.");
return false;
@@ -35,7 +36,7 @@ public class DeleteDirectory extends ChangeFilePass {
}
@Override
protected void performPreparation() throws Exception {
if (Current.HasFile() && (Utils.isAnchestor(Current.getFile().file, target_dir)))
if (Global.mainModule.HasFile() && (Utils.isAnchestor(Global.mainModule.getFile().file, target_dir)))
passes.get(PassCode.CloseCurrentFile).Do();
}
@Override
@@ -56,7 +57,7 @@ public class DeleteDirectory extends ChangeFilePass {
}
@Override
protected void performDone() throws Exception {
Current_.set(Current.SelectedDirectory, null);
Current_.set(Current.ProjectNode, null);
Global.mainModule.set(Current.SelectedDirectory, null);
Global.mainModule.set(Current.ProjectNode, null);
}
}

2
src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
View File

@@ -58,7 +58,7 @@ public class DeleteDownloadedBugReports extends Pass<DirInfosDataSet> {
}
@Override
protected void performPreparation() throws Exception {
if (Current.HasProject())
if (Global.mainModule.HasProject())
passes.get(PassCode.CloseCurrentProject).Do();
}
@Override

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

@@ -3,6 +3,7 @@ import Common.Current_;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -16,13 +17,13 @@ public class DeleteFile extends ChangeFilePass<DBProjectFile> {
@Override
protected boolean canStart(Object... args) {
resetArgs();
return (Current_.Check(Log, Current.SelectedFile)) &&
return (Global.mainModule.Check(Log, Current.SelectedFile)) &&
UI_.Warning("Удалить файл "
+ Utils_.Brackets((target = Current.getSelectedFile()).name));
+ Utils_.Brackets((target = Global.mainModule.getSelectedFile()).name));
}
@Override
protected void performPreparation() throws Exception {
if (Current.HasFile() && (Current.getFile().file.equals(target.file)))
if (Global.mainModule.HasFile() && (Global.mainModule.getFile().file.equals(target.file)))
passes.get(PassCode.CloseCurrentFile).Do();
}
@Override
@@ -33,7 +34,7 @@ public class DeleteFile extends ChangeFilePass<DBProjectFile> {
}
@Override
protected void performDone() throws Exception {
Current_.set(Current.SelectedFile, null);
Current_.set(Current.ProjectNode, null);
Global.mainModule.set(Current.SelectedFile, null);
Global.mainModule.set(Current.ProjectNode, null);
}
}

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
@@ -9,8 +10,8 @@ import java.util.Vector;
public class DeleteLonelyM extends Pass<db_project_info> {
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current_.Check(Log, Current.Root)) {
target = Current.getRoot();
if (Global.mainModule.Check(Log, Current.Root)) {
target = Global.mainModule.getRoot();
return true;
}
return false;

21
src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
View File

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -14,29 +15,29 @@ public class DeleteSelectedFiles extends Pass {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.getProject().db.files.getCheckedCount() == 0) {
if (Global.mainModule.getProject().db.files.getCheckedCount() == 0) {
Log.Writeln_("Не отмечено ни одного файла.");
return false;
}
return UI_.Warning("Удалить " + Current.getProject().db.files.getCheckedCount() + " файлов.");
return UI_.Warning("Удалить " + Global.mainModule.getProject().db.files.getCheckedCount() + " файлов.");
}
@Override
protected void performPreparation() throws Exception {
boolean hasCurrent = false;
boolean hasSelected = false;
if (Current.HasFile()) {
for (DBProjectFile file : Current.getProject().db.files.getCheckedItems()) {
if (Current.getFile().file.equals(file.file))
if (Global.mainModule.HasFile()) {
for (DBProjectFile file :Global.mainModule.getProject().db.files.getCheckedItems()) {
if (Global.mainModule.getFile().file.equals(file.file))
hasCurrent = true;
if (Current.getSelectedFile().file.equals(file.file))
if (Global.mainModule.getSelectedFile().file.equals(file.file))
hasSelected = true;
}
}
if (hasCurrent)
passes.get(PassCode.CloseCurrentFile).Do();
if (hasSelected) {
Current_.set(Current.SelectedFile, null);
Current_.set(Current.ProjectNode, null);
Global.mainModule.set(Current.SelectedFile, null);
Global.mainModule.set(Current.ProjectNode, null);
}
}
@Override
@@ -45,10 +46,10 @@ public class DeleteSelectedFiles extends Pass {
}
@Override
protected void body() throws Exception {
for (DBProjectFile file : Current.getProject().db.files.getCheckedItems()) {
for (DBProjectFile file : Global.mainModule.getProject().db.files.getCheckedItems()) {
ShowMessage1(file.name);
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RemoveNode(file.node);
Current.getProject().db.Delete(file);
Global.mainModule.getProject().db.Delete(file);
Utils.forceDeleteWithCheck(file.file);
}
}

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

@@ -27,19 +27,19 @@ public class DeleteSelectedVersions extends Pass<Vector<db_project_info>> {
Log.Writeln_("Нажмите правую клавишу мыши, и перейдите в режим выбора версий.");
return false;
}
if (!Current_.Check(Log, Current.Root)) {
if (!Global.mainModule.Check(Log, Current.Root)) {
return false;
}
Vector<db_project_info> allVersions = new Vector<>();
Current.getRoot().getSelectedVersions(allVersions);
Global.mainModule.getRoot().getSelectedVersions(allVersions);
if (allVersions.size() == 0) {
Log.Writeln_("Не отмечено ни одной версии.");
return false;
}
int q = Current.getRoot().getSelectedVersionsForDeletion(target);
if (Current.HasProject()) {
int q = Global.mainModule.getRoot().getSelectedVersionsForDeletion(target);
if (Global.mainModule.HasProject()) {
for (db_project_info version : target) {
if (Current.getProject().Home.getAbsolutePath().startsWith(version.Home.getAbsolutePath())) {
if (Global.mainModule.getProject().Home.getAbsolutePath().startsWith(version.Home.getAbsolutePath())) {
has_current_project = true;
break;
}

2
src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java
View File

@@ -10,6 +10,6 @@ public class DeleteServerSapfor extends DeleteServerObject<TestingServer, Server
}
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart(args)&&Current.getAccount().CheckAdmin(Log);
return super.canStart(args)&&Global.mainModule.getAccount().CheckAdmin(Log);
}
}

15
src/Visual_DVM_2021/Passes/All/DeleteVersion.java
View File

@@ -3,6 +3,7 @@ import Common.Current_;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Project.db_project_info;
@@ -19,12 +20,12 @@ public class DeleteVersion extends Pass<db_project_info> {
protected boolean canStart(Object... args) {
if (args.length > 0) {
target = (db_project_info) args[0];
current = (Current.getVersion() != null) && Current.getVersion().Home.equals(target.Home);
current = (Global.mainModule.getVersion() != null) && Global.mainModule.getVersion().Home.equals(target.Home);
return true;
} else {
if (((target = Current.getVersion()) != null) && (!UI_.isActive() ||
if (((target = Global.mainModule.getVersion()) != null) && (!UI_.isActive() ||
UI_.Warning("Удалить " +
((Current.HasProject() && target.Home.equals(Current.getProject().Home)) ? "текущий проект" : "версию ")
((Global.mainModule.HasProject() && target.Home.equals(Global.mainModule.getProject().Home)) ? "текущий проект" : "версию ")
+ Utils_.Brackets(target.name)))) {
current = true;
return true;
@@ -36,8 +37,8 @@ public class DeleteVersion extends Pass<db_project_info> {
protected void performPreparation() throws Exception {
if (target.parent != null)
target.parent.checkLastModification(target);
if (Current.HasProject()) {
if ((Current.getProject().Home.getAbsolutePath().startsWith(target.Home.getAbsolutePath())))
if (Global.mainModule.HasProject()) {
if ((Global.mainModule.getProject().Home.getAbsolutePath().startsWith(target.Home.getAbsolutePath())))
passes.get(PassCode.CloseCurrentProject).Do();
}
if (UI_.isActive()) {
@@ -52,11 +53,11 @@ public class DeleteVersion extends Pass<db_project_info> {
protected void performDone() throws Exception {
parent = target.parent;
if (current)
Current_.set(Current.Version, null);
Global.mainModule.set(Current.Version, null);
if (parent != null) {
UI.getVersionsWindow().getVersionsForm().getTree().RemoveNode(target.node);
parent.versions.remove(target.name);
} else
Current_.set(Current.Root, null);
Global.mainModule.set(Current.Root, null);
}
}

2
src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java
View File

@@ -23,7 +23,7 @@ public class DownloadAllBugReportsArchives extends ComponentsRepositoryPass<File
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode.CloseCurrentProject).Do();
Current_.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Global.mainModule.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Utils.CleanDirectory(Global.BugReportsDirectory);
}
@Override

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -8,7 +9,7 @@ import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
public class DownloadComponent extends ComponentsRepositoryPass<Component> {
@Override
protected void ServerAction() throws Exception {
target = Current.getComponent();
target = Global.mainModule.getComponent();
String packed = target.getComponentType()+"\n"+target.getFileName();
Command(new ServerExchangeUnit_2021(ServerCode.ReceiveComponent, packed));
Utils_.bytesToFile((byte[]) response.object, target.getNewFile());

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

@@ -15,9 +15,9 @@ public class DownloadDVMPackage extends DownloadDVMPackages {
}
DVMPackage dvmPackage;
protected boolean canStart(Object... args) throws Exception {
if (Current_.Check(Log, Current.DVMPackage)) {
if (Global.mainModule.Check(Log, Current.DVMPackage)) {
//--
dvmPackage = Current.getDVMPackage();
dvmPackage = Global.mainModule.getDVMPackage();
//--
if (!dvmPackage.state.isDone()

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

@@ -23,7 +23,7 @@ public class DownloadProject extends CurrentConnectionPass {
protected void ServerAction() throws Exception {
dialogOK = (UI.getRemoteFileChooser().ShowDialog(getDescription(), this, true));
if (dialogOK) {
src = Current.getRemoteFile();
src = Global.mainModule.getRemoteFile();
remote_archive = new RemoteFile(src.full_name, src.name + ".zip", false);
local_archive = Utils.getTempFileName(remote_archive.name);
if ((user.connection.getFileKBSize(src.full_name)) <= maxSize) {
@@ -42,12 +42,12 @@ public class DownloadProject extends CurrentConnectionPass {
} else throw new PassException("Размер проекта превышает " + maxSize + " KB.\n");
} else {
//диалога не вышло, сбрасываем файл.
Current_.set(Current.RemoteFile, null);
Global.mainModule.set(Current.RemoteFile, null);
}
}
@Override
protected boolean validate() {
Current_.Check(Log, Current.RemoteFile);
Global.mainModule.Check(Log, Current.RemoteFile);
return (Log.isEmpty());
}
@Override

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.TestingSystem.Common.Test.Test;
public class DownloadTaskTest extends DownloadTest {
@@ -11,8 +12,8 @@ public class DownloadTaskTest extends DownloadTest {
@Override
protected boolean canStart(Object... args) throws Exception {
target = null;
if (Current.getAccount().CheckRegistered(Log) && Current_.Check(Log, Current.DVMRunTask)) {
DVMRunTask task = Current.getDVMRunTask();
if (Global.mainModule.getAccount().CheckRegistered(Log) && Global.mainModule.Check(Log, Current.DVMRunTask)) {
DVMRunTask task = Global.mainModule.getDVMRunTask();
//-- квазиобъект, нам от него нужно только имя.
target = new Test();
target.id = task.test_id;

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

@@ -21,8 +21,8 @@ public class DownloadTest extends TestingSystemPass<Test> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.getAccount().CheckRegistered(Log) && Current_.Check(Log, Current.Test)) {
target = Current.getTest();
if (Global.mainModule.getAccount().CheckRegistered(Log) && Global.mainModule.Check(Log, Current.Test)) {
target = Global.mainModule.getTest();
return true;
}
return false;
@@ -30,7 +30,7 @@ public class DownloadTest extends TestingSystemPass<Test> {
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode.CloseCurrentProject).Do();
Current_.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Global.mainModule.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Utils.forceDeleteWithCheck(target.getArchive());
Utils.forceDeleteWithCheck(target.getHomePath());
}

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

@@ -1,13 +1,14 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import Visual_DVM_2021.Passes.CurrentProjectPass;
import _VisualDVM.Global;
public class DropAnalyses extends CurrentProjectPass {
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart(args) && (Current.getSapfor() != null);
return super.canStart(args) && (Global.mainModule.getSapfor() != null);
}
@Override
protected void body() throws Exception {
Current.getSapfor().ResetAllAnalyses();
Global.mainModule.getSapfor().ResetAllAnalyses();
}
}

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

@@ -61,9 +61,9 @@ public class EditAccount extends Email {
@Override
protected void performDone() throws Exception {
super.performDone();
Current.getAccount().name = name;
Current.getAccount().email = email;
Global.mainModule.getDb().Update(Current.getAccount());
Global.mainModule.getAccount().name = name;
Global.mainModule.getAccount().email = email;
Global.mainModule.getDb().Update(Global.mainModule.getAccount());
//это не регистрация. только заполнение почты в своей бд и ее подтверждение на реальность.
}
}

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.SessionMaxtimeDialog;
import Visual_DVM_2021.Passes.CurrentProjectPass;
import _VisualDVM.Global;
public class EditProjectCompilationMaxtime extends CurrentProjectPass {
@Override
public String getIconPath() {
@@ -15,7 +16,7 @@ public class EditProjectCompilationMaxtime extends CurrentProjectPass {
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart(args) &&
(f = new SessionMaxtimeDialog()).ShowDialog("максимальное время компиляции", Current.getProject().compilation_maxtime);
(f = new SessionMaxtimeDialog()).ShowDialog("максимальное время компиляции", Global.mainModule.getProject().compilation_maxtime);
}
@Override
protected void body() throws Exception {

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.SessionMaxtimeDialog;
import Visual_DVM_2021.Passes.CurrentProjectPass;
import _VisualDVM.Global;
public class EditProjectRunMaxtime extends CurrentProjectPass {
@Override
public String getIconPath() {
@@ -15,7 +16,7 @@ public class EditProjectRunMaxtime extends CurrentProjectPass {
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart(args) &&
(f = new SessionMaxtimeDialog()).ShowDialog("максимальное время запуска", Current.getProject().run_maxtime);
(f = new SessionMaxtimeDialog()).ShowDialog("максимальное время запуска", Global.mainModule.getProject().run_maxtime);
}
@Override
protected void body() throws Exception {

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
@@ -16,8 +17,8 @@ public class ExcludeFile extends Pass<DBProjectFile> {
target = (DBProjectFile) args[0];
return !target.state.equals(FileState.Excluded);
}
return Current_.Check(Log, Current.SelectedFile)
&& !(target = Current.getSelectedFile()).state.equals(FileState.Excluded);
return Global.mainModule.Check(Log, Current.SelectedFile)
&& !(target = Global.mainModule.getSelectedFile()).state.equals(FileState.Excluded);
}
@Override
protected void body() throws Exception {

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

@@ -18,9 +18,7 @@ public class ExcludeSelectedFiles extends Pass<Vector<DBProjectFile>> {
return false;
}
target = new Vector<>();
for (DBProjectFile file: Current.getProject().db.files.Data.values())
if (file.isSelected()) target.add(file);
target = Global.mainModule.getProject().db.files.getCheckedItems();
if (target.isEmpty()){
Log.Writeln_("Не отмечено ни одного файла.");
return false;

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

@@ -62,9 +62,9 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
if (Global.testingServer.db.dvmPackages.getCheckedCount() > 0) {
target = Global.testingServer.db.dvmPackages.getCheckedItems();
} else {
if (Current_.Check(Log, Current.DVMPackage)) {
if (Global.mainModule.Check(Log, Current.DVMPackage)) {
target = new Vector<>();
target.add(Current.getDVMPackage());
target.add(Global.mainModule.getDVMPackage());
} else return false;
}
Vector<Integer> packagesToDownload = new Vector<>();

21
src/Visual_DVM_2021/Passes/All/GCOV.java
View File

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -50,9 +51,9 @@ public class GCOV extends Precompilation {
@Override
protected void showPreparation() throws Exception {
//super.showPreparation(); тут не надо отображать пустые анализы.
if (Current.HasFile()) {
Current.getFile().form.ShowNoRunOutput();
Current.getFile().form.ShowNoGCOVLog();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowNoRunOutput();
Global.mainModule.getFile().form.ShowNoGCOVLog();
}
}
@Override
@@ -108,16 +109,16 @@ public class GCOV extends Precompilation {
@Override
protected void showDone() throws Exception {
super.showDone();
if (Current.HasFile()) {
Current.getFile().form.ShowRunOutput();
Current.getFile().form.ShowGCOVLog();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowRunOutput();
Global.mainModule.getFile().form.ShowGCOVLog();
}
}
@Override
protected void showFail() throws Exception {
super.showFail();
if (Current.HasFile())
Current.getFile().form.FocusCompilationOut();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.FocusCompilationOut();
}
@Override
protected void performDone() throws Exception {
@@ -125,8 +126,8 @@ public class GCOV extends Precompilation {
}
@Override
protected void FocusResult() {
if (Current.HasFile())
Current.getFile().form.FocusGCOVLog();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.FocusGCOVLog();
}
/*
@Override

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
@@ -11,17 +12,17 @@ public class GetComponentsBackupsFromServer extends ComponentsRepositoryPass<Vec
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
return (Current_.Check(Log, Current.Component));
return (Global.mainModule.Check(Log, Current.Component));
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsBackups, Current.getComponent().getComponentType().toString()));
Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsBackups, Global.mainModule.getComponent().getComponentType().toString()));
target = (Vector<File>) response.object;
}
@Override
protected boolean validate() {
if (target.isEmpty()) {
Log.Writeln_("Не найдено резервных копий на сервере для компонента " + Current.getComponent().getComponentType().getDescription());
Log.Writeln_("Не найдено резервных копий на сервере для компонента " + Global.mainModule.getComponent().getComponentType().getDescription());
return false;
}
return true;

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
@@ -16,8 +17,8 @@ public class IncludeFile extends Pass<DBProjectFile> {
target = (DBProjectFile) args[0];
return target.state.equals(FileState.Excluded);
}
return Current_.Check(Log, Current.SelectedFile)
&& (target = Current.getSelectedFile()).state.equals(FileState.Excluded);
return Global.mainModule.Check(Log, Current.SelectedFile)
&& (target =Global.mainModule.getSelectedFile()).state.equals(FileState.Excluded);
}
@Override
protected void body() throws Exception {

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

@@ -17,9 +17,7 @@ public class IncludeSelectedFiles extends Pass<Vector<DBProjectFile>> {
Log.Writeln_("Нажмите правую клавишу мыши, и перейдите в режим выбора файлов.");
return false;
}
target = new Vector<>();
for (DBProjectFile file : Current.getProject().db.files.Data.values())
if (file.isSelected()) target.add(file);
target = Global.mainModule.getProject().db.files.getCheckedItems();
if (target.isEmpty()) {
Log.Writeln_("Не отмечено ни одного файла.");
return false;

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

@@ -21,11 +21,11 @@ public class InitialiseUser extends Pass {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return Current_.Check(Log, Current.Machine, Current.User);
return Global.mainModule.Check(Log, Current.Machine, Current.User);
}
@Override
protected void body() throws Exception {
switch (Current.getMachine().type) {
switch (Global.mainModule.getMachine().type) {
case Local:
passes.get(PassCode.LocalInitaliseUser).Do();
break;
@@ -36,23 +36,23 @@ public class InitialiseUser extends Pass {
if (workspace == null) {
if (passes.get(PassCode.RemoteInitialiseUser).Do()){
workspace = new SubscriberWorkspace();
workspace.email=Current.getAccount().email;
workspace.URL=Current.getMachine().getURL();
workspace.login=Current.getUser().login;
workspace.email=Global.mainModule.getAccount().email;
workspace.URL=Global.mainModule.getMachine().getURL();
workspace.login=Global.mainModule.getUser().login;
workspace.path=((RemoteFile) passes.get(PassCode.RemoteInitialiseUser).target).full_name;
//---
if (passes.get(PassCode.PublishRemoteWorkspace).Do(workspace)) {
Current.getUser().workspace = workspace.path;
Current.getUser().state = UserState.ready_to_work;
Global.mainModule.getDb().Update(Current.getUser());
Global.mainModule.getUser().workspace = workspace.path;
Global.mainModule.getUser().state = UserState.ready_to_work;
Global.mainModule.getDb().Update(Global.mainModule.getUser());
}
}
}
else {
//рега была. просто заносим то что там пользователю
Current.getUser().workspace = workspace.path;
Current.getUser().state = UserState.ready_to_work;
Global.mainModule.getDb().Update(Current.getUser());
Global.mainModule.getUser().workspace = workspace.path;
Global.mainModule.getUser().state = UserState.ready_to_work;
Global.mainModule.getDb().Update(Global.mainModule.getUser());
}
}
break;

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

@@ -12,7 +12,7 @@ import java.io.File;
public class LocalInitaliseUser extends ProcessPass<User> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = Current.getUser();
target = Global.mainModule.getUser();
return true;
}
@Override

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

@@ -23,8 +23,8 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current_.Check(Log, Current.BugReport) &&
(BugReportInterface.CheckNotDraft(target=Current.getBugReport(),Log))) {
if (Global.mainModule.Check(Log, Current.BugReport) &&
(BugReportInterface.CheckNotDraft(target=Global.mainModule.getBugReport(),Log))) {
if (!target.project_version.isEmpty()) {
root = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
@@ -43,7 +43,7 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode.CloseCurrentProject).Do();
Current_.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Global.mainModule.set(Current.Root, null); //чтобы гарантированно не существовало корня.
}
@Override
protected void body() throws Exception {

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

@@ -1,6 +1,8 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.PassCode;
@@ -9,7 +11,7 @@ public class OpenCurrentFile extends Pass<DBProjectFile> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (args.length > 0) ? (DBProjectFile) args[0] : null;
return (target != null) && (!Current.HasFile() || (!Current.getFile().file.equals(target.file)));
return (target != null) && (!Global.mainModule.HasFile() || (!Global.mainModule.getFile().file.equals(target.file)));
}
@Override
protected void performPreparation() throws Exception {
@@ -21,7 +23,7 @@ public class OpenCurrentFile extends Pass<DBProjectFile> {
}
@Override
protected void performDone() throws Exception {
Current_.set(Current.File, target);
Global.mainModule.set(Current.File, target);
}
@Override
protected void showDone() throws Exception {

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

@@ -36,7 +36,7 @@ public class OpenCurrentProject extends Pass<db_project_info> {
return true;
}
boolean needsOpen() {
return !Current.HasProject() || !Current.getProject().Home.equals(dir);
return !Global.mainModule.HasProject() || !Global.mainModule.getProject().Home.equals(dir);
}
//-----------------
@Override
@@ -80,8 +80,8 @@ public class OpenCurrentProject extends Pass<db_project_info> {
root_changes = true;
switch (mode) {
case Directory:
if (Current.HasRoot()) {
db_project_info root = Current.getRoot();
if (Global.mainModule.HasRoot()) {
db_project_info root = Global.mainModule.getRoot();
db_project_info project = root.find_version_r(dir);
if (project != null) {
Utils_.MainLog.Print("версия найдена в текущем корне");
@@ -106,10 +106,10 @@ public class OpenCurrentProject extends Pass<db_project_info> {
}
@Override
protected void performDone() throws Exception {
Current_.set(Current.Project, target);
Current_.set(Current.ProjectView, ProjectView.Files);
Global.mainModule.set(Current.Project, target);
Global.mainModule.set(Current.ProjectView, ProjectView.Files);
if (root_changes)
Current_.set(Current.Root, new_root);
Global.mainModule.set(Current.Root, new_root);
Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir.getParent());
Pass.passes.get(PassCode.UpdateSetting).Do(
SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0")

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
@@ -21,7 +22,7 @@ public class OpenProject extends Pass<db_project_info> {
}
@Override
protected void performDone() throws Exception {
Current_.set(Current.Project, target);
Global.mainModule.set(Current.Project, target);
/*
пока непонятно надо
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(

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

@@ -30,8 +30,8 @@ public class PickCompilerEnvironments extends Pass<String> {
//-
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current_.Check(Log, Current.RunConfiguration)) {
RunConfiguration configuration = Current.getRunConfiguration();
if (Global.mainModule.Check(Log, Current.RunConfiguration)) {
RunConfiguration configuration = Global.mainModule.getRunConfiguration();
if (configuration.compiler_id == CommonConstants.Nan) {
Log.Writeln_("Отсутвует DVM компилятор, связанный с текущей конфигурацией запуска.\n" +
"Если конфигурация содержит вызов DVM компилятора, но была создана на версии 801 и ниже,\n" +
@@ -73,14 +73,14 @@ public class PickCompilerEnvironments extends Pass<String> {
}
@Override
protected void body() throws Exception {
LinkedHashMap<String, String> envValues = Current.getRunConfiguration().getEnvMap();
LinkedHashMap<String, String> envValues = Global.mainModule.getRunConfiguration().getEnvMap();
for (CompilerEnvironment compilerEnv : compiler.environments.Data.values()) {
if (compilerEnv.isSelected()) {
EnvironmentValue confEnv;
if (!envValues.containsKey(compilerEnv.name)) {
confEnv = new EnvironmentValue();
confEnv.machine_id = Current.getRunConfiguration().machine_id;
confEnv.run_configuration_id = Current.getRunConfiguration().id;
confEnv.machine_id = Global.mainModule.getRunConfiguration().machine_id;
confEnv.run_configuration_id = Global.mainModule.getRunConfiguration().id;
confEnv.name = compilerEnv.name;
confEnv.value = compilerEnv.value;
Global.mainModule.getDb().Insert(confEnv);

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
@@ -21,7 +22,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass<String> {
return false;
}
target = "";
compiler = Current.getCompiler();
compiler = Global.mainModule.getCompiler();
if (!compiler.type.equals(CompilerType.dvm)) {
Log.Writeln_("Выбор переменных окружения возможен только для DVM компилятора,");
return false;

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

@@ -49,7 +49,7 @@ public class Precompilation extends Pass<db_project_info> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = Current.getProject();
target = Global.mainModule.getProject();
if (Utils_.isWindows()) {
//--
makepath = Global.mainModule.getDb().settings.get(SettingName.LocalMakePathWindows).toString();
@@ -134,9 +134,9 @@ public class Precompilation extends Pass<db_project_info> {
@Override
protected void showPreparation() throws Exception {
UI.getMainWindow().getProjectWindow().ShowNoAnalyses();
if (Current.HasFile()) {
Current.getFile().form.ShowNoMessages();
Current.getFile().form.ShowNoAnalyses();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowNoMessages();
Global.mainModule.getFile().form.ShowNoAnalyses();
}
}
protected static void unpackPrecompilationMessages(db_project_info target, String text) throws Exception {
@@ -241,9 +241,9 @@ public class Precompilation extends Pass<db_project_info> {
@Override
protected void showFinish() throws Exception {
UI.getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages();
if (Current.HasFile()) {
Current.getFile().form.ShowCompilationOutput();
Current.getFile().form.FocusCompilationOut();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowCompilationOutput();
Global.mainModule.getFile().form.FocusCompilationOut();
}
}
@Override

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

@@ -25,8 +25,8 @@ public class PublishBugReport extends Pass<BugReport> {
}
@Override
protected boolean canStart(Object... args) {
if (Current_.Check(Log, Current.BugReport)) {
target = Current.getBugReport();
if (Global.mainModule.Check(Log, Current.BugReport)) {
target = Global.mainModule.getBugReport();
if (!target.state.equals(BugReportState.draft)) {
Log.Writeln_("Отчёт об ошибке " + target.id + " уже опубликован!");
return false;
@@ -36,7 +36,7 @@ public class PublishBugReport extends Pass<BugReport> {
if (!UI_.Question("Для отчёта об ошибке не назначен исполнитель.\nВсе равно опубликовать его"))
return false;
}
if (!Current.getAccount().CheckAccessRights(target.sender_address, Log) && (BugReportInterface.CheckDraft(target, Log))) {
if (!Global.mainModule.getAccount().CheckAccessRights(target.sender_address, Log) && (BugReportInterface.CheckDraft(target, Log))) {
return false;
}
return true;
@@ -63,8 +63,8 @@ public class PublishBugReport extends Pass<BugReport> {
message.addAttachement(BugReportInterface.getArchiveFile(target));
//со скринами будет небольшой трабл. потому что теретически возможна ситуация,
//что проект черновика бага уже закрыт.
if (Current.HasProject()) {
for (File screen : Current.getProject().getScreenShots())
if (Global.mainModule.HasProject()) {
for (File screen : Global.mainModule.getProject().getScreenShots())
message.addAttachement(screen);
}
}

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

@@ -36,16 +36,16 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
Log.Writeln_("Публикация компонент разрешена только для Windows");
return false;
}
if (!Current.HasAccount()) {
if (!Global.mainModule.HasAccount()) {
Log.Writeln_("Окно компонент было открыто до синхронизации прав");
return false;
}
if (!Current.getAccount().role.equals(AccountRole.Admin)) {
if (!Global.mainModule.getAccount().role.equals(AccountRole.Admin)) {
Log.Writeln_("Вы не являетесь администратором");
}
;
if (Current_.Check(Log, Current.Component)) {
target = Current.getComponent();
if (Global.mainModule.Check(Log, Current.Component)) {
target = Global.mainModule.getComponent();
target.needs_update_minimal_version = false;
f.fields.cbUpdateMinimalVersion.setSelected(false);
f.fields.lMinimalVersion.setText(String.valueOf(target.minimal_version));
@@ -72,7 +72,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
String change_description = (f.Result == null) ? "не указаны" : f.Result;
String change_record_header = String.join(" ",
Utils_.Brackets(Utils_.print_date(new Date())) + ":",
Current.getAccount().name + Utils_.RBrackets(Current.getAccount().email),
Global.mainModule.getAccount().name + Utils_.RBrackets(Global.mainModule.getAccount().email),
"публикует версию", Utils_.DQuotes(target.version)
);
String change_record = String.join("\n", change_record_header, "Изменения:",

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

@@ -11,11 +11,11 @@ public class PublishSapforSettingsCommand extends PublishServerObject<TestingSer
}
@Override
public boolean fillObjectFields() throws Exception {
target.sapforsettings_id = Current.getSapforSettings().id;
target.sapforsettings_id = Global.mainModule.getSapforSettings().id;
return super.fillObjectFields();
}
@Override
protected boolean canStart(Object... args) throws Exception {
return Current_.Check(Log, Current.SapforSettings)&&super.canStart(args);
return Global.mainModule.Check(Log, Current.SapforSettings)&&super.canStart(args);
}
}

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

@@ -3,6 +3,7 @@ import Common.Current_;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import Common.Passes.PassException;
import Visual_DVM_2021.Passes.SSH.ConnectionPass;
@@ -16,12 +17,12 @@ public class RemoteInitialiseUser extends ConnectionPass<RemoteFile> {
}
@Override
protected boolean canStart(Object... args) {
return Current_.Check(Log, Current.User);
return Global.mainModule.Check(Log, Current.User);
}
@Override
protected void Connect() throws Exception {
machine = Current.getMachine();
user = Current.getUser();
machine = Global.mainModule.getMachine();
user =Global.mainModule.getUser();
super.Connect();
}
@Override
@@ -49,7 +50,7 @@ public class RemoteInitialiseUser extends ConnectionPass<RemoteFile> {
if (!modules_log.isEmpty())
throw new PassException(modules_log);
//--------------------------------------
RemoteFile info = new RemoteFile(target, Current.getAccount().email);
RemoteFile info = new RemoteFile(target, Global.mainModule.getAccount().email);
user.connection.writeToFile("", info);
}
}

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current_;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.Utils;
@@ -25,11 +26,11 @@ public class RenameDirectory extends ChangeFilePass {
current = false;
old_current_file = null;
new_current_file = null;
dst_node = Current.getProjectNode();
dst_node = Global.mainModule.getProjectNode();
if ((dst_node != null) && (dst_node.getUserObject() instanceof File)) {
target_dir = Current.getSelectedDirectory();
if (current = Current.HasFile() && Utils.isAnchestor(Current.getFile().file, target_dir)) {
old_current_file = Current.getFile();
target_dir = Global.mainModule.getSelectedDirectory();
if (current = Global.mainModule.HasFile() && Utils.isAnchestor(Global.mainModule.getFile().file, target_dir)) {
old_current_file = Global.mainModule.getFile();
}
if ((ff = new FileNameForm()).ShowDialog("Введите новое имя папки", target_dir.getName())) {
fileName = ff.Result;
@@ -80,8 +81,8 @@ public class RenameDirectory extends ChangeFilePass {
}
@Override
protected void performDone() throws Exception {
Current.getSapfor().ResetAllAnalyses();
Current_.set(Current.SelectedDirectory, dst);
Global.mainModule.getSapfor().ResetAllAnalyses();
Global.mainModule.set(Current.SelectedDirectory, dst);
if (current && new_current_file != null)
passes.get(PassCode.OpenCurrentFile).Do(new_current_file);
}

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current_;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -19,13 +20,13 @@ public class RenameFile extends ChangeFilePass<DBProjectFile> {
protected boolean canStart(Object... args) {
resetArgs();
current = false;
if (Current_.Check(Log, Current.SelectedFile)) {
old = Current.getSelectedFile();
current = Current.HasFile() && Current.getFile().file.equals(old.file);
if (Global.mainModule.Check(Log, Current.SelectedFile)) {
old = Global.mainModule.getSelectedFile();
current = Global.mainModule.HasFile() && Global.mainModule.getFile().file.equals(old.file);
if ((ff = new FileNameForm()).ShowDialog("Введите новое имя файла", old.file.getName())) {
fileName = ff.Result;
//->
parent_node = Current.getProjectCurrentParentNode();
parent_node = Global.mainModule.getProjectCurrentParentNode();
target_dir = (File) parent_node.getUserObject();
//->
dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile();
@@ -58,8 +59,8 @@ public class RenameFile extends ChangeFilePass<DBProjectFile> {
}
@Override
protected void performDone() throws Exception {
Current.getSapfor().ResetAllAnalyses();
Current_.set(Current.SelectedFile, target);
Global.mainModule.getSapfor().ResetAllAnalyses();
Global.mainModule.set(Current.SelectedFile, target);
if (current)
passes.get(PassCode.OpenCurrentFile).Do(target);
}

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import Visual_DVM_2021.Passes.PassCode;
@@ -34,9 +35,8 @@ public class ReplaceTestProject extends CreateTestFromProject {
}
@Override
protected boolean initTarget() throws Exception {
if (Current_.Check(Log, Current.Test)) {
target = Current.getTest();
if (Global.mainModule.Check(Log, Current.Test)) {
target = Global.mainModule.getTest();
return true;
}
return false;

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

@@ -5,6 +5,7 @@ import Common.Visual.UI_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Repository.Server.ServerCode;
@@ -33,9 +34,9 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
//-
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Current_.Check(Log, Current.Group))
if (!Global.mainModule.Check(Log, Current.Group))
return false;
group = Current.getGroup();
group = Global.mainModule.getGroup();
//--->>>
Utils.RestoreSelectedDirectory(fileChooser);
Vector<File> files = fileChooser.ShowMultiDialog();

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

@@ -10,7 +10,7 @@ public class ResetCurrentProject extends CurrentProjectPass {
protected void performPreparation() throws Exception {
passes.get(PassCode.DeleteDebugResults).Do();
passes.get(PassCode.CloseCurrentProject).Do();
Current_.set(Current.Root, null);
Global.mainModule.set(Current.Root, null);
}
@Override
protected void body() throws Exception {

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

@@ -80,8 +80,8 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
content = tree;
}
};
if (d.ShowDialog("Выбор версии для восстановления")&& Current_.Check(Log, Current.ComponentServerBackup)){
remoteFile = Current.getComponentServerBackup();
if (d.ShowDialog("Выбор версии для восстановления")&& Global.mainModule.Check(Log, Current.ComponentServerBackup)){
remoteFile = Global.mainModule.getComponentServerBackup();
return true;
};
}

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

@@ -28,7 +28,7 @@ public class Run extends Pass<db_project_info> {
}
@Override
protected void performPreparation() throws Exception {
runTasks = Current.getRunConfiguration().generateRunTasks(target, Current.getCompilationTask());
runTasks = Global.mainModule.getRunConfiguration().generateRunTasks(target, Global.mainModule.getCompilationTask());
for (RunTask runTask : runTasks) {
Global.mainModule.getDb().Insert(runTask);
Utils.forceDeleteWithCheck(runTask.getLocalWorkspace());
@@ -41,17 +41,17 @@ public class Run extends Pass<db_project_info> {
@Override
protected boolean canStart(Object... args) {
subpass = null;
if (Current_.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile, Current.RunConfiguration,
if (Global.mainModule.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile, Current.RunConfiguration,
Current.CompilationTask)) {
//-
target = Current.getProject();
target = Global.mainModule.getProject();
//-
if (Current.getMachine().type.equals(MachineType.MVS_cluster) &&
Current.getRunConfiguration().LauncherCall.isEmpty()
if (Global.mainModule.getMachine().type.equals(MachineType.MVS_cluster) &&
Global.mainModule.getRunConfiguration().LauncherCall.isEmpty()
) {
Log.Writeln_("Запуск напрямую на кластере запрещён.Используйте для запуска DVM систему или MPI");
}
if (!Current.getCompilationTask().state.equals(TaskState.Done))
if (!Global.mainModule.getCompilationTask().state.equals(TaskState.Done))
Log.Writeln_("Текущая задача на компиляцию еще не выполнялась, или была завершена с ошибками");
return Log.isEmpty();
}
@@ -59,7 +59,7 @@ public class Run extends Pass<db_project_info> {
}
@Override
protected void body() throws Exception {
switch (Current.getMachine().type) {
switch (Global.mainModule.getMachine().type) {
case Local:
if (Utils_.isWindows()) {
subpass = passes.get(PassCode.WindowsLocalRun);
@@ -68,7 +68,7 @@ public class Run extends Pass<db_project_info> {
break;
case Undefined:
case MVS_cluster:
throw new PassException("Запуск не реализован для типа машины " + Utils_.DQuotes(Current.getMachine().type));
throw new PassException("Запуск не реализован для типа машины " + Utils_.DQuotes(Global.mainModule.getMachine().type));
/*
case MVS_cluster:
subpass = passes.get(PassCode_2021.MVSRun);
@@ -95,7 +95,7 @@ public class Run extends Pass<db_project_info> {
case DoneWithErrors:
task_completed = true;
if (task.hasDvmSts) {
Utils.CheckAndCleanDirectory(Current.getProject().getStatisticDirectory());
Utils.CheckAndCleanDirectory(Global.mainModule.getProject().getStatisticDirectory());
Pass.passes.get(PassCode.SPF_StatisticAnalyzer).Do(task);
}
break;

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import Visual_DVM_2021.Passes.SapforFilesModification;
import _VisualDVM.Global;
public class SPF_ChangeSpfIntervals extends SapforFilesModification {
// SPF_ChangeSpfIntervals (addOpt1_c -> file, addOpt2_c-> int lines, '|' as delimiter)
int start;
@@ -9,11 +10,11 @@ public class SPF_ChangeSpfIntervals extends SapforFilesModification {
int mod;
@Override
protected boolean canStart(Object... args) throws Exception {
if (super.canStart(args) && Current_.Check(Log, Current.File)) {
if (super.canStart(args) && Global.mainModule.Check(Log, Current.File)) {
start = (int) args[0];
end = (int) args[1];
mod = (int) args[2];
addOpt1 = Current.getFile().name;
addOpt1 = Global.mainModule.getFile().name;
addOpt2 = start + "|" + end + "|" + mod;
return true;
}

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

@@ -1,5 +1,6 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Utils.Index;
import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -22,8 +23,8 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
@Override
protected void showPreparation() {
UI.getMainWindow().getProjectWindow().getArraysWindow().ShowNoArrays();
if (Current.HasFile())
Current.getFile().form.ShowNoArrays();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowNoArrays();
}
@Override
public void unpack(String packed) throws Exception {
@@ -55,16 +56,16 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
@Override
protected void FocusResult() {
UI.getMainWindow().getProjectWindow().FocusArrays();
if (Current.HasFile())
Current.getFile().form.FocusArrays();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.FocusArrays();
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().getArraysWindow().ShowArrays();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowArraysCount();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
if (Current.HasFile())
Current.getFile().form.ShowArrays();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowArrays();
super.showDone();
}
}

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

@@ -80,14 +80,14 @@ public class SPF_GetGCovInfo extends SilentSapforPass {
}
@Override
protected void showDone() throws Exception {
if (Current.HasFile())
Current.getFile().form.ShowGCOV();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowGCOV();
for (PassControl control: controls)
control.setIcon(getDoneIconPath());
}
@Override
protected void FocusResult() {
if (Current.HasFile())
Current.getFile().form.FocusGCOVLog();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.FocusGCOVLog();
}
}

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

@@ -130,9 +130,9 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
int x = (int) (screenDims.getKey() * target.fgScreen);
int y = (int) (screenDims.getValue() * target.fgScreen);
Vector<String> visibleFuncNames = new Vector<>();
if (showByCurrentFunction && Current.HasFunction()) {
if (showByCurrentFunction && Global.mainModule.HasFunction()) {
Vector<String> rawVisible =
getNeighbors(Current.getFunction().funcName,
getNeighbors(Global.mainModule.getFunction().funcName,
depth,
showIn,
showOut);

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

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current_;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Utils.Index;
import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -16,8 +17,8 @@ import java.util.Vector;
public class SPF_GetGraphFunctions extends SapforAnalysis {
@Override
protected void showPreparation() {
if (Current.HasFile())
Current.getFile().form.ShowNoFunctions();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowNoFunctions();
UI.getMainWindow().getProjectWindow().ShowNoFunctions();
if (SPF_GetGraphFunctionPositions.showByCurrentFunction)
UI.getMainWindow().getProjectWindow().getFunctionsWindow().ShowNoCurrentFunction();
@@ -33,8 +34,8 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
@Override
protected void performPreparation() throws Exception {
super.performPreparation(); //удаление интеррупта.
Current_.set(Current.Function, null);
Current_.set(Current.SelectedFunction,null);
Global.mainModule.set(Current.Function, null);
Global.mainModule.set(Current.SelectedFunction,null);
target.main_function = null;
target.main_functionH = null;
target.allFunctions.clear();
@@ -130,8 +131,8 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
@Override
protected void FocusResult() {
super.FocusResult();
if (Current.HasFile())
Current.getFile().form.FocusFunctions();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.FocusFunctions();
UI.getMainWindow().getProjectWindow().FocusFunctions();
}
@Override
@@ -139,8 +140,8 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
super.showDone();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowFunctionsCount();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
if (Current.HasFile())
Current.getFile().form.ShowFunctions();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowFunctions();
passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
}
}

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Utils.Index;
import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -15,8 +16,8 @@ public class SPF_GetGraphLoops extends SapforAnalysis {
}
@Override
protected void showPreparation() {
if (Current.HasFile())
Current.getFile().form.ShowNoLoops();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowNoLoops();
}
@Override
protected boolean alwaysCheck() {
@@ -61,15 +62,15 @@ public class SPF_GetGraphLoops extends SapforAnalysis {
@Override
protected void FocusResult() {
super.FocusResult();
if (Current.HasFile())
Current.getFile().form.FocusLoops();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.FocusLoops();
}
@Override
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowLoopsCount();
UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
if (Current.HasFile())
Current.getFile().form.ShowLoops();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowLoops();
super.showDone();
}
}

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -71,7 +72,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
if (d_file.style == LanguageStyle.none)
d_file.UpdateStyle(father.style);
//----------------------------------------
if (Current.HasFile() && Current.getFile().name.equals(d_file.name))
if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(d_file.name))
update_current = true;
//-----------------------------------------
}
@@ -97,7 +98,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
protected void showDone() throws Exception {
UI.getMainWindow().getProjectWindow().ShowIncludes();
if (update_current)
Current.getFile().form.ShowProperties();
Global.mainModule.getFile().form.ShowProperties();
super.showDone();
}
@Override

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

@@ -15,7 +15,7 @@ public class SPF_InlineProcedure extends SapforFilesModification {
@Override
protected boolean canStart(Object... args) throws Exception {
if (super.canStart(args) && (call = (args.length > 0) ? (FuncCall) args[0] : null) != null) {
addOpt1 = call.funcName + "|" + Current.getFile().name;
addOpt1 = call.funcName + "|" + Global.mainModule.getFile().name;
addOpt2 = String.valueOf(call.parent_offset);
Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1");
// Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.PARSE_FOR_INLINE, "1");
@@ -32,6 +32,6 @@ public class SPF_InlineProcedure extends SapforFilesModification {
@Override
protected void showDone() throws Exception {
super.showDone();
Current.getFile().form.getEditor().gotoLine(call.line);
Global.mainModule.getFile().form.getEditor().gotoLine(call.line);
}
}

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

@@ -2,13 +2,14 @@ package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import Visual_DVM_2021.Passes.SapforFilesModification;
import _VisualDVM.Global;
// SPF_LoopUnionCurrent (addOpt1_c -> file, addOpt2_c-> line)
public class SPF_LoopUnionCurrent extends SapforFilesModification {
@Override
protected boolean canStart(Object... args) throws Exception {
if (super.canStart(args) && Current_.Check(Log, Current.File)) {
addOpt1 = Current.getFile().name;
addOpt2 = String.valueOf(Current.getFile().form.getEditor().getCurrentLine());
if (super.canStart(args) && Global.mainModule.Check(Log, Current.File)) {
addOpt1 = Global.mainModule.getFile().name;
addOpt2 = String.valueOf(Global.mainModule.getFile().form.getEditor().getCurrentLine());
return true;
}
return false;

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.Dimension;
@@ -23,8 +24,8 @@ public class SPF_ModifyArrayDistribution extends SapforModification {
@Override
protected boolean canStart(Object... args) throws Exception {
region = null;
if (Current_.Check(Log, Current.ParallelRegion) && super.canStart(args) && passes.get(PassCode.SPF_GetArrayLinks).Do()) {
region = Current.getParallelRegion();
if (Global.mainModule.Check(Log, Current.ParallelRegion) && super.canStart(args) && passes.get(PassCode.SPF_GetArrayLinks).Do()) {
region = Global.mainModule.getParallelRegion();
DBObjectDialog dialog = new DBObjectDialog<ParallelRegion, ParallelRegionFields>(ParallelRegionFields.class) {
@Override
public int getDefaultHeight() {

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

@@ -144,9 +144,9 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
protected void showPreparation() throws Exception {
if (!precompilation_done) {
UI.getMainWindow().getProjectWindow().ShowNoAnalyses();
if (Current.HasFile()) {
Current.getFile().form.ShowNoMessages();
Current.getFile().form.ShowNoAnalyses();
if (Global.mainModule.HasFile()) {
Global.mainModule.getFile().form.ShowNoMessages();
Global.mainModule.getFile().form.ShowNoAnalyses();
}
}
}
@@ -183,8 +183,8 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
protected void showFinish() throws Exception {
super.showFinish();
UI.getMainWindow().getProjectWindow().ShowAllAnalyses();
if (Current.HasFile())
Current.getFile().form.ShowAllAnalyses();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowAllAnalyses();
}
@Override
protected void showFail() throws Exception {

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

@@ -1,5 +1,6 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Common.Passes.Pass;
import org.apache.commons.io.FileUtils;
@@ -14,8 +15,8 @@ public class Save extends Pass<DBProjectFile> {
}
@Override
protected boolean canStart(Object... args) {
if (Current.HasFile()) {
target = Current.getFile();
if (Global.mainModule.HasFile()) {
target = Global.mainModule.getFile();
return (target.NeedsSave);
}
return false;

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

@@ -1,6 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
public class SaveBugReportExecutor extends UpdateBugReportField {
@Override
public String getIconPath() {
@@ -12,9 +13,9 @@ public class SaveBugReportExecutor extends UpdateBugReportField {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return (Current_.Check(Log, Current.Subscriber)) &&
super.canStart("executor", Current.getSubscriber().name,
"executor_address", Current.getSubscriber().address
return (Global.mainModule.Check(Log, Current.Subscriber)) &&
super.canStart("executor", Global.mainModule.getSubscriber().name,
"executor_address", Global.mainModule.getSubscriber().address
);
}
}

21
src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java
View File

@@ -1,5 +1,6 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
@@ -19,26 +20,26 @@ public class SaveFunctionsGraphCoordinates extends Pass {
graphForm = UI.getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphWindow();
if (!graphForm.isShown())
Log.Writeln_("Сначала отобразите граф");
if (Current.getProject().functionsGraph.isEmpty())
if (Global.mainModule.getProject().functionsGraph.isEmpty())
Log.Writeln_("Граф процедур пуст");
return Log.isEmpty();
}
@Override
protected void body() throws Exception {
for (String funcName : Current.getProject().functionsGraph.vertexCoordinates.keySet()) {
for (String funcName : Global.mainModule.getProject().functionsGraph.vertexCoordinates.keySet()) {
FuncCoordinates coords = null;
if (Current.getProject().db.funcCoordinates.containsKey(funcName)) {
coords = Current.getProject().db.funcCoordinates.get(funcName);
if (Global.mainModule.getProject().db.funcCoordinates.containsKey(funcName)) {
coords = Global.mainModule.getProject().db.funcCoordinates.get(funcName);
coords.name=funcName;
coords.X = Current.getProject().functionsGraph.vertexCoordinates.get(funcName).getKey();
coords.Y = Current.getProject().functionsGraph.vertexCoordinates.get(funcName).getValue();
Current.getProject().db.Update(coords);
coords.X = Global.mainModule.getProject().functionsGraph.vertexCoordinates.get(funcName).getKey();
coords.Y = Global.mainModule.getProject().functionsGraph.vertexCoordinates.get(funcName).getValue();
Global.mainModule.getProject().db.Update(coords);
} else {
coords = new FuncCoordinates();
coords.name=funcName;
coords.X = Current.getProject().functionsGraph.vertexCoordinates.get(funcName).getKey();
coords.Y = Current.getProject().functionsGraph.vertexCoordinates.get(funcName).getValue();
Current.getProject().db.Insert(coords);
coords.X = Global.mainModule.getProject().functionsGraph.vertexCoordinates.get(funcName).getKey();
coords.Y = Global.mainModule.getProject().functionsGraph.vertexCoordinates.get(funcName).getValue();
Global.mainModule.getProject().db.Insert(coords);
}
}
}

2
src/Visual_DVM_2021/Passes/All/SaveGraph.java
View File

@@ -35,7 +35,7 @@ public class SaveGraph extends Pass<File> {
graphForm = UI.getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphWindow();
if (!graphForm.isShown())
Log.Writeln_("Сначала отобразите граф");
if (Current.getProject().functionsGraph.isEmpty())
if (Global.mainModule.getProject().functionsGraph.isEmpty())
Log.Writeln_("Граф процедур пуст");
return Log.isEmpty();
}

Some files were not shown because too many files have changed in this diff Show More