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

no message

Browse Source
This commit is contained in:
02090095
2024-10-20 21:59:39 +03:00
parent 99643aa755
commit fda2940a79
95 changed files with 872 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
.idea/workspace.xml generated
View File

@@ -7,27 +7,101 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.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/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/Compiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/Compiler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironment.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/CompilerOption.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/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/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/DirInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfo.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/Machine/Machine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/Machine.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/Makefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/Makefile.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/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/Module.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/Module.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/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/RunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.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/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/SapforProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.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/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/CompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.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/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/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.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/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/User.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/MassSelectArrays.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/MassSelectArrays.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/DBArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/DBArray.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/MessageWarning.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/MessageWarning.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/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/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/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/SubscriberWorkspace/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Component.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/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/SubscriberWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/Subscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/Subscriber.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/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Group.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/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/DVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/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/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/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/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" afterDir="false" />
</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" />

4
src/Common/Database/Objects/DBObject.java
View File

@@ -56,8 +56,4 @@ public abstract class DBObject implements Selectable, Serializable {
public void SynchronizeFields(DBObject src) { public void SynchronizeFields(DBObject src) {
selected = src.selected; selected = src.selected;
} }
//---------для отображения.
public Object getFieldAt(int coulmnIndex) {
return null;
}
} }

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

@@ -73,6 +73,10 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected String[] getUIColumnNames() { protected String[] getUIColumnNames() {
return new String[]{}; return new String[]{};
} }
//---------для отображения.
protected Object getFieldAt(D object, int coulmnIndex) {
return null;
}
public void SaveColumns() { public void SaveColumns() {
if (MainModule_.instance.getDb() != null) { if (MainModule_.instance.getDb() != null) {
try { try {
@@ -115,14 +119,14 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected Comparator getDefaultComparator() { protected Comparator getDefaultComparator() {
return null; return null;
} }
public boolean isObjectVisible(D object){ public boolean isObjectVisible(D object) {
return ApplyFilters(object); return ApplyFilters(object);
} }
Vector<Object> getVisibleKeys() { Vector<Object> getVisibleKeys() {
Comparator comparator = getDefaultComparator(); Comparator comparator = getDefaultComparator();
Vector<Object> res_keys = new Vector<>(); Vector<Object> res_keys = new Vector<>();
if (comparator == null) { if (comparator == null) {
for (D object: dataSource.Data.values()){ for (D object : dataSource.Data.values()) {
if (isObjectVisible(object)) if (isObjectVisible(object))
res_keys.add(object.getPK()); res_keys.add(object.getPK());
} }
@@ -149,10 +153,10 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
Object key = data.get(rowIndex); Object key = data.get(rowIndex);
if (columnIndex == 0) if (columnIndex == 0)
return key; return key;
DBObject object = dataSource.get((key)); D object = dataSource.get((key));
if ((columnIndex == 1) && hasCheckBox()) if ((columnIndex == 1) && hasCheckBox())
return object.isSelected(); return object.isSelected();
return object.getFieldAt(columnIndex); //dataSource.getFieldAt(object, columnIndex); return getFieldAt(object, columnIndex);
} }
@Override @Override
public boolean isCellEditable(int row, int col) { public boolean isCellEditable(int row, int col) {

46
src/_VisualDVM/Global.java
View File

@@ -172,27 +172,27 @@ public class Global {
public static boolean ValidateComponentsStates() { public static boolean ValidateComponentsStates() {
bad_state = need_update = need_publish = 0; bad_state = need_update = need_publish = 0;
for (Component component : Components.Data.values()) { for (Component component : Components.Data.values()) {
// if (component.isVisible()) { // if (component.isVisible()) {
switch (component.getState()) { switch (component.getState()) {
case Not_found: case Not_found:
case Unknown_version: case Unknown_version:
case Old_version: case Old_version:
if (component.isNecessary()) if (component.isNecessary())
bad_state++; bad_state++;
component.Select(true); component.Select(true);
break; break;
case Needs_update: case Needs_update:
need_update++; need_update++;
component.Select(true); component.Select(true);
break; break;
case Needs_publish: case Needs_publish:
need_publish++; need_publish++;
break; break;
default: default:
component.Select(false); component.Select(false);
break; break;
} }
// } // }
} }
return (bad_state == 0); return (bad_state == 0);
} }
@@ -242,8 +242,8 @@ public class Global {
Components.put(ComponentType.Instruction, new Instruction()); Components.put(ComponentType.Instruction, new Instruction());
//- //-
for (Component component : Components.Data.values()) for (Component component : Components.Data.values())
// if (component.isVisible()) // if (component.isVisible())
component.InitialVersionCheck(); component.InitialVersionCheck();
//- //-
AbstractTokenMakerFactory atmf = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance(); AbstractTokenMakerFactory atmf = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance();
atmf.putMapping("text/FortranSPF", "_VisualDVM.Visual.Syntax.FortranSPFTokenMaker"); atmf.putMapping("text/FortranSPF", "_VisualDVM.Visual.Syntax.FortranSPFTokenMaker");

16
src/_VisualDVM/GlobalData/Compiler/Compiler.java
View File

@@ -1,8 +1,6 @@
package _VisualDVM.GlobalData.Compiler; package _VisualDVM.GlobalData.Compiler;
import Common.Database.Objects.iDBObject; import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironmentsSet; import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironmentsSet;
import _VisualDVM.GlobalData.CompilerOption.CompilerOptionsSet; import _VisualDVM.GlobalData.CompilerOption.CompilerOptionsSet;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
@@ -187,18 +185,4 @@ public class Compiler extends iDBObject {
return "v=" + version + " r=" + revision; return "v=" + version + " r=" + revision;
} }
// //
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return call_command;
case 4:
return version;
case 5:
return revision;
}
return null;
}
} }

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

@@ -49,6 +49,20 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
} }
@Override @Override
public boolean isObjectVisible(Compiler object) { public boolean isObjectVisible(Compiler object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
}
@Override
public Object getFieldAt(Compiler object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.call_command;
case 4:
return object.version;
case 5:
return object.revision;
}
return null;
} }
} }

11
src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironment.java
View File

@@ -73,15 +73,4 @@ public class CompilerEnvironment extends DBObject {
} }
} }
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return value;
case 3:
return description;
default:
return null;
}
}
} }

11
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java
View File

@@ -20,6 +20,17 @@ public class CompilerEnvironmentsForm extends DataSetControlForm<CompilerEnviron
}; };
} }
@Override @Override
public Object getFieldAt(CompilerEnvironment object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.value;
case 3:
return object.description;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(2).setRendererClass(CompilerEnvironmentValueRenderer.class); columns.get(2).setRendererClass(CompilerEnvironmentValueRenderer.class);
columns.get(2).setEditorClass(CompilerEnvironmentValueEditor.class); columns.get(2).setEditorClass(CompilerEnvironmentValueEditor.class);

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

@@ -45,17 +45,4 @@ public class CompilerOption extends DBObject {
} }
return false; return false;
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return parameterName + parameterSeparator;
case 3:
return parameterValue;
case 4:
return description;
default:
return null;
}
}
} }

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

