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

no message

Browse Source
This commit is contained in:
02090095
2025-03-13 00:32:20 +03:00
parent 91e40c4393
commit 1d97048de1
204 changed files with 984 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

203
.idea/workspace.xml generated
View File

@@ -7,9 +7,210 @@
</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 afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/RDataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.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/Properties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Properties.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/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.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/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HeaderTextFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HeaderTextFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererMilliseconds.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererMilliseconds.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Themes/ThemeElement.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Themes/ThemeElement.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/_VisualDVM/ComponentsServer/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualiser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Recipient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Recipient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServerProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServerProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.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/CompilerEnvironment/EnvironmentsLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLinesSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLinesSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsSetJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsSetJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/RawCompilerEnvironmentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/RawCompilerEnvironmentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/EnvironmentsLinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/EnvironmentsLinesForm.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/Json/OptionJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/OptionsLinesSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/OptionsLinesSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/RawCompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/RawCompilerOptionsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.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/UI/MachineFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilePreviewForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilePreviewForm.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/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/Remote/ServerRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/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/User/UI/UsersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportComment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportComment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ArchivesBackupPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ArchivesBackupPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/BuildComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/BuildComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ComponentsServerBackUp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ComponentsServerBackUp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConfirmEmail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConfirmEmail.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteUserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteUserAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDvmRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDvmRepository.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDvmRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDvmRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditUserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditUserAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetDVMPackageCredetials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetDVMPackageCredetials.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerOptions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerOptions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedure.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedure.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeCredentials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeCredentials.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestingServerBackUp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestingServerBackUp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSapforProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSapforProperty.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ComponentsServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ComponentsServerPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/StartServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/StartServerPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/TestingServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/TestingServerPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.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/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/BackUpsChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/BackUpsChecker.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/EmailChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/EmailChecker.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServerClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServerClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.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/ServerObjectsCache/TestCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/TestCache.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingServerProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingServerProperties.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/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/UI/GroupDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.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/MachinesDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachinesDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingClient.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/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.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/DVM/DVMSettings/UI/DVMSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackageCredentials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackageCredentials.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackagesCredentialsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackagesCredentialsDBTable.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/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.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/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.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/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.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/Visual/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Editor/BaseEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/Viewer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Editor/Viewer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/MainWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.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/VisualiserSettingsMenu/VersionsComparisonMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VersionsComparisonMenu.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/ProjectMenuBar/ProjectSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.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/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CredentialsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CredentialsForm.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/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MultilineTextForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/MultilineTextForm.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/ReadOnlyMultilineTextForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/ReadOnlyMultilineTextForm.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" />
</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" />

8
src/Common/Database/Database.java
View File

@@ -34,7 +34,7 @@ public abstract class Database {
// UI.Print(DebugPrintLevel.Database, "соединение с базой данных " + file.getAbsolutePath()); // UI.Print(DebugPrintLevel.Database, "соединение с базой данных " + file.getAbsolutePath());
connect(); connect();
} }
public void Activate() throws Exception{ public void Activate() throws Exception {
Connect(); Connect();
CreateAllTables(); CreateAllTables();
prepareTablesStatements(); prepareTablesStatements();
@@ -310,7 +310,7 @@ public abstract class Database {
} }
public abstract PassCode_ getSynchronizePassCode(); //если бд есть на сервере. public abstract PassCode_ getSynchronizePassCode(); //если бд есть на сервере.
//-- //--
public void ReplaceFileAndReconnect(File file_in) throws Exception{ public void ReplaceFileAndReconnect(File file_in) throws Exception {
Disconnect(); Disconnect();
Utils_.forceDeleteWithCheck(getFile()); Utils_.forceDeleteWithCheck(getFile());
FileUtils.moveFile(file_in, getFile()); FileUtils.moveFile(file_in, getFile());
@@ -318,10 +318,10 @@ public abstract class Database {
prepareTablesStatements(); prepareTablesStatements();
Synchronize(); Synchronize();
} }
public void DropUI(){ public void DropUI() {
SaveLastSelections(); SaveLastSelections();
} }
public void ResetUI(){ public void ResetUI() {
RestoreLastSelections(); RestoreLastSelections();
} }
} }

1
src/Common/Database/SQLITE/SQLiteDatabase.java
View File

@@ -255,5 +255,4 @@ public abstract class SQLiteDatabase extends Database {
} }
//-- //--
//https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause //https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause
} }

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

@@ -22,10 +22,6 @@ public class Pass<T> {
//-------------- //--------------
public boolean ui_visible = true; public boolean ui_visible = true;
public Vector<PassControl> controls = new Vector<>(); public Vector<PassControl> controls = new Vector<>();
public void addControl(PassControl control_in){
control_in.setVisible(ui_visible);
controls.add(control_in);
}
public TextLog Log; //внутренний журнал прохода. public TextLog Log; //внутренний журнал прохода.
protected boolean interrupt; protected boolean interrupt;
protected SwingWorker dispatcher = null; protected SwingWorker dispatcher = null;
@@ -34,6 +30,10 @@ public class Pass<T> {
private JButton button = null; private JButton button = null;
private JButton tabButton = null; private JButton tabButton = null;
private Exception last_error; //последнее пойманное исключение выполнения. private Exception last_error; //последнее пойманное исключение выполнения.
public void addControl(PassControl control_in) {
control_in.setVisible(ui_visible);
controls.add(control_in);
}
//->> //->>
public Throwable getCauseRec(Throwable ex) { public Throwable getCauseRec(Throwable ex) {
Throwable cause = ex.getCause(); Throwable cause = ex.getCause();
@@ -79,7 +79,7 @@ public class Pass<T> {
control.setEnabled(flag); control.setEnabled(flag);
} }
public void setControlsVisible(boolean flag) { public void setControlsVisible(boolean flag) {
ui_visible =flag; ui_visible = flag;
for (PassControl control : controls) for (PassControl control : controls)
control.setVisible(ui_visible); control.setVisible(ui_visible);
} }

16
src/Common/Properties.java
View File

@@ -11,6 +11,11 @@ import java.util.LinkedHashMap;
public class Properties { public class Properties {
protected LinkedHashMap<String, JMenuItem> controls = new LinkedHashMap<>(); protected LinkedHashMap<String, JMenuItem> controls = new LinkedHashMap<>();
private File file = null; //файл где хранятся настройки. private File file = null; //файл где хранятся настройки.
public Properties() {
}
public Properties(File file_in) {
setFile(file_in);
}
public File getFile() { public File getFile() {
return file; return file;
} }
@@ -24,11 +29,6 @@ public class Properties {
e.printStackTrace(); e.printStackTrace();
} }
} }
public Properties() {
}
public Properties(File file_in) {
setFile(file_in);
}
public boolean updateField(String name, Object newValue) { public boolean updateField(String name, Object newValue) {
try { try {
Field field = getClass().getField(name); Field field = getClass().getField(name);
@@ -50,7 +50,7 @@ public class Properties {
return "?"; return "?";
} }
public boolean controlAction(String fieldName, JMenuItem control public boolean controlAction(String fieldName, JMenuItem control
){ ) {
return false; return false;
} }
public JMenuItem getMenuItem(String fieldName) { public JMenuItem getMenuItem(String fieldName) {
@@ -86,8 +86,8 @@ public class Properties {
ex.printStackTrace(); ex.printStackTrace();
} }
} }
public void setControlVisible(String settingName, boolean flag){ public void setControlVisible(String settingName, boolean flag) {
if (controls.containsKey(settingName)){ if (controls.containsKey(settingName)) {
controls.get(settingName).setVisible(flag); controls.get(settingName).setVisible(flag);
} }
} }

2
src/Common/Utils/Loggable.java
View File

@@ -1,6 +1,6 @@
package Common.Utils; package Common.Utils;
import Common.Visual.UI; import Common.Visual.UI;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm; import Common.Visual.Windows.ReadOnlyMultilineTextForm;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;

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

@@ -2,7 +2,6 @@ package Common.Visual;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Objects.Grid.TableVisualData; import Common.Database.Objects.Grid.TableVisualData;
import Common.Database.Objects.riDBObject;
import Common.Database.Tables.DBTable; import Common.Database.Tables.DBTable;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKBehaviour;
@@ -15,7 +14,6 @@ import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.*; import Common.Visual.Tables.*;
import Common.Visual.Tables.Grid.GridAnchestor; import Common.Visual.Tables.Grid.GridAnchestor;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import javax.swing.*; import javax.swing.*;
import javax.swing.table.TableColumn; import javax.swing.table.TableColumn;
@@ -42,8 +40,6 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
//-- //--
Object savedCurrentKey = null; Object savedCurrentKey = null;
Vector<Object> savedSelectedKeys = new Vector<>(); Vector<Object> savedSelectedKeys = new Vector<>();
//--
public DataMenuBar getMenuBar() {return bar;}
public DataSetControlForm(DataSet<?, D> dataSource_in, JPanel mountPanel_in) { public DataSetControlForm(DataSet<?, D> dataSource_in, JPanel mountPanel_in) {
super(DataTable.class, mountPanel_in); super(DataTable.class, mountPanel_in);
dataSource = dataSource_in; dataSource = dataSource_in;
@@ -71,7 +67,7 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
//-- //--
counter_ui = (count -> bar.countLabel.setText(String.valueOf(count))); counter_ui = (count -> bar.countLabel.setText(String.valueOf(count)));
//--фильтры всегда в конец бара. //--фильтры всегда в конец бара.
// bar.add(new JSeparator()); // bar.add(new JSeparator());
for (FilterFlag filter : getFilters(FilterFlag.class)) { for (FilterFlag filter : getFilters(FilterFlag.class)) {
bar.add(filter.getControl()); bar.add(filter.getControl());
} }
@@ -84,6 +80,10 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
} }
} }
} }
//--
public DataMenuBar getMenuBar() {
return bar;
}
protected boolean isPKVisible() { protected boolean isPKVisible() {
return true; return true;
} }
@@ -575,12 +575,10 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
public PassCode_ getDeletePassCode() { public PassCode_ getDeletePassCode() {
return null; return null;
} }
public Object getCurrentPK(Object nanValue){ public Object getCurrentPK(Object nanValue) {
return current==null? nanValue: current.getPK(); return current == null ? nanValue : current.getPK();
} }
//todo временное решение ? ->>> public boolean canModifyCurrent(TextLog Log) {
public boolean canModifyCurrent(TextLog Log){ return CheckCurrent(Log);
return CheckCurrent(Log) && (
!(current instanceof riDBObject) || Global.mainModule.getAccount().CheckAuthorship(((riDBObject)current).sender_address,Log));
} }
} }

14
src/_VisualDVM/Visual/Editor/BaseEditor.java → src/Common/Visual/Editor/BaseEditor.java
View File

@@ -1,12 +1,10 @@
package _VisualDVM.Visual.Editor; package Common.Visual.Editor;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Menus.StyledPopupMenu; import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.TextEditorMenu; import Common.Visual.Menus.TextEditorMenu;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI; import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Visual.Syntax.SPFEditorTheme;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkEvent;
@@ -16,7 +14,7 @@ import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.net.URI; import java.net.URI;
public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogFields { public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogFields {
private final StyledPopupMenu menu; protected final StyledPopupMenu menu;
// protected int changesCount = 0; // protected int changesCount = 0;
// protected int insertsCount = 0; // protected int insertsCount = 0;
// protected int removesCount = 0; // protected int removesCount = 0;
@@ -128,14 +126,6 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
changeFont(getFont().getSize() - 1); changeFont(getFont().getSize() - 1);
} }
@Override @Override
public void applyTheme() {
float font_size = (float) getFont().getSize();
((SPFEditorTheme) MainModule_.instance.getUI().getTheme()).getEditorTheme().apply(this);
setFont(getFont().deriveFont(font_size));
menu.applyTheme();
//меню связано с редактором. поэтому тема меняется только вместе с ним.
}
@Override
public Component getContent() { public Component getContent() {
return this; return this;
} }

2
src/_VisualDVM/Visual/Editor/Viewer.java → src/Common/Visual/Editor/Viewer.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.Visual.Editor; package Common.Visual.Editor;
public class Viewer extends BaseEditor { public class Viewer extends BaseEditor {
public Viewer() { public Viewer() {
setLineWrap(true); setLineWrap(true);

2
src/Common/Visual/Menus/DataMenuBar.java
View File

@@ -8,12 +8,12 @@ import java.awt.*;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
public class DataMenuBar extends VisualiserMenuBar { public class DataMenuBar extends VisualiserMenuBar {
public JLabel countLabel = null; public JLabel countLabel = null;
private DataSet dataSource = null;
//- //-
public ActionListener selectAllListener = null; public ActionListener selectAllListener = null;
public ActionListener unselectAllListener = null; public ActionListener unselectAllListener = null;
JButton selectAllButton = null; JButton selectAllButton = null;
JButton unselectAllButton = null; JButton unselectAllButton = null;
private DataSet dataSource = null;
//- //-
public DataMenuBar(String dataName, PassCode_... passes) { public DataMenuBar(String dataName, PassCode_... passes) {
add(new JLabel(dataName + " : ")); add(new JLabel(dataName + " : "));

8
src/Common/Visual/Menus/TableMenu.java
View File

@@ -21,7 +21,7 @@ public class TableMenu extends StyledPopupMenu {
mcopy.addActionListener(e -> Utils_.CopyToClipboard(target.toString())); mcopy.addActionListener(e -> Utils_.CopyToClipboard(target.toString()));
add(mcopy); add(mcopy);
// //
add(value_scroll= new JScrollPane(value_view = new JTextArea())); add(value_scroll = new JScrollPane(value_view = new JTextArea()));
value_view.setEditable(false); value_view.setEditable(false);
//value_view.setLineWrap(true); //value_view.setLineWrap(true);
//value_view.setWrapStyleWord(true); //value_view.setWrapStyleWord(true);
@@ -33,13 +33,13 @@ public class TableMenu extends StyledPopupMenu {
if ((row >= 0) && (column >= 0)) { if ((row >= 0) && (column >= 0)) {
target = owner.getValueAt(row, column); target = owner.getValueAt(row, column);
mcopy.setVisible(true); mcopy.setVisible(true);
Dimension d= new Dimension(Math.max(mcopy.getWidth(), 300),100); Dimension d = new Dimension(Math.max(mcopy.getWidth(), 300), 100);
value_view.setVisible(true); value_view.setVisible(true);
String res = target.toString(); String res = target.toString();
if (target instanceof Vector){ if (target instanceof Vector) {
Vector<Object> v = (Vector<Object>) target; Vector<Object> v = (Vector<Object>) target;
Vector<String> res_ = new Vector<>(); Vector<String> res_ = new Vector<>();
for (Object o: v){ for (Object o : v) {
res_.add(o.toString()); res_.add(o.toString());
} }
res = String.join("\n", res_); res = String.join("\n", res_);

4
src/Common/Visual/Menus/VisualiserMenuBar.java
View File

@@ -21,8 +21,8 @@ public class VisualiserMenuBar extends JToolBar {
} }
} }
} }
public void addPasses(Pass...passes){ public void addPasses(Pass... passes) {
for (Pass pass: passes) for (Pass pass : passes)
add(pass.createButton()); add(pass.createButton());
} }
public JMenuBar addMenus(JMenu... menus) { public JMenuBar addMenus(JMenu... menus) {

14
src/Common/Visual/Tables/HeaderTextFilter.java
View File

@@ -18,26 +18,26 @@ public class HeaderTextFilter<D extends DBObject> implements DBObjectFilter_<D>
int columnIndex = CommonConstants.Nan; //номер столбца к которому привязан фильтр. int columnIndex = CommonConstants.Nan; //номер столбца к которому привязан фильтр.
JTextField textField = null; JTextField textField = null;
JPopupMenu popup = null; JPopupMenu popup = null;
boolean contains = true;
private String filterValue = ""; private String filterValue = "";
private int offset = 0; private int offset = 0;
boolean contains = true;
//при одиночном клике, показать поверх заголовка столбца выпавшее меню с полем фильтра. //при одиночном клике, показать поверх заголовка столбца выпавшее меню с полем фильтра.
public HeaderTextFilter(DataSet dataSet_in, int columnIndex_in, int offset_in, boolean contains_in) { public HeaderTextFilter(DataSet dataSet_in, int columnIndex_in, int offset_in, boolean contains_in) {
dataSet = dataSet_in; dataSet = dataSet_in;
columnIndex = columnIndex_in; columnIndex = columnIndex_in;
offset = offset_in; offset = offset_in;
contains=contains_in; contains = contains_in;
} }
public HeaderTextFilter(DataSet dataSet_in, int columnIndex_in, int offset_in) { public HeaderTextFilter(DataSet dataSet_in, int columnIndex_in, int offset_in) {
this(dataSet_in,columnIndex_in,offset_in, true); this(dataSet_in, columnIndex_in, offset_in, true);
} }
@Override @Override
public boolean Validate(D object) { public boolean Validate(D object) {
Object field = dataSet.getUI().getColumnInfo(columnIndex).getFieldAt(object); Object field = dataSet.getUI().getColumnInfo(columnIndex).getFieldAt(object);
if (field instanceof String){ if (field instanceof String) {
String s = field.toString().toLowerCase(); String s = field.toString().toLowerCase();
return contains?s.contains(filterValue): return contains ? s.contains(filterValue) :
(filterValue.isEmpty()||s.equals(filterValue)) || (filterValue.trim().isEmpty()&&s.isEmpty()); (filterValue.isEmpty() || s.equals(filterValue)) || (filterValue.trim().isEmpty() && s.isEmpty());
} }
return false; return false;
} }

5
src/Common/Visual/Tables/RendererMilliseconds.java
View File

@@ -1,11 +1,8 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
import java.util.Date; public class RendererMilliseconds extends RendererCell<Long> {
public class RendererMilliseconds extends RendererCell<Long>{
@Override @Override
public Long Init(JTable table, Object value, int row, int column) { public Long Init(JTable table, Object value, int row, int column) {
return (Long) value; return (Long) value;

4
src/Common/Visual/Themes/ThemeElement.java
View File

@@ -4,5 +4,7 @@ public interface ThemeElement {
} }
default void FontDown() { default void FontDown() {
} }
void applyTheme(); default void applyTheme() {
}
;
} }

2
src/Common/Visual/Trees/TreeForm.java
View File

@@ -13,6 +13,6 @@ public class TreeForm<C extends StyledTree> extends ControlForm<C> {
} }
@Override @Override
protected void redrawControl() { protected void redrawControl() {
((DefaultTreeModel)getTree().getModel()).reload(); ((DefaultTreeModel) getTree().getModel()).reload();
} }
} }

2
src/Common/Visual/Windows/Dialog/Dialog.java
View File

@@ -108,7 +108,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
} }
getContentPane().add(buttonsPane, BorderLayout.SOUTH); getContentPane().add(buttonsPane, BorderLayout.SOUTH);
} }
public void BlockButtons(){ public void BlockButtons() {
btnOK.setVisible(false); btnOK.setVisible(false);
btnCancel.setVisible(false); btnCancel.setVisible(false);
} }

4
src/_VisualDVM/Visual/Windows/MultilineTextForm.java → src/Common/Visual/Windows/MultilineTextForm.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows; package Common.Visual.Windows;
import Common.Visual.Editor.BaseEditor;
import Common.Visual.Windows.Dialog.Text.TextDialog; import Common.Visual.Windows.Dialog.Text.TextDialog;
import _VisualDVM.Visual.Editor.BaseEditor;
public class MultilineTextForm extends TextDialog<BaseEditor> { public class MultilineTextForm extends TextDialog<BaseEditor> {
public MultilineTextForm() { public MultilineTextForm() {
super(BaseEditor.class); super(BaseEditor.class);

2
src/_VisualDVM/Visual/Windows/ReadOnlyMultilineTextForm.java → src/Common/Visual/Windows/ReadOnlyMultilineTextForm.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.Visual.Windows; package Common.Visual.Windows;
public class ReadOnlyMultilineTextForm extends MultilineTextForm { public class ReadOnlyMultilineTextForm extends MultilineTextForm {
public ReadOnlyMultilineTextForm() { public ReadOnlyMultilineTextForm() {
} }

2
src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
View File

@@ -155,12 +155,10 @@ public class BugReport extends rDBObject {
return project_version.isEmpty(); return project_version.isEmpty();
} }
//---> //--->
public void CheckRecipients() { public void CheckRecipients() {
for (Recipient recipient : Global.componentsServer.db.recipients.Data.values()) for (Recipient recipient : Global.componentsServer.db.recipients.Data.values())
recipient.Select(packedRecipientsJson.contains(recipient.email)); recipient.Select(packedRecipientsJson.contains(recipient.email));
} }
public void saveRecipientsAsJson(Vector<Recipient> recipients) { public void saveRecipientsAsJson(Vector<Recipient> recipients) {
packedRecipientsJson = Utils_.gson.toJson(new RecipientsJson(recipients)); packedRecipientsJson = Utils_.gson.toJson(new RecipientsJson(recipients));
} }

4
src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java
View File

@@ -9,8 +9,8 @@ public class BugReportAdditionJson implements Serializable {
@Expose @Expose
public String fieldName = ""; public String fieldName = "";
@Expose @Expose
public String textAddition =""; public String textAddition = "";
public BugReportAdditionJson(BugReport bugReport, String fieldName_in, String addition_in){ public BugReportAdditionJson(BugReport bugReport, String fieldName_in, String addition_in) {
id = bugReport.id; id = bugReport.id;
fieldName = fieldName_in; fieldName = fieldName_in;
textAddition = addition_in; textAddition = addition_in;

2
src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java
View File

@@ -4,7 +4,7 @@ public class RecipientJson {
@Expose @Expose
public String address; public String address;
public RecipientJson(String addres_in) { public RecipientJson(String addres_in) {
address= addres_in; address = addres_in;
} }
public RecipientJson() { public RecipientJson() {
} }

2
src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java
View File

@@ -5,6 +5,6 @@ public class VisualiserSettingJson {
public String name; public String name;
@Expose @Expose
public String value; public String value;
public VisualiserSettingJson(){ public VisualiserSettingJson() {
} }
} }

1
src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
View File

@@ -3,7 +3,6 @@ import Common.Database.SQLITE.SQLiteDatabase;
import _VisualDVM.ComponentsServer.BugReport.BugReport; import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.BugReportsDBTable; import _VisualDVM.ComponentsServer.BugReport.BugReportsDBTable;
import _VisualDVM.ComponentsServer.Recipient.RecipientsDataSet; import _VisualDVM.ComponentsServer.Recipient.RecipientsDataSet;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspaceDBTable;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import java.nio.file.Paths; import java.nio.file.Paths;

2
src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java
View File

@@ -25,7 +25,7 @@ public class ComponentPublicationInfoJson implements Serializable {
public boolean needsEmail = false; public boolean needsEmail = false;
@Expose @Expose
public boolean needsSendFile = false; public boolean needsSendFile = false;
public ComponentPublicationInfoJson(Component component) throws Exception{ public ComponentPublicationInfoJson(Component component) throws Exception {
componentType = component.getComponentType(); componentType = component.getComponentType();
fileName = component.getFileName(); fileName = component.getFileName();
packedFile = Utils_.fileToBytes(component.getFile()); packedFile = Utils_.fileToBytes(component.getFile());

4
src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java
View File

@@ -10,7 +10,7 @@ public class ComponentVersionsInfoJson implements Serializable {
public String minimal_version = ""; public String minimal_version = "";
@Expose @Expose
public String actual_version = ""; public String actual_version = "";
public ComponentVersionsInfoJson(ComponentType componentType_in){ public ComponentVersionsInfoJson(ComponentType componentType_in) {
componentType=componentType_in; componentType = componentType_in;
} }
} }

212
src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
View File

@@ -301,6 +301,112 @@ public abstract class Sapfor extends OSDComponent {
} }
return res; return res;
} }
//--
public static int getFileMaxDim_C(File file) {
int fileMax = 0;
final String prefix = "#pragma dvm array distribute";
int n = 0;
try {
for (String line : FileUtils.readLines(file, Charset.defaultCharset())) {
// #pragma dvm array distribute[block][block], не важно
String packedLine = Utils_.removeCharacters(Utils_.removeRedundantSpaces(line).toLowerCase(), "\n", "\r", "\t");
if (packedLine.startsWith(prefix)) {
packedLine = packedLine.substring(prefix.length());
boolean bracketOpen = false;
int pragmaMax = 0;
String distr = "";
for (int i = packedLine.indexOf('['); i < packedLine.length(); ++i) {
char c = packedLine.charAt(i);
if (bracketOpen) {
if (c == ']') {
bracketOpen = false;
if (distr.equals("block"))
pragmaMax++;
distr = "";
} else {
distr += c;
}
} else {
if (c == '[') {
bracketOpen = true;
} else {
break;
}
}
}
fileMax = Math.max(fileMax, pragmaMax);
}
++n;
}
} catch (Exception ex) {
ex.printStackTrace();
}
return fileMax;
}
public static int getProjectMinMaxDim_C(db_project_info project) {
int res = 0;
for (DBProjectFile file : project.db.files.Data.values()) {
if (file.isActiveProgram())
res = Math.max(res, Sapfor.getFileMaxDim_C(file.file));
}
return res;
}
public static Pair<Integer, Integer> getProjectFolderMinMaxDim_F(File sapfor_drv, File projectPath) {
String flags = "-noLogo";
Pair<Integer, Integer> res = new Pair<>(0, 0);
try {
if (Sapfor.parse(sapfor_drv, projectPath, flags)
) {
Vector<String> outputLines = new Vector<>();
if (Sapfor.analysis(sapfor_drv, projectPath, PassCode.SPF_GetMaxMinBlockDistribution, flags, outputLines)) {
//---
for (String line : outputLines) {
String prefix = "GET_MIN_MAX_BLOCK_DIST: ";
if (line.startsWith(prefix)) {
String s = line.substring(prefix.length());
String[] data = s.split(" ");
res = new Pair<>(Math.max(Integer.parseInt(data[0]), 0), Math.max(Integer.parseInt(data[1]), 0));
break;
}
}
}
}
} catch (Exception ex) {
ex.printStackTrace();
} finally {
try {
Utils.deleteFilesByExtensions(projectPath,
"proj", "dep", "jar"
);
File visualiser_data = new File(projectPath, Constants.data);
if (visualiser_data.exists())
FileUtils.forceDelete(visualiser_data);
} catch (Exception ex) {
ex.printStackTrace();
}
}
return res;
}
public static void getTestMinMaxDim_F(File sapfor_drv, Test test) {
Pair<Integer, Integer> res = getProjectFolderMinMaxDim_F(sapfor_drv, test.getServerPath());
test.min_dim = res.getKey();
test.max_dim = res.getValue();
}
public static void getTestMinMaxDime_C(Test test) {
File workspace = test.getServerPath();
Vector<File> files = new Vector<>();
TestFilesJson filesJson = Utils_.gson.fromJson(test.packedFilesJson, TestFilesJson.class);
for (TestFileJson fileJson : filesJson.values) {
files.add(new File(workspace, fileJson.name));
}
int min_dim = 0;
int max_dim = 0;
for (File file : files) {
max_dim = Math.max(max_dim, getFileMaxDim_C(file));
}
test.min_dim = min_dim;
test.max_dim = max_dim;
}
public void refreshPid() { public void refreshPid() {
try { try {
// UI.Info("Calling SPF_GetCurrentPID..."); // UI.Info("Calling SPF_GetCurrentPID...");
@@ -542,110 +648,4 @@ public abstract class Sapfor extends OSDComponent {
Global.mainModule.getUI().getVersionsWindow().BlockVariants(); Global.mainModule.getUI().getVersionsWindow().BlockVariants();
} }
//-- //--
public static int getFileMaxDim_C(File file) {
int fileMax = 0;
final String prefix = "#pragma dvm array distribute";
int n = 0;
try {
for (String line : FileUtils.readLines(file, Charset.defaultCharset())) {
// #pragma dvm array distribute[block][block], не важно
String packedLine = Utils_.removeCharacters(Utils_.removeRedundantSpaces(line).toLowerCase(), "\n", "\r", "\t");
if (packedLine.startsWith(prefix)) {
packedLine = packedLine.substring(prefix.length());
boolean bracketOpen = false;
int pragmaMax = 0;
String distr = "";
for (int i = packedLine.indexOf('['); i < packedLine.length(); ++i) {
char c = packedLine.charAt(i);
if (bracketOpen) {
if (c == ']') {
bracketOpen = false;
if (distr.equals("block"))
pragmaMax++;
distr = "";
} else {
distr += c;
}
} else {
if (c == '[') {
bracketOpen = true;
} else {
break;
}
}
}
fileMax = Math.max(fileMax, pragmaMax);
}
++n;
}
} catch (Exception ex) {
ex.printStackTrace();
}
return fileMax;
}
public static int getProjectMinMaxDim_C(db_project_info project) {
int res = 0;
for (DBProjectFile file : project.db.files.Data.values()) {
if (file.isActiveProgram())
res = Math.max(res, Sapfor.getFileMaxDim_C(file.file));
}
return res;
}
public static Pair<Integer, Integer> getProjectFolderMinMaxDim_F(File sapfor_drv, File projectPath) {
String flags = "-noLogo";
Pair<Integer, Integer> res = new Pair<>(0, 0);
try {
if (Sapfor.parse(sapfor_drv, projectPath, flags)
) {
Vector<String> outputLines = new Vector<>();
if (Sapfor.analysis(sapfor_drv, projectPath, PassCode.SPF_GetMaxMinBlockDistribution, flags, outputLines)) {
//---
for (String line : outputLines) {
String prefix = "GET_MIN_MAX_BLOCK_DIST: ";
if (line.startsWith(prefix)) {
String s = line.substring(prefix.length());
String[] data = s.split(" ");
res = new Pair<>(Math.max(Integer.parseInt(data[0]), 0), Math.max(Integer.parseInt(data[1]), 0));
break;
}
}
}
}
} catch (Exception ex) {
ex.printStackTrace();
} finally {
try {
Utils.deleteFilesByExtensions(projectPath,
"proj", "dep", "jar"
);
File visualiser_data = new File(projectPath, Constants.data);
if (visualiser_data.exists())
FileUtils.forceDelete(visualiser_data);
} catch (Exception ex) {
ex.printStackTrace();
}
}
return res;
}
public static void getTestMinMaxDim_F(File sapfor_drv, Test test) {
Pair<Integer, Integer> res = getProjectFolderMinMaxDim_F(sapfor_drv, test.getServerPath());
test.min_dim = res.getKey();
test.max_dim = res.getValue();
}
public static void getTestMinMaxDime_C(Test test) {
File workspace = test.getServerPath();
Vector<File> files = new Vector<>();
TestFilesJson filesJson = Utils_.gson.fromJson(test.packedFilesJson,TestFilesJson.class);
for (TestFileJson fileJson : filesJson.values) {
files.add(new File(workspace, fileJson.name));
}
int min_dim = 0;
int max_dim = 0;
for (File file: files){
max_dim = Math.max(max_dim,getFileMaxDim_C(file));
}
test.min_dim = min_dim;
test.max_dim = max_dim;
}
//--
} }

2
src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ComponentsServer.Component.UI; package _VisualDVM.ComponentsServer.Component.UI;
import Common.Visual.Editor.BaseEditor;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Visual.Editor.BaseEditor;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

2
src/_VisualDVM/ComponentsServer/Component/Visualiser.java
View File

@@ -85,7 +85,7 @@ public class Visualiser extends Component {
} }
return res; return res;
} }
public File getDownloadsDirectory(){ public File getDownloadsDirectory() {
File res = new File(getWorkspace(), Constants.DownloadsDirectoryName); File res = new File(getWorkspace(), Constants.DownloadsDirectoryName);
Utils_.CheckDirectory(res); Utils_.CheckDirectory(res);
return res; return res;

4
src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
View File

@@ -73,8 +73,8 @@ public class Visualizer_2 extends OSDComponent {
} }
@Override @Override
public String getAssemblyCommand() { public String getAssemblyCommand() {
File src_home= Paths.get(Global.RepoDirectory.getAbsolutePath(),"SAPFOR/src/Server").toFile(); File src_home = Paths.get(Global.RepoDirectory.getAbsolutePath(), "SAPFOR/src/Server").toFile();
return "cd " +Utils_.DQuotes(src_home)+ return "cd " + Utils_.DQuotes(src_home) +
"\n" + "\n" +
"g++ -O3 -std=c++17 checkUniq.cpp server.cpp -o Visualizer_2 -lpthread -lstdc++fs\n"; "g++ -O3 -std=c++17 checkUniq.cpp server.cpp -o Visualizer_2 -lpthread -lstdc++fs\n";
} }

22
src/_VisualDVM/ComponentsServer/ComponentsServer.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.ComponentsServer; package _VisualDVM.ComponentsServer;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Database.RepositoryRefuseException; import Common.Database.RepositoryRefuseException;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.BugReport.BugReport; import _VisualDVM.ComponentsServer.BugReport.BugReport;
@@ -12,13 +11,7 @@ import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount; import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.All.ArchivesBackupPass;
import _VisualDVM.Passes.All.Email;
import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.Passes.All.ZipFolderPass; import _VisualDVM.Passes.All.ZipFolderPass;
import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.EmailMessage;
@@ -26,17 +19,14 @@ import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Utils; import _VisualDVM.Utils;
import javafx.util.Pair; import javafx.util.Pair;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.RandomStringUtils;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Vector; import java.util.Vector;
public class ComponentsServer extends RepositoryServer<BugReportsDatabase> { public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
@@ -54,7 +44,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
} }
@Override @Override
protected void extraBackup(File todayBackUp) { protected void extraBackup(File todayBackUp) {
zip.Do("Bugs",new File (todayBackUp, "Bugs.zip").getAbsolutePath()); zip.Do("Bugs", new File(todayBackUp, "Bugs.zip").getAbsolutePath());
} }
@Override @Override
protected void beforePublishAction(DBObject object) throws Exception { protected void beforePublishAction(DBObject object) throws Exception {
@@ -71,7 +61,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
if (object instanceof BugReport) { if (object instanceof BugReport) {
BugReport bugReport = (BugReport) object; BugReport bugReport = (BugReport) object;
if (!bugReport.project_version.isEmpty()) Utils_.forceDeleteWithCheck(bugReport.getArchiveFile()); if (!bugReport.project_version.isEmpty()) Utils_.forceDeleteWithCheck(bugReport.getArchiveFile());
}else if (object instanceof UserAccount){ } else if (object instanceof UserAccount) {
UserAccount account = (UserAccount) object; UserAccount account = (UserAccount) object;
Utils_.forceDeleteWithCheck(account.getServerKeyFile()); Utils_.forceDeleteWithCheck(account.getServerKeyFile());
} }
@@ -237,7 +227,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
bufferWriter_.close(); bufferWriter_.close();
} }
//-рассылка об изменениях. //-рассылка об изменениях.
if (info.needsEmail){ if (info.needsEmail) {
String version_mail_header = String.join(" ", String version_mail_header = String.join(" ",
"Опубликована версия", "Опубликована версия",
Utils_.DQuotes(info.versionNumber), Utils_.DQuotes(info.versionNumber),
@@ -246,13 +236,13 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
//- //-
EmailMessage message = EmailMessage message =
new EmailMessage(version_mail_header, new EmailMessage(version_mail_header,
info.changeRecord info.changeRecord
); );
if (info.needsSendFile) if (info.needsSendFile)
message.addAttachement(componentFile); message.addAttachement(componentFile);
//-- //--
for (String address: credentials_db.userAccounts.getActiveMails()){ for (String address : credentials_db.userAccounts.getActiveMails()) {
EmailMessagesQueue.add(new Pair<>(address,message)); EmailMessagesQueue.add(new Pair<>(address, message));
} }
} }
} }

7
src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
View File

@@ -1,17 +1,11 @@
package _VisualDVM.ComponentsServer; package _VisualDVM.ComponentsServer;
import Common.Database.Objects.DBObject;
import Common.Database.SQLITE.SQLiteDatabase; import Common.Database.SQLITE.SQLiteDatabase;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspaceDBTable; import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspaceDBTable;
import _VisualDVM.ComponentsServer.UserAccount.UserAccountsDBTable; import _VisualDVM.ComponentsServer.UserAccount.UserAccountsDBTable;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.LinkedHashMap;
public class CredentialsDatabase extends SQLiteDatabase { public class CredentialsDatabase extends SQLiteDatabase {
public UserAccountsDBTable userAccounts; public UserAccountsDBTable userAccounts;
public SubscriberWorkspaceDBTable workspaces; public SubscriberWorkspaceDBTable workspaces;
@@ -38,5 +32,4 @@ public class CredentialsDatabase extends SQLiteDatabase {
userAccounts.ShowUI(); userAccounts.ShowUI();
super.ResetUI(); super.ResetUI();
} }
} }

2
src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountJson.java
View File

@@ -5,7 +5,7 @@ public class UserAccountJson {
public String email; public String email;
@Expose @Expose
public String name; public String name;
public UserAccountJson(String email_in, String name_in){ public UserAccountJson(String email_in, String name_in) {
email = email_in; email = email_in;
name = name_in; name = name_in;
} }

12
src/_VisualDVM/ComponentsServer/Recipient/Recipient.java
View File

@@ -4,6 +4,12 @@ import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountJson;
public class Recipient extends DBObject { public class Recipient extends DBObject {
public String email = ""; public String email = "";
public String name = ""; public String name = "";
public Recipient() {
}
public Recipient(UserAccountJson json) {
email = json.email;
name = json.name;
}
@Override @Override
public Object getPK() { public Object getPK() {
return email; return email;
@@ -15,10 +21,4 @@ public class Recipient extends DBObject {
email = src_.email; email = src_.email;
name = src_.name; name = src_.name;
} }
public Recipient() {
}
public Recipient(UserAccountJson json) {
email = json.email;
name = json.name;
}
} }

13
src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java
View File

@@ -5,7 +5,6 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountJson; import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountJson;
import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountsJson; import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountsJson;
import _VisualDVM.ComponentsServer.Recipient.UI.RecipientsForm; import _VisualDVM.ComponentsServer.Recipient.UI.RecipientsForm;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -15,16 +14,16 @@ public class RecipientsDataSet extends DataSet<String, Recipient> {
public RecipientsDataSet() { public RecipientsDataSet() {
super(String.class, Recipient.class); super(String.class, Recipient.class);
} }
public void Unpack(String packed){ public void Unpack(String packed) {
clear(); clear();
UserAccountsJson jsons = Utils_.gson.fromJson(packed, UserAccountsJson.class); UserAccountsJson jsons = Utils_.gson.fromJson(packed, UserAccountsJson.class);
for (UserAccountJson userAccountJson: jsons.values){ for (UserAccountJson userAccountJson : jsons.values) {
Global.componentsServer.db.recipients.put(userAccountJson.email, new Recipient(userAccountJson)); Global.componentsServer.db.recipients.put(userAccountJson.email, new Recipient(userAccountJson));
} }
} }
@Override @Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new RecipientsForm(this,mountPanel); return new RecipientsForm(this, mountPanel);
} }
@Override @Override
public String getPluralDescription() { public String getPluralDescription() {
@@ -34,11 +33,11 @@ public class RecipientsDataSet extends DataSet<String, Recipient> {
public String getSingleDescription() { public String getSingleDescription() {
return "адресат"; return "адресат";
} }
public Vector<String> getSelectedMails(){ public Vector<String> getSelectedMails() {
//баг текущий. значит адресаты уже активные и правильные. дополняем их админами и автором. //баг текущий. значит адресаты уже активные и правильные. дополняем их админами и автором.
Vector<String> res = new Vector<>(); Vector<String> res = new Vector<>();
for (Recipient recipient:Data.values()){ for (Recipient recipient : Data.values()) {
if (recipient.isSelected()&& !res.contains(recipient.email)) if (recipient.isSelected() && !res.contains(recipient.email))
res.add(recipient.email); res.add(recipient.email);
} }
//-- //--

2
src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java
View File

@@ -26,7 +26,7 @@ public class RecipientsForm extends DataSetControlForm<Recipient> {
} }
@Override @Override
protected DataMenuBar createMenuBar() { protected DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SaveBugReportExecutor,PassCode.SaveBugReportRecipients); return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SaveBugReportExecutor, PassCode.SaveBugReportRecipients);
} }
@Override @Override
protected ColumnInfo<Recipient> createPKColumn() { protected ColumnInfo<Recipient> createPKColumn() {

2
src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
View File

@@ -1,13 +1,11 @@
package _VisualDVM.ComponentsServer.SubscriberWorkspace.UI; package _VisualDVM.ComponentsServer.SubscriberWorkspace.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo; import Common.Visual.Tables.ColumnInfo;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace; import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount; import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import javax.swing.*; import javax.swing.*;
public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> { public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {

2
src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java
View File

@@ -2,9 +2,9 @@ package _VisualDVM.ComponentsServer.UserAccount.UI;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.UI; import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount; import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
public class UserAccountDialog extends DBObjectDialog<UserAccount, UserAccountFields> { public class UserAccountDialog extends DBObjectDialog<UserAccount, UserAccountFields> {
public UserAccountDialog() { public UserAccountDialog() {
super(UserAccountFields.class); super(UserAccountFields.class);

2
src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java
View File

@@ -6,11 +6,11 @@ import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
public class UserAccountFields implements DialogFields { public class UserAccountFields implements DialogFields {
private JPanel content;
public JTextField tfName; public JTextField tfName;
public JTextField tfAddress; public JTextField tfAddress;
public JCheckBox cbMail; public JCheckBox cbMail;
public JComboBox cbRole; public JComboBox cbRole;
private JPanel content;
private void createUIComponents() { private void createUIComponents() {
// TODO: place custom component creation code here // TODO: place custom component creation code here
tfName = new StyledTextField(); tfName = new StyledTextField();

27
src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java
View File

@@ -13,38 +13,37 @@ public class UserAccount extends iDBObject {
public String name = ""; public String name = "";
public String email = ""; public String email = "";
@Description("DEFAULT ''") @Description("DEFAULT ''")
public String telegram_name=""; public String telegram_name = "";
@Description("DEFAULT 1") @Description("DEFAULT 1")
public int subscribe_active = 1; public int subscribe_active = 1;
@Description("DEFAULT 'Undefined'") @Description("DEFAULT 'Undefined'")
public AccountRole role = AccountRole.Undefined; //права доступа public AccountRole role = AccountRole.Undefined; //права доступа
public UserAccount(){ public UserAccount() {
} }
public UserAccount(UserAccount account_in) { public UserAccount(UserAccount account_in) {
this.SynchronizeFields(account_in); this.SynchronizeFields(account_in);
} }
public UserAccount(String name_in, String email_in) {
name = name_in;
email = email_in;
}
@Override @Override
public void SynchronizeFields(DBObject src) { public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src); super.SynchronizeFields(src);
UserAccount src_ = (UserAccount) src; UserAccount src_ = (UserAccount) src;
name = src_.name; name = src_.name;
email = src_.email; email = src_.email;
telegram_name=src_.telegram_name; telegram_name = src_.telegram_name;
subscribe_active=src_.subscribe_active; subscribe_active = src_.subscribe_active;
role = src_.role; role = src_.role;
} }
public UserAccount(String name_in, String email_in){ public File getClientKeyFile() {
name = name_in; return new File(Global.KeysDirectory, "key");
email=email_in;
} }
public File getClientKeyFile(){ public File getServerKeyFile() {
return new File(Global.KeysDirectory,"key"); return new File(Global.KeysDirectory, String.valueOf(id));
} }
public File getServerKeyFile(){ public String getKey() throws Exception {
return new File(Global.KeysDirectory,String.valueOf(id));
}
public String getKey() throws Exception{
return FileUtils.readFileToString(getServerKeyFile()); return FileUtils.readFileToString(getServerKeyFile());
} }
public void generateKey() throws Exception { public void generateKey() throws Exception {

24
src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java
View File

@@ -11,7 +11,6 @@ import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountsJson;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace; import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountsForm; import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountsForm;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global;
import javax.swing.*; import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -20,15 +19,15 @@ public class UserAccountsDBTable extends iDBTable<UserAccount> {
public UserAccountsDBTable() { public UserAccountsDBTable() {
super(UserAccount.class); super(UserAccount.class);
} }
public UserAccount getByKey(String key_in) throws Exception{ public UserAccount getByKey(String key_in) throws Exception {
for (UserAccount userAccount: Data.values()){ for (UserAccount userAccount : Data.values()) {
if (userAccount.getKey().equals(key_in)) if (userAccount.getKey().equals(key_in))
return userAccount; return userAccount;
} }
return null; return null;
} }
public UserAccount getByEmail(String email_in){ public UserAccount getByEmail(String email_in) {
for (UserAccount userAccount: Data.values()){ for (UserAccount userAccount : Data.values()) {
if (userAccount.email.equals(email_in)) if (userAccount.email.equals(email_in))
return userAccount; return userAccount;
} }
@@ -53,22 +52,21 @@ public class UserAccountsDBTable extends iDBTable<UserAccount> {
res.put(SubscriberWorkspace.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(SubscriberWorkspace.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res; return res;
} }
public String getPackedActiveRecipients(){ public String getPackedActiveRecipients() {
UserAccountsJson res = new UserAccountsJson(); UserAccountsJson res = new UserAccountsJson();
Vector<String> active = new Vector<>(); Vector<String> active = new Vector<>();
for (UserAccount userAccount: Data.values()){ for (UserAccount userAccount : Data.values()) {
if ((userAccount.subscribe_active!=0) && !active.contains(userAccount.email)){ if ((userAccount.subscribe_active != 0) && !active.contains(userAccount.email)) {
active.add(userAccount.email); active.add(userAccount.email);
res.values.add(new UserAccountJson(userAccount.email, userAccount.name)); res.values.add(new UserAccountJson(userAccount.email, userAccount.name));
} }
} }
return Utils_.gson.toJson(res); return Utils_.gson.toJson(res);
} }
public Vector<String> getActiveMails() {
public Vector<String> getActiveMails(){
Vector<String> res = new Vector<>(); Vector<String> res = new Vector<>();
for (UserAccount account: Data.values()){ for (UserAccount account : Data.values()) {
if ((account.subscribe_active!=0)&& !res.contains(account.email)) if ((account.subscribe_active != 0) && !res.contains(account.email))
res.add(account.email); res.add(account.email);
} }
for (String admin_mail : Constants.admins_mails) { for (String admin_mail : Constants.admins_mails) {

8
src/_VisualDVM/ComponentsServerProperties.java
View File

@@ -2,17 +2,17 @@ package _VisualDVM;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import java.io.File; import java.io.File;
public class ComponentsServerProperties extends VisualDVMProperties{ public class ComponentsServerProperties extends VisualDVMProperties {
//--- //---
@Expose @Expose
public int ComponentsBackUpsCount = 10; public int ComponentsBackUpsCount = 10;
@Expose @Expose
public String default_dvm_drv=""; public String default_dvm_drv = "";
//--- //---
public ComponentsServerProperties(){ public ComponentsServerProperties() {
Mode = _VisualDVM.Mode.Server; Mode = _VisualDVM.Mode.Server;
} }
public ComponentsServerProperties(File file_in){ public ComponentsServerProperties(File file_in) {
super(_VisualDVM.Mode.Server, file_in); super(_VisualDVM.Mode.Server, file_in);
} }
} }

2
src/_VisualDVM/Constants.java
View File

@@ -31,7 +31,7 @@ public class Constants {
public static final String DVM_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/dvm"; public static final String DVM_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/dvm";
//GIT //GIT
public static final String SAPFOR_REPOSITORY = "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR.git"; public static final String SAPFOR_REPOSITORY = "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR.git";
public static final String SAPFOR_VERSION_URL= "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR/raw/branch/master/src/Utils/version.h"; public static final String SAPFOR_VERSION_URL = "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR/raw/branch/master/src/Utils/version.h";
//-вывод задач //-вывод задач
public final static String parse_out_file = "parse_out.txt"; public final static String parse_out_file = "parse_out.txt";
public final static String parse_err_file = "parse_err.txt"; public final static String parse_err_file = "parse_err.txt";

1
src/_VisualDVM/Global.java
View File

@@ -17,7 +17,6 @@ import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory; import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
import java.io.File; import java.io.File;
import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
public class Global { public class Global {
//todo свести большинство к содержимому mainModule //todo свести большинство к содержимому mainModule

4
src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLine.java
View File

@@ -1,12 +1,10 @@
package _VisualDVM.GlobalData.CompilerEnvironment; package _VisualDVM.GlobalData.CompilerEnvironment;
import Common.Database.Objects.iDBObject; import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson; import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
public class EnvironmentsLine extends iDBObject { public class EnvironmentsLine extends iDBObject {
public EnvironmentsJson json; public EnvironmentsJson json;
public EnvironmentsLine(EnvironmentsJson json_in){ public EnvironmentsLine(EnvironmentsJson json_in) {
json = json_in; json = json_in;
} }
@Override @Override

13
src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLinesSet.java
View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson; import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsSetJson; import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsSetJson;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.EnvironmentsLinesForm; import _VisualDVM.GlobalData.CompilerEnvironment.UI.EnvironmentsLinesForm;
import _VisualDVM.GlobalData.CompilerOption.OptionsLine;
import javax.swing.*; import javax.swing.*;
public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> { public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
@@ -14,8 +13,8 @@ public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
} }
public EnvironmentsLinesSet(EnvironmentsSetJson json) { public EnvironmentsLinesSet(EnvironmentsSetJson json) {
super(Integer.class, EnvironmentsLine.class); super(Integer.class, EnvironmentsLine.class);
for (EnvironmentsJson environmentsJson: json.values) { for (EnvironmentsJson environmentsJson : json.values) {
EnvironmentsLine environmentsLine =new EnvironmentsLine(environmentsJson); EnvironmentsLine environmentsLine = new EnvironmentsLine(environmentsJson);
environmentsLine.id = maxId++; environmentsLine.id = maxId++;
put(environmentsLine.id, environmentsLine); put(environmentsLine.id, environmentsLine);
} }
@@ -30,11 +29,11 @@ public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
} }
@Override @Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new EnvironmentsLinesForm(this,mountPanel); return new EnvironmentsLinesForm(this, mountPanel);
} }
public EnvironmentsSetJson toJson(){ public EnvironmentsSetJson toJson() {
EnvironmentsSetJson res= new EnvironmentsSetJson(); EnvironmentsSetJson res = new EnvironmentsSetJson();
for (EnvironmentsLine environmentsLine: Data.values()){ for (EnvironmentsLine environmentsLine : Data.values()) {
res.values.add(environmentsLine.json); res.values.add(environmentsLine.json);
} }
return res; return res;

5
src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java
View File

@@ -1,14 +1,13 @@
package _VisualDVM.GlobalData.CompilerEnvironment.Json; package _VisualDVM.GlobalData.CompilerEnvironment.Json;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment; import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
public class EnvironmentJson { public class EnvironmentJson {
@Expose @Expose
public String name; //в том числе и с разделителем если есть. поиск по startswith public String name; //в том числе и с разделителем если есть. поиск по startswith
@Expose @Expose
public String value; //значение без кавычек public String value; //значение без кавычек
public EnvironmentJson(CompilerEnvironment src){ public EnvironmentJson(CompilerEnvironment src) {
name= src.name; name = src.name;
value = src.value; value = src.value;
} }
} }

7
src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsJson.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.GlobalData.CompilerEnvironment.Json; package _VisualDVM.GlobalData.CompilerEnvironment.Json;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionJson;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import java.util.List; import java.util.List;
@@ -8,10 +7,10 @@ import java.util.Vector;
public class EnvironmentsJson { public class EnvironmentsJson {
@Expose @Expose
public List<EnvironmentJson> values = new Vector<>(); public List<EnvironmentJson> values = new Vector<>();
public String toLine(){ public String toLine() {
Vector<String> res = new Vector<>(); Vector<String> res = new Vector<>();
for (EnvironmentJson environmentJson: values){ for (EnvironmentJson environmentJson : values) {
res.add(environmentJson.name+"="+Utils_.DQuotes(environmentJson.value)); res.add(environmentJson.name + "=" + Utils_.DQuotes(environmentJson.value));
} }
return String.join(" ", res); return String.join(" ", res);
} }

1
src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsSetJson.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.GlobalData.CompilerEnvironment.Json; package _VisualDVM.GlobalData.CompilerEnvironment.Json;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import java.util.List; import java.util.List;

15
src/_VisualDVM/GlobalData/CompilerEnvironment/RawCompilerEnvironmentsSet.java
View File

@@ -4,9 +4,6 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson; import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson; import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsForm; import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsForm;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionJson;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import javax.swing.*; import javax.swing.*;
public class RawCompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> { public class RawCompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
@@ -25,23 +22,23 @@ public class RawCompilerEnvironmentsSet extends DataSet<String, CompilerEnvironm
public String getSingleDescription() { public String getSingleDescription() {
return "переменная окружения"; return "переменная окружения";
} }
public CompilerEnvironment findByJson(EnvironmentJson json){ public CompilerEnvironment findByJson(EnvironmentJson json) {
for (CompilerEnvironment compilerEnvironment: Data.values()){ for (CompilerEnvironment compilerEnvironment : Data.values()) {
if (json.name.equals(compilerEnvironment.name)) if (json.name.equals(compilerEnvironment.name))
return compilerEnvironment; return compilerEnvironment;
} }
return null; return null;
} }
public void Reset() { public void Reset() {
for (CompilerEnvironment environment: Data.values()){ for (CompilerEnvironment environment : Data.values()) {
environment.select(false); environment.select(false);
environment.value=""; environment.value = "";
} }
} }
public void Synchronize(EnvironmentsJson json) { public void Synchronize(EnvironmentsJson json) {
for (EnvironmentJson environmentJson: json.values){ for (EnvironmentJson environmentJson : json.values) {
CompilerEnvironment compilerEnvironment = findByJson(environmentJson); CompilerEnvironment compilerEnvironment = findByJson(environmentJson);
if (compilerEnvironment!=null){ if (compilerEnvironment != null) {
compilerEnvironment.select(true); compilerEnvironment.select(true);
compilerEnvironment.value = environmentJson.value; compilerEnvironment.value = environmentJson.value;
} }

19
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/EnvironmentsLinesForm.java
View File

@@ -8,9 +8,6 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLine; import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLine;
import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLinesSet; import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLinesSet;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson; import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
import _VisualDVM.GlobalData.CompilerOption.OptionsLine;
import _VisualDVM.GlobalData.CompilerOption.OptionsLinesSet;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*; import javax.swing.*;
@@ -18,7 +15,6 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
public EnvironmentsLinesForm(DataSet<?, EnvironmentsLine> dataSource_in, JPanel mountPanel_in) { public EnvironmentsLinesForm(DataSet<?, EnvironmentsLine> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return false;
@@ -40,7 +36,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
protected DataMenuBar createMenuBar() { protected DataMenuBar createMenuBar() {
DataMenuBar res = super.createMenuBar(); DataMenuBar res = super.createMenuBar();
res.addPasses( res.addPasses(
new Pass<EnvironmentsLine>(){ new Pass<EnvironmentsLine>() {
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/Common/icons/RedAdd.png"; return "/Common/icons/RedAdd.png";
@@ -56,9 +52,9 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting); Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())){ if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())) {
target= new EnvironmentsLine((EnvironmentsJson) pass.target); target = new EnvironmentsLine((EnvironmentsJson) pass.target);
target.id = ((EnvironmentsLinesSet)dataSource).maxId++; target.id = ((EnvironmentsLinesSet) dataSource).maxId++;
return true; return true;
} }
return false; return false;
@@ -72,7 +68,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
dataSource.ShowUI(target.getPK()); dataSource.ShowUI(target.getPK());
} }
}, },
new Pass<EnvironmentsLine>(){ new Pass<EnvironmentsLine>() {
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/Common/icons/Edit.png"; return "/Common/icons/Edit.png";
@@ -90,7 +86,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
if (dataSource.getUI().CheckCurrent(Log)) { if (dataSource.getUI().CheckCurrent(Log)) {
target = dataSource.getUI().getCurrent(); target = dataSource.getUI().getCurrent();
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting); Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)){ if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)) {
return true; return true;
} }
} }
@@ -98,14 +94,13 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
} }
@Override @Override
protected void showFinish() throws Exception { protected void showFinish() throws Exception {
dataSource.ShowUI(target.getPK()); dataSource.ShowUI(target.getPK());
} }
}, },
new Pass<EnvironmentsLine>(){ new Pass<EnvironmentsLine>() {
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/Common/icons/Delete.png"; return "/Common/icons/Delete.png";

1
src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.CompilerOption; package _VisualDVM.GlobalData.CompilerOption;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import com.sun.org.glassfish.gmbal.Description;
import java.util.Arrays; import java.util.Arrays;
import java.util.Vector; import java.util.Vector;

4
src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java
View File

@@ -6,8 +6,8 @@ public class OptionJson {
public String name; //в том числе и с разделителем если есть. поиск по startswith public String name; //в том числе и с разделителем если есть. поиск по startswith
@Expose @Expose
public String value; //значение без кавычек public String value; //значение без кавычек
public OptionJson(CompilerOption src){ public OptionJson(CompilerOption src) {
name= src.name+src.parameterSeparator; name = src.name + src.parameterSeparator;
value = src.parameterValue; value = src.parameterValue;
} }
} }

9
src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java
View File

@@ -7,12 +7,11 @@ import java.util.Vector;
public class OptionsJson { public class OptionsJson {
@Expose @Expose
public List<OptionJson> values = new Vector<>(); public List<OptionJson> values = new Vector<>();
public String toLine(){ public String toLine() {
Vector<String> res = new Vector<>(); Vector<String> res = new Vector<>();
for (OptionJson optionJson: values){ for (OptionJson optionJson : values) {
res.add(optionJson.name+ res.add(optionJson.name +
(optionJson.value.contains(" ") ? Utils_.DQuotes(optionJson.value) : optionJson.value));
(optionJson.value.contains(" ")? Utils_.DQuotes(optionJson.value): optionJson.value));
} }
return String.join(" ", res); return String.join(" ", res);
} }

2
src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java
View File

@@ -6,6 +6,6 @@ import java.util.Vector;
public class OptionsSetJson { public class OptionsSetJson {
@Expose @Expose
public List<OptionsJson> values = new Vector<>(); public List<OptionsJson> values = new Vector<>();
public OptionsSetJson(){ public OptionsSetJson() {
} }
} }

2
src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java
View File

@@ -4,7 +4,7 @@ import Common.Utils.Utils_;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson; import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
public class OptionsLine extends iDBObject { public class OptionsLine extends iDBObject {
public OptionsJson json; public OptionsJson json;
public OptionsLine(OptionsJson json_in){ public OptionsLine(OptionsJson json_in) {
json = json_in; json = json_in;
} }
@Override @Override

14
src/_VisualDVM/GlobalData/CompilerOption/OptionsLinesSet.java
View File

@@ -11,10 +11,10 @@ public class OptionsLinesSet extends DataSet<Integer, OptionsLine> {
public OptionsLinesSet() { public OptionsLinesSet() {
super(Integer.class, OptionsLine.class); super(Integer.class, OptionsLine.class);
} }
public OptionsLinesSet(OptionsSetJson json){ public OptionsLinesSet(OptionsSetJson json) {
super(Integer.class, OptionsLine.class); super(Integer.class, OptionsLine.class);
for (OptionsJson optionsJson: json.values) { for (OptionsJson optionsJson : json.values) {
OptionsLine optionsLine =new OptionsLine(optionsJson); OptionsLine optionsLine = new OptionsLine(optionsJson);
optionsLine.id = maxId++; optionsLine.id = maxId++;
put(optionsLine.id, optionsLine); put(optionsLine.id, optionsLine);
} }
@@ -29,11 +29,11 @@ public class OptionsLinesSet extends DataSet<Integer, OptionsLine> {
} }
@Override @Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new OptionsLinesForm(this,mountPanel); return new OptionsLinesForm(this, mountPanel);
} }
public OptionsSetJson toJson(){ public OptionsSetJson toJson() {
OptionsSetJson res= new OptionsSetJson(); OptionsSetJson res = new OptionsSetJson();
for (OptionsLine optionsLine: Data.values()){ for (OptionsLine optionsLine : Data.values()) {
res.values.add(optionsLine.json); res.values.add(optionsLine.json);
} }
return res; return res;

18
src/_VisualDVM/GlobalData/CompilerOption/RawCompilerOptionsSet.java
View File

@@ -23,24 +23,24 @@ public class RawCompilerOptionsSet extends DataSet<String, CompilerOption> {
public String getSingleDescription() { public String getSingleDescription() {
return "опция компиляции"; return "опция компиляции";
} }
public CompilerOption findByJson(OptionJson json){ public CompilerOption findByJson(OptionJson json) {
for (CompilerOption compilerOption: Data.values()){ for (CompilerOption compilerOption : Data.values()) {
if (json.name.equals(compilerOption.name+compilerOption.parameterSeparator)) if (json.name.equals(compilerOption.name + compilerOption.parameterSeparator))
return compilerOption; return compilerOption;
} }
return null; return null;
} }
public void Reset(){ public void Reset() {
for (CompilerOption option: Data.values()){ for (CompilerOption option : Data.values()) {
option.select(false); option.select(false);
option.parameterValue=""; option.parameterValue = "";
} }
} }
public void Synchronize(OptionsJson json){ public void Synchronize(OptionsJson json) {
for (OptionJson option_json: json.values){ for (OptionJson option_json : json.values) {
// найти опцию по началу // найти опцию по началу
CompilerOption compilerOption = findByJson(option_json); CompilerOption compilerOption = findByJson(option_json);
if (compilerOption!=null){ if (compilerOption != null) {
compilerOption.select(true); compilerOption.select(true);
compilerOption.parameterValue = option_json.value; compilerOption.parameterValue = option_json.value;
} }

17
src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java
View File

@@ -1,7 +1,5 @@
package _VisualDVM.GlobalData.CompilerOption.UI; package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.Pass; import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo; import Common.Visual.Tables.ColumnInfo;
@@ -37,7 +35,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
protected DataMenuBar createMenuBar() { protected DataMenuBar createMenuBar() {
DataMenuBar res = super.createMenuBar(); DataMenuBar res = super.createMenuBar();
res.addPasses( res.addPasses(
new Pass<OptionsLine>(){ new Pass<OptionsLine>() {
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/Common/icons/RedAdd.png"; return "/Common/icons/RedAdd.png";
@@ -53,9 +51,9 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions); Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())){ if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())) {
target= new OptionsLine((OptionsJson) pass.target); target = new OptionsLine((OptionsJson) pass.target);
target.id = ((OptionsLinesSet)dataSource).maxId++; target.id = ((OptionsLinesSet) dataSource).maxId++;
return true; return true;
} }
return false; return false;
@@ -69,7 +67,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
dataSource.ShowUI(target.getPK()); dataSource.ShowUI(target.getPK());
} }
}, },
new Pass<OptionsLine>(){ new Pass<OptionsLine>() {
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/Common/icons/Edit.png"; return "/Common/icons/Edit.png";
@@ -87,7 +85,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
if (dataSource.getUI().CheckCurrent(Log)) { if (dataSource.getUI().CheckCurrent(Log)) {
target = dataSource.getUI().getCurrent(); target = dataSource.getUI().getCurrent();
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions); Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)){ if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)) {
return true; return true;
} }
} }
@@ -95,14 +93,13 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
} }
@Override @Override
protected void showFinish() throws Exception { protected void showFinish() throws Exception {
dataSource.ShowUI(target.getPK()); dataSource.ShowUI(target.getPK());
} }
}, },
new Pass<OptionsLine>(){ new Pass<OptionsLine>() {
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/Common/icons/Delete.png"; return "/Common/icons/Delete.png";

8
src/_VisualDVM/GlobalData/GlobalDatabase.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Database.VisualiserDatabase; import Common.Database.VisualiserDatabase;
import Common.MainModule_; import Common.MainModule_;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilersDBTable; import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
@@ -98,7 +97,6 @@ public class GlobalDatabase extends VisualiserDatabase {
//-- //--
//проверить, есть ли профиль с таким же набором настроек. //проверить, есть ли профиль с таким же набором настроек.
public SapforProfile checkProfileForCurrentSettings() { public SapforProfile checkProfileForCurrentSettings() {
LinkedHashMap<String, String> current_values = Global.mainModule.getProject().sapforProperties.toMap(); LinkedHashMap<String, String> current_values = Global.mainModule.getProject().sapforProperties.toMap();
for (SapforProfile profile : sapforProfiles.Data.values()) { for (SapforProfile profile : sapforProfiles.Data.values()) {
//--получить все настройки профиля //--получить все настройки профиля
@@ -152,9 +150,9 @@ public class GlobalDatabase extends VisualiserDatabase {
Insert(profile); Insert(profile);
insertProfileSettings(profile); insertProfileSettings(profile);
} }
public SapforProfile getDefaultSapforProfile(){ public SapforProfile getDefaultSapforProfile() {
for (SapforProfile sapforProfile: sapforProfiles.Data.values()){ for (SapforProfile sapforProfile : sapforProfiles.Data.values()) {
if (sapforProfile.isAuto!=0) if (sapforProfile.isAuto != 0)
return sapforProfile; return sapforProfile;
} }
return null; return null;

4
src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java
View File

@@ -33,8 +33,8 @@ public class MachineFields implements DialogFields {
//- //-
cbMachineType = new JComboBox<>(); cbMachineType = new JComboBox<>();
cbMachineType.addItem(MachineType.Server); cbMachineType.addItem(MachineType.Server);
// cbMachineType.addItem(MachineType.MVS_cluster); // cbMachineType.addItem(MachineType.MVS_cluster);
// cbMachineType.addItem(MachineType.Local); // cbMachineType.addItem(MachineType.Local);
} }
@Override @Override
public Component getContent() { public Component getContent() {

2
src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
View File

@@ -24,7 +24,7 @@ public class MachinesForm extends DataSetControlForm<Machine> {
return object.name; return object.name;
} }
}, },
new ColumnInfo<Machine>("URL") { new ColumnInfo<Machine>("URL") {
@Override @Override
public Object getFieldAt(Machine object) { public Object getFieldAt(Machine object) {
return object.getURL(); return object.getURL();

2
src/_VisualDVM/GlobalData/Makefile/UI/MakefilePreviewForm.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Makefile.UI; package _VisualDVM.GlobalData.Makefile.UI;
import Common.Visual.Editor.Viewer;
import Common.Visual.Windows.Dialog.Text.TextDialog; import Common.Visual.Windows.Dialog.Text.TextDialog;
import _VisualDVM.Visual.Editor.Viewer;
public class MakefilePreviewForm extends TextDialog<Viewer> { public class MakefilePreviewForm extends TextDialog<Viewer> {
public MakefilePreviewForm() { public MakefilePreviewForm() {
super(Viewer.class); super(Viewer.class);

4
src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
View File

@@ -42,7 +42,7 @@ public class ModuleAnchestorFields implements DialogFields {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions); Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(compiler)) { if (pass.Do(compiler)) {
UI.TrySelect(cbFlags, ((OptionsJson)pass.target).toLine()); UI.TrySelect(cbFlags, ((OptionsJson) pass.target).toLine());
} }
} }
}); });
@@ -60,7 +60,7 @@ public class ModuleAnchestorFields implements DialogFields {
((Module) target).language; ((Module) target).language;
cbCompilers.addActionListener(e -> { cbCompilers.addActionListener(e -> {
if (cbCompilers.getSelectedItem() instanceof Compiler) { if (cbCompilers.getSelectedItem() instanceof Compiler) {
Compiler compiler = ((Compiler) cbCompilers.getSelectedItem()); Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
UI.TrySelect(cbCommands, UI.TrySelect(cbCommands,
linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName)); linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName));
} }

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
View File

@@ -45,8 +45,8 @@ public abstract class LinuxLocalTaskSupervisor<T extends Task> extends LocalTask
@Override @Override
public void WaitForTask() throws Exception { public void WaitForTask() throws Exception {
if (isTaskActive()) { if (isTaskActive()) {
// if (task.PID.isEmpty()) // if (task.PID.isEmpty())
// throw new PassException("Ошибка при старте : идентификатор задачи не определен."); // throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
task.StartDate = (new Date()).getTime(); task.StartDate = (new Date()).getTime();
pass.ShowMessage1("Задача активна, идентификатор " + Utils_.Brackets(task.PID)); pass.ShowMessage1("Задача активна, идентификатор " + Utils_.Brackets(task.PID));
RefreshProgress(); RefreshProgress();

2
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
View File

@@ -18,7 +18,7 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
String env = String.join(" ", MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().getEnvList()); String env = String.join(" ", MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().getEnvList());
if (!env.isEmpty()) res = env + " " + res; if (!env.isEmpty()) res = env + " " + res;
//-- //--
// task.PID = // task.PID =
pass.user.connection.startShellProcess(getRemoteProject(), "PID", res); pass.user.connection.startShellProcess(getRemoteProject(), "PID", res);
task.state = TaskState.Running; task.state = TaskState.Running;
} }

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
View File

@@ -113,8 +113,8 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
} }
public void WaitForTask() throws Exception { public void WaitForTask() throws Exception {
if (isTaskActive()) { if (isTaskActive()) {
// if (task.PID.isEmpty()) // if (task.PID.isEmpty())
// throw new PassException("Ошибка при старте : идентификатор задачи не определен."); // throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
task.StartDate = (new Date()).getTime(); task.StartDate = (new Date()).getTime();
pass.ShowMessage1("Задача активна");//, идентификатор " + Utils_.Brackets(task.PID)); pass.ShowMessage1("Задача активна");//, идентификатор " + Utils_.Brackets(task.PID));
RefreshProgress(); RefreshProgress();

2
src/_VisualDVM/GlobalData/User/UI/UsersForm.java
View File

@@ -48,7 +48,7 @@ public class UsersForm extends DataSetControlForm<User> {
protected void ShowNoCurrentObject() throws Exception { protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject(); super.ShowNoCurrentObject();
Global.mainModule.getUI().mainMenuBar.ShowNoUser(); Global.mainModule.getUI().mainMenuBar.ShowNoUser();
// Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser(); // Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
} }
@Override @Override
public PassCode_ getDeletePassCode() { public PassCode_ getDeletePassCode() {

2
src/_VisualDVM/Passes/All/AddBugReport.java
View File

@@ -6,8 +6,8 @@ import Common.Visual.UI;
import _VisualDVM.ComponentsServer.BugReport.BugReport; import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.BugReportState; import _VisualDVM.ComponentsServer.BugReport.BugReportState;
import _VisualDVM.ComponentsServer.Component.ComponentType; import _VisualDVM.ComponentsServer.Component.ComponentType;
import _VisualDVM.Global;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole; import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import java.io.File; import java.io.File;

2
src/_VisualDVM/Passes/All/AppendBugReportComment.java
View File

@@ -13,6 +13,6 @@ public class AppendBugReportComment extends AppendBugReportField {
} }
@Override @Override
protected boolean canUpdate() { protected boolean canUpdate() {
return target.canAppend(Global.mainModule.getAccount(),Log); return target.canAppend(Global.mainModule.getAccount(), Log);
} }
} }

5
src/_VisualDVM/Passes/All/ArchivesBackupPass.java
View File

@@ -1,6 +1,4 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.User.User; import _VisualDVM.GlobalData.User.User;
@@ -8,7 +6,6 @@ import _VisualDVM.Passes.SSH.ConnectionPass;
import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.ChannelSftp;
import java.io.File; import java.io.File;
import java.nio.file.Paths;
import java.util.Comparator; import java.util.Comparator;
import java.util.Vector; import java.util.Vector;
public class ArchivesBackupPass extends ConnectionPass<File> { public class ArchivesBackupPass extends ConnectionPass<File> {
@@ -26,7 +23,7 @@ public class ArchivesBackupPass extends ConnectionPass<File> {
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
RemoteFile workspace = new RemoteFile(user.connection.sftpChannel.getHome(), "_sapfor_x64_backups", true); RemoteFile workspace = new RemoteFile(user.connection.sftpChannel.getHome(), "_sapfor_x64_backups", 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());
user.connection.putSingleFile(src, dst); user.connection.putSingleFile(src, dst);

4
src/_VisualDVM/Passes/All/BuildComponent.java
View File

@@ -31,9 +31,9 @@ public class BuildComponent extends ProcessPass<Component> {
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
ShowMessage1("Сборка " + target.getComponentType().getDescription()); ShowMessage1("Сборка " + target.getComponentType().getDescription());
if (target.getComponentType().equals(ComponentType.Sapfor_F)){ if (target.getComponentType().equals(ComponentType.Sapfor_F)) {
File RepoSapfor = new File(Global.RepoDirectory, "SAPFOR"); File RepoSapfor = new File(Global.RepoDirectory, "SAPFOR");
File installationDirectory = new File(RepoSapfor,"install"); File installationDirectory = new File(RepoSapfor, "install");
Utils_.CheckAndCleanDirectory(installationDirectory); Utils_.CheckAndCleanDirectory(installationDirectory);
} }
PerformScript(target.getAssemblyCommand()); PerformScript(target.getAssemblyCommand());

21
src/_VisualDVM/Passes/All/CheckAccount.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.UI; import Common.Visual.UI;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount; import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
@@ -11,6 +11,7 @@ import org.apache.commons.io.FileUtils;
import java.io.File; import java.io.File;
public class CheckAccount extends ComponentsServerPass { public class CheckAccount extends ComponentsServerPass {
File keyFile;
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/icons/Registry.png"; return "/icons/Registry.png";
@@ -19,12 +20,12 @@ public class CheckAccount extends ComponentsServerPass {
protected boolean isSafe() { protected boolean isSafe() {
return false; return false;
} }
File keyFile; void confirmEmail() throws Exception {
void confirmEmail() throws Exception{ ConfirmEmail confirmEmailPass = (ConfirmEmail) Global.mainModule.getPass(PassCode.ConfirmEmail);
ConfirmEmail confirmEmailPass = (ConfirmEmail) Global.mainModule.getPass(PassCode.ConfirmEmail);; ;
if (confirmEmailPass.Do(Global.mainModule.getAccount())) { if (confirmEmailPass.Do(Global.mainModule.getAccount())) {
//подтвердили почту. теперь проверяем ее роль на сервере. если на сервере нет акка будет создан //подтвердили почту. теперь проверяем ее роль на сервере. если на сервере нет акка будет создан
if (SendRequest(ServerCode.GetUserAccountByEmail, "",Global.mainModule.getAccount())){ if (SendRequest(ServerCode.GetUserAccountByEmail, "", Global.mainModule.getAccount())) {
Global.mainModule.setAccount((UserAccount) request.server_response.object); Global.mainModule.setAccount((UserAccount) request.server_response.object);
FileUtils.writeStringToFile(keyFile, request.server_response.arg); FileUtils.writeStringToFile(keyFile, request.server_response.arg);
} }
@@ -39,19 +40,19 @@ public class CheckAccount extends ComponentsServerPass {
//1. Ищем ключ. //1. Ищем ключ.
if (keyFile.exists()) { if (keyFile.exists()) {
//ключ есть. проверить его актуальность. //ключ есть. проверить его актуальность.
String key = FileUtils.readFileToString(keyFile); String key = FileUtils.readFileToString(keyFile);
if (SendRequest(ServerCode.GetUserAccountByKey,key)){ if (SendRequest(ServerCode.GetUserAccountByKey, key)) {
if (request.server_response.object!=null){ if (request.server_response.object != null) {
//ключ актуальный. //ключ актуальный.
Global.mainModule.setAccount((UserAccount) request.server_response.object); Global.mainModule.setAccount((UserAccount) request.server_response.object);
}else { } else {
//ключ неактуальный. регистрируемся по новой. //ключ неактуальный. регистрируемся по новой.
UI.Error("Текущий ключ неверен. Он будет удален."); UI.Error("Текущий ключ неверен. Он будет удален.");
Utils_.forceDeleteWithCheck(keyFile); Utils_.forceDeleteWithCheck(keyFile);
confirmEmail(); confirmEmail();
} }
} }
}else { } else {
confirmEmail(); confirmEmail();
} }
return !Global.mainModule.getAccount().role.equals(AccountRole.Undefined); return !Global.mainModule.getAccount().role.equals(AccountRole.Undefined);

5
src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
View File

@@ -10,7 +10,7 @@ public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspa
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = null; target = null;
if (Global.mainModule.getAccount().CheckRegistered(Log)){ if (Global.mainModule.getAccount().CheckRegistered(Log)) {
String email = Global.mainModule.getAccount().email; String email = Global.mainModule.getAccount().email;
String machineURL = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().getURL(); String machineURL = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().getURL();
String login = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent().login; String login = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent().login;
@@ -18,7 +18,8 @@ public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspa
target = (SubscriberWorkspace) request.server_response.object; target = (SubscriberWorkspace) request.server_response.object;
return true; return true;
} }
}; }
;
return false; return false;
} }
} }

2
src/_VisualDVM/Passes/All/ComponentsServerBackUp.java
View File

@@ -9,6 +9,6 @@ public class ComponentsServerBackUp extends ComponentsServerPass {
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
return Global.mainModule.getAccount().isAdmin()&&SendRequest(ServerCode.CreateBackUp,"", true); return Global.mainModule.getAccount().isAdmin() && SendRequest(ServerCode.CreateBackUp, "", true);
} }
} }

3
src/_VisualDVM/Passes/All/ConfirmEmail.java
View File

@@ -3,7 +3,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI; import Common.Visual.UI;
import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountDialog; import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountDialog;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount; import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
@@ -32,7 +31,7 @@ public class ConfirmEmail extends ComponentsServerPass<UserAccount> {
return false; return false;
} }
password = String.valueOf(getRandomIntegerBetweenRange(1111, 9999)); password = String.valueOf(getRandomIntegerBetweenRange(1111, 9999));
return SendRequest(ServerCode.Email, return SendRequest(ServerCode.Email,
target.email, target.email,
new EmailMessage("Код подтверждения визуализатора для: " + Utils_.Brackets(target.name), password)); new EmailMessage("Код подтверждения визуализатора для: " + Utils_.Brackets(target.name), password));
} }

2
src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
View File

@@ -18,7 +18,7 @@ public class ConvertCorrectnessTests extends TestingServerPass<File> {
Log.Writeln_("Вы не являетесь администратором"); Log.Writeln_("Вы не являетесь администратором");
return false; return false;
} }
return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.")&& return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.") &&
SendRequest(ServerCode.RefreshDVMTests, "", null); SendRequest(ServerCode.RefreshDVMTests, "", null);
} }
@Override @Override

2
src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
View File

@@ -168,7 +168,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
filesNames.add(projectFile.file.getName()); filesNames.add(projectFile.file.getName());
filesJson.values.add(new TestFileJson(projectFile)); filesJson.values.add(new TestFileJson(projectFile));
} }
target.packedFilesJson=Utils_.gson.toJson(filesJson); target.packedFilesJson = Utils_.gson.toJson(filesJson);
return true; return true;
} }
public boolean isNotExcluded(ProjectFile projectFile) { public boolean isNotExcluded(ProjectFile projectFile) {

3
src/_VisualDVM/Passes/All/CreateTestFromProject.java
View File

@@ -24,8 +24,7 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
return true; return true;
} }
} }
} } else {
else {
project = (db_project_info) args[0]; project = (db_project_info) args[0];
group = (Group) args[1]; group = (Group) args[1];
//если проект не текущий, освежить его бд. //если проект не текущий, освежить его бд.

2
src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
View File

@@ -47,7 +47,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
} }
//--- //---
return UI.Question("В группу " + Utils_.Brackets(group.description) + return UI.Question("В группу " + Utils_.Brackets(group.description) +
"\nбудет добавлено " + target.size() + " тестов.\nПродолжить")&& "\nбудет добавлено " + target.size() + " тестов.\nПродолжить") &&
SendRequest(ServerCode.PublishObjects, null, target); SendRequest(ServerCode.PublishObjects, null, target);
} }
} }

2
src/_VisualDVM/Passes/All/DVMConvertProject.java
View File

@@ -72,7 +72,7 @@ public class DVMConvertProject extends ComponentsServerPass<db_project_info> {
unit_args.add(target.languageName.toString()); unit_args.add(target.languageName.toString());
unit_args.add(target.sapforProperties.DVMConvertationOptions); unit_args.add(target.sapforProperties.DVMConvertationOptions);
unit_args.addAll(programsNames); unit_args.addAll(programsNames);
return SendRequest(ServerCode.DVMConvertProject, String.join("\n", unit_args),Utils_.fileToBytes(archive)); return SendRequest(ServerCode.DVMConvertProject, String.join("\n", unit_args), Utils_.fileToBytes(archive));
//-- //--
} }
return false; return false;

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

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

4
src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java
View File

@@ -8,7 +8,7 @@ public class DeleteBugReportFromServer extends ComponentsServerPass<BugReport> {
@Override @Override
protected boolean canStart(Object... args) { protected boolean canStart(Object... args) {
target = (BugReport) args[0]; target = (BugReport) args[0];
return !target.state.equals(BugReportState.draft)&& return !target.state.equals(BugReportState.draft) &&
SendRequest(ServerCode.DeleteObjectByPK, "",new Pair<>(BugReport.class, target.getPK())); SendRequest(ServerCode.DeleteObjectByPK, "", new Pair<>(BugReport.class, target.getPK()));
} }
} }

1
src/_VisualDVM/Passes/All/DeleteUserAccount.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.Server.DeleteServerObject; import _VisualDVM.Passes.Server.DeleteServerObject;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit; import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import javafx.util.Pair; import javafx.util.Pair;
public class DeleteUserAccount extends DeleteServerObject<ComponentsServer, UserAccount> { public class DeleteUserAccount extends DeleteServerObject<ComponentsServer, UserAccount> {
public DeleteUserAccount() { public DeleteUserAccount() {

2
src/_VisualDVM/Passes/All/DownloadBugReport.java
View File

@@ -8,7 +8,7 @@ public class DownloadBugReport extends ComponentsServerPass<BugReport> {
@Override @Override
protected boolean canStart(Object... args) { protected boolean canStart(Object... args) {
target = (BugReport) args[0]; target = (BugReport) args[0];
return !target.getArchiveFile().exists()&&SendRequest(ServerCode.ReceiveBugReport, target.id); return !target.getArchiveFile().exists() && SendRequest(ServerCode.ReceiveBugReport, target.id);
} }
@Override @Override
protected void performPreparation() throws Exception { protected void performPreparation() throws Exception {

1
src/_VisualDVM/Passes/All/DownloadDvmRepository.java
View File

@@ -13,7 +13,6 @@ public class DownloadDvmRepository extends ProcessPass {
git clone https://dvmguest:dvmguest@dvm.keldysh.ru/dvm-system/dvm /home/testuser/Repo/DVM/ git clone https://dvmguest:dvmguest@dvm.keldysh.ru/dvm-system/dvm /home/testuser/Repo/DVM/
git clone https://dvmguest:dvmguest@dvm.keldysh.ru/dvm-system/dvm-auto-test /home/testuser/Repo/DVM_AUTO_TEST/ git clone https://dvmguest:dvmguest@dvm.keldysh.ru/dvm-system/dvm-auto-test /home/testuser/Repo/DVM_AUTO_TEST/
*/ */
File dvmHome; File dvmHome;
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {

2
src/_VisualDVM/Passes/All/DownloadSapforPackage.java
View File

@@ -23,7 +23,7 @@ public class DownloadSapforPackage extends TestingServerPass<SapforPackage> {
} }
int id = target.id; int id = target.id;
loaded = new File(target.getLocalWorkspace(), CommonConstants.LOADED); loaded = new File(target.getLocalWorkspace(), CommonConstants.LOADED);
return !loaded.exists()&&SendRequest(ServerCode.DownloadSapforPackage, "", id); return !loaded.exists() && SendRequest(ServerCode.DownloadSapforPackage, "", id);
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {

4
src/_VisualDVM/Passes/All/DownloadTaskTest.java
View File

@@ -12,8 +12,8 @@ public class DownloadTaskTest extends DownloadTest {
target = null; target = null;
if (Global.testingServer.db.dvmRunTasks.getUI().CheckCurrent(Log)) { if (Global.testingServer.db.dvmRunTasks.getUI().CheckCurrent(Log)) {
DVMRunTask task = Global.testingServer.db.dvmRunTasks.getUI().getCurrent(); DVMRunTask task = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
if (!Global.testingServer.db.tests.containsKey(task.test_id)){ if (!Global.testingServer.db.tests.containsKey(task.test_id)) {
Log.Writeln_("Теста с ключом "+task.test_id+" не существует!"); Log.Writeln_("Теста с ключом " + task.test_id + " не существует!");
return false; return false;
} }
target = Global.testingServer.db.tests.get(task.test_id); target = Global.testingServer.db.tests.get(task.test_id);

4
src/_VisualDVM/Passes/All/DownloadTest.java
View File

@@ -17,7 +17,7 @@ public class DownloadTest extends TestingServerPass<Test> {
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
testArchive= null; testArchive = null;
if (Global.mainModule.getAccount().CheckRegistered(Log) && if (Global.mainModule.getAccount().CheckRegistered(Log) &&
Global.testingServer.db.tests.getUI().CheckCurrent(Log) Global.testingServer.db.tests.getUI().CheckCurrent(Log)
) { ) {
@@ -34,7 +34,7 @@ public class DownloadTest extends TestingServerPass<Test> {
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
testArchive= new File(Global.TempDirectory, Utils_.getDateName(String.valueOf(target.id))); testArchive = new File(Global.TempDirectory, Utils_.getDateName(String.valueOf(target.id)));
request.server_response.Unpack(testArchive); request.server_response.Unpack(testArchive);
} }
@Override @Override

5
src/_VisualDVM/Passes/All/EditUserAccount.java
View File

@@ -1,15 +1,12 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Database.Database; import Common.Database.Database;
import Common.Passes.Pass;
import _VisualDVM.ComponentsServer.ComponentsServer; import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount; import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Passes.Server.EditServerObject; import _VisualDVM.Passes.Server.EditServerObject;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit; import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.ServerObjectsCache.VisualCaches; public class EditUserAccount extends EditServerObject<ComponentsServer, UserAccount> {
public class EditUserAccount extends EditServerObject<ComponentsServer,UserAccount> {
public EditUserAccount() { public EditUserAccount() {
super(Global.componentsServer, UserAccount.class); super(Global.componentsServer, UserAccount.class);
} }

11
src/_VisualDVM/Passes/All/Email.java
View File

@@ -17,17 +17,16 @@ public class Email extends ComponentsServerPass<EmailMessage> {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
recipients = null; recipients = null;
if (args.length<=1) { if (args.length <= 1) {
return false; return false;
} }
target = (EmailMessage) args[0]; target = (EmailMessage) args[0];
if (args[1]instanceof Vector) { if (args[1] instanceof Vector) {
recipients = (Vector<String>) args[1]; recipients = (Vector<String>) args[1];
return true; return true;
} } else if (args[1] instanceof String) {
else if (args[1] instanceof String){ recipients = new Vector<>();
recipients= new Vector<>(); for (int i = 1; i < args.length; ++i) {
for (int i=1; i< args.length; ++i){
recipients.add((String) args[i]); recipients.add((String) args[i]);
} }
return true; return true;

2
src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
View File

@@ -13,7 +13,7 @@ public class GetComponentsBackupsFromServer extends ComponentsServerPass<Vector<
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = new Vector<>(); target = new Vector<>();
return Global.components.getUI().CheckCurrent(Log)&& return Global.components.getUI().CheckCurrent(Log) &&
SendRequest(ServerCode.GetComponentsBackups, SendRequest(ServerCode.GetComponentsBackups,
Global.components.getUI().getCurrent().getComponentType().toString()); Global.components.getUI().getCurrent().getComponentType().toString());
} }

2
src/_VisualDVM/Passes/All/GetDVMPackageCredetials.java
View File

@@ -7,7 +7,7 @@ public class GetDVMPackageCredetials extends TestingServerPass<DVMPackageCredent
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = null; target = null;
return SendRequest(ServerCode.GetDVMPackageCredentials, "", ((DVMPackage)args[0]).id); return SendRequest(ServerCode.GetDVMPackageCredentials, "", ((DVMPackage) args[0]).id);
} }
@Override @Override
protected void performDone() throws Exception { protected void performDone() throws Exception {

10
src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
View File

@@ -7,22 +7,22 @@ import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.TasksPackageState; import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
public class JoinSapforTestingVersionsToGroup extends TestingServerPass { public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
Group group;
SapforPackage sapforPackage;
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/Common/icons/Publish.png"; return "/Common/icons/Publish.png";
} }
Group group;
SapforPackage sapforPackage;
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)){ if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)) {
group = Global.testingServer.db.groups.getUI().getCurrent(); group = Global.testingServer.db.groups.getUI().getCurrent();
sapforPackage = Global.testingServer.db.sapforPackages.getUI().getCurrent(); sapforPackage = Global.testingServer.db.sapforPackages.getUI().getCurrent();
if (!sapforPackage.state.equals(TasksPackageState.Done)&&!sapforPackage.state.equals(TasksPackageState.DoneWithErrors)){ if (!sapforPackage.state.equals(TasksPackageState.Done) && !sapforPackage.state.equals(TasksPackageState.DoneWithErrors)) {
Log.Writeln_("Пакет не завершен!"); Log.Writeln_("Пакет не завершен!");
return false; return false;
} }
return SendRequest(ServerCode.JoinSapforVersionsToGroup, group.id+"\n"+sapforPackage.id, null); return SendRequest(ServerCode.JoinSapforVersionsToGroup, group.id + "\n" + sapforPackage.id, null);
} }
return false; return false;
} }

4
src/_VisualDVM/Passes/All/OpenBugReportTestProject.java
View File

@@ -24,8 +24,6 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
(target = Global.componentsServer.db.bugReports.getUI().getCurrent()).CheckNotDraft(Log)) { (target = Global.componentsServer.db.bugReports.getUI().getCurrent()).CheckNotDraft(Log)) {
if (!target.project_version.isEmpty()) { if (!target.project_version.isEmpty()) {
root = new File(Global.visualiser.getDownloadsDirectory(), target.id); root = new File(Global.visualiser.getDownloadsDirectory(), target.id);
project = new File(root, project = new File(root,
Utils_.isWindows() ? Utils_.toW(target.project_version) : Utils_.toU(target.project_version) Utils_.isWindows() ? Utils_.toW(target.project_version) : Utils_.toU(target.project_version)
); );
@@ -64,7 +62,7 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
} }
@Override @Override
protected void performDone() throws Exception { protected void performDone() throws Exception {
if (Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(project)&&target.visualiser_version<1134) if (Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(project) && target.visualiser_version < 1134)
Global.mainModule.getPass(PassCode.ApplyBugReportSettings).Do(); Global.mainModule.getPass(PassCode.ApplyBugReportSettings).Do();
} }
} }

7
src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Passes.Pass; import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Dialog; import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -9,11 +8,9 @@ import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson; import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson; import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsFields; import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsFields;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*; import javax.swing.*;
import java.util.Vector;
public class PickCompilerEnvironmentsForTesting extends Pass<EnvironmentsJson> { public class PickCompilerEnvironmentsForTesting extends Pass<EnvironmentsJson> {
Compiler compiler = null; Compiler compiler = null;
//- //-
@@ -32,7 +29,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass<EnvironmentsJson> {
if (!(compiler.helpLoaded || Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, false))) if (!(compiler.helpLoaded || Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, false)))
return false; return false;
compiler.environments.Reset(); compiler.environments.Reset();
if (args.length>1){ if (args.length > 1) {
target = (EnvironmentsJson) args[1]; target = (EnvironmentsJson) args[1];
compiler.environments.Synchronize(target); compiler.environments.Synchronize(target);
} }
@@ -61,7 +58,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass<EnvironmentsJson> {
protected void body() throws Exception { protected void body() throws Exception {
target.values.clear(); target.values.clear();
for (CompilerEnvironment compilerEnv : compiler.environments.Data.values()) { for (CompilerEnvironment compilerEnv : compiler.environments.Data.values()) {
if (compilerEnv.isSelected()){ if (compilerEnv.isSelected()) {
target.values.add(new EnvironmentJson(compilerEnv)); target.values.add(new EnvironmentJson(compilerEnv));
} }
} }

4
src/_VisualDVM/Passes/All/PickCompilerOptions.java
View File

@@ -29,8 +29,8 @@ public class PickCompilerOptions extends Pass<OptionsJson> {
if (!(compiler.helpLoaded || Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, false))) if (!(compiler.helpLoaded || Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, false)))
return false; return false;
compiler.options.Reset(); compiler.options.Reset();
if (args.length>1){ if (args.length > 1) {
target =(OptionsJson) args[1]; target = (OptionsJson) args[1];
compiler.options.Synchronize(target); compiler.options.Synchronize(target);
} }
Dialog<String, CompilerOptionsFields> dialog = new Dialog<String, CompilerOptionsFields>(CompilerOptionsFields.class) { Dialog<String, CompilerOptionsFields> dialog = new Dialog<String, CompilerOptionsFields>(CompilerOptionsFields.class) {

4
src/_VisualDVM/Passes/All/PublishBugReport.java
View File

@@ -42,8 +42,8 @@ public class PublishBugReport extends Pass<BugReport> {
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
// target.targets = BugReport.getPackedTargets(); // target.targets = BugReport.getPackedTargets();
// target.saveRecipientsAsJson(Global.componentsServer.db.subscribers.getUI().getSelectedItems()); // target.saveRecipientsAsJson(Global.componentsServer.db.subscribers.getUI().getSelectedItems());
target.change_date = new Date().getTime(); target.change_date = new Date().getTime();
Global.componentsServer.db.Update(target); Global.componentsServer.db.Update(target);
target.state = BugReportState.active; target.state = BugReportState.active;

11
src/_VisualDVM/Passes/All/PublishComponent.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.Component.Component; import _VisualDVM.ComponentsServer.Component.Component;
import _VisualDVM.ComponentsServer.Component.ComponentType; import _VisualDVM.ComponentsServer.Component.ComponentType;
@@ -10,11 +9,9 @@ import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import java.util.Date; import java.util.Date;
import java.util.Vector;
public class PublishComponent extends ComponentsServerPass<Component> { public class PublishComponent extends ComponentsServerPass<Component> {
String version_mail_header = ""; String version_mail_header = "";
String version_text = ""; String version_text = "";
@@ -64,13 +61,13 @@ public class PublishComponent extends ComponentsServerPass<Component> {
Constants.separator, "" Constants.separator, ""
); );
//-- //--
ComponentPublicationInfoJson info=new ComponentPublicationInfoJson(target); ComponentPublicationInfoJson info = new ComponentPublicationInfoJson(target);
info.changeRecord = change_record; info.changeRecord = change_record;
info.needsUpdateMinimalVersion = f.fields.cbUpdateMinimalVersion.isSelected(); info.needsUpdateMinimalVersion = f.fields.cbUpdateMinimalVersion.isSelected();
info.needsEmail = f.fields.cbNeedsBroadcast.isSelected(); info.needsEmail = f.fields.cbNeedsBroadcast.isSelected();
info.needsSendFile =f.fields.cbForceMail.isSelected(); info.needsSendFile = f.fields.cbForceMail.isSelected();
//-- //--
return SendRequest(ServerCode.UpdateComponent, "",info); return SendRequest(ServerCode.UpdateComponent, "", info);
} }
} }
return false; return false;

2
src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
View File

@@ -112,7 +112,7 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
} }
@Override @Override
protected void performDone() throws Exception { protected void performDone() throws Exception {
SendRequest(ServerCode.ReplaceDVMPackageResults,"", SendRequest(ServerCode.ReplaceDVMPackageResults, "",
new Pair<>( new Pair<>(
target, target,
Utils_.fileToBytes(target.getJsonFile()) Utils_.fileToBytes(target.getJsonFile())

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