From 99643aa75569b7de26c12da5ce3d254b953fb2b4 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 20 Oct 2024 21:06:15 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 42 ++-----------------
 src/Common/Visual/DataSetControlForm.java     |  2 +-
 .../GlobalData/Compiler/UI/CompilersForm.java |  2 +-
 .../UI/EnvironmentsValuesForm.java            |  2 +-
 .../GlobalData/Makefile/UI/MakefilesForm.java |  3 +-
 .../GlobalData/Module/UI/ModulesForm.java     |  2 +-
 .../UI/RunConfigurationsForm.java             |  2 +-
 .../UI/SapforProfileSettingsForm.java         |  2 +-
 .../UI/CompilationTasksForm.java              |  3 +-
 .../Tasks/RunTask/UI/RunTasksForm.java        |  2 +-
 .../GlobalData/User/UI/UsersForm.java         |  2 +-
 .../Messages/MessagesControlForm.java         |  2 +-
 .../Arrays/UI/ProjectArraysForm.java          | 15 ++++---
 .../BugReport/UI/BugReportsForm.java          |  2 +-
 .../SubscriberWorkspacesForm.java             |  2 +-
 .../Common/Group/UI/GroupsForm.java           |  3 +-
 .../Common/Test/UI/TestsForm.java             |  2 +-
 .../DVM/DVMPackage/UI/DVMPackagesForm.java    |  2 +-
 .../DVM/DVMTasks/UI/DVMRunTasksForm.java      |  2 +-
 .../SapforPackage/UI/SapforPackagesForm.java  |  3 +-
 .../UI/SapforSettingsCommandsForm.java        |  2 +-
 21 files changed, 36 insertions(+), 63 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 94c416fa..8f7ffc02 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,61 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesForm.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" 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/Objects/DBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.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/GlobalData/Compiler/Compiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/Compiler.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/Makefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/Makefile.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/Module.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/Module.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.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/GlobalData/User/UI/UsersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/User.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/MassSelectArrays.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/MassSelectArrays.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Component.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Group.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesForm.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/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.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" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.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 b7b4caea..7a4af44f 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -116,7 +116,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
         return null;
     }
     public boolean isObjectVisible(D object){
-        return true;
+        return ApplyFilters(object);
     }
     Vector<Object> getVisibleKeys() {
         Comparator comparator = getDefaultComparator();
diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
index e92450a6..b02f9421 100644
--- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
+++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
@@ -49,6 +49,6 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
     }
     @Override
     public boolean isObjectVisible(Compiler object) {
-        return MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
+        return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
index ac59f373..e3a24229 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
@@ -33,6 +33,6 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
     }
     @Override
     public boolean isObjectVisible(EnvironmentValue object) {
-        return MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id);
+        return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
index 8f5845d7..c80d7951 100644
--- a/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
+++ b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
@@ -44,6 +44,7 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
     }
     @Override
     public boolean isObjectVisible(Makefile object) {
-        return  MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
+        return  super.isObjectVisible(object)&&
+                MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java b/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
index 60f3200f..d4202cd8 100644
--- a/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
+++ b/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
@@ -36,7 +36,7 @@ public class ModulesForm extends DataSetControlForm<Module> {
     }
     @Override
     public boolean isObjectVisible(Module object) {
-        return MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id);
+        return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id);
     }
 
 }
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
index 0734ddca..aca97e0f 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
@@ -44,6 +44,6 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
     }
     @Override
     public boolean isObjectVisible(RunConfiguration object) {
-        return  MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
+        return  super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java b/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
index a6ba02f0..16325ee0 100644
--- a/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
+++ b/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java
@@ -28,6 +28,6 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
     }
     @Override
     public boolean isObjectVisible(SapforProfileSetting object) {
-        return MainModule_.instance.matchCurrentID(Current.SapforProfile, object.sapforprofile_id);
+        return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.SapforProfile, object.sapforprofile_id);
     }
 }
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
index 18854a0b..f6ce4cde 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
@@ -57,7 +57,8 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
     }
     @Override
     public boolean isObjectVisible(CompilationTask object) {
-        return  MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
+        return  super.isObjectVisible(object)&&
+                MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
                 MainModule_.instance.matchCurrentID(Current.User, object.user_id) &&
                 Global.mainModule.HasProject() &&
                 object.belongsToProject(Global.mainModule.getProject());
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
index 3d4f2888..f0ef8670 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
@@ -51,7 +51,7 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
     }
     @Override
     public boolean isObjectVisible(RunTask object) {
-        return
+        return super.isObjectVisible(object)&&
                 MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
                         MainModule_.instance.matchCurrentID(Current.User, object.user_id) &&
                         MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id) &&
