From 2eca19cad43a3733c5e5ef70e82e10973e6fae63 Mon Sep 17 00:00:00 2001 From: 02090095 Date: Sat, 8 Feb 2025 20:06:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=BF=D0=BE=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=B2?= =?UTF-8?q?=20-=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=8B,=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D1=8B,=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D1=80=D1=8B,=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?= =?UTF-8?q?=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8,=20=D0=B7=D0=B0=D0=B4?= =?UTF-8?q?=D0=B0=D1=87=D0=B8=20=D0=B4=D0=B2=D0=BC=20=D1=81=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=B5=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repository/Component/Visualiser.java | 2 +- .../Common/Group/UI/GroupsForm.java | 2 ++ .../Common/Test/UI/TestsForm.java | 7 +++++ .../UI/DVMConfigurationsForm.java | 27 +++++++++++++++++++ .../DVM/DVMSettings/UI/DVMSettingsForm.java | 19 +++++++++++++ .../DVM/DVMTasks/UI/DVMRunTasksForm.java | 2 ++ .../UI/SapforConfigurationsForm.java | 21 +++++++++++++++ .../SapforSettings/UI/SapforSettingsForm.java | 20 ++++++++++++++ 8 files changed, 99 insertions(+), 1 deletion(-) diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java index 766b9d14..3dee2523 100644 --- a/src/_VisualDVM/Repository/Component/Visualiser.java +++ b/src/_VisualDVM/Repository/Component/Visualiser.java @@ -62,7 +62,7 @@ public class Visualiser extends Component { //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html @Override public void GetVersionInfo() { - version = 1148; + version = 1149; String pattern = "MMM dd yyyy HH:mm:ss"; DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH); date_text = df.format(getClassBuildTime()); diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java index 99c345a5..dd95689d 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java @@ -9,6 +9,7 @@ import Common.Visual.FilterFlag; import Common.Visual.FilterMenuFlag; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; +import Common.Visual.Tables.HeaderTextFilter; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -70,6 +71,7 @@ public class GroupsForm extends DataSetControlForm { @Override protected void createFilters() { AddFilters( + new HeaderTextFilter<>(dataSource, 2, 65), new FilterFlag(dataSource, new MenuBarButton() { { setText("Свои"); diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java index 00ba29ec..57be8595 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java @@ -4,6 +4,7 @@ import Common.Passes.PassCode_; import Common.Visual.DataSetControlForm; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; +import Common.Visual.Tables.HeaderTextFilter; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -80,5 +81,11 @@ public class TestsForm extends DataSetControlForm { } return false; } + @Override + protected void createFilters() { + AddFilters( + new HeaderTextFilter<>(dataSource, 2, 65) + ); + } }; diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java index 304d66e1..e3dfc527 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java @@ -1,15 +1,24 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI; import Common.Database.Tables.DataSet; import Common.Passes.PassCode_; +import Common.Visual.Controls.MenuBarButton; +import Common.Visual.Controls.StableMenuItem; import Common.Visual.DataSetControlForm; +import Common.Visual.DataSetFiltersMenu; +import Common.Visual.FilterFlag; +import Common.Visual.FilterMenuFlag; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; +import Common.Visual.Tables.HeaderTextFilter; import Common.Visual.Tables.RendererMultiline; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; +import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.VisualCaches; +import _VisualDVM.TestingSystem.Common.Group.Group; +import _VisualDVM.TestingSystem.Common.Test.TestType; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; import javax.swing.*; @@ -108,5 +117,23 @@ public class DVMConfigurationsForm extends DataSetControlForm } return false; } + @Override + protected void createFilters() { + AddFilters( + new HeaderTextFilter<>(dataSource, 2, 65), + new FilterFlag(dataSource, new MenuBarButton() { + { + setText("Свои"); + setToolTipText("Отображать только конфигурации тестирования DVM авторства пользователя"); + } + }, false) { + @Override + protected boolean validate(DVMConfiguration object) { + return Global.mainModule.getAccount().email.equals(object.sender_address); + } + } + ); + } + } diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java index 8429ff41..95d750f4 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java @@ -1,13 +1,17 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.UI; import Common.Database.Tables.DataSet; import Common.Passes.PassCode_; +import Common.Visual.Controls.MenuBarButton; import Common.Visual.DataSetControlForm; +import Common.Visual.FilterFlag; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; +import Common.Visual.Tables.HeaderTextFilter; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; +import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import javax.swing.*; public class DVMSettingsForm extends DataSetControlForm { @@ -74,6 +78,21 @@ public class DVMSettingsForm extends DataSetControlForm { ); } @Override + protected void createFilters() { + AddFilters(new HeaderTextFilter<>(dataSource, 2, 65), + new FilterFlag(dataSource, new MenuBarButton() { + { + setText("Свои"); + setToolTipText("Отображать только параметры тестирования DVM авторства пользователя"); + } + }, false) { + @Override + protected boolean validate(DVMSettings object) { + return Global.mainModule.getAccount().email.equals(object.sender_address); + } + }); + } + @Override public PassCode_ getDeletePassCode() { return PassCode.DeleteDVMSettings; } diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java index a35ff903..73cb20f7 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java @@ -6,6 +6,7 @@ import Common.Visual.DataSetFiltersMenu; import Common.Visual.FilterMenuFlag; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; +import Common.Visual.Tables.HeaderTextFilter; import Common.Visual.Tables.RendererProgressBar; import Common.Visual.Tables.RendererStatusEnum; import _VisualDVM.Global; @@ -115,6 +116,7 @@ public class DVMRunTasksForm extends DataSetControlForm { @Override protected void createFilters() { AddFilters( + new HeaderTextFilter<>(dataSource, 2, 70), new DataSetFiltersMenu("Компиляция", dataSource) { @Override public void fill() { diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java index 0536972d..87c24d6d 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java @@ -2,15 +2,19 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI; import Common.CommonConstants; import Common.Database.Tables.DataSet; import Common.Passes.PassCode_; +import Common.Visual.Controls.MenuBarButton; import Common.Visual.DataSetControlForm; +import Common.Visual.FilterFlag; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; +import Common.Visual.Tables.HeaderTextFilter; import Common.Visual.Tables.RendererMultiline; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.VisualCaches; +import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.Visual.Tables.RendererConfigurationAuto; @@ -141,4 +145,21 @@ public class SapforConfigurationsForm extends DataSetControlForm(dataSource, 2, 65), + new FilterFlag(dataSource, new MenuBarButton() { + { + setText("Свои"); + setToolTipText("Отображать только конфигурации тестирования SAPFOR авторства пользователя"); + } + }, false) { + @Override + protected boolean validate(SapforConfiguration object) { + return Global.mainModule.getAccount().email.equals(object.sender_address); + } + } + ); + } } diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java index 2a5ffec2..3ce72ba3 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java @@ -1,13 +1,17 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI; import Common.Database.Tables.DataSet; import Common.Passes.PassCode_; +import Common.Visual.Controls.MenuBarButton; import Common.Visual.DataSetControlForm; +import Common.Visual.FilterFlag; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; +import Common.Visual.Tables.HeaderTextFilter; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; +import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import javax.swing.*; @@ -38,6 +42,22 @@ public class SapforSettingsForm extends DataSetControlForm { } ); } + + @Override + protected void createFilters() { + AddFilters(new HeaderTextFilter<>(dataSource, 2, 65), + new FilterFlag(dataSource, new MenuBarButton() { + { + setText("Свои"); + setToolTipText("Отображать только параметры тестирования SAPFOR авторства пользователя"); + } + }, false) { + @Override + protected boolean validate(SapforSettings object) { + return Global.mainModule.getAccount().email.equals(object.sender_address); + } + }); + } @Override public PassCode_ getDeletePassCode() { return PassCode.DeleteSapforSettings;