From fc6282cd2214856157822799d397e3257fb9c91f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 22 Oct 2024 13:06:47 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                        | 4 +++-
 src/Common/Visual/DataSetControlForm.java                  | 2 +-
 .../GlobalData/Tasks/RunTask/UI/RunTasksForm.java          | 3 +--
 .../TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java   | 7 -------
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6e71eb57..a159ebf5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,9 @@
   </component>
   <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$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index ed536747..ea5f79f2 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -347,7 +347,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
     }
     protected boolean ApplyFilters(D object) {
         for (DBObjectFilter_ filterInterface : allFilters) {
-            if (!filterInterface.Validate(object)) //??
+            if (!filterInterface.Validate(object))
                 return false;
         }
         return true;
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
index e361c0b6..9b959fa3 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
@@ -75,7 +75,6 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
                 MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id) &&
                 Global.mainModule.HasProject() &&
                 object.belongsToProject(Global.mainModule.getProject()) &&
-                Global.mainModule.HasCompilationTask() &&
-                object.compilation_task_id == Global.mainModule.getCompilationTask().id;
+                MainModule_.instance.matchCurrentID(Current.CompilationTask,  object.compilation_task_id);
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index 02981c48..76f53b56 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -18,8 +18,6 @@ import javax.swing.*;
 import java.util.Comparator;
 import java.util.Date;
 public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
-    public static boolean filterMyOnly = false;
-    public static boolean filterActive = false;
     public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
     }
@@ -147,9 +145,4 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
             }
         };
     }
-    @Override
-    public boolean isObjectVisible(DVMPackage object) {
-        return super.isObjectVisible(object) && (!filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
-                (!filterActive || object.state.isActive());
-    }
 }