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

вывод диалоговых форм для объектов в отдельный класс

Browse Source
This commit is contained in:
02090095
2024-10-22 16:44:13 +03:00
parent 38b2896e4a
commit a60fd375d0
66 changed files with 840 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
.idea/workspace.xml generated
View File

@@ -7,20 +7,29 @@
</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/GlobalData/Compiler/UI/CompilerDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParameterDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentValueDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachineDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfileDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandDialog.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$/src/Common/Database/Objects/DBForm/FormsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBForm/FormsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/PassStats/PassStatsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/PassStats/PassStatsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.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/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/_VisualDVM/GlobalData/Account/AccountsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Account/AccountsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DBLastProject/LastProjectsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DBLastProject/LastProjectsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
@@ -35,80 +44,35 @@
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.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/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/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddSubscriber.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Run.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.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/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.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/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ServerObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ServerObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/FilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/FilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatisticsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatisticsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/ProjectInfoDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/ProjectInfoDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.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/Regions/ParallelRegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.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/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/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/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/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/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/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/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.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/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/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.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/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/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/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/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.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/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/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.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/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandFields.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/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/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/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/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/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/Visual/Interface/ProjectWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ProjectWindow.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" />
</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" />
@@ -214,11 +178,11 @@
<recent name="Common.CommonConstants" /> <recent name="Common.CommonConstants" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\TestingSystem\SAPFOR\SapforSettingsCommand\UI" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\GlobalData\FileObject\UI" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\GlobalData\FileObject\UI" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\Visual\Windows" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\Visual\Windows" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Visual\Windows" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Visual\Windows" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Visual\Main" />
</key> </key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="_VisualDVM.Visual.Windows" /> <recent name="_VisualDVM.Visual.Windows" />

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

@@ -3,8 +3,6 @@ import Common.Database.Objects.DBObject;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.UI; import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*; import javax.swing.*;
import java.util.Comparator; import java.util.Comparator;
@@ -53,32 +51,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
res.sort(comparator); res.sort(comparator);
return res; return res;
} }
//todo все это тоже в уи?
@SuppressWarnings("unchecked")
public DBObjectDialog<D, ? extends DialogFields> getDialog() {
return null;
}
public boolean ShowAddObjectDialog(DBObject object) {
return getDialog().ShowDialog(getUI().getSingleDescription() + ": добавление", object);
}
public boolean ShowEditObjectDialog(DBObject object) {
DBObjectDialog dialog = getDialog();
dialog.edit = true;
dialog.SetEditLimits();
return dialog.ShowDialog(getUI().getSingleDescription() + ": редактирование", object);
}
public boolean ViewObject(DBObject object) {
DBObjectDialog dialog = getDialog();
dialog.SetReadonly();
dialog.ShowDialog(getUI().getSingleDescription() + ": просмотр", object);
return false;
}
public boolean ShowDeleteObjectDialog(DBObject object) {
return UI.Warning(getUI().getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
}
public boolean ShowDeleteObjectsDialog(int toDeleteCount) {
return UI.Warning(getUI().getPluralDescription() + " в количестве " + toDeleteCount + " будут удалены)");
}
public String QName() { public String QName() {
return "\"" + Name + "\""; return "\"" + Name + "\"";
} }

2
src/Common/Passes/AddObjectPass.java
View File

@@ -15,7 +15,7 @@ public abstract class AddObjectPass<D extends DBObject> extends ObjectPass<D> {
fillObjectFields(); fillObjectFields();
} }
protected boolean fillObjectFields() throws Exception { protected boolean fillObjectFields() throws Exception {
return getTable().ShowAddObjectDialog(target); return getTable().getUI().ShowAddObjectDialog(target);
} }
@Override @Override
public String getIconPath() { public String getIconPath() {

2
src/Common/Passes/DeleteObjectPass.java
View File

@@ -11,7 +11,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = (D) getTable().getUI().getCurrent(); target = (D) getTable().getUI().getCurrent();
return getTable().getUI().CheckCurrent(Log) && getTable().ShowDeleteObjectDialog(target); return getTable().getUI().CheckCurrent(Log) && getTable().getUI().ShowDeleteObjectDialog(target);
} }
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта. //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override @Override

2
src/Common/Passes/DeleteObjectsPass.java
View File

@@ -13,7 +13,7 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
if (!getTable().getUI().CheckSelectedOrCurrent(Log)) if (!getTable().getUI().CheckSelectedOrCurrent(Log))
return false; return false;
target = getTable().getUI().getSelectedOrCurrent(); target = getTable().getUI().getSelectedOrCurrent();
return getTable().ShowDeleteObjectsDialog(target.size()); return getTable().getUI().ShowDeleteObjectsDialog(target.size());
} }
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта. //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override @Override

2
src/Common/Passes/EditObjectPass.java
View File

@@ -11,7 +11,7 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = (D) getTable().getUI().getCurrent(); target = (D) getTable().getUI().getCurrent();
return getTable().getUI().CheckCurrent(Log) && getTable().ShowEditObjectDialog(target); return getTable().getUI().CheckCurrent(Log) && getTable().getUI().ShowEditObjectDialog(target);
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {

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

@@ -13,6 +13,7 @@ import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.TableMenu; 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 javax.swing.*; import javax.swing.*;
import javax.swing.table.TableColumn; import javax.swing.table.TableColumn;
@@ -33,10 +34,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected boolean events_on = true; protected boolean events_on = true;
protected String colNamesAndSizes = ""; protected String colNamesAndSizes = "";
protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
//-
protected Vector<DBObjectFilter_<D>> allFilters = new Vector<>(); protected Vector<DBObjectFilter_<D>> allFilters = new Vector<>();
//---
//фильтры и подсчеты. todo слить с баром (?)
MatchesCounter counter_ui = null; MatchesCounter counter_ui = null;
//-- //--
Object savedCurrentKey = null; Object savedCurrentKey = null;
@@ -505,4 +503,30 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} }
return res; return res;
} }
@SuppressWarnings("unchecked")
public DBObjectDialog getDialog() {
return null;
}
public boolean ShowAddObjectDialog(D object) {
return getDialog().ShowDialog(getSingleDescription() + ": добавление", object);
}
//todo встроить развилку на возможность редактирования объекты boolean isObjectEditable(D object){return true;}
public boolean ShowEditObjectDialog(D object) {
DBObjectDialog dialog = getDialog();
dialog.edit = true;
dialog.SetEditLimits();
return dialog.ShowDialog(getSingleDescription() + ": редактирование", object);
}
public boolean ViewObject(D object) {
DBObjectDialog dialog = getDialog();
dialog.SetReadonly();
dialog.ShowDialog(getSingleDescription() + ": просмотр", object);
return false;
}
public boolean ShowDeleteObjectDialog(D object) {
return UI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
}
public boolean ShowDeleteObjectsDialog(int toDeleteCount) {
return UI.Warning(getPluralDescription() + " в количестве " + toDeleteCount + " будут удалены)");
}
} }