@@ -1,6 +1,7 @@
package _VisualDVM.GlobalData.CompilerOption; package _VisualDVM.GlobalData.CompilerOption;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionsForm;
import javax.swing.*; import javax.swing.*;
public class CompilerOptionsSet extends DataSet<String, CompilerOption> { public class CompilerOptionsSet extends DataSet<String, CompilerOption> {

18
src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsForm.java → src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java
View File

@@ -1,9 +1,8 @@
package _VisualDVM.GlobalData.CompilerOption; package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer; import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
import javax.swing.*; import javax.swing.*;
public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> { public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> {
@@ -23,6 +22,19 @@ public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> {
}; };
} }
@Override @Override
public Object getFieldAt(CompilerOption object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.parameterName + object.parameterSeparator;
case 3:
return object.parameterValue;
case 4:
return object.description;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(2).setRendererClass(CompilerOptionParameterNameRenderer.class); columns.get(2).setRendererClass(CompilerOptionParameterNameRenderer.class);
columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class); columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class);

11
src/_VisualDVM/GlobalData/DVMParameter/DVMParameter.java
View File

@@ -5,14 +5,5 @@ public class DVMParameter extends EnvironmentValue {
public String toString() { public String toString() {
return name + "=" + value + ";"; return name + "=" + value + ";";
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return name;
case 2:
return value;
}
return null;
}
} }

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

@@ -64,8 +64,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
for (DVMParameter par : (Global.mainModule.getDb()).dvmParameters.Data.values()) { for (DVMParameter par : (Global.mainModule.getDb()).dvmParameters.Data.values()) {
if ( if (
Global.mainModule.getDb().dvmParameters.getUI().isObjectVisible(par) Global.mainModule.getDb().dvmParameters.getUI().isObjectVisible(par)
&& (Result.id != par.id) && (par.name.equals(name))) {
&& (Result.id != par.id) && (par.name.equals(name))) {
Log.Writeln("В конфигурации запуска уже задан параметр DVM системы с именем " + Utils_.Brackets(name)); Log.Writeln("В конфигурации запуска уже задан параметр DVM системы с именем " + Utils_.Brackets(name));
break; break;
} }

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

@@ -18,6 +18,16 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
}; };
} }
@Override @Override
public Object getFieldAt(DVMParameter object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name;
case 2:
return object.value;
}
return null;
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
} }

12
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java
View File

@@ -2,8 +2,6 @@ package _VisualDVM.GlobalData.EnvironmentValue;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Database.Objects.iDBObject; import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
public class EnvironmentValue extends iDBObject { public class EnvironmentValue extends iDBObject {
public String name = ""; public String name = "";
public String value = ""; public String value = "";
@@ -13,14 +11,4 @@ public class EnvironmentValue extends iDBObject {
public String toString() { public String toString() {
return name + "=" + Utils_.DQuotes(value); return name + "=" + Utils_.DQuotes(value);
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return name;
case 2:
return value;
}
return null;
}
} }

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

@@ -51,7 +51,7 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
for (EnvironmentValue env : Global.mainModule.getDb().environmentValues.Data.values()) { for (EnvironmentValue env : Global.mainModule.getDb().environmentValues.Data.values()) {
if ( if (
Global.mainModule.getDb().environmentValues.getUI().isObjectVisible(env) Global.mainModule.getDb().environmentValues.getUI().isObjectVisible(env)
&& (Result.id != env.id) && (env.name.equals(name))) { && (Result.id != env.id) && (env.name.equals(name))) {
Log.Writeln("В конфигурации запуска уже задана переменная окружения с именем " + Utils_.Brackets(name)); Log.Writeln("В конфигурации запуска уже задана переменная окружения с именем " + Utils_.Brackets(name));
break; break;
} }

13
src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
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 _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -20,6 +19,16 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
"значение"}; "значение"};
} }
@Override @Override
public Object getFieldAt(EnvironmentValue object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name;
case 2:
return object.value;
}
return null;
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
} }
@@ -33,6 +42,6 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
} }
@Override @Override
public boolean isObjectVisible(EnvironmentValue object) { public boolean isObjectVisible(EnvironmentValue object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id);
} }
} }

9
src/_VisualDVM/GlobalData/FileObject/DirInfo.java
View File

@@ -20,13 +20,4 @@ public class DirInfo extends DBObject {
public File getFile() { public File getFile() {
return dir; return dir;
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return getDate();
default:
return null;
}
}
} }

9
src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java
View File

@@ -15,6 +15,15 @@ public class DirInfosForm extends DataSetControlForm<DirInfo> {
"дата изменения"}; "дата изменения"};
} }
@Override @Override
public Object getFieldAt(DirInfo object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.getDate();
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(1).setRendererClass(RendererDate.class); columns.get(1).setRendererClass(RendererDate.class);
} }

9
src/_VisualDVM/GlobalData/Machine/Machine.java
View File

@@ -63,13 +63,4 @@ public class Machine extends iDBObject {
"--help" "--help"
)); ));
*/ */
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return getURL();
default:
return null;
}
}
} }

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

@@ -60,4 +60,13 @@ public class MachinesForm extends DataSetControlForm<Machine> {
} }
}; };
} }
@Override
public Object getFieldAt(Machine object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getURL();
default:
return null;
}
}
} }

14
src/_VisualDVM/GlobalData/Makefile/Makefile.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.Makefile; package _VisualDVM.GlobalData.Makefile;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common.Utils.Utils_; import Common.Utils.Utils_;
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;
@@ -196,17 +195,4 @@ public class Makefile extends ModuleAnchestor {
} }
} }
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return getCompilerDescription();
case 3:
return command;
case 4:
return flags;
default:
return null;
}
}
} }

16
src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
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 _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -26,6 +25,19 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
}; };
} }
@Override @Override
public Object getFieldAt(Makefile object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getCompilerDescription();
case 3:
return object.command;
case 4:
return object.flags;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
} }
@@ -44,7 +56,7 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
} }
@Override @Override
public boolean isObjectVisible(Makefile object) { public boolean isObjectVisible(Makefile object) {
return super.isObjectVisible(object)&& return super.isObjectVisible(object) &&
MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id); MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
} }
} }

16
src/_VisualDVM/GlobalData/Module/Module.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.Module; package _VisualDVM.GlobalData.Module;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.LanguageName;
@@ -31,19 +30,4 @@ public class Module extends ModuleAnchestor {
Utils_.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
} }
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return language.getDescription();
case 3:
return getCompilerDescription();
case 4:
return command;
case 5:
return flags;
default:
return null;
}
}
} }

19
src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
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 _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Module.Module; import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -27,6 +26,21 @@ public class ModulesForm extends DataSetControlForm<Module> {
}; };
} }
@Override @Override
public Object getFieldAt(Module object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.language.getDescription();
case 3:
return object.getCompilerDescription();
case 4:
return object.command;
case 5:
return object.flags;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
} }
@@ -36,7 +50,6 @@ public class ModulesForm extends DataSetControlForm<Module> {
} }
@Override @Override
public boolean isObjectVisible(Module object) { public boolean isObjectVisible(Module object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id);
} }
} }

22
src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java
View File

@@ -4,7 +4,6 @@ import Common.Database.Objects.iDBObject;
import Common.Passes.PassException; import Common.Passes.PassException;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
@@ -252,25 +251,4 @@ public class RunConfiguration extends iDBObject {
} }
return res; return res;
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return LauncherCall;
case 2:
return LauncherOptions;
case 3:
return dim;
case 4:
return printCube();
case 5:
return minMatrix;
case 6:
return maxMatrix;
case 7:
return args;
default:
return null;
}
}
} }

