From 2f4f841dcc154aec3bbe09ae8eec424ac2c9098f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 22 Feb 2025 16:48:19 +0300
Subject: [PATCH] =?UTF-8?q?v++=20=D0=90=D0=B2=D1=82=D0=BE=D1=80=D1=81?=
 =?UTF-8?q?=D1=82=D0=B2=D0=BE=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=B8=D0=B7=20=D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D1=8F=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D1=83?=
 =?UTF-8?q?=20=D0=B8=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=BF=D0=BE=D1=87=D1=82=D0=B5.=20=D0=9D=D0=B0=20?=
 =?UTF-8?q?=D0=B1=D1=83=D0=B4=D1=83=D1=89=D0=B5=D0=B5=20=D0=B2=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BC=20=D0=B0=D0=BA=D0=BA=20=D1=81=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             | 10 +++-------
 src/_VisualDVM/Constants.java                   |  2 +-
 .../Passes/All/ConvertCorrectnessTests.java     |  2 +-
 .../Common/Group/UI/GroupsForm.java             | 17 +++++++++++++----
 .../TestingSystem/Common/TestingServer.java     |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f1ebc127..12aef278 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,14 +8,10 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index c4dc0234..c8217851 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1182;
+    public static final int version = 1183;
     public static final int planner_version = 10;
     public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
     //--
diff --git a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
index 5d9d585e..de2196fc 100644
--- a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
+++ b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
@@ -19,7 +19,7 @@ public class ConvertCorrectnessTests extends TestingServerPass<File> {
             return false;
         }
         return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.")&&
-                SendRequest(ServerCode.RefreshDVMTests, "", Global.mainModule.getAccount());
+                SendRequest(ServerCode.RefreshDVMTests, "", null);
     }
     @Override
     protected boolean needsAnimation() {
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
index 167d5fb2..0b675f47 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
@@ -2,16 +2,14 @@ package _VisualDVM.TestingSystem.Common.Group.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
 import Common.Utils.TextLog;
+import Common.Visual.*;
 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.Windows.Dialog.DBObjectDialog;
+import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.LanguageName;
@@ -83,6 +81,17 @@ public class GroupsForm extends DataSetControlForm<Group> {
                         return Global.mainModule.getAccount().email.equals(object.sender_address);
                     }
                 },
+                new FilterFlag<Group>(dataSource, new MenuBarButton() {
+                    {
+                        setText("Стандарт");
+                        setToolTipText("Отображать только стандартные группы тестов");
+                    }
+                }, false) {
+                    @Override
+                    protected boolean validate(Group object) {
+                        return object.sender_address.equals(Constants.MailAddress);
+                    }
+                },
                 new DataSetFiltersMenu<Group>("Тип", dataSource) {
                     @Override
                     public void fill() {
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 23245a2b..1e193316 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -341,7 +341,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         return new Pair<>(object, groupFiles);
     }
     void RefreshDVMTests() throws Exception {
-        UserAccount account = (UserAccount) request.object;
+        UserAccount account =  new UserAccount("server", Constants.MailAddress);
         ServerSapfor serverSapfor = db.serverSapfors.getLastDoneVersion();
         DownloadRepository downloadRepository = new DownloadRepository();
         if (!downloadRepository.Do())