84
src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -5,19 +5,12 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour; import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.UI.CompilerFields;
import _VisualDVM.GlobalData.Compiler.UI.CompilersForm; import _VisualDVM.GlobalData.Compiler.UI.CompilersForm;
import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module; import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
import _VisualDVM.Validators.PathValidator;
import javax.swing.*; import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -34,83 +27,6 @@ public class CompilersDBTable extends iDBTable<Compiler> {
return res; return res;
} }
@Override @Override
public DBObjectDialog<Compiler, CompilerFields> getDialog() {
return new DBObjectDialog<Compiler, CompilerFields>(CompilerFields.class) {
@Override
public void validateFields() {
//<editor-fold desc="расположение">
String home = fields.tfHome.getText();
if (!home.isEmpty()) {
if (home.startsWith("/")) {
if (Utils_.ContainsCyrillic(home))
Log.Writeln("Расположение компилятора не может содержать кириллицу");
else {
new PathValidator(home, "Расположение компилятора", Log).Validate();
}
} else
Log.Writeln("Расположение компилятора может быть либо пустой строкой, либо путём к файлу");
}
//</editor-fold>
//<editor-fold desc="команда вызова">
String call_command = fields.tfCallCommand.getText();
if (call_command.isEmpty())
Log.Writeln("Команда вызова компилятора не может быть пустой");
else if (Utils_.ContainsCyrillic(call_command))
Log.Writeln("Команда вызова компилятора не может содержать кириллицу");
else {
switch (call_command.charAt(0)) {
case ' ':
Log.Writeln("Команда вызова компилятора не может начинаться с пробела.");
break;
case '/':
if (call_command.endsWith("/"))
Log.Writeln("Каталог не может быть указан в качестве команды.");
else
new PathValidator(call_command, "Команда вызова компилятора", Log).Validate();
break;
default:
//это команда.
//самое опасное место. теоретически тут можно ввести любую команду ОС, в том числе rm -rf
if (call_command.contains(" "))
Log.Writeln("Прямая команда вызова не может содержать пробелы");
if (!call_command.contains("+") && Utils_.ContainsForbiddenName(call_command))
Log.Writeln("Прямая команда вызова содержит запрещённые символы");
else {
if (Utils.isLinuxSystemCommand(call_command))
Log.Writeln(Utils_.DQuotes(call_command) + " является системной командой Linux");
}
break;
}
}
//</editor-fold>
}
@Override
public void fillFields() {
fields.tfDescription.setText(Result.description);
fields.tfCallCommand.setText(Result.call_command);
fields.tfHelpCommand.setText(Result.help_command);
fields.tfVersionCommand.setText(Result.version_command);
fields.tfHome.setText(Result.home_path);
UI.TrySelect(fields.cbCompilerType, Result.type);
fields.events_on = true;
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.description = fields.tfDescription.getText();
Result.call_command = fields.tfCallCommand.getText();
Result.help_command = fields.tfHelpCommand.getText();
Result.version_command = fields.tfVersionCommand.getText();
Result.home_path = fields.tfHome.getText();
Result.type = (CompilerType) fields.cbCompilerType.getSelectedItem();
}
@Override
public int getDefaultHeight() {
return 300;
}
};
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new CompilersForm(this, mountPanel); return new CompilersForm(this, mountPanel);
} }

86
src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java Normal file
View File

@@ -0,0 +1,86 @@
package _VisualDVM.GlobalData.Compiler.UI;
import Common.Utils.Utils_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.Utils;
import _VisualDVM.Validators.PathValidator;
public class CompilerDialog extends DBObjectDialog<Compiler, CompilerFields> {
public CompilerDialog() {
super(CompilerFields.class);
}
@Override
public int getDefaultHeight() {
return 300;
}
@Override
public void validateFields() {
//<editor-fold desc="расположение">
String home = fields.tfHome.getText();
if (!home.isEmpty()) {
if (home.startsWith("/")) {
if (Utils_.ContainsCyrillic(home))
Log.Writeln("Расположение компилятора не может содержать кириллицу");
else {
new PathValidator(home, "Расположение компилятора", Log).Validate();
}
} else
Log.Writeln("Расположение компилятора может быть либо пустой строкой, либо путём к файлу");
}
//</editor-fold>
//<editor-fold desc="команда вызова">
String call_command = fields.tfCallCommand.getText();
if (call_command.isEmpty())
Log.Writeln("Команда вызова компилятора не может быть пустой");
else if (Utils_.ContainsCyrillic(call_command))
Log.Writeln("Команда вызова компилятора не может содержать кириллицу");
else {
switch (call_command.charAt(0)) {
case ' ':
Log.Writeln("Команда вызова компилятора не может начинаться с пробела.");
break;
case '/':
if (call_command.endsWith("/"))
Log.Writeln("Каталог не может быть указан в качестве команды.");
else
new PathValidator(call_command, "Команда вызова компилятора", Log).Validate();
break;
default:
//это команда.
//самое опасное место. теоретически тут можно ввести любую команду ОС, в том числе rm -rf
if (call_command.contains(" "))
Log.Writeln("Прямая команда вызова не может содержать пробелы");
if (!call_command.contains("+") && Utils_.ContainsForbiddenName(call_command))
Log.Writeln("Прямая команда вызова содержит запрещённые символы");
else {
if (Utils.isLinuxSystemCommand(call_command))
Log.Writeln(Utils_.DQuotes(call_command) + " является системной командой Linux");
}
break;
}
}
//</editor-fold>
}
@Override
public void fillFields() {
fields.tfDescription.setText(Result.description);
fields.tfCallCommand.setText(Result.call_command);
fields.tfHelpCommand.setText(Result.help_command);
fields.tfVersionCommand.setText(Result.version_command);
fields.tfHome.setText(Result.home_path);
UI.TrySelect(fields.cbCompilerType, Result.type);
fields.events_on = true;
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.description = fields.tfDescription.getText();
Result.call_command = fields.tfCallCommand.getText();
Result.help_command = fields.tfHelpCommand.getText();
Result.version_command = fields.tfVersionCommand.getText();
Result.home_path = fields.tfHome.getText();
Result.type = (CompilerType) fields.cbCompilerType.getSelectedItem();
}
}

29
src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -38,6 +39,20 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
"ревизия"}; "ревизия"};
} }
@Override @Override
public Object getFieldAt(Compiler object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.call_command;
case 4:
return object.version;
case 5:
return object.revision;
}
return null;
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
} }
@@ -64,17 +79,7 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
} }
@Override @Override
public Object getFieldAt(Compiler object, int columnIndex) { public DBObjectDialog getDialog() {
switch (columnIndex) { return new CompilerDialog();
case 2:
return object.description;
case 3:
return object.call_command;
case 4:
return object.version;
case 5:
return object.revision;
}
return null;
} }
} }

56
src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
View File

@@ -1,15 +1,9 @@
package _VisualDVM.GlobalData.DVMParameter; package _VisualDVM.GlobalData.DVMParameter;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParametersForm; import _VisualDVM.GlobalData.DVMParameter.UI.DVMParametersForm;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
import javax.swing.*; import javax.swing.*;
public class DVMParameterDBTable extends iDBTable<DVMParameter> { public class DVMParameterDBTable extends iDBTable<DVMParameter> {
@@ -21,56 +15,6 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
return new DVMParametersForm(this, mountPanel); return new DVMParametersForm(this, mountPanel);
} }
@Override @Override
public DBObjectDialog<DVMParameter, DVMParameterFields> getDialog() {
return new DBObjectDialog<DVMParameter, DVMParameterFields>(DVMParameterFields.class) {
@Override
public void fillFields() {
UI.TrySelect(fields.cbName, Result.name);
fields.tfValue.setText(Result.value);
}
//https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java
@Override
public void validateFields() {
String name = (String) fields.cbName.getSelectedItem();
String value = fields.tfValue.getText();
if (name.isEmpty())
Log.Writeln("Имя параметра DVM системы не может быть пустым.");
/*
if (!name.matches("\\w*")) {
Log.Writeln("Имя переменной окружения может содержать только латинские буквы, цифры и подчёркивания");
}
*/
if (Utils.isLinuxSystemCommand(name))
Log.Writeln(Utils_.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
/*
if (value.contains("\"")) {
Log.Writeln("Значение переменной окружения не может содержать двойные кавычки");
}
*/
for (DVMParameter par : (Global.mainModule.getDb()).dvmParameters.Data.values()) {
if (
Global.mainModule.getDb().dvmParameters.getUI().isObjectVisible(par)
&& (Result.id != par.id) && (par.name.equals(name))) {
Log.Writeln("В конфигурации запуска уже задан параметр DVM системы с именем " + Utils_.Brackets(name));
break;
}
}
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.run_configuration_id = Global.mainModule.getRunConfiguration().id;
Result.name = (String) fields.cbName.getSelectedItem();
Result.value = fields.tfValue.getText();
}
@Override
public int getDefaultHeight() {
return 200;
}
};
}
@Override
public PassCode_ getDeletePassCode() { public PassCode_ getDeletePassCode() {
return PassCode.DeleteDVMParameter; return PassCode.DeleteDVMParameter;
} }

57
src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParameterDialog.java Normal file
View File

@@ -0,0 +1,57 @@
package _VisualDVM.GlobalData.DVMParameter.UI;
import Common.Utils.Utils_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.Utils;
public class DVMParameterDialog extends DBObjectDialog<DVMParameter, DVMParameterFields> {
public DVMParameterDialog() {
super(DVMParameterFields.class);
}
@Override
public void fillFields() {
UI.TrySelect(fields.cbName, Result.name);
fields.tfValue.setText(Result.value);
}
//https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java
@Override
public void validateFields() {
String name = (String) fields.cbName.getSelectedItem();
String value = fields.tfValue.getText();
if (name.isEmpty())
Log.Writeln("Имя параметра DVM системы не может быть пустым.");
/*
if (!name.matches("\\w*")) {
Log.Writeln("Имя переменной окружения может содержать только латинские буквы, цифры и подчёркивания");
}
*/
if (Utils.isLinuxSystemCommand(name))
Log.Writeln(Utils_.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
/*
if (value.contains("\"")) {
Log.Writeln("Значение переменной окружения не может содержать двойные кавычки");
}
*/
for (DVMParameter par : (Global.mainModule.getDb()).dvmParameters.Data.values()) {
if (
Global.mainModule.getDb().dvmParameters.getUI().isObjectVisible(par)
&& (Result.id != par.id) && (par.name.equals(name))) {
Log.Writeln("В конфигурации запуска уже задан параметр DVM системы с именем " + Utils_.Brackets(name));
break;
}
}
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.run_configuration_id = Global.mainModule.getRunConfiguration().id;
Result.name = (String) fields.cbName.getSelectedItem();
Result.value = fields.tfValue.getText();
}
@Override
public int getDefaultHeight() {
return 200;
}
}

6
src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
View File

@@ -2,6 +2,8 @@ package _VisualDVM.GlobalData.DVMParameter.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -51,4 +53,8 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
PassCode.EditDVMParameter, PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter); PassCode.DeleteDVMParameter);
} }
@Override
public DBObjectDialog<DVMParameter, ? extends DialogFields> getDialog() {
return new DVMParameterDialog();
}
} }