24
src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
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 _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -26,6 +25,27 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
}; };
} }
@Override @Override
public Object getFieldAt(RunConfiguration object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.LauncherCall;
case 2:
return object.LauncherOptions;
case 3:
return object.dim;
case 4:
return object.printCube();
case 5:
return object.minMatrix;
case 6:
return object.maxMatrix;
case 7:
return object.args;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
} }
@@ -44,6 +64,6 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
} }
@Override @Override
public boolean isObjectVisible(RunConfiguration object) { public boolean isObjectVisible(RunConfiguration object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
} }
} }

13
src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java
View File

@@ -1,22 +1,9 @@
package _VisualDVM.GlobalData.SapforProfile; package _VisualDVM.GlobalData.SapforProfile;
import Common.Database.Objects.iDBObject; import Common.Database.Objects.iDBObject;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
import java.util.Date;
public class SapforProfile extends iDBObject { public class SapforProfile extends iDBObject {
@Description("DEFAULT ''") @Description("DEFAULT ''")
public String description = ""; public String description = "";
@Description("DEFAULT 0") @Description("DEFAULT 0")
public long creationDate = 0; public long creationDate = 0;
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return new Date(creationDate);
default:
return null;
}
}
} }

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

@@ -6,10 +6,10 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfileFields; import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfileFields;
import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfilesForm;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting; import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -29,27 +29,7 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
} }
@Override @Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) { return new SapforProfilesForm(this, mountPanel);
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Описание",
"Дата создания"
};
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SaveProfile,
PassCode.EditProfile,
PassCode.ApplyProfile,
PassCode.DeleteProfile);
}
};
} }
@Override @Override
public Current CurrentName() { public Current CurrentName() {

44
src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java Normal file
View File

@@ -0,0 +1,44 @@
package _VisualDVM.GlobalData.SapforProfile.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.util.Date;
public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
public SapforProfilesForm(DataSet<?, SapforProfile> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Описание",
"Дата создания"
};
}
@Override
public Object getFieldAt(SapforProfile object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return new Date(object.creationDate);
default:
return null;
}
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SaveProfile,
PassCode.EditProfile,
PassCode.ApplyProfile,
PassCode.DeleteProfile);
}
}

13
src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java
View File

@@ -1,8 +1,6 @@
package _VisualDVM.GlobalData.SapforProfileSetting; package _VisualDVM.GlobalData.SapforProfileSetting;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Database.Objects.iDBObject; import Common.Database.Objects.iDBObject;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.GlobalData.Settings.SettingName;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
public class SapforProfileSetting extends iDBObject { public class SapforProfileSetting extends iDBObject {
@@ -12,15 +10,4 @@ public class SapforProfileSetting extends iDBObject {
public String value = ""; public String value = "";
@Description("DEFAULT -1") @Description("DEFAULT -1")
public int sapforprofile_id = CommonConstants.Nan; public int sapforprofile_id = CommonConstants.Nan;
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return name.getDescription();
case 2:
return value;
default:
return null;
}
}
} }

14
src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting; import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import javax.swing.*; import javax.swing.*;
@@ -19,6 +18,17 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
}; };
} }
@Override @Override
public Object getFieldAt(SapforProfileSetting object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name.getDescription();
case 2:
return object.value;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
} }
@@ -28,6 +38,6 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
} }
@Override @Override
public boolean isObjectVisible(SapforProfileSetting object) { public boolean isObjectVisible(SapforProfileSetting object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.SapforProfile, object.sapforprofile_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.SapforProfile, object.sapforprofile_id);
} }
} }

32
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.Tasks.CompilationTask; package _VisualDVM.GlobalData.Tasks.CompilationTask;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module; import _VisualDVM.GlobalData.Module.Module;
@@ -105,35 +104,4 @@ public class CompilationTask extends Task {
return "compilation_task_id"; return "compilation_task_id";
} }
//- //-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return linkerDescription;
case 3:
return linkFlags;
case 4:
return fortranCompilerDescription;
case 5:
return fortranFlags;
case 6:
return cCompilerDescription;
case 7:
return cFlags;
case 8:
return cppCompilerDescription;
case 9:
return cppFlags;
case 10:
return maxtime;
case 11:
return Time;
case 12:
return getEndDate();
case 13:
return state;
default:
return null;
}
}
} }

33
src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
View File

@@ -57,10 +57,41 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
} }
@Override @Override
public boolean isObjectVisible(CompilationTask object) { public boolean isObjectVisible(CompilationTask object) {
return super.isObjectVisible(object)&& return super.isObjectVisible(object) &&
MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
MainModule_.instance.matchCurrentID(Current.User, object.user_id) && MainModule_.instance.matchCurrentID(Current.User, object.user_id) &&
Global.mainModule.HasProject() && Global.mainModule.HasProject() &&
object.belongsToProject(Global.mainModule.getProject()); object.belongsToProject(Global.mainModule.getProject());
} }
@Override
public Object getFieldAt(CompilationTask object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.linkerDescription;
case 3:
return object.linkFlags;
case 4:
return object.fortranCompilerDescription;
case 5:
return object.fortranFlags;
case 6:
return object.cCompilerDescription;
case 7:
return object.cFlags;
case 8:
return object.cppCompilerDescription;
case 9:
return object.cppFlags;
case 10:
return object.maxtime;
case 11:
return object.Time;
case 12:
return object.getEndDate();
case 13:
return object.state;
default:
return null;
}
}
} }

20
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Utils.StringTemplate; import Common.Utils.StringTemplate;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
@@ -147,23 +146,4 @@ public class RunTask extends Task {
!config.getParList().isEmpty() !config.getParList().isEmpty()
; ;
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return matrix;
case 3:
return maxtime;
case 4:
return Time;
case 5:
return CleanTime;
case 6:
return getEndDate();
case 7:
return state;
default:
return null;
}
}
} }

34
src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
View File

@@ -8,7 +8,6 @@ import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.MainModule;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import javax.swing.*; import javax.swing.*;
@@ -31,6 +30,25 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
"Статус"}; "Статус"};
} }
@Override @Override
public Object getFieldAt(RunTask object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.matrix;
case 3:
return object.maxtime;
case 4:
return object.Time;
case 5:
return object.CleanTime;
case 6:
return object.getEndDate();
case 7:
return object.state;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererDate.class); columns.get(6).setRendererClass(RendererDate.class);
columns.get(7).setRendererClass(RendererStatusEnum.class); columns.get(7).setRendererClass(RendererStatusEnum.class);
@@ -51,13 +69,13 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
} }
@Override @Override
public boolean isObjectVisible(RunTask object) { public boolean isObjectVisible(RunTask object) {
return super.isObjectVisible(object)&& return super.isObjectVisible(object) &&
MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
MainModule_.instance.matchCurrentID(Current.User, object.user_id) && MainModule_.instance.matchCurrentID(Current.User, object.user_id) &&
MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id) && MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id) &&
Global.mainModule.HasProject() && Global.mainModule.HasProject() &&
object.belongsToProject(Global.mainModule.getProject()) && object.belongsToProject(Global.mainModule.getProject()) &&
Global.mainModule.HasCompilationTask() && Global.mainModule.HasCompilationTask() &&
object.compilation_task_id == Global.mainModule.getCompilationTask().id; object.compilation_task_id == Global.mainModule.getCompilationTask().id;
} }
} }

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

@@ -25,6 +25,17 @@ public class UsersForm extends DataSetControlForm<User> {
"Статус"}; "Статус"};
} }
@Override @Override
public Object getFieldAt(User object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.login;
case 3:
return object.state;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
columns.get(3).setRendererClass(RendererStatusEnum.class); columns.get(3).setRendererClass(RendererStatusEnum.class);
@@ -47,9 +58,8 @@ public class UsersForm extends DataSetControlForm<User> {
PassCode.InitialiseUser, PassCode.InitialiseUser,
PassCode.DeleteUser); PassCode.DeleteUser);
} }
@Override @Override
public boolean isObjectVisible(User object) { public boolean isObjectVisible(User object) {
return super.isObjectVisible(object)&&super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id); return super.isObjectVisible(object) && super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
} }
} }

