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

---
 .idea/workspace.xml                           |  7 -----
 src/Common/Visual/DBObjectFilter_.java        |  6 ++--
 src/Common/Visual/DataSetControlForm.java     | 31 +++++++++----------
 src/Common/Visual/DataSetFiltersMenu.java     |  1 -
 src/Common/Visual/FilterFlag.java             | 23 +++++++-------
 src/Common/Visual/FilterMenuFlag.java         |  2 +-
 .../Visual/Tables/HeaderTextFilter.java       | 22 ++++++-------
 .../GlobalData/DVMParameter/DVMParameter.java |  1 -
 .../Messages/MessagesControlForm.java         |  2 +-
 .../Messages/Warnings/WarningsDBTable.java    |  7 -----
 .../Common/Group/UI/GroupsForm.java           |  1 -
 .../DVM/DVMPackage/UI/DVMPackagesForm.java    |  5 ---
 .../DVM/DVMTasks/UI/DVMRunTasksForm.java      |  7 ++---
 src/_VisualDVM/Visual/Windows/FileForm.java   |  3 --
 14 files changed, 47 insertions(+), 71 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 95d4d093..6e71eb57 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,13 +8,6 @@
   <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/Common/Visual/DataSetFiltersMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFiltersMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/FilterFlag.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/FilterFlag.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/FilterFlagMenuItem.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/MenuButtonFilterFlag.java" beforeDir="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/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Visual/DBObjectFilter_.java b/src/Common/Visual/DBObjectFilter_.java
index eaab85d3..dc7be8a4 100644
--- a/src/Common/Visual/DBObjectFilter_.java
+++ b/src/Common/Visual/DBObjectFilter_.java
@@ -2,7 +2,9 @@ package Common.Visual;
 import Common.Database.Objects.DBObject;
 public interface DBObjectFilter_<D extends DBObject> {
     boolean Validate(D dbObject);
-    default void DropMatchesCount(){}
-    default void ShowMatchesCount(){}
+    default void DropMatchesCount() {
+    }
+    default void ShowMatchesCount() {
+    }
     //-------
 }
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index d7c2a2ec..ed536747 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -7,7 +7,6 @@ import Common.Database.Tables.DataSet;
 import Common.Database.Tables.FKBehaviour;
 import Common.MainModule_;
 import Common.Utils.Utils_;
-import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Menus.TableMenu;
 import Common.Visual.Tables.*;
@@ -34,19 +33,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
     protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
     //-
     protected Vector<DBObjectFilter_<D>> allFilters = new Vector<>();
-    <M> Vector<M> getFilters(Class<M> f){
-        Vector<M> res = new Vector<>();
-        for (DBObjectFilter_ filter_: allFilters){
-            //либо М, либо наследует от М
-            if (filter_.getClass().equals(f)||filter_.getClass().getSuperclass().equals(f)){
-                res.add((M) filter_);
-            }
-        }
-        return res;
-    }
-    public void AddFilter(DBObjectFilter_<D> filter_in){
-        allFilters.add(filter_in);
-    }
     //---
     //фильтры и подсчеты. todo слить с баром (?)
     MatchesCounter counter_ui = null;
@@ -85,7 +71,20 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
                 ex.printStackTrace();
             }
         }