51
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
View File

@@ -1,15 +1,9 @@
package _VisualDVM.GlobalData.EnvironmentValue; package _VisualDVM.GlobalData.EnvironmentValue;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentsValuesForm; import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentsValuesForm;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
import javax.swing.*; import javax.swing.*;
public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> { public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
@@ -17,51 +11,6 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
super(EnvironmentValue.class); super(EnvironmentValue.class);
} }
@Override @Override
public DBObjectDialog<EnvironmentValue, EnvironmentValueFields> getDialog() {
return new DBObjectDialog<EnvironmentValue, EnvironmentValueFields>(EnvironmentValueFields.class) {
@Override
public void fillFields() {
UI.TrySelect(fields.cbName, Result.name);
fields.tfValue.setText(Result.value);
}
//https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java
@Override
public void validateFields() {
String name = (String) fields.cbName.getSelectedItem();
String value = fields.tfValue.getText();
if (name.isEmpty())
Log.Writeln("Имя переменной окружения не может быть пустым.");
if (!name.matches("\\w*")) {
Log.Writeln("Имя переменной окружения может содержать только латинские буквы, цифры и подчёркивания");
}
if (Utils.isLinuxSystemCommand(name))
Log.Writeln(Utils_.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
if (value.contains("\"")) {
Log.Writeln("Значение переменной окружения не может содержать двойные кавычки");
}
for (EnvironmentValue env : Global.mainModule.getDb().environmentValues.Data.values()) {
if (
Global.mainModule.getDb().environmentValues.getUI().isObjectVisible(env)
&& (Result.id != env.id) && (env.name.equals(name))) {
Log.Writeln("В конфигурации запуска уже задана переменная окружения с именем " + Utils_.Brackets(name));
break;
}
}
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.run_configuration_id = Global.mainModule.getRunConfiguration().id;
Result.name = (String) fields.cbName.getSelectedItem();
Result.value = fields.tfValue.getText();
}
@Override
public int getDefaultHeight() {
return 200;
}
};
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new EnvironmentsValuesForm(this, mountPanel); return new EnvironmentsValuesForm(this, mountPanel);
} }

52
src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentValueDialog.java Normal file
View File

@@ -0,0 +1,52 @@
package _VisualDVM.GlobalData.EnvironmentValue.UI;
import Common.Utils.Utils_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.Utils;
public class EnvironmentValueDialog extends DBObjectDialog<EnvironmentValue, EnvironmentValueFields> {
public EnvironmentValueDialog() {
super(EnvironmentValueFields.class);
}
@Override
public void fillFields() {
UI.TrySelect(fields.cbName, Result.name);
fields.tfValue.setText(Result.value);
}
//https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java
@Override
public void validateFields() {
String name = (String) fields.cbName.getSelectedItem();
String value = fields.tfValue.getText();
if (name.isEmpty())
Log.Writeln("Имя переменной окружения не может быть пустым.");
if (!name.matches("\\w*")) {
Log.Writeln("Имя переменной окружения может содержать только латинские буквы, цифры и подчёркивания");
}
if (Utils.isLinuxSystemCommand(name))
Log.Writeln(Utils_.DQuotes(name) + " является системной командой Linux,\nи не может быть задано в качестве имени переменной окружения.");
if (value.contains("\"")) {
Log.Writeln("Значение переменной окружения не может содержать двойные кавычки");
}
for (EnvironmentValue env : Global.mainModule.getDb().environmentValues.Data.values()) {
if (
Global.mainModule.getDb().environmentValues.getUI().isObjectVisible(env)
&& (Result.id != env.id) && (env.name.equals(name))) {
Log.Writeln("В конфигурации запуска уже задана переменная окружения с именем " + Utils_.Brackets(name));
break;
}
}
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.run_configuration_id = Global.mainModule.getRunConfiguration().id;
Result.name = (String) fields.cbName.getSelectedItem();
Result.value = fields.tfValue.getText();
}
@Override
public int getDefaultHeight() {
return 200;
}
}

6
src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
View File

@@ -3,6 +3,8 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -56,4 +58,8 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
public boolean isObjectVisible(EnvironmentValue object) { public boolean isObjectVisible(EnvironmentValue object) {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id);
} }
@Override
public DBObjectDialog<EnvironmentValue, ? extends DialogFields> getDialog() {
return new EnvironmentValueDialog();
}
} }

35
src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
View File

@@ -6,12 +6,9 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.Machine.UI.MachineFields;
import _VisualDVM.GlobalData.Machine.UI.MachinesForm; import _VisualDVM.GlobalData.Machine.UI.MachinesForm;
import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module; import _VisualDVM.GlobalData.Module.Module;
@@ -28,38 +25,6 @@ public class MachinesDBTable extends iDBTable<Machine> {
super(Machine.class); super(Machine.class);
} }
@Override @Override
public DBObjectDialog<Machine, MachineFields> getDialog() {
return new DBObjectDialog<Machine, MachineFields>(MachineFields.class) {
@Override
public int getDefaultHeight() {
return 250;
}
@Override
public void validateFields() {
if (fields.tfAddress.getText().isEmpty())
Log.Writeln("Адрес машины не может быть пустым");
}
@Override
public void fillFields() {
fields.tfName.setText(Result.name);
fields.tfAddress.setText(Result.address);
fields.sPort.setValue(Result.port);
UI.TrySelect(fields.cbMachineType, Result.type);
}
@Override
public void ProcessResult() {
Result.name = fields.tfName.getText();
Result.address = fields.tfAddress.getText();
Result.port = (int) fields.sPort.getValue();
Result.type = (MachineType) fields.cbMachineType.getSelectedItem();
}
@Override
public void SetEditLimits() {
fields.cbMachineType.setEnabled(false);
}
};
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
//- //-

37
src/_VisualDVM/GlobalData/Machine/UI/MachineDialog.java Normal file
View File

@@ -0,0 +1,37 @@
package _VisualDVM.GlobalData.Machine.UI;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
public class MachineDialog extends DBObjectDialog<Machine, MachineFields> {
public MachineDialog() {
super(MachineFields.class);
}
@Override
public int getDefaultHeight() {
return 250;
}
@Override
public void validateFields() {
if (fields.tfAddress.getText().isEmpty())
Log.Writeln("Адрес машины не может быть пустым");
}
@Override
public void fillFields() {
fields.tfName.setText(Result.name);
fields.tfAddress.setText(Result.address);
fields.sPort.setValue(Result.port);
UI.TrySelect(fields.cbMachineType, Result.type);
}
@Override
public void ProcessResult() {
Result.name = fields.tfName.getText();
Result.address = fields.tfAddress.getText();
Result.port = (int) fields.sPort.getValue();
Result.type = (MachineType) fields.cbMachineType.getSelectedItem();
}
@Override
public void SetEditLimits() {
fields.cbMachineType.setEnabled(false);
}
}

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

@@ -3,6 +3,8 @@ import Common.Database.Tables.DataSet;
import Common.Visual.Controls.MenuBarButton; import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
@@ -36,6 +38,15 @@ public class MachinesForm extends DataSetControlForm<Machine> {
return new String[]{"URL"}; return new String[]{"URL"};
} }
@Override @Override
public Object getFieldAt(Machine object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getURL();
default:
return null;
}
}
@Override
public void ShowCurrentObject() throws Exception { public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject(); super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler(); Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
@@ -74,12 +85,7 @@ public class MachinesForm extends DataSetControlForm<Machine> {
}; };
} }
@Override @Override
public Object getFieldAt(Machine object, int columnIndex) { public DBObjectDialog<Machine, ? extends DialogFields> getDialog() {
switch (columnIndex) { return new MachineDialog();
case 2:
return object.getURL();
default:
return null;
}
} }
} }

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

@@ -6,11 +6,8 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.GlobalData.Makefile.UI.MakefilesForm; import _VisualDVM.GlobalData.Makefile.UI.MakefilesForm;
import _VisualDVM.GlobalData.Module.Module; import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask; import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -21,10 +18,6 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
super(Makefile.class); super(Makefile.class);
} }
@Override @Override
public DBObjectDialog<Makefile, ModuleAnchestorFields> getDialog() {
return new ModuleAnchestorForm<>();
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(Module.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(Module.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

7
src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
View File

@@ -3,8 +3,11 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*; import javax.swing.*;
@@ -71,4 +74,8 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
return super.isObjectVisible(object) && return super.isObjectVisible(object) &&
MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id); MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
} }
@Override
public DBObjectDialog<Makefile, ModuleAnchestorFields> getDialog() {
return new ModuleAnchestorForm<>();
}
} }

7
src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
View File

@@ -1,9 +1,6 @@
package _VisualDVM.GlobalData.Module; package _VisualDVM.GlobalData.Module;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
import _VisualDVM.GlobalData.Module.UI.ModulesForm; import _VisualDVM.GlobalData.Module.UI.ModulesForm;
import javax.swing.*; import javax.swing.*;
@@ -12,10 +9,6 @@ public class ModulesDBTable extends iDBTable<Module> {
super(Module.class); super(Module.class);
} }
@Override @Override
public DBObjectDialog<Module, ? extends DialogFields> getDialog() {
return new ModuleAnchestorForm<>();
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new ModulesForm(this, mountPanel); return new ModulesForm(this, mountPanel);
} }

6
src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
View File

@@ -3,6 +3,8 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.GlobalData.Module.Module; import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -64,4 +66,8 @@ public class ModulesForm extends DataSetControlForm<Module> {
public boolean isObjectVisible(Module object) { public boolean isObjectVisible(Module object) {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id);
} }
@Override
public DBObjectDialog<Module, ? extends DialogFields> getDialog() {
return new ModuleAnchestorForm<>();
}
} }

83
src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.GlobalData.RunConfiguration; package _VisualDVM.GlobalData.RunConfiguration;
import Common.CommonConstants;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKCurrentObjectBehaviuor;
@@ -7,101 +6,19 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.RunConfiguration.UI.MatrixBar;
import _VisualDVM.GlobalData.RunConfiguration.UI.RunConfigurationFields;
import _VisualDVM.GlobalData.RunConfiguration.UI.RunConfigurationsForm; import _VisualDVM.GlobalData.RunConfiguration.UI.RunConfigurationsForm;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*; import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> { public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
public RunConfigurationsDBTable() { public RunConfigurationsDBTable() {
super(RunConfiguration.class); super(RunConfiguration.class);
} }
@Override @Override
public DBObjectDialog<RunConfiguration, RunConfigurationFields> getDialog() {
return new DBObjectDialog<RunConfiguration, RunConfigurationFields>(RunConfigurationFields.class) {
@Override
public void fillFields() {
for (Compiler compiler : (Global.mainModule.getDb()).compilers.Data.values()) {
if (Global.mainModule.getDb().compilers.getUI().isObjectVisible(compiler)
&& compiler.type.equals(CompilerType.dvm))
fields.cbLauncherCall.addItem(compiler);
}
UI.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
UI.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions);
fields.tfArgs.setText(Result.args);
fields.cbLauncherCall.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
UI.TrySelect(fields.cbLaunchOptions, "run");
}
}
});
fields.cbCube.setSelected(Result.isCube());
//------------------------------------------->>>
fields.sMaxDim.setModel(new SpinnerNumberModel(
Result.dim,
0, RunConfiguration.maxProc, 1));
fields.minMatrixPanel.add(fields.minMatrixBar = new MatrixBar(Result.minMatrix));
fields.maxMatrixPanel.add(fields.maxMatrixBar = new MatrixBar(Result.maxMatrix));
//------------------------------------------->>>
if (!edit)
fields.sMaxDim.setValue(Global.mainModule.getProject().maxdim);
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.LauncherCall = fields.cbLauncherCall.getSelectedItem().toString();
Result.LauncherOptions = (String) fields.cbLaunchOptions.getSelectedItem();
if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
Result.compiler_id = ((Compiler) (fields.cbLauncherCall.getSelectedItem())).id;
} else Result.compiler_id = CommonConstants.Nan;
//-
Result.dim = (int) fields.sMaxDim.getValue();
Result.minMatrix = fields.minMatrixBar.pack(Result.dim);
Result.maxMatrix = fields.maxMatrixBar.pack(Result.dim);
//-
Result.args = fields.tfArgs.getText();
Result.cube = fields.cbCube.isSelected() ? 1 : 0;
}
@Override
public void validateFields() {
String launcher_call = fields.cbLauncherCall.getSelectedItem().toString();
String launcher_options = (String) fields.cbLaunchOptions.getSelectedItem();
if (launcher_call.isEmpty() && !launcher_options.isEmpty())
Log.Writeln_("Непустые опции запуска допускаются только для DVM системы или MPI");
if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
Compiler compiler = (Compiler) (fields.cbLauncherCall.getSelectedItem());
switch (compiler.type) {
case dvm:
case mpi:
int dim_ = (int) fields.sMaxDim.getValue();
RunConfiguration.validateMatrixes(
fields.minMatrixBar.pack(dim_),
fields.maxMatrixBar.pack(dim_),
dim_,
fields.cbCube.isSelected(),
Log
);
break;
}
}
}
};
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

85
src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationDialog.java Normal file
View File

@@ -0,0 +1,85 @@
package _VisualDVM.GlobalData.RunConfiguration.UI;
import Common.CommonConstants;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class RunConfigurationDialog extends DBObjectDialog<RunConfiguration, RunConfigurationFields> {
public RunConfigurationDialog() {
super(RunConfigurationFields.class);
}
@Override
public void fillFields() {
for (Compiler compiler : (Global.mainModule.getDb()).compilers.Data.values()) {
if (Global.mainModule.getDb().compilers.getUI().isObjectVisible(compiler)
&& compiler.type.equals(CompilerType.dvm))
fields.cbLauncherCall.addItem(compiler);
}
UI.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
UI.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions);
fields.tfArgs.setText(Result.args);
fields.cbLauncherCall.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
UI.TrySelect(fields.cbLaunchOptions, "run");
}
}
});
fields.cbCube.setSelected(Result.isCube());
//------------------------------------------->>>
fields.sMaxDim.setModel(new SpinnerNumberModel(
Result.dim,
0, RunConfiguration.maxProc, 1));
fields.minMatrixPanel.add(fields.minMatrixBar = new MatrixBar(Result.minMatrix));
fields.maxMatrixPanel.add(fields.maxMatrixBar = new MatrixBar(Result.maxMatrix));
//------------------------------------------->>>
if (!edit)
fields.sMaxDim.setValue(Global.mainModule.getProject().maxdim);
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.LauncherCall = fields.cbLauncherCall.getSelectedItem().toString();
Result.LauncherOptions = (String) fields.cbLaunchOptions.getSelectedItem();
if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
Result.compiler_id = ((Compiler) (fields.cbLauncherCall.getSelectedItem())).id;
} else Result.compiler_id = CommonConstants.Nan;
//-
Result.dim = (int) fields.sMaxDim.getValue();
Result.minMatrix = fields.minMatrixBar.pack(Result.dim);
Result.maxMatrix = fields.maxMatrixBar.pack(Result.dim);
//-
Result.args = fields.tfArgs.getText();
Result.cube = fields.cbCube.isSelected() ? 1 : 0;
}
@Override
public void validateFields() {
String launcher_call = fields.cbLauncherCall.getSelectedItem().toString();
String launcher_options = (String) fields.cbLaunchOptions.getSelectedItem();
if (launcher_call.isEmpty() && !launcher_options.isEmpty())
Log.Writeln_("Непустые опции запуска допускаются только для DVM системы или MPI");
if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
Compiler compiler = (Compiler) (fields.cbLauncherCall.getSelectedItem());
switch (compiler.type) {
case dvm:
case mpi:
int dim_ = (int) fields.sMaxDim.getValue();
RunConfiguration.validateMatrixes(
fields.minMatrixBar.pack(dim_),
fields.maxMatrixBar.pack(dim_),
dim_,
fields.cbCube.isSelected(),
Log
);
break;
}
}
}
}