14
src/_VisualDVM/GlobalData/User/User.java
View File

@@ -1,9 +1,6 @@
package _VisualDVM.GlobalData.User; package _VisualDVM.GlobalData.User;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Database.Objects.iDBObject; import Common.Database.Objects.iDBObject;
import Common.MainModule_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.TestingSystem.DVM.UserConnection; import _VisualDVM.TestingSystem.DVM.UserConnection;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
@@ -70,15 +67,4 @@ public class User extends iDBObject {
return Paths.get(workspace, "modules", "launcher").toFile(); return Paths.get(workspace, "modules", "launcher").toFile();
} }
//- //-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return login;
case 3:
return state;
default:
return null;
}
}
} }

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

@@ -22,7 +22,7 @@ public class GetComponentsActualVersions extends ComponentsRepositoryPass {
Vector<String> versions = new Vector<>(); Vector<String> versions = new Vector<>();
for (Component component : Global.Components.Data.values()) for (Component component : Global.Components.Data.values())
//if (component.isVisible()) //if (component.isVisible())
versions.add(component.getComponentType().toString()); versions.add(component.getComponentType().toString());
Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsVersions, String.join("\n", versions))); Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsVersions, String.join("\n", versions)));
LinkedHashMap<ComponentType, String> response_actual_versions = (LinkedHashMap<ComponentType, String>) response.object; LinkedHashMap<ComponentType, String> response_actual_versions = (LinkedHashMap<ComponentType, String>) response.object;
for (ComponentType componentType : response_actual_versions.keySet()) { for (ComponentType componentType : response_actual_versions.keySet()) {

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

@@ -61,8 +61,6 @@ public class MassSelectArrays extends SapforModification {
//-- //--
for (ProjectArray array : arrays) { for (ProjectArray array : arrays) {
if ( if (
Global.mainModule.getProject().declaratedArrays.getUI().isObjectVisible(array) && array.isSelectionEnabled()) { Global.mainModule.getProject().declaratedArrays.getUI().isObjectVisible(array) && array.isSelectionEnabled()) {
array.State = new_state; array.State = new_state;
array.SaveUserState(); array.SaveUserState();

11
src/_VisualDVM/ProjectData/DBArray/DBArray.java
View File

@@ -25,15 +25,4 @@ public class DBArray extends DBObject {
public ImageIcon GetSelectionIcon() { public ImageIcon GetSelectionIcon() {
return State.GetIcon(); return State.GetIcon();
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return State;
case 2:
return shortName;
default:
return null;
}
}
} }

11
src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
View File

@@ -14,6 +14,17 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
return new String[]{"Имя"}; return new String[]{"Имя"};
} }
@Override @Override
public Object getFieldAt(DBArray object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.State;
case 2:
return object.shortName;
default:
return null;
}
}
@Override
public boolean hasCheckBox() { public boolean hasCheckBox() {
return true; return true;
} }

14
src/_VisualDVM/ProjectData/Messages/Message.java
View File

@@ -443,18 +443,4 @@ public class Message extends FileObject {
break; break;
} }
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return group_s;
case 2:
return line;
case 3:
return value;
default:
return null;
}
}
} }

31
src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
View File

@@ -18,6 +18,19 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
"текст"}; "текст"};
} }
@Override @Override
public Object getFieldAt(Message object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.group_s;
case 2:
return object.line;
case 3:
return object.value;
default:
return null;
}
}
@Override
public void ShowCurrentObject() throws Exception { public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject(); super.ShowCurrentObject();
Global.mainModule.getFile().form.getEditor().gotoLine(((Message) dataSource.getCurrent()).line); Global.mainModule.getFile().form.getEditor().gotoLine(((Message) dataSource.getCurrent()).line);
@@ -32,17 +45,17 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
public void MouseAction2() throws Exception { public void MouseAction2() throws Exception {
ShowCurrentObject(); ShowCurrentObject();
} }
/* /*
@Override @Override
protected void createFilters() { protected void createFilters() {
super.createFilters(); super.createFilters();
headersTextFilters.put(3, new HeaderTextFilter(dataSource, 3)); headersTextFilters.put(3, new HeaderTextFilter(dataSource, 3));
} }
*/ */
@Override @Override
protected Comparator<Message> getDefaultComparator() { protected Comparator<Message> getDefaultComparator() {
return Comparator.comparingInt(o -> o.line); return Comparator.comparingInt(o -> o.line);
} }
@Override @Override
public boolean hasMenuBar() { public boolean hasMenuBar() {
return false; return false;

1
src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import javax.swing.*; import javax.swing.*;
import java.util.Comparator;
//https://stackoverflow.com/questions/2026965/can-i-add-a-button-to-a-jtable-column-header //https://stackoverflow.com/questions/2026965/can-i-add-a-button-to-a-jtable-column-header
//https://stackoverflow.com/questions/7137786/how-can-i-put-a-control-in-the-jtableheader-of-a-jtable/29963916#29963916 //https://stackoverflow.com/questions/7137786/how-can-i-put-a-control-in-the-jtableheader-of-a-jtable/29963916#29963916
//https://stackoverflow.com/questions/7137786/how-can-i-put-a-control-in-the-jtableheader-of-a-jtable ->> //https://stackoverflow.com/questions/7137786/how-can-i-put-a-control-in-the-jtableheader-of-a-jtable ->>

9
src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java
View File

@@ -41,13 +41,4 @@ public class MessageRecommendation extends iDBObject {
argName.equals(recommendation_in.argName) && argName.equals(recommendation_in.argName) &&
argValue.equals(recommendation_in.argValue); argValue.equals(recommendation_in.argValue);
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return text;
default:
return null;
}
}
} }

9
src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java
View File

@@ -14,6 +14,15 @@ public class RecommendationsForm extends DataSetControlForm<MessageRecommendatio
return new String[]{"текст"}; return new String[]{"текст"};
} }
@Override @Override
public Object getFieldAt(MessageRecommendation object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.text;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
columns.get(1).setMinWidth(700); columns.get(1).setMinWidth(700);

1
src/_VisualDVM/ProjectData/Messages/Warnings/MessageWarning.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.ProjectData.Messages.Warnings; package _VisualDVM.ProjectData.Messages.Warnings;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Messages.Message; import _VisualDVM.ProjectData.Messages.Message;
public class MessageWarning extends Message { public class MessageWarning extends Message {
public static String filterValue = ""; public static String filterValue = "";

22
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -385,26 +385,4 @@ public class ProjectArray extends DBObject {
public boolean canBeDistributed() { public boolean canBeDistributed() {
return (isLoopArrayFlag == 0) && (isTemplFlag == 0); return (isLoopArrayFlag == 0) && (isTemplFlag == 0);
} }
//----
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return State;
case 2:
return GetShortNameWithDim();
case 3:
return locName + " : " + location;
case 4:
return GetDeclPlacesList();
case 5:
return dimSize;
case 6:
return typeSize;
case 7:
return GetRegionsText();
default:
return null;
}
}
} }

21
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
View File

