no message

This commit is contained in:
2024-10-11 00:00:30 +03:00
parent a11b7711f7
commit f317ab1aa1
341 changed files with 1866 additions and 1688 deletions

320
.idea/workspace.xml generated
View File

@@ -7,158 +7,346 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/nDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/nDBObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStats.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStats.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizePackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizePackages.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/Visual_DVM_2021/Passes/All/ActualizeServerSapfors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizeServerSapfors.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/Utils/CommonUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/StringTemplate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/StringTemplate.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/TextLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/TextLog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/ControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/ControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/HyperlinksStyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/HyperlinksStyledList.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/MenuBarButton.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledList.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledProgressBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledProgressBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DBObjectFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DBObjectFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DragDrop/FileDrop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DragDrop/FileDrop.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/StyledPopupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/StyledPopupMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/TableMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TableMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/TextComboBoxMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TextComboBoxMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/TextEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TextEditorMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Selectable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Selectable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DateRenderer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DateRenderer_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledCellLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledCellLabel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Themes/VisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Themes/VisualiserTheme.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/GraphTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/GraphTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectionTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectionTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VDirectoryChooser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/VFileChooser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Form.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Form.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddCompiler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.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/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/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/AddMachine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddMachine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddMakefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddMakefile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/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/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/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/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/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/ArchivesBackupPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneCurrentDVMConfiguration.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/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/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/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/CombineFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CombineFiles.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/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/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/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/CreateDVMPackageFromCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateDVMPackageFromCurrentProject.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/CopyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CopyProject.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/CreateEmptyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.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/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/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/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/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/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/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/DeleteCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/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/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/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/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/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/DeleteMachine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteMachine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteProfile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/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/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/DeleteSelectedRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/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/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/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/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/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/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadBugReport.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/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.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/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.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/DropFastAccess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropFastAccess.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropFastAccess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropFastAccess.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropLastProjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropLastProjects.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropLastProjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropLastProjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/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/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/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/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/EraseBadSymbols.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.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/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/ExtractRecipients.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExtractRecipients.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/FinishApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/FinishApplication.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ImportFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ImportFiles.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/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/MakeScreenShot.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/MakeScreenShot.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/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/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/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/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/PickCompilerOptions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.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/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/PrepareForModulesAssembly.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.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/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/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/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.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/RemoteSingleCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.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/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/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/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/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/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/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/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/SPF_CreateParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.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/SPF_GetArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.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_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_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.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/SPF_StatisticAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.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/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/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/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/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/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/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/ShowInstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowInstruction.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/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/ShowVersionsFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowVersionsFiles.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/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.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/UnzipFolderPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.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/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/UpdateSelectedComponents.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSelectedComponents.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/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/All/ZipFolderPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ZipFolderPass.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/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ObjectPass.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/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/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProjectPass.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/ConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.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/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.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/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/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/StartTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/StartTestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SortPassesByStats.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SortPassesByStats.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.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/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/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/Machine/MachinesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.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/Machine/Machine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/Machine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.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/ModuleAnchestor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModuleAnchestor.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/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/RemoteFileRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.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/Settings/DBSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/DBSetting.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/DBSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/DBSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Splitter/SplittersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Splitter/SplittersDBTable.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/QueueSystem/QueueSystem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/QueueSystem/QueueSystem.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/LinuxLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.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/RemoteCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Task.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.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/ProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/ProjectFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.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/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/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/ChangeSettingPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/ChangeSettingPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.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/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.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/ArrayDecl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.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/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/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/UI/DistributionMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.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/RulesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.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/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.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/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/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/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.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/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/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Component.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Instruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Instruction.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/OSDComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/OSDComponent.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/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/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualizer_2.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/EmailMessage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/EmailMessage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerExchangeUnit_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerExchangeUnit_2021.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.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/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.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/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.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/Common/ThreadsPlanner/ThreadsPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/UserConnection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Controls/PassButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Controls/PassButton.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.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/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Validators/DVMHelpParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/DVMHelpParser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Validators/PathValidator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/PathValidator.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Validators/ShellParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Validators/ShellParser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/CaretInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/CaretInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FormWithSplitters.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FormWithSplitters.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/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/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/LanguagesSubmenu.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/MainEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainEditorMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassMenuItem.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassMenuItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.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/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/PropertiesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.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/SettingsSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StableMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StableMenuItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StablePassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/StablePassMenuItem.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/Menus/VersionsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.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/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.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/CommentFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CommentFields.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/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DescriptionFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DescriptionFields.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DebugForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DebugForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.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/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/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesForm.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/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectsChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectsChooser.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/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.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/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TabToolBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TabToolBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TasksComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/WelcomeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/WelcomeForm.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" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -1,6 +1,6 @@
package Common.Database; package Common.Database;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Database.Tables.DBTable; import Common.Database.Tables.DBTable;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
@@ -84,7 +84,7 @@ public abstract class Database {
public DBObject InsertS(DBObject object) throws Exception { public DBObject InsertS(DBObject object) throws Exception {
DBTable table = tables.get(object.getClass()); DBTable table = tables.get(object.getClass());
if (!(object instanceof iDBObject) && table.Data.containsKey(object.getPK())) if (!(object instanceof iDBObject) && table.Data.containsKey(object.getPK()))
throw new RepositoryRefuseException("Таблица " + CommonUtils.Brackets(table.Name) + " уже содержит объект с ключом " + CommonUtils.Brackets(object.getPK().toString())); throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.Name) + " уже содержит объект с ключом " + Utils_.Brackets(object.getPK().toString()));
insert(table, object); insert(table, object);
table.Data.put(object.getPK(), object); table.Data.put(object.getPK(), object);
return object; return object;
@@ -111,7 +111,7 @@ public abstract class Database {
table.Data.remove(o.getPK()); table.Data.remove(o.getPK());
return o; return o;
} else } else
throw new RepositoryRefuseException("Таблица " + CommonUtils.Brackets(table.Name) + " не содержит объект с ключом " + CommonUtils.Brackets(to_delete.getPK().toString())); throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.Name) + " не содержит объект с ключом " + Utils_.Brackets(to_delete.getPK().toString()));
} }
public DBObject DeleteByPK(Class object_class, Object key) throws Exception { public DBObject DeleteByPK(Class object_class, Object key) throws Exception {
DBTable table = tables.get(object_class); DBTable table = tables.get(object_class);
@@ -121,7 +121,7 @@ public abstract class Database {
table.Data.remove(key); table.Data.remove(key);
return o; return o;
} else } else
throw new RepositoryRefuseException("Таблица " + CommonUtils.Brackets(table.Name) + " не содержит объект с ключом " + CommonUtils.Brackets(key.toString())); throw new RepositoryRefuseException("Таблица " + Utils_.Brackets(table.Name) + " не содержит объект с ключом " + Utils_.Brackets(key.toString()));
} }
// не работает с автоинкрементом. // не работает с автоинкрементом.
public DBObject getObjectCopyByPK(Class table_class, Object pk) throws Exception { public DBObject getObjectCopyByPK(Class table_class, Object pk) throws Exception {
@@ -178,7 +178,7 @@ public abstract class Database {
if (fk_class.getField(owner.getFKName()).get(o).equals(owner.getPK())) res.add((DBObject) o); if (fk_class.getField(owner.getFKName()).get(o).equals(owner.getPK())) res.add((DBObject) o);
} }
} catch (Exception e) { } catch (Exception e) {
CommonUtils.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
} }
return res; return res;
} }
@@ -207,7 +207,7 @@ public abstract class Database {
if (fk_class.getField(owner.getFKName()).get(f).equals(owner.getPK())) res.put((K) f.getPK(), f); if (fk_class.getField(owner.getFKName()).get(f).equals(owner.getPK())) res.put((K) f.getPK(), f);
} }
} catch (Exception e) { } catch (Exception e) {
CommonUtils.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
} }
return res; return res;
} }
@@ -222,7 +222,7 @@ public abstract class Database {
if (fk_class.getField(owner.getFKName()).get(o).equals(owner.getPK())) res.add(o.toString()); if (fk_class.getField(owner.getFKName()).get(o).equals(owner.getPK())) res.add(o.toString());
} }
} catch (Exception e) { } catch (Exception e) {
CommonUtils.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
} }
return res; return res;
} }
@@ -243,7 +243,7 @@ public abstract class Database {
res.put((G) (fk_class.getField(group_field).get(f)), f); res.put((G) (fk_class.getField(group_field).get(f)), f);
} }
} catch (Exception e) { } catch (Exception e) {
CommonUtils.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
} }
return res; return res;
} }

View File

