изменение умолчаний для контролов таблиц

This commit is contained in:
2024-10-25 02:08:23 +03:00
parent f2de9054d0
commit f6ab578ce2
83 changed files with 172 additions and 428 deletions

114
.idea/workspace.xml generated
View File

@@ -7,57 +7,89 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/src/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.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/_VisualDVM/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Current.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyProfile.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/CompilerEnvironment/UI/CompilerEnvironmentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Credentials/Credentials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Credentials/Credentials.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/UI/EnvironmentsValuesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.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/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/UI/SapforProfileSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.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/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/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserDialog.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/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneDVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneDVMSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneSapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneSapforSettings.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/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Compile.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Compile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/LocalInitaliseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/LocalInitaliseUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InitialiseUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.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/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Run.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SelectRemoteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SelectRemoteFile.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveCurrentDVMConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveCurrentSAPFORConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveCurrentSAPFORConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowMakefilePreview.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowMakefilePreview.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowMakefilePreview.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowMakefilePreview.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.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/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportProgress.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportProgress.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/Passes/CurrentComponentPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/CurrentComponentPass.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/Passes/SSH/CurrentConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/CurrentConnectionPass.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/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.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/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.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/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.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/Passes/Testing/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.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/Passes/Testing/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.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/Passes/Testing/ShowCurrentConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.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/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/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/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/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/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/UI/TestDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/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/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/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/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/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/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/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/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -33,7 +33,7 @@
"InstructionPath": "", "InstructionPath": "",
"PerformanceAnalyzerPath": "", "PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10, "ComponentsBackUpsCount": 10,
"AutoCheckTesting": true, "AutoCheckTesting": false,
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": true, "EmailOnTestingProgress": true,
"eraseTestingWorkspaces": true "eraseTestingWorkspaces": true

View File

@@ -4,7 +4,6 @@ import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable; import Common.Database.Tables.DBTable;
import Common.Database.Tables.DBTableColumn; import Common.Database.Tables.DBTableColumn;
import Common.Passes.PassException; import Common.Passes.PassException;
import Common.Utils.TextLog;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.UI; import Common.Visual.UI;
import javafx.util.Pair; import javafx.util.Pair;
@@ -256,5 +255,4 @@ public abstract class SQLiteDatabase extends Database {
} }
//-- //--
//https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause //https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause
} }

View File

@@ -5,7 +5,6 @@ import Common.Database.Objects.PassStats.PassStatsDBTable;
import Common.Database.Objects.Splitter.SplittersDBTable; import Common.Database.Objects.Splitter.SplittersDBTable;
import Common.Database.SQLITE.SQLiteDatabase; import Common.Database.SQLITE.SQLiteDatabase;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Utils.TextLog;
import java.io.File; import java.io.File;
public class VisualiserDatabase extends SQLiteDatabase { public class VisualiserDatabase extends SQLiteDatabase {
@@ -27,5 +26,4 @@ public class VisualiserDatabase extends SQLiteDatabase {
public PassCode_ getSynchronizePassCode() { public PassCode_ getSynchronizePassCode() {
return null; return null;
} }
} }

View File

@@ -1,6 +1,5 @@
package Common; package Common;
import Common.Database.Objects.PassStats.PassStats; import Common.Database.Objects.PassStats.PassStats;
import Common.Database.Objects.iDBObject;
import Common.Database.VisualiserDatabase; import Common.Database.VisualiserDatabase;
import Common.Passes.Pass; import Common.Passes.Pass;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;

View File

@@ -24,8 +24,8 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
protected void showFinish() throws Exception { protected void showFinish() throws Exception {
getTable().ShowUI(target.getPK()); getTable().ShowUI(target.getPK());
for (Class dep : getTable().getFKDependencies().keySet()) { for (Class dep : getTable().getFKDependencies().keySet()) {
if (getDb().getTable(dep).getUI()!=null) if (getDb().getTable(dep).getUI() != null)
getDb().getTable(dep).getUI().RedrawControl(); getDb().getTable(dep).getUI().RedrawControl();
} }
} }
} }

View File