5
src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -78,4 +79,8 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
public boolean isObjectVisible(RunConfiguration object) { public boolean isObjectVisible(RunConfiguration object) {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
} }
@Override
public DBObjectDialog getDialog() {
return new RunConfigurationDialog();
}
} }

19
src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
View File

@@ -6,8 +6,6 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfileFields;
import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfilesForm; import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfilesForm;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting; import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -23,23 +21,6 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
return new SapforProfilesForm(this, mountPanel); return new SapforProfilesForm(this, mountPanel);
} }
@Override @Override
public DBObjectDialog<SapforProfile, SapforProfileFields> getDialog() {
return new DBObjectDialog<SapforProfile, SapforProfileFields>(SapforProfileFields.class) {
@Override
public int getDefaultHeight() {
return 250;
}
@Override
public void fillFields() {
fields.tfDescription.setText(edit ? Result.description : "По умолчанию");
}
@Override
public void ProcessResult() {
Result.description = fields.tfDescription.getText();
}
};
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(SapforProfileSetting.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(SapforProfileSetting.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

20
src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfileDialog.java Normal file
View File

@@ -0,0 +1,20 @@
package _VisualDVM.GlobalData.SapforProfile.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
public class SapforProfileDialog extends DBObjectDialog<SapforProfile, SapforProfileFields> {
public SapforProfileDialog() {
super(SapforProfileFields.class);
}
@Override
public int getDefaultHeight() {
return 250;
}
@Override
public void fillFields() {
fields.tfDescription.setText(edit ? Result.description : "По умолчанию");
}
@Override
public void ProcessResult() {
Result.description = fields.tfDescription.getText();
}
}

6
src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
View File

@@ -2,6 +2,8 @@ package _VisualDVM.GlobalData.SapforProfile.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -54,4 +56,8 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
PassCode.ApplyProfile, PassCode.ApplyProfile,
PassCode.DeleteProfile); PassCode.DeleteProfile);
} }
@Override
public DBObjectDialog<SapforProfile, ? extends DialogFields> getDialog() {
return new SapforProfileDialog();
}
} }

41
src/_VisualDVM/GlobalData/User/UI/UserDialog.java Normal file
View File

@@ -0,0 +1,41 @@
package _VisualDVM.GlobalData.User.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.GlobalData.User.UserAuthentication;
public class UserDialog extends DBObjectDialog<User, UserFields> {
public UserDialog() {
super(UserFields.class);
}
@Override
public void SetEditLimits() {
fields.tfLogin.setEditable(false);
}
@Override
public void fillFields() {
if (Global.mainModule.getMachine().type.equals(MachineType.Local)) {
Result.login = "этот пользователь";
fields.tfLogin.setEditable(false);
}
fields.tfLogin.setText(Result.login);
fields.tfPassword.setText(Result.password);
fields.tfWorkspace.setText(Result.workspace);
}
@Override
public void validateFields() {
if (fields.tfLogin.getText().isEmpty())
Log.Writeln_("Логин пользователя не может быть пустым");
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.login = fields.tfLogin.getText();
Result.authentication = UserAuthentication.password;
Result.password = new String(fields.tfPassword.getPassword());
}
@Override
public int getDefaultHeight() {
return 250;
}
}

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

@@ -4,6 +4,7 @@ import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.User.User; import _VisualDVM.GlobalData.User.User;
@@ -74,4 +75,8 @@ public class UsersForm extends DataSetControlForm<User> {
public boolean isObjectVisible(User object) { public boolean isObjectVisible(User object) {
return super.isObjectVisible(object) && super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id); return super.isObjectVisible(object) && super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
} }
@Override
public DBObjectDialog getDialog() {
return new UserDialog();
}
} }

39
src/_VisualDVM/GlobalData/User/UsersDBTable.java
View File

@@ -6,12 +6,8 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask; import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.UI.UserFields;
import _VisualDVM.GlobalData.User.UI.UsersForm; import _VisualDVM.GlobalData.User.UI.UsersForm;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -29,41 +25,6 @@ public class UsersDBTable extends iDBTable<User> {
return res; return res;
} }
@Override @Override
public DBObjectDialog<User, UserFields> getDialog() {
return new DBObjectDialog<User, UserFields>(UserFields.class) {
@Override
public void SetEditLimits() {
fields.tfLogin.setEditable(false);
}
@Override
public void fillFields() {
if (Global.mainModule.getMachine().type.equals(MachineType.Local)) {
Result.login = "этот пользователь";
fields.tfLogin.setEditable(false);
}
fields.tfLogin.setText(Result.login);
fields.tfPassword.setText(Result.password);
fields.tfWorkspace.setText(Result.workspace);
}
@Override
public void validateFields() {
if (fields.tfLogin.getText().isEmpty())
Log.Writeln_("Логин пользователя не может быть пустым");
}
@Override
public void ProcessResult() {
Result.machine_id = Global.mainModule.getMachine().id;
Result.login = fields.tfLogin.getText();
Result.authentication = UserAuthentication.password;
Result.password = new String(fields.tfPassword.getPassword());
}
@Override
public int getDefaultHeight() {
return 250;
}
};
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new UsersForm(this, mountPanel); return new UsersForm(this, mountPanel);
} }

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

@@ -20,7 +20,7 @@ public class AddSubscriber extends ComponentsRepositoryPass<Subscriber> {
return fillObjectFields(); return fillObjectFields();
} }
protected boolean fillObjectFields() throws Exception { protected boolean fillObjectFields() throws Exception {
return server.db.subscribers.ShowAddObjectDialog(target); return server.db.subscribers.getUI().ShowAddObjectDialog(target);
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {

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

@@ -4,7 +4,7 @@ import Common.Visual.UI;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Subscribes.Subscriber; import _VisualDVM.Repository.Subscribes.Subscriber;
import _VisualDVM.Repository.Subscribes.UI.SubscriberForm; import _VisualDVM.Repository.Subscribes.UI.SubscriberDialog;
import javax.swing.*; import javax.swing.*;
import java.util.Vector; import java.util.Vector;
@@ -12,7 +12,7 @@ public class EditAccount extends Email {
public String name; public String name;
public String email; public String email;
String password; String password;
SubscriberForm f = new SubscriberForm() { SubscriberDialog f = new SubscriberDialog() {
{ {
fields.cbRole.setEnabled(false); fields.cbRole.setEnabled(false);
} }

2
src/_VisualDVM/Passes/Server/DeleteServerObject.java
View File

@@ -13,7 +13,7 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = (D) getDb().getTable(d).getUI().getCurrent(); target = (D) getDb().getTable(d).getUI().getCurrent();
return getDb().getTable(d).getUI().CheckCurrent(Log) && getDb().getTable(d).ShowDeleteObjectDialog(target); return getDb().getTable(d).getUI().CheckCurrent(Log) && getDb().getTable(d).getUI().ShowDeleteObjectDialog(target);
} }
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта. //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override @Override

2
src/_VisualDVM/Passes/Server/DeleteServerObjects.java
View File

@@ -39,7 +39,7 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
if (!table.getUI().CheckSelectedOrCurrent(Log)) if (!table.getUI().CheckSelectedOrCurrent(Log))
return false; return false;
target = table.getUI().getSelectedOrCurrentKeys(); target = table.getUI().getSelectedOrCurrentKeys();
return table.ShowDeleteObjectsDialog(target.size()); return table.getUI().ShowDeleteObjectsDialog(target.size());
} }
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта. //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override @Override

2
src/_VisualDVM/Passes/Server/EditServerObject.java
View File

@@ -16,7 +16,7 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = (D) getDb().getTable(d).getUI().getCurrent(); target = (D) getDb().getTable(d).getUI().getCurrent();
return getDb().getTable(d).getUI().CheckCurrent(Log) && getDb().getTable(d).ShowEditObjectDialog(target); return getDb().getTable(d).getUI().CheckCurrent(Log) && getDb().getTable(d).getUI().ShowEditObjectDialog(target);
} }
//-- //--
@Override @Override

2
src/_VisualDVM/Passes/Server/ServerObjectPass.java
View File

@@ -26,6 +26,6 @@ public abstract class ServerObjectPass<S extends RepositoryServer, D extends DBO
} }
//- //-
public boolean fillObjectFields() throws Exception { public boolean fillObjectFields() throws Exception {
return getDb().getTable(d).ShowAddObjectDialog(target); return getDb().getTable(d).getUI().ShowAddObjectDialog(target);
} }
} }

7
src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
View File

@@ -6,11 +6,8 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour; import Common.Database.Tables.FKDataBehaviour;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Repository.Subscribes.UI.SubscriberFields;
import _VisualDVM.Repository.Subscribes.UI.SubscriberForm;
import _VisualDVM.Repository.Subscribes.UI.SubsribersForm; import _VisualDVM.Repository.Subscribes.UI.SubsribersForm;
import javax.swing.*; import javax.swing.*;
@@ -24,10 +21,6 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
return new SubsribersForm(this, mountPanel); return new SubsribersForm(this, mountPanel);
} }
@Override @Override
public DBObjectDialog<Subscriber, SubscriberFields> getDialog() {
return new SubscriberForm();
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
//- //-

4
src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java → src/_VisualDVM/Repository/Subscribes/UI/SubscriberDialog.java
View File

@@ -5,8 +5,8 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Repository.Subscribes.Subscriber; import _VisualDVM.Repository.Subscribes.Subscriber;
public class SubscriberForm extends DBObjectDialog<Subscriber, SubscriberFields> { public class SubscriberDialog extends DBObjectDialog<Subscriber, SubscriberFields> {
public SubscriberForm() { public SubscriberDialog() {
super(SubscriberFields.class); super(SubscriberFields.class);
} }
@Override @Override

6
src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
View File

@@ -2,6 +2,8 @@ package _VisualDVM.Repository.Subscribes.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.GlobalData.Account.AccountRole;
@@ -65,4 +67,8 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
PassCode.EditSubscriber, PassCode.EditSubscriber,
PassCode.DeleteSubscriber); PassCode.DeleteSubscriber);
} }
@Override
public DBObjectDialog<Subscriber, ? extends DialogFields> getDialog() {
return new SubscriberDialog();
}
} }

32
src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -6,14 +6,10 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.UI.GroupFields;
import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm; import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import javax.swing.*; import javax.swing.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -33,34 +29,6 @@ public class GroupsDBTable extends iDBTable<Group> {
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new GroupsForm(this, mountPanel); return new GroupsForm(this, mountPanel);
} }
@Override
public DBObjectDialog<Group, GroupFields> getDialog() {
return new DBObjectDialog<Group, GroupFields>(GroupFields.class) {
@Override
public int getDefaultHeight() {
return 250;
}
@Override
public int getDefaultWidth() {
return 400;
}
@Override
public void validateFields() {
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
UI.TrySelect(fields.cbType, Result.type);
UI.TrySelect(fields.cbLanguage, Result.language);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.type = (TestType) fields.cbType.getSelectedItem();
Result.language = (LanguageName) fields.cbLanguage.getSelectedItem();
}
};
}
public boolean containsGroupWithDescription(String description_in) { public boolean containsGroupWithDescription(String description_in) {
for (Group group : Data.values()) { for (Group group : Data.values()) {
if (group.description.equalsIgnoreCase(description_in)) if (group.description.equalsIgnoreCase(description_in))

34
src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java Normal file
View File

@@ -0,0 +1,34 @@
package _VisualDVM.TestingSystem.Common.Group.UI;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.TestType;
public class GroupDialog extends DBObjectDialog<Group, GroupFields> {
public GroupDialog() {
super(GroupFields.class);
}
@Override
public int getDefaultHeight() {
return 250;
}
@Override
public int getDefaultWidth() {
return 400;
}
@Override
public void validateFields() {
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
UI.TrySelect(fields.cbType, Result.type);
UI.TrySelect(fields.cbLanguage, Result.language);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.type = (TestType) fields.cbType.getSelectedItem();
Result.language = (LanguageName) fields.cbLanguage.getSelectedItem();
}
}

5
src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
View File

@@ -7,6 +7,7 @@ import Common.Visual.DataSetFiltersMenu;
import Common.Visual.FilterFlag; import Common.Visual.FilterFlag;
import Common.Visual.FilterMenuFlag; import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -110,4 +111,8 @@ public class GroupsForm extends DataSetControlForm<Group> {
} }
}); });
} }
@Override
public DBObjectDialog getDialog() {
return new GroupDialog();
}
} }

39
src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
View File