diff --git a/src/_VisualDVM/GlobalData/User/UI/UsersForm.java b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
index 5e7dc24e..9d1592c8 100644
--- a/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
+++ b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
@@ -50,6 +50,6 @@ public class UsersForm extends DataSetControlForm<User> {
 
     @Override
     public boolean isObjectVisible(User object) {
-        return MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
+        return super.isObjectVisible(object)&&super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
     }
 }
\ No newline at end of file
diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
index 8e690f52..9b00d653 100644
--- a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
+++ b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
@@ -49,7 +49,7 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
     }
     @Override
     public boolean isObjectVisible(Message object) {
-        return true;
+        return super.isObjectVisible(object);
     }
 
         /*
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
index 8f95edd4..23886a9e 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
@@ -41,11 +41,14 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
     }
     @Override
     public boolean isObjectVisible(ProjectArray object) {
-        if (object.isTemplFlag > 0) return true;
-        return object.shortName.startsWith(object.filterName) &&
-                object.location.toString().startsWith(object.filterLocation) &&
-                object.locName.startsWith(object.filterLocationName) &&
-                object.has_decl_place(object.filterFile) &&
-                object.has_region(object.filterRegion);
+        if (super.isObjectVisible(object)) {
+            if (object.isTemplFlag > 0) return true;
+            return object.shortName.startsWith(object.filterName) &&
+                    object.location.toString().startsWith(object.filterLocation) &&
+                    object.locName.startsWith(object.filterLocationName) &&
+                    object.has_decl_place(object.filterFile) &&
+                    object.has_region(object.filterRegion);
+        }
+        return false;
     }
 }
diff --git a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
index 56162b0f..304ee819 100644
--- a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
+++ b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
@@ -84,6 +84,6 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
     }
     @Override
     public boolean isObjectVisible(BugReport object) {
-        return BugReportInterface.isVisible(object);
+        return super.isObjectVisible(object)&&BugReportInterface.isVisible(object);
     }
 }
diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesForm.java b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesForm.java
index 216798a1..c60e2bb3 100644
--- a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesForm.java
+++ b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesForm.java
@@ -23,7 +23,7 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
     }
     @Override
     public boolean isObjectVisible(SubscriberWorkspace object) {
-        return Global.mainModule.HasSubscriber() &&  Global.mainModule.getSubscriber().address.equals(object.email) &&
+        return super.isObjectVisible(object)&&Global.mainModule.HasSubscriber() &&  Global.mainModule.getSubscriber().address.equals(object.email) &&
                 (Global.mainModule.getAccount().isAdmin() || Global.mainModule.getAccount().email.equals(Global.mainModule.getSubscriber().address));
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
index f40f6d60..94e13dab 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
@@ -33,7 +33,8 @@ public class GroupsForm extends DataSetControlForm<Group> {
     }
     @Override
     public boolean isObjectVisible(Group object) {
-        return (!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
+        return super.isObjectVisible(object)&&
+                (!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
                 Global.testingServer.db.groups.getUI().ApplyFilters(object);
     }
     @Override
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
index 52642dbb..3364f721 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
@@ -39,7 +39,7 @@ public class TestsForm extends DataSetControlForm<Test> {
     }
     @Override
     public boolean isObjectVisible(Test object) {
-        return MainModule_.instance.matchCurrentID(Current.Group, object.group_id);
+        return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Group, object.group_id);
     }
 };
 
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index b4300052..05649cf3 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -121,7 +121,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
     }
     @Override
     public boolean isObjectVisible(DVMPackage object) {
-        return (!DVMPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
+        return super.isObjectVisible(object)&&(!DVMPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
                 (!DVMPackageDBTable.filterActive || object.state.isActive());
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
index eaaa742f..1f361451 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
@@ -92,6 +92,6 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
     }
     @Override
     public boolean isObjectVisible(DVMRunTask object) {
-        return Global.testingServer.db.dvmRunTasks.getUI().ApplyFilters(object);
+        return super.isObjectVisible(object)&&Global.testingServer.db.dvmRunTasks.getUI().ApplyFilters(object);
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index 7e92e8d6..96526f3c 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -104,7 +104,8 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
     }
     @Override
     public boolean isObjectVisible(SapforPackage object) {
-        return (!SapforPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
+        return super.isObjectVisible(object)&&
+                (!SapforPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
                 (!SapforPackageDBTable.filterActive || object.state.isActive());
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
index 5f2ac898..ee5e52d2 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
@@ -32,6 +32,6 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
 
     @Override
     public boolean isObjectVisible(SapforSettingsCommand object) {
-        return MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id);
+        return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id);
     }
 }