@@ -51,4 +51,25 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
} }
return false; return false;
} }
@Override
public Object getFieldAt(ProjectArray object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.State;
case 2:
return object.GetShortNameWithDim();
case 3:
return object.locName + " : " + object.location;
case 4:
return object.GetDeclPlacesList();
case 5:
return object.dimSize;
case 6:
return object.typeSize;
case 7:
return object.GetRegionsText();
default:
return null;
}
}
} }

21
src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
View File

@@ -143,25 +143,4 @@ public class ParallelRegion extends DBObject {
} else if (new_array.isLoopArrayFlag != 1) arrays_count++; } else if (new_array.isLoopArrayFlag != 1) arrays_count++;
*/ */
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return originalName;
case 2:
return lines_count;
case 3:
return arrays_count;
case 4:
return loops_count;
case 5:
return fd_count;
case 6:
return fc_count;
case 7:
return fragments;
default:
return null;
}
}
} }

21
src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
View File

@@ -22,6 +22,27 @@ public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
"Фрагменты"}; "Фрагменты"};
} }
@Override @Override
public Object getFieldAt(ParallelRegion object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.originalName;
case 2:
return object.lines_count;
case 3:
return object.arrays_count;
case 4:
return object.loops_count;
case 5:
return object.fd_count;
case 6:
return object.fc_count;
case 7:
return object.fragments;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
for (int i = 1; i < 7; ++i) for (int i = 1; i < 7; ++i)

31
src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java
View File

@@ -91,35 +91,4 @@ public class ParallelVariant extends DBObject {
return project; return project;
} }
//- //-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return templates_description;
case 3:
return stats.ParallelCount;
case 4:
return stats.RemoteCount;
case 5:
return stats.RedistributeCount;
case 6:
return stats.IntervalCount;
case 7:
return stats.PS_RemoteCount;
case 8:
return stats.PS_ShadowCount;
case 9:
return stats.PS_ReductionCount;
case 10:
return stats.PS_AcrossCount;
case 11:
return stats.Rank;
case 12:
return stats.getPredictionDate();
case 13:
return stats.last_version;
default:
return null;
}
}
} }

31
src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
View File

@@ -34,6 +34,37 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
"Версия"}; "Версия"};
} }
@Override @Override
public Object getFieldAt(ParallelVariant object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.templates_description;
case 3:
return object.stats.ParallelCount;
case 4:
return object.stats.RemoteCount;
case 5:
return object.stats.RedistributeCount;
case 6:
return object.stats.IntervalCount;
case 7:
return object.stats.PS_RemoteCount;
case 8:
return object.stats.PS_ShadowCount;
case 9:
return object.stats.PS_ReductionCount;
case 10:
return object.stats.PS_AcrossCount;
case 11:
return object.stats.Rank;
case 12:
return object.stats.getPredictionDate();
case 13:
return object.stats.last_version;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
columns.get(2).setRendererClass(RendererMultiline.class); columns.get(2).setRendererClass(RendererMultiline.class);

25
src/_VisualDVM/Repository/BugReport/BugReport.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Repository.BugReport;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Objects.rDBObject; import Common.Database.Objects.rDBObject;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.Component.ComponentType; import _VisualDVM.Repository.Component.ComponentType;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
@@ -69,28 +68,4 @@ public class BugReport extends rDBObject {
commentAdditionDraft = b.commentAdditionDraft; commentAdditionDraft = b.commentAdditionDraft;
owner = b.owner; owner = b.owner;
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
//todo выкинуть этот интерфейс. бессмысленный
return BugReportInterface.getDescriptionHeader(this);
case 2:
return sender_name;
case 3:
return executor;
case 4:
return project_version;
case 5:
return percentage;
case 6:
return getDate();
case 7:
return getChangeDate();
case 8:
return state;
default:
return null;
}
}
} }

1
src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
View File

@@ -7,7 +7,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.UI.BugReportsForm; import _VisualDVM.Repository.BugReport.UI.BugReportsForm;
import javax.swing.*; import javax.swing.*;
import java.util.Comparator;
import java.util.Vector; import java.util.Vector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class BugReportsDBTable extends DBTable<String, BugReport> { public class BugReportsDBTable extends DBTable<String, BugReport> {

26
src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
View File

@@ -84,6 +84,30 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
} }
@Override @Override
public boolean isObjectVisible(BugReport object) { public boolean isObjectVisible(BugReport object) {
return super.isObjectVisible(object)&&BugReportInterface.isVisible(object); return super.isObjectVisible(object) && BugReportInterface.isVisible(object);
}
@Override
public Object getFieldAt(BugReport object, int columnIndex) {
switch (columnIndex) {
case 1:
//todo выкинуть этот интерфейс. бессмысленный
return BugReportInterface.getDescriptionHeader(object);
case 2:
return object.sender_name;
case 3:
return object.executor;
case 4:
return object.project_version;
case 5:
return object.percentage;
case 6:
return object.getDate();
case 7:
return object.getChangeDate();
case 8:
return object.state;
default:
return null;
}
} }
} }

17
src/_VisualDVM/Repository/Component/Component.java
View File

@@ -132,21 +132,4 @@ public abstract class Component extends DBObject implements Loggable {
public boolean isNecessary() { public boolean isNecessary() {
return true; return true;
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return getComponentType().getDescription();
case 3:
return version;
case 4:
return actual_version;
case 5:
return date_text;
case 6:
return getState();
default:
return null;
}
}
} }

17
src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
View File

@@ -30,6 +30,23 @@ public class ComponentsForm extends DataSetControlForm<Component> {
"Статус"}; "Статус"};
} }
@Override @Override
public Object getFieldAt(Component object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getComponentType().getDescription();
case 3:
return object.version;
case 4:
return object.actual_version;
case 5:
return object.date_text;
case 6:
return object.getState();
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(0).setVisible(false); columns.get(0).setVisible(false);
columns.get(3).setRendererClass(RendererMaskedNanInteger.class); columns.get(3).setRendererClass(RendererMaskedNanInteger.class);

13
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java
View File

@@ -1,22 +1,9 @@
package _VisualDVM.Repository.SubscriberWorkspace; package _VisualDVM.Repository.SubscriberWorkspace;
import Common.Database.Objects.iDBObject; import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
public class SubscriberWorkspace extends iDBObject { public class SubscriberWorkspace extends iDBObject {
public String email; //почта public String email; //почта
public String URL; //адрес:порт машины public String URL; //адрес:порт машины
public String login; // имя пользователя public String login; // имя пользователя
public String path; //рабочая папка на машине public String path; //рабочая папка на машине
//- //-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return URL;
case 2:
return login;
case 3:
return path;
}
return null;
}
} }

3
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
View File

@@ -2,10 +2,9 @@ package _VisualDVM.Repository.SubscriberWorkspace;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.UI.SubscriberWorkspacesForm;
import javax.swing.*; import javax.swing.*;
public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> { public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {

17
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesForm.java → src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
View File

@@ -1,9 +1,10 @@
package _VisualDVM.Repository.SubscriberWorkspace; package _VisualDVM.Repository.SubscriberWorkspace.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.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import javax.swing.*; import javax.swing.*;
public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> { public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {
@@ -18,12 +19,24 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
"папка"}; "папка"};
} }
@Override @Override
public Object getFieldAt(SubscriberWorkspace object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.URL;
case 2:
return object.login;
case 3:
return object.path;
}
return null;
}
@Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteSubscriberWorkspace); return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
} }
@Override @Override
public boolean isObjectVisible(SubscriberWorkspace object) { public boolean isObjectVisible(SubscriberWorkspace object) {
return super.isObjectVisible(object)&&Global.mainModule.HasSubscriber() && Global.mainModule.getSubscriber().address.equals(object.email) && return super.isObjectVisible(object) && Global.mainModule.HasSubscriber() && Global.mainModule.getSubscriber().address.equals(object.email) &&
(Global.mainModule.getAccount().isAdmin() || Global.mainModule.getAccount().email.equals(Global.mainModule.getSubscriber().address)); (Global.mainModule.getAccount().isAdmin() || Global.mainModule.getAccount().email.equals(Global.mainModule.getSubscriber().address));
} }
} }

12
src/_VisualDVM/Repository/Subscribes/Subscriber.java
View File

@@ -36,16 +36,4 @@ public class Subscriber extends DBObject {
public Object getEmptyFK() { public Object getEmptyFK() {
return ""; return "";
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return name;
case 3:
return role.getDescription();
case 4:
return (mailOn == 0) ? "выключена" : "включена";
}
return name;
}
} }

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

@@ -24,6 +24,18 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
"Рассылка"}; "Рассылка"};
} }
@Override @Override
public Object getFieldAt(Subscriber object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.name;
case 3:
return object.role.getDescription();
case 4:
return (object.mailOn == 0) ? "выключена" : "включена";
}
return object.name;
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
boolean admin = Global.mainModule.getAccount().role.equals(AccountRole.Admin); boolean admin = Global.mainModule.getAccount().role.equals(AccountRole.Admin);
columns.get(0).setVisible(admin); columns.get(0).setVisible(admin);

15
src/_VisualDVM/TestingSystem/Common/Group/Group.java
View File

@@ -106,19 +106,4 @@ public class Group extends riDBObject {
"\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary, "\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary,
String.join(" ", bodies)); String.join(" ", bodies));
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return sender_name;
case 4:
return type.getDescription();
case 5:
return language.getDescription();
default:
return null;
}
}
} }

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

@@ -5,20 +5,12 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour; import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI; import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.UI.AddGroupMenu;
import _VisualDVM.TestingSystem.Common.Group.UI.EditGroupMenu;
import _VisualDVM.TestingSystem.Common.Group.UI.GroupFields; import _VisualDVM.TestingSystem.Common.Group.UI.GroupFields;
import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm; import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.Test.Test;

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

@@ -32,8 +32,23 @@ public class GroupsForm extends DataSetControlForm<Group> {
}; };
} }
@Override @Override
public Object getFieldAt(Group object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.sender_name;
case 4:
return object.type.getDescription();
case 5:
return object.language.getDescription();
default:
return null;
}
}
@Override
public boolean isObjectVisible(Group object) { public boolean isObjectVisible(Group object) {
return super.isObjectVisible(object)&& return super.isObjectVisible(object) &&
(!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) && (!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
Global.testingServer.db.groups.getUI().ApplyFilters(object); Global.testingServer.db.groups.getUI().ApplyFilters(object);
} }

16
src/_VisualDVM/TestingSystem/Common/Test/Test.java
View File

@@ -5,7 +5,6 @@ import Common.Database.Objects.riDBObject;
import Common.Database.RepositoryRefuseException; import Common.Database.RepositoryRefuseException;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.UI; import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.All.UnzipFolderPass; import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.Passes.All.ZipFolderPass; import _VisualDVM.Passes.All.ZipFolderPass;
@@ -127,19 +126,4 @@ public class Test extends riDBObject {
return res; return res;
} }
//- //-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return min_dim;
case 4:
return max_dim;
case 5:
return getFilesForTable();
default:
return null;
}
}
} }

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

@@ -1,16 +1,12 @@
package _VisualDVM.TestingSystem.Common.Test; package _VisualDVM.TestingSystem.Common.Test;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.MainModule_;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.UI.AddTestMenu;
import _VisualDVM.TestingSystem.Common.Test.UI.EditTestMenu;
import _VisualDVM.TestingSystem.Common.Test.UI.TestFields; import _VisualDVM.TestingSystem.Common.Test.UI.TestFields;
import _VisualDVM.TestingSystem.Common.Test.UI.TestsForm; import _VisualDVM.TestingSystem.Common.Test.UI.TestsForm;
@@ -31,7 +27,6 @@ public class TestDBTable extends iDBTable<Test> {
@Override @Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new TestsForm(this, mountPanel); return new TestsForm(this, mountPanel);
} }
@Override @Override
public Current CurrentName() { public Current CurrentName() {

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

@@ -26,6 +26,21 @@ public class TestsForm extends DataSetControlForm<Test> {
}; };
} }
@Override @Override
public Object getFieldAt(Test object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.min_dim;
case 4:
return object.max_dim;
case 5:
return object.getFilesForTable();
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
} }
@Override @Override
@@ -39,7 +54,7 @@ public class TestsForm extends DataSetControlForm<Test> {
} }
@Override @Override
public boolean isObjectVisible(Test object) { public boolean isObjectVisible(Test object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Group, object.group_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Group, object.group_id);
} }
}; };

26
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java
View File

@@ -1,7 +1,5 @@
package _VisualDVM.TestingSystem.DVM.DVMConfiguration; package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration; import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
//конфгурация тестирования ДВМ //конфгурация тестирования ДВМ
public class DVMConfiguration extends Configuration { public class DVMConfiguration extends Configuration {
@@ -17,28 +15,4 @@ public class DVMConfiguration extends Configuration {
DVMConfiguration c = (DVMConfiguration) src; DVMConfiguration c = (DVMConfiguration) src;
c_maxtime = c.c_maxtime; c_maxtime = c.c_maxtime;
} }
@Override
public Object getFieldAt(int columnIndex) {
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(this);
switch (columnIndex) {
case 2:
return description;
case 3:
return sender_name;
case 4:
return kernels;
case 5:
return cache.settingsSummary;
case 6:
return cache.groupsSummary;
case 7:
return cache.getTestsCount();
case 8:
return c_maxtime;
case 9:
return maxtime;
default:
return null;
}
}
} }

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

@@ -4,6 +4,8 @@ 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 _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import javax.swing.*; import javax.swing.*;
@@ -29,6 +31,30 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
}; };
} }
@Override @Override
public Object getFieldAt(DVMConfiguration object, int columnIndex) {
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(object);
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.sender_name;
case 4:
return object.kernels;
case 5:
return cache.settingsSummary;
case 6:
return cache.groupsSummary;
case 7:
return cache.getTestsCount();
case 8:
return object.c_maxtime;
case 9:
return object.maxtime;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererMultiline.class); columns.get(6).setRendererClass(RendererMultiline.class);
columns.get(6).setMaxWidth(500); columns.get(6).setMaxWidth(500);

32
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
View File

@@ -8,7 +8,6 @@ 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;
import _VisualDVM.ServerObjectsCache.DVMConfigurationCache; import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.TasksPackageState; import _VisualDVM.TestingSystem.Common.TasksPackageState;
@@ -19,7 +18,6 @@ import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import java.io.File; import java.io.File;
import java.util.Date;
import java.util.Vector; import java.util.Vector;
public class DVMPackage extends TestingPackage<DVMPackage_json> { public class DVMPackage extends TestingPackage<DVMPackage_json> {
//--- //---
@@ -112,35 +110,5 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
@Override @Override
public void checkFinishState() throws Exception { public void checkFinishState() throws Exception {
} }
@Override
public Object getFieldAt(int columnIndex) {
PackageCache cache = (PackageCache) VisualCaches.GetCache(this);
switch (columnIndex) {
case 2:
return sender_name;
case 3:
return machine_address + ":" + machine_port;
case 4:
return user_name;
case 5:
return version;
case 6:
return cache.getConfigurationsDescriptions();
case 7:
return tasksCount;
case 8:
return kernels;
case 9:
return progress;
case 10:
return new Date(StartDate);
case 11:
return new Date(ChangeDate);
case 12:
return state;
default:
return null;
}
}
} }

2
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -7,7 +7,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm; import _VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm;
import javax.swing.*; import javax.swing.*;
import java.util.Comparator;
public class DVMPackageDBTable extends iDBTable<DVMPackage> { public class DVMPackageDBTable extends iDBTable<DVMPackage> {
public static boolean filterMyOnly = false; public static boolean filterMyOnly = false;
public static boolean filterActive = false; public static boolean filterActive = false;
@@ -30,7 +29,6 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMPackagesForm(this, mountPanel); return new DVMPackagesForm(this, mountPanel);
} }
@Override @Override
public PassCode_ getDeletePassCode() { public PassCode_ getDeletePassCode() {
return PassCode.DeleteDVMPackage; return PassCode.DeleteDVMPackage;

35
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
View File

@@ -10,11 +10,14 @@ import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import javax.swing.*; import javax.swing.*;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date;
public class DVMPackagesForm extends DataSetControlForm<DVMPackage> { public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) { public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
@@ -40,6 +43,36 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
}; };
} }
@Override @Override
public Object getFieldAt(DVMPackage object, int columnIndex) {
PackageCache cache = (PackageCache) VisualCaches.GetCache(object);
switch (columnIndex) {
case 2:
return object.sender_name;
case 3:
return object.machine_address + ":" + object.machine_port;
case 4:
return object.user_name;
case 5:
return object.version;
case 6:
return cache.getConfigurationsDescriptions();
case 7:
return object.tasksCount;
case 8:
return object.kernels;
case 9:
return object.progress;
case 10:
return new Date(object.StartDate);
case 11:
return new Date(object.ChangeDate);
case 12:
return object.state;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(6).setRendererClass(RendererMultiline.class); columns.get(6).setRendererClass(RendererMultiline.class);
columns.get(9).setRendererClass(RendererProgressBar.class); columns.get(9).setRendererClass(RendererProgressBar.class);
@@ -121,7 +154,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
} }
@Override @Override
public boolean isObjectVisible(DVMPackage object) { public boolean isObjectVisible(DVMPackage object) {
return super.isObjectVisible(object)&&(!DVMPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) && return super.isObjectVisible(object) && (!DVMPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
(!DVMPackageDBTable.filterActive || object.state.isActive()); (!DVMPackageDBTable.filterActive || object.state.isActive());
} }
} }

25
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java
View File

@@ -84,30 +84,5 @@ public class DVMSettings extends Settings {
public String getParamsText() { public String getParamsText() {
return "Is_DVM_STAT=" + Is_DVM_STAT; return "Is_DVM_STAT=" + Is_DVM_STAT;
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return sender_name;
case 4:
return flags;
case 5:
return environments;
case 6:
return printUsrPar();
case 7:
return cube;
case 8:
return max_proc_count;
case 9:
return min_dim_proc_count;
case 10:
return max_dim_proc_count;
default:
return null;
}
}
} }

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

@@ -3,12 +3,12 @@ import Common.Database.Objects.DBObject;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields; import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsForm;
import javax.swing.*; import javax.swing.*;
public class DVMSettingsDBTable extends iDBTable<DVMSettings> { public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
@@ -31,34 +31,7 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
//- //-
@Override @Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) { return new DVMSettingsForm(this, mountPanel);
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"автор",
"флаги",
"окружение",
"usr.par",
"куб",
"max",
"min dim",
"max dim"
};
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings);
}
};
} }
@Override @Override
public DBObjectDialog<DVMSettings, DVMSettingsFields> getDialog() { public DBObjectDialog<DVMSettings, DVMSettingsFields> getDialog() {

64
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java Normal file
View File

@@ -0,0 +1,64 @@
package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import javax.swing.*;
public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"автор",
"флаги",
"окружение",
"usr.par",
"куб",
"max",
"min dim",
"max dim"
};
}
@Override
public Object getFieldAt(DVMSettings object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.sender_name;
case 4:
return object.flags;
case 5:
return object.environments;
case 6:
return object.printUsrPar();
case 7:
return object.cube;
case 8:
return object.max_proc_count;
case 9:
return object.min_dim_proc_count;
case 10:
return object.max_dim_proc_count;
default:
return null;
}
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings);
}
}

31
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java
View File

@@ -128,36 +128,5 @@ public class DVMRunTask extends DVMTask {
public String getStatistic() { public String getStatistic() {
return getResultFile(new File(getLocalWorkspace(), Constants.statistic + ".txt")); return getResultFile(new File(getLocalWorkspace(), Constants.statistic + ".txt"));
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return test_description;
case 3:
return language;
case 4:
return flags;
case 5:
return compilation_state;
case 6:
return state;
case 7:
return matrix;
case 8:
return getEnvironments();
case 9:
return getUsrPar();
case 10:
return compilation_time;
case 11:
return Time;
case 12:
return CleanTime;
case 13:
return progress;
default:
return null;
}
}
} }
//-- //--

2
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksForm; import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksForm;
import javax.swing.*; import javax.swing.*;
import java.util.Comparator;
public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> { public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
//todo обобщить бы наличие фильтров для всех таблиц. //todo обобщить бы наличие фильтров для всех таблиц.
DVMPackage target; DVMPackage target;
@@ -56,5 +55,4 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
Data.clear(); Data.clear();
target = null; target = null;
} }
} }

33
src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
View File

@@ -39,6 +39,37 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
}; };
} }
@Override @Override
public Object getFieldAt(DVMRunTask object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.test_description;
case 3:
return object.language;
case 4:
return object.flags;
case 5:
return object.compilation_state;
case 6:
return object.state;
case 7:
return object.matrix;
case 8:
return object.getEnvironments();
case 9:
return object.getUsrPar();
case 10:
return object.compilation_time;
case 11:
return object.Time;
case 12:
return object.CleanTime;
case 13:
return object.progress;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(5).setRendererClass(RendererStatusEnum.class); columns.get(5).setRendererClass(RendererStatusEnum.class);
columns.get(6).setRendererClass(RendererStatusEnum.class); columns.get(6).setRendererClass(RendererStatusEnum.class);
@@ -92,6 +123,6 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
} }
@Override @Override
public boolean isObjectVisible(DVMRunTask object) { public boolean isObjectVisible(DVMRunTask object) {
return super.isObjectVisible(object)&&Global.testingServer.db.dvmRunTasks.getUI().ApplyFilters(object); return super.isObjectVisible(object) && Global.testingServer.db.dvmRunTasks.getUI().ApplyFilters(object);
} }
} }

23
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration; package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache; import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration; import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
@@ -42,26 +41,4 @@ public class SapforConfiguration extends Configuration {
//- //-
return Log.isEmpty(); return Log.isEmpty();
} }
@Override
public Object getFieldAt(int columnIndex) {
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(this);
switch (columnIndex) {
case 2:
return description;
case 3:
return sender_name;
case 4:
return printAuto();
case 5:
return kernels;
case 6:
return cache.settingsSummary;
case 7:
return cache.groupsSummary;
case 8:
return cache.getTestsCount();
default:
return null;
}
}
} }

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

@@ -4,6 +4,8 @@ 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 _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.Visual.Tables.RendererConfigurationAuto; import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto; import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
@@ -30,6 +32,28 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
}; };
} }
@Override @Override
public Object getFieldAt(SapforConfiguration object, int columnIndex) {
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(object);
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.sender_name;
case 4:
return object.printAuto();
case 5:
return object.kernels;
case 6:
return cache.settingsSummary;
case 7:
return cache.groupsSummary;
case 8:
return cache.getTestsCount();
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(4).setRendererClass(RendererConfigurationAuto.class); columns.get(4).setRendererClass(RendererConfigurationAuto.class);
columns.get(4).setEditorClass(SwitcherConfigurationAuto.class); columns.get(4).setEditorClass(SwitcherConfigurationAuto.class);

28
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
View File

@@ -7,7 +7,6 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.Account; import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.TasksPackageState; import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -18,7 +17,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import java.io.File; import java.io.File;
import java.util.Date;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Vector; import java.util.Vector;
public class SapforPackage extends TestingPackage<SapforPackage_json> { public class SapforPackage extends TestingPackage<SapforPackage_json> {
@@ -114,30 +112,4 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
description = "Выполнено на " + ((int) percent) + "%\n" + description = "Выполнено на " + ((int) percent) + "%\n" +
"Всего задач: " + tasksCount + ", из них с ошибками " + bad; "Всего задач: " + tasksCount + ", из них с ошибками " + bad;
} }
@Override
public Object getFieldAt(int columnIndex) {
PackageCache cache = (PackageCache) VisualCaches.GetCache(this);
switch (columnIndex) {
case 2:
return sender_name;
case 3:
return version;
case 4:
return cache.getConfigurationsDescriptions();
case 5:
return tasksCount;
case 6:
return kernels;
case 7:
return progress;
case 8:
return new Date(StartDate);
case 9:
return new Date(ChangeDate);
case 10:
return state;
default:
return null;
}
}
} }

1
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -7,7 +7,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm;
import javax.swing.*; import javax.swing.*;
import java.util.Comparator;
public class SapforPackageDBTable extends iDBTable<SapforPackage> { public class SapforPackageDBTable extends iDBTable<SapforPackage> {
public static boolean filterMyOnly = false; public static boolean filterMyOnly = false;
public static boolean filterActive = false; public static boolean filterActive = false;

31
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
View File

@@ -10,11 +10,14 @@ import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import javax.swing.*; import javax.swing.*;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date;
public class SapforPackagesForm extends DataSetControlForm<SapforPackage> { public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) { public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
@@ -38,6 +41,32 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
}; };
} }
@Override @Override
public Object getFieldAt(SapforPackage object, int columnIndex) {
PackageCache cache = (PackageCache) VisualCaches.GetCache(object);
switch (columnIndex) {
case 2:
return object.sender_name;
case 3:
return object.version;
case 4:
return cache.getConfigurationsDescriptions();
case 5:
return object.tasksCount;
case 6:
return object.kernels;
case 7:
return object.progress;
case 8:
return new Date(object.StartDate);
case 9:
return new Date(object.ChangeDate);
case 10:
return object.state;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(4).setRendererClass(RendererMultiline.class); columns.get(4).setRendererClass(RendererMultiline.class);
columns.get(7).setRendererClass(RendererProgressBar.class); columns.get(7).setRendererClass(RendererProgressBar.class);
@@ -104,7 +133,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
} }
@Override @Override
public boolean isObjectVisible(SapforPackage object) { public boolean isObjectVisible(SapforPackage object) {
return super.isObjectVisible(object)&& return super.isObjectVisible(object) &&
(!SapforPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) && (!SapforPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
(!SapforPackageDBTable.filterActive || object.state.isActive()); (!SapforPackageDBTable.filterActive || object.state.isActive());
} }

13
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
View File

@@ -102,17 +102,4 @@ public class SapforSettings extends Settings {
//- //-
return res; return res;
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return description;
case 3:
return sender_name;
case 4:
return flags;
default:
return null;
}
}
} }

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

@@ -7,11 +7,11 @@ import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsFields; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsFields;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsForm;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand; import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import javax.swing.*; import javax.swing.*;
@@ -34,28 +34,7 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
} }
@Override @Override
protected DataSetControlForm createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) { return new SapforSettingsForm(this, mountPanel);
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"автор",
"флаги"
};
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforSettings,
PassCode.CloneSapforSettings,
PassCode.EditSapforSettings,
PassCode.DeleteSapforSettings);
}
};
} }
//- //-
@Override @Override

46
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java Normal file
View File

@@ -0,0 +1,46 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import javax.swing.*;
public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
public SapforSettingsForm(DataSet<?, SapforSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"автор",
"флаги"
};
}
@Override
public Object getFieldAt(SapforSettings object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
case 3:
return object.sender_name;
case 4:
return object.flags;
default:
return null;
}
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishSapforSettings,
PassCode.CloneSapforSettings,
PassCode.EditSapforSettings,
PassCode.DeleteSapforSettings);
}
}

12
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java
View File

@@ -2,9 +2,6 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject; import Common.Database.Objects.riDBObject;
import Common.MainModule_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
public class SapforSettingsCommand extends riDBObject { public class SapforSettingsCommand extends riDBObject {
@@ -23,13 +20,4 @@ public class SapforSettingsCommand extends riDBObject {
sapforsettings_id = c.sapforsettings_id; sapforsettings_id = c.sapforsettings_id;
passCode = c.passCode; passCode = c.passCode;
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return passCode.getDescription();
default:
return null;
}
}
} }

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

@@ -1,9 +1,7 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand; package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.MainModule_;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI; import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current; import _VisualDVM.Current;

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

@@ -23,15 +23,23 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
}; };
} }
@Override @Override
public Object getFieldAt(SapforSettingsCommand object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.passCode.getDescription();
default:
return null;
}
}
@Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishSapforSettingsCommand, PassCode.PublishSapforSettingsCommand,
PassCode.EditSapforSettingsCommand, PassCode.EditSapforSettingsCommand,
PassCode.DeleteSapforSettingsCommand); PassCode.DeleteSapforSettingsCommand);
} }
@Override @Override
public boolean isObjectVisible(SapforSettingsCommand object) { public boolean isObjectVisible(SapforSettingsCommand object) {
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id); return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id);
} }
} }

14
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
View File

@@ -47,18 +47,4 @@ public class ServerSapfor extends riDBObject {
public String getVersionCommand() { public String getVersionCommand() {
return Utils_.DQuotes(call_command) + " " + version_command; return Utils_.DQuotes(call_command) + " " + version_command;
} }
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return version;
case 3:
return sender_name;
case 4:
return getBuildDate();
case 5:
return state;
}
return null;
}
} }

1
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
View File

@@ -7,7 +7,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI.ServerSapforsForm; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI.ServerSapforsForm;
import javax.swing.*; import javax.swing.*;
import java.util.Comparator;
public class ServerSapforsDBTable extends iDBTable<ServerSapfor> { public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
public ServerSapforsDBTable() { public ServerSapforsDBTable() {
super(ServerSapfor.class); super(ServerSapfor.class);

14
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
View File

@@ -28,6 +28,20 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
}; };
} }
@Override @Override
public Object getFieldAt(ServerSapfor object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.version;
case 3:
return object.sender_name;
case 4:
return object.getBuildDate();
case 5:
return object.state;
}
return null;
}
@Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(4).setRendererClass(RendererDate.class); columns.get(4).setRendererClass(RendererDate.class);
columns.get(5).setRendererClass(RendererStatusEnum.class); columns.get(5).setRendererClass(RendererStatusEnum.class);