@@ -2,11 +2,8 @@ package _VisualDVM.TestingSystem.Common.Test;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.UI.TestFields;
import _VisualDVM.TestingSystem.Common.Test.UI.TestsForm; import _VisualDVM.TestingSystem.Common.Test.UI.TestsForm;
import javax.swing.*; import javax.swing.*;
@@ -19,42 +16,6 @@ public class TestDBTable extends iDBTable<Test> {
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new TestsForm(this, mountPanel); return new TestsForm(this, mountPanel);
} }
@Override
public DBObjectDialog<Test, TestFields> getDialog() {
return new DBObjectDialog<Test, TestFields>(TestFields.class) {
@Override
public int getDefaultHeight() {
return 200;
}
@Override
public int getDefaultWidth() {
return 400;
}
@Override
public void validateFields() {
if (!edit) {
if (!Global.mainModule.getGroup().language.equals(Global.mainModule.getProject().languageName))
Log.Writeln_("В текущую группу могут войти только тесты на языке " + Global.mainModule.getGroup().language);
}
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
fields.sMinDim.setValue(Result.min_dim);
fields.sMaxDim.setValue(Result.max_dim);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.min_dim = (int) fields.sMinDim.getValue();
Result.max_dim = (int) fields.sMaxDim.getValue();
if (!edit) {
Result.sender_name = Global.mainModule.getAccount().name;
Result.sender_address = Global.mainModule.getAccount().email;
}
}
};
}
public boolean containsTestWithDescription(String description_in) { public boolean containsTestWithDescription(String description_in) {
for (Test test : Data.values()) { for (Test test : Data.values()) {
if (test.description.equalsIgnoreCase(description_in)) if (test.description.equalsIgnoreCase(description_in))

40
src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java Normal file
View File

@@ -0,0 +1,40 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.Common.Test.Test;
public class TestDialog extends DBObjectDialog<Test, TestFields> {
public TestDialog() {
super(TestFields.class);
}
@Override
public int getDefaultHeight() {
return 200;
}
@Override
public int getDefaultWidth() {
return 400;
}
@Override
public void validateFields() {
if (!edit) {
if (!Global.mainModule.getGroup().language.equals(Global.mainModule.getProject().languageName))
Log.Writeln_("В текущую группу могут войти только тесты на языке " + Global.mainModule.getGroup().language);
}
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
fields.sMinDim.setValue(Result.min_dim);
fields.sMaxDim.setValue(Result.max_dim);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.min_dim = (int) fields.sMinDim.getValue();
Result.max_dim = (int) fields.sMaxDim.getValue();
if (!edit) {
Result.sender_name = Global.mainModule.getAccount().name;
Result.sender_address = Global.mainModule.getAccount().email;
}
}
}

5
src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -68,5 +69,9 @@ public class TestsForm extends DataSetControlForm<Test> {
public boolean isObjectVisible(Test object) { public boolean isObjectVisible(Test object) {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Group, object.group_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Group, object.group_id);
} }
@Override
public DBObjectDialog getDialog() {
return new TestDialog();
}
}; };

42
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
View File

@@ -1,12 +1,8 @@
package _VisualDVM.TestingSystem.DVM.DVMConfiguration; package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.DVMConfigurationsForm; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.DVMConfigurationsForm;
import javax.swing.*; import javax.swing.*;
@@ -19,44 +15,6 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
return new DVMConfigurationsForm(this, mountPanel); return new DVMConfigurationsForm(this, mountPanel);
} }
@Override @Override
public DBObjectDialog<DVMConfiguration, ConfigurationFields> getDialog() {
return new DBObjectDialog<DVMConfiguration, ConfigurationFields>(ConfigurationFields.class) {
@Override
public int getDefaultHeight() {
return 300;
}
@Override
public int getDefaultWidth() {
return 500;
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
//------->>>>
fields.sCompilationMaxtime.setValue(Result.c_maxtime);
fields.sRunMaxtime.setValue(Result.maxtime);
fields.sKernels.setValue(Result.kernels);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.c_maxtime = (int) fields.sCompilationMaxtime.getValue();
Result.maxtime = (int) fields.sRunMaxtime.getValue();
Result.kernels = (int) fields.sKernels.getValue();
}
@Override
public void SetReadonly() {
fields.tfName.setEnabled(false);
fields.sCompilationMaxtime.setEnabled(false);
fields.sRunMaxtime.setEnabled(false);
}
};
}
@Override
public boolean ShowEditObjectDialog(DBObject object) {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public PassCode_ getDeletePassCode() { public PassCode_ getDeletePassCode() {
return PassCode.DeleteConfiguration; return PassCode.DeleteConfiguration;
} }

37
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java Normal file
View File

@@ -0,0 +1,37 @@
package _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
public class DVMConfigurationDialog extends DBObjectDialog<DVMConfiguration, DVMConfigurationFields> {
public DVMConfigurationDialog() {
super(DVMConfigurationFields.class);
}
@Override
public int getDefaultHeight() {
return 300;
}
@Override
public int getDefaultWidth() {
return 500;
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
//------->>>>
fields.sCompilationMaxtime.setValue(Result.c_maxtime);
fields.sRunMaxtime.setValue(Result.maxtime);
fields.sKernels.setValue(Result.kernels);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.c_maxtime = (int) fields.sCompilationMaxtime.getValue();
Result.maxtime = (int) fields.sRunMaxtime.getValue();
Result.kernels = (int) fields.sKernels.getValue();
}
@Override
public void SetReadonly() {
fields.tfName.setEnabled(false);
fields.sCompilationMaxtime.setEnabled(false);
fields.sRunMaxtime.setEnabled(false);
}
}

2
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.form → src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields"> <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.DVMConfigurationFields">
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/> <margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>

4
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java → src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationFields.java
View File

@@ -5,14 +5,14 @@ import _VisualDVM.Constants;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
public class ConfigurationFields implements DialogFields { public class DVMConfigurationFields implements DialogFields {
public JTextField tfName; public JTextField tfName;
public JSpinner sCompilationMaxtime; public JSpinner sCompilationMaxtime;
public JSpinner sRunMaxtime; public JSpinner sRunMaxtime;
public JSpinner sKernels; public JSpinner sKernels;
//- //-
private JPanel content; private JPanel content;
public ConfigurationFields() { public DVMConfigurationFields() {
sCompilationMaxtime.setModel(new SpinnerNumberModel(40, sCompilationMaxtime.setModel(new SpinnerNumberModel(40,
5, 3600, 1 5, 3600, 1
)); ));

10
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
View File

@@ -3,7 +3,9 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.ServerObjectsCache.VisualCaches;
@@ -82,4 +84,12 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
PassCode.DeleteConfiguration, PassCode.DeleteConfiguration,
PassCode.StartSelectedDVMConfigurations); PassCode.StartSelectedDVMConfigurations);
} }
@Override
public DBObjectDialog getDialog() {
return new DVMConfigurationDialog();
}
@Override
public boolean ShowEditObjectDialog(DVMConfiguration object) {
return (Global.mainModule.getAccount().CheckAccessRights(object.sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
} }

65
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
View File

@@ -1,12 +1,8 @@
package _VisualDVM.TestingSystem.DVM.DVMSettings; package _VisualDVM.TestingSystem.DVM.DVMSettings;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsForm; import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsForm;
import javax.swing.*; import javax.swing.*;
@@ -19,67 +15,6 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
return new DVMSettingsForm(this, mountPanel); return new DVMSettingsForm(this, mountPanel);
} }
@Override @Override
public DBObjectDialog<DVMSettings, DVMSettingsFields> getDialog() {
return new DBObjectDialog<DVMSettings, DVMSettingsFields>(DVMSettingsFields.class) {
@Override
public int getDefaultHeight() {
return 400;
}
@Override
public int getDefaultWidth() {
return 800;
}
@Override
public void validateFields() {
int min = (int) fields.sMinDimProc.getValue();
int max = (int) fields.sMaxDimProc.getValue();
if (max < min)
Log.Writeln_("Некорректный диапазон размерностей: максимум меньше минимума");
if ((min == 0) && (max != 0) || (min != 0) && (max == 0))
Log.Writeln_("Некорректный диапазон размерностей. " +
"'0' допускается только одновременно на обеих границах,\n" +
"и подразумевает единственный запуск без решётки");
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
//------->>>
fields.tfFlags.setText(Result.flags);
fields.tfEnvironments.setText(Result.environments);
//------->>>
fields.sMinDimProc.setValue(Result.min_dim_proc_count);
fields.sMaxDimProc.setValue(Result.max_dim_proc_count);
fields.cbCube.setSelected(Result.cube == 1);
//-
fields.sMaxProc.setValue(Result.max_proc_count);
fields.cbDvmStat.setSelected(Result.Is_DVM_STAT != 0);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.min_dim_proc_count = (int) fields.sMinDimProc.getValue();
Result.max_dim_proc_count = (int) fields.sMaxDimProc.getValue();
Result.cube = fields.cbCube.isSelected() ? 1 : 0;
Result.max_proc_count = (int) fields.sMaxProc.getValue();
Result.flags = fields.tfFlags.getText();
Result.environments = fields.tfEnvironments.getText();
Result.Is_DVM_STAT = fields.cbDvmStat.isSelected() ? 1 : 0;
}
@Override
public void SetReadonly() {
fields.tfName.setEnabled(false);
fields.sMinDimProc.setEnabled(false);
fields.sMaxDimProc.setEnabled(false);
fields.cbCube.setEnabled(false);
fields.sMaxProc.setEnabled(false);
}
};
}
@Override
public boolean ShowEditObjectDialog(DBObject object) {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMSettings) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public PassCode_ getDeletePassCode() { public PassCode_ getDeletePassCode() {
return PassCode.DeleteDVMSettings; return PassCode.DeleteDVMSettings;
} }

60
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java Normal file
View File

@@ -0,0 +1,60 @@
package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
public class DVMSettingsDialog extends DBObjectDialog<DVMSettings, DVMSettingsFields> {
public DVMSettingsDialog() {
super(DVMSettingsFields.class);
}
@Override
public int getDefaultHeight() {
return 400;
}
@Override
public int getDefaultWidth() {
return 800;
}
@Override
public void validateFields() {
int min = (int) fields.sMinDimProc.getValue();
int max = (int) fields.sMaxDimProc.getValue();
if (max < min)
Log.Writeln_("Некорректный диапазон размерностей: максимум меньше минимума");
if ((min == 0) && (max != 0) || (min != 0) && (max == 0))
Log.Writeln_("Некорректный диапазон размерностей. " +
"'0' допускается только одновременно на обеих границах,\n" +
"и подразумевает единственный запуск без решётки");
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
//------->>>
fields.tfFlags.setText(Result.flags);
fields.tfEnvironments.setText(Result.environments);
//------->>>
fields.sMinDimProc.setValue(Result.min_dim_proc_count);
fields.sMaxDimProc.setValue(Result.max_dim_proc_count);
fields.cbCube.setSelected(Result.cube == 1);
//-
fields.sMaxProc.setValue(Result.max_proc_count);
fields.cbDvmStat.setSelected(Result.Is_DVM_STAT != 0);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.min_dim_proc_count = (int) fields.sMinDimProc.getValue();
Result.max_dim_proc_count = (int) fields.sMaxDimProc.getValue();
Result.cube = fields.cbCube.isSelected() ? 1 : 0;
Result.max_proc_count = (int) fields.sMaxProc.getValue();
Result.flags = fields.tfFlags.getText();
Result.environments = fields.tfEnvironments.getText();
Result.Is_DVM_STAT = fields.cbDvmStat.isSelected() ? 1 : 0;
}
@Override
public void SetReadonly() {
fields.tfName.setEnabled(false);
fields.sMinDimProc.setEnabled(false);
fields.sMaxDimProc.setEnabled(false);
fields.cbCube.setEnabled(false);
fields.sMaxProc.setEnabled(false);
}
}

10
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
View File