-        System.out.println("found "+allFilters.size()+" filters for ui "+this.getClass().getSimpleName());
+        System.out.println("found " + allFilters.size() + " filters for ui " + this.getClass().getSimpleName());
+    }
+    <M> Vector<M> getFilters(Class<M> f) {
+        Vector<M> res = new Vector<>();
+        for (DBObjectFilter_ filter_ : allFilters) {
+            //либо М, либо наследует от М
+            if (filter_.getClass().equals(f) || filter_.getClass().getSuperclass().equals(f)) {
+                res.add((M) filter_);
+            }
+        }
+        return res;
+    }
+    public void AddFilter(DBObjectFilter_<D> filter_in) {
+        allFilters.add(filter_in);
     }
     public ColumnInfo getColumnInfo(int i) {
         return columns.get(i);
@@ -347,7 +346,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
     protected void createFilters() {
     }
     protected boolean ApplyFilters(D object) {
-        for (DBObjectFilter_ filterInterface: allFilters){
+        for (DBObjectFilter_ filterInterface : allFilters) {
             if (!filterInterface.Validate(object)) //??
                 return false;
         }
diff --git a/src/Common/Visual/DataSetFiltersMenu.java b/src/Common/Visual/DataSetFiltersMenu.java
index 0830a698..f5bf3a7d 100644
--- a/src/Common/Visual/DataSetFiltersMenu.java
+++ b/src/Common/Visual/DataSetFiltersMenu.java
@@ -59,7 +59,6 @@ public abstract class DataSetFiltersMenu<D extends DBObject> extends VisualiserM
         return res;
     }
     //-------
-
     void selectAll(boolean flag) {
         for (FilterFlag filter : field_filters)
             filter.setActive(flag);
diff --git a/src/Common/Visual/FilterFlag.java b/src/Common/Visual/FilterFlag.java
index 3254c599..9290113e 100644
--- a/src/Common/Visual/FilterFlag.java
+++ b/src/Common/Visual/FilterFlag.java
@@ -9,16 +9,10 @@ import javax.swing.*;
 //фильтр флаг. либо в меню, либо на баре. текста нет.
 public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<D> {
     protected AbstractButton control = null;
-    String description; //описание фильтра
     protected boolean active = true; //включен ли фильтр
-    int count = 0;
     protected DataSet<?, D> dataSet = null; ///источник данных
-    protected String getNotActiveIconPath() {
-        return "/Common/icons/NotPick.png";
-    }
-    protected String getActiveIconPath() {
-        return "/Common/icons/Pick.png";
-    }
+    String description; //описание фильтра
+    int count = 0;
     public FilterFlag(DataSet<?, D> dataSet_in, AbstractButton control_in, boolean active_in) {
         dataSet = dataSet_in;
         active = active_in;
@@ -26,14 +20,22 @@ public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<
         description = control.getText();
         control.addActionListener(e -> {
             active = !active;
-            System.out.println("active="+active);
+            System.out.println("active=" + active);
             Mark();
             dataSet.ShowUI();
         });
         Mark();
         control.setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
     }
-    public AbstractButton getControl(){return control;}
+    protected String getNotActiveIconPath() {
+        return "/Common/icons/NotPick.png";
+    }
+    protected String getActiveIconPath() {
+        return "/Common/icons/Pick.png";
+    }
+    public AbstractButton getControl() {
+        return control;
+    }
     public void Mark() {
         control.setIcon(Utils_.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
     }
@@ -56,5 +58,4 @@ public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<
     public void DropMatchesCount() {
         count = 0;
     }
-
 }
diff --git a/src/Common/Visual/FilterMenuFlag.java b/src/Common/Visual/FilterMenuFlag.java
index d42e1b8d..00d972f0 100644
--- a/src/Common/Visual/FilterMenuFlag.java
+++ b/src/Common/Visual/FilterMenuFlag.java
@@ -4,7 +4,7 @@ import Common.Database.Tables.DataSet;
 import Common.Utils.Utils_;
 
 import javax.swing.*;
-public abstract class FilterMenuFlag<D extends DBObject> extends FilterFlag<D>{
+public abstract class FilterMenuFlag<D extends DBObject> extends FilterFlag<D> {
     public FilterMenuFlag(DataSet<?, D> dataSet_in, AbstractButton control_in, boolean active_in) {
         super(dataSet_in, control_in, active_in);
     }
diff --git a/src/Common/Visual/Tables/HeaderTextFilter.java b/src/Common/Visual/Tables/HeaderTextFilter.java
index f7c52765..1d2bd388 100644
--- a/src/Common/Visual/Tables/HeaderTextFilter.java
+++ b/src/Common/Visual/Tables/HeaderTextFilter.java
@@ -19,12 +19,12 @@ public class HeaderTextFilter<D extends DBObject> implements DBObjectFilter_<D>
     JTextField textField = null;
     JPopupMenu popup = null;
     private String filterValue = "";
-    private int offset=0;
+    private int offset = 0;
     //при одиночном клике, показать поверх заголовка столбца выпавшее меню с полем фильтра.
     public HeaderTextFilter(DataSet dataSet_in, int columnIndex_in, int offset_in) {
         dataSet = dataSet_in;
         columnIndex = columnIndex_in;
-        offset=offset_in;
+        offset = offset_in;
     }
     @Override
     public boolean Validate(D object) {
@@ -72,15 +72,15 @@ public class HeaderTextFilter<D extends DBObject> implements DBObjectFilter_<D>
          */
         control.getColumnModel().getColumn(columnIndex).setHeaderRenderer(
                 (table, value, isSelected, hasFocus, row, column1) -> new JLabel() {
-            {
-                setIcon(Utils_.getIcon("/Common/icons/Filter.png"));
-                setForeground(control.getTableHeader().getForeground());
-                setBackground(control.getTableHeader().getBackground());
-                setFont(control.getTableHeader().getFont());
-                setBorder(new MatteBorder(0, 0, 1, 1, Color.DARK_GRAY));
-                setText(dataSet.getUI().getColumnInfo(columnIndex).getName() + " : " + getFilterValue());
-            }
-        });
+                    {
+                        setIcon(Utils_.getIcon("/Common/icons/Filter.png"));
+                        setForeground(control.getTableHeader().getForeground());
+                        setBackground(control.getTableHeader().getBackground());
+                        setFont(control.getTableHeader().getFont());
+                        setBorder(new MatteBorder(0, 0, 1, 1, Color.DARK_GRAY));
+                        setText(dataSet.getUI().getColumnInfo(columnIndex).getName() + " : " + getFilterValue());
+                    }
+                });
         //--
         control.getTableHeader().addMouseListener(new MouseAdapter() {
             @Override
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameter.java b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameter.java
index 1f101f18..79fa4ab2 100644
--- a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameter.java
+++ b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameter.java
@@ -5,5 +5,4 @@ public class DVMParameter extends EnvironmentValue {
     public String toString() {
         return name + "=" + value + ";";
     }
-
 }
diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
index 16d6abee..581fb25c 100644
--- a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
+++ b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
@@ -62,7 +62,7 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
     }
     @Override
     public boolean isObjectVisible(Message object) {
-        if (super.isObjectVisible(object)){
+        if (super.isObjectVisible(object)) {
             if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(object.file)) {
                 Object o = Global.mainModule.get(Current.FileGraphElement);
                 return !(o instanceof FileObjectWithMessages) || ((FileObjectWithMessages) o).HasMessage(object);
diff --git a/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java b/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java
index 540ce0aa..f03fbc18 100644
--- a/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java
+++ b/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java
@@ -1,13 +1,6 @@
 package _VisualDVM.ProjectData.Messages.Warnings;
-import Common.Database.Objects.DBObject;
-import Common.Visual.DataSetControlForm;
-import Common.Visual.Tables.HeaderTextFilter;
 import _VisualDVM.Current;
-import _VisualDVM.ProjectData.Messages.Message;
-import _VisualDVM.ProjectData.Messages.MessagesControlForm;
 import _VisualDVM.ProjectData.Messages.MessagesDBTable;
-
-import javax.swing.*;
 public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
     //https://stackoverflow.com/questions/13079777/editable-jtableheader
     public WarningsDBTable() {
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
index cb8ec83f..4d041efe 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
@@ -6,7 +6,6 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.DataSetFiltersMenu;
 import Common.Visual.FilterFlag;
 import Common.Visual.FilterMenuFlag;
-import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Menus.DataMenuBar;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index 0ff0c689..02981c48 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -1,10 +1,8 @@
 package _VisualDVM.TestingSystem.DVM.DVMPackage.UI;
 import Common.Database.Tables.DataSet;
-import Common.Utils.Utils_;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.FilterFlag;
-import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererMultiline;
@@ -14,8 +12,6 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
-import _VisualDVM.TestingSystem.Common.Group.Group;
-import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 
 import javax.swing.*;
@@ -116,7 +112,6 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
                         PassCode.DeleteDVMPackage);
             }
         };
-
     }
     @Override
     protected void createFilters() {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
index 455a9ef3..584a4c99 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
@@ -3,7 +3,6 @@ import Common.Database.Tables.DataSet;
 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.RendererProgressBar;
@@ -87,7 +86,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
             public void fill() {
                 for (TaskState state : TaskState.values()) {
                     if (state.isVisible()) {
-                        field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()) , true) {
+                        field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
                             @Override
                             protected boolean validate(DVMRunTask object) {
                                 return object.compilation_state.equals(state);
@@ -97,12 +96,12 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
                 }
             }
         });
-       AddFilter(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
+        AddFilter(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
             @Override
             public void fill() {
                 for (TaskState state : TaskState.values()) {
                     if (state.isVisible()) {
-                        field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource,new StableMenuItem(state.getDescription()),true) {
+                        field_filters.add(new FilterMenuFlag<DVMRunTask>(dataSource, new StableMenuItem(state.getDescription()), true) {
                             @Override
                             protected boolean validate(DVMRunTask object) {
                                 return object.state.equals(state);
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java
index b1d3debc..372533db 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.java
+++ b/src/_VisualDVM/Visual/Windows/FileForm.java
@@ -10,9 +10,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import _VisualDVM.ProjectData.LanguageName;
-import _VisualDVM.ProjectData.Messages.Errors.MessageError;
-import _VisualDVM.ProjectData.Messages.Notes.MessageNote;
-import _VisualDVM.ProjectData.Messages.Warnings.MessageWarning;
 import _VisualDVM.ProjectData.SapforData.Arrays.UI.FileArraysTree;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree;
 import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree;