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

упраздение лишних енумов в оформлении таблиц и деревьев.

Browse Source
This commit is contained in:
02090095
2024-10-15 15:13:57 +03:00
parent b7b82e54c6
commit 5e2a9848da
146 changed files with 565 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
.idea/workspace.xml generated
View File

@@ -7,119 +7,148 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/RendererVariantRank.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/FastAccessMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/TextComboBoxMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TextComboBoxMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ConfigurationAutoRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererConfigurationAuto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/SwitcherConfigurationAuto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/EditorDBObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererDBObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectSelectionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectSelectionRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectSelector.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/DBObjectSelector.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/DateRenderer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererDate.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/EditableHeaderRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendereEditableHeader.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererHiddenList.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HyperlinksRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererHyperlinks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/MaskedIntegerValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererMaskedNanInteger.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/MultilineRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererMultiline.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ProgressBarRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererProgressBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererStatusEnum.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/TableEditors.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/TableRenderers.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/TopLeftRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererTopLeft.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/VectorEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/EditorFilesHyperlinks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererWrapText.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/TreeRenderers.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/UI_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/UI_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Account/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Account/Account.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RendererTreeRemoteFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportComment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportComment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportDescription.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportDescription.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CleanAnalyses.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CleanAnalyses.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloseCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloseCurrentFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloseCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloseCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Compile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateParallelVariants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateParallelVariants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CopyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CopyProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteVersion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExcludeFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExcludeFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GenerateParallelVariants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GenerateParallelVariants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/IncludeFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/IncludeFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Run.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportComment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportComment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportDescription.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportDescription.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveFunctionsGraphCoordinates.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveFunctionsGraphCoordinates.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveGraph.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SelectRemoteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SelectRemoteFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Project/FilesMassPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Project/FilesMassPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/Transformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/Transformation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/StartTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/StartTestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/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/RecommendationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/RendererProjectVersion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RendererTreeRule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.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/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.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/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualizer_2.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/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/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/TestingMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/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/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/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/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/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/RendererTreeSapforVersions.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/Visual/Interface/ProjectWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ProjectWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/FastAccessMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />

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