@@ -385,7 +385,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} }
//- //-
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return true;
} }
protected boolean hasMenuBar() { protected boolean hasMenuBar() {
return true; return true;
@@ -469,7 +469,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
return true; return true;
} }
protected boolean needsCurrent() { protected boolean needsCurrent() {
return false; return true;
} //нужно ли отслеживать текущий объект. } //нужно ли отслеживать текущий объект.
protected String getCurrentName() { protected String getCurrentName() {
return dataSource.d.getSimpleName(); return dataSource.d.getSimpleName();

View File

@@ -15,7 +15,6 @@ public enum Current implements Current_ {
File, File,
Root, Root,
Version, Version,
RunTask,
ProjectNode, //узел в дереве проекта. нужен для отображения добавленных файлов ProjectNode, //узел в дереве проекта. нужен для отображения добавленных файлов
SelectedDirectory, SelectedDirectory,
SelectedFile, SelectedFile,
@@ -29,8 +28,6 @@ public enum Current implements Current_ {
Function, Function,
SelectedFunction, SelectedFunction,
//- //-
PackageVersion,
//--
ProjectView, Credentials; ProjectView, Credentials;
@Override @Override
public String getDescription() { public String getDescription() {
@@ -43,8 +40,6 @@ public enum Current implements Current_ {
return "Версия компонента для восстановления с сервера"; return "Версия компонента для восстановления с сервера";
case SelectedFunction: case SelectedFunction:
return "Выбранный узел графа процедур"; return "Выбранный узел графа процедур";
case PackageVersion:
return "Версия пакетного режима";
case Function: case Function:
return "Функция"; return "Функция";
case ProjectNode: case ProjectNode:
@@ -55,8 +50,6 @@ public enum Current implements Current_ {
return "Папка проекта"; return "Папка проекта";
case SelectedFile: case SelectedFile:
return "Файл проекта"; return "Файл проекта";
case RunTask:
return "Задача на запуск";
case RemoteFile: case RemoteFile:
return "Удалённый файл"; return "Удалённый файл";
case Project: case Project:

View File

@@ -8,8 +8,10 @@ import _VisualDVM.GlobalData.Settings.DBSetting;
import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.ProjectView; import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.*; import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Repository.Component.Sapfor.MessagesServer; import _VisualDVM.Repository.Component.Sapfor.MessagesServer;
import _VisualDVM.Repository.Component.Visualizer_2;
import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner; import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
@@ -153,7 +155,6 @@ public class Global {
} }
System.exit(0); System.exit(0);
} }
public static void changeSetting(SettingName settingName, Object new_value) throws Exception { public static void changeSetting(SettingName settingName, Object new_value) throws Exception {
Global.mainModule.getPass(PassCode.UpdateSetting).Do(settingName, new_value); Global.mainModule.getPass(PassCode.UpdateSetting).Do(settingName, new_value);
} }
@@ -191,7 +192,6 @@ public class Global {
} }
messagesServer = new MessagesServer(); messagesServer = new MessagesServer();
messagesServer.Start(); messagesServer.Start();
components = new ComponentsSet(); components = new ComponentsSet();
components.initialVersionsCheck(); components.initialVersionsCheck();
//-------->> //-------->>

View File

@@ -1,10 +1,8 @@
package _VisualDVM.GlobalData.Compiler.UI; package _VisualDVM.GlobalData.Compiler.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
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.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
@@ -16,14 +14,6 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"описание", "описание",

View File

@@ -10,10 +10,6 @@ public class CompilerEnvironmentsForm extends DataSetControlForm<CompilerEnviron
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Значение", "Описание" "Значение", "Описание"

View File

@@ -10,10 +10,6 @@ public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Параметр", "Параметр",

View File

@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.Credentials;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Database.Objects.iDBObject; import Common.Database.Objects.iDBObject;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
//todo вывести. оформить механизм сохр текущих объектов в бд визуализатора.
public class Credentials extends iDBObject { public class Credentials extends iDBObject {
@Description("DEFAULT -1") @Description("DEFAULT -1")
public int machine_id = CommonConstants.Nan; public int machine_id = CommonConstants.Nan;

View File

@@ -4,7 +4,6 @@ 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.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -14,8 +13,8 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() { protected boolean hasCheckBox() {
return true; return false;
} }
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {

View File

@@ -5,10 +5,8 @@ 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.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.All.Run;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*; import javax.swing.*;
@@ -17,8 +15,8 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() { protected boolean hasCheckBox() {
return true; return false;
} }
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
@@ -51,7 +49,7 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
@Override @Override
public boolean isObjectVisible(EnvironmentValue object) { public boolean isObjectVisible(EnvironmentValue object) {
return super.isObjectVisible(object) && return super.isObjectVisible(object) &&
MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().matchCurrentID(object.run_configuration_id ); MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().matchCurrentID(object.run_configuration_id);
} }
@Override @Override
protected DBObjectDialog<EnvironmentValue, ? extends DialogFields> getDialog() { protected DBObjectDialog<EnvironmentValue, ? extends DialogFields> getDialog() {

View File

@@ -10,6 +10,14 @@ public class DirInfosForm extends DataSetControlForm<DirInfo> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean hasCheckBox() {
return false;
}
@Override
protected boolean needsCurrent() {
return false;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"дата изменения"}; "дата изменения"};

View File

@@ -1,24 +1,19 @@
package _VisualDVM.GlobalData; package _VisualDVM.GlobalData;
import Common.Database.VisualiserDatabase; import Common.Database.VisualiserDatabase;
import Common.MainModule_; import Common.MainModule_;
import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.Account; import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Account.AccountsDBTable; import _VisualDVM.GlobalData.Account.AccountsDBTable;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilersDBTable; import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
import _VisualDVM.GlobalData.Credentials.Credentials; import _VisualDVM.GlobalData.Credentials.Credentials;
import _VisualDVM.GlobalData.Credentials.CredentialsDBTable; import _VisualDVM.GlobalData.Credentials.CredentialsDBTable;
import _VisualDVM.GlobalData.DBLastProject.LastProjectsDBTable; import _VisualDVM.GlobalData.DBLastProject.LastProjectsDBTable;
import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable; import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachinesDBTable; import _VisualDVM.GlobalData.Machine.MachinesDBTable;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Makefile.MakefilesDBTable; import _VisualDVM.GlobalData.Makefile.MakefilesDBTable;
import _VisualDVM.GlobalData.Module.ModulesDBTable; import _VisualDVM.GlobalData.Module.ModulesDBTable;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsDBTable; import _VisualDVM.GlobalData.RunConfiguration.RunConfigurationsDBTable;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.GlobalData.SapforProfile.SapforProfilesDBTable; import _VisualDVM.GlobalData.SapforProfile.SapforProfilesDBTable;
@@ -29,7 +24,6 @@ import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.GlobalData.Settings.SettingsDBTable; import _VisualDVM.GlobalData.Settings.SettingsDBTable;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable; import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable; import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.GlobalData.User.UsersDBTable; import _VisualDVM.GlobalData.User.UsersDBTable;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.ComponentType; import _VisualDVM.Repository.Component.ComponentType;
@@ -102,9 +96,7 @@ public class GlobalDatabase extends VisualiserDatabase {
public PassCode getSynchronizePassCode() { public PassCode getSynchronizePassCode() {
return null; return null;
} }
//todo централизованное сохранение текущих объектов в базах //todo централизованное сохранение текущих объектов в базах
public void SaveCredentials() { public void SaveCredentials() {
/* /*
try { try {
@@ -130,9 +122,7 @@ public class GlobalDatabase extends VisualiserDatabase {
ex.printStackTrace(); ex.printStackTrace();
} }
*/ */
} }
public void UpdateCredentials() { public void UpdateCredentials() {
/* /*
} }

View File

@@ -5,7 +5,6 @@ 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.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -18,14 +17,6 @@ public class MachinesForm extends DataSetControlForm<Machine> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{"URL"}; return new String[]{"URL"};
} }

View File

@@ -4,7 +4,6 @@ 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.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields; import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
@@ -17,14 +16,6 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Линковщик", "Линковщик",

View File

@@ -3,7 +3,6 @@ import Common.CommonConstants;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.UI; import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;

View File

@@ -5,7 +5,6 @@ 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.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module; import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -16,14 +15,6 @@ public class ModulesForm extends DataSetControlForm<Module> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Язык", "Язык",

View File

@@ -4,7 +4,6 @@ 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.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -15,8 +14,8 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() { protected boolean hasCheckBox() {
return true; return false;
} }
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {

View File

@@ -4,7 +4,6 @@ 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.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -15,10 +14,6 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Описание", "Описание",

View File

@@ -2,8 +2,6 @@ package _VisualDVM.GlobalData.SapforProfileSetting.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting; import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
@@ -13,8 +11,8 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() { protected boolean hasCheckBox() {
return true; return false;
} }
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {

View File

@@ -17,14 +17,6 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"сборка", "сборка",
@@ -42,34 +34,6 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
}; };
} }
@Override @Override
protected void AdditionalInitColumns() {
columns.get(12).setRendererClass(RendererDate.class);
columns.get(13).setRendererClass(RendererStatusEnum.class);
}
@Override
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteCompilationTasks);
}
@Override
public boolean isObjectVisible(CompilationTask object) {
return super.isObjectVisible(object) &&
MainModule_.instance.getDb().getTable(Machine.class).getUI().matchCurrentID(object.machine_id) &&
MainModule_.instance.getDb().getTable(User.class).getUI().matchCurrentID(object.user_id) &&
Global.mainModule.HasProject() &&
object.belongsToProject(Global.mainModule.getProject());
}
@Override
public Object getFieldAt(CompilationTask object, int columnIndex) { public Object getFieldAt(CompilationTask object, int columnIndex) {
switch (columnIndex) { switch (columnIndex) {
case 2: case 2:
@@ -100,4 +64,32 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
return null; return null;
} }
} }
@Override
protected void AdditionalInitColumns() {
columns.get(12).setRendererClass(RendererDate.class);
columns.get(13).setRendererClass(RendererStatusEnum.class);
}
@Override
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteCompilationTasks);
}
@Override
public boolean isObjectVisible(CompilationTask object) {
return super.isObjectVisible(object) &&
MainModule_.instance.getDb().getTable(Machine.class).getUI().matchCurrentID(object.machine_id) &&
MainModule_.instance.getDb().getTable(User.class).getUI().matchCurrentID(object.user_id) &&
Global.mainModule.HasProject() &&
object.belongsToProject(Global.mainModule.getProject());
}
} }

View File

@@ -5,7 +5,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
@@ -20,14 +19,6 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Матрица", "Матрица",

View File

@@ -1,7 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux; package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
import Common.MainModule_; import Common.MainModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;

View File

@@ -1,7 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows; package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows;
import Common.MainModule_; import Common.MainModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;

View File

@@ -1,8 +1,6 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote; package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import Common.MainModule_; import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.QueueSystem.MVS; import _VisualDVM.GlobalData.Tasks.QueueSystem.MVS;

View File

@@ -1,7 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote; package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import Common.MainModule_; import Common.MainModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;

View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.User.UI; package _VisualDVM.GlobalData.User.UI;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType; import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.User.User; import _VisualDVM.GlobalData.User.User;

View File

@@ -5,7 +5,6 @@ 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 Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User; import _VisualDVM.GlobalData.User.User;
@@ -17,14 +16,6 @@ public class UsersForm extends DataSetControlForm<User> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Логин", "Логин",

View File

@@ -49,8 +49,12 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
return "_VisualDVM.Passes.All."; return "_VisualDVM.Passes.All.";
} }
//-- //--
public boolean HasAccount(){return get(Current.Account)!=null; } //Бессмысленно. аккаунт всегда подразумевается. вывести. public boolean HasAccount() {
public Account getAccount(){return (Account) get(Current.Account);} //временно return get(Current.Account) != null;
} //Бессмысленно. аккаунт всегда подразумевается. вывести.
public Account getAccount() {
return (Account) get(Current.Account);
} //временно
public boolean HasProject() { public boolean HasProject() {
return get(Current.Project) != null; return get(Current.Project) != null;
} }
@@ -122,12 +126,6 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
public FuncInfo getSelectionFunction() { public FuncInfo getSelectionFunction() {
return (FuncInfo) get(Current.SelectedFunction); return (FuncInfo) get(Current.SelectedFunction);
} }
public db_project_info getPackageVersion() {
return (db_project_info) get(Current.PackageVersion);
}
public boolean HasPackageVersion() {
return get(Current.PackageVersion) != null;
}
public ProjectView getProjectView() { public ProjectView getProjectView() {
return (ProjectView) get(Current.ProjectView); return (ProjectView) get(Current.ProjectView);
} }

View File

@@ -56,7 +56,7 @@ public class CheckAccount extends Pass<Boolean> {
protected void showDone() throws Exception { protected void showDone() throws Exception {
if (Global.mainModule.getUI().getMainWindow() != null) { if (Global.mainModule.getUI().getMainWindow() != null) {
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowAccount(); Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowAccount();
if (Global.componentsServer.db.bugReports.getUI().getCurrent()!=null) if (Global.componentsServer.db.bugReports.getUI().getCurrent() != null)
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport(); Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
} }
if (Global.mainModule.getAccount().isAdmin()) if (Global.mainModule.getAccount().isAdmin())

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Server.CloneServerObject; import _VisualDVM.Passes.Server.CloneServerObject;
import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.Common.TestingServer;

View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.CloneServerObject; import _VisualDVM.Passes.Server.CloneServerObject;

View File

@@ -37,7 +37,7 @@ public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
master = target.get(0); master = target.get(0);
slave = null; slave = null;
return UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK())); return UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));
} else if ((target.size() == 0) && (Global.testingServer.db.dvmRunTasks.getUI().getCurrent()!=null)) { } else if ((target.size() == 0) && (Global.testingServer.db.dvmRunTasks.getUI().getCurrent() != null)) {
master = Global.testingServer.db.dvmRunTasks.getUI().getCurrent(); master = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
slave = null; slave = null;
return UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK())); return UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));

View File

@@ -37,7 +37,7 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
master = target.get(0); master = target.get(0);
slave = null; slave = null;
return UI.Question("Отобразить пакет " + Utils_.Brackets(master.getPK())); return UI.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));
} else if ((target.size() == 0) && ( (Global.testingServer.db.sapforPackages.getUI().getCurrent()!=null))) { } else if ((target.size() == 0) && ((Global.testingServer.db.sapforPackages.getUI().getCurrent() != null))) {
master = Global.testingServer.db.sapforPackages.getUI().getCurrent(); master = Global.testingServer.db.sapforPackages.getUI().getCurrent();
slave = null; slave = null;
return UI.Question("Отобразить пакет " + Utils_.Brackets(master.getPK())); return UI.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));

View File

@@ -37,8 +37,8 @@ public class Compile extends Pass<db_project_info> {
target = Global.mainModule.getProject(); target = Global.mainModule.getProject();
//-- //--
machine = Global.mainModule.getDb().getTable(Machine.class).getUI().getCurrent(); machine = Global.mainModule.getDb().getTable(Machine.class).getUI().getCurrent();
user= Global.mainModule.getDb().getTable(User.class).getUI().getCurrent(); user = Global.mainModule.getDb().getTable(User.class).getUI().getCurrent();
makefile= Global.mainModule.getDb().getTable(Makefile.class).getUI().getCurrent(); makefile = Global.mainModule.getDb().getTable(Makefile.class).getUI().getCurrent();
//-- //--
subpass = null; subpass = null;
compilationTask = null; compilationTask = null;

View File

@@ -27,7 +27,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
Log.Writeln_("Вы не являетесь администратором"); Log.Writeln_("Вы не являетесь администратором");
return false; return false;
} }
if (! Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) { if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false; return false;
} }
return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность."); return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import Common.MainModule_; import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User; import _VisualDVM.GlobalData.User.User;
import _VisualDVM.GlobalData.User.UserState; import _VisualDVM.GlobalData.User.UserState;
import _VisualDVM.Passes.ProcessPass; import _VisualDVM.Passes.ProcessPass;

View File

@@ -21,8 +21,8 @@ public class PublishBugReport extends Pass<BugReport> {
} }
@Override @Override
protected boolean canStart(Object... args) { protected boolean canStart(Object... args) {
if ( Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log)) { if (Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log)) {
target = Global.componentsServer.db.bugReports.getUI().getCurrent(); target = Global.componentsServer.db.bugReports.getUI().getCurrent();
if (!target.state.equals(BugReportState.draft)) { if (!target.state.equals(BugReportState.draft)) {
Log.Writeln_("Отчёт об ошибке " + target.id + " уже опубликован!"); Log.Writeln_("Отчёт об ошибке " + target.id + " уже опубликован!");
return false; return false;

View File

@@ -45,8 +45,8 @@ public class Run extends Pass<db_project_info> {
@Override @Override
protected boolean canStart(Object... args) { protected boolean canStart(Object... args) {
subpass = null; subpass = null;
if ((Global.mainModule.Check(Log, Current.Project))&& if ((Global.mainModule.Check(Log, Current.Project)) &&
MainModule_.instance.getDb().CheckCurrent(Log,Machine.class, User.class, Makefile.class, RunConfiguration.class,CompilationTask.class)) { MainModule_.instance.getDb().CheckCurrent(Log, Machine.class, User.class, Makefile.class, RunConfiguration.class, CompilationTask.class)) {
//- //-
target = Global.mainModule.getProject(); target = Global.mainModule.getProject();
//- //-

View File

@@ -24,7 +24,7 @@ public class SPF_ModifyArrayDistribution extends SapforModification {
if ( if (
Global.mainModule.getProject().parallelRegions.getUI().CheckCurrent(Log) Global.mainModule.getProject().parallelRegions.getUI().CheckCurrent(Log)
&& super.canStart(args) && Global.mainModule.getPass(PassCode.SPF_GetArrayLinks).Do()) { && super.canStart(args) && Global.mainModule.getPass(PassCode.SPF_GetArrayLinks).Do()) {
region = Global.mainModule.getProject().parallelRegions.getUI().getCurrent(); region = Global.mainModule.getProject().parallelRegions.getUI().getCurrent();
DBObjectDialog dialog = new DBObjectDialog<ParallelRegion, ParallelRegionFields>(ParallelRegionFields.class) { DBObjectDialog dialog = new DBObjectDialog<ParallelRegion, ParallelRegionFields>(ParallelRegionFields.class) {
@Override @Override
public int getDefaultHeight() { public int getDefaultHeight() {

View File

@@ -11,8 +11,8 @@ public class SaveBugReportExecutor extends UpdateBugReportField {
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
return Global.componentsServer.db.subscribers.getUI().CheckCurrent(Log) && return Global.componentsServer.db.subscribers.getUI().CheckCurrent(Log) &&
super.canStart("executor",Global.componentsServer.db.subscribers.getUI().getCurrent().name, super.canStart("executor", Global.componentsServer.db.subscribers.getUI().getCurrent().name,
"executor_address", Global.componentsServer.db.subscribers.getUI().getCurrent().address "executor_address", Global.componentsServer.db.subscribers.getUI().getCurrent().address
); );
} }

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Passes.Testing.SaveCurrentConfiguration; import _VisualDVM.Passes.Testing.SaveCurrentConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Passes.Testing.SaveCurrentConfiguration; import _VisualDVM.Passes.Testing.SaveCurrentConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests; import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests;
import _VisualDVM.ServerObjectsCache.DVMConfigurationCache; import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests; import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests;
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache; import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;

View File

@@ -22,7 +22,7 @@ public class ShowMakefilePreview extends Pass<db_project_info> {
} }
@Override @Override
protected boolean canStart(Object... args) { protected boolean canStart(Object... args) {
if (Global.mainModule.Check(Log, Current.Project) &&MainModule_.instance.getDb().getTable(Makefile.class).getUI().CheckCurrent(Log) ) { if (Global.mainModule.Check(Log, Current.Project) && MainModule_.instance.getDb().getTable(Makefile.class).getUI().CheckCurrent(Log)) {
target = Global.mainModule.getProject(); target = Global.mainModule.getProject();
return true; return true;
} }

View File

@@ -24,7 +24,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
if (!Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log)) if (!Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log))
return false; return false;
old_description = ""; old_description = "";
old_comment = ""; old_comment = "";

View File

@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.DBArray.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 _VisualDVM.Current;
import _VisualDVM.ProjectData.DBArray.DBArray; import _VisualDVM.ProjectData.DBArray.DBArray;
import javax.swing.*; import javax.swing.*;
@@ -11,10 +10,6 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{"Имя"}; return new String[]{"Имя"};
} }
@@ -30,10 +25,6 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
} }
} }
@Override @Override
protected boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(1).setEditable(false); columns.get(1).setEditable(false);
} }

View File

@@ -1,10 +1,5 @@
package _VisualDVM.ProjectData.Messages.Errors; package _VisualDVM.ProjectData.Messages.Errors;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.MessagesControlForm;
import _VisualDVM.ProjectData.Messages.MessagesDBTable; import _VisualDVM.ProjectData.Messages.MessagesDBTable;
import javax.swing.*;
public class ErrorsDBTable extends MessagesDBTable<MessageError> { public class ErrorsDBTable extends MessagesDBTable<MessageError> {
public ErrorsDBTable() { public ErrorsDBTable() {
super(MessageError.class); super(MessageError.class);

View File

@@ -14,8 +14,8 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() { protected boolean hasCheckBox() {
return true; return false;
} }
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {

View File

@@ -14,5 +14,4 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel); return new MessagesControlForm(this, mountPanel);
} }
} }

View File

@@ -1,10 +1,5 @@
package _VisualDVM.ProjectData.Messages.Notes; package _VisualDVM.ProjectData.Messages.Notes;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.MessagesControlForm;
import _VisualDVM.ProjectData.Messages.MessagesDBTable; import _VisualDVM.ProjectData.Messages.MessagesDBTable;
import javax.swing.*;
public class NotesDBTable extends MessagesDBTable<MessageNote> { public class NotesDBTable extends MessagesDBTable<MessageNote> {
public NotesDBTable() { public NotesDBTable() {
super(MessageNote.class); super(MessageNote.class);

View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.HeaderTextFilter; import Common.Visual.Tables.HeaderTextFilter;
import Common.Visual.Tables.RendererWrapText; import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation; import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation;
import javax.swing.*; import javax.swing.*;
@@ -12,8 +11,8 @@ public class RecommendationsForm extends DataSetControlForm<MessageRecommendatio
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() { protected boolean hasCheckBox() {
return true; return false;
} }
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {

View File

@@ -1,10 +1,5 @@
package _VisualDVM.ProjectData.Messages.Warnings; package _VisualDVM.ProjectData.Messages.Warnings;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.MessagesControlForm;
import _VisualDVM.ProjectData.Messages.MessagesDBTable; import _VisualDVM.ProjectData.Messages.MessagesDBTable;
import javax.swing.*;
public class WarningsDBTable extends MessagesDBTable<MessageWarning> { public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
//https://stackoverflow.com/questions/13079777/editable-jtableheader //https://stackoverflow.com/questions/13079777/editable-jtableheader
public WarningsDBTable() { public WarningsDBTable() {

View File

@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererHiddenList; import Common.Visual.Tables.RendererHiddenList;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -24,11 +23,6 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
//-- //--
@Override
protected boolean needsCurrent() {
return true;
}
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
@@ -41,10 +35,6 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
}; };
} }
@Override @Override
protected boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
if ((Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) { if ((Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {

View File

@@ -1,7 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI; package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.Menus.GraphMenu; import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree; import Common.Visual.Trees.StyledTree;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion; import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;

View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererTopLeft; import Common.Visual.Tables.RendererTopLeft;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion; import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import javax.swing.*; import javax.swing.*;
@@ -12,8 +11,8 @@ public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() { protected boolean hasCheckBox() {
return true; return false;
} }
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {

View File

@@ -5,7 +5,6 @@ import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMaskedNanInteger; import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant; import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
@@ -14,15 +13,6 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) { public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{

View File

@@ -5,7 +5,6 @@ import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererProgressBar; import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReport;
@@ -29,11 +28,11 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) { public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
//--
@Override @Override
protected boolean needsCurrent() { protected boolean hasCheckBox() {
return true; return false;
} }
//--
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{

View File

@@ -17,6 +17,14 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
public boolean bad_state = false; public boolean bad_state = false;
public boolean need_update = false; public boolean need_update = false;
public boolean need_publish = false; public boolean need_publish = false;
public ComponentsSet() {
super(ComponentType.class, Component.class);
put(ComponentType.Visualiser, visualiser = new Visualiser());
put(ComponentType.Sapfor_F, (Component) MainModule_.instance.set(Current.Sapfor, new Sapfor_F()));
put(ComponentType.Visualizer_2, visualizer_2);
put(ComponentType.PerformanceAnalyzer, performanceAnalyzer = new PerformanceAnalyzer());
put(ComponentType.Instruction, new Instruction());
}
public boolean needChanges() { public boolean needChanges() {
return bad_state || need_update; return bad_state || need_update;
} }
@@ -24,14 +32,6 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
return needChanges() ? "/icons/ComponentsNeedUpdate.gif" return needChanges() ? "/icons/ComponentsNeedUpdate.gif"
: (need_publish ? "/icons/ComponentsNeedPublish_2023.gif" : "/icons/ComponentsActual.png"); : (need_publish ? "/icons/ComponentsNeedPublish_2023.gif" : "/icons/ComponentsActual.png");
} }
public ComponentsSet() {
super(ComponentType.class, Component.class);
put(ComponentType.Visualiser, visualiser = new Visualiser());
put(ComponentType.Sapfor_F, (Component)MainModule_.instance.set(Current.Sapfor, new Sapfor_F()));
put(ComponentType.Visualizer_2, visualizer_2);
put(ComponentType.PerformanceAnalyzer, performanceAnalyzer = new PerformanceAnalyzer());
put(ComponentType.Instruction, new Instruction());
}
@Override @Override
public String getSingleDescription() { public String getSingleDescription() {
return "компонент"; return "компонент";
@@ -78,7 +78,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
} }
return !bad_state; return !bad_state;
} }
public void initialVersionsCheck(){ public void initialVersionsCheck() {
for (Component component : Data.values()) for (Component component : Data.values())
component.InitialVersionCheck(); component.InitialVersionCheck();
} }

View File

@@ -7,7 +7,6 @@ import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.VisualiserMenu; import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Tables.RendererMaskedNanInteger; import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Component.Component;
@@ -19,14 +18,6 @@ public class ComponentsForm extends DataSetControlForm<Component> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Компонент", "Компонент",

View File

@@ -13,8 +13,8 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() { protected boolean hasCheckBox() {
return true; return false;
} }
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {

View File

@@ -4,7 +4,6 @@ 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.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -16,14 +15,6 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Имя", "Имя",

View File

@@ -8,7 +8,6 @@ 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 Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.LanguageName;
@@ -21,15 +20,6 @@ public class GroupsForm extends DataSetControlForm<Group> {
public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) { public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{

View File

@@ -18,7 +18,7 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
@Override @Override
public void validateFields() { public void validateFields() {
if (!edit) { if (!edit) {
if (! Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language.equals(Global.mainModule.getProject().languageName)) if (!Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language.equals(Global.mainModule.getProject().languageName))
Log.Writeln_("В текущую группу могут войти только тесты на языке " Log.Writeln_("В текущую группу могут войти только тесты на языке "
+ +
Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language); Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language);

View File

@@ -3,7 +3,6 @@ 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.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Group.Group;
@@ -14,15 +13,6 @@ public class TestsForm extends DataSetControlForm<Test> {
public TestsForm(DataSet<?, Test> dataSource_in, JPanel mountPanel_in) { public TestsForm(DataSet<?, Test> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{

View File

@@ -4,7 +4,6 @@ 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 Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.ConfigurationCache;
@@ -17,14 +16,6 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"имя", "имя",

View File

@@ -8,7 +8,6 @@ import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar; import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache; import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -23,14 +22,6 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Автор", "Автор",

View File

@@ -3,7 +3,6 @@ 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.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
@@ -13,15 +12,6 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) { public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{

View File

@@ -7,7 +7,6 @@ import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererProgressBar; import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
@@ -19,14 +18,6 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Тест", "Тест",

View File

@@ -4,7 +4,6 @@ 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 Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.ServerObjectsCache.VisualCaches;
@@ -18,14 +17,6 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"имя", "имя",

View File

@@ -8,7 +8,6 @@ import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar; import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache; import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -23,14 +22,6 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Автор", "Автор",

View File

@@ -3,7 +3,6 @@ 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.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
@@ -13,14 +12,6 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"имя", "имя",

View File

@@ -1,10 +1,8 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI; package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
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.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
@@ -16,14 +14,6 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Проход" "Проход"

View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
@@ -16,14 +15,6 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@Override @Override
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"версия", "версия",

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Visual;
import Common.Visual.UIModule_; import Common.Visual.UIModule_;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileChooser; import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileChooser;
import _VisualDVM.Visual.Windows.ComponentsWindow;
import _VisualDVM.TestingSystem.Common.TestingMenuBar; import _VisualDVM.TestingSystem.Common.TestingMenuBar;
import _VisualDVM.Visual.Interface.DebugWindow; import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.VersionsWindow; import _VisualDVM.Visual.Interface.VersionsWindow;

View File

@@ -135,7 +135,7 @@ public abstract class ComparisonForm<T> {
} }
public abstract Object getDefaultCurrentObject(); public abstract Object getDefaultCurrentObject();
public void ApplyObject() { public void ApplyObject() {
if (getDefaultCurrentObject()!=null) if (getDefaultCurrentObject() != null)
ApplyObject(getDefaultCurrentObject()); ApplyObject(getDefaultCurrentObject());
else UI.Info("Текущий объект для сравнения не назначен!"); else UI.Info("Текущий объект для сравнения не назначен!");
} }

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Visual.Windows; package _VisualDVM.Visual.Windows;
import Common.Database.Objects.DBObject;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton; import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Constants; import _VisualDVM.Constants;

View File

@@ -1,5 +1,4 @@
package _VisualDVM.Visual.Windows; package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.FormWithSplitters; import Common.Visual.FormWithSplitters;
import Common.Visual.TextField.StyledTextField; import Common.Visual.TextField.StyledTextField;
@@ -8,7 +7,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Credentials.Credentials;
import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
@@ -224,13 +222,13 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
@Override @Override
public void ShowCurrentCompiler() { public void ShowCurrentCompiler() {
Compiler compiler = (MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent()); Compiler compiler = (MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent());
String title = (compiler!=null)&& (compiler.type.equals(CompilerType.dvm)) ? String title = (compiler != null) && (compiler.type.equals(CompilerType.dvm)) ?
"DVM система: " + compiler.description : "DVM система: ?"; "DVM система: " + compiler.description : "DVM система: ?";
testingTabs.setTitleAt(0, title); testingTabs.setTitleAt(0, title);
} }
@Override @Override
public void ShowCurrentServerSapfor() { public void ShowCurrentServerSapfor() {
testingTabs.setTitleAt(2, "SAPFOR: " + Global.testingServer.db.serverSapfors.getUI().getCurrent().version); testingTabs.setTitleAt(2, "SAPFOR: " + Global.testingServer.db.serverSapfors.getUI().getCurrent().version);
} }
@Override @Override
public void ShowNoServerSapfor() { public void ShowNoServerSapfor() {