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

no message

Browse Source
This commit is contained in:
02090095
2024-10-08 22:33:49 +03:00
parent 90546fc62e
commit e0974fe4a8
246 changed files with 1170 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

260
.idea/workspace.xml generated
View File

@@ -7,17 +7,251 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBForm/Json/SplitterJson.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/Common/Visual/Themes/DefaultTheme.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBForm/Json/SplittersJson.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/SPFEditorTheme.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Form.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Form.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/GlobalData/FormsParams/DBForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBForm/DBForm.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/GlobalData/FormsParams/DBMainFormParams.java" beforeDir="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/GlobalData/FormsParams/FormsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBForm/FormsDBTable.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/GlobalData/FormsParams/MainFormParamsDBTable.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/StatusEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/StatusEnum.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common_old/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Current.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Editor/BaseEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/List/HyperlinksStyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/List/HyperlinksStyledList.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/List/StyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/List/StyledList.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/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/StyledPopupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/StyledPopupMenu.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/Menus_2023/CredentialsBar/CredentialsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.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/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/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/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/ProgressBar/StyledProgressBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/ProgressBar/StyledProgressBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/HiddenListRenderer.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/Tables/StyledCellLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/StyledCellLabel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/StyledTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/StyledTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/WrapTextRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/WrapTextRenderer.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/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/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/StyledTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/StyledTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/StyledTreeCellRenderer.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/Windows/Dialog/DBObjectDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DBObjectDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogSlider.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogSlider.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogSpinner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogSpinner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogTextField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/DialogWrapText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/NumberDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/NumberDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/PercentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/PercentsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/SessionMaxtimeDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/SessionMaxtimeDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/SliderNumberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/SliderNumberForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/SpinnerNumberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/SpinnerNumberForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/ComboTextDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/ComboTextDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/FileNameForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/FileNameForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/MultilineTextForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/TextDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/TextDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Text/TextFieldDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Text/TextFieldDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Form.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Form.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/FormType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/FormType.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Sapfor.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/icons/Sapfor.png" 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/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/UI/CompilerFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/UI/CompilerFields.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/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.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/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionsFields.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/GlobalData/DVMParameter/UI/DVMParameterFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/UI/DVMParameterFields.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/UI/EnvironmentValueFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.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/UI/MachineFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/UI/MachineFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/UI/MakefilePreviewForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/UI/MakefilePreviewForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModulesDBTable.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/RemoteFile/UI/RemoteFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileRenderer.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/UI/RunConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/SapforProfile/UI/SapforProfileFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/SapforProfile/UI/SapforProfileFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.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/UI/UserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UI/UserFields.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/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesHyperlinksPanel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesHyperlinksPanel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.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/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/FileObjectWithMessages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/FileObjectWithMessages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCallH.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/EGoto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/EGoto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IGoto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IGoto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/IO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Loop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Loop.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/LoopState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/LoopState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/NonRectIter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/NonRectIter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Stop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Loops/Stop.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/UI/ParallelRegionFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/UI/ParallelRegionFields.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/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/Component/OSDComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/OSDComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/ComponentsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/PickUpComponentFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/PickUpComponentFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/PublishFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/PublishFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/PublishForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/PublishForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualizer_2.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/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberFields.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/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Group.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/UI/GroupFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/GroupFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.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/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/TestFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/UI/TestFields.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/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.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/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.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/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.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/CloseProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CombineFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CombineFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CopyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CopyProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteVersion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GCOV.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GCOV.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RenameFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveGraph.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.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/Passes/ChangeFilePass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ChangeFilePass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.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/ProcessPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforFilesModification.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforFilesModification.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/StartTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/StartTestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/UI/PassForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CombineFilesDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FunctionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FunctionsForm.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/ProfilesFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.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/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/DarkVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/DarkVisualiserTheme.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/LightVisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Syntax/LightSPFEditorTheme.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/ThemeElement.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Themes/ThemeElement.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserColor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/VisualiserColor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserFonts.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Fonts/VisualiserFonts.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Themes/VisualiserTheme.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Syntax/VisualiserThemeName.java" beforeDir="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" />
@@ -116,16 +350,16 @@
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
</key> </key>
<key name="MoveMembersDialog.RECENTS_KEY"> <key name="MoveMembersDialog.RECENTS_KEY">
<recent name="Common.Visual.CommonUI" />
<recent name="CommomUI" />
<recent name="_VisualDVM.Global" />
<recent name="Common.CurrentAnchestor" /> <recent name="Common.CurrentAnchestor" />
<recent name="Common.Utils.CommonUtils" /> <recent name="Common.Utils.CommonUtils" />
<recent name="Common.CommonConstants" />
<recent name="Common.Visual.CommonUI" />
<recent name="Common_old.Constants" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Syntax" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Syntax" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
<recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" /> <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" />
<recent name="E:\Visual_DVM_2020\src\Visual_DVM_2021\UI\Main" /> <recent name="E:\Visual_DVM_2020\src\Visual_DVM_2021\UI\Main" />
</key> </key>

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

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

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

@@ -1,13 +1,11 @@
package Common.Database.Tables; package Common.Database.Tables;
import Common.CurrentAnchestor; import Common.CurrentAnchestor;
import Common_old.Current;
import Common.Visual.DataSetFilter; import Common.Visual.DataSetFilter;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.DataMenuBar; import Common.Visual.DataMenuBar;
import Common_old.UI.Tables.ColumnFilter; import Common_old.UI.Tables.ColumnFilter;
import Common_old.UI.UI; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DialogFields;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
@@ -135,7 +133,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return false; return false;
} }
public boolean ShowDeleteObjectDialog(DBObject object) { public boolean ShowDeleteObjectDialog(DBObject object) {
return UI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)"); return CommonUI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
} }
public String QName() { public String QName() {
return "\"" + Name + "\""; return "\"" + Name + "\"";

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

@@ -1,8 +1,6 @@
package Common.Utils; package Common.Utils;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Database.VisualiserDatabase; import Common.Database.VisualiserDatabase;
import Common.Mode;
import Common_old.Current;
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;
@@ -24,15 +22,20 @@ import java.util.concurrent.Semaphore;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class CommonUtils { public class CommonUtils {
//Режим static String HomePath = System.getProperty("user.dir");
public static Mode mode= Mode.Undefined; public static void setHomePath(String path_in){
public static boolean hasUI() { HomePath = path_in;
return mode.equals(Mode.Normal);
} }
//Текущая оперционная система //Текущая оперционная система
public static boolean isWindows=true; public static boolean isWindows() {
//Домашняя папка. return System.getProperty("os.name").startsWith("Windows");
public static String Home; }
public static String getHomePath(){
return HomePath;
}
public static File getHomeDirectory(){
return new File(getHomePath());
};
//ГЛОБАЛЬНЫЙ ЖУРНАЛ //ГЛОБАЛЬНЫЙ ЖУРНАЛ
public static Loggable MainLog; public static Loggable MainLog;
public static Semaphore date_semaphore = new Semaphore(1); public static Semaphore date_semaphore = new Semaphore(1);
@@ -148,9 +151,9 @@ public class CommonUtils {
return res.toString(); return res.toString();
} }
//Синтаксис и регулярные выражения //Синтаксис и регулярные выражения
public static String printAllForbiddenCharacters(){ public static String printAllForbiddenCharacters() {
Vector<String> res = new Vector<>(); Vector<String> res = new Vector<>();
for (char c: CommonConstants.forbidden_file_name_characters) for (char c : CommonConstants.forbidden_file_name_characters)
res.add(String.valueOf(c)); res.add(String.valueOf(c));
return String.join(" ", res); return String.join(" ", res);
} }
@@ -385,7 +388,7 @@ public class CommonUtils {
return path.replace('/', '\\'); return path.replace('/', '\\');
} }
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 byte[] fileToBytes(File src) throws Exception { public static byte[] fileToBytes(File src) throws Exception {
byte[] dst = Files.readAllBytes(src.toPath()); byte[] dst = Files.readAllBytes(src.toPath());

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

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

66
src/Common/Visual/CommonUI.java
View File

@@ -1,13 +1,41 @@
package Common.Visual; package Common.Visual;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Mode;
import Common.Utils.CommonUtils;
import Common.Visual.Themes.DefaultTheme;
import Common.Visual.Themes.VisualiserTheme;
import _VisualDVM.Global;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ChangeListener;
import javax.swing.text.DefaultFormatter;
import java.awt.*; import java.awt.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Stack; import java.util.Stack;
public class CommonUI { public class CommonUI {
public static boolean active=true; //есть ли интерфейс. в консольных версиях не нужен.
public static boolean isActive() {
return active;
}
//---
public static LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>(); public static LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
public static Stack<Component> windowsStack = new Stack<>(); public static Stack<Component> windowsStack = new Stack<>();
static VisualiserTheme theme = new DefaultTheme();
public static VisualiserTheme getTheme() {
return theme;
}
public static void setTheme(VisualiserTheme theme_in){
theme= theme_in;
}
public static Component getFrontWindow() {
Component res = null;
try {
res = windowsStack.peek();
} catch (Exception ignored){
}
return res;
}
//----- //-----
public static void Clear(Container container) { public static void Clear(Container container) {
container.removeAll(); container.removeAll();
@@ -37,4 +65,42 @@ public class CommonUI {
} }
} }
} }
public static void MakeSpinnerRapid(JSpinner spinner, ChangeListener listener) {
JComponent comp = spinner.getEditor();
JFormattedTextField field = (JFormattedTextField) comp.getComponent(0);
DefaultFormatter formatter = (DefaultFormatter) field.getFormatter();
formatter.setCommitsOnValidEdit(true);
formatter.setAllowsInvalid(true);
spinner.addChangeListener(listener);
}
//Примитивные диалоговые элементы
public static boolean Question(Component parent, String text) {
return !CommonUI.isActive() || (JOptionPane.showConfirmDialog(parent,
text + "?",
"Подтверждение",
JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == 0);
}
public static boolean Question(String text) {
return Question(getFrontWindow(), text);
}
public static void Info(String message) {
CommonUtils.CopyToClipboard(message);
if (CommonUI.isActive())
JOptionPane.showMessageDialog(getFrontWindow(), message, "", 1);
}
public static void Error(String message) {
CommonUtils.CopyToClipboard(message);
if (CommonUI.isActive())
JOptionPane.showMessageDialog(getFrontWindow(), message, "", 0);
}
public static boolean Warning(String text) {
return !CommonUI.isActive() ||
JOptionPane.showConfirmDialog(getFrontWindow(),
text + "\nВы уверены?",
"Подтверждение",
JOptionPane.YES_NO_OPTION,
JOptionPane.WARNING_MESSAGE) == 0;
}
//--
} }

2
src/_VisualDVM/Syntax/VisualiserFonts.java → src/Common/Visual/Fonts/VisualiserFonts.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.Syntax; package Common.Visual.Fonts;
public enum VisualiserFonts { public enum VisualiserFonts {
GoodState, GoodState,
ReadyState, ReadyState,

2
src/Common/Visual/StatusEnum.java
View File

@@ -1,5 +1,5 @@
package Common.Visual; package Common.Visual;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
public interface StatusEnum { public interface StatusEnum {
default String getDescription() { default String getDescription() {
return toString(); return toString();

60
src/Common/Visual/Themes/DefaultTheme.java Normal file
View File

@@ -0,0 +1,60 @@
package Common.Visual.Themes;
import java.awt.*;
public class DefaultTheme extends VisualiserTheme{
@Override
protected String getForegroundHex() {
return "#000000";
}
@Override
protected String getBackgroundHex() {
return "#f7f7f7";
}
@Override
protected String getSelectionBackgroundHex() {
return "#dae3f1";
}
@Override
protected String getTreeBackgroundHex() {
return "#ffffff";
}
@Override
protected String getBarForegroundHex() {
return "#637780";
}
@Override
protected String getBarBackgroundHex() {
return "#ffffff";
}
@Override
protected String getTableBackgroundHex() {
return "#ffffff";
}
@Override
protected Color getGoodFontColor() {
return Color.decode("#009738");
}
@Override
protected Color getReadyFontColor2() {
return Color.decode("#FFD700");
}
@Override
protected Color getProgressFontColor() {
return Color.decode("#f39a28");
}
@Override
protected Color getBadFontColor() {
return Color.decode("#ab0000");
}
@Override
protected Color getFatalFontColor() {
return Color.decode("#FF4500");
}
@Override
protected Color getUnknownFontColor() {
return Color.GRAY;
}
@Override
protected Color getHyperlinkFontColor() {
return Color.blue;
}
}

2
src/_VisualDVM/Syntax/ThemeElement.java → src/Common/Visual/Themes/ThemeElement.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.Syntax; package Common.Visual.Themes;
public interface ThemeElement { public interface ThemeElement {
default void FontUp() { default void FontUp() {
} }

175
src/Common/Visual/Themes/VisualiserTheme.java Normal file
View File

@@ -0,0 +1,175 @@
package Common.Visual.Themes;
import Common.Utils.CommonUtils;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.VisualiserColor;
import org.fife.ui.rsyntaxtextarea.Theme;
import java.awt.*;
import java.awt.font.TextAttribute;
import java.util.HashMap;
import java.util.LinkedHashMap;
import static java.awt.Font.MONOSPACED;
public abstract class VisualiserTheme {
public Color foreground;
public Color background;
public Color selection_background;
public Color trees_background;
public Color bar_foreground;
public Color bar_background;
public Color table_background;
//--
protected abstract String getForegroundHex();
protected abstract String getBackgroundHex();
protected abstract String getSelectionBackgroundHex();
protected abstract String getTreeBackgroundHex();
protected abstract String getBarForegroundHex();
protected abstract String getBarBackgroundHex();
protected abstract String getTableBackgroundHex();
protected abstract Color getGoodFontColor();
protected abstract Color getReadyFontColor2();
protected abstract Color getProgressFontColor();
protected abstract Color getBadFontColor();
protected abstract Color getFatalFontColor();
protected abstract Color getUnknownFontColor();
protected abstract Color getHyperlinkFontColor();
//--
public LinkedHashMap<VisualiserFonts, Font> Fonts = new LinkedHashMap<>();
public LinkedHashMap<VisualiserColor, Color> Colors = new LinkedHashMap<>();
protected void createFonts(){
Fonts.put(VisualiserFonts.GoodState,
new Font(
new HashMap<TextAttribute, Object>() {
{
put(TextAttribute.FAMILY, "Times New Roman");
put(TextAttribute.FOREGROUND, getGoodFontColor());
put(TextAttribute.SIZE, 16);
}
}
));
Fonts.put(VisualiserFonts.ReadyState,
new Font(
new HashMap<TextAttribute, Object>() {
{
put(TextAttribute.FAMILY, "Times New Roman");
put(TextAttribute.FOREGROUND, getReadyFontColor2());
put(TextAttribute.SIZE, 16);
}
}
));
Fonts.put(VisualiserFonts.BadState,
new Font(
new HashMap<TextAttribute, Object>() {
{
put(TextAttribute.FAMILY, "Times New Roman");
put(TextAttribute.FOREGROUND, getBadFontColor());
put(TextAttribute.SIZE, 16);
}
}
));
Fonts.put(VisualiserFonts.BlueState,
new Font(
new HashMap<TextAttribute, Object>() {
{
put(TextAttribute.FAMILY, "Times New Roman");
put(TextAttribute.FOREGROUND, getHyperlinkFontColor());
put(TextAttribute.SIZE, 16);
}
}
));
Fonts.put(VisualiserFonts.Fatal,
new Font(
new HashMap<TextAttribute, Object>() {
{
put(TextAttribute.FAMILY, "Times New Roman");
put(TextAttribute.FOREGROUND, getFatalFontColor());
put(TextAttribute.SIZE, 16);
}
}
));
Fonts.put(VisualiserFonts.UnknownState,
new Font(
new HashMap<TextAttribute, Object>() {
{
put(TextAttribute.FAMILY, "Times New Roman");
put(TextAttribute.FOREGROUND, getUnknownFontColor());
put(TextAttribute.SIZE, 16);
}
}
));
Fonts.put(VisualiserFonts.Hyperlink,
new Font(
new HashMap<TextAttribute, Object>() {
{
put(TextAttribute.FAMILY, MONOSPACED);
put(TextAttribute.FOREGROUND, getHyperlinkFontColor());
put(TextAttribute.SIZE, 18);
put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD);
put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
}
}
));
Fonts.put(VisualiserFonts.ProgressState,
new Font(
new HashMap<TextAttribute, Object>() {
{
put(TextAttribute.FAMILY, "Times New Roman");
put(TextAttribute.FOREGROUND, getProgressFontColor());
put(TextAttribute.SIZE, 16);
}
}
));
Fonts.put(VisualiserFonts.Disabled, new Font(
new HashMap<TextAttribute, Object>() {
{
put(TextAttribute.FAMILY, MONOSPACED);
put(TextAttribute.BACKGROUND, Color.lightGray);
put(TextAttribute.FOREGROUND, Color.lightGray);
put(TextAttribute.SIZE, 18);
put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
}
}
));
Fonts.put(VisualiserFonts.Distribution,
new Font(
new HashMap<TextAttribute, Object>() {
{
put(TextAttribute.FAMILY, MONOSPACED);
put(TextAttribute.SIZE, 16);
}
}
)
);
Fonts.put(VisualiserFonts.TreePlain, new Font("Times New Roman", Font.PLAIN, 16));
Fonts.put(VisualiserFonts.TreeItalic, new Font("Times New Roman", Font.ITALIC, 16));
Fonts.put(VisualiserFonts.TreeBold, new Font("Times New Roman", Font.BOLD, 16));
Fonts.put(VisualiserFonts.TreeBoldItalic, new Font("Times New Roman", Font.BOLD|Font.ITALIC, 16));
Fonts.put(VisualiserFonts.Menu, new Font("Times New Roman", Font.ITALIC, 16));
Fonts.put(VisualiserFonts.NewVersion, new Font(
new HashMap<TextAttribute, Object>() {
{
put(TextAttribute.FAMILY, "Times New Roman");
put(TextAttribute.FOREGROUND, Color.BLACK);
put(TextAttribute.BACKGROUND, Color.YELLOW);
put(TextAttribute.SIZE, 16);
}
}
));
}
public VisualiserTheme() {
try {
//-----------------------------------------------
foreground = Color.decode(getForegroundHex());
background = Color.decode(getBackgroundHex());
selection_background = Color.decode(getSelectionBackgroundHex());
trees_background = Color.decode(getTreeBackgroundHex());
bar_foreground = Color.decode(getBarForegroundHex());
bar_background = Color.decode(getBarBackgroundHex());
table_background = Color.decode(getTableBackgroundHex());
createFonts();
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
}
}
}

2
src/_VisualDVM/Syntax/VisualiserColor.java → src/Common/Visual/VisualiserColor.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.Syntax; package Common.Visual;
public enum VisualiserColor { public enum VisualiserColor {
ToolTip_background, ToolTip_background,
ToolTip_foreground ToolTip_foreground

2
src/Common_old/UI/Windows/Dialog/DBObjectDialog.java → src/Common/Visual/Windows/Dialog/DBObjectDialog.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
public abstract class DBObjectDialog<T extends DBObject, F extends DialogFields> extends Dialog<T, F> { public abstract class DBObjectDialog<T extends DBObject, F extends DialogFields> extends Dialog<T, F> {
public boolean edit = false; public boolean edit = false;

12
src/Common_old/UI/Windows/Dialog/Dialog.java → src/Common/Visual/Windows/Dialog/Dialog.java
View File

@@ -1,10 +1,8 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common_old.Current; import Common.Visual.Themes.ThemeElement;
import _VisualDVM.Syntax.ThemeElement; import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.UI;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import javax.swing.*; import javax.swing.*;
@@ -37,7 +35,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
setModal(true); setModal(true);
toFront(); toFront();
getContentPane().setLayout(new BorderLayout()); getContentPane().setLayout(new BorderLayout());
lTitle.setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu)); lTitle.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
if (!getIconPath().isEmpty()) { if (!getIconPath().isEmpty()) {
setIconImage(CommonUtils.getIcon(getIconPath()).getImage()); setIconImage(CommonUtils.getIcon(getIconPath()).getImage());
} }
@@ -139,7 +137,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
OK = true; OK = true;
CloseAction(); CloseAction();
} else } else
UI.Error("Валидация не пройдена:\n" + Log.toString()); CommonUI.Error("Валидация не пройдена:\n" + Log.toString());
} }
protected void onCancel() { protected void onCancel() {
CloseAction(); CloseAction();

2
src/Common_old/UI/Windows/Dialog/DialogFields.java → src/Common/Visual/Windows/Dialog/DialogFields.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
import java.awt.*; import java.awt.*;
public interface DialogFields { public interface DialogFields {
Component getContent(); Component getContent();

2
src/Common_old/UI/Windows/Dialog/DialogSlider.java → src/Common/Visual/Windows/Dialog/DialogSlider.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
public class DialogSlider extends JSlider implements DialogFields { public class DialogSlider extends JSlider implements DialogFields {

2
src/Common_old/UI/Windows/Dialog/DialogSpinner.java → src/Common/Visual/Windows/Dialog/DialogSpinner.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
public class DialogSpinner extends JSpinner implements DialogFields { public class DialogSpinner extends JSpinner implements DialogFields {

8
src/Common_old/UI/Windows/Dialog/DialogTextComboBox.java → src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
View File

@@ -1,12 +1,12 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
public class DialogTextComboBox extends JComboBox<String> implements DialogFields { public class DialogTextComboBox extends JComboBox<String> implements DialogFields {
public DialogTextComboBox() { public DialogTextComboBox() {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
setEditable(false); setEditable(false);
} }
@Override @Override

2
src/Common_old/UI/Windows/Dialog/DialogTextField.java → src/Common/Visual/Windows/Dialog/DialogTextField.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common_old.UI.TextField.StyledTextField; import Common_old.UI.TextField.StyledTextField;
import java.awt.*; import java.awt.*;

8
src/Common_old/UI/Windows/Dialog/DialogWrapText.java → src/Common/Visual/Windows/Dialog/DialogWrapText.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@@ -8,7 +8,7 @@ public class DialogWrapText extends JTextPane implements DialogFields {
public DialogWrapText(){ public DialogWrapText(){
setOpaque(true); setOpaque(true);
setBackground(Color.WHITE); setBackground(Color.WHITE);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeBold)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeBold));
setEditable(false); setEditable(false);
} }
@Override @Override

2
src/Common_old/UI/Windows/Dialog/NumberDialog.java → src/Common/Visual/Windows/Dialog/NumberDialog.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
public abstract class NumberDialog<F extends DialogFields> extends Dialog<Integer, F> { public abstract class NumberDialog<F extends DialogFields> extends Dialog<Integer, F> {
public NumberDialog(Class<F> f) { public NumberDialog(Class<F> f) {
super(f); super(f);

2
src/Common_old/UI/Windows/Dialog/PercentsForm.java → src/Common/Visual/Windows/Dialog/PercentsForm.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
public class PercentsForm extends SliderNumberForm { public class PercentsForm extends SliderNumberForm {
public PercentsForm() { public PercentsForm() {
} }

2
src/Common_old/UI/Windows/Dialog/SessionMaxtimeDialog.java → src/Common/Visual/Windows/Dialog/SessionMaxtimeDialog.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
import javax.swing.*; import javax.swing.*;
public class SessionMaxtimeDialog extends SpinnerNumberForm { public class SessionMaxtimeDialog extends SpinnerNumberForm {
public SessionMaxtimeDialog() { public SessionMaxtimeDialog() {

2
src/Common_old/UI/Windows/Dialog/SliderNumberForm.java → src/Common/Visual/Windows/Dialog/SliderNumberForm.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
public class SliderNumberForm extends NumberDialog<DialogSlider> { public class SliderNumberForm extends NumberDialog<DialogSlider> {

2
src/Common_old/UI/Windows/Dialog/SpinnerNumberForm.java → src/Common/Visual/Windows/Dialog/SpinnerNumberForm.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog; package Common.Visual.Windows.Dialog;
public abstract class SpinnerNumberForm extends NumberDialog<DialogSpinner> { public abstract class SpinnerNumberForm extends NumberDialog<DialogSpinner> {
public SpinnerNumberForm() { public SpinnerNumberForm() {
super(DialogSpinner.class); super(DialogSpinner.class);

6
src/Common_old/UI/Windows/Dialog/Text/ComboTextDialog.java → src/Common/Visual/Windows/Dialog/Text/ComboTextDialog.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Windows.Dialog.Text; package Common.Visual.Windows.Dialog.Text;
import Common_old.UI.Windows.Dialog.Dialog; import Common.Visual.Windows.Dialog.Dialog;
import Common_old.UI.Windows.Dialog.DialogTextComboBox; import Common.Visual.Windows.Dialog.DialogTextComboBox;
import java.util.Vector; import java.util.Vector;
public class ComboTextDialog extends Dialog<String, DialogTextComboBox> { public class ComboTextDialog extends Dialog<String, DialogTextComboBox> {

2
src/Common_old/UI/Windows/Dialog/Text/FileNameForm.java → src/Common/Visual/Windows/Dialog/Text/FileNameForm.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog.Text; package Common.Visual.Windows.Dialog.Text;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
public class FileNameForm extends TextFieldDialog { public class FileNameForm extends TextFieldDialog {
public FileNameForm() { public FileNameForm() {

2
src/Common_old/UI/Windows/Dialog/Text/MultilineTextForm.java → src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog.Text; package Common.Visual.Windows.Dialog.Text;
import Common_old.UI.Editor.BaseEditor; import Common_old.UI.Editor.BaseEditor;
public class MultilineTextForm extends TextDialog<BaseEditor> { public class MultilineTextForm extends TextDialog<BaseEditor> {
public MultilineTextForm() { public MultilineTextForm() {

2
src/Common_old/UI/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java → src/Common/Visual/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI.Windows.Dialog.Text; package Common.Visual.Windows.Dialog.Text;
public class ReadOnlyMultilineTextForm extends MultilineTextForm { public class ReadOnlyMultilineTextForm extends MultilineTextForm {
public ReadOnlyMultilineTextForm() { public ReadOnlyMultilineTextForm() {
} }

6
src/Common_old/UI/Windows/Dialog/Text/TextDialog.java → src/Common/Visual/Windows/Dialog/Text/TextDialog.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Windows.Dialog.Text; package Common.Visual.Windows.Dialog.Text;
import Common_old.UI.Windows.Dialog.Dialog; import Common.Visual.Windows.Dialog.Dialog;
import Common_old.UI.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
//текстовый диалог. возвращает текст. может иметь параметром исходный текст. //текстовый диалог. возвращает текст. может иметь параметром исходный текст.
public abstract class TextDialog<F extends DialogFields> extends Dialog<String, F> { public abstract class TextDialog<F extends DialogFields> extends Dialog<String, F> {
public TextDialog(Class<F> f) { public TextDialog(Class<F> f) {

4
src/Common_old/UI/Windows/Dialog/Text/TextFieldDialog.java → src/Common/Visual/Windows/Dialog/Text/TextFieldDialog.java
View File

@@ -1,5 +1,5 @@
package Common_old.UI.Windows.Dialog.Text; package Common.Visual.Windows.Dialog.Text;
import Common_old.UI.Windows.Dialog.DialogTextField; import Common.Visual.Windows.Dialog.DialogTextField;
import java.awt.event.KeyAdapter; import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;

36
src/Common_old/UI/Windows/Form.java → src/Common/Visual/Windows/Form.java
View File

@@ -1,7 +1,6 @@
package Common_old.UI.Windows; package Common.Visual.Windows;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import GlobalData.GlobalDatabase; import Common.Visual.Themes.ThemeElement;
import _VisualDVM.Syntax.ThemeElement;
import Common.Database.Objects.DBForm.DBForm; import Common.Database.Objects.DBForm.DBForm;
import javax.swing.*; import javax.swing.*;
@@ -9,17 +8,17 @@ import java.awt.*;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
public abstract class Form extends JFrame implements ThemeElement { public abstract class Form extends JFrame implements ThemeElement {
private DBForm info = null; private DBForm dbInfo = null;
public Form() { public Form() {
if (getIconName().length() > 0) setIconImage(new ImageIcon(Form.class.getResource(getIconName())).getImage()); if (getIconPath()!=null) setIconImage(CommonUtils.getIcon(getIconPath()).getImage());
SetListener(); SetListener();
this.setTitle(CommonUtils.isWindows ? getWTitleText() : getUTitleText()); this.setTitle(CommonUtils.isWindows() ? getWTitleText() : getUTitleText());
pack(); pack();
setMinimumSize(new Dimension(getDefaultWidth(), getDefaultHeight())); setMinimumSize(new Dimension(getDefaultWidth(), getDefaultHeight()));
} }
abstract protected JPanel getMainPanel(); abstract protected JPanel getMainPanel();
public String getIconName() { public String getIconPath() {
return ""; return null;
} }
public String getWTitleText() { public String getWTitleText() {
return ""; return "";
@@ -27,7 +26,7 @@ public abstract class Form extends JFrame implements ThemeElement {
public String getUTitleText() { public String getUTitleText() {
return ""; return "";
} }
protected String getFormType() { protected String getFormKey() {
return null; return null;
} }
protected void SetListener() { protected void SetListener() {
@@ -72,24 +71,23 @@ public abstract class Form extends JFrame implements ThemeElement {
} }
public void AfterClose() { public void AfterClose() {
} }
//todo поменять на json? вместе с окном компонент
public void LoadWindowParameters() throws Exception { public void LoadWindowParameters() throws Exception {
if (getFormType()!=null) if (getFormKey()!=null)
if (((GlobalDatabase)CommonUtils.db).forms.Data.containsKey(getFormType())) { if (CommonUtils.db.forms.Data.containsKey(getFormKey())) {
info = ((GlobalDatabase)CommonUtils.db).forms.Data.get(getFormType()); dbInfo = CommonUtils.db.forms.Data.get(getFormKey());
info.Apply(this); dbInfo.Apply(this);
return; return;
} }
setSize(getDefaultWidth(), getDefaultHeight()); setSize(getDefaultWidth(), getDefaultHeight());
setLocationRelativeTo(getRelative()); setLocationRelativeTo(getRelative());
} }
public void SaveWindowParameters() throws Exception { public void SaveWindowParameters() throws Exception {
if (getFormType()!=null) { if (getFormKey()!=null) {
if (info != null) { if (dbInfo != null) {
info.Init(this); dbInfo.Init(this);
CommonUtils.db.Update(info); CommonUtils.db.Update(dbInfo);
} else } else
CommonUtils.db.Insert(new DBForm(getFormType(), this)); CommonUtils.db.Insert(new DBForm(getFormKey(), this));
} }
} }
@Override @Override

8
src/Common_old/Current.java
View File

@@ -21,7 +21,6 @@ import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import TestingSystem.SAPFOR.SapforSettings.SapforSettings; import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import Visual_DVM_2021.Passes.UI.PassForm; import Visual_DVM_2021.Passes.UI.PassForm;
import _VisualDVM.Syntax.VisualiserTheme;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File; import java.io.File;
@@ -34,10 +33,8 @@ public enum Current implements CurrentAnchestor {
SapforEtalonVersion, SapforEtalonVersion,
SapforVersion, SapforVersion,
//-- //--
//--
ComponentServerBackup, ComponentServerBackup,
Subscriber, Subscriber,
Theme,
FileGraphElement, FileGraphElement,
InlineGraphElement, InlineGraphElement,
InlineGraphElement2, InlineGraphElement2,
@@ -166,8 +163,6 @@ public enum Current implements CurrentAnchestor {
return "Тест"; return "Тест";
case Sapfor: case Sapfor:
return "SAPFOR"; return "SAPFOR";
case Theme:
return "Тема";
case EnvironmentValue: case EnvironmentValue:
return "Значение переменной окружения"; return "Значение переменной окружения";
case SelectedDirectory: case SelectedDirectory:
@@ -373,9 +368,6 @@ public enum Current implements CurrentAnchestor {
public static PassForm getPassForm() { public static PassForm getPassForm() {
return (Visual_DVM_2021.Passes.UI.PassForm) CurrentAnchestor.get(Current.PassForm); return (Visual_DVM_2021.Passes.UI.PassForm) CurrentAnchestor.get(Current.PassForm);
} }
public static VisualiserTheme getTheme() {
return (VisualiserTheme) CurrentAnchestor.get(Current.Theme);
}
public static ParallelRegion getParallelRegion() { public static ParallelRegion getParallelRegion() {
return (ParallelRegion) CurrentAnchestor.get(Current.ParallelRegion); return (ParallelRegion) CurrentAnchestor.get(Current.ParallelRegion);
} }

12
src/Common_old/UI/Editor/BaseEditor.java
View File

@@ -1,11 +1,11 @@
package Common_old.UI.Editor; package Common_old.UI.Editor;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common_old.Current; import Common.Visual.CommonUI;
import Common_old.UI.Menus.StyledPopupMenu; import Common_old.UI.Menus.StyledPopupMenu;
import Common_old.UI.Menus.TextEditorMenu; import Common_old.UI.Menus.TextEditorMenu;
import _VisualDVM.Syntax.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common_old.UI.UI; import Common.Visual.Windows.Dialog.DialogFields;
import Common_old.UI.Windows.Dialog.DialogFields; import _VisualDVM.Syntax.SPFEditorTheme;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkEvent;
@@ -45,7 +45,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
//todo переход в нужную строку по ctrl+g? //todo переход в нужную строку по ctrl+g?
case KeyEvent.VK_Z: case KeyEvent.VK_Z:
if (getText().equals(startText)) { if (getText().equals(startText)) {
UI.Info("Начальная версия текста достигнута."); CommonUI.Info("Начальная версия текста достигнута.");
e.consume(); e.consume();
} }
break; break;
@@ -129,7 +129,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
@Override @Override
public void applyTheme() { public void applyTheme() {
float font_size = (float) getFont().getSize(); float font_size = (float) getFont().getSize();
Current.getTheme().getEditorTheme().apply(this); ((SPFEditorTheme)CommonUI.getTheme()).getEditorTheme().apply(this);
setFont(getFont().deriveFont(font_size)); setFont(getFont().deriveFont(font_size));
menu.applyTheme(); menu.applyTheme();
//меню связано с редактором. поэтому тема меняется только вместе с ним. //меню связано с редактором. поэтому тема меняется только вместе с ним.

6
src/Common_old/UI/List/HyperlinksStyledList.java
View File

@@ -1,10 +1,10 @@
package Common_old.UI.List; package Common_old.UI.List;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
public class HyperlinksStyledList extends StyledList { public class HyperlinksStyledList extends StyledList {
@Override @Override
public void applyTheme() { public void applyTheme() {
super.applyTheme(); super.applyTheme();
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
} }
} }

12
src/Common_old/UI/List/StyledList.java
View File

@@ -1,17 +1,17 @@
package Common_old.UI.List; package Common_old.UI.List;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.ThemeElement; import Common.Visual.Themes.ThemeElement;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
public class StyledList extends JList implements ThemeElement { public class StyledList extends JList implements ThemeElement {
public StyledList() { public StyledList() {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
applyTheme(); applyTheme();
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(Current.getTheme().table_background); setBackground(CommonUI.getTheme().table_background);
setForeground(Current.getTheme().foreground); setForeground(CommonUI.getTheme().foreground);
} }
} }

6
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.Utils.CommonUtils;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
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;
@@ -10,7 +10,7 @@ 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(CommonUtils.getIcon(icon)); setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(CommonUI.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/PropertiesSubmenu.java
View File

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

12
src/Common_old/UI/Menus/StyledPopupMenu.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Menus; package Common_old.UI.Menus;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.ThemeElement; import Common.Visual.Themes.ThemeElement;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.PopupMenuEvent; import javax.swing.event.PopupMenuEvent;
@@ -21,15 +21,15 @@ public class StyledPopupMenu extends JPopupMenu implements ThemeElement {
}); });
} }
private void refreshTheme_r(MenuElement element) { private void refreshTheme_r(MenuElement element) {
element.getComponent().setBackground(Current.getTheme().background); element.getComponent().setBackground(CommonUI.getTheme().background);
element.getComponent().setForeground(Current.getTheme().foreground); element.getComponent().setForeground(CommonUI.getTheme().foreground);
for (MenuElement se : element.getSubElements()) for (MenuElement se : element.getSubElements())
refreshTheme_r(se); refreshTheme_r(se);
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(Current.getTheme().background); setBackground(CommonUI.getTheme().background);
setForeground(Current.getTheme().foreground); setForeground(CommonUI.getTheme().foreground);
refreshTheme_r(this); refreshTheme_r(this);
} }
public void CheckElementsVisibility() { public void CheckElementsVisibility() {

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

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

2
src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java
View File

@@ -2,7 +2,7 @@ package Common_old.UI.Menus_2023.CredentialsBar;
import Common_old.Current; import Common_old.Current;
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 Common.Visual.Fonts.VisualiserFonts;
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;

3
src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java
View File

@@ -1,4 +1,5 @@
package Common_old.UI.Menus_2023.MainMenuBar; package Common_old.UI.Menus_2023.MainMenuBar;
import Common.Visual.CommonUI;
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;
@@ -29,7 +30,7 @@ public class MainMenuBar extends VisualiserMenuBar {
setIcon("/icons/ComponentsActual.png"); setIcon("/icons/ComponentsActual.png");
addActionListener(e -> { addActionListener(e -> {
if (PerformanceAnalyzer.isActive) { if (PerformanceAnalyzer.isActive) {
UI.Info("Перед работой с компонентами закройте анализатор производительности!"); CommonUI.Info("Перед работой с компонентами закройте анализатор производительности!");
} else { } else {
Pass_2021.passes.get(PassCode_2021.GetComponentsActualVersions).Do(); Pass_2021.passes.get(PassCode_2021.GetComponentsActualVersions).Do();
Global.RefreshUpdatesStatus(); Global.RefreshUpdatesStatus();

2
src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
View File

@@ -15,7 +15,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
"FocusPassesResult" "FocusPassesResult"
)); ));
add(new CompactnessSettingsMenu()); add(new CompactnessSettingsMenu());
if (CommonUtils.isWindows) { if (CommonUtils.isWindows()) {
add(new SettingsSubmenu("Компиляция на локальной машине", null, add(new SettingsSubmenu("Компиляция на локальной машине", null,
SettingName.LocalMakePathWindows, SettingName.LocalMakePathWindows,
SettingName.Kernels SettingName.Kernels

8
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.Utils.CommonUtils;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@@ -9,7 +9,7 @@ import java.awt.*;
public class MenuBarButton extends JButton { public class MenuBarButton extends JButton {
public MenuBarButton() { public MenuBarButton() {
super(); super();
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
// //
setBorderPainted(false); setBorderPainted(false);
setContentAreaFilled(false); setContentAreaFilled(false);
@@ -30,6 +30,6 @@ public class MenuBarButton extends JButton {
setIcon(CommonUtils.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(CommonUI.getTheme().Fonts.get(font_in));
} }
} }

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

@@ -1,9 +1,10 @@
package Common_old.UI.Menus_2023.ProjectMenuBar; package Common_old.UI.Menus_2023.ProjectMenuBar;
import Common.CurrentAnchestor; import Common.CurrentAnchestor;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
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 Common.Visual.Fonts.VisualiserFonts;
import Common_old.UI.UI; import Common_old.UI.UI;
import ProjectData.ProjectView; import ProjectData.ProjectView;
@@ -18,7 +19,7 @@ public class ProjectViewMenu extends VisualiserMenu {
JMenuItem m = new JMenuItem(view.getDescription()) { JMenuItem m = new JMenuItem(view.getDescription()) {
{ {
setIcon(CommonUtils.getIcon(view.getIcon())); setIcon(CommonUtils.getIcon(view.getIcon()));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
addActionListener(e -> { addActionListener(e -> {
CurrentAnchestor.set(Current.ProjectView, view); CurrentAnchestor.set(Current.ProjectView, view);
UI.getMainWindow().getProjectWindow().ShowProjectView(); UI.getMainWindow().getProjectWindow().ShowProjectView();

6
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.Utils.CommonUtils;
import Common_old.Current; import Common.Visual.CommonUI;
import GlobalData.GlobalDatabase; import GlobalData.GlobalDatabase;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import GlobalData.Settings.SettingName; import GlobalData.Settings.SettingName;
import javax.swing.*; import javax.swing.*;
@@ -11,7 +11,7 @@ public class SettingsSubmenu extends JMenu {
super(title); super(title);
if (icon != null) if (icon != null)
setIcon(CommonUtils.getIcon(icon)); setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
for (SettingName c : settings) { for (SettingName c : settings) {
add(((GlobalDatabase)CommonUtils.db).settings.get(c).getMenuItem()); add(((GlobalDatabase)CommonUtils.db).settings.get(c).getMenuItem());
} }

6
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.Utils.CommonUtils;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
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;
@@ -13,7 +13,7 @@ public class VisualiserMenu extends JMenu {
setToolTipText(text); setToolTipText(text);
if (textVisible) if (textVisible)
setText(text); setText(text);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (!iconPath.isEmpty()) if (!iconPath.isEmpty())
setIcon(CommonUtils.getIcon(iconPath)); setIcon(CommonUtils.getIcon(iconPath));
} }

6
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.Utils.CommonUtils;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
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;
@@ -34,7 +34,7 @@ public class VisualiserMenuBar extends JToolBar {
public JLabel addLabel(String text_in, String icon_path_in) { public JLabel addLabel(String text_in, String icon_path_in) {
JLabel res = new JLabel(text_in) { JLabel res = new JLabel(text_in) {
{ {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (icon_path_in != null) { if (icon_path_in != null) {
setIcon(CommonUtils.getIcon(icon_path_in)); setIcon(CommonUtils.getIcon(icon_path_in));
} }

8
src/Common_old/UI/ProgressBar/StyledProgressBar.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.ProgressBar; package Common_old.UI.ProgressBar;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.ThemeElement; import Common.Visual.Themes.ThemeElement;
import javax.swing.*; import javax.swing.*;
public class StyledProgressBar extends JProgressBar implements ThemeElement { public class StyledProgressBar extends JProgressBar implements ThemeElement {
@@ -10,7 +10,7 @@ public class StyledProgressBar extends JProgressBar implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(Current.getTheme().bar_background); setBackground(CommonUI.getTheme().bar_background);
setForeground(Current.getTheme().bar_foreground); setForeground(CommonUI.getTheme().bar_foreground);
} }
} }

6
src/Common_old/UI/Tables/HiddenListRenderer.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Tables; package Common_old.UI.Tables;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
import java.util.Vector; import java.util.Vector;
@@ -12,6 +12,6 @@ public class HiddenListRenderer extends RendererCell<Vector<String>> {
@Override @Override
public void Display() { public void Display() {
setText(String.join(";", value)); setText(String.join(";", value));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
} }
} }

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

@@ -1,5 +1,5 @@
package Common_old.UI.Tables; package Common_old.UI.Tables;
import Common_old.Current; import Common.Visual.CommonUI;
import Common.Visual.StatusEnum; import Common.Visual.StatusEnum;
import javax.swing.*; import javax.swing.*;
@@ -12,7 +12,7 @@ public class StatusEnumRenderer extends RendererCell<StatusEnum> {
public void Display() { public void Display() {
if (value != null) { if (value != null) {
setText(value.getDescription()); setText(value.getDescription());
setFont(Current.getTheme().Fonts.get(value.getFont())); setFont(CommonUI.getTheme().Fonts.get(value.getFont()));
} }
} }
} }

12
src/Common_old/UI/Tables/StyledCellLabel.java
View File

@@ -1,13 +1,13 @@
package Common_old.UI.Tables; package Common_old.UI.Tables;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.ThemeElement; import Common.Visual.Themes.ThemeElement;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
//наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы. //наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы.
public class StyledCellLabel extends JLabel implements ThemeElement { public class StyledCellLabel extends JLabel implements ThemeElement {
public StyledCellLabel() { public StyledCellLabel() {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
setHorizontalAlignment(SwingConstants.LEFT); setHorizontalAlignment(SwingConstants.LEFT);
setVerticalAlignment(SwingConstants.CENTER); setVerticalAlignment(SwingConstants.CENTER);
setOpaque(true); setOpaque(true);
@@ -15,7 +15,7 @@ public class StyledCellLabel extends JLabel implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(Current.getTheme().table_background); setBackground(CommonUI.getTheme().table_background);
setForeground(Current.getTheme().foreground); setForeground(CommonUI.getTheme().foreground);
} }
} }

18
src/Common_old/UI/Tables/StyledTable.java
View File

@@ -1,8 +1,8 @@
package Common_old.UI.Tables; package Common_old.UI.Tables;
import Common_old.Current; import Common.Visual.CommonUI;
import Common_old.UI.Menus.TableMenu; import Common_old.UI.Menus.TableMenu;
import _VisualDVM.Syntax.ThemeElement; import Common.Visual.Themes.ThemeElement;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
import javax.swing.table.*; import javax.swing.table.*;
@@ -16,9 +16,9 @@ public abstract class StyledTable extends JTable implements ThemeElement {
setFillsViewportHeight(true); setFillsViewportHeight(true);
setAutoCreateRowSorter(dataModel.getRowCount() > 0); setAutoCreateRowSorter(dataModel.getRowCount() > 0);
Init(); Init();
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
JTableHeader header = getTableHeader(); JTableHeader header = getTableHeader();
header.setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain)); header.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
setSelectionMode(ListSelectionModel.SINGLE_SELECTION); setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
//текущий объет может определяться по первому столбцу. могут быть баги если не запретить //текущий объет может определяться по первому столбцу. могут быть баги если не запретить
@@ -77,10 +77,10 @@ public abstract class StyledTable extends JTable implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(Current.getTheme().table_background); setBackground(CommonUI.getTheme().table_background);
setForeground(Current.getTheme().foreground); setForeground(CommonUI.getTheme().foreground);
setSelectionBackground(Current.getTheme().selection_background); setSelectionBackground(CommonUI.getTheme().selection_background);
setSelectionForeground(Current.getTheme().foreground); setSelectionForeground(CommonUI.getTheme().foreground);
} }
public void SelectRow(int r) { public void SelectRow(int r) {
getSelectionModel().setSelectionInterval(r, r); getSelectionModel().setSelectionInterval(r, r);

6
src/Common_old/UI/Tables/WrapTextRenderer.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Tables; package Common_old.UI.Tables;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
import javax.swing.table.TableCellRenderer; import javax.swing.table.TableCellRenderer;
@@ -10,7 +10,7 @@ public class WrapTextRenderer extends JTextArea implements TableCellRenderer {
setLineWrap(true); setLineWrap(true);
setWrapStyleWord(true); setWrapStyleWord(true);
// setOpaque(false); // setOpaque(false);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Distribution).deriveFont(14.0f)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Distribution).deriveFont(14.0f));
} }
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground()); setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());

8
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.Utils.CommonUtils;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import ProjectData.SapforData.FileObjectWithMessages; import ProjectData.SapforData.FileObjectWithMessages;
import javax.swing.*; import javax.swing.*;
@@ -16,10 +16,10 @@ public class GraphTreeCellRenderer extends StyledTreeCellRenderer {
if (o instanceof FileObjectWithMessages) { if (o instanceof FileObjectWithMessages) {
FileObjectWithMessages target = (FileObjectWithMessages) o; FileObjectWithMessages target = (FileObjectWithMessages) o;
setIcon(CommonUtils.getIcon(target.ImageKey())); setIcon(CommonUtils.getIcon(target.ImageKey()));
setFont(Current.getTheme().Fonts.get(target.getFont())); setFont(CommonUI.getTheme().Fonts.get(target.getFont()));
} else { } else {
setIcon(null); setIcon(null);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
} }
setForeground(tree.getForeground()); setForeground(tree.getForeground());
return this; return this;

6
src/Common_old/UI/Trees/SelectionTreeCellRenderer.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Trees; package Common_old.UI.Trees;
import Common_old.Current; import Common.Visual.CommonUI;
import Common.Visual.Selectable; import Common.Visual.Selectable;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*; import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
@@ -17,7 +17,7 @@ public class SelectionTreeCellRenderer extends StyledTreeCellRenderer {
setText(selectable.getSelectionText()); setText(selectable.getSelectionText());
setIcon(selectable.GetSelectionIcon()); setIcon(selectable.GetSelectionIcon());
} else { } else {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setIcon(null); setIcon(null);
} }
setForeground(tree.getForeground()); setForeground(tree.getForeground());

12
src/Common_old/UI/Trees/StyledTree.java
View File

@@ -1,8 +1,8 @@
package Common_old.UI.Trees; package Common_old.UI.Trees;
import Common_old.Current; import Common.Visual.CommonUI;
import Common_old.UI.Menus.GraphMenu; import Common_old.UI.Menus.GraphMenu;
import _VisualDVM.Syntax.ThemeElement; import Common.Visual.Themes.ThemeElement;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common_old.UI.UI; import Common_old.UI.UI;
import javax.swing.*; import javax.swing.*;
@@ -22,7 +22,7 @@ public class StyledTree extends JTree implements ThemeElement {
super(root_in); super(root_in);
root = root_in; root = root_in;
setOpaque(true); setOpaque(true);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
setToggleClickCount(0); //отключение сворачивание разворачивания по двойному клику setToggleClickCount(0); //отключение сворачивание разворачивания по двойному клику
//-- //--
if (!getRenderer().equals(TreeRenderers.RendererUndefined)) if (!getRenderer().equals(TreeRenderers.RendererUndefined))
@@ -86,8 +86,8 @@ public class StyledTree extends JTree implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(Current.getTheme().trees_background); setBackground(CommonUI.getTheme().trees_background);
setForeground(Current.getTheme().foreground); setForeground(CommonUI.getTheme().foreground);
menu.applyTheme(); menu.applyTheme();
} }
protected GraphMenu createMenu() { protected GraphMenu createMenu() {

8
src/Common_old/UI/Trees/StyledTreeCellRenderer.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Trees; package Common_old.UI.Trees;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.ThemeElement; import Common.Visual.Themes.ThemeElement;
import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeCellRenderer;
public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements ThemeElement { public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements ThemeElement {
@@ -9,7 +9,7 @@ public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements T
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackgroundNonSelectionColor(Current.getTheme().trees_background); setBackgroundNonSelectionColor(CommonUI.getTheme().trees_background);
setBackgroundSelectionColor(Current.getTheme().selection_background); setBackgroundSelectionColor(CommonUI.getTheme().selection_background);
} }
} }

58
src/Common_old/UI/UI.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI; package Common_old.UI;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.Themes.ThemeElement;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.Menus_2023.CredentialsBar.CredentialsBar; import Common_old.UI.Menus_2023.CredentialsBar.CredentialsBar;
import Common.Visual.DataMenuBar; import Common.Visual.DataMenuBar;
@@ -93,14 +93,10 @@ import Visual_DVM_2021.UI.Main.DebugForm;
import Visual_DVM_2021.UI.Main.MainForm; import Visual_DVM_2021.UI.Main.MainForm;
import Visual_DVM_2021.UI.Main.ProfilesForm; import Visual_DVM_2021.UI.Main.ProfilesForm;
import Visual_DVM_2021.UI.Main.VersionsForm; import Visual_DVM_2021.UI.Main.VersionsForm;
import _VisualDVM.Syntax.*;
import _VisualDVM.Syntax.VisualiserTheme;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ChangeListener;
import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer; import javax.swing.table.TableCellRenderer;
import javax.swing.text.DefaultFormatter;
import javax.swing.text.DefaultHighlighter; import javax.swing.text.DefaultHighlighter;
import javax.swing.text.Highlighter; import javax.swing.text.Highlighter;
import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreeCellRenderer;
@@ -128,7 +124,6 @@ public class UI {
public static LinkedHashMap<Common_old.UI.Tables.TableRenderers, TableCellRenderer> TableRenderers = new LinkedHashMap<>(); public static LinkedHashMap<Common_old.UI.Tables.TableRenderers, TableCellRenderer> TableRenderers = new LinkedHashMap<>();
public static LinkedHashMap<Common_old.UI.Tables.TableEditors, TableCellEditor> TableEditors = new LinkedHashMap<>(); public static LinkedHashMap<Common_old.UI.Tables.TableEditors, TableCellEditor> TableEditors = new LinkedHashMap<>();
public static LinkedHashMap<Common_old.UI.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>(); public static LinkedHashMap<Common_old.UI.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>();
public static LinkedHashMap<VisualiserThemeName, VisualiserTheme> themes = new LinkedHashMap<>();
public static LinkedHashMap<FormType, ThemeElement> windows = new LinkedHashMap<>(); public static LinkedHashMap<FormType, ThemeElement> windows = new LinkedHashMap<>();
public static RemoteFileChooser getRemoteFileChooser() { public static RemoteFileChooser getRemoteFileChooser() {
return (RemoteFileChooser) windows.get(FormType.RemoteFileChooser); return (RemoteFileChooser) windows.get(FormType.RemoteFileChooser);
@@ -239,10 +234,6 @@ public class UI {
UIManager.put("OptionPane.cancelButtonText", "Отмена"); UIManager.put("OptionPane.cancelButtonText", "Отмена");
UIManager.put("OptionPane.okButtonText", "Готово"); UIManager.put("OptionPane.okButtonText", "Готово");
//</editor-fold> //</editor-fold>
//<editor-fold desc="Темы(всегда создавать первыми)">
themes.put(VisualiserThemeName.Light, new LightVisualiserTheme());
//по умолчанию поставить светлую тему. потому что до загрузки бд работаем с таблицей компонент.
CurrentAnchestor.set(Current.Theme, themes.get(VisualiserThemeName.Light));
//</editor-fold> //</editor-fold>
//<editor-fold desc="Объекты отрисовки и редактирования деревьев и таблиц"> //<editor-fold desc="Объекты отрисовки и редактирования деревьев и таблиц">
TableRenderers.put(RendererDate, new DateRenderer_()); TableRenderers.put(RendererDate, new DateRenderer_());
@@ -285,15 +276,6 @@ public class UI {
public static ProfilesForm getProfilesWindow() { public static ProfilesForm getProfilesWindow() {
return (ProfilesForm) windows.get(FormType.Profiles); return (ProfilesForm) windows.get(FormType.Profiles);
} }
public static Component getFrontWindow() {
Component res = null;
try {
res = CommonUI.windowsStack.peek();
} catch (Exception ignored){
}
return res;
}
//----- //-----
public static void ShowTabsNames(JTabbedPane tabs) { public static void ShowTabsNames(JTabbedPane tabs) {
ShowTabsNames(tabs, 0); ShowTabsNames(tabs, 0);
@@ -309,43 +291,6 @@ public class UI {
if (list.get(i).equals(line)) last_index = i; if (list.get(i).equals(line)) last_index = i;
return (last_index >= max_index); return (last_index >= max_index);
} }
public static void MakeSpinnerRapid(JSpinner spinner, ChangeListener listener) {
JComponent comp = spinner.getEditor();
JFormattedTextField field = (JFormattedTextField) comp.getComponent(0);
DefaultFormatter formatter = (DefaultFormatter) field.getFormatter();
formatter.setCommitsOnValidEdit(true);
formatter.setAllowsInvalid(true);
spinner.addChangeListener(listener);
}
//---------------
public static boolean Question(Component parent, String text) {
return !CommonUtils.hasUI() || (JOptionPane.showConfirmDialog(parent,
text + "?",
"Подтверждение",
JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == 0);
}
public static boolean Question(String text) {
return Question(getFrontWindow(), text);
}
public static void Info(String message) {
CommonUtils.CopyToClipboard(message);
if (CommonUtils.hasUI())
JOptionPane.showMessageDialog(getFrontWindow(), message, "", 1);
}
public static void Error(String message) {
CommonUtils.CopyToClipboard(message);
if (CommonUtils.hasUI())
JOptionPane.showMessageDialog(getFrontWindow(), message, "", 0);
}
public static boolean Warning(String text) {
return !CommonUtils.hasUI() ||
JOptionPane.showConfirmDialog(getFrontWindow(),
text + "\nВы уверены?",
"Подтверждение",
JOptionPane.YES_NO_OPTION,
JOptionPane.WARNING_MESSAGE) == 0;
}
//-- //--
public static VersionsWindow getVersionsWindow() { public static VersionsWindow getVersionsWindow() {
return versionsWindow; return versionsWindow;
@@ -380,5 +325,4 @@ public class UI {
public static void ShowProfilesWindow() { public static void ShowProfilesWindow() {
getProfilesWindow().ShowDialog(""); getProfilesWindow().ShowDialog("");
} }
} }

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

@@ -1,9 +1,9 @@
package Common_old.UI.Windows; package Common_old.UI.Windows;
public enum FormType { public enum FormType {
Undefined, Undefined,
Main, Main,
SearchReplace, SearchReplace,
Components, Components,
RemoteFileChooser, Profiles RemoteFileChooser,
Profiles
} }

3
src/Common_old/UI/Windows/SearchReplaceForm.java
View File

@@ -1,6 +1,7 @@
package Common_old.UI.Windows; package Common_old.UI.Windows;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common.Visual.Windows.Form;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.TextField.StyledTextField; import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Trees.StyledTree; import Common_old.UI.Trees.StyledTree;
@@ -125,7 +126,7 @@ public class SearchReplaceForm extends Form {
lCount.setText(String.valueOf(result.getMarkedCount())); lCount.setText(String.valueOf(result.getMarkedCount()));
} }
@Override @Override
protected String getFormType() { protected String getFormKey() {
return FormType.SearchReplace.toString(); return FormType.SearchReplace.toString();
} }
private void createUIComponents() { private void createUIComponents() {

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

@@ -3,6 +3,7 @@ import Common.Utils.CommonUtils;
import Common.Utils.Index; import Common.Utils.Index;
import Common.Utils.StringTemplate; import Common.Utils.StringTemplate;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common.Visual.CommonUI;
import Common_old.Constants; import Common_old.Constants;
import GlobalData.GlobalDatabase; import GlobalData.GlobalDatabase;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -141,7 +142,7 @@ public class Utils {
return getTempFileName(name, ""); return getTempFileName(name, "");
} }
public static boolean isAnchestor(File child, File anchestor) { public static boolean isAnchestor(File child, File anchestor) {
return child.getAbsolutePath().startsWith(anchestor.getAbsolutePath() + (CommonUtils.isWindows ? "\\" : "/")); return child.getAbsolutePath().startsWith(anchestor.getAbsolutePath() + (CommonUtils.isWindows() ? "\\" : "/"));
} }
//при условии что это точно его предок //при условии что это точно его предок
public static String getRelativeAddress(File file, File anchestor) { public static String getRelativeAddress(File file, File anchestor) {
@@ -328,7 +329,7 @@ public class Utils {
} }
public static File createScript(File scriptDirectory, File targetDirectory, String name, String scriptText) throws Exception { public static File createScript(File scriptDirectory, File targetDirectory, String name, String scriptText) throws Exception {
//-> //->
File scriptFile = Paths.get(scriptDirectory.getAbsolutePath(), name + (CommonUtils.isWindows ? ".bat" : "")).toFile(); File scriptFile = Paths.get(scriptDirectory.getAbsolutePath(), name + (CommonUtils.isWindows() ? ".bat" : "")).toFile();
FileUtils.write(scriptFile, "cd " + CommonUtils.DQuotes(targetDirectory.getAbsolutePath()) + "\n" + scriptText); FileUtils.write(scriptFile, "cd " + CommonUtils.DQuotes(targetDirectory.getAbsolutePath()) + "\n" + scriptText);
if (!scriptFile.setExecutable(true)) throw new PassException("Не удалось создать исполняемый файл для скрипта"); if (!scriptFile.setExecutable(true)) throw new PassException("Не удалось создать исполняемый файл для скрипта");
return scriptFile; return scriptFile;
@@ -529,7 +530,7 @@ public class Utils {
} }
} }
if (sources.isEmpty()) { if (sources.isEmpty()) {
if (question) return UI.Question("Папка " + CommonUtils.Brackets(folder.getName()) + "\n" + if (question) return CommonUI.Question("Папка " + CommonUtils.Brackets(folder.getName()) + "\n" +
"не содержит ни одного файла, распознанного как поддерживаемый код\n" + "не содержит ни одного файла, распознанного как поддерживаемый код\n" +
"Всё равно открыть её как проект"); "Всё равно открыть её как проект");
else return false; else return false;
@@ -538,8 +539,8 @@ public class Utils {
public static void Kill(String PID, boolean force) { public static void Kill(String PID, boolean force) {
if (!PID.isEmpty()) { if (!PID.isEmpty()) {
String killCommand = String killCommand =
force ? CommonUtils.isWindows ? "taskkill /PID " + CommonUtils.DQuotes(PID) + " /F /T" : "kill -9 " + CommonUtils.DQuotes(PID) : force ? CommonUtils.isWindows() ? "taskkill /PID " + CommonUtils.DQuotes(PID) + " /F /T" : "kill -9 " + CommonUtils.DQuotes(PID) :
CommonUtils.isWindows ? "taskkill /PID " + CommonUtils.DQuotes(PID) : "kill -2 " + CommonUtils.DQuotes(PID); CommonUtils.isWindows() ? "taskkill /PID " + CommonUtils.DQuotes(PID) : "kill -2 " + CommonUtils.DQuotes(PID);
System.out.println(killCommand); System.out.println(killCommand);
try { try {
Process killer = Utils.startScript(Global.TempDirectory, Global.TempDirectory, "killer", killCommand); Process killer = Utils.startScript(Global.TempDirectory, Global.TempDirectory, "killer", killCommand);

2
src/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -4,7 +4,7 @@ import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import Common_old.Utils.Validators.PathValidator; import Common_old.Utils.Validators.PathValidator;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;

6
src/GlobalData/Compiler/UI/CompilerFields.java
View File

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

7
src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
View File

@@ -1,14 +1,13 @@
package GlobalData.CompilerEnvironment.UI; package GlobalData.CompilerEnvironment.UI;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.Tables.DBObjectEditor; import Common_old.UI.Tables.DBObjectEditor;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common_old.UI.Windows.Dialog.Text.ComboTextDialog; import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import GlobalData.CompilerEnvironment.CompilerEnvironment; import GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> { public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
@Override @Override
public void Action() { public void Action() {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setText(value.value.isEmpty() ? "не задано" : value.value); setText(value.value.isEmpty() ? "не задано" : value.value);
//- //-
ComboTextDialog dialog = new ComboTextDialog() { ComboTextDialog dialog = new ComboTextDialog() {

6
src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
View File

@@ -1,14 +1,14 @@
package GlobalData.CompilerEnvironment.UI; package GlobalData.CompilerEnvironment.UI;
import Common_old.Current; import Common.Visual.CommonUI;
import Common_old.UI.Tables.DBObjectRenderer; import Common_old.UI.Tables.DBObjectRenderer;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import GlobalData.CompilerEnvironment.CompilerEnvironment; import GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueRenderer extends DBObjectRenderer { public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
@Override @Override
public void Display() { public void Display() {
if (value != null) { if (value != null) {
CompilerEnvironment environment = (CompilerEnvironment) value; CompilerEnvironment environment = (CompilerEnvironment) value;
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setText(environment.value.isEmpty() ? "не задано" : environment.value); setText(environment.value.isEmpty() ? "не задано" : environment.value);
} }
} }

2
src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsFields.java
View File

@@ -1,5 +1,5 @@
package GlobalData.CompilerEnvironment.UI; package GlobalData.CompilerEnvironment.UI;
import Common_old.UI.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

8
src/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
View File

@@ -1,7 +1,7 @@
package GlobalData.CompilerOption.UI; package GlobalData.CompilerOption.UI;
import Common_old.Current; import Common.Visual.CommonUI;
import Common_old.UI.Tables.DBObjectRenderer; import Common_old.UI.Tables.DBObjectRenderer;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import GlobalData.CompilerOption.CompilerOption; import GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterNameRenderer extends DBObjectRenderer { public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
@Override @Override
@@ -9,10 +9,10 @@ public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
if (value != null) { if (value != null) {
CompilerOption option = (CompilerOption) value; CompilerOption option = (CompilerOption) value;
if (option.hasParameter()) { if (option.hasParameter()) {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
setText(option.parameterName); setText(option.parameterName);
} else { } else {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.UnknownState)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
setText("нет"); setText("нет");
} }
} }

9
src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
View File

@@ -1,15 +1,14 @@
package GlobalData.CompilerOption.UI; package GlobalData.CompilerOption.UI;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.Tables.DBObjectEditor; import Common_old.UI.Tables.DBObjectEditor;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common_old.UI.Windows.Dialog.Text.ComboTextDialog; import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import GlobalData.CompilerOption.CompilerOption; import GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> { public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> {
@Override @Override
public void Action() { public void Action() {
if (value.hasParameter()) { if (value.hasParameter()) {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
//- //-
setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue); setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
//- //-
@@ -23,7 +22,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue); setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
} }
} else { } else {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.UnknownState)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
setText("нет"); setText("нет");
} }
} }

8
src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
View File

@@ -1,7 +1,7 @@
package GlobalData.CompilerOption.UI; package GlobalData.CompilerOption.UI;
import Common_old.Current; import Common.Visual.CommonUI;
import Common_old.UI.Tables.DBObjectRenderer; import Common_old.UI.Tables.DBObjectRenderer;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import GlobalData.CompilerOption.CompilerOption; import GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueRenderer extends DBObjectRenderer { public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
@Override @Override
@@ -9,10 +9,10 @@ public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
if (value != null) { if (value != null) {
CompilerOption option = (CompilerOption) value; CompilerOption option = (CompilerOption) value;
if (option.hasParameter()) { if (option.hasParameter()) {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setText(option.parameterValue.isEmpty() ? "не задано" : option.parameterValue); setText(option.parameterValue.isEmpty() ? "не задано" : option.parameterValue);
} else { } else {
setFont(Current.getTheme().Fonts.get(VisualiserFonts.UnknownState)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.UnknownState));
setText("нет"); setText("нет");
} }
} }

2
src/GlobalData/CompilerOption/UI/CompilerOptionsFields.java
View File

@@ -1,5 +1,5 @@
package GlobalData.CompilerOption.UI; package GlobalData.CompilerOption.UI;
import Common_old.UI.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

2
src/GlobalData/DVMParameter/DVMParameterDBTable.java
View File

@@ -4,7 +4,7 @@ import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import GlobalData.DVMParameter.UI.DVMParameterFields; import GlobalData.DVMParameter.UI.DVMParameterFields;
import GlobalData.GlobalDatabase; import GlobalData.GlobalDatabase;

2
src/GlobalData/DVMParameter/UI/DVMParameterFields.java
View File

@@ -1,7 +1,7 @@
package GlobalData.DVMParameter.UI; package GlobalData.DVMParameter.UI;
import Common.Visual.Controls.StyledTextComboBox; import Common.Visual.Controls.StyledTextComboBox;
import Common_old.UI.TextField.StyledTextField; import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

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

@@ -4,7 +4,7 @@ import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import GlobalData.EnvironmentValue.UI.EnvironmentValueFields; import GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
import GlobalData.GlobalDatabase; import GlobalData.GlobalDatabase;

2
src/GlobalData/EnvironmentValue/UI/EnvironmentValueFields.java
View File

@@ -1,6 +1,6 @@
package GlobalData.EnvironmentValue.UI; package GlobalData.EnvironmentValue.UI;
import Common_old.UI.TextField.StyledTextField; import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

2
src/GlobalData/FileObject/DirInfosFields.java
View File

@@ -1,5 +1,5 @@
package GlobalData.FileObject; package GlobalData.FileObject;
import Common_old.UI.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

2
src/GlobalData/Machine/MachinesDBTable.java
View File

@@ -3,7 +3,7 @@ import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKCurrentObjectBehaviuor;

2
src/GlobalData/Machine/UI/MachineFields.java
View File

@@ -1,6 +1,6 @@
package GlobalData.Machine.UI; package GlobalData.Machine.UI;
import Common_old.UI.TextField.StyledTextField; import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import GlobalData.Machine.MachineType; import GlobalData.Machine.MachineType;
import javax.swing.*; import javax.swing.*;

2
src/GlobalData/Makefile/MakefilesDBTable.java
View File

@@ -1,7 +1,7 @@
package GlobalData.Makefile; package GlobalData.Makefile;
import Common_old.Current; import Common_old.Current;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKCurrentObjectBehaviuor;

2
src/GlobalData/Makefile/UI/MakefilePreviewForm.java
View File

@@ -1,6 +1,6 @@
package GlobalData.Makefile.UI; package GlobalData.Makefile.UI;
import Common_old.UI.Editor.Viewer; import Common_old.UI.Editor.Viewer;
import Common_old.UI.Windows.Dialog.Text.TextDialog; import Common.Visual.Windows.Dialog.Text.TextDialog;
public class MakefilePreviewForm extends TextDialog<Viewer> { public class MakefilePreviewForm extends TextDialog<Viewer> {
public MakefilePreviewForm() { public MakefilePreviewForm() {
super(Viewer.class); super(Viewer.class);

4
src/GlobalData/Module/ModulesDBTable.java
View File

@@ -2,8 +2,8 @@ package GlobalData.Module;
import Common_old.Current; import Common_old.Current;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common_old.UI.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import GlobalData.Module.UI.ModuleAnchestorForm; import GlobalData.Module.UI.ModuleAnchestorForm;
public class ModulesDBTable extends iDBTable<Module> { public class ModulesDBTable extends iDBTable<Module> {
public ModulesDBTable() { public ModulesDBTable() {

5
src/GlobalData/Module/UI/ModuleAnchestorFields.java
View File

@@ -2,8 +2,7 @@ package GlobalData.Module.UI;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common.Visual.Controls.StyledTextComboBox; import Common.Visual.Controls.StyledTextComboBox;
import Common_old.UI.UI; import Common.Visual.Windows.Dialog.DialogFields;
import Common_old.UI.Windows.Dialog.DialogFields;
import GlobalData.Compiler.Compiler; import GlobalData.Compiler.Compiler;
import GlobalData.Makefile.Makefile; import GlobalData.Makefile.Makefile;
import GlobalData.Module.Module; import GlobalData.Module.Module;
@@ -33,7 +32,7 @@ public class ModuleAnchestorFields implements DialogFields {
bHelp.addActionListener(e -> { bHelp.addActionListener(e -> {
if (cbCompilers.getSelectedItem() != null) { if (cbCompilers.getSelectedItem() != null) {
Pass_2021.passes.get(PassCode_2021.ShowCompilerHelp).Do(compiler, true); Pass_2021.passes.get(PassCode_2021.ShowCompilerHelp).Do(compiler, true);
} else UI.Info("Компилятор не выбран"); } else CommonUI.Info("Компилятор не выбран");
}); });
BPickOptions.addActionListener(new ActionListener() { BPickOptions.addActionListener(new ActionListener() {
@Override @Override

2
src/GlobalData/Module/UI/ModuleAnchestorForm.java
View File

@@ -2,7 +2,7 @@ package GlobalData.Module.UI;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import GlobalData.Compiler.Compiler; import GlobalData.Compiler.Compiler;
import GlobalData.Compiler.CompilerType; import GlobalData.Compiler.CompilerType;
import GlobalData.Makefile.Makefile; import GlobalData.Makefile.Makefile;

6
src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
View File

@@ -1,9 +1,9 @@
package GlobalData.RemoteFile.UI; package GlobalData.RemoteFile.UI;
import Common.CurrentAnchestor; import Common.CurrentAnchestor;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.UI; import Common.Visual.Windows.Dialog.Dialog;
import Common_old.UI.Windows.Dialog.Dialog;
import GlobalData.RemoteFile.RemoteFile; import GlobalData.RemoteFile.RemoteFile;
import Visual_DVM_2021.Passes.SSH.ConnectionPass; import Visual_DVM_2021.Passes.SSH.ConnectionPass;
import com.jcraft.jsch.ChannelSftp.LsEntry; import com.jcraft.jsch.ChannelSftp.LsEntry;
@@ -84,7 +84,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
public void goUp() { public void goUp() {
if (!root_file.full_name.equals("/")) { if (!root_file.full_name.equals("/")) {
Refresh(root_file.parent); Refresh(root_file.parent);
} else UI.Info("Корневая папка файловой системы достигнута."); } else CommonUI.Info("Корневая папка файловой системы достигнута.");
} }
@Override @Override
public void validateFields() { public void validateFields() {

2
src/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
View File

@@ -1,7 +1,7 @@
package GlobalData.RemoteFile.UI; package GlobalData.RemoteFile.UI;
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.UI.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

6
src/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
View File

@@ -1,6 +1,6 @@
package GlobalData.RemoteFile.UI; package GlobalData.RemoteFile.UI;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common_old.UI.Trees.StyledTreeCellRenderer; import Common_old.UI.Trees.StyledTreeCellRenderer;
import GlobalData.RemoteFile.RemoteFile; import GlobalData.RemoteFile.RemoteFile;
@@ -16,7 +16,7 @@ public class RemoteFileRenderer extends StyledTreeCellRenderer {
if (o instanceof RemoteFile) { if (o instanceof RemoteFile) {
RemoteFile file = (RemoteFile) o; RemoteFile file = (RemoteFile) o;
setText(file.name); setText(file.name);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
if (file.isDirectory()) if (file.isDirectory())
setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png"))); setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
} }

2
src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -4,7 +4,7 @@ import Common.Utils.CommonUtils;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKCurrentObjectBehaviuor;

2
src/GlobalData/RunConfiguration/UI/RunConfigurationFields.java
View File

@@ -1,6 +1,6 @@
package GlobalData.RunConfiguration.UI; package GlobalData.RunConfiguration.UI;
import Common_old.UI.TextField.StyledTextField; import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

2
src/GlobalData/SapforProfile/SapforProfilesDBTable.java
View File

@@ -1,7 +1,7 @@
package GlobalData.SapforProfile; package GlobalData.SapforProfile;
import Common_old.Current; import Common_old.Current;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKCurrentObjectBehaviuor;

2
src/GlobalData/SapforProfile/UI/SapforProfileFields.java
View File

@@ -1,6 +1,6 @@
package GlobalData.SapforProfile.UI; package GlobalData.SapforProfile.UI;
import Common_old.UI.TextField.StyledTextField; import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

2
src/GlobalData/Settings/SettingsDBTable.java
View File

@@ -43,7 +43,7 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser)); AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.AutoBugReportsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true)); AddSetting(new DBSetting(SettingName.AutoBugReportsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
AddSetting(new DBSetting(SettingName.AutoTestsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true)); AddSetting(new DBSetting(SettingName.AutoTestsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
if (CommonUtils.isWindows) if (CommonUtils.isWindows())
AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser)); AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.SmallScreen, 0, SettingType.SapforFlag, ComponentType.Visualiser)); AddSetting(new DBSetting(SettingName.SmallScreen, 0, SettingType.SapforFlag, ComponentType.Visualiser));
//совместимость. указываем явно чтобы не были видны в меню. //совместимость. указываем явно чтобы не были видны в меню.

2
src/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
View File

@@ -44,7 +44,7 @@ public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor
return Paths.get(task.getUser().getLocalProjectsDir().getAbsolutePath(), project.getUniqKey()).toFile(); return Paths.get(task.getUser().getLocalProjectsDir().getAbsolutePath(), project.getUniqKey()).toFile();
} }
protected File getBinary() { protected File getBinary() {
return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (CommonUtils.isWindows ? ".exe" : "")).toFile(); return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (CommonUtils.isWindows() ? ".exe" : "")).toFile();
} }
protected File getProjectOutput() { protected File getProjectOutput() {
return Paths.get(getProjectCopy().getAbsolutePath(), Constants.out_file).toFile(); return Paths.get(getProjectCopy().getAbsolutePath(), Constants.out_file).toFile();

2
src/GlobalData/Tasks/TaskState.java
View File

@@ -1,6 +1,6 @@
package GlobalData.Tasks; package GlobalData.Tasks;
import Common.Visual.StatusEnum; import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
public enum TaskState implements StatusEnum { public enum TaskState implements StatusEnum {
Inactive, Inactive,
//-- //--

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

@@ -3,7 +3,7 @@ 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.Visual.Windows.Dialog.DialogFields;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

2
src/GlobalData/User/UserState.java
View File

@@ -1,6 +1,6 @@
package GlobalData.User; package GlobalData.User;
import Common.Visual.StatusEnum; import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
public enum UserState implements StatusEnum { public enum UserState implements StatusEnum {
initial, //на пользователя еще не заходили. initial, //на пользователя еще не заходили.
ready, //рудимент. ready, //рудимент.

2
src/GlobalData/User/UsersDBTable.java
View File

@@ -3,7 +3,7 @@ import Common_old.Current;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common_old.UI.Tables.TableRenderers; import Common_old.UI.Tables.TableRenderers;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKCurrentObjectBehaviuor;

6
src/ProjectData/Files/UI/FilesHyperlinksPanel.java
View File

@@ -1,6 +1,6 @@
package ProjectData.Files.UI; package ProjectData.Files.UI;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common_old.UI.UI; import Common_old.UI.UI;
import javax.swing.*; import javax.swing.*;
@@ -41,7 +41,7 @@ public class FilesHyperlinksPanel extends JPanel {
} }
}); });
Hyperlinks.setLayoutOrientation(JList.VERTICAL); Hyperlinks.setLayoutOrientation(JList.VERTICAL);
Hyperlinks.setFont(Current.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); Hyperlinks.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
add(Hyperlinks, BorderLayout.CENTER); add(Hyperlinks, BorderLayout.CENTER);
} }
} }

10
src/ProjectData/Files/UI/FilesTreeCellRenderer.java
View File

@@ -1,7 +1,7 @@
package ProjectData.Files.UI; package ProjectData.Files.UI;
import Common_old.Current; import Common.Visual.CommonUI;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common_old.UI.Trees.StyledTreeCellRenderer; import Common_old.UI.Trees.StyledTreeCellRenderer;
import ProjectData.Files.DBProjectFile; import ProjectData.Files.DBProjectFile;
import ProjectData.Files.FileState; import ProjectData.Files.FileState;
@@ -23,7 +23,7 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
File dir = (File) o; File dir = (File) o;
setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png"))); setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
setText(dir.getName()); setText(dir.getName());
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
} else if (o instanceof DBProjectFile) { } else if (o instanceof DBProjectFile) {
DBProjectFile file = (DBProjectFile) o; DBProjectFile file = (DBProjectFile) o;
if (Global.files_multiselection) { if (Global.files_multiselection) {
@@ -32,8 +32,8 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
setIcon(file.GetIcon()); setIcon(file.GetIcon());
} }
setText(file.file.getName()); setText(file.file.getName());
if (file.IsMain()) setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeBold)); if (file.IsMain()) setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeBold));
else setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain)); else setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
if (file.state.equals(FileState.Excluded)) { if (file.state.equals(FileState.Excluded)) {
Map attributes = getFont().getAttributes(); Map attributes = getFont().getAttributes();
attributes.put(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON); attributes.put(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON);

5
src/ProjectData/Messages/Message.java
View File

@@ -4,6 +4,7 @@ import Common.Mode;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common_old.Constants; import Common_old.Constants;
import Common_old.Current; import Common_old.Current;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName; import GlobalData.Settings.SettingName;
import ProjectData.SapforData.FileObject; import ProjectData.SapforData.FileObject;
import ProjectData.SapforData.FileObjectWithMessages; import ProjectData.SapforData.FileObjectWithMessages;
@@ -27,10 +28,10 @@ public class Message extends FileObject {
setGroup(group_in); setGroup(group_in);
if ((group == Constants.parser_group) || if ((group == Constants.parser_group) ||
(group == Constants.compiler_group) || (group == Constants.compiler_group) ||
(CommonUtils.mode != Mode.Normal)) { (Global.mode != Mode.Normal)) {
value = value_in; value = value_in;
} else { } else {
value = !Global.getSetting(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in); value = !((GlobalDatabase)CommonUtils.db).settings.get(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in);
} }
} }
// last code - 183 // last code - 183

5
src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
View File

@@ -1,8 +1,9 @@
package ProjectData.Project.UI; package ProjectData.Project.UI;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common.Visual.Selectable; import Common.Visual.Selectable;
import _VisualDVM.Syntax.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common_old.UI.Trees.StyledTreeCellRenderer; import Common_old.UI.Trees.StyledTreeCellRenderer;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;
@@ -41,7 +42,7 @@ public class VersionsTreeCellRenderer extends StyledTreeCellRenderer {
} }
} }
setForeground(tree.getForeground()); setForeground(tree.getForeground());
setFont(Current.getTheme().Fonts.get( setFont(CommonUI.getTheme().Fonts.get(
version.isNew ? VisualiserFonts.NewVersion : VisualiserFonts.TreePlain)); version.isNew ? VisualiserFonts.NewVersion : VisualiserFonts.TreePlain));
setText(version.getTitle()); setText(version.getTitle());
return this; return this;

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