@@ -5,7 +5,7 @@ import Common.Database.Tables.DBTable;
import Common.Database.Tables.DBTableColumn;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import javafx.util.Pair;
import java.io.File;
@@ -210,7 +210,7 @@ public abstract class SQLiteDatabase extends Database {
protected void insert(DBTable table, DBObject o) throws Exception {
PreparedStatement ps = insertStatements.get(table.d);
if (ps == null)
UI_.Info("INSERT NULL");
UI.Info("INSERT NULL");
int i = 1;
for (DBTableColumn column : table.columns.values()) {
if (!column.AutoIncrement) {
@@ -234,7 +234,7 @@ public abstract class SQLiteDatabase extends Database {
protected void update(DBTable table, DBObject o) throws Exception {
PreparedStatement ps = updateStatements.get(table.d);
if (ps == null)
UI_.Info("UPDATE NULL");
UI.Info("UPDATE NULL");
int i = 1;
for (DBTableColumn column : table.columns.values()) {
if (!column.AutoIncrement) {

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

@@ -8,7 +8,7 @@ import Common.Visual.DataSetFilter;
import Common.Visual.FilterInterface;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnFilter;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Global;
@@ -46,7 +46,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return null;
}
public void mountUI(JPanel content_in) {
UI_.Clear(content_in);
UI.Clear(content_in);
//-->
ui_ = createUI();
ui_.setContent(content_in);
@@ -150,7 +150,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return false;
}
public boolean ShowDeleteObjectDialog(DBObject object) {
return UI_.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
return UI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
}
public String QName() {
return "\"" + Name + "\"";

6
src/Common/MainModule_.java
View File

@@ -30,9 +30,11 @@ public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModu
db_class = db_class_in;
instance = this;
}
public void CreateAll() throws Exception {
if (ui_class != null)
public void Init() throws Exception {
//нужно потому что внутри есть ссылки на экземпляр объекта, и конструктор не годится
if (ui_class != null) {
ui = ui_class.newInstance();
}
//--
createPasses();
//-

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

@@ -6,7 +6,7 @@ import Common.Utils.Utils_;
import Common.Visual.Controls.PassButton;
import Common.Visual.Controls.PassControl;
import Common.Visual.Controls.StablePassMenuItem;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.PassForm;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
@@ -151,30 +151,30 @@ public class Pass<T> {
//-
private void PerformCanNotStart() throws Exception {
performCanNotStart();
if (UI_.isActive())
if (UI.isActive())
showCanNotStart();
}
protected void PerformPreparation() throws Exception {
performPreparation();
if (UI_.isActive())
if (UI.isActive())
showPreparation();
}
private void PerformFinish() throws Exception {
performFinish();
//-
if (UI_.isActive())
if (UI.isActive())
showFinish();
}
private void PerformDone() throws Exception {
performDone();
//-
if (UI_.isActive())
if (UI.isActive())
showDone();
}
private void PerformFail() throws Exception {
performFail();
//-
if (UI_.isActive())
if (UI.isActive())
showFail();
}
//------
@@ -207,7 +207,7 @@ public class Pass<T> {
Vector<String> ToPrint = new Vector<>();
createStack_r(ToDo, ToPrint);
if (Global.properties.ConfirmPassesStart && !ToPrint.isEmpty() &&
!UI_.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
!UI.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
) return false;
while (ToDo.size() > 1) {
if (!ToDo.pop().start()) return false;
@@ -218,7 +218,7 @@ public class Pass<T> {
//-
if (Global.properties.ShowPassesDone && !ToPrint.isEmpty()
) {
UI_.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) +
UI.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) +
"\nуспешно выполнен(ы)!");
}
//-
@@ -232,7 +232,7 @@ public class Pass<T> {
return false;
}
public void Interrupt() throws Exception {
UI_.Info("Проход " + Utils_.Brackets(getDescription()) + " не разрешено прерывать.");
UI.Info("Проход " + Utils_.Brackets(getDescription()) + " не разрешено прерывать.");
}
public boolean needsConfirmations() {
return false;
@@ -259,10 +259,10 @@ public class Pass<T> {
timer.Start();
//------------------------------->
try {
if (UI_.isActive()) FocusBeforeStart();
if (UI.isActive()) FocusBeforeStart();
if (canStart(args)) {
PerformPreparation();
if (UI_.isActive() && needsAnimation()) {
if (UI.isActive() && needsAnimation()) {
animation_sem = new Semaphore(1);
animation_sem.acquire();
//---
@@ -343,8 +343,8 @@ public class Pass<T> {
" окончен за " + timer.Print() +
" состояние " + Utils_.Brackets(state.getDescription())
);
if (!Log.isEmpty() && UI_.isActive())
UI_.Error(
if (!Log.isEmpty() && UI.isActive())
UI.Error(
"проход " + Utils_.Brackets(getDescription()) + "\n" + state.getDescription() + "\n\n" +
Log.toString());
}
@@ -353,7 +353,7 @@ public class Pass<T> {
}
//--
public void ShowSapforMessage(String message) {
if (UI_.isActive() && form != null) {
if (UI.isActive() && form != null) {
String[] data = message.split(":");
switch (data[0]) {
case "message_1":

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

@@ -1,5 +1,5 @@
package Common.Utils;
import Common.Visual.UI_;
import Common.Visual.UI;
import java.io.File;
import java.io.FileWriter;
@@ -34,8 +34,8 @@ public interface Loggable {
ex.printStackTrace(writer);
writer.flush();
Print(out.toString());
if (UI_.isActive())
UI_.Error("Возникло исключение. Подробности в файле журнала\n" +
if (UI.isActive())
UI.Error("Возникло исключение. Подробности в файле журнала\n" +
Utils_.Brackets(getLogFile().getAbsolutePath()));
}
}

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

@@ -9,6 +9,8 @@ import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.DBObjectSelectionRenderer;
import Common.Visual.Tables.DBObjectSelector;
import Common.Visual.Tables.DataTable;
import Common.Visual.Tables.Grid.GridAnchestor;
import _VisualDVM.Global;
@@ -23,9 +25,6 @@ import java.util.Arrays;
import java.util.Vector;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import static Common.Visual.Tables.TableEditors.EditorSelect;
import static Common.Visual.Tables.TableRenderers.RendererSelect;
public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
protected JPanel dataPanel;
protected DataSet dataSource;
@@ -55,7 +54,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
@Override
public void Clear() {
super.Clear();
UI_.Clear(dataPanel);
UI.Clear(dataPanel);
}
public DataSet getDataSource() {
return dataSource;
@@ -96,7 +95,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
columns.clear();
columns.add(new ColumnInfo(getDataSource().getPKName()));
if (hasCheckBox()) {
columns.add(new ColumnInfo("", RendererSelect, EditorSelect));
columns.add(new ColumnInfo("", DBObjectSelectionRenderer.class, DBObjectSelector.class));
columns.get(1).setMinWidth(25);
columns.get(1).setMaxWidth(25);
}
@@ -184,9 +183,9 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
ColumnInfo columnInfo = columns.get(i);
if (columnInfo.isVisible()) {
if (columnInfo.hasRenderer())
getColumnModel().getColumn(i).setCellRenderer(MainModule_.instance.getUI().getTableRenderer(columnInfo.getRenderer()));
getColumnModel().getColumn(i).setCellRenderer(MainModule_.instance.getUI().getTableRenderer(columnInfo.getRendererClass()));
if (columnInfo.hasEditor())
getColumnModel().getColumn(i).setCellEditor(MainModule_.instance.getUI().getTableEditor(columnInfo.getEditor()));
getColumnModel().getColumn(i).setCellEditor(MainModule_.instance.getUI().getTableEditor(columnInfo.getEditorClass()));
if (columnInfo.hasMaxWidth())
getColumnModel().getColumn((i)).setMaxWidth(columnInfo.getMaxWidth());
if (columnInfo.hasMinWidth())

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

@@ -1,7 +1,7 @@
package Common.Visual.Menus;
import Common.MainModule_;
import Common.Passes.Pass;
import Common.Visual.UI_;
import Common.Visual.UI;
import javax.swing.*;
import java.awt.*;
@@ -28,6 +28,6 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
}
}
public void Drop() {
UI_.Clear(this);
UI.Clear(this);
}
}

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

@@ -1,6 +1,6 @@
package Common.Visual.Menus;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -27,7 +27,7 @@ public class TextComboBoxMenu extends StyledPopupMenu {
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
UI_.TrySelect(box, Utils_.getFromClipboard());
UI.TrySelect(box, Utils_.getFromClipboard());
}
});
add(m_paste);

50
src/Common/Visual/Tables/ColumnInfo.java
View File

@@ -4,29 +4,22 @@ public class ColumnInfo {
private String Name = "?";
private boolean visible = true;
private boolean editable = false;
private TableRenderers renderer = TableRenderers.RendererDefault;
private TableEditors editor = TableEditors.EditorDefault;
private Class rendererClass = null;
private Class editorClass = null;
private int maxWidth = CommonConstants.Nan;
private int minWidth = CommonConstants.Nan;
//private int lastWidth = Utils.Nan;
// public void setLastWidth(int width_in) {
// lastWidth = width_in;
// }
// public int getLastWidth() {
// return lastWidth;
// }
public ColumnInfo(String name_in) {
setName(name_in);
}
public ColumnInfo(String name_in, TableRenderers renderer_in, TableEditors editor_in) {
public ColumnInfo(String name_in, Class renderer_in, Class editor_in) {
setName(name_in);
setRenderer(renderer_in);
setRendererClass(renderer_in);
setEditable(true);
setEditor(editor_in);
setEditorClass(editor_in);
}
public ColumnInfo(String name_in, TableRenderers renderer_in) {
public ColumnInfo(String name_in, Class renderer_in) {
setName(name_in);
setRenderer(renderer_in);
setRendererClass(renderer_in);
}
public String getName() {
return Name;
@@ -46,24 +39,24 @@ public class ColumnInfo {
public void setEditable(boolean editable_in) {
this.editable = editable_in;
}
public TableRenderers getRenderer() {
return renderer;
public Class getRendererClass() {
return rendererClass;
}
public void setRenderer(TableRenderers renderer_in) {
this.renderer = renderer_in;
public void setRendererClass(Class renderer_in) {
this.rendererClass = renderer_in;
}
public TableEditors getEditor() {
return editor;
public Class getEditorClass() {
return editorClass;
}
public void setEditor(TableEditors editor_in) {
this.editor = editor_in;
setEditable(editor != TableEditors.EditorDefault);
public void setEditorClass(Class editor_in) {
this.editorClass = editor_in;
setEditable(editorClass != null);
}
public boolean hasRenderer() {
return getRenderer() != TableRenderers.RendererDefault;
return getRendererClass() != null;
}
public boolean hasEditor() {
return getEditor() != TableEditors.EditorDefault;
return getEditorClass() != null;
}
public int getMaxWidth() {
return maxWidth;
@@ -84,11 +77,4 @@ public class ColumnInfo {
public boolean hasMinWidth() {
return minWidth != CommonConstants.Nan;
}
/*
public boolean hasLastWidth() {
return lastWidth != Utils.Nan;
}
*/
//-
}

2
src/Common/Visual/Tables/DBObjectSelectionRenderer.java
View File

@@ -1,5 +1,5 @@
package Common.Visual.Tables;
public class DBObjectSelectionRenderer extends DBObjectRenderer {
public class DBObjectSelectionRenderer extends RendererDBObject {
/*
@Override
public Dimension getMinimumSize() {

2
src/Common/Visual/Tables/DBObjectSelector.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Tables;
import Common.Database.Objects.DBObject;
public class DBObjectSelector<T extends DBObject> extends DBObjectEditor<T> {
public class DBObjectSelector<T extends DBObject> extends EditorDBObject<T> {
@Override
public void Action() {
value.SwitchSelection();

2
src/Common/Visual/Tables/DBObjectEditor.java → src/Common/Visual/Tables/EditorDBObject.java
View File

@@ -9,7 +9,7 @@ import javax.swing.table.TableCellEditor;
import java.awt.*;
import java.util.EventObject;
import java.util.Objects;
public abstract class DBObjectEditor<T extends DBObject> extends EditorCell implements TableCellEditor {
public abstract class EditorDBObject<T extends DBObject> extends EditorCell implements TableCellEditor {
//задается при редактировании клетки.
public T value = null;
protected transient ChangeEvent changeEvent;

4
src/Common/Visual/Tables/EditableHeaderRenderer.java → src/Common/Visual/Tables/RendereEditableHeader.java
View File

@@ -5,11 +5,11 @@ import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
public class EditableHeaderRenderer implements TableCellRenderer {
public class RendereEditableHeader implements TableCellRenderer {
private JTable table = null;
private MouseEventReposter reporter = null;
private JComponent editor;
public EditableHeaderRenderer(JComponent editor) {
public RendereEditableHeader(JComponent editor) {
this.editor = editor;
this.editor.setBorder(UIManager.getBorder("TableHeader.cellBorder"));
}

2
src/Common/Visual/Tables/DBObjectRenderer.java → src/Common/Visual/Tables/RendererDBObject.java
View File

@@ -3,7 +3,7 @@ import Common.Database.Objects.DBObject;
import Common.Visual.DataControl;
import javax.swing.*;
public abstract class DBObjectRenderer extends RendererCell<DBObject> {
public abstract class RendererDBObject extends RendererCell<DBObject> {
@Override
public DBObject Init(JTable table, Object value, int row, int column) {
return ((DataControl) table).getRowObject(row);

2
src/Common/Visual/Tables/DateRenderer_.java → src/Common/Visual/Tables/RendererDate.java
View File

@@ -4,7 +4,7 @@ import Common.Utils.Utils_;
import javax.swing.*;
import java.util.Date;
//название пересекается с встроенным классом поэтому подчеркивание.
public class DateRenderer_ extends RendererCell<Date> {
public class RendererDate extends RendererCell<Date> {
private static final Date zero = new Date(0);
@Override
public Date Init(JTable table, Object value, int row, int column) {

2
src/Common/Visual/Tables/HiddenListRenderer.java → src/Common/Visual/Tables/RendererHiddenList.java
View File

@@ -4,7 +4,7 @@ import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*;
import java.util.Vector;
public class HiddenListRenderer extends RendererCell<Vector<String>> {
public class RendererHiddenList extends RendererCell<Vector<String>> {
@Override
public Vector<String> Init(JTable table, Object value, int row, int column) {
return (Vector<String>) value;

2
src/Common/Visual/Tables/MaskedIntegerValueRenderer.java → src/Common/Visual/Tables/RendererMaskedNanInteger.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Tables;
import javax.swing.*;
public class MaskedIntegerValueRenderer extends RendererCell<Long> {
public class RendererMaskedNanInteger extends RendererCell<Long> {
@Override
public Long Init(JTable table, Object value, int row, int column) {
return (Long) value;

2
src/Common/Visual/Tables/MultilineRenderer.java → src/Common/Visual/Tables/RendererMultiline.java
View File

@@ -5,7 +5,7 @@ import javax.swing.*;
import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.util.Vector;
public class MultilineRenderer extends StyledList implements TableCellRenderer {
public class RendererMultiline extends StyledList implements TableCellRenderer {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());

2
src/Common/Visual/Tables/ProgressBarRenderer.java → src/Common/Visual/Tables/RendererProgressBar.java
View File

@@ -3,7 +3,7 @@ import Common.Visual.Controls.StyledProgressBar;
import javax.swing.*;
import javax.swing.table.TableCellRenderer;
public class ProgressBarRenderer extends StyledProgressBar implements TableCellRenderer {
public class RendererProgressBar extends StyledProgressBar implements TableCellRenderer {
@Override
public java.awt.Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());

2
src/Common/Visual/Tables/StatusEnumRenderer.java → src/Common/Visual/Tables/RendererStatusEnum.java
View File

@@ -3,7 +3,7 @@ import Common.MainModule_;
import Common.Visual.StatusEnum;
import javax.swing.*;
public class StatusEnumRenderer extends RendererCell<StatusEnum> {
public class RendererStatusEnum extends RendererCell<StatusEnum> {
@Override
public StatusEnum Init(JTable table, Object value, int row, int column) {
return (StatusEnum) value;

2
src/Common/Visual/Tables/TopLeftRenderer.java → src/Common/Visual/Tables/RendererTopLeft.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Tables;
import javax.swing.*;
public class TopLeftRenderer extends RendererCell {
public class RendererTopLeft extends RendererCell {
@Override
public Object Init(JTable table, Object value, int row, int column) {
return value;

4
src/Common/Visual/Tables/WrapTextRenderer.java → src/Common/Visual/Tables/RendererWrapText.java
View File

@@ -5,8 +5,8 @@ import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*;
import javax.swing.table.TableCellRenderer;
import java.awt.*;
public class WrapTextRenderer extends JTextArea implements TableCellRenderer {
public WrapTextRenderer() {
public class RendererWrapText extends JTextArea implements TableCellRenderer {
public RendererWrapText() {
setLineWrap(true);
setWrapStyleWord(true);
// setOpaque(false);

10
src/Common/Visual/Tables/TableEditors.java
View File

@@ -1,10 +0,0 @@
package Common.Visual.Tables;
public enum TableEditors {
EditorDefault,
EditorSelect,
EditorHyperlinks,
EditorDimension,
EditorCompilerEnvironmentValue,
EditorCompilerOptionParameterValue,
EditorAutoConfiguration
}

20
src/Common/Visual/Tables/TableRenderers.java
View File

@@ -1,20 +0,0 @@
package Common.Visual.Tables;
public enum TableRenderers {
RendererDefault,
RendererDate,
RendererProgress,
RendererSelect,
RendererDimension,
RendererMultiline,
RendererHyperlinks,
RendererTopLeft,
RendererMaskedInt,
RendererVariantRank,
RendererHiddenList,
RendererWrapText,
RendererCompilerOptionParameterValue,
RendererCompilerEnvironmentValue,
RendererCompilerOptionParameterName,
RendererStatusEnum,
RendererAutoConfiguration
}

8
src/Common/Visual/Trees/StyledTree.java
View File

@@ -24,8 +24,8 @@ public class StyledTree extends JTree implements ThemeElement {
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
setToggleClickCount(0); //отключение сворачивание разворачивания по двойному клику
//--
if (!getRenderer().equals(TreeRenderers.RendererUndefined))
setCellRenderer(MainModule_.instance.getUI().getTreeRenderer(getRenderer()));
if (getRendererClass()!=null)
setCellRenderer(MainModule_.instance.getUI().getTreeRenderer(getRendererClass()));
//--
getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
addTreeSelectionListener(e -> {
@@ -65,8 +65,8 @@ public class StyledTree extends JTree implements ThemeElement {
applyTheme();
ExpandAll();
}
public TreeRenderers getRenderer() {
return TreeRenderers.RendererUndefined;
public Class getRendererClass() {
return null;
}
public void EventsOn() {
events_on = true;

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

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

13
src/Common/Visual/Trees/TreeRenderers.java
View File

@@ -1,13 +0,0 @@
package Common.Visual.Trees;
public enum TreeRenderers {
RendererUndefined,
//-
RendererGraph,
RendererFile,
RendererRemoteFile,
RendererVersion,
RendererRule,
RendererAttachment,
RendererSapforVersion,
RendererSelection,
}

15
src/Common/Visual/UI_.java → src/Common/Visual/UI.java
View File

@@ -5,13 +5,8 @@ import Common.Utils.Utils_;
import javax.swing.*;
import javax.swing.event.ChangeListener;
import javax.swing.text.DefaultFormatter;
import javax.swing.text.DefaultHighlighter;
import javax.swing.text.Highlighter;
import java.awt.*;
public class UI_ {
//--
public static final Highlighter.HighlightPainter GreenTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
public static final Highlighter.HighlightPainter RedTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
public class UI {
public static boolean active = false;
public static boolean isActive() {
return active;
@@ -55,7 +50,7 @@ public class UI_ {
}
//Примитивные диалоговые элементы
public static boolean Question(Component parent, String text) {
return !UI_.isActive() || (JOptionPane.showConfirmDialog(parent,
return !UI.isActive() || (JOptionPane.showConfirmDialog(parent,
text + "?",
"Подтверждение",
JOptionPane.YES_NO_OPTION,
@@ -66,16 +61,16 @@ public class UI_ {
}
public static void Info(String message) {
Utils_.CopyToClipboard(message);
if (UI_.isActive())
if (UI.isActive())
JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 1);
}
public static void Error(String message) {
Utils_.CopyToClipboard(message);
if (UI_.isActive())
if (UI.isActive())
JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 0);
}
public static boolean Warning(String text) {
return !UI_.isActive() ||
return !UI.isActive() ||
JOptionPane.showConfirmDialog(MainModule_.instance.getUI().getFrontWindow(),
text + "\nВы уверены?",
"Подтверждение",

73
src/Common/Visual/UIModule_.java
View File

@@ -2,10 +2,8 @@ package Common.Visual;
import Common.Database.Tables.DataSet;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.FastAccessMenuBar;
import Common.Visual.Tables.*;
import Common.Visual.Themes.DefaultTheme;
import Common.Visual.Themes.VisualiserTheme;
import Common.Visual.Trees.SelectionTreeCellRenderer;
import Common.Visual.Windows.PassForm;
import javax.swing.*;
@@ -16,15 +14,12 @@ import java.awt.*;
import java.util.LinkedHashMap;
import java.util.Stack;
import static Common.Visual.Tables.TableEditors.EditorSelect;
import static Common.Visual.Tables.TableRenderers.*;
import static Common.Visual.Trees.TreeRenderers.RendererSelection;
public class UIModule_ {
public LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
public Stack<Component> windowsStack = new Stack<>();
protected LinkedHashMap<Common.Visual.Tables.TableRenderers, TableCellRenderer> tableRenderers = new LinkedHashMap<>();
protected LinkedHashMap<Common.Visual.Tables.TableEditors, TableCellEditor> tableEditors = new LinkedHashMap<>();
protected LinkedHashMap<Common.Visual.Trees.TreeRenderers, TreeCellRenderer> treeRenderers = new LinkedHashMap<>();
protected LinkedHashMap<Class, TableCellRenderer> tableRenderers = new LinkedHashMap<>();
protected LinkedHashMap<Class, TableCellEditor> tableEditors = new LinkedHashMap<>();
protected LinkedHashMap<Class, TreeCellRenderer> treeRenderers = new LinkedHashMap<>();
//--
VisualiserTheme theme = new DefaultTheme();
FastAccessMenuBar fastAccessMenuBar = new FastAccessMenuBar();
@@ -62,20 +57,6 @@ public class UIModule_ {
UIManager.put("OptionPane.cancelButtonText", "Отмена");
UIManager.put("OptionPane.okButtonText", "Готово");
//</editor-fold>
tableRenderers.put(RendererDate, new DateRenderer_());
tableRenderers.put(RendererProgress, new ProgressBarRenderer());
tableRenderers.put(RendererSelect, new DBObjectSelectionRenderer());
tableRenderers.put(RendererMultiline, new MultilineRenderer());
tableRenderers.put(RendererHyperlinks, new HyperlinksRenderer());
tableRenderers.put(RendererTopLeft, new TopLeftRenderer());
tableRenderers.put(RendererMaskedInt, new MaskedIntegerValueRenderer());
tableRenderers.put(RendererHiddenList, new HiddenListRenderer());
tableRenderers.put(RendererWrapText, new WrapTextRenderer());
tableRenderers.put(RendererStatusEnum, new StatusEnumRenderer());
//-
tableEditors.put(EditorSelect, new DBObjectSelector());
//
treeRenderers.put(RendererSelection, new SelectionTreeCellRenderer());
}
//--
public VisualiserTheme getTheme() {
@@ -108,13 +89,49 @@ public class UIModule_ {
}
return res;
}
public TableCellRenderer getTableRenderer(Common.Visual.Tables.TableRenderers r_name) {
return tableRenderers.get(r_name);
public TableCellRenderer getTableRenderer(Class key) {
TableCellRenderer res = null;
if (tableRenderers.containsKey(key))
res= tableRenderers.get(key);
else {
try {
res = (TableCellRenderer) key.newInstance();
}
catch (Exception ex){
ex.printStackTrace();
}
tableRenderers.put(key,res);
}
return res;
}
public TableCellEditor getTableEditor(Common.Visual.Tables.TableEditors e_name) {
return tableEditors.get(e_name);
public TableCellEditor getTableEditor(Class key) {
TableCellEditor res = null;
if (tableEditors.containsKey(key))
res= tableEditors.get(key);
else {
try {
res = (TableCellEditor) key.newInstance();
}
catch (Exception ex){
ex.printStackTrace();
}
tableEditors.put(key,res);
}
return res;
}
public TreeCellRenderer getTreeRenderer(Common.Visual.Trees.TreeRenderers r_name) {
return treeRenderers.get(r_name);
public TreeCellRenderer getTreeRenderer(Class key) {
TreeCellRenderer res = null;
if (treeRenderers.containsKey(key))
res= treeRenderers.get(key);
else {
try {
res = (TreeCellRenderer) key.newInstance();
}
catch (Exception ex){
ex.printStackTrace();
}
treeRenderers.put(key,res);
}
return res;
}
}

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

@@ -4,7 +4,7 @@ import Common.Utils.TextLog;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import Common.Visual.UI;
import javax.swing.*;
import java.awt.*;
@@ -137,7 +137,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
OK = true;
CloseAction();
} else
UI_.Error("Валидация не пройдена:\n" + Log.toString());
UI.Error("Валидация не пройдена:\n" + Log.toString());
}
protected void onCancel() {
CloseAction();

12
src/_VisualDVM/Global.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM;
import Common.Database.Tables.DataSet;
import Common.Utils.Loggable;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.GlobalData.Settings.DBSetting;
@@ -221,9 +221,9 @@ public class Global {
//--
public static void NormalMode(int port) throws Exception {
//-------------------------------->>
UI_.active = true;
UI.active = true;
mainModule = new MainModule();
mainModule.CreateAll();
mainModule.Init();
//--
CheckVisualiserDirectories();
CreateLogAtComponentsPath();
@@ -233,7 +233,7 @@ public class Global {
visualizer_2.refreshPid();
//если делать раньше, то не удастся убить сервер.
if (Utils_.ContainsCyrillic(Utils_.getHomePath())) {
UI_.Info("В пути к корневой папке " + Utils_.DQuotes(Utils_.getHomePath()) + "\n" +
UI.Info("В пути к корневой папке " + Utils_.DQuotes(Utils_.getHomePath()) + "\n" +
"Найдены русские буквы.\n" +
"Визуализатор завершает работу."); //
FinishApplication();
@@ -265,10 +265,10 @@ public class Global {
do {
Global.mainModule.getUI().getComponentsWindow().ShowDialog("");
if (flag = (!ValidateComponentsStates())) {
if (!UI_.Question("Найдено " + bad_state + " некорректных необходимых компонент.Работа визуализатора невозможна.\n" +
if (!UI.Question("Найдено " + bad_state + " некорректных необходимых компонент.Работа визуализатора невозможна.\n" +
"Вернуться к окну компонент"
)) {
UI_.Info("Визуализатор завершает работу.");
UI.Info("Визуализатор завершает работу.");
FinishApplication();
}
}

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

@@ -6,7 +6,7 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -96,7 +96,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
fields.tfHelpCommand.setText(Result.help_command);
fields.tfVersionCommand.setText(Result.version_command);
fields.tfHome.setText(Result.home_path);
UI_.TrySelect(fields.cbCompilerType, Result.type);
UI.TrySelect(fields.cbCompilerType, Result.type);
fields.events_on = true;
}
@Override

4
src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Compiler.UI;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Global;
@@ -41,7 +41,7 @@ public class CompilerFields implements DialogFields {
if (dst != null)
tfHome.setText(dst);
} else
UI_.Info("Назначение домашней папки поддерживается только для dvm системы.");
UI.Info("Назначение домашней папки поддерживается только для dvm системы.");
});
tfHome.getDocument().addDocumentListener(new DocumentListener() {
@Override

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

@@ -1,10 +1,9 @@
package _VisualDVM.GlobalData.CompilerEnvironment;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableEditors;
import Common.Visual.Tables.TableRenderers;
import static Common.Visual.Tables.TableRenderers.RendererMultiline;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
public CompilerEnvironmentsSet() {
super(String.class, CompilerEnvironment.class);
@@ -35,10 +34,10 @@ public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment
}
@Override
protected void AdditionalInitColumns() {
columns.get(2).setRenderer(TableRenderers.RendererCompilerEnvironmentValue);
columns.get(2).setEditor(TableEditors.EditorCompilerEnvironmentValue);
columns.get(2).setRendererClass(CompilerEnvironmentValueRenderer.class);
columns.get(2).setEditorClass(CompilerEnvironmentValueEditor.class);
//-
columns.get(3).setRenderer(RendererMultiline);
columns.get(3).setRendererClass(RendererMultiline.class);
}
};
}

8
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_;
import Common.Visual.Tables.EditorDBObject;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
public class CompilerEnvironmentValueEditor extends EditorDBObject<CompilerEnvironment> {
@Override
public void Action() {
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
@@ -21,7 +21,7 @@ public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvir
};
dialog.fields.setEditable(value.valueVariants.isEmpty());
if (!value.value.isEmpty())
UI_.TrySelect(dialog.fields, value.value);
UI.TrySelect(dialog.fields, value.value);
if (dialog.ShowDialog("Изменить значение опции " + value.name,
value.valueVariants
)) {

4
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Tables.RendererDBObject;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
public class CompilerEnvironmentValueRenderer extends RendererDBObject {
@Override
public void Display() {
if (value != null) {

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

@@ -1,10 +1,9 @@
package _VisualDVM.GlobalData.CompilerOption;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableEditors;
import Common.Visual.Tables.TableRenderers;
import static Common.Visual.Tables.TableRenderers.RendererMultiline;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
public CompilerOptionsSet() {
super(String.class, CompilerOption.class);
@@ -37,10 +36,10 @@ public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(2).setRenderer(TableRenderers.RendererCompilerOptionParameterName);
columns.get(3).setRenderer(TableRenderers.RendererCompilerOptionParameterValue);
columns.get(3).setEditor(TableEditors.EditorCompilerOptionParameterValue);
columns.get(4).setRenderer(RendererMultiline);
columns.get(2).setRendererClass( CompilerOptionParameterNameRenderer.class);
columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class);
columns.get(3).setEditorClass(CompilerOptionParameterValueRenderer.class);
columns.get(4).setRendererClass(RendererMultiline.class);
}
};
}

4
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Tables.RendererDBObject;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
public class CompilerOptionParameterNameRenderer extends RendererDBObject {
@Override
public void Display() {
if (value != null) {

8
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_;
import Common.Visual.Tables.EditorDBObject;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> {
public class CompilerOptionParameterValueEditor extends EditorDBObject<CompilerOption> {
@Override
public void Action() {
if (value.hasParameter()) {
@@ -15,7 +15,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
//-
ComboTextDialog dialog = new ComboTextDialog();
if (!value.parameterValue.isEmpty())
UI_.TrySelect(dialog.fields, value.parameterValue);
UI.TrySelect(dialog.fields, value.parameterValue);
dialog.fields.setEditable(value.parameterVariants.isEmpty());
if (dialog.ShowDialog("Изменить значение опции " + value.name,
value.parameterVariants)) {

4
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Tables.RendererDBObject;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
public class CompilerOptionParameterValueRenderer extends RendererDBObject {
@Override
public void Display() {
if (value != null) {

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

@@ -2,7 +2,7 @@ package _VisualDVM.GlobalData.DVMParameter;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -52,7 +52,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
return new DBObjectDialog<DVMParameter, DVMParameterFields>(DVMParameterFields.class) {
@Override
public void fillFields() {
UI_.TrySelect(fields.cbName, Result.name);
UI.TrySelect(fields.cbName, Result.name);
fields.tfValue.setText(Result.value);
}
//https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java

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

@@ -2,7 +2,7 @@ package _VisualDVM.GlobalData.EnvironmentValue;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -25,7 +25,7 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
return new DBObjectDialog<EnvironmentValue, EnvironmentValueFields>(EnvironmentValueFields.class) {
@Override
public void fillFields() {
UI_.TrySelect(fields.cbName, Result.name);
UI.TrySelect(fields.cbName, Result.name);
fields.tfValue.setText(Result.value);
}
//https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java

5
src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
View File

@@ -1,8 +1,7 @@
package _VisualDVM.GlobalData.FileObject;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import static Common.Visual.Tables.TableRenderers.RendererDate;
import Common.Visual.Tables.RendererDate;
public class DirInfosDataSet extends DataSet<String, DirInfo> {
public DirInfosDataSet() {
super(String.class, DirInfo.class);
@@ -12,7 +11,7 @@ public class DirInfosDataSet extends DataSet<String, DirInfo> {
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(1).setRenderer(RendererDate);
columns.get(1).setRendererClass(RendererDate.class);
}
};
}

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

@@ -5,7 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -50,7 +50,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
fields.tfName.setText(Result.name);
fields.tfAddress.setText(Result.address);
fields.sPort.setValue(Result.port);
UI_.TrySelect(fields.cbMachineType, Result.type);
UI.TrySelect(fields.cbMachineType, Result.type);
}
@Override
public void ProcessResult() {

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

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.Module.UI;
import Common.Passes.Pass;
import Common.Visual.Controls.StyledTextComboBox;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -32,14 +32,14 @@ public class ModuleAnchestorFields implements DialogFields {
bHelp.addActionListener(e -> {
if (cbCompilers.getSelectedItem() != null) {
Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, true);
} else UI_.Info("Компилятор не выбран");
} else UI.Info("Компилятор не выбран");
});
BPickOptions.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass<String> pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(compiler)) {
UI_.TrySelect(cbFlags, pass.target);
UI.TrySelect(cbFlags, pass.target);
}
}
});
@@ -58,7 +58,7 @@ public class ModuleAnchestorFields implements DialogFields {
cbCompilers.addActionListener(e -> {
if (cbCompilers.getSelectedItem() instanceof Compiler) {
Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
UI_.TrySelect(cbCommands,
UI.TrySelect(cbCommands,
linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName));
}
});

8
src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Module.UI;
import Common.CommonConstants;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -93,9 +93,9 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
}
@Override
public void fillFields() {
UI_.TrySelect(fields.cbFlags, Result.flags);
UI_.TrySelect(fields.cbCommands, Result.command);
UI_.TrySelect(fields.cbCompilers, Result.getCompiler());
UI.TrySelect(fields.cbFlags, Result.flags);
UI.TrySelect(fields.cbCommands, Result.command);
UI.TrySelect(fields.cbCompilers, Result.getCompiler());
//--------------------------------------------
fields.setListeners(Result);
}

4
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -84,7 +84,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
public void goUp() {
if (!root_file.full_name.equals("/")) {
Refresh(root_file.parent);
} else UI_.Info("Корневая папка файловой системы достигнута.");
} else UI.Info("Корневая папка файловой системы достигнута.");
}
@Override
public void validateFields() {

5
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
public class RemoteFilesTree extends DataTree {
@@ -8,8 +7,8 @@ public class RemoteFilesTree extends DataTree {
super(Global.mainModule.getUI().getRemoteFileChooser().root);
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererRemoteFile;
public Class getRendererClass() {
return RendererTreeRemoteFile.class;
}
@Override
public Current getCurrent() {

2
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java → src/_VisualDVM/GlobalData/RemoteFile/UI/RendererTreeRemoteFile.java
View File

@@ -6,7 +6,7 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
public class RemoteFileRenderer extends StyledTreeCellRenderer {
public class RendererTreeRemoteFile extends StyledTreeCellRenderer {
public java.awt.Component getTreeCellRendererComponent(
JTree tree, Object value,
boolean selected, boolean expanded,

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

@@ -6,7 +6,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -43,14 +43,14 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
if (compiler.isVisible() && compiler.type.equals(CompilerType.dvm))
fields.cbLauncherCall.addItem(compiler);
}
UI_.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
UI_.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions);
UI.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
UI.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions);
fields.tfArgs.setText(Result.args);
fields.cbLauncherCall.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
UI_.TrySelect(fields.cbLaunchOptions, "run");
UI.TrySelect(fields.cbLaunchOptions, "run");
}
}
});

8
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
View File

@@ -6,6 +6,8 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
@@ -13,8 +15,6 @@ import _VisualDVM.Passes.PassCode;
import java.util.LinkedHashMap;
import static Common.Visual.Tables.TableRenderers.RendererDate;
import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
public CompilationTasksDBTable() {
super(CompilationTask.class);
@@ -42,8 +42,8 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(12).setRenderer(RendererDate);
columns.get(13).setRenderer(RendererStatusEnum);
columns.get(12).setRendererClass(RendererDate.class);
columns.get(13).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {

8
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
View File

@@ -2,12 +2,12 @@ package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import static Common.Visual.Tables.TableRenderers.RendererDate;
import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
public class RunTasksDBTable extends iDBTable<RunTask> {
public RunTasksDBTable() {
super(RunTask.class);
@@ -29,8 +29,8 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRenderer(RendererDate);
columns.get(7).setRenderer(RendererStatusEnum);
columns.get(6).setRendererClass(RendererDate.class);
columns.get(7).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {

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

@@ -5,7 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import Common.Visual.Tables.RendererStatusEnum;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -75,7 +75,7 @@ public class UsersDBTable extends iDBTable<User> {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(2).setRenderer(TableRenderers.RendererStatusEnum);
columns.get(2).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {

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

@@ -2,7 +2,7 @@ package _VisualDVM.Passes.All;
import Common.Database.Database;
import Common.Passes.AddObjectPass;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
@@ -38,7 +38,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
"Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'", version);
return true;
} else {
if (UI_.Warning("Создать отчёт об ошибке без прикрепления проекта.")) {
if (UI.Warning("Создать отчёт об ошибке без прикрепления проекта.")) {
target = new BugReport();
target.genName();
target.sender_name = Global.mainModule.getAccount().name;

8
src/_VisualDVM/Passes/All/CompareDVMRunTasks.java
View File

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

8
src/_VisualDVM/Passes/All/CompareSapforPackages.java
View File

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

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

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

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

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -62,7 +62,7 @@ public class CopyProject extends CurrentProjectPass {
}
@Override
protected void performDone() throws Exception {
if (UI_.Question("копия текущего проекта успешно создана по адресу\n" + dstFile.getAbsolutePath() + "\nОткрыть её")) {
if (UI.Question("копия текущего проекта успешно создана по адресу\n" + dstFile.getAbsolutePath() + "\nОткрыть её")) {
Global.mainModule.getPass(PassCode.CloseCurrentProject).Do();
Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(dstFile);
}

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

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

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

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.Controls.PassMenuItem;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
@@ -139,7 +139,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
Global.mainModule.getFile().form.FocusCompilationOut();
}
if (!badFiles.isEmpty())
UI_.Error(badFiles);
UI.Error(badFiles);
}
@Override
protected void performDone() throws Exception {

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

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

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

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

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

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

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

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

8
src/_VisualDVM/Passes/All/DeleteVersion.java
View File

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

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

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -53,7 +53,7 @@ public class DownloadProject extends CurrentConnectionPass {
File project = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
Utils_.getDateName(src.name)).toFile();
if (Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) {
if (UI_.Question("Проект " + Utils_.Brackets(src.name) + " успешно загружен. Открыть его"))
if (UI.Question("Проект " + Utils_.Brackets(src.name) + " успешно загружен. Открыть его"))
Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(project);
}
}

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

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -48,7 +48,7 @@ public class DownloadTest extends TestingSystemPass<Test> {
target.getArchive().getAbsolutePath(),
Global.visualiser.getWorkspace().getAbsolutePath(), false
))
if (UI_.Question("Тестовый проект успешно загружен под именем\n" +
if (UI.Question("Тестовый проект успешно загружен под именем\n" +
Utils_.Brackets(target.getHomePath().getName()) +
"\nОткрыть его"))
Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(target.getHomePath());

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

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Subscribes.Subscriber;
@@ -46,13 +46,13 @@ public class EditAccount extends Email {
JOptionPane.INFORMATION_MESSAGE);
if (attempt != null) {
if (attempt.equals(password)) {
UI_.Info("Почта успешно подтверждена!");
UI.Info("Почта успешно подтверждена!");
return true;
} else {
UI_.Error("Неверный код активации.\nПовторите попытку.");
UI.Error("Неверный код активации.\nПовторите попытку.");
}
} else {
UI_.Info("Подтверждение почты отменено");
UI.Info("Подтверждение почты отменено");
return false;
}
} while (true);

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

@@ -2,7 +2,7 @@ package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Index;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Constants;
import _VisualDVM.Current;
@@ -395,7 +395,7 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
protected void performDone() throws Exception {
super.performDone();
if (Desktop.isDesktopSupported()) {
if (UI_.Question("Таблица сформирована в файле\n" + Utils_.DQuotes(res.getAbsolutePath()) + ".\nОткрыть её"
if (UI.Question("Таблица сформирована в файле\n" + Utils_.DQuotes(res.getAbsolutePath()) + ".\nОткрыть её"
)) {
Desktop.getDesktop().open(res);
}

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

@@ -1,5 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.CurrentProjectPass;
@@ -28,7 +28,7 @@ public class GenerateParallelVariants extends CurrentProjectPass {
Log.Writeln_("Количество вариантов " + amount + "\nпревышает 1600. Отображение запрещено.");
return false;
}
return UI_.Question("Будет отображено " + amount + " вариантов. Хотите продолжить");
return UI.Question("Будет отображено " + amount + " вариантов. Хотите продолжить");
}
return false;
}

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

@@ -3,7 +3,7 @@ import Common.CommonConstants;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -252,7 +252,7 @@ public class Precompilation extends Pass<db_project_info> {
killer.waitFor();
}
} else {
UI_.Info("Прерывание процессов под Linux не реализовано");
UI.Info("Прерывание процессов под Linux не реализовано");
}
}
}

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

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -31,7 +31,7 @@ public class PublishBugReport extends Pass<BugReport> {
}
if (target.executor.isEmpty()) {
Global.mainModule.getUI().getMainWindow().getCallbackWindow().FocusRecipients();
if (!UI_.Question("Для отчёта об ошибке не назначен исполнитель.\nВсе равно опубликовать его"))
if (!UI.Question("Для отчёта об ошибке не назначен исполнитель.\nВсе равно опубликовать его"))
return false;
}
if (!Global.mainModule.getAccount().CheckAccessRights(target.sender_address, Log) && (BugReportInterface.CheckDraft(target, Log))) {

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

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingSystemPass;
@@ -70,7 +70,7 @@ public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
return false;
}
//---
return UI_.Question("В группу " + Utils_.Brackets(group.description) +
return UI.Question("В группу " + Utils_.Brackets(group.description) +
"\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
}
}

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

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Constants;
import _VisualDVM.Current;
@@ -92,7 +92,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
return false;
}
//--
if (UI_.Question(
if (UI.Question(
testForReplaceNames.size() + " тестов будет заменено,\n" +
newTestsNames.size() + " тестов будет добавлено.\n" +
"Продолжить"

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

@@ -1,5 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
@@ -65,7 +65,7 @@ public class SPF_CreateParallelVariant extends SapforTransformation {
protected void performDone() throws Exception {
Global.transformationPermission = TransformationPermission.VariantsOnly;
target.migrateFilesSettings(target.last_version, true, true);
if (UI_.isActive())
if (UI.isActive())
variant.UpdateStats(sapfor.getPredictorStats(), target.last_version.name);
}
@Override

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

@@ -1,5 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -29,7 +29,7 @@ public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalys
@Override
protected boolean canStart(Object... args) throws Exception {
if (Global.mainModule.getDb().settings.get(SettingName.MPI_PROGRAM).toBoolean()) {
UI_.Info("Включена настройка SAPFOR 'MPI программа'." +
UI.Info("Включена настройка SAPFOR 'MPI программа'." +
"\nПостроение распределения данных невозможно.");
Global.mainModule.getPass(PassCode.SPF_SharedMemoryParallelization).Do();
return false;

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

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassState;
import Common.Visual.Controls.PassControl;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SilentSapforPass;
@@ -20,7 +20,7 @@ public class SPF_GetGCovInfo extends SilentSapforPass {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (UI_.Question("Все анализы будут сброшены.Продолжить")) {
if (UI.Question("Все анализы будут сброшены.Продолжить")) {
SPF_ParseFilesWithOrder.silent = true;
return super.canStart(args) && Global.mainModule.getPass(PassCode.GCOV).Do() && Global.mainModule.getPass(PassCode.SPF_ParseFilesWithOrder).Do();
}

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

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -109,7 +109,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
protected void performPreparation() throws Exception {
super.performPreparation(); //удаление интеррупта.
//------------------------------------------------------------------------------------------>>> пакетный режим.
if (!precompilation_done && UI_.isActive()) {
if (!precompilation_done && UI.isActive()) {
Global.mainModule.getPass(PassCode.Save).Do();
target.CleanAnalyses();
}

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

@@ -2,7 +2,7 @@ package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
import com.mxgraph.io.mxCodec;
@@ -62,6 +62,6 @@ public class SaveGraph extends Pass<File> {
}
@Override
protected void showDone() throws Exception {
UI_.Info("Граф успешно сохранен в файл: " + Utils_.Brackets(target.getAbsolutePath()));
UI.Info("Граф успешно сохранен в файл: " + Utils_.Brackets(target.getAbsolutePath()));
}
}

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

@@ -1,5 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.CompilerType;
@@ -62,6 +62,6 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
Log.Writeln_("Задач не найдено.");
return false;
}
return UI_.Question("Будет запущено " + target.tasksCount + " задач. Продолжить");
return UI.Question("Будет запущено " + target.tasksCount + " задач. Продолжить");
}
}

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

@@ -1,5 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.PublishServerObject;
@@ -49,6 +49,6 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
Log.Writeln_("Не сформировано ни одной новой задачи.");
return false;
}
return (UI_.Question("Будет запущено " + target.tasksCount + " задач. Продолжить"));
return (UI.Question("Будет запущено " + target.tasksCount + " задач. Продолжить"));
}
}

4
src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java
View File

@@ -3,7 +3,7 @@ import Common.Passes.PassState;
import Common.Utils.Utils_;
import Common.Visual.Controls.PassControl;
import Common.Visual.Controls.PassMenuItem;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -49,7 +49,7 @@ public class SapforAnalysis extends SapforPass {
@Override
protected void PerformPreparation() throws Exception {
//-
if (UI_.isActive())
if (UI.isActive())
showPreparation(); // отображение пустых данных
//-
performPreparation(); //в данном случае удаление данных

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

@@ -2,7 +2,7 @@ package _VisualDVM.Passes.Server;
import Common.Database.Database;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode;
@@ -39,7 +39,7 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
DBTable table = getDb().tables.get(d);
if (table.getCheckedCount() > 0) {
target = table.getCheckedKeys();
return UI_.Warning(table.getCheckedCount() + " объектов будет удален(о).");
return UI.Warning(table.getCheckedCount() + " объектов будет удален(о).");
} else {
if (Global.mainModule.Check(Log, table.CurrentName())) {
target = new Vector<>();

4
src/_VisualDVM/Passes/Testing/StartTestingPackage.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Passes.Testing;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.PublishServerObject;
@@ -35,7 +35,7 @@ public abstract class StartTestingPackage<P extends TestingPackage> extends Publ
Log.Writeln_("В пакете отсутствуют задачи.");
return false;
}
if (UI_.Question("Будет запущено:\n"
if (UI.Question("Будет запущено:\n"
+ target.tasksCount + " задач.\n" +
"Продолжить")) {
target.state = TasksPackageState.Queued;

3
src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
View File

@@ -27,6 +27,9 @@ import java.awt.event.KeyEvent;
import java.util.Vector;
public class SPFEditor extends BaseEditor implements SPFEditorInterface {
public static final Color never = new Color(229, 228, 226, 90);
//--
public static final Highlighter.HighlightPainter GreenTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
public static final Highlighter.HighlightPainter RedTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
public DBProjectFile file = null; //файл связанный с редактором
//----
public RSyntaxTextAreaHighlighter highlighter = null;

6
src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import Common.Visual.Trees.GraphTreeCellRenderer;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject;
@@ -13,8 +13,8 @@ public class FileGraphTree extends DataTree {
// ExpandAll();
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererGraph;
public Class getRendererClass() {
return GraphTreeCellRenderer.class;
}
@Override
public Current getCurrent() {

5
src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.DragDrop.FileDrop;
import Common.Visual.Trees.StyledTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -54,8 +53,8 @@ public class FilesTree extends StyledTree {
file_pass : folder_pass).Do();
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererFile;
public Class getRendererClass() {
return FilesTreeCellRenderer.class;
}
@Override
protected GraphMenu createMenu() {

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

@@ -3,7 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.ColumnFilter;
import Common.Visual.Tables.TableRenderers;
import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Global;
import javax.swing.table.TableModel;
@@ -29,7 +29,7 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setMinWidth(700);
columns.get(3).setRenderer(TableRenderers.RendererWrapText);
columns.get(3).setRendererClass(RendererWrapText.class);
}
@Override
public void MouseAction2() throws Exception {

4
src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.Messages.Recommendations;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -19,7 +19,7 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(1).setMinWidth(700);
columns.get(1).setRenderer(TableRenderers.RendererWrapText);
columns.get(1).setRendererClass(RendererWrapText.class);
}
};
}

2
src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java → src/_VisualDVM/ProjectData/Project/UI/RendererProjectVersion.java
View File

@@ -11,7 +11,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
import java.net.URL;
//https://docs.oracle.com/javase/7/docs/api/javax/swing/tree/DefaultMutableTreeNode.html
//https://java.hotexamples.com/ru/examples/java.awt/JTree/-/java-jtree-class-examples.html
public class VersionsTreeCellRenderer extends StyledTreeCellRenderer {
public class RendererProjectVersion extends StyledTreeCellRenderer {
public java.awt.Component getTreeCellRendererComponent(
JTree tree, Object value,
boolean selected, boolean expanded,

5
src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.ProjectData.Project.UI;
import Common.Visual.Selectable;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -31,8 +30,8 @@ public class VersionsTree extends DataTree {
});
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererVersion;
public Class getRendererClass() {
return RendererProjectVersion.class;
}
@Override
public Current getCurrent() {

4
src/_VisualDVM/ProjectData/Project/db_project_info.java
View File

@@ -5,7 +5,7 @@ import Common.Passes.PassException;
import Common.Utils.Index;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -1171,7 +1171,7 @@ public class db_project_info extends DBObject {
String[] localSplit = splited[idx++].split(" ");
int m_type = Integer.parseInt(localSplit[0]);
if (m_type == 1) {
UI_.Info(packed_messages);
UI.Info(packed_messages);
return true;
}
}

12
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
View File

@@ -1,16 +1,16 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererHiddenList;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Tables.EditorFilesHyperlinks;
import _VisualDVM.Visual.Tables.RendererHyperlinks;
import java.util.Vector;
import static Common.Visual.Tables.TableEditors.EditorHyperlinks;
import static Common.Visual.Tables.TableRenderers.RendererHiddenList;
import static Common.Visual.Tables.TableRenderers.RendererHyperlinks;
public class ArraysSet extends DataSet<Long, ProjectArray> {
public ArraysSet() {
super(Long.class, ProjectArray.class);
@@ -38,10 +38,10 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
if ((Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
columns.get(4).setRenderer(RendererHyperlinks);
columns.get(4).setEditor(EditorHyperlinks);
columns.get(4).setRendererClass(RendererHyperlinks.class);
columns.get(4).setEditorClass(EditorFilesHyperlinks.class);
} else {
columns.get(4).setRenderer(RendererHiddenList);
columns.get(4).setRendererClass(RendererHiddenList.class);
columns.get(4).setMaxWidth(200);
}
}

4
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.Tables.EditorDBObject;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import javax.swing.*;
public class DimensionStateChanger extends DBObjectEditor<TemplateDimension> {
public class DimensionStateChanger extends EditorDBObject<TemplateDimension> {
@Override
public Object getCellEditorValue() {
return value;

11
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
View File

@@ -3,16 +3,13 @@ import Common.MainModule_;
import Common.Visual.ControlForm;
import Common.Visual.Tables.Grid.GridAnchestor;
import Common.Visual.Tables.StyledTable;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import java.awt.*;
import java.util.Vector;
import static Common.Visual.Tables.TableEditors.EditorDimension;
import static Common.Visual.Tables.TableRenderers.RendererDimension;
public class DimensionsTableForm extends ControlForm<StyledTable> {
public DimensionsTableForm() {
super(StyledTable.class);
@@ -26,7 +23,7 @@ public class DimensionsTableForm extends ControlForm<StyledTable> {
@Override
public void Clear() {
super.Clear();
UI_.Clear(content);
UI.Clear(content);
}
@Override
public void CreateControl() {
@@ -48,8 +45,8 @@ public class DimensionsTableForm extends ControlForm<StyledTable> {
}) {
@Override
public void Init() {
setDefaultRenderer(TemplateDimension.class, MainModule_.instance.getUI().getTableRenderer(RendererDimension));
setDefaultEditor(TemplateDimension.class, MainModule_.instance.getUI().getTableEditor(EditorDimension));
setDefaultRenderer(TemplateDimension.class, MainModule_.instance.getUI().getTableRenderer(DimensionRenderer.class));
setDefaultEditor(TemplateDimension.class, MainModule_.instance.getUI().getTableEditor(DimensionStateChanger.class));
}
};
}

2
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java → src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RendererTreeRule.java
View File

@@ -6,7 +6,7 @@ import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
public class RulesTreeCellRenderer extends StyledTreeCellRenderer {
public class RendererTreeRule extends StyledTreeCellRenderer {
public java.awt.Component getTreeCellRendererComponent(
JTree tree, Object value,
boolean selected, boolean expanded,

6
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.Trees.StyledTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
@@ -9,7 +8,6 @@ import _VisualDVM.Visual.Menus.GraphMenu;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;
import static Common.Visual.Trees.TreeRenderers.RendererRule;
public class RulesTree extends StyledTree {
public RulesTree() {
super(Global.mainModule.getProject().align_rules_root);
@@ -23,8 +21,8 @@ public class RulesTree extends StyledTree {
return new DistributionMenu(this);
}
@Override
public TreeRenderers getRenderer() {
return RendererRule;
public Class getRendererClass() {
return RendererTreeRule.class;
}
@Override
public void SelectionAction(TreePath e) {

4
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -32,7 +32,7 @@ public class FuncCall extends FileObjectWithMessages {
if (Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
UI.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
}
}
}

4
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -41,7 +41,7 @@ public class FuncCallH extends FuncCall {
if (Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
UI.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
}
}
}

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