@@ -2,7 +2,9 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
@@ -74,4 +76,12 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
PassCode.EditDVMSettings, PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings); PassCode.DeleteDVMSettings);
} }
@Override
public DBObjectDialog getDialog() {
return new DVMSettingsDialog();
}
@Override
public boolean ShowEditObjectDialog(DVMSettings object) {
return (Global.mainModule.getAccount().CheckAccessRights(object.sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
} }

34
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -3,9 +3,7 @@ import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Utils.Vector_; import Common.Utils.Vector_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationsForm; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationsForm;
import javax.swing.*; import javax.swing.*;
@@ -18,38 +16,6 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforConfigurationsForm(this, mountPanel); return new SapforConfigurationsForm(this, mountPanel);
} }
//--
@Override
public DBObjectDialog<SapforConfiguration, SapforConfigurationFields> getDialog() {
return new DBObjectDialog<SapforConfiguration, SapforConfigurationFields>(SapforConfigurationFields.class) {
@Override
public int getDefaultHeight() {
return 200;
}
@Override
public int getDefaultWidth() {
return 450;
}
@Override
public void validateFields() {
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
fields.sKernels.setValue(Result.kernels);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.kernels = (int) fields.sKernels.getValue();
}
@Override
public void SetReadonly() {
fields.tfName.setEnabled(false);
fields.sTransformationMaxtime.setEnabled(false);
}
};
}
public Vector<SapforConfiguration> getAutoConfigurations() { public Vector<SapforConfiguration> getAutoConfigurations() {
Vector<SapforConfiguration> res = new Vector_<>(); Vector<SapforConfiguration> res = new Vector_<>();
for (SapforConfiguration configuration : Data.values()) { for (SapforConfiguration configuration : Data.values()) {

34
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java Normal file
View File

@@ -0,0 +1,34 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
public class SapforConfigurationDialog extends DBObjectDialog<SapforConfiguration, SapforConfigurationFields> {
public SapforConfigurationDialog() {
super(SapforConfigurationFields.class);
}
@Override
public int getDefaultHeight() {
return 200;
}
@Override
public int getDefaultWidth() {
return 450;
}
@Override
public void validateFields() {
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
fields.sKernels.setValue(Result.kernels);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.kernels = (int) fields.sKernels.getValue();
}
@Override
public void SetReadonly() {
fields.tfName.setEnabled(false);
fields.sTransformationMaxtime.setEnabled(false);
}
}

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.ConfigurationCache;
@@ -86,4 +87,8 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
PassCode.DeleteSapforConfiguration, PassCode.DeleteSapforConfiguration,
PassCode.StartSelectedSAPFORConfigurations); PassCode.StartSelectedSAPFORConfigurations);
} }
@Override
public DBObjectDialog getDialog() {
return new SapforConfigurationDialog();
}
} }

42
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
View File

@@ -5,11 +5,8 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour; import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsFields;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsForm; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsForm;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand; import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
@@ -25,45 +22,6 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
} }
//- //-
@Override @Override
public DBObjectDialog<SapforSettings, SapforSettingsFields> getDialog() {
return new DBObjectDialog<SapforSettings, SapforSettingsFields>(SapforSettingsFields.class) {
@Override
public int getDefaultHeight() {
return 415;
}
@Override
public int getDefaultWidth() {
return 600;
}
@Override
public void validateFields() {
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
fields.cbFREE_FORM.setSelected(Result.FREE_FORM != 0);
fields.cbKEEP_DVM_DIRECTIVES.setSelected(Result.KEEP_DVM_DIRECTIVES != 0);
fields.cbKEEP_SPF_DIRECTIVES.setSelected(Result.KEEP_SPF_DIRECTIVES != 0);
fields.cbSTATIC_SHADOW_ANALYSIS.setSelected(Result.STATIC_SHADOW_ANALYSIS != 0);
fields.sMAX_SHADOW_WIDTH.setValue(Result.MAX_SHADOW_WIDTH);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.FREE_FORM = Utils_.fromBoolean(fields.cbFREE_FORM.isSelected());
Result.KEEP_DVM_DIRECTIVES = Utils_.fromBoolean(fields.cbKEEP_DVM_DIRECTIVES.isSelected());
Result.KEEP_SPF_DIRECTIVES = Utils_.fromBoolean(fields.cbKEEP_SPF_DIRECTIVES.isSelected());
Result.STATIC_SHADOW_ANALYSIS = Utils_.fromBoolean(fields.cbSTATIC_SHADOW_ANALYSIS.isSelected());
Result.MAX_SHADOW_WIDTH = fields.sMAX_SHADOW_WIDTH.getValue();
Result.packFlags();
}
@Override
public void SetReadonly() {
fields.tfName.setEnabled(false);
}
};
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() { public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>(); LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(SapforSettingsCommand.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE)); res.put(SapforSettingsCommand.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

43
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java Normal file
View File

@@ -0,0 +1,43 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
public class SapforSettingsDialog extends DBObjectDialog<SapforSettings, SapforSettingsFields> {
public SapforSettingsDialog() {
super(SapforSettingsFields.class);
}
@Override
public int getDefaultHeight() {
return 415;
}
@Override
public int getDefaultWidth() {
return 600;
}
@Override
public void validateFields() {
}
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
fields.cbFREE_FORM.setSelected(Result.FREE_FORM != 0);
fields.cbKEEP_DVM_DIRECTIVES.setSelected(Result.KEEP_DVM_DIRECTIVES != 0);
fields.cbKEEP_SPF_DIRECTIVES.setSelected(Result.KEEP_SPF_DIRECTIVES != 0);
fields.cbSTATIC_SHADOW_ANALYSIS.setSelected(Result.STATIC_SHADOW_ANALYSIS != 0);
fields.sMAX_SHADOW_WIDTH.setValue(Result.MAX_SHADOW_WIDTH);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.FREE_FORM = Utils_.fromBoolean(fields.cbFREE_FORM.isSelected());
Result.KEEP_DVM_DIRECTIVES = Utils_.fromBoolean(fields.cbKEEP_DVM_DIRECTIVES.isSelected());
Result.KEEP_SPF_DIRECTIVES = Utils_.fromBoolean(fields.cbKEEP_SPF_DIRECTIVES.isSelected());
Result.STATIC_SHADOW_ANALYSIS = Utils_.fromBoolean(fields.cbSTATIC_SHADOW_ANALYSIS.isSelected());
Result.MAX_SHADOW_WIDTH = fields.sMAX_SHADOW_WIDTH.getValue();
Result.packFlags();
}
@Override
public void SetReadonly() {
fields.tfName.setEnabled(false);
}
}

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
@@ -56,4 +57,8 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
PassCode.EditSapforSettings, PassCode.EditSapforSettings,
PassCode.DeleteSapforSettings); PassCode.DeleteSapforSettings);
} }
@Override
public DBObjectDialog getDialog() {
return new SapforSettingsDialog();
}
} }

23
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
View File

@@ -2,12 +2,8 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI.SapforSettingsCommandsForm; import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI.SapforSettingsCommandsForm;
import javax.swing.*; import javax.swing.*;
@@ -20,25 +16,6 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforSettingsCommandsForm(this, mountPanel); return new SapforSettingsCommandsForm(this, mountPanel);
} }
@Override
public DBObjectDialog<SapforSettingsCommand, SapforSettingsCommandFields> getDialog() {
return new DBObjectDialog<SapforSettingsCommand, SapforSettingsCommandFields>(SapforSettingsCommandFields.class) {
@Override
public int getDefaultHeight() {
return 250;
}
@Override
public void fillFields() {
UI.TrySelect(fields.cbPassCode, Result.passCode);
}
@Override
public void ProcessResult() {
Result.passCode = (PassCode) fields.cbPassCode.getSelectedItem();
Result.sapforsettings_id = Global.mainModule.getSapforSettings().id;
}
};
}
//--
public Vector<PassCode> getCodes(SapforSettings sapforSettings) { public Vector<PassCode> getCodes(SapforSettings sapforSettings) {
Vector<PassCode> res = new Vector<>(); Vector<PassCode> res = new Vector<>();
for (SapforSettingsCommand command : Data.values()) { for (SapforSettingsCommand command : Data.values()) {

24
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandDialog.java Normal file
View File

@@ -0,0 +1,24 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
public class SapforSettingsCommandDialog extends DBObjectDialog<SapforSettingsCommand, SapforSettingsCommandFields> {
public SapforSettingsCommandDialog() {
super(SapforSettingsCommandFields.class);
}
@Override
public int getDefaultHeight() {
return 250;
}
@Override
public void fillFields() {
UI.TrySelect(fields.cbPassCode, Result.passCode);
}
@Override
public void ProcessResult() {
Result.passCode = (PassCode) fields.cbPassCode.getSelectedItem();
Result.sapforsettings_id = Global.mainModule.getSapforSettings().id;
}
}

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.form → src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields"> <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI.SapforSettingsCommandFields">
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/> <margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java → src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandFields.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI; package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.Tables.StyledCellLabel; import Common.Visual.Tables.StyledCellLabel;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand; import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
@@ -54,4 +55,8 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
public boolean isObjectVisible(SapforSettingsCommand object) { public boolean isObjectVisible(SapforSettingsCommand object) {
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id);
} }
@Override
public DBObjectDialog getDialog() {
return new SapforSettingsCommandDialog();
}
} }