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-07 20:04:11 +03:00
parent e7f661f7ad
commit 7fac84740d
41 changed files with 164 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
.idea/workspace.xml generated
View File

@@ -8,92 +8,46 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/1.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/StringTemplate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/StringTemplate.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/DBObjectFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DBObjectFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/Selectable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Selectable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/Properties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Properties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/PassesSubMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/PassesSubMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextComboBoxMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextComboBoxMenu.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/ProjectFilesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/ProjectFilesMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/DataMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/PropertiesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/PropertiesSubmenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/VersionsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/VersionsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/VisualiserMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/VisualiserMenuItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Selectable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Selectable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/LanguagesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/LanguagesSubmenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/StatusEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/StatusEnum.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MenuBarButton.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/StatusEnumRenderer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/PassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/PassMenuItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectableTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectableTree.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/SettingsSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/SettingsSubmenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/TreeForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/StableMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/StableMenuItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/UI.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/StablePassMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/StablePassMenuItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VisualiserMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/ColumnFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/ColumnFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/GraphTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/GraphTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/DVMHelpParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/DVMHelpParser.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/DBSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/DBSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UI/UserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UI/UserFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Includes/FileInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Includes/FileInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParametersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParametersMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModulesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModulesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/TaskState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/TaskState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/User/UserState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UserState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Component.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/ComponentState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/SubscribersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubscribersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/FilterWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/FilterInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VariantsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

26
src/Common/Utils/CommonUtils.java
View File

@@ -1,10 +1,14 @@
package Common.Utils; package Common.Utils;
import Common.CommonConstants; import Common.CommonConstants;
import Common_old.Utils.Utils;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import javax.swing.*;
import java.awt.*;
import java.io.File; import java.io.File;
import java.net.URL;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Arrays; import java.util.Arrays;
import java.util.Vector; import java.util.Vector;
@@ -281,7 +285,27 @@ public class CommonUtils {
public static double getFileSizeMegaBytes(File file) { public static double getFileSizeMegaBytes(File file) {
return ((double)file.length()) / (1024 * 1024); return ((double)file.length()) / (1024 * 1024);
} }
//Иконки
public static ImageIcon getIcon(String path) {
URL imageUrl = CommonUtils.class.getResource(path);
if (imageUrl == null) {
return null;
}
return new ImageIcon(imageUrl);
}
public static ImageIcon getTabIcon(String path) {
URL imageUrl = CommonUtils.class.getResource(path);
if (imageUrl == null) {
return null;
}
ImageIcon icon = new ImageIcon(imageUrl);
return new ImageIcon(icon.getImage().getScaledInstance(
18,
18,
Image.SCALE_DEFAULT));
}
//- //-
//ГЕНЕРАЦИЯ ИМЕН //ГЕНЕРАЦИЯ ИМЕН Старт задачи
} }

3
src/Common/Visual/DBObjectFilter.java
View File

@@ -1,7 +1,6 @@
package Common.Visual; package Common.Visual;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common_old.UI.Menus_2023.StableMenuItem; import Common_old.UI.Menus_2023.StableMenuItem;
import Common_old.Utils.Utils;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
@@ -21,7 +20,7 @@ public abstract class DBObjectFilter<D extends DBObject> {
return "/Common/icons/Pick.png"; return "/Common/icons/Pick.png";
} }
void Mark() { void Mark() {
menuItem.setIcon(Utils.getIcon(active ? getActiveIconPath() : getNotActiveIconPath())); menuItem.setIcon(CommonUtils.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
} }
//------- //-------
public boolean Validate(D object) { public boolean Validate(D object) {

6
src/Common/Visual/Selectable.java
View File

@@ -1,5 +1,5 @@
package Common.Visual; package Common.Visual;
import Common_old.Utils.Utils; import Common.Utils.CommonUtils;
import javax.swing.*; import javax.swing.*;
public interface Selectable { public interface Selectable {
@@ -13,11 +13,11 @@ public interface Selectable {
default ImageIcon GetSelectionIcon() { default ImageIcon GetSelectionIcon() {
return return
isSelectionEnabled() ? isSelectionEnabled() ?
Utils.getIcon("/Common/icons/" + (isSelected() ? "Pick" : "NotPick") + ".png") : CommonUtils.getIcon("/Common/icons/" + (isSelected() ? "Pick" : "NotPick") + ".png") :
GetDisabledIcon(); GetDisabledIcon();
} }
default ImageIcon GetDisabledIcon() { default ImageIcon GetDisabledIcon() {
return Utils.getIcon("/Common/icons/Arrays/Unknown.png"); return CommonUtils.getIcon("/Common/icons/Arrays/Unknown.png");
} }
default void SwitchSelection() { default void SwitchSelection() {
Select(!isSelected()); Select(!isSelected());

3
src/Common_old/Properties.java
View File

@@ -1,7 +1,6 @@
package Common_old; package Common_old;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common_old.UI.Menus_2023.StableMenuItem; import Common_old.UI.Menus_2023.StableMenuItem;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
@@ -15,7 +14,7 @@ public abstract class Properties {
//- //-
menu_item.addActionListener(e -> { menu_item.addActionListener(e -> {
if (Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do(fieldName, !getFlag(fieldName))) if (Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
menu_item.setIcon(Utils.getIcon(getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png")); menu_item.setIcon(CommonUtils.getIcon(getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}); });
menu.add(menu_item); menu.add(menu_item);
} }

4
src/Common_old/UI/Menus/PassesSubMenu.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus; package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
@@ -9,7 +9,7 @@ import javax.swing.*;
public class PassesSubMenu extends JMenu { public class PassesSubMenu extends JMenu {
public PassesSubMenu(String title, String icon, PassCode_2021... passes) { public PassesSubMenu(String title, String icon, PassCode_2021... passes) {
super(title); super(title);
setIcon(Utils.getIcon(icon)); setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
for (PassCode_2021 code : passes) { for (PassCode_2021 code : passes) {
add(Pass_2021.passes.get(code).createMenuItem()); add(Pass_2021.passes.get(code).createMenuItem());

6
src/Common_old/UI/Menus/ProjectFilesMenu.java
View File

@@ -1,4 +1,5 @@
package Common_old.UI.Menus; package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Menus_2023.LanguagesSubmenu; import Common_old.UI.Menus_2023.LanguagesSubmenu;
@@ -7,7 +8,6 @@ import Common_old.UI.Menus_2023.StylesSubmenu;
import Common_old.UI.Menus_2023.TypesSubmenu; import Common_old.UI.Menus_2023.TypesSubmenu;
import Common_old.UI.Trees.StyledTree; import Common_old.UI.Trees.StyledTree;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Files.FileType; import ProjectData.Files.FileType;
import ProjectData.Files.LanguageStyle; import ProjectData.Files.LanguageStyle;
import ProjectData.LanguageName; import ProjectData.LanguageName;
@@ -61,10 +61,10 @@ public class ProjectFilesMenu extends GraphMenu {
}); });
addSeparator(); addSeparator();
m_multiselection = new VisualiserMenuItem("Массовый режим работы с файлами"); m_multiselection = new VisualiserMenuItem("Массовый режим работы с файлами");
m_multiselection.setIcon(Utils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png")); m_multiselection.setIcon(CommonUtils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.addActionListener(e -> { m_multiselection.addActionListener(e -> {
Global.files_multiselection = !Global.files_multiselection; Global.files_multiselection = !Global.files_multiselection;
m_multiselection.setIcon(Utils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png")); m_multiselection.setIcon(CommonUtils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
Current.getProject().SelectAllFiles(false); Current.getProject().SelectAllFiles(false);
UI.getMainWindow().getProjectWindow().RefreshProjectFiles(); UI.getMainWindow().getProjectWindow().RefreshProjectFiles();

4
src/Common_old/UI/Menus/PropertiesSubmenu.java
View File

@@ -1,15 +1,15 @@
package Common_old.UI.Menus; package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import javax.swing.*; import javax.swing.*;
public class PropertiesSubmenu extends JMenu { public class PropertiesSubmenu extends JMenu {
public PropertiesSubmenu(String title, String icon, String... settings) { public PropertiesSubmenu(String title, String icon, String... settings) {
super(title); super(title);
if (icon != null) if (icon != null)
setIcon(Utils.getIcon(icon)); setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
for (String name : settings) { for (String name : settings) {
Global.properties.addFlagMenuItem(this, name); Global.properties.addFlagMenuItem(this, name);

6
src/Common_old/UI/Menus/VersionsMenu.java
View File

@@ -1,10 +1,10 @@
package Common_old.UI.Menus; package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Menus_2023.StableMenuItem; import Common_old.UI.Menus_2023.StableMenuItem;
import Common_old.UI.Trees.DataTree; import Common_old.UI.Trees.DataTree;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
public class VersionsMenu extends GraphMenu<DataTree> { public class VersionsMenu extends GraphMenu<DataTree> {
@@ -17,10 +17,10 @@ public class VersionsMenu extends GraphMenu<DataTree> {
add(Pass_2021.passes.get(PassCode_2021.DeleteLonelyM).createMenuItem()); add(Pass_2021.passes.get(PassCode_2021.DeleteLonelyM).createMenuItem());
addSeparator(); addSeparator();
m_multiselection = new VisualiserMenuItem("Массовый режим работы с версиями"); m_multiselection = new VisualiserMenuItem("Массовый режим работы с версиями");
m_multiselection.setIcon(Utils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png")); m_multiselection.setIcon(CommonUtils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.addActionListener(e -> { m_multiselection.addActionListener(e -> {
Global.versions_multiselection = !Global.versions_multiselection; Global.versions_multiselection = !Global.versions_multiselection;
m_multiselection.setIcon(Utils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png")); m_multiselection.setIcon(CommonUtils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
Current.getRoot().SelectAllVersions(false); Current.getRoot().SelectAllVersions(false);
UI.getVersionsWindow().getVersionsForm().getTree().updateUI(); UI.getVersionsWindow().getVersionsForm().getTree().updateUI();
}); });

4
src/Common_old/UI/Menus/VisualiserMenuItem.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus; package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import javax.swing.*; import javax.swing.*;
public class VisualiserMenuItem extends JMenuItem { public class VisualiserMenuItem extends JMenuItem {
@@ -13,7 +13,7 @@ public class VisualiserMenuItem extends JMenuItem {
super(text); super(text);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
if (icon_path != null) if (icon_path != null)
setIcon(Utils.getIcon(icon_path)); setIcon(CommonUtils.getIcon(icon_path));
} }
public VisualiserMenuItem(){ public VisualiserMenuItem(){
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));

4
src/Common_old/UI/Menus_2023/LanguagesSubmenu.java
View File

@@ -1,5 +1,5 @@
package Common_old.UI.Menus_2023; package Common_old.UI.Menus_2023;
import Common_old.Utils.Utils; import Common.Utils.CommonUtils;
import ProjectData.LanguageName; import ProjectData.LanguageName;
import javax.swing.*; import javax.swing.*;
@@ -18,7 +18,7 @@ public abstract class LanguagesSubmenu extends VisualiserMenu {
JMenuItem languageItem = new StableMenuItem(languageName.getDescription()); JMenuItem languageItem = new StableMenuItem(languageName.getDescription());
String li = languageName.getIcon(); String li = languageName.getIcon();
if (!li.isEmpty()) if (!li.isEmpty())
languageItem.setIcon(Utils.getIcon(li)); languageItem.setIcon(CommonUtils.getIcon(li));
languageItem.addActionListener( languageItem.addActionListener(
new AbstractAction() { new AbstractAction() {
@Override @Override

4
src/Common_old/UI/Menus_2023/MenuBarButton.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023; package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@@ -27,7 +27,7 @@ public class MenuBarButton extends JButton {
super.paintComponent(g); super.paintComponent(g);
} }
public void setIcon(String icon_path) { public void setIcon(String icon_path) {
setIcon(Utils.getIcon(icon_path)); setIcon(CommonUtils.getIcon(icon_path));
} }
public void setFont(VisualiserFonts font_in){ public void setFont(VisualiserFonts font_in){
setFont(Current.getTheme().Fonts.get(font_in)); setFont(Current.getTheme().Fonts.get(font_in));

4
src/Common_old/UI/Menus_2023/PassMenuItem.java
View File

@@ -1,11 +1,11 @@
package Common_old.UI.Menus_2023; package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus.VisualiserMenuItem; import Common_old.UI.Menus.VisualiserMenuItem;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
public class PassMenuItem extends VisualiserMenuItem implements PassControl { public class PassMenuItem extends VisualiserMenuItem implements PassControl {
@Override @Override
public void setIcon(String icon_path) { public void setIcon(String icon_path) {
setIcon(Utils.getIcon(icon_path)); setIcon(CommonUtils.getIcon(icon_path));
} }
public PassMenuItem(Pass_2021 pass) { public PassMenuItem(Pass_2021 pass) {
setText(pass.getDescription()); setText(pass.getDescription());

4
src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java
View File

@@ -1,9 +1,9 @@
package Common_old.UI.Menus_2023.ProjectMenuBar; package Common_old.UI.Menus_2023.ProjectMenuBar;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.Menus_2023.VisualiserMenu; import Common_old.UI.Menus_2023.VisualiserMenu;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.ProjectView; import ProjectData.ProjectView;
import javax.swing.*; import javax.swing.*;
@@ -16,7 +16,7 @@ public class ProjectViewMenu extends VisualiserMenu {
for (ProjectView view : ProjectView.values()) { for (ProjectView view : ProjectView.values()) {
JMenuItem m = new JMenuItem(view.getDescription()) { JMenuItem m = new JMenuItem(view.getDescription()) {
{ {
setIcon(Utils.getIcon(view.getIcon())); setIcon(CommonUtils.getIcon(view.getIcon()));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
addActionListener(e -> { addActionListener(e -> {
Current.set(Current.ProjectView, view); Current.set(Current.ProjectView, view);

4
src/Common_old/UI/Menus_2023/SettingsSubmenu.java
View File

@@ -1,8 +1,8 @@
package Common_old.UI.Menus_2023; package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import GlobalData.Settings.SettingName; import GlobalData.Settings.SettingName;
import javax.swing.*; import javax.swing.*;
@@ -10,7 +10,7 @@ public class SettingsSubmenu extends JMenu {
public SettingsSubmenu(String title, String icon, SettingName... settings) { public SettingsSubmenu(String title, String icon, SettingName... settings) {
super(title); super(title);
if (icon != null) if (icon != null)
setIcon(Utils.getIcon(icon)); setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
for (SettingName c : settings) { for (SettingName c : settings) {
add(Global.db.settings.get(c).getMenuItem()); add(Global.db.settings.get(c).getMenuItem());

4
src/Common_old/UI/Menus_2023/StableMenuItem.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023; package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus.VisualiserMenuItem; import Common_old.UI.Menus.VisualiserMenuItem;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.Utils.Utils;
import javax.swing.*; import javax.swing.*;
import javax.swing.plaf.ComponentUI; import javax.swing.plaf.ComponentUI;
@@ -32,7 +32,7 @@ public class StableMenuItem extends VisualiserMenuItem {
} }
public StableMenuItem(String text, String icon_path) { public StableMenuItem(String text, String icon_path) {
super(text); super(text);
setIcon(Utils.getIcon(icon_path)); setIcon(CommonUtils.getIcon(icon_path));
setUI(new StableItemUI()); setUI(new StableItemUI());
} }
public StableMenuItem() { public StableMenuItem() {

4
src/Common_old/UI/Menus_2023/StablePassMenuItem.java
View File

@@ -1,10 +1,10 @@
package Common_old.UI.Menus_2023; package Common_old.UI.Menus_2023;
import Common_old.Utils.Utils; import Common.Utils.CommonUtils;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
public class StablePassMenuItem extends StableMenuItem implements PassControl { public class StablePassMenuItem extends StableMenuItem implements PassControl {
@Override @Override
public void setIcon(String icon_path) { public void setIcon(String icon_path) {
setIcon(Utils.getIcon(icon_path)); setIcon(CommonUtils.getIcon(icon_path));
} }
public StablePassMenuItem(Pass_2021 pass) { public StablePassMenuItem(Pass_2021 pass) {
setText(pass.getDescription()); setText(pass.getDescription());

4
src/Common_old/UI/Menus_2023/VisualiserMenu.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023; package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
@@ -15,7 +15,7 @@ public class VisualiserMenu extends JMenu {
setText(text); setText(text);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (!iconPath.isEmpty()) if (!iconPath.isEmpty())
setIcon(Utils.getIcon(iconPath)); setIcon(CommonUtils.getIcon(iconPath));
} }
public VisualiserMenu(String text, String iconPath) { public VisualiserMenu(String text, String iconPath) {
this(text, iconPath, false); this(text, iconPath, false);

4
src/Common_old/UI/Menus_2023/VisualiserMenuBar.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023; package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
@@ -36,7 +36,7 @@ public class VisualiserMenuBar extends JToolBar {
{ {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (icon_path_in != null) { if (icon_path_in != null) {
setIcon(Utils.getIcon(icon_path_in)); setIcon(CommonUtils.getIcon(icon_path_in));
} }
} }
}; };

4
src/Common_old/UI/Tables/ColumnFilter.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Tables; package Common_old.UI.Tables;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Utils.CommonUtils;
import Common_old.UI.TextField.StyledTextField; import Common_old.UI.TextField.StyledTextField;
import Common_old.Utils.Utils;
import javax.swing.*; import javax.swing.*;
import javax.swing.border.MatteBorder; import javax.swing.border.MatteBorder;
@@ -47,7 +47,7 @@ public class ColumnFilter {
//-- //--
dataSet.getUi().control.getColumnModel().getColumn(columnIndex).setHeaderRenderer((table, value, isSelected, hasFocus, row, column1) -> new JLabel() { dataSet.getUi().control.getColumnModel().getColumn(columnIndex).setHeaderRenderer((table, value, isSelected, hasFocus, row, column1) -> new JLabel() {
{ {
setIcon(Utils.getIcon("/icons/Filter.png")); setIcon(CommonUtils.getIcon("/icons/Filter.png"));
setForeground(dataSet.getUi().control.getTableHeader().getForeground()); setForeground(dataSet.getUi().control.getTableHeader().getForeground());
setBackground(dataSet.getUi().control.getTableHeader().getBackground()); setBackground(dataSet.getUi().control.getTableHeader().getBackground());
setFont(dataSet.getUi().control.getTableHeader().getFont()); setFont(dataSet.getUi().control.getTableHeader().getFont());

4
src/Common_old/UI/Trees/GraphTreeCellRenderer.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Trees; package Common_old.UI.Trees;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import ProjectData.SapforData.FileObjectWithMessages; import ProjectData.SapforData.FileObjectWithMessages;
import javax.swing.*; import javax.swing.*;
@@ -15,7 +15,7 @@ public class GraphTreeCellRenderer extends StyledTreeCellRenderer {
Object o = ((DefaultMutableTreeNode) value).getUserObject(); Object o = ((DefaultMutableTreeNode) value).getUserObject();
if (o instanceof FileObjectWithMessages) { if (o instanceof FileObjectWithMessages) {
FileObjectWithMessages target = (FileObjectWithMessages) o; FileObjectWithMessages target = (FileObjectWithMessages) o;
setIcon(Utils.getIcon(target.ImageKey())); setIcon(CommonUtils.getIcon(target.ImageKey()));
setFont(Current.getTheme().Fonts.get(target.getFont())); setFont(Current.getTheme().Fonts.get(target.getFont()));
} else { } else {
setIcon(null); setIcon(null);

4
src/Common_old/UI/Windows/Dialog/Dialog.java
View File

@@ -1,4 +1,5 @@
package Common_old.UI.Windows.Dialog; package Common_old.UI.Windows.Dialog;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -6,7 +7,6 @@ import _VisualDVM.Syntax.ThemeElement;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common_old.Utils.Utils;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@@ -40,7 +40,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
getContentPane().setLayout(new BorderLayout()); getContentPane().setLayout(new BorderLayout());
lTitle.setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu)); lTitle.setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
if (!getIconPath().isEmpty()) { if (!getIconPath().isEmpty()) {
setIconImage(Utils.getIcon(getIconPath()).getImage()); setIconImage(CommonUtils.getIcon(getIconPath()).getImage());
} }
//делаем титульную надпись в самом окне чтобы не зависеть от языковой политики ОС //делаем титульную надпись в самом окне чтобы не зависеть от языковой политики ОС
getContentPane().add(lTitle, BorderLayout.NORTH); getContentPane().add(lTitle, BorderLayout.NORTH);

19
src/Common_old/Utils/Utils.java
View File

@@ -16,7 +16,6 @@ import Visual_DVM_2021.Passes.PassException;
import javafx.util.Pair; import javafx.util.Pair;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import java.awt.*; import java.awt.*;
import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.DataFlavor;
@@ -259,24 +258,6 @@ public class Utils {
//нужно проверить корень на наличие хоть одной программы. //нужно проверить корень на наличие хоть одной программы.
return Log.isEmpty(); return Log.isEmpty();
} }
public static ImageIcon getIcon(String path) {
URL imageUrl = Utils.class.getResource(path);
if (imageUrl == null) {
return null;
}
return new ImageIcon(imageUrl);
}
public static ImageIcon getTabIcon(String path) {
URL imageUrl = Utils.class.getResource(path);
if (imageUrl == null) {
return null;
}
ImageIcon icon = new ImageIcon(imageUrl);
return new ImageIcon(icon.getImage().getScaledInstance(
18,
18,
Image.SCALE_DEFAULT));
}
public static void CopyToClipboard(String text) { public static void CopyToClipboard(String text) {
Toolkit.getDefaultToolkit() Toolkit.getDefaultToolkit()
.getSystemClipboard() .getSystemClipboard()

3
src/GlobalData/Settings/DBSetting.java
View File

@@ -2,7 +2,6 @@ package GlobalData.Settings;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common_old.UI.Menus_2023.StableMenuItem; import Common_old.UI.Menus_2023.StableMenuItem;
import Common_old.Utils.Utils;
import Repository.Component.ComponentType; import Repository.Component.ComponentType;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
@@ -65,7 +64,7 @@ public class DBSetting extends DBObject {
public void Mark() { public void Mark() {
switch (settingType) { switch (settingType) {
case SapforFlag: case SapforFlag:
getMenuItem().setIcon(Utils.getIcon(toBoolean() ? "/icons/Pick.png" : "/icons/NotPick.png")); getMenuItem().setIcon(CommonUtils.getIcon(toBoolean() ? "/icons/Pick.png" : "/icons/NotPick.png"));
break; break;
case PercentField: case PercentField:
getMenuItem().setText(Name.getDescription() + " : " + this + "%"); getMenuItem().setText(Name.getDescription() + " : " + this + "%");

1
src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
View File

@@ -1,4 +1,5 @@
package GlobalData.Tasks.Supervisor.Remote; package GlobalData.Tasks.Supervisor.Remote;
import Common_old.UI.UI;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import GlobalData.Makefile.Makefile; import GlobalData.Makefile.Makefile;
import GlobalData.RemoteFile.RemoteFile; import GlobalData.RemoteFile.RemoteFile;

4
src/GlobalData/User/UI/UserFields.java
View File

@@ -1,9 +1,9 @@
package GlobalData.User.UI; package GlobalData.User.UI;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus.TextEditorMenu; import Common_old.UI.Menus.TextEditorMenu;
import Common_old.UI.TextField.StyledPasswordField; import Common_old.UI.TextField.StyledPasswordField;
import Common_old.UI.TextField.StyledTextField; import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields; import Common_old.UI.Windows.Dialog.DialogFields;
import Common_old.Utils.Utils;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@@ -27,7 +27,7 @@ public class UserFields implements DialogFields {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
password_visible = !password_visible; password_visible = !password_visible;
tfPassword.setEchoChar(password_visible ? unmask : mask); tfPassword.setEchoChar(password_visible ? unmask : mask);
bPasswordVisibility.setIcon(Utils.getIcon("/icons/" + (password_visible ? "Show" : "Hide") + "Password.png")); bPasswordVisibility.setIcon(CommonUtils.getIcon("/icons/" + (password_visible ? "Show" : "Hide") + "Password.png"));
} }
}); });
} }

3
src/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -3,7 +3,6 @@ import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Utils.Index; import Common.Utils.Index;
import Common_old.Utils.Utils;
import ProjectData.DBArray.DBArray; import ProjectData.DBArray.DBArray;
import ProjectData.Files.DBProjectFile; import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.Arrays.Distribution.Dimension; import ProjectData.SapforData.Arrays.Distribution.Dimension;
@@ -359,7 +358,7 @@ public class ProjectArray extends DBObject {
} }
@Override @Override
public ImageIcon GetDisabledIcon() { public ImageIcon GetDisabledIcon() {
return Utils.getIcon("/icons/Arrays/" + State.toString() + ".png"); return CommonUtils.getIcon("/icons/Arrays/" + State.toString() + ".png");
} }
@Override @Override
public void select(boolean flag) { public void select(boolean flag) {

3
src/ProjectData/SapforData/Functions/FuncInfo.java
View File

@@ -1,7 +1,6 @@
package ProjectData.SapforData.Functions; package ProjectData.SapforData.Functions;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Utils.Index; import Common.Utils.Index;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile; import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages; import ProjectData.SapforData.FileObjectWithMessages;
import com.mxgraph.model.mxCell; import com.mxgraph.model.mxCell;
@@ -65,7 +64,7 @@ public class FuncInfo extends FileObjectWithMessages {
} }
@Override @Override
public ImageIcon GetDisabledIcon() { public ImageIcon GetDisabledIcon() {
return Utils.getIcon("/icons/Function.png"); return CommonUtils.getIcon("/icons/Function.png");
} }
@Override @Override
public void SelectAllChildren(boolean select) { public void SelectAllChildren(boolean select) {

4
src/ProjectData/SapforData/Includes/FileInfo.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Includes; package ProjectData.SapforData.Includes;
import Common_old.Utils.Utils; import Common.Utils.CommonUtils;
import ProjectData.SapforData.FileObject; import ProjectData.SapforData.FileObject;
import javax.swing.*; import javax.swing.*;
@@ -19,7 +19,7 @@ public class FileInfo extends FileObject {
} }
@Override @Override
public ImageIcon GetDisabledIcon() { public ImageIcon GetDisabledIcon() {
return Utils.getIcon("/icons/File.png"); return CommonUtils.getIcon("/icons/File.png");
} }
@Override @Override
public void SelectAllChildren(boolean select) { public void SelectAllChildren(boolean select) {

3
src/TestingSystem/Common/Configuration/Configuration.java
View File

@@ -3,7 +3,6 @@ import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject; import Common.Database.Objects.riDBObject;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common_old.Utils.Utils;
import TestingSystem.Common.Group.Group; import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Group.Json.GroupsJson; import TestingSystem.Common.Group.Json.GroupsJson;
import TestingSystem.Common.Settings.Json.SettingsArrayJson; import TestingSystem.Common.Settings.Json.SettingsArrayJson;
@@ -34,7 +33,7 @@ public class Configuration extends riDBObject {
autoTesting = (autoTesting == 0) ? 1 : 0; autoTesting = (autoTesting == 0) ? 1 : 0;
} }
public ImageIcon GetAutoIcon() { public ImageIcon GetAutoIcon() {
return Utils.getIcon("/Common/icons/" + (autoTesting == 1 ? "RedPick" : "NotPick") + ".png"); return CommonUtils.getIcon("/Common/icons/" + (autoTesting == 1 ? "RedPick" : "NotPick") + ".png");
} }
//-- //--
@Description("DEFAULT ''") @Description("DEFAULT ''")

4
src/TestingSystem/Common/Group/GroupsMenuBar.java
View File

@@ -1,8 +1,8 @@
package TestingSystem.Common.Group; package TestingSystem.Common.Group;
import Common.Utils.CommonUtils;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common.Visual.DataMenuBar; import Common.Visual.DataMenuBar;
import Common_old.UI.Menus_2023.MenuBarButton; import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.Utils.Utils;
import TestingSystem.Common.Group.UI.AddGroupMenu; import TestingSystem.Common.Group.UI.AddGroupMenu;
import TestingSystem.Common.Group.UI.EditGroupMenu; import TestingSystem.Common.Group.UI.EditGroupMenu;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
@@ -29,7 +29,7 @@ public class GroupsMenuBar extends DataMenuBar {
}); });
} }
public void Mark() { public void Mark() {
setIcon(Utils.getIcon(GroupsDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png")); setIcon(CommonUtils.getIcon(GroupsDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
} }
}); });
} }

8
src/TestingSystem/Common/TestingBar.java
View File

@@ -1,11 +1,11 @@
package TestingSystem.Common; package TestingSystem.Common;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Menus_2023.MenuBarButton; import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.UI.Menus_2023.VisualiserMenuBar; import Common_old.UI.Menus_2023.VisualiserMenuBar;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*; import javax.swing.*;
@@ -46,7 +46,7 @@ public class TestingBar extends VisualiserMenuBar {
}); });
} }
public void Mark() { public void Mark() {
setIcon(Utils.getIcon(Global.properties.EmailOnTestingProgress ? "/icons/Pick.png" : "/icons/NotPick.png")); setIcon(CommonUtils.getIcon(Global.properties.EmailOnTestingProgress ? "/icons/Pick.png" : "/icons/NotPick.png"));
} }
}); });
//-- //--
@@ -67,7 +67,7 @@ public class TestingBar extends VisualiserMenuBar {
}); });
} }
public void Mark() { public void Mark() {
setIcon(Utils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png")); setIcon(CommonUtils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));
} }
}); });
//-- //--
@@ -90,7 +90,7 @@ public class TestingBar extends VisualiserMenuBar {
addPasses(PassCode_2021.StartTestingServer, PassCode_2021.ShutdownTestingServer, PassCode_2021.PublishTestingServer); addPasses(PassCode_2021.StartTestingServer, PassCode_2021.ShutdownTestingServer, PassCode_2021.PublishTestingServer);
} }
public void ShowAutoCheckTesting() { public void ShowAutoCheckTesting() {
autorefreshButton.setIcon(Utils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png")); autorefreshButton.setIcon(CommonUtils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));
} }
public void showServerAdminLabel(boolean flag) { public void showServerAdminLabel(boolean flag) {
serverAdminLabel.setVisible(flag); serverAdminLabel.setVisible(flag);

6
src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
View File

@@ -1,8 +1,8 @@
package TestingSystem.DVM.DVMPackage; package TestingSystem.DVM.DVMPackage;
import Common.Utils.CommonUtils;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common.Visual.DataMenuBar; import Common.Visual.DataMenuBar;
import Common_old.UI.Menus_2023.MenuBarButton; import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*; import javax.swing.*;
@@ -29,7 +29,7 @@ public class DVMPackagesBar extends DataMenuBar {
}); });
} }
public void Mark() { public void Mark() {
setIcon(Utils.getIcon(DVMPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png")); setIcon(CommonUtils.getIcon(DVMPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
} }
}); });
add(new MenuBarButton() { add(new MenuBarButton() {
@@ -44,7 +44,7 @@ public class DVMPackagesBar extends DataMenuBar {
}); });
} }
public void Mark() { public void Mark() {
setIcon(Utils.getIcon(DVMPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png")); setIcon(CommonUtils.getIcon(DVMPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png"));
} }
}); });
} }

27
src/TestingSystem/DVM/UserConnection.java
View File

@@ -2,6 +2,7 @@ package TestingSystem.DVM;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common_old.Constants; import Common_old.Constants;
import Common_old.UI.UI;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import GlobalData.Machine.Machine; import GlobalData.Machine.Machine;
@@ -194,6 +195,7 @@ public class UserConnection {
try { try {
sftpChannel.lstat(file_full_name); sftpChannel.lstat(file_full_name);
return true; return true;
} catch (SftpException e) { } catch (SftpException e) {
if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
// file doesn't exist // file doesn't exist
@@ -204,6 +206,24 @@ public class UserConnection {
} }
} }
} }
public boolean Busy(String file_full_name) throws Exception {
try {
sftpChannel.lstat(file_full_name);
return true;
} catch (SftpException e) {
if (e.id == ChannelSftp.SSH_FX_PERMISSION_DENIED) {
// file busy
return false;
} else {
// something else went wrong
throw e;
}
}
}
public boolean Busy(RemoteFile file) throws Exception {
return Busy(file.full_name);
}
public boolean Exists(RemoteFile file) throws Exception { public boolean Exists(RemoteFile file) throws Exception {
return Exists(file.full_name); return Exists(file.full_name);
} }
@@ -466,6 +486,12 @@ public class UserConnection {
Utils.sleep(1000); Utils.sleep(1000);
} }
} }
public void waitForFileFree(RemoteFile file) throws Exception {
while (!Busy(file)) {
System.out.println(file.full_name + " PERMISSION DENIED");
Utils.sleep(1000);
}
}
public String startShellProcess(RemoteFile directory, String outFileName, String... commands) throws Exception { public String startShellProcess(RemoteFile directory, String outFileName, String... commands) throws Exception {
Vector<String> commands_ = new Vector<>(); Vector<String> commands_ = new Vector<>();
commands_.add("cd " + CommonUtils.DQuotes(directory.full_name)); commands_.add("cd " + CommonUtils.DQuotes(directory.full_name));
@@ -488,6 +514,7 @@ public class UserConnection {
ShellConnect(); ShellConnect();
pin.write(("nohup " + start_command + " &\r\n").getBytes()); pin.write(("nohup " + start_command + " &\r\n").getBytes());
waitForFileCreation(outFile); waitForFileCreation(outFile);
waitForFileFree(outFile);
ShellDisconnect(); ShellDisconnect();
return readFromFile(outFile).replace("\n", "").replace("\r", ""); return readFromFile(outFile).replace("\n", "").replace("\r", "");
} }

6
src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
View File

@@ -1,8 +1,8 @@
package TestingSystem.SAPFOR.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.Utils.CommonUtils;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common.Visual.DataMenuBar; import Common.Visual.DataMenuBar;
import Common_old.UI.Menus_2023.MenuBarButton; import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.Utils.Utils;
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable; import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
@@ -30,7 +30,7 @@ public class SapforPackagesBar extends DataMenuBar {
}); });
} }
public void Mark() { public void Mark() {
setIcon(Utils.getIcon(SapforPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png")); setIcon(CommonUtils.getIcon(SapforPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
} }
}); });
add(new MenuBarButton() { add(new MenuBarButton() {
@@ -45,7 +45,7 @@ public class SapforPackagesBar extends DataMenuBar {
}); });
} }
public void Mark() { public void Mark() {
setIcon(Utils.getIcon(SapforPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png")); setIcon(CommonUtils.getIcon(SapforPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png"));
} }
}); });
} }

4
src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile; import ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
@@ -14,7 +14,7 @@ public class CloseCurrentFile extends Pass_2021<DBProjectFile> {
} }
@Override @Override
public Icon getTabIcon() { public Icon getTabIcon() {
return Utils.getIcon("/icons/Close_18.png"); return CommonUtils.getIcon("/icons/Close_18.png");
} }
@Override @Override
public String getButtonText() { public String getButtonText() {

4
src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
View File

@@ -1,8 +1,8 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
@@ -20,7 +20,7 @@ public class CloseCurrentProject extends Pass_2021<db_project_info> {
} }
@Override @Override
public Icon getTabIcon() { public Icon getTabIcon() {
return Utils.getIcon("/icons/Close_18.png"); return CommonUtils.getIcon("/icons/Close_18.png");
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {

3
src/Visual_DVM_2021/Passes/Pass_2021.java
View File

@@ -9,7 +9,6 @@ import Common_old.UI.Menus_2023.StablePassMenuItem;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common.Utils.Stopwatch; import Common.Utils.Stopwatch;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common_old.Utils.Utils;
import Visual_DVM_2021.PassStats.PassStats; import Visual_DVM_2021.PassStats.PassStats;
import Visual_DVM_2021.Passes.UI.PassForm; import Visual_DVM_2021.Passes.UI.PassForm;
@@ -78,7 +77,7 @@ public class Pass_2021<T> {
return null; return null;
} }
public Icon getTabIcon(){ public Icon getTabIcon(){
return Utils.getTabIcon(getIconPath()); return CommonUtils.getTabIcon(getIconPath());
} }
public AbstractAction getControlAction() { public AbstractAction getControlAction() {
return new AbstractAction() { return new AbstractAction() {

8
src/Visual_DVM_2021/UI/Main/MainForm.java
View File

@@ -1,4 +1,5 @@
package Visual_DVM_2021.UI.Main; package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -6,7 +7,6 @@ import Common_old.UI.Menus_2023.MainMenuBar.MainWindow;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.UI.Windows.Form; import Common_old.UI.Windows.Form;
import Common_old.UI.Windows.FormType; import Common_old.UI.Windows.FormType;
import Common_old.Utils.Utils;
import TestingSystem.Common.Group.Group; import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test; import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
@@ -101,7 +101,7 @@ public class MainForm extends Form implements MainWindow {
} }
private void InstallCallbackPanel() { private void InstallCallbackPanel() {
globalTabs.insertTab("Обратная связь", globalTabs.insertTab("Обратная связь",
Utils.getIcon("/icons/Bug.png"), CommonUtils.getIcon("/icons/Bug.png"),
(callbackForm = new CallbackForm()).getContent(), (callbackForm = new CallbackForm()).getContent(),
"Журнал ошибок и связь с разработчиками", 1); "Журнал ошибок и связь с разработчиками", 1);
} }
@@ -113,7 +113,7 @@ public class MainForm extends Form implements MainWindow {
} }
private void InstallTestsPanel() { private void InstallTestsPanel() {
globalTabs.insertTab("Тесты", globalTabs.insertTab("Тесты",
Utils.getIcon("/icons/Library.PNG"), CommonUtils.getIcon("/icons/Library.PNG"),
(testsForm = new TestsForm()).getContent(), (testsForm = new TestsForm()).getContent(),
"Библиотека тестов на сервере", 2); "Библиотека тестов на сервере", 2);
} }
@@ -126,7 +126,7 @@ public class MainForm extends Form implements MainWindow {
private void InstallTestingPanel() { private void InstallTestingPanel() {
testingForm = new TestingForm(); testingForm = new TestingForm();
globalTabs.insertTab("Тестирование", globalTabs.insertTab("Тестирование",
Utils.getIcon("/icons/Session.png"), CommonUtils.getIcon("/icons/Session.png"),
testingForm.getContent(), testingForm.getContent(),
"Система тестирования", 3); "Система тестирования", 3);
} }

8
src/Visual_DVM_2021/UI/Main/ProjectForm.java
View File

@@ -1,4 +1,5 @@
package Visual_DVM_2021.UI.Main; package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -6,7 +7,6 @@ import Common_old.UI.Editor.Viewer;
import Common_old.UI.Menus_2023.ProjectMenuBar.ProjectMenuBar; import Common_old.UI.Menus_2023.ProjectMenuBar.ProjectMenuBar;
import Common_old.UI.Trees.TreeForm; import Common_old.UI.Trees.TreeForm;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.Utils.Utils;
import GlobalData.Settings.SettingName; import GlobalData.Settings.SettingName;
import ProjectData.Files.DBProjectFile; import ProjectData.Files.DBProjectFile;
import ProjectData.Files.UI.FilesTree; import ProjectData.Files.UI.FilesTree;
@@ -256,7 +256,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
CommonUI.Clear(projectViewPanel); CommonUI.Clear(projectViewPanel);
ProjectView view = Current.getProjectView(); ProjectView view = Current.getProjectView();
menuBar.getProjectViewMenu().setToolTipText(view.getDescription()); menuBar.getProjectViewMenu().setToolTipText(view.getDescription());
menuBar.getProjectViewMenu().setIcon(Utils.getIcon(view.getIcon())); menuBar.getProjectViewMenu().setIcon(CommonUtils.getIcon(view.getIcon()));
switch (view) { switch (view) {
case Files: case Files:
projectViewPanel.add(filesForm.getContent()); projectViewPanel.add(filesForm.getContent());
@@ -276,13 +276,13 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
//- //-
private void InstallVersionsPanel() { private void InstallVersionsPanel() {
projectTabs.insertTab("", projectTabs.insertTab("",
Utils.getIcon("/icons/VersionsTree.png"), CommonUtils.getIcon("/icons/VersionsTree.png"),
UI.getVersionsWindow().getContent(), UI.getVersionsWindow().getContent(),
"Версии", 5); "Версии", 5);
} }
private void InstallDebugPanel() { private void InstallDebugPanel() {
projectTabs.insertTab("", projectTabs.insertTab("",
Utils.getIcon("/icons/Command.png"), CommonUtils.getIcon("/icons/Command.png"),
UI.getDebugWindow().getContent(), UI.getDebugWindow().getContent(),
"Компиляция и запуск", 6); "Компиляция и запуск", 6);
} }

10
src/Visual_DVM_2021/UI/Main/VariantsForm.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.UI.Main; package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.Trees.TreeForm; import Common_old.UI.Trees.TreeForm;
import Common_old.Utils.Utils;
import ProjectData.SapforData.Arrays.UI.DimensionsTableForm; import ProjectData.SapforData.Arrays.UI.DimensionsTableForm;
import ProjectData.SapforData.Arrays.UI.RulesTree; import ProjectData.SapforData.Arrays.UI.RulesTree;
import Visual_DVM_2021.UI.Interface.VariantsWindow; import Visual_DVM_2021.UI.Interface.VariantsWindow;
@@ -34,7 +34,7 @@ public class VariantsForm implements VariantsWindow {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Current.getProject().SwitchFilterDistributed(); Current.getProject().SwitchFilterDistributed();
BDistributed.setIcon(Utils.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png")); BDistributed.setIcon(CommonUtils.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
ShowVariantsFilter(); ShowVariantsFilter();
ShowFilteredVariantsCount(); ShowFilteredVariantsCount();
} }
@@ -43,7 +43,7 @@ public class VariantsForm implements VariantsWindow {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Current.getProject().SwitchFilterMultiplied(); Current.getProject().SwitchFilterMultiplied();
bMultiplied.setIcon(Utils.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png")); bMultiplied.setIcon(CommonUtils.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
ShowVariantsFilter(); ShowVariantsFilter();
ShowFilteredVariantsCount(); ShowFilteredVariantsCount();
} }
@@ -68,8 +68,8 @@ public class VariantsForm implements VariantsWindow {
} }
@Override @Override
public void ShowVariantsFilterButtons() { public void ShowVariantsFilterButtons() {
BDistributed.setIcon(Utils.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png")); BDistributed.setIcon(CommonUtils.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
bMultiplied.setIcon(Utils.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png")); bMultiplied.setIcon(CommonUtils.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
} }
@Override @Override
public void ShowVariantsFilter() { public void ShowVariantsFilter() {