@@ -1,5 +1,5 @@
package Common.Database.Objects; package Common.Database.Objects;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.Selectable; import Common.Visual.Selectable;
import Common.Utils.Index; import Common.Utils.Index;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
@@ -34,7 +34,7 @@ public abstract class DBObject implements Selectable, Serializable {
} }
public abstract Object getPK(); public abstract Object getPK();
public String getBDialogName() { public String getBDialogName() {
return CommonUtils.Brackets(getDialogName()); return Utils_.Brackets(getDialogName());
} }
public String getDialogName() { public String getDialogName() {
return getPK().toString(); return getPK().toString();

View File

@@ -1,5 +1,5 @@
package Common.Database.Objects; package Common.Database.Objects;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
public abstract class nDBObject extends DBObject { public abstract class nDBObject extends DBObject {
@Description("PRIMARY KEY, UNIQUE") @Description("PRIMARY KEY, UNIQUE")
@@ -13,7 +13,7 @@ public abstract class nDBObject extends DBObject {
return ""; return "";
} }
public void genName() { public void genName() {
id = CommonUtils.getDateName(getClass().getSimpleName().toLowerCase()); id = Utils_.getDateName(getClass().getSimpleName().toLowerCase());
} }
//- //-
@Override @Override

View File

@@ -3,8 +3,8 @@ import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable; import Common.Database.Tables.DBTable;
import Common.Database.Tables.DBTableColumn; import Common.Database.Tables.DBTableColumn;
import Common.Database.Database; import Common.Database.Database;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Passes.PassException; import Common.Passes.PassException;
import javafx.util.Pair; import javafx.util.Pair;
@@ -13,7 +13,7 @@ import java.sql.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Vector; import java.util.Vector;
import static Common.Utils.CommonUtils.requireNonNullElse; import static Common.Utils.Utils_.requireNonNullElse;
public abstract class SQLiteDatabase extends Database { public abstract class SQLiteDatabase extends Database {
protected Connection conn = null; protected Connection conn = null;
protected Statement statement = null; protected Statement statement = null;
@@ -36,7 +36,7 @@ public abstract class SQLiteDatabase extends Database {
ex.printStackTrace(); ex.printStackTrace();
conn = null; conn = null;
System.gc(); System.gc();
CommonUtils.sleep(2000); Utils_.sleep(2000);
} }
} }
if (conn == null) if (conn == null)
@@ -116,7 +116,7 @@ public abstract class SQLiteDatabase extends Database {
Vector<String> columns_names = new Vector<>(); Vector<String> columns_names = new Vector<>();
for (DBTableColumn column : table.columns.values()) for (DBTableColumn column : table.columns.values())
columns_names.add(column.toString()); columns_names.add(column.toString());
cmd += CommonUtils.RBrackets(String.join(",", columns_names)); cmd += Utils_.RBrackets(String.join(",", columns_names));
statement.execute(cmd); statement.execute(cmd);
} }
} }
@@ -135,8 +135,8 @@ public abstract class SQLiteDatabase extends Database {
} }
insertStatements.put(table.d, conn.prepareStatement( insertStatements.put(table.d, conn.prepareStatement(
"INSERT OR REPLACE INTO " + table.QName() + " " + "INSERT OR REPLACE INTO " + table.QName() + " " +
CommonUtils.RBrackets(String.join(",", column_names)) + " " + "VALUES " + Utils_.RBrackets(String.join(",", column_names)) + " " + "VALUES " +
CommonUtils.RBrackets(String.join(",", column_values)))); Utils_.RBrackets(String.join(",", column_values))));
//------------------------------------------------------------------------------->> //------------------------------------------------------------------------------->>
Vector<String> new_values = new Vector(); Vector<String> new_values = new Vector();
for (DBTableColumn column : table.columns.values()) { for (DBTableColumn column : table.columns.values()) {
@@ -194,7 +194,7 @@ public abstract class SQLiteDatabase extends Database {
if (field_value != null) { if (field_value != null) {
table.d.getField(column.Name).set(o, field_value); table.d.getField(column.Name).set(o, field_value);
} else } else
throw new PassException("Ошибка при загрузке поля " + CommonUtils.Brackets(column.Name) + " класса " + CommonUtils.Brackets(table.d.getSimpleName())); throw new PassException("Ошибка при загрузке поля " + Utils_.Brackets(column.Name) + " класса " + Utils_.Brackets(table.d.getSimpleName()));
} }
return new Pair<>((K) o.getPK(), o); return new Pair<>((K) o.getPK(), o);
} }
@@ -210,7 +210,7 @@ public abstract class SQLiteDatabase extends Database {
protected void insert(DBTable table, DBObject o) throws Exception { protected void insert(DBTable table, DBObject o) throws Exception {
PreparedStatement ps = insertStatements.get(table.d); PreparedStatement ps = insertStatements.get(table.d);
if (ps == null) if (ps == null)
CommonUI.Info("INSERT NULL"); UI_.Info("INSERT NULL");
int i = 1; int i = 1;
for (DBTableColumn column : table.columns.values()) { for (DBTableColumn column : table.columns.values()) {
if (!column.AutoIncrement) { if (!column.AutoIncrement) {
@@ -234,7 +234,7 @@ public abstract class SQLiteDatabase extends Database {
protected void update(DBTable table, DBObject o) throws Exception { protected void update(DBTable table, DBObject o) throws Exception {
PreparedStatement ps = updateStatements.get(table.d); PreparedStatement ps = updateStatements.get(table.d);
if (ps == null) if (ps == null)
CommonUI.Info("UPDATE NULL"); UI_.Info("UPDATE NULL");
int i = 1; int i = 1;
for (DBTableColumn column : table.columns.values()) { for (DBTableColumn column : table.columns.values()) {
if (!column.AutoIncrement) { if (!column.AutoIncrement) {

View File

@@ -8,7 +8,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.FilterInterface; import Common.Visual.FilterInterface;
import javax.swing.*; import javax.swing.*;
@@ -41,15 +41,15 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
Name = d.getSimpleName(); Name = d.getSimpleName();
} }
public void mountUI(JPanel content_in) { public void mountUI(JPanel content_in) {
CommonUI.Clear(content_in); UI_.Clear(content_in);
//--> //-->
ui_ = createUI(); ui_ = createUI();
ui_.setContent(content_in); ui_.setContent(content_in);
//--> //-->
if ( CommonUI.menuBars.containsKey(getClass())) { if ( UI_.menuBars.containsKey(getClass())) {
DataMenuBar bar = CommonUI.menuBars.get(getClass()); DataMenuBar bar = UI_.menuBars.get(getClass());
content_in.add(bar, BorderLayout.NORTH); content_in.add(bar, BorderLayout.NORTH);
setFilterUI(count -> CommonUI.menuBars.get(getClass()).countLabel.setText(String.valueOf(count))); setFilterUI(count -> UI_.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
if (ui_.hasCheckBox()) if (ui_.hasCheckBox())
bar.createSelectionButtons(this); bar.createSelectionButtons(this);
} }
@@ -57,7 +57,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
//---- //----
createFilters(); createFilters();
if (!filters.isEmpty()) { if (!filters.isEmpty()) {
DataMenuBar menuBar = CommonUI.menuBars.get(getClass()); DataMenuBar menuBar = UI_.menuBars.get(getClass());
for (DataSetFilter<D> filter : filters) for (DataSetFilter<D> filter : filters)
menuBar.addMenus(filter.menu); menuBar.addMenus(filter.menu);
} }
@@ -133,7 +133,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return false; return false;
} }
public boolean ShowDeleteObjectDialog(DBObject object) { public boolean ShowDeleteObjectDialog(DBObject object) {
return CommonUI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)"); return UI_.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
} }
public String QName() { public String QName() {
return "\"" + Name + "\""; return "\"" + Name + "\"";

View File

@@ -1,9 +1,9 @@
package Common.Passes; package Common.Passes;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Utils.Stopwatch; import Common.Utils.Stopwatch;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Visual_DVM_2021.PassStats.PassStats; import Visual_DVM_2021.PassStats.PassStats;
import Visual_DVM_2021.Passes.PassCode; import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.UI.PassForm; import Visual_DVM_2021.Passes.UI.PassForm;
@@ -53,9 +53,9 @@ public class Pass<T> {
//важно. вызывать только если есть интерфейс. passstats делать частью общей бд.пусть будут. //важно. вызывать только если есть интерфейс. passstats делать частью общей бд.пусть будут.
public static void CheckAllStats() throws Exception { public static void CheckAllStats() throws Exception {
for (Pass pass : FAPasses) { for (Pass pass : FAPasses) {
if (!((GlobalDatabase) CommonUtils.db).passStats.Data.containsKey(pass.code().toString())) if (!((GlobalDatabase) Utils_.db).passStats.Data.containsKey(pass.code().toString()))
CommonUtils.db.Insert(pass.stats = new PassStats(pass.code().toString())); Utils_.db.Insert(pass.stats = new PassStats(pass.code().toString()));
else pass.stats = ((GlobalDatabase) CommonUtils.db).passStats.Data.get(pass.code().toString()); else pass.stats = ((GlobalDatabase) Utils_.db).passStats.Data.get(pass.code().toString());
} }
FAPasses.sort(new SortPassesByStats()); FAPasses.sort(new SortPassesByStats());
} }
@@ -68,7 +68,7 @@ public class Pass<T> {
if (pass.hasStats()) if (pass.hasStats())
FAPasses.add(pass); FAPasses.add(pass);
} catch (Exception ex) { } catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex); Utils_.MainLog.PrintException(ex);
} }
} }
} }
@@ -78,7 +78,7 @@ public class Pass<T> {
return null; return null;
} }
public Icon getTabIcon() { public Icon getTabIcon() {
return CommonUtils.getTabIcon(getIconPath()); return Utils_.getTabIcon(getIconPath());
} }
public AbstractAction getControlAction() { public AbstractAction getControlAction() {
return new AbstractAction() { return new AbstractAction() {
@@ -128,12 +128,12 @@ public class Pass<T> {
if (hasStats()) { if (hasStats()) {
stats.Inc(); stats.Inc();
try { try {
CommonUtils.db.Update(stats); Utils_.db.Update(stats);
FAPasses.sort(new SortPassesByStats()); FAPasses.sort(new SortPassesByStats());
if (Current.HasProject()) if (Current.HasProject())
UI.fastAccessMenuBar.Refresh(); UI.fastAccessMenuBar.Refresh();
} catch (Exception ex) { } catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex); Utils_.MainLog.PrintException(ex);
} }
} }
} }
@@ -190,30 +190,30 @@ public class Pass<T> {
//- //-
private void PerformCanNotStart() throws Exception { private void PerformCanNotStart() throws Exception {
performCanNotStart(); performCanNotStart();
if (CommonUI.isActive()) if (UI_.isActive())
showCanNotStart(); showCanNotStart();
} }
protected void PerformPreparation() throws Exception { protected void PerformPreparation() throws Exception {
performPreparation(); performPreparation();
if (CommonUI.isActive()) if (UI_.isActive())
showPreparation(); showPreparation();
} }
private void PerformFinish() throws Exception { private void PerformFinish() throws Exception {
performFinish(); performFinish();
//- //-
if (CommonUI.isActive()) if (UI_.isActive())
showFinish(); showFinish();
} }
private void PerformDone() throws Exception { private void PerformDone() throws Exception {
performDone(); performDone();
//- //-
if (CommonUI.isActive()) if (UI_.isActive())
showDone(); showDone();
} }
private void PerformFail() throws Exception { private void PerformFail() throws Exception {
performFail(); performFail();
//- //-
if (CommonUI.isActive()) if (UI_.isActive())
showFail(); showFail();
} }
//------ //------
@@ -245,7 +245,7 @@ public class Pass<T> {
Vector<String> ToPrint = new Vector<>(); Vector<String> ToPrint = new Vector<>();
createStack_r(ToDo, ToPrint); createStack_r(ToDo, ToPrint);
if (Global.properties.ConfirmPassesStart && !ToPrint.isEmpty() && if (Global.properties.ConfirmPassesStart && !ToPrint.isEmpty() &&
!CommonUI.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint)) !UI_.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
) return false; ) return false;
while (ToDo.size() > 1) { while (ToDo.size() > 1) {
if (!ToDo.pop().start()) return false; if (!ToDo.pop().start()) return false;
@@ -256,7 +256,7 @@ public class Pass<T> {
//- //-
if (Global.properties.ShowPassesDone && !ToPrint.isEmpty() if (Global.properties.ShowPassesDone && !ToPrint.isEmpty()
) { ) {
CommonUI.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) + UI_.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) +
"\nуспешно выполнен(ы)!"); "\nуспешно выполнен(ы)!");
} }
//- //-
@@ -270,7 +270,7 @@ public class Pass<T> {
return false; return false;
} }
public void Interrupt() throws Exception { public void Interrupt() throws Exception {
CommonUI.Info("Проход " + CommonUtils.Brackets(getDescription()) + " не разрешено прерывать."); UI_.Info("Проход " + Utils_.Brackets(getDescription()) + " не разрешено прерывать.");
} }
public boolean needsConfirmations() { public boolean needsConfirmations() {
return false; return false;
@@ -281,7 +281,7 @@ public class Pass<T> {
if (ex instanceof PassException) { if (ex instanceof PassException) {
Log.Writeln_(ex.getMessage()); Log.Writeln_(ex.getMessage());
} else } else
CommonUtils.MainLog.PrintException(ex); Utils_.MainLog.PrintException(ex);
} }
public boolean start(Object... args) { public boolean start(Object... args) {
//-------------------------------> //------------------------------->
@@ -293,15 +293,15 @@ public class Pass<T> {
target = null; target = null;
Log = new TextLog(); Log = new TextLog();
if (!getDescription().isEmpty()) if (!getDescription().isEmpty())
CommonUtils.MainLog.Print(getDescription() + " стартует.."); Utils_.MainLog.Print(getDescription() + " стартует..");
timer.Start(); timer.Start();
//-------------------------------> //------------------------------->
try { try {
if (CommonUI.isActive()) FocusBeforeStart(); if (UI_.isActive()) FocusBeforeStart();
if (canStart(args)) { if (canStart(args)) {
PerformPreparation(); PerformPreparation();
//todo тут должна быть вилка на анимацию? //todo тут должна быть вилка на анимацию?
if (CommonUI.isActive() && needsAnimation()) { if (UI_.isActive() && needsAnimation()) {
animation_sem = new Semaphore(1); animation_sem = new Semaphore(1);
animation_sem.acquire(); animation_sem.acquire();
//--- //---
@@ -324,7 +324,7 @@ public class Pass<T> {
try { try {
animation_sem.acquire(); animation_sem.acquire();
} catch (InterruptedException e) { } catch (InterruptedException e) {
CommonUtils.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
} }
//и уничтожаем его. //и уничтожаем его.
// UI.Print(DebugPrintLevel.Passes, "Окно анимации активировано."); // UI.Print(DebugPrintLevel.Passes, "Окно анимации активировано.");
@@ -375,19 +375,19 @@ public class Pass<T> {
} }
} catch (Exception ex) { } catch (Exception ex) {
state = PassState.ExternalCrushed; state = PassState.ExternalCrushed;
CommonUtils.MainLog.PrintException(ex); Utils_.MainLog.PrintException(ex);
} }
//-------------------------------> //------------------------------->
timer.Stop(); timer.Stop();
if (!getDescription().isEmpty()) { if (!getDescription().isEmpty()) {
CommonUtils.MainLog.Print( Utils_.MainLog.Print(
getDescription() + getDescription() +
" окончен за " + timer.Print() + " окончен за " + timer.Print() +
" состояние " + CommonUtils.Brackets(state.getDescription()) " состояние " + Utils_.Brackets(state.getDescription())
); );
if (!Log.isEmpty() && CommonUI.isActive()) if (!Log.isEmpty() && UI_.isActive())
CommonUI.Error( UI_.Error(
"проход " + CommonUtils.Brackets(getDescription()) + "\n" + state.getDescription() + "\n\n" + "проход " + Utils_.Brackets(getDescription()) + "\n" + state.getDescription() + "\n\n" +
Log.toString()); Log.toString());
} }
//-------------------------------> //------------------------------->
@@ -395,7 +395,7 @@ public class Pass<T> {
} }
//-- //--
public void ShowSapforMessage(String message) { public void ShowSapforMessage(String message) {
if (CommonUI.isActive() && form != null) { if (UI_.isActive() && form != null) {
String[] data = message.split(":"); String[] data = message.split(":");
switch (data[0]) { switch (data[0]) {
case "message_1": case "message_1":
@@ -408,17 +408,17 @@ public class Pass<T> {
form.fields.ProgressBar.setValue((data.length > 1) ? Integer.parseInt(data[1]) : 0); form.fields.ProgressBar.setValue((data.length > 1) ? Integer.parseInt(data[1]) : 0);
break; break;
} }
} else System.out.println(CommonUtils.Brackets(message)); } else System.out.println(Utils_.Brackets(message));
} }
public void ShowMessage1(String message) { public void ShowMessage1(String message) {
if (form != null) if (form != null)
form.fields.Label1.setText((message.length() > 1) ? message : ""); form.fields.Label1.setText((message.length() > 1) ? message : "");
else System.out.println(CommonUtils.Brackets(message)); else System.out.println(Utils_.Brackets(message));
} }
public void ShowMessage2(String message) { public void ShowMessage2(String message) {
if (form != null) if (form != null)
form.fields.Label2.setText((message.isEmpty() ? "" : message)); form.fields.Label2.setText((message.isEmpty() ? "" : message));
else System.out.println(CommonUtils.Brackets(message)); else System.out.println(Utils_.Brackets(message));
} }
public void ShowProgress(int total, int current, boolean auto) { public void ShowProgress(int total, int current, boolean auto) {
if (form != null) { if (form != null) {

View File

@@ -1,5 +1,5 @@
package Common.Utils; package Common.Utils;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Utils; import _VisualDVM.Utils;
import java.io.File; import java.io.File;
@@ -23,7 +23,7 @@ public interface Loggable {
default void Print(String message) { default void Print(String message) {
try { try {
FileWriter Log = new FileWriter(getLogFile(), true); FileWriter Log = new FileWriter(getLogFile(), true);
String datedMessage = CommonUtils.Brackets(new Date()) + " " + message; String datedMessage = Utils_.Brackets(new Date()) + " " + message;
Log.write(datedMessage + "\n"); Log.write(datedMessage + "\n");
Log.close(); Log.close();
} catch (Exception ignored) { } catch (Exception ignored) {
@@ -35,8 +35,8 @@ public interface Loggable {
ex.printStackTrace(writer); ex.printStackTrace(writer);
writer.flush(); writer.flush();
Print(out.toString()); Print(out.toString());
if (CommonUI.isActive()) if (UI_.isActive())
CommonUI.Error("Возникло исключение. Подробности в файле журнала\n" + UI_.Error("Возникло исключение. Подробности в файле журнала\n" +
CommonUtils.Brackets(getLogFile().getAbsolutePath())); Utils_.Brackets(getLogFile().getAbsolutePath()));
} }
} }

View File

@@ -11,8 +11,8 @@ public class StringTemplate {
public String pattern = ""; public String pattern = "";
//------------------------------------------------------------------ //------------------------------------------------------------------
public StringTemplate(String p, String s) { public StringTemplate(String p, String s) {
prefix = CommonUtils.removeRedundantSpaces(p); prefix = Utils_.removeRedundantSpaces(p);
suffix = CommonUtils.removeRedundantSpaces(s); suffix = Utils_.removeRedundantSpaces(s);
String[] prefix_words = prefix.split(" "); String[] prefix_words = prefix.split(" ");
String[] suffix_words = suffix.split(" "); String[] suffix_words = suffix.split(" ");
//настраиваем регулярное выражение---------- //настраиваем регулярное выражение----------

View File

@@ -6,7 +6,7 @@ public class TextLog {
} }
public void Writeln_(String line) { public void Writeln_(String line) {
text += line + "\n"; text += line + "\n";
CommonUtils.MainLog.Print(line); Utils_.MainLog.Print(line);
} }
public void Clear() { public void Clear() {
text = ""; text = "";

View File

@@ -21,7 +21,7 @@ import java.util.Vector;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class CommonUtils { public class Utils_ {
static String HomePath = System.getProperty("user.dir"); static String HomePath = System.getProperty("user.dir");
public static void setHomePath(String path_in){ public static void setHomePath(String path_in){
HomePath = path_in; HomePath = path_in;
@@ -401,14 +401,14 @@ public class CommonUtils {
} }
//Иконки //Иконки
public static ImageIcon getIcon(String path) { public static ImageIcon getIcon(String path) {
URL imageUrl = CommonUtils.class.getResource(path); URL imageUrl = Utils_.class.getResource(path);
if (imageUrl == null) { if (imageUrl == null) {
return null; return null;
} }
return new ImageIcon(imageUrl); return new ImageIcon(imageUrl);
} }
public static ImageIcon getTabIcon(String path) { public static ImageIcon getTabIcon(String path) {
URL imageUrl = CommonUtils.class.getResource(path); URL imageUrl = Utils_.class.getResource(path);
if (imageUrl == null) { if (imageUrl == null) {
return null; return null;
} }

View File

@@ -1,5 +1,5 @@
package Common.Visual; package Common.Visual;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@@ -34,7 +34,7 @@ public class ControlForm<C extends Component> {
try { try {
control = control_class.newInstance(); control = control_class.newInstance();
} catch (Exception e) { } catch (Exception e) {
CommonUtils.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
} }
} }
public boolean isShown() { public boolean isShown() {

View File

@@ -1,10 +1,10 @@
package Common.Visual.Controls; package Common.Visual.Controls;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
public class HyperlinksStyledList extends StyledList { public class HyperlinksStyledList extends StyledList {
@Override @Override
public void applyTheme() { public void applyTheme() {
super.applyTheme(); super.applyTheme();
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
} }
} }

View File

@@ -1,6 +1,6 @@
package Common.Visual.Controls; package Common.Visual.Controls;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
@@ -9,7 +9,7 @@ import java.awt.*;
public class MenuBarButton extends JButton { public class MenuBarButton extends JButton {
public MenuBarButton() { public MenuBarButton() {
super(); super();
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
// //
setBorderPainted(false); setBorderPainted(false);
setContentAreaFilled(false); setContentAreaFilled(false);
@@ -27,9 +27,9 @@ public class MenuBarButton extends JButton {
super.paintComponent(g); super.paintComponent(g);
} }
public void setIcon(String icon_path) { public void setIcon(String icon_path) {
setIcon(CommonUtils.getIcon(icon_path)); setIcon(Utils_.getIcon(icon_path));
} }
public void setFont(VisualiserFonts font_in){ public void setFont(VisualiserFonts font_in){
setFont(CommonUI.getTheme().Fonts.get(font_in)); setFont(UI_.getTheme().Fonts.get(font_in));
} }
} }

View File

@@ -1,17 +1,17 @@
package Common.Visual.Controls; package Common.Visual.Controls;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
public class StyledList extends JList implements ThemeElement { public class StyledList extends JList implements ThemeElement {
public StyledList() { public StyledList() {
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
applyTheme(); applyTheme();
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(CommonUI.getTheme().table_background); setBackground(UI_.getTheme().table_background);
setForeground(CommonUI.getTheme().foreground); setForeground(UI_.getTheme().foreground);
} }
} }

View File

@@ -1,5 +1,5 @@
package Common.Visual.Controls; package Common.Visual.Controls;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import javax.swing.*; import javax.swing.*;
@@ -10,7 +10,7 @@ public class StyledProgressBar extends JProgressBar implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(CommonUI.getTheme().bar_background); setBackground(UI_.getTheme().bar_background);
setForeground(CommonUI.getTheme().bar_foreground); setForeground(UI_.getTheme().bar_foreground);
} }
} }

View File

@@ -1,5 +1,5 @@
package Common.Visual; package Common.Visual;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Visual.Menus.StableMenuItem; import _VisualDVM.Visual.Menus.StableMenuItem;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
@@ -20,7 +20,7 @@ public abstract class DBObjectFilter<D extends DBObject> {
return "/Common/icons/Pick.png"; return "/Common/icons/Pick.png";
} }
void Mark() { void Mark() {
menuItem.setIcon(CommonUtils.getIcon(active ? getActiveIconPath() : getNotActiveIconPath())); menuItem.setIcon(Utils_.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
} }
//------- //-------
public boolean Validate(D object) { public boolean Validate(D object) {
@@ -53,7 +53,7 @@ public abstract class DBObjectFilter<D extends DBObject> {
count = 0; count = 0;
} }
public void Refresh() { public void Refresh() {
menuItem.setText(description + " " + CommonUtils.RBrackets(count)); menuItem.setText(description + " " + Utils_.RBrackets(count));
} }
public boolean isActive() { public boolean isActive() {
return active; return active;

View File

@@ -1,7 +1,7 @@
package Common.Visual; package Common.Visual;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable; import Common.Database.Tables.DBTable;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
@@ -54,7 +54,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
@Override @Override
public void Clear() { public void Clear() {
super.Clear(); super.Clear();
CommonUI.Clear(dataPanel); UI_.Clear(dataPanel);
} }
public DataSet getDataSource() { public DataSet getDataSource() {
return dataSource; return dataSource;
@@ -64,21 +64,21 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
return getDataSource().CurrentName(); return getDataSource().CurrentName();
} }
public void SaveColumns() { public void SaveColumns() {
if (CommonUtils.db != null) { if (Utils_.db != null) {
try { try {
if ((CurrentName() != null)) { if ((CurrentName() != null)) {
String tableName= CurrentName().toString(); String tableName= CurrentName().toString();
Vector<String> widths = IntStream.range(0, columns.size()).mapToObj(i -> String.valueOf(control.getColumnModel().getColumn(i).getWidth())).collect(Collectors.toCollection(Vector::new)); Vector<String> widths = IntStream.range(0, columns.size()).mapToObj(i -> String.valueOf(control.getColumnModel().getColumn(i).getWidth())).collect(Collectors.toCollection(Vector::new));
String packed = String.join("|", widths); String packed = String.join("|", widths);
TableVisualData tableVisualData; TableVisualData tableVisualData;
if (CommonUtils.db.tablesVisualData.containsKey(tableName)) { if (Utils_.db.tablesVisualData.containsKey(tableName)) {
tableVisualData = CommonUtils.db.tablesVisualData.get(tableName); tableVisualData = Utils_.db.tablesVisualData.get(tableName);
} else { } else {
tableVisualData = new TableVisualData(tableName); tableVisualData = new TableVisualData(tableName);
CommonUtils.db.Insert(tableVisualData); Utils_.db.Insert(tableVisualData);
} }
tableVisualData.sizes = packed; tableVisualData.sizes = packed;
CommonUtils.db.Update(tableVisualData); Utils_.db.Update(tableVisualData);
} }
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
@@ -149,9 +149,9 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
//-----------------------------NEW------------------------------------- //-----------------------------NEW-------------------------------------
@Override @Override
public void CorrectColumnsSizes() { public void CorrectColumnsSizes() {
if ((CommonUtils.db != null) && CurrentName() != null && CommonUtils.db.tablesVisualData.containsKey(CurrentName().toString())) { if ((Utils_.db != null) && CurrentName() != null && Utils_.db.tablesVisualData.containsKey(CurrentName().toString())) {
if (!getColumnsProfile().equalsIgnoreCase(colNamesAndSizes)) { if (!getColumnsProfile().equalsIgnoreCase(colNamesAndSizes)) {
TableVisualData grid = CommonUtils.db.tablesVisualData.get(CurrentName().toString()); TableVisualData grid = Utils_.db.tablesVisualData.get(CurrentName().toString());
String[] data = grid.sizes.split("\\|"); String[] data = grid.sizes.split("\\|");
for (int i = 0; i < columns.size(); ++i) { for (int i = 0; i < columns.size(); ++i) {
if (i <= (data.length - 1)) { if (i <= (data.length - 1)) {
@@ -220,7 +220,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
try { try {
ShowCurrentObject(); ShowCurrentObject();
} catch (Exception ex) { } catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex); Utils_.MainLog.PrintException(ex);
} }
} }
} }
@@ -231,7 +231,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
try { try {
ShowNoCurrentObject(); ShowNoCurrentObject();
} catch (Exception ex) { } catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex); Utils_.MainLog.PrintException(ex);
} }
} }
} }
@@ -244,7 +244,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
try { try {
MouseAction2(); MouseAction2();
} catch (Exception ex) { } catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex); Utils_.MainLog.PrintException(ex);
} }
} }
} }
@@ -255,7 +255,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
try { try {
ShowNoCurrentObject(); ShowNoCurrentObject();
} catch (Exception e) { } catch (Exception e) {
CommonUtils.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
} }
} }
//--- //---

View File

@@ -1,5 +1,5 @@
package Common.Visual.DragDrop; package Common.Visual.DragDrop;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.DataFlavor;
import java.io.*; import java.io.*;
@@ -314,12 +314,12 @@ public class FileDrop {
} // end try } // end try
catch (IOException io) { catch (IOException io) {
log(out, "FileDrop: IOException - abort:"); log(out, "FileDrop: IOException - abort:");
CommonUtils.MainLog.PrintException(io); Utils_.MainLog.PrintException(io);
evt.rejectDrop(); evt.rejectDrop();
} // end catch IOException } // end catch IOException
catch (java.awt.datatransfer.UnsupportedFlavorException ufe) { catch (java.awt.datatransfer.UnsupportedFlavorException ufe) {
log(out, "FileDrop: UnsupportedFlavorException - abort:"); log(out, "FileDrop: UnsupportedFlavorException - abort:");
CommonUtils.MainLog.PrintException(ufe); Utils_.MainLog.PrintException(ufe);
evt.rejectDrop(); evt.rejectDrop();
} // end catch: UnsupportedFlavorException } // end catch: UnsupportedFlavorException
finally { finally {
@@ -446,7 +446,7 @@ public class FileDrop {
dt.addDropTargetListener(dropListener); dt.addDropTargetListener(dropListener);
} // end try } // end try
catch (java.util.TooManyListenersException e) { catch (java.util.TooManyListenersException e) {
CommonUtils.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
log(out, "FileDrop: Drop will not work due to previous error. Do you have another listener attached?"); log(out, "FileDrop: Drop will not work due to previous error. Do you have another listener attached?");
} // end catch } // end catch
// Listen for hierarchy changes and remove the drop target when the parent gets cleared out. // Listen for hierarchy changes and remove the drop target when the parent gets cleared out.

View File

@@ -1,5 +1,5 @@
package Common.Visual.Menus; package Common.Visual.Menus;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import javax.swing.*; import javax.swing.*;
@@ -21,15 +21,15 @@ public class StyledPopupMenu extends JPopupMenu implements ThemeElement {
}); });
} }
private void refreshTheme_r(MenuElement element) { private void refreshTheme_r(MenuElement element) {
element.getComponent().setBackground(CommonUI.getTheme().background); element.getComponent().setBackground(UI_.getTheme().background);
element.getComponent().setForeground(CommonUI.getTheme().foreground); element.getComponent().setForeground(UI_.getTheme().foreground);
for (MenuElement se : element.getSubElements()) for (MenuElement se : element.getSubElements())
refreshTheme_r(se); refreshTheme_r(se);
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(CommonUI.getTheme().background); setBackground(UI_.getTheme().background);
setForeground(CommonUI.getTheme().foreground); setForeground(UI_.getTheme().foreground);
refreshTheme_r(this); refreshTheme_r(this);
} }
public void CheckElementsVisibility() { public void CheckElementsVisibility() {

View File

@@ -1,8 +1,6 @@
package Common.Visual.Menus; package Common.Visual.Menus;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import javax.swing.*; import javax.swing.*;
public class TableMenu extends StyledPopupMenu { public class TableMenu extends StyledPopupMenu {
@@ -16,7 +14,7 @@ public class TableMenu extends StyledPopupMenu {
owner = owner_in; owner = owner_in;
mcopy = new VisualiserMenuItem("Копировать текст текущей ячейки", "/icons/Editor/Copy.png"); mcopy = new VisualiserMenuItem("Копировать текст текущей ячейки", "/icons/Editor/Copy.png");
//если удалось нажать значит все условия выполнены //если удалось нажать значит все условия выполнены
mcopy.addActionListener(e -> CommonUtils.CopyToClipboard(target.toString())); mcopy.addActionListener(e -> Utils_.CopyToClipboard(target.toString()));
add(mcopy); add(mcopy);
} }
@Override @Override

View File

@@ -1,8 +1,6 @@
package Common.Visual.Menus; package Common.Visual.Menus;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import javax.swing.*; import javax.swing.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
@@ -20,7 +18,7 @@ public class TextComboBoxMenu extends StyledPopupMenu {
new AbstractAction() { new AbstractAction() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
CommonUtils.CopyToClipboard(box.getSelectedItem().toString()); Utils_.CopyToClipboard(box.getSelectedItem().toString());
} }
}); });
add(m_copy); add(m_copy);
@@ -29,7 +27,7 @@ public class TextComboBoxMenu extends StyledPopupMenu {
new AbstractAction() { new AbstractAction() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
CommonUI.TrySelect(box, CommonUtils.getFromClipboard()); UI_.TrySelect(box, Utils_.getFromClipboard());
} }
}); });
add(m_paste); add(m_paste);

View File

@@ -1,7 +1,5 @@
package Common.Visual.Menus; package Common.Visual.Menus;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import javax.swing.*; import javax.swing.*;
import javax.swing.text.JTextComponent; import javax.swing.text.JTextComponent;
@@ -54,7 +52,7 @@ public class TextEditorMenu extends StyledPopupMenu {
String[] data = selectedText.split("\n"); String[] data = selectedText.split("\n");
Vector<String> new_data = new Vector<>(); Vector<String> new_data = new Vector<>();
for (String line: data){ for (String line: data){
new_data.add(CommonUtils.strikeThrough(line)); new_data.add(Utils_.strikeThrough(line));
} }
editor.replaceSelection(String.join("\n", new_data)); editor.replaceSelection(String.join("\n", new_data));
} }
@@ -68,7 +66,7 @@ public class TextEditorMenu extends StyledPopupMenu {
String[] data = selectedText.split("\n"); String[] data = selectedText.split("\n");
Vector<String> new_data = new Vector<>(); Vector<String> new_data = new Vector<>();
for (String line: data){ for (String line: data){
new_data.add(CommonUtils.noStrikeThrough(line)); new_data.add(Utils_.noStrikeThrough(line));
} }
editor.replaceSelection(String.join("\n", new_data)); editor.replaceSelection(String.join("\n", new_data));
} }

View File

@@ -1,21 +1,21 @@
package Common.Visual.Menus; package Common.Visual.Menus;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
public class VisualiserMenuItem extends JMenuItem { public class VisualiserMenuItem extends JMenuItem {
public VisualiserMenuItem(String text) { public VisualiserMenuItem(String text) {
super(text, null); super(text, null);
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
} }
public VisualiserMenuItem(String text, String icon_path) { public VisualiserMenuItem(String text, String icon_path) {
super(text); super(text);
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
if (icon_path != null) if (icon_path != null)
setIcon(CommonUtils.getIcon(icon_path)); setIcon(Utils_.getIcon(icon_path));
} }
public VisualiserMenuItem(){ public VisualiserMenuItem(){
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
} }
} }

View File

@@ -1,5 +1,5 @@
package Common.Visual; package Common.Visual;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import javax.swing.*; import javax.swing.*;
public interface Selectable { public interface Selectable {
@@ -13,11 +13,11 @@ public interface Selectable {
default ImageIcon GetSelectionIcon() { default ImageIcon GetSelectionIcon() {
return return
isSelectionEnabled() ? isSelectionEnabled() ?
CommonUtils.getIcon("/Common/icons/" + (isSelected() ? "Pick" : "NotPick") + ".png") : Utils_.getIcon("/Common/icons/" + (isSelected() ? "Pick" : "NotPick") + ".png") :
GetDisabledIcon(); GetDisabledIcon();
} }
default ImageIcon GetDisabledIcon() { default ImageIcon GetDisabledIcon() {
return CommonUtils.getIcon("/Common/icons/Arrays/Unknown.png"); return Utils_.getIcon("/Common/icons/Arrays/Unknown.png");
} }
default void SwitchSelection() { default void SwitchSelection() {
Select(!isSelected()); Select(!isSelected());

View File

@@ -1,6 +1,6 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.TextField.StyledTextField; import Common.Visual.TextField.StyledTextField;
import javax.swing.*; import javax.swing.*;
@@ -47,7 +47,7 @@ public class ColumnFilter {
//-- //--
dataSet.getUi().control.getColumnModel().getColumn(columnIndex).setHeaderRenderer((table, value, isSelected, hasFocus, row, column1) -> new JLabel() { dataSet.getUi().control.getColumnModel().getColumn(columnIndex).setHeaderRenderer((table, value, isSelected, hasFocus, row, column1) -> new JLabel() {
{ {
setIcon(CommonUtils.getIcon("/icons/Filter.png")); setIcon(Utils_.getIcon("/icons/Filter.png"));
setForeground(dataSet.getUi().control.getTableHeader().getForeground()); setForeground(dataSet.getUi().control.getTableHeader().getForeground());
setBackground(dataSet.getUi().control.getTableHeader().getBackground()); setBackground(dataSet.getUi().control.getTableHeader().getBackground());
setFont(dataSet.getUi().control.getTableHeader().getFont()); setFont(dataSet.getUi().control.getTableHeader().getFont());

View File

@@ -1,5 +1,5 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import javax.swing.*; import javax.swing.*;
import java.util.Date; import java.util.Date;
@@ -13,6 +13,6 @@ public class DateRenderer_ extends RendererCell<Date> {
@Override @Override
public void Display() { public void Display() {
if (value != null) if (value != null)
setText(value.equals(zero) ? "нет" : CommonUtils.print_date(value)); setText(value.equals(zero) ? "нет" : Utils_.print_date(value));
} }
} }

View File

@@ -1,5 +1,5 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
@@ -12,6 +12,6 @@ public class HiddenListRenderer extends RendererCell<Vector<String>> {
@Override @Override
public void Display() { public void Display() {
setText(String.join(";", value)); setText(String.join(";", value));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
} }
} }

View File

@@ -1,5 +1,5 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.StatusEnum; import Common.Visual.StatusEnum;
import javax.swing.*; import javax.swing.*;
@@ -12,7 +12,7 @@ public class StatusEnumRenderer extends RendererCell<StatusEnum> {
public void Display() { public void Display() {
if (value != null) { if (value != null) {
setText(value.getDescription()); setText(value.getDescription());
setFont(CommonUI.getTheme().Fonts.get(value.getFont())); setFont(UI_.getTheme().Fonts.get(value.getFont()));
} }
} }
} }

View File

@@ -1,5 +1,5 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
@@ -7,7 +7,7 @@ import javax.swing.*;
//наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы. //наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы.
public class StyledCellLabel extends JLabel implements ThemeElement { public class StyledCellLabel extends JLabel implements ThemeElement {
public StyledCellLabel() { public StyledCellLabel() {
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
setHorizontalAlignment(SwingConstants.LEFT); setHorizontalAlignment(SwingConstants.LEFT);
setVerticalAlignment(SwingConstants.CENTER); setVerticalAlignment(SwingConstants.CENTER);
setOpaque(true); setOpaque(true);
@@ -15,7 +15,7 @@ public class StyledCellLabel extends JLabel implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(CommonUI.getTheme().table_background); setBackground(UI_.getTheme().table_background);
setForeground(CommonUI.getTheme().foreground); setForeground(UI_.getTheme().foreground);
} }
} }

View File

@@ -1,5 +1,5 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Menus.TableMenu; import Common.Visual.Menus.TableMenu;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
@@ -16,9 +16,9 @@ public abstract class StyledTable extends JTable implements ThemeElement {
setFillsViewportHeight(true); setFillsViewportHeight(true);
setAutoCreateRowSorter(dataModel.getRowCount() > 0); setAutoCreateRowSorter(dataModel.getRowCount() > 0);
Init(); Init();
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
JTableHeader header = getTableHeader(); JTableHeader header = getTableHeader();
header.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain)); header.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
setSelectionMode(ListSelectionModel.SINGLE_SELECTION); setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
//текущий объет может определяться по первому столбцу. могут быть баги если не запретить //текущий объет может определяться по первому столбцу. могут быть баги если не запретить
@@ -77,10 +77,10 @@ public abstract class StyledTable extends JTable implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(CommonUI.getTheme().table_background); setBackground(UI_.getTheme().table_background);
setForeground(CommonUI.getTheme().foreground); setForeground(UI_.getTheme().foreground);
setSelectionBackground(CommonUI.getTheme().selection_background); setSelectionBackground(UI_.getTheme().selection_background);
setSelectionForeground(CommonUI.getTheme().foreground); setSelectionForeground(UI_.getTheme().foreground);
} }
public void SelectRow(int r) { public void SelectRow(int r) {
getSelectionModel().setSelectionInterval(r, r); getSelectionModel().setSelectionInterval(r, r);

View File

@@ -1,5 +1,5 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
@@ -10,7 +10,7 @@ public class WrapTextRenderer extends JTextArea implements TableCellRenderer {
setLineWrap(true); setLineWrap(true);
setWrapStyleWord(true); setWrapStyleWord(true);
// setOpaque(false); // setOpaque(false);
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Distribution).deriveFont(14.0f)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Distribution).deriveFont(14.0f));
} }
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground()); setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());

View File

@@ -1,8 +1,7 @@
package Common.Visual.Themes; package Common.Visual.Themes;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.VisualiserColor; import Common.Visual.VisualiserColor;
import org.fife.ui.rsyntaxtextarea.Theme;
import java.awt.*; import java.awt.*;
import java.awt.font.TextAttribute; import java.awt.font.TextAttribute;
@@ -169,7 +168,7 @@ public abstract class VisualiserTheme {
table_background = Color.decode(getTableBackgroundHex()); table_background = Color.decode(getTableBackgroundHex());
createFonts(); createFonts();
} catch (Exception ex) { } catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex); Utils_.MainLog.PrintException(ex);
} }
} }
} }

View File

@@ -1,6 +1,6 @@
package Common.Visual.Trees; package Common.Visual.Trees;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.DataControl_OLD; import Common.Visual.DataControl_OLD;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
@@ -25,7 +25,7 @@ public class DataTree extends StyledTree implements DataControl_OLD {
try { try {
ShowCurrentObject(); ShowCurrentObject();
} catch (Exception ex) { } catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex); Utils_.MainLog.PrintException(ex);
} }
} }
public void SelectNodeByCriteria(Object criteria) { public void SelectNodeByCriteria(Object criteria) {

View File

@@ -1,6 +1,6 @@
package Common.Visual.Trees; package Common.Visual.Trees;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages; import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
@@ -15,11 +15,11 @@ public class GraphTreeCellRenderer extends StyledTreeCellRenderer {
Object o = ((DefaultMutableTreeNode) value).getUserObject(); Object o = ((DefaultMutableTreeNode) value).getUserObject();
if (o instanceof FileObjectWithMessages) { if (o instanceof FileObjectWithMessages) {
FileObjectWithMessages target = (FileObjectWithMessages) o; FileObjectWithMessages target = (FileObjectWithMessages) o;
setIcon(CommonUtils.getIcon(target.ImageKey())); setIcon(Utils_.getIcon(target.ImageKey()));
setFont(CommonUI.getTheme().Fonts.get(target.getFont())); setFont(UI_.getTheme().Fonts.get(target.getFont()));
} else { } else {
setIcon(null); setIcon(null);
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
} }
setForeground(tree.getForeground()); setForeground(tree.getForeground());
return this; return this;

View File

@@ -1,5 +1,5 @@
package Common.Visual.Trees; package Common.Visual.Trees;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Selectable; import Common.Visual.Selectable;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
@@ -17,7 +17,7 @@ public class SelectionTreeCellRenderer extends StyledTreeCellRenderer {
setText(selectable.getSelectionText()); setText(selectable.getSelectionText());
setIcon(selectable.GetSelectionIcon()); setIcon(selectable.GetSelectionIcon());
} else { } else {
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setIcon(null); setIcon(null);
} }
setForeground(tree.getForeground()); setForeground(tree.getForeground());

View File

@@ -1,5 +1,5 @@
package Common.Visual.Trees; package Common.Visual.Trees;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Visual.Menus.GraphMenu; import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
@@ -22,7 +22,7 @@ public class StyledTree extends JTree implements ThemeElement {
super(root_in); super(root_in);
root = root_in; root = root_in;
setOpaque(true); setOpaque(true);
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
setToggleClickCount(0); //отключение сворачивание разворачивания по двойному клику setToggleClickCount(0); //отключение сворачивание разворачивания по двойному клику
//-- //--
if (!getRenderer().equals(TreeRenderers.RendererUndefined)) if (!getRenderer().equals(TreeRenderers.RendererUndefined))
@@ -86,8 +86,8 @@ public class StyledTree extends JTree implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(CommonUI.getTheme().trees_background); setBackground(UI_.getTheme().trees_background);
setForeground(CommonUI.getTheme().foreground); setForeground(UI_.getTheme().foreground);
menu.applyTheme(); menu.applyTheme();
} }
protected GraphMenu createMenu() { protected GraphMenu createMenu() {

View File

@@ -1,5 +1,5 @@
package Common.Visual.Trees; package Common.Visual.Trees;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeCellRenderer;
@@ -9,7 +9,7 @@ public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements T
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackgroundNonSelectionColor(CommonUI.getTheme().trees_background); setBackgroundNonSelectionColor(UI_.getTheme().trees_background);
setBackgroundSelectionColor(CommonUI.getTheme().selection_background); setBackgroundSelectionColor(UI_.getTheme().selection_background);
} }
} }

View File

@@ -1,5 +1,5 @@
package Common.Visual.Trees; package Common.Visual.Trees;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.ControlForm; import Common.Visual.ControlForm;
import java.awt.*; import java.awt.*;
@@ -25,6 +25,6 @@ public class TreeForm<C extends StyledTree> extends ControlForm<C> {
@Override @Override
public void Clear() { public void Clear() {
super.Clear(); super.Clear();
CommonUI.Clear(content); UI_.Clear(content);
} }
} }

View File

@@ -1,6 +1,6 @@
package Common.Visual; package Common.Visual;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Themes.DefaultTheme; import Common.Visual.Themes.DefaultTheme;
import Common.Visual.Themes.VisualiserTheme; import Common.Visual.Themes.VisualiserTheme;
@@ -11,7 +11,7 @@ import javax.swing.text.DefaultFormatter;
import java.awt.*; import java.awt.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Stack; import java.util.Stack;
public class CommonUI { public class UI_ {
public static boolean active=false; //есть ли интерфейс. в консольных версиях не нужен. public static boolean active=false; //есть ли интерфейс. в консольных версиях не нужен.
public static MenuElement[] last_menu_path; //для меню public static MenuElement[] last_menu_path; //для меню
public static boolean isActive() { public static boolean isActive() {
@@ -75,7 +75,7 @@ public class CommonUI {
} }
//Примитивные диалоговые элементы //Примитивные диалоговые элементы
public static boolean Question(Component parent, String text) { public static boolean Question(Component parent, String text) {
return !CommonUI.isActive() || (JOptionPane.showConfirmDialog(parent, return !UI_.isActive() || (JOptionPane.showConfirmDialog(parent,
text + "?", text + "?",
"Подтверждение", "Подтверждение",
JOptionPane.YES_NO_OPTION, JOptionPane.YES_NO_OPTION,
@@ -85,17 +85,17 @@ public class CommonUI {
return Question(getFrontWindow(), text); return Question(getFrontWindow(), text);
} }
public static void Info(String message) { public static void Info(String message) {
CommonUtils.CopyToClipboard(message); Utils_.CopyToClipboard(message);
if (CommonUI.isActive()) if (UI_.isActive())
JOptionPane.showMessageDialog(getFrontWindow(), message, "", 1); JOptionPane.showMessageDialog(getFrontWindow(), message, "", 1);
} }
public static void Error(String message) { public static void Error(String message) {
CommonUtils.CopyToClipboard(message); Utils_.CopyToClipboard(message);
if (CommonUI.isActive()) if (UI_.isActive())
JOptionPane.showMessageDialog(getFrontWindow(), message, "", 0); JOptionPane.showMessageDialog(getFrontWindow(), message, "", 0);
} }
public static boolean Warning(String text) { public static boolean Warning(String text) {
return !CommonUI.isActive() || return !UI_.isActive() ||
JOptionPane.showConfirmDialog(getFrontWindow(), JOptionPane.showConfirmDialog(getFrontWindow(),
text + "\nВы уверены?", text + "\nВы уверены?",
"Подтверждение", "Подтверждение",

View File

@@ -1,6 +1,6 @@
package Common.Visual.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Utils.TextLog; import Common.Utils.TextLog;
@@ -35,9 +35,9 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
setModal(true); setModal(true);
toFront(); toFront();
getContentPane().setLayout(new BorderLayout()); getContentPane().setLayout(new BorderLayout());
lTitle.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu)); lTitle.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
if (!getIconPath().isEmpty()) { if (!getIconPath().isEmpty()) {
setIconImage(CommonUtils.getIcon(getIconPath()).getImage()); setIconImage(Utils_.getIcon(getIconPath()).getImage());
} }
//делаем титульную надпись в самом окне чтобы не зависеть от языковой политики ОС //делаем титульную надпись в самом окне чтобы не зависеть от языковой политики ОС
getContentPane().add(lTitle, BorderLayout.NORTH); getContentPane().add(lTitle, BorderLayout.NORTH);
@@ -51,7 +51,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() { addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) { public void windowClosing(WindowEvent e) {
CommonUI.windowsStack.pop(); UI_.windowsStack.pop();
onCancel(); onCancel();
onClose(); onClose();
} }
@@ -65,7 +65,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
content = (fields = f.newInstance()).getContent(); content = (fields = f.newInstance()).getContent();
//--? //--?
} catch (Exception e) { } catch (Exception e) {
CommonUtils.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
} }
} }
public void onClose() { public void onClose() {
@@ -117,7 +117,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
Init(params); Init(params);
ShowTitle(); ShowTitle();
setAlwaysOnTop(isOnTop()); setAlwaysOnTop(isOnTop());
CommonUI.windowsStack.push(this); UI_.windowsStack.push(this);
setVisible(true); setVisible(true);
return OK; return OK;
} }
@@ -137,7 +137,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
OK = true; OK = true;
CloseAction(); CloseAction();
} else } else
CommonUI.Error("Валидация не пройдена:\n" + Log.toString()); UI_.Error("Валидация не пройдена:\n" + Log.toString());
} }
protected void onCancel() { protected void onCancel() {
CloseAction(); CloseAction();

View File

@@ -1,12 +1,12 @@
package Common.Visual.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
public class DialogTextComboBox extends JComboBox<String> implements DialogFields { public class DialogTextComboBox extends JComboBox<String> implements DialogFields {
public DialogTextComboBox() { public DialogTextComboBox() {
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
setEditable(false); setEditable(false);
} }
@Override @Override

View File

@@ -1,5 +1,5 @@
package Common.Visual.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
@@ -8,7 +8,7 @@ public class DialogWrapText extends JTextPane implements DialogFields {
public DialogWrapText(){ public DialogWrapText(){
setOpaque(true); setOpaque(true);
setBackground(Color.WHITE); setBackground(Color.WHITE);
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeBold)); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeBold));
setEditable(false); setEditable(false);
} }
@Override @Override

View File

@@ -1,5 +1,5 @@
package Common.Visual.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import javax.swing.*; import javax.swing.*;
import javax.swing.filechooser.FileFilter; import javax.swing.filechooser.FileFilter;
@@ -9,7 +9,7 @@ public class VDirectoryChooser extends VFileChooser_ {
super(title, new FileFilter() { super(title, new FileFilter() {
@Override @Override
public boolean accept(File f) { public boolean accept(File f) {
return !CommonUtils.ContainsCyrillic(f.getAbsolutePath()); return !Utils_.ContainsCyrillic(f.getAbsolutePath());
} }
@Override @Override
public String getDescription() { public String getDescription() {

View File

@@ -1,5 +1,5 @@
package Common.Visual.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import javax.swing.*; import javax.swing.*;
import javax.swing.filechooser.FileFilter; import javax.swing.filechooser.FileFilter;
@@ -20,7 +20,7 @@ public class VFileChooser extends VFileChooser_ {
fileChooser.setFileFilter(new FileFilter() { fileChooser.setFileFilter(new FileFilter() {
@Override @Override
public boolean accept(File f) { public boolean accept(File f) {
return !CommonUtils.ContainsCyrillic(f.getName()) return !Utils_.ContainsCyrillic(f.getName())
&& (f.isDirectory() || acceptExtensions(f)); && (f.isDirectory() || acceptExtensions(f));
} }
@Override @Override
@@ -36,7 +36,7 @@ public class VFileChooser extends VFileChooser_ {
} }
public boolean acceptExtensions(File file) { public boolean acceptExtensions(File file) {
if (Extensions.isEmpty()) return true; if (Extensions.isEmpty()) return true;
String file_ext = CommonUtils.getExtension(file); String file_ext = Utils_.getExtension(file);
for (String ext : Extensions) for (String ext : Extensions)
if (ext.equalsIgnoreCase(file_ext)) return true; if (ext.equalsIgnoreCase(file_ext)) return true;
return false; return false;

View File

@@ -1,5 +1,5 @@
package Common.Visual.Windows; package Common.Visual.Windows;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Database.Objects.DBForm.DBForm; import Common.Database.Objects.DBForm.DBForm;
@@ -10,9 +10,9 @@ import java.awt.event.WindowEvent;
public abstract class Form extends JFrame implements ThemeElement { public abstract class Form extends JFrame implements ThemeElement {
private DBForm dbInfo = null; private DBForm dbInfo = null;
public Form() { public Form() {
if (getIconPath()!=null) setIconImage(CommonUtils.getIcon(getIconPath()).getImage()); if (getIconPath()!=null) setIconImage(Utils_.getIcon(getIconPath()).getImage());
SetListener(); SetListener();
this.setTitle(CommonUtils.isWindows() ? getWTitleText() : getUTitleText()); this.setTitle(Utils_.isWindows() ? getWTitleText() : getUTitleText());
pack(); pack();
setMinimumSize(new Dimension(getDefaultWidth(), getDefaultHeight())); setMinimumSize(new Dimension(getDefaultWidth(), getDefaultHeight()));
} }
@@ -54,7 +54,7 @@ public abstract class Form extends JFrame implements ThemeElement {
try { try {
LoadWindowParameters(); LoadWindowParameters();
} catch (Exception e) { } catch (Exception e) {
CommonUtils.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
} }
setContentPane(getMainPanel()); setContentPane(getMainPanel());
setVisible(true); setVisible(true);
@@ -63,7 +63,7 @@ public abstract class Form extends JFrame implements ThemeElement {
try { try {
SaveWindowParameters(); SaveWindowParameters();
} catch (Exception e) { } catch (Exception e) {
CommonUtils.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
} }
setVisible(false); setVisible(false);
dispose(); dispose();
@@ -73,8 +73,8 @@ public abstract class Form extends JFrame implements ThemeElement {
} }
public void LoadWindowParameters() throws Exception { public void LoadWindowParameters() throws Exception {
if (getFormKey()!=null) if (getFormKey()!=null)
if (CommonUtils.db.forms.Data.containsKey(getFormKey())) { if (Utils_.db.forms.Data.containsKey(getFormKey())) {
dbInfo = CommonUtils.db.forms.Data.get(getFormKey()); dbInfo = Utils_.db.forms.Data.get(getFormKey());
dbInfo.Apply(this); dbInfo.Apply(this);
return; return;
} }
@@ -85,9 +85,9 @@ public abstract class Form extends JFrame implements ThemeElement {
if (getFormKey()!=null) { if (getFormKey()!=null) {
if (dbInfo != null) { if (dbInfo != null) {
dbInfo.Init(this); dbInfo.Init(this);
CommonUtils.db.Update(dbInfo); Utils_.db.Update(dbInfo);
} else } else
CommonUtils.db.Insert(new DBForm(getFormKey(), this)); Utils_.db.Insert(new DBForm(getFormKey(), this));
} }
} }
@Override @Override

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import Common.Database.Database; import Common.Database.Database;
import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.GlobalDatabase;
@@ -40,7 +40,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
"Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'", version); "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'", version);
return true; return true;
} else { } else {
if (CommonUI.Warning("Создать отчёт об ошибке без прикрепления проекта.")) { if (UI_.Warning("Создать отчёт об ошибке без прикрепления проекта.")) {
target = new BugReport(); target = new BugReport();
target.genName(); target.genName();
target.sender_name = Current.getAccount().name; target.sender_name = Current.getAccount().name;
@@ -48,7 +48,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
target.project_version = ""; target.project_version = "";
target.visualiser_version = Global.visualiser.version; target.visualiser_version = Global.visualiser.version;
target.sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version; target.sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version;
target.sapfor_settings =((GlobalDatabase)CommonUtils.db).settings.getSapforSettingsText(); target.sapfor_settings =((GlobalDatabase) Utils_.db).settings.getSapforSettingsText();
target.percentage = 0; target.percentage = 0;
target.description = "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'"; target.description = "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'";
target.date = new Date().getTime(); target.date = new Date().getTime();
@@ -72,7 +72,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
//логи во вложения. //логи во вложения.
File attachementsDir = Current.getProject().getAttachmentsDirectory(); File attachementsDir = Current.getProject().getAttachmentsDirectory();
Vector<File> logs = new Vector<>(); Vector<File> logs = new Vector<>();
logs.add(CommonUtils.MainLog.getLogFile()); logs.add(Utils_.MainLog.getLogFile());
logs.add(Paths.get(Global.ComponentsDirectory.getAbsolutePath(), "Sapfor_log.txt").toFile()); logs.add(Paths.get(Global.ComponentsDirectory.getAbsolutePath(), "Sapfor_log.txt").toFile());
logs.add(Paths.get(Global.ComponentsDirectory.getAbsolutePath(), "Server_log.txt").toFile()); logs.add(Paths.get(Global.ComponentsDirectory.getAbsolutePath(), "Server_log.txt").toFile());
logs.add(Global.Components.get(ComponentType.Visualizer_2).getLogFile()); logs.add(Global.Components.get(ComponentType.Visualizer_2).getLogFile());
@@ -86,7 +86,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
} }
@Override @Override
protected boolean validate() { protected boolean validate() {
double size = CommonUtils.getFileSizeMegaBytes(BugReportInterface.getArchiveFile(target)); double size = Utils_.getFileSizeMegaBytes(BugReportInterface.getArchiveFile(target));
if (size > 100) { if (size > 100) {
Log.Writeln_("Размер запакованного вложения " + size + " Мб превышает 100 Мб"); Log.Writeln_("Размер запакованного вложения " + size + " Мб превышает 100 Мб");
return false; return false;

View File

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

View File

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

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Utils; import _VisualDVM.Utils;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
@@ -20,9 +20,9 @@ public class AddDVMParameterForTesting extends Pass<String> {
if (name.isEmpty()) if (name.isEmpty())
Log.Writeln("Имя параметра DVM системы не может быть пустым."); Log.Writeln("Имя параметра DVM системы не может быть пустым.");
if (Utils.isLinuxSystemCommand(name)) if (Utils.isLinuxSystemCommand(name))
Log.Writeln(CommonUtils.DQuotes(name) + " является системной командой Linux"); Log.Writeln(Utils_.DQuotes(name) + " является системной командой Linux");
if (Utils.isLinuxSystemCommand(value)) if (Utils.isLinuxSystemCommand(value))
Log.Writeln(CommonUtils.DQuotes(value) + " является системной командой Linux"); Log.Writeln(Utils_.DQuotes(value) + " является системной командой Linux");
} }
@Override @Override
public void ProcessResult() { public void ProcessResult() {

View File

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

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.Text.FileNameForm; import Common.Visual.Windows.Dialog.Text.FileNameForm;
@@ -24,14 +24,14 @@ public class AddFile extends ChangeFilePass<DBProjectFile> {
src = (File) args[0]; src = (File) args[0];
mode = Mode.Import; mode = Mode.Import;
fileName = src.getName(); fileName = src.getName();
if (CommonUtils.ContainsCyrillic(fileName)) { if (Utils_.ContainsCyrillic(fileName)) {
Log.Writeln_("Имя файла " + CommonUtils.Brackets(fileName) + " содержит кириллицу."); Log.Writeln_("Имя файла " + Utils_.Brackets(fileName) + " содержит кириллицу.");
return false; return false;
} }
if (CommonUtils.ContainsForbiddenName(fileName)) { if (Utils_.ContainsForbiddenName(fileName)) {
Log.Writeln_("Имя файла " + CommonUtils.Brackets(fileName) Log.Writeln_("Имя файла " + Utils_.Brackets(fileName)
+ " содержит запрещенные символы." + + " содержит запрещенные символы." +
"\n" + CommonUtils.printAllForbiddenCharacters()); "\n" + Utils_.printAllForbiddenCharacters());
return false; return false;
} }
} else { } else {
@@ -46,12 +46,12 @@ public class AddFile extends ChangeFilePass<DBProjectFile> {
//-> //->
dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile(); dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile();
if (dst.exists()) { if (dst.exists()) {
Log.Writeln_("Файл с именем " + CommonUtils.Brackets(fileName) + " уже существует"); Log.Writeln_("Файл с именем " + Utils_.Brackets(fileName) + " уже существует");
return false; return false;
} }
target = new DBProjectFile(dst, project); target = new DBProjectFile(dst, project);
if (target.fileType.equals(FileType.forbidden)) { if (target.fileType.equals(FileType.forbidden)) {
Log.Writeln_("Расширение " + CommonUtils.Brackets(CommonUtils.getExtension(dst)) + " недопустимо"); Log.Writeln_("Расширение " + Utils_.Brackets(Utils_.getExtension(dst)) + " недопустимо");
return false; return false;
} }
return true; return true;

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReport;
@@ -50,7 +50,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
Command(new ServerExchangeUnit_2021(ServerCode.GetObjectCopyByPK, "", new Pair<>(BugReport.class, target.id))); Command(new ServerExchangeUnit_2021(ServerCode.GetObjectCopyByPK, "", new Pair<>(BugReport.class, target.id)));
target.SynchronizeFields((BugReport) response.object); target.SynchronizeFields((BugReport) response.object);
oldValue = (String) BugReport.class.getField(fieldName).get(target); oldValue = (String) BugReport.class.getField(fieldName).get(target);
newValue = oldValue + "\n" + CommonUtils.Brackets(CommonUtils.print_date( newValue = oldValue + "\n" + Utils_.Brackets(Utils_.print_date(
new Date())) + " " + Current.getAccount().name new Date())) + " " + Current.getAccount().name
+ " : " + addition; + " : " + addition;
//2. дописываем нужное поле. //2. дописываем нужное поле.
@@ -85,7 +85,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
} }
passes.get(PassCode.Email).Do( passes.get(PassCode.Email).Do(
new EmailMessage( new EmailMessage(
message_header + " " + CommonUtils.Brackets(Current.getAccount().name), message_header + " " + Utils_.Brackets(Current.getAccount().name),
message_text, message_text,
BugReportInterface.getRecipients(target) BugReportInterface.getRecipients(target)
) )

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog; import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
@@ -32,7 +32,7 @@ public class ApplyCurrentFunction extends Pass {
Current_.set(Current.Function, fi); Current_.set(Current.Function, fi);
return true; return true;
} else { } else {
Log.Writeln_("Проект не содержит процедуры с именем " + CommonUtils.Brackets(func_name)); Log.Writeln_("Проект не содержит процедуры с именем " + Utils_.Brackets(func_name));
} }
} }
} }

View File

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

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -22,7 +22,7 @@ public class ArchivesBackupPass extends ConnectionPass<File> {
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
String workspace_path = CommonUtils.toU(Paths.get(user.connection.sftpChannel.getHome(), Global.properties.BackupWorkspace).toString()); String workspace_path = Utils_.toU(Paths.get(user.connection.sftpChannel.getHome(), Global.properties.BackupWorkspace).toString());
RemoteFile workspace = new RemoteFile(workspace_path, true); RemoteFile workspace = new RemoteFile(workspace_path, true);
user.connection.MKDIR(workspace); user.connection.MKDIR(workspace);
RemoteFile dst = new RemoteFile(workspace.full_name, src.getName()); RemoteFile dst = new RemoteFile(workspace.full_name, src.getName());

View File

@@ -1,8 +1,8 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import Common.Database.Database; import Common.Database.Database;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -169,7 +169,7 @@ public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
src_jsons = new Vector<>(); src_jsons = new Vector<>();
for (DVMPackage src : srcPackages) { for (DVMPackage src : srcPackages) {
if (src.state.equals(TasksPackageState.Draft)) { if (src.state.equals(TasksPackageState.Draft)) {
Log.Writeln_("Пакет " + CommonUtils.Brackets(src.id) + " является черновиком."); Log.Writeln_("Пакет " + Utils_.Brackets(src.id) + " является черновиком.");
return false; return false;
} }
src_ids.add(src.id); src_ids.add(src.id);
@@ -209,7 +209,7 @@ public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
target.tasksCount++; target.tasksCount++;
} }
} }
return inexistingTests.isEmpty() || CommonUI.Question(inexistingTests.size() + " тестов отсутствует. Продолжить"); return inexistingTests.isEmpty() || UI_.Question(inexistingTests.size() + " тестов отсутствует. Продолжить");
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {

View File

@@ -1,8 +1,8 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import Common.Database.Database; import Common.Database.Database;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -106,7 +106,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
Vector<SapforPackage_json> src_jsons = new Vector<>(); Vector<SapforPackage_json> src_jsons = new Vector<>();
for (SapforPackage src : srcPackages) { for (SapforPackage src : srcPackages) {
if (src.state.equals(TasksPackageState.Draft)) { if (src.state.equals(TasksPackageState.Draft)) {
Log.Writeln_("Пакет " + CommonUtils.Brackets(src.id) + " является черновиком."); Log.Writeln_("Пакет " + Utils_.Brackets(src.id) + " является черновиком.");
return false; return false;
} }
src_ids.add(src.id); src_ids.add(src.id);
@@ -174,7 +174,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
*/ */
//-- //--
return inexistingTests.isEmpty() && inexistingConfigurations.isEmpty() || return inexistingTests.isEmpty() && inexistingConfigurations.isEmpty() ||
CommonUI.Question( UI_.Question(
(inexistingTests.isEmpty() ? "" : (inexistingTests.size() + " тестов отсутствует;")) + (inexistingTests.isEmpty() ? "" : (inexistingTests.size() + " тестов отсутствует;")) +
(inexistingConfigurations.isEmpty() ? "" : (inexistingConfigurations.size() + " конфигураций отсутствует;")) + (inexistingConfigurations.isEmpty() ? "" : (inexistingConfigurations.size() + " конфигураций отсутствует;")) +
"Будет добавлено " + target.package_json.tasks.size() + " задач. Продолжить" "Будет добавлено " + target.package_json.tasks.size() + " задач. Продолжить"

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -15,7 +15,7 @@ public class CloseCurrentFile extends Pass<DBProjectFile> {
} }
@Override @Override
public Icon getTabIcon() { public Icon getTabIcon() {
return CommonUtils.getIcon("/icons/Close_18.png"); return Utils_.getIcon("/icons/Close_18.png");
} }
@Override @Override
public String getButtonText() { public String getButtonText() {

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
@@ -20,7 +20,7 @@ public class CloseCurrentProject extends Pass<db_project_info> {
} }
@Override @Override
public Icon getTabIcon() { public Icon getTabIcon() {
return CommonUtils.getIcon("/icons/Close_18.png"); return Utils_.getIcon("/icons/Close_18.png");
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
@@ -40,7 +40,7 @@ public class CloseCurrentProject extends Pass<db_project_info> {
Global.files_multiselection = false; Global.files_multiselection = false;
//-- //--
Current.getSapfor().ResetAllAnalyses(); Current.getSapfor().ResetAllAnalyses();
Current.getSapfor().cd(CommonUtils.getHomeDirectory()); Current.getSapfor().cd(Utils_.getHomeDirectory());
Current_.set(Current.Project, null); Current_.set(Current.Project, null);
Current_.set(Current.File, null); Current_.set(Current.File, null);
Current_.set(Current.Function, null); Current_.set(Current.Function, null);

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.ProjectData.Project.db_project_info;
import Common.Passes.Pass; import Common.Passes.Pass;
@@ -16,7 +16,7 @@ public class CloseProject extends Pass<db_project_info> {
@Override @Override
protected void performDone() throws Exception { protected void performDone() throws Exception {
Current.getSapfor().ResetAllAnalyses(); Current.getSapfor().ResetAllAnalyses();
Current.getSapfor().cd(CommonUtils.getHomeDirectory()); Current.getSapfor().cd(Utils_.getHomeDirectory());
Current_.set(Current.Project, null); Current_.set(Current.Project, null);
//- //-
} }

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog; import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.Utils; import _VisualDVM.Utils;
@@ -47,7 +47,7 @@ public class CombineFiles extends Transformation {
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
result = Paths.get(target.last_version.Home.getAbsolutePath(), result = Paths.get(target.last_version.Home.getAbsolutePath(),
CommonUtils.isWindows() ? fd.Result : CommonUtils.toU(fd.Result)).toFile(); Utils_.isWindows() ? fd.Result : Utils_.toU(fd.Result)).toFile();
//----------------------- //-----------------------
//получить список хедеров. //получить список хедеров.
//----------------------- //-----------------------
@@ -56,13 +56,13 @@ public class CombineFiles extends Transformation {
//----------------------------- //-----------------------------
result_lines.add("!-Found " + target.allIncludes.size() + " headers"); result_lines.add("!-Found " + target.allIncludes.size() + " headers");
for (String name : target.allIncludes.keySet()) { for (String name : target.allIncludes.keySet()) {
all_includes.add(" include " + CommonUtils.Quotes(CommonUtils.toU(name))); all_includes.add(" include " + Utils_.Quotes(Utils_.toU(name)));
result_lines.add("! include " + CommonUtils.Quotes(CommonUtils.toU(name))); result_lines.add("! include " + Utils_.Quotes(Utils_.toU(name)));
} }
result_lines.add("!-Collapse-" + target.files_order.size() + " files"); result_lines.add("!-Collapse-" + target.files_order.size() + " files");
int i = 1; int i = 1;
for (String name : target.files_order) { for (String name : target.files_order) {
result_lines.add("! -- " + i + ". " + CommonUtils.Brackets(name)); result_lines.add("! -- " + i + ". " + Utils_.Brackets(name));
++i; ++i;
} }
result_lines.add("!--------------------"); result_lines.add("!--------------------");
@@ -76,8 +76,8 @@ public class CombineFiles extends Transformation {
String header = Utils.extractHeaderName(line); String header = Utils.extractHeaderName(line);
if (header != null) { if (header != null) {
if (file.relativeHeaders.containsKey(header)) if (file.relativeHeaders.containsKey(header))
result_lines.add(" include " + CommonUtils.Quotes( result_lines.add(" include " + Utils_.Quotes(
CommonUtils.toU( Utils_.toU(
file.relativeHeaders.get(header).name))); file.relativeHeaders.get(header).name)));
} else } else
result_lines.add(line); result_lines.add(line);

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
@@ -26,8 +26,8 @@ public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
//-- //--
target = Global.testingServer.db.dvmRunTasks.getCheckedItems(); target = Global.testingServer.db.dvmRunTasks.getCheckedItems();
if (target.size() == 2) { if (target.size() == 2) {
if (CommonUI.Question("Назначить задачу " + CommonUtils.Brackets(target.get(0).getPK()) + " эталоном" + if (UI_.Question("Назначить задачу " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" +
"\n(в случае отказа, будет назначена задача " + CommonUtils.Brackets(target.get(1).getPK()) + ")")) { "\n(в случае отказа, будет назначена задача " + Utils_.Brackets(target.get(1).getPK()) + ")")) {
master = target.get(0); master = target.get(0);
slave = target.get(1); slave = target.get(1);
} else { } else {
@@ -38,11 +38,11 @@ public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
} else if (target.size() == 1) { } else if (target.size() == 1) {
master = target.get(0); master = target.get(0);
slave = null; slave = null;
return CommonUI.Question("Отобразить задачу " + CommonUtils.Brackets(master.getPK())); return UI_.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));
} else if ((target.size() == 0) && (Current.HasDVMRunTask())) { } else if ((target.size() == 0) && (Current.HasDVMRunTask())) {
master = Current.getDVMRunTask(); master = Current.getDVMRunTask();
slave = null; slave = null;
return CommonUI.Question("Отобразить задачу " + CommonUtils.Brackets(master.getPK())); return UI_.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));
} else { } else {
Log.Writeln_("Для сравнения требуется отметить две задачи.\nДля отображения требуется отметить одну задачу,или выделить её."); Log.Writeln_("Для сравнения требуется отметить две задачи.\nДля отображения требуется отметить одну задачу,или выделить её.");
return false; return false;

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
@@ -26,8 +26,8 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
//-- //--
target = Global.testingServer.db.sapforPackages.getCheckedItems(); target = Global.testingServer.db.sapforPackages.getCheckedItems();
if (target.size() == 2) { if (target.size() == 2) {
if (CommonUI.Question("Назначить пакет " + CommonUtils.Brackets(target.get(0).getPK()) + " эталоном" + if (UI_.Question("Назначить пакет " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" +
"\n(в случае отказа, будет назначен пакет " + CommonUtils.Brackets(target.get(1).getPK()) + ")")) { "\n(в случае отказа, будет назначен пакет " + Utils_.Brackets(target.get(1).getPK()) + ")")) {
master = target.get(0); master = target.get(0);
slave = target.get(1); slave = target.get(1);
} else { } else {
@@ -38,11 +38,11 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
} else if (target.size() == 1) { } else if (target.size() == 1) {
master = target.get(0); master = target.get(0);
slave = null; slave = null;
return CommonUI.Question("Отобразить пакет " + CommonUtils.Brackets(master.getPK())); return UI_.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));
} else if ((target.size() == 0) && (Current.HasSapforPackage())) { } else if ((target.size() == 0) && (Current.HasSapforPackage())) {
master = Current.getSapforPackage(); master = Current.getSapforPackage();
slave = null; slave = null;
return CommonUI.Question("Отобразить пакет " + CommonUtils.Brackets(master.getPK())); return UI_.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));
} else { } else {
Log.Writeln_("Для сравнения требуется отметить два пакета.\nДля отображения требуется отметить один пакет,или выделить его"); Log.Writeln_("Для сравнения требуется отметить два пакета.\nДля отображения требуется отметить один пакет,или выделить его");
return false; return false;

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
import _VisualDVM.Utils; import _VisualDVM.Utils;
@@ -35,7 +35,7 @@ public class Compile extends Pass<db_project_info> {
subpass = null; subpass = null;
compilationTask = null; compilationTask = null;
if (Current.getUser().state != UserState.ready_to_work) if (Current.getUser().state != UserState.ready_to_work)
Log.Writeln_("Пользователь " + CommonUtils.Brackets(Current.getUser().login) + Log.Writeln_("Пользователь " + Utils_.Brackets(Current.getUser().login) +
" не проинициализирован\ерейдите на вкладку 'Настройки компиляции и запуска',\n" + " не проинициализирован\ерейдите на вкладку 'Настройки компиляции и запуска',\n" +
" и выполните команду 'Инициализация пользователя'\n"); " и выполните команду 'Инициализация пользователя'\n");
Current.getMakefile().Validate(Log); Current.getMakefile().Validate(Log);
@@ -54,26 +54,26 @@ public class Compile extends Pass<db_project_info> {
//------------------------------------------ //------------------------------------------
compilationTask.CompleteSummary(target.compilation_maxtime); compilationTask.CompleteSummary(target.compilation_maxtime);
compilationTask.state = TaskState.Inactive; compilationTask.state = TaskState.Inactive;
CommonUtils.db.Insert(compilationTask); Utils_.db.Insert(compilationTask);
Utils.forceDeleteWithCheck(compilationTask.getLocalWorkspace()); Utils.forceDeleteWithCheck(compilationTask.getLocalWorkspace());
} }
@Override @Override
protected void showPreparation() throws Exception { protected void showPreparation() throws Exception {
((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI(compilationTask.getPK()); ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(compilationTask.getPK());
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
switch (Current.getMachine().type) { switch (Current.getMachine().type) {
case Local: case Local:
if (CommonUtils.isWindows()) { if (Utils_.isWindows()) {
subpass = passes.get(PassCode.WindowsLocalCompilation); subpass = passes.get(PassCode.WindowsLocalCompilation);
} else } else
subpass = passes.get(PassCode.LinuxLocalCompilation); subpass = passes.get(PassCode.LinuxLocalCompilation);
break; break;
case Undefined: case Undefined:
case MVS_cluster: case MVS_cluster:
throw new PassException("Компиляция не реализована для типа машины " + CommonUtils.DQuotes(Current.getMachine().type)); throw new PassException("Компиляция не реализована для типа машины " + Utils_.DQuotes(Current.getMachine().type));
default: default:
subpass = passes.get(PassCode.RemoteCompilation); subpass = passes.get(PassCode.RemoteCompilation);
break; break;
@@ -86,7 +86,7 @@ public class Compile extends Pass<db_project_info> {
} }
@Override @Override
protected void showFinish() throws Exception { protected void showFinish() throws Exception {
((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI(compilationTask.getPK()); ((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(compilationTask.getPK());
UI.getDebugWindow().ShowLastCompilationTask(); UI.getDebugWindow().ShowLastCompilationTask();
} }
} }

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
@@ -31,7 +31,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
if (!Current_.Check(Log, Current.ServerSapfor)){ if (!Current_.Check(Log, Current.ServerSapfor)){
return false; return false;
} }
return CommonUI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность."); return UI_.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");
} }
@Override @Override
protected boolean needsAnimation() { protected boolean needsAnimation() {

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common.Visual.Windows.Dialog.Dialog; import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Utils; import _VisualDVM.Utils;
@@ -34,7 +34,7 @@ public class CopyProject extends CurrentProjectPass {
public void validateFields() { public void validateFields() {
Utils.validateFileShortNewName(fields.tfName.getText(), Log); Utils.validateFileShortNewName(fields.tfName.getText(), Log);
if (!fields.tfParent.getText().isEmpty()) { if (!fields.tfParent.getText().isEmpty()) {
if (CommonUtils.ContainsCyrillic(fields.tfParent.getText())) if (Utils_.ContainsCyrillic(fields.tfParent.getText()))
Log.Writeln_("Путь к целевой папке не может содержать кириллицу!"); Log.Writeln_("Путь к целевой папке не может содержать кириллицу!");
} else Log.Writeln_("Путь к целевой папке не может быть пустым!"); } else Log.Writeln_("Путь к целевой папке не может быть пустым!");
if (Log.isEmpty()) { if (Log.isEmpty()) {
@@ -62,7 +62,7 @@ public class CopyProject extends CurrentProjectPass {
} }
@Override @Override
protected void performDone() throws Exception { protected void performDone() throws Exception {
if (CommonUI.Question("копия текущего проекта успешно создана по адресу\n" + dstFile.getAbsolutePath() + "\nОткрыть её")) { if (UI_.Question("копия текущего проекта успешно создана по адресу\n" + dstFile.getAbsolutePath() + "\nОткрыть её")) {
passes.get(PassCode.CloseCurrentProject).Do(); passes.get(PassCode.CloseCurrentProject).Do();
passes.get(PassCode.OpenCurrentProject).Do(dstFile); passes.get(PassCode.OpenCurrentProject).Do(dstFile);
} }

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
@@ -22,11 +22,11 @@ public class CreateEmptyDirectory extends ChangeFilePass {
//-> //->
dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile(); dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile();
if (dst.exists()) { if (dst.exists()) {
Log.Writeln("Файл с именем " + CommonUtils.Brackets(fileName) + " уже существует"); Log.Writeln("Файл с именем " + Utils_.Brackets(fileName) + " уже существует");
return false; return false;
} }
if (fileName.equalsIgnoreCase(Constants.data)) { if (fileName.equalsIgnoreCase(Constants.data)) {
Log.Writeln(CommonUtils.Brackets(Constants.data) + " является зарезервированным именем!"); Log.Writeln(Utils_.Brackets(Constants.data) + " является зарезервированным именем!");
return false; return false;
} }
return true; return true;

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common.Visual.Windows.Dialog.Text.FileNameForm; import Common.Visual.Windows.Dialog.Text.FileNameForm;
@@ -28,7 +28,7 @@ public class CreateEmptyProject extends Pass<File> {
project_name = ff.Result; project_name = ff.Result;
target = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), project_name).toFile(); target = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), project_name).toFile();
if (target.exists()) if (target.exists())
Log.Writeln("Файл\n" + CommonUtils.Brackets(target.getAbsolutePath()) + "\nуже существует"); Log.Writeln("Файл\n" + Utils_.Brackets(target.getAbsolutePath()) + "\nуже существует");
return Log.isEmpty(); return Log.isEmpty();
} }
return false; return false;

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Current; import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.VDirectoryChooser; import Common.Visual.Windows.Dialog.VDirectoryChooser;
@@ -35,17 +35,17 @@ public class CreateGroupFromDirectory extends PublishTests {
} }
//--------------- //---------------
if (!dir.isDirectory()) { if (!dir.isDirectory()) {
Log.Writeln_(CommonUtils.Brackets(dir) + "\е является папкой!"); Log.Writeln_(Utils_.Brackets(dir) + "\е является папкой!");
return false; return false;
} }
if (dir.getName().equals(Constants.data)) { if (dir.getName().equals(Constants.data)) {
Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!"); Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
return false; return false;
} }
if (!Utils.validateProjectFile(dir, Log)) { if (!Utils.validateProjectFile(dir, Log)) {
Log.Writeln_("Имя папки " + CommonUtils.Brackets(dir.getName()) Log.Writeln_("Имя папки " + Utils_.Brackets(dir.getName())
+ " содержит запрещённые символы " + + " содержит запрещённые символы " +
CommonUtils.printAllForbiddenCharacters() + ", или кириллицу."); Utils_.printAllForbiddenCharacters() + ", или кириллицу.");
return false; return false;
} }
//-- //--

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Current; import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.VFileChooser; import Common.Visual.Windows.Dialog.VFileChooser;
@@ -35,13 +35,13 @@ public class CreateGroupFromFiles extends PublishTests{
Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir); Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
//--------------- //---------------
if (dir.getName().equals(Constants.data)) { if (dir.getName().equals(Constants.data)) {
Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!"); Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
return false; return false;
} }
if (!Utils.validateProjectFile(dir, Log)) { if (!Utils.validateProjectFile(dir, Log)) {
Log.Writeln_("Имя папки " + CommonUtils.Brackets(dir.getName()) Log.Writeln_("Имя папки " + Utils_.Brackets(dir.getName())
+ " содержит запрещённые символы " + " содержит запрещённые символы "
+ CommonUtils.printAllForbiddenCharacters() + ", или кириллицу."); + Utils_.printAllForbiddenCharacters() + ", или кириллицу.");
return false; return false;
} }
if (passes.get(PassCode.PublishGroup).Do(dir.getName().toUpperCase())) { if (passes.get(PassCode.PublishGroup).Do(dir.getName().toUpperCase())) {

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Current; import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.VDirectoryChooser; import Common.Visual.Windows.Dialog.VDirectoryChooser;
@@ -91,19 +91,19 @@ public class CreateTestFromDirectory extends Pass<Test> {
int other_project_files = 0; int other_project_files = 0;
//--- //---
if (dir.getName().equalsIgnoreCase(Constants.data)) { if (dir.getName().equalsIgnoreCase(Constants.data)) {
Log.Writeln_("Папка " + CommonUtils.Brackets(dir) + " является служебной папкой визуализатора."); Log.Writeln_("Папка " + Utils_.Brackets(dir) + " является служебной папкой визуализатора.");
return false; return false;
} }
//-- //--
if (CommonUtils.ContainsCyrillic(dir.getName()) || CommonUtils.ContainsForbiddenName(dir.getName())) { if (Utils_.ContainsCyrillic(dir.getName()) || Utils_.ContainsForbiddenName(dir.getName())) {
Log.Writeln_("Имя папки " + CommonUtils.Brackets(dir.getName()) Log.Writeln_("Имя папки " + Utils_.Brackets(dir.getName())
+ " содержит запрещённые символы " + " содержит запрещённые символы "
+ CommonUtils.printAllForbiddenCharacters() + ", или кириллицу."); + Utils_.printAllForbiddenCharacters() + ", или кириллицу.");
return false; return false;
} }
//-- //--
if (files == null) { if (files == null) {
Log.Writeln_("Не удалось получить список файлов для папки " + CommonUtils.Brackets(dir) + "."); Log.Writeln_("Не удалось получить список файлов для папки " + Utils_.Brackets(dir) + ".");
return false; return false;
} }
//--- //---
@@ -117,7 +117,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
!Utils.isVersion(file)) { !Utils.isVersion(file)) {
subdirs++; subdirs++;
} }
} else if (file.isFile() && !CommonUtils.ContainsCyrillic(file.getName()) && !CommonUtils.ContainsForbiddenName(file.getName())) { } else if (file.isFile() && !Utils_.ContainsCyrillic(file.getName()) && !Utils_.ContainsForbiddenName(file.getName())) {
//если файл. все недопустимые файлы просто игнорируются. //если файл. все недопустимые файлы просто игнорируются.
ProjectFile projectFile = new ProjectFile(file); ProjectFile projectFile = new ProjectFile(file);
if (isNotExcluded(projectFile)) { if (isNotExcluded(projectFile)) {
@@ -146,7 +146,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
} }
//-- //--
if (subdirs > 0) { if (subdirs > 0) {
Log.Writeln_("Папка " + CommonUtils.Brackets(dir) + " содержит вложенные подпапки,\n" + Log.Writeln_("Папка " + Utils_.Brackets(dir) + " содержит вложенные подпапки,\n" +
"не являющиеся версиями или данными визуализатора"); "не являющиеся версиями или данными визуализатора");
return false; return false;
} }
@@ -174,7 +174,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
} }
//- //-
public File packTestCode() throws Exception { public File packTestCode() throws Exception {
target.temp_project_name = CommonUtils.getDateName("test"); target.temp_project_name = Utils_.getDateName("test");
//- //-
File tempProject = target.getTempProject(); File tempProject = target.getTempProject();
File tempArchive = target.getTempArchive(); File tempArchive = target.getTempArchive();
@@ -190,7 +190,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
//-- //--
ZipFolderPass zip = new ZipFolderPass(); ZipFolderPass zip = new ZipFolderPass();
if (zip.Do(tempProject.getAbsolutePath(), tempArchive.getAbsolutePath())) { if (zip.Do(tempProject.getAbsolutePath(), tempArchive.getAbsolutePath())) {
target.project_archive_bytes = CommonUtils.fileToBytes(tempArchive); target.project_archive_bytes = Utils_.fileToBytes(tempArchive);
} else throw new PassException("Не удалось создать архив папки с кодом."); } else throw new PassException("Не удалось создать архив папки с кодом.");
return tempProject; return tempProject;
} }

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Utils; import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.FileType; import _VisualDVM.ProjectData.Files.FileType;
@@ -36,16 +36,16 @@ public class CreateTestFromFile extends Pass<Test> {
File file_in = (File) args[0]; File file_in = (File) args[0];
group = (Group) args[1]; group = (Group) args[1];
//-- //--
if (CommonUtils.ContainsCyrillic(file_in.getName()) || CommonUtils.ContainsForbiddenName(file_in.getName())) { if (Utils_.ContainsCyrillic(file_in.getName()) || Utils_.ContainsForbiddenName(file_in.getName())) {
Log.Writeln_("Имя файла " + CommonUtils.Brackets(file_in.getName()) Log.Writeln_("Имя файла " + Utils_.Brackets(file_in.getName())
+ " содержит запрещённые символы " + + " содержит запрещённые символы " +
CommonUtils.printAllForbiddenCharacters() + ", или кириллицу."); Utils_.printAllForbiddenCharacters() + ", или кириллицу.");
return false; return false;
} }
//-- //--
projectFile = new ProjectFile(file_in); projectFile = new ProjectFile(file_in);
if (!projectFile.fileType.equals(FileType.program) || !projectFile.languageName.equals(group.language)) { if (!projectFile.fileType.equals(FileType.program) || !projectFile.languageName.equals(group.language)) {
Log.Writeln_("Не удалось распознать файл " + CommonUtils.Brackets(file_in.getName()) + Log.Writeln_("Не удалось распознать файл " + Utils_.Brackets(file_in.getName()) +
" как программу на языке " + group.language.getDescription()); " как программу на языке " + group.language.getDescription());
return false; return false;
} }
@@ -54,12 +54,12 @@ public class CreateTestFromFile extends Pass<Test> {
target.sender_address = Current.getAccount().email; target.sender_address = Current.getAccount().email;
target.sender_name = Current.getAccount().name; target.sender_name = Current.getAccount().name;
target.group_id = group.id; target.group_id = group.id;
target.description = CommonUtils.getNameWithoutExtension(file_in.getName()); target.description = Utils_.getNameWithoutExtension(file_in.getName());
target.files = file_in.getName(); target.files = file_in.getName();
return true; return true;
} }
public File packTestCode() throws Exception { public File packTestCode() throws Exception {
target.temp_project_name = CommonUtils.getDateName("test"); target.temp_project_name = Utils_.getDateName("test");
//- //-
File tempProject = target.getTempProject(); File tempProject = target.getTempProject();
File tempArchive = target.getTempArchive(); File tempArchive = target.getTempArchive();
@@ -73,7 +73,7 @@ public class CreateTestFromFile extends Pass<Test> {
//-- //--
ZipFolderPass zip = new ZipFolderPass(); ZipFolderPass zip = new ZipFolderPass();
if (zip.Do(tempProject.getAbsolutePath(), tempArchive.getAbsolutePath())) { if (zip.Do(tempProject.getAbsolutePath(), tempArchive.getAbsolutePath())) {
target.project_archive_bytes = CommonUtils.fileToBytes(tempArchive); target.project_archive_bytes = Utils_.fileToBytes(tempArchive);
} else throw new PassException("Не удалось создать архив папки с кодом."); } else throw new PassException("Не удалось создать архив папки с кодом.");
return tempProject; return tempProject;
} }

View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -46,7 +46,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
return false; return false;
} }
//--- //---
return CommonUI.Question("В группу " + CommonUtils.Brackets(group.description) + return UI_.Question("В группу " + Utils_.Brackets(group.description) +
"\nбудет добавлено " + target.size() + " тестов.\родолжить"); "\nбудет добавлено " + target.size() + " тестов.\родолжить");
} }
} }

View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.PassMenuItem; import _VisualDVM.Visual.Menus.PassMenuItem;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
@@ -50,10 +50,10 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
return false; return false;
} }
for (DBProjectFile program : programsToConvert) { for (DBProjectFile program : programsToConvert) {
if (CommonUtils.getFileSizeMegaBytes(program.file) > 1) { if (Utils_.getFileSizeMegaBytes(program.file) > 1) {
Log.Writeln_("Размер файла кода " + CommonUtils.Brackets(program.name) + " превышает 1 Мб."); Log.Writeln_("Размер файла кода " + Utils_.Brackets(program.name) + " превышает 1 Мб.");
return false; return false;
} else programsNames.add(CommonUtils.toU(program.name)); } else programsNames.add(Utils_.toU(program.name));
} }
workspace = Utils.getTempFileName("convertation"); workspace = Utils.getTempFileName("convertation");
FileUtils.forceMkdir(workspace); FileUtils.forceMkdir(workspace);
@@ -66,7 +66,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
return false; return false;
} }
; ;
if (CommonUtils.getFileSizeMegaBytes(archive) > 500) { if (Utils_.getFileSizeMegaBytes(archive) > 500) {
Log.Writeln_("Размер архива проекта превышает 500 МБ"); Log.Writeln_("Размер архива проекта превышает 500 МБ");
return false; return false;
} }
@@ -95,11 +95,11 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
ServerExchangeUnit_2021 unit = new ServerExchangeUnit_2021(ServerCode.DVMConvertProject); ServerExchangeUnit_2021 unit = new ServerExchangeUnit_2021(ServerCode.DVMConvertProject);
unit.object = CommonUtils.fileToBytes(archive); unit.object = Utils_.fileToBytes(archive);
Vector<String> unit_args = new Vector<>(); Vector<String> unit_args = new Vector<>();
unit_args.add(target.name); unit_args.add(target.name);
unit_args.add(target.languageName.toString()); unit_args.add(target.languageName.toString());
unit_args.add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.DVMConvertationOptions).toString()); unit_args.add(((GlobalDatabase) Utils_.db).settings.get(SettingName.DVMConvertationOptions).toString());
unit_args.addAll(programsNames); unit_args.addAll(programsNames);
unit.arg = String.join("\n", unit_args); unit.arg = String.join("\n", unit_args);
Command(unit); Command(unit);
@@ -141,7 +141,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
Current.getFile().form.FocusCompilationOut(); Current.getFile().form.FocusCompilationOut();
} }
if (!badFiles.isEmpty()) if (!badFiles.isEmpty())
CommonUI.Error(badFiles); UI_.Error(badFiles);
} }
@Override @Override
protected void performDone() throws Exception { protected void performDone() throws Exception {

View File

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

View File

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

View File

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

View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
import _VisualDVM.Utils; import _VisualDVM.Utils;
@@ -28,7 +28,7 @@ public class DeleteDirectory extends ChangeFilePass {
Log.Writeln("Нельзя удалять домашнюю папку проекта."); Log.Writeln("Нельзя удалять домашнюю папку проекта.");
return false; return false;
} }
return (CommonUI.Warning("Удалить папку\n" + CommonUtils.Brackets(target_dir.getAbsolutePath()) return (UI_.Warning("Удалить папку\n" + Utils_.Brackets(target_dir.getAbsolutePath())
+ "\n и всё её содержимое.")); + "\n и всё её содержимое."));
} else Log.Writeln_("Папка не выделена."); } else Log.Writeln_("Папка не выделена.");
return false; return false;

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.GlobalDatabase;
import Common.Visual.Windows.Dialog.Dialog; import Common.Visual.Windows.Dialog.Dialog;
@@ -24,7 +24,7 @@ public class DeleteDownloadedBugReports extends Pass<DirInfosDataSet> {
target = (DirInfosDataSet) passes.get(PassCode.GetOldBugReports).target; target = (DirInfosDataSet) passes.get(PassCode.GetOldBugReports).target;
if (target.Data.isEmpty()){ if (target.Data.isEmpty()){
Log.Writeln_("Не найдено отчетов, не использовавшихся " + Log.Writeln_("Не найдено отчетов, не использовавшихся " +
((GlobalDatabase) CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).toInt32() + ((GlobalDatabase) Utils_.db).settings.get(SettingName.BugReportsAgeLimit).toInt32() +
" месяцев и более!"); " месяцев и более!");
return false; return false;
} }
@@ -48,7 +48,7 @@ public class DeleteDownloadedBugReports extends Pass<DirInfosDataSet> {
} }
}; };
if (dialog.ShowDialog("Найдено "+target.size()+" отчетов, не использовавшихся " + if (dialog.ShowDialog("Найдено "+target.size()+" отчетов, не использовавшихся " +
((GlobalDatabase)CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).toInt32()+ ((GlobalDatabase) Utils_.db).settings.get(SettingName.BugReportsAgeLimit).toInt32()+
" месяцев и более. Удалить?")) { " месяцев и более. Удалить?")) {
return true; return true;
} }

View File

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

View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
import _VisualDVM.Utils; import _VisualDVM.Utils;
@@ -17,8 +17,8 @@ public class DeleteFile extends ChangeFilePass<DBProjectFile> {
protected boolean canStart(Object... args) { protected boolean canStart(Object... args) {
resetArgs(); resetArgs();
return (Current_.Check(Log, Current.SelectedFile)) && return (Current_.Check(Log, Current.SelectedFile)) &&
CommonUI.Warning("Удалить файл " UI_.Warning("Удалить файл "
+ CommonUtils.Brackets((target = Current.getSelectedFile()).name)); + Utils_.Brackets((target = Current.getSelectedFile()).name));
} }
@Override @Override
protected void performPreparation() throws Exception { protected void performPreparation() throws Exception {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
import _VisualDVM.Utils; import _VisualDVM.Utils;
@@ -18,7 +18,7 @@ public class DeleteSelectedFiles extends Pass {
Log.Writeln_("Не отмечено ни одного файла."); Log.Writeln_("Не отмечено ни одного файла.");
return false; return false;
} }
return CommonUI.Warning("Удалить " + Current.getProject().db.files.getCheckedCount() + " файлов."); return UI_.Warning("Удалить " + Current.getProject().db.files.getCheckedCount() + " файлов.");
} }
@Override @Override
protected void performPreparation() throws Exception { protected void performPreparation() throws Exception {

View File

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

View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.ProjectData.Project.db_project_info;
@@ -45,7 +45,7 @@ public class DeleteSelectedVersions extends Pass<Vector<db_project_info>> {
} }
} }
} }
return CommonUI.Warning("Удалить " + q + " версий."); return UI_.Warning("Удалить " + q + " версий.");
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {

View File

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

View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
import _VisualDVM.Utils; import _VisualDVM.Utils;
@@ -22,10 +22,10 @@ public class DeleteVersion extends Pass<db_project_info> {
current = (Current.getVersion() != null) && Current.getVersion().Home.equals(target.Home); current = (Current.getVersion() != null) && Current.getVersion().Home.equals(target.Home);
return true; return true;
} else { } else {
if (((target = Current.getVersion()) != null) && (!CommonUI.isActive() || if (((target = Current.getVersion()) != null) && (!UI_.isActive() ||
CommonUI.Warning("Удалить " + UI_.Warning("Удалить " +
((Current.HasProject() && target.Home.equals(Current.getProject().Home)) ? "текущий проект" : "версию ") ((Current.HasProject() && target.Home.equals(Current.getProject().Home)) ? "текущий проект" : "версию ")
+ CommonUtils.Brackets(target.name)))) { + Utils_.Brackets(target.name)))) {
current = true; current = true;
return true; return true;
} }
@@ -40,7 +40,7 @@ public class DeleteVersion extends Pass<db_project_info> {
if ((Current.getProject().Home.getAbsolutePath().startsWith(target.Home.getAbsolutePath()))) if ((Current.getProject().Home.getAbsolutePath().startsWith(target.Home.getAbsolutePath())))
passes.get(PassCode.CloseCurrentProject).Do(); passes.get(PassCode.CloseCurrentProject).Do();
} }
if (CommonUI.isActive()) { if (UI_.isActive()) {
UI.getVersionsWindow().RemoveVersionFromComparison(target); UI.getVersionsWindow().RemoveVersionFromComparison(target);
} }
} }

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Utils; import _VisualDVM.Utils;
import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReport;
@@ -22,7 +22,7 @@ public class DownloadBugReport extends ComponentsRepositoryPass<BugReport> {
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.ReceiveBugReport, target.id)); Command(new ServerExchangeUnit_2021(ServerCode.ReceiveBugReport, target.id));
CommonUtils.bytesToFile((byte[]) response.object, BugReportInterface.getArchiveFile(target)); Utils_.bytesToFile((byte[]) response.object, BugReportInterface.getArchiveFile(target));
} }
@Override @Override
protected boolean validate() { protected boolean validate() {

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
@@ -11,6 +11,6 @@ public class DownloadComponent extends ComponentsRepositoryPass<Component> {
target = Current.getComponent(); target = Current.getComponent();
String packed = target.getComponentType()+"\n"+target.getFileName(); String packed = target.getComponentType()+"\n"+target.getFileName();
Command(new ServerExchangeUnit_2021(ServerCode.ReceiveComponent, packed)); Command(new ServerExchangeUnit_2021(ServerCode.ReceiveComponent, packed));
CommonUtils.bytesToFile((byte[]) response.object, target.getNewFile()); Utils_.bytesToFile((byte[]) response.object, target.getNewFile());
} }
} }

View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Utils; import _VisualDVM.Utils;
@@ -67,8 +67,8 @@ public class DownloadDVMPackages extends Pass<Vector<Integer>> {
File loaded = new File(workspace, Constants.LOADED); File loaded = new File(workspace, Constants.LOADED);
Pair<byte[], byte[]> packed_package = p.getValue(); Pair<byte[], byte[]> packed_package = p.getValue();
//--- //---
CommonUtils.bytesToFile(packed_package.getKey(), results_zip); Utils_.bytesToFile(packed_package.getKey(), results_zip);
CommonUtils.bytesToFile(packed_package.getValue(), dvmPackage.getJsonFile()); Utils_.bytesToFile(packed_package.getValue(), dvmPackage.getJsonFile());
passes.get(PassCode.UnzipFolderPass).Do(results_zip.getAbsolutePath(), workspace.getAbsolutePath()); passes.get(PassCode.UnzipFolderPass).Do(results_zip.getAbsolutePath(), workspace.getAbsolutePath());
FileUtils.writeStringToFile(loaded, new Date().toString()); FileUtils.writeStringToFile(loaded, new Date().toString());
} }

View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current_; import Common.Current_;
import Common.Utils.CommonUtils; import Common.Utils.Utils_;
import Common.Visual.CommonUI; import Common.Visual.UI_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
@@ -29,8 +29,8 @@ public class DownloadProject extends CurrentConnectionPass {
if ((user.connection.getFileKBSize(src.full_name)) <= maxSize) { if ((user.connection.getFileKBSize(src.full_name)) <= maxSize) {
ShowMessage2("Запаковка папки проекта.."); ShowMessage2("Запаковка папки проекта..");
user.connection.Command( user.connection.Command(
"cd " + CommonUtils.DQuotes(src.full_name), "cd " + Utils_.DQuotes(src.full_name),
"zip -r " + CommonUtils.DQuotes(remote_archive.full_name) + " ./" "zip -r " + Utils_.DQuotes(remote_archive.full_name) + " ./"
); );
// try { // try {
ShowMessage2("Загрузка проекта.."); ShowMessage2("Загрузка проекта..");
@@ -53,9 +53,9 @@ public class DownloadProject extends CurrentConnectionPass {
@Override @Override
protected void performDone() throws Exception { protected void performDone() throws Exception {
File project = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), File project = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
CommonUtils.getDateName(src.name)).toFile(); Utils_.getDateName(src.name)).toFile();
if (passes.get(PassCode.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) { if (passes.get(PassCode.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) {
if (CommonUI.Question("Проект " + CommonUtils.Brackets(src.name) + " успешно загружен. Открыть его")) if (UI_.Question("Проект " + Utils_.Brackets(src.name) + " успешно загружен. Открыть его"))
passes.get(PassCode.OpenCurrentProject).Do(project); passes.get(PassCode.OpenCurrentProject).Do(project);
} }
} }

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