From 10422327baa4f80b2430e4dd45ba8995ce596d52 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 20 Oct 2024 16:19:43 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                         | 13 ++----------
 src/Common/Database/Tables/DataSet.java     | 21 +------------------
 src/Common/Visual/DataSetControlForm.java   | 23 ++++++++++++++++++++-
 src/_VisualDVM/Visual/Windows/FileForm.java |  8 +++----
 4 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1633259a..8725eddf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,18 +8,9 @@
   <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/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/Common/Visual/Tables/HeaderTextFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HeaderTextFilter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/MessageError.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/MessageError.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/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/MessageNote.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/MessageNote.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/MessageWarning.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/MessageWarning.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index 0199902b..a5a34559 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -127,26 +127,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         return Data.containsKey(key);
     }
     //-
-    public Vector<K> getVisibleKeys() {
-        Comparator<D> comparator = getComparator();
-        Vector<K> res = new Vector<>();
-        if (comparator == null) {
-            for (K key : Data.keySet())
-                if (Data.get(key).isVisible())
-                    res.add(key);
-        } else {
-            Vector<D> raw = new Vector<>();
-            for (D object : Data.values()) {
-                if (object.isVisible())
-                    raw.add(object);
-            }
-            raw.sort(comparator);
-            for (D object : raw)
-                res.add((K) object.getPK());
-        }
-        return res;
-    }
-    protected Comparator<D> getComparator() {
+    public Comparator<D> getComparator() {
         return null;
     }
     public int getSelectedCount() {
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index e1619427..28802eaa 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -20,6 +20,7 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 import java.util.stream.Collectors;
@@ -111,11 +112,30 @@ public class DataSetControlForm extends ControlForm<DataTable> {
     protected void AdditionalInitColumns() {
         //уточнение инфы по столбцам.
     }
+    Vector<Object> getVisibleKeys() {
+        Comparator comparator = dataSource.getComparator();
+        Vector<Object> res = new Vector<>();
+        if (comparator == null) {
+            for (Object key : dataSource.Data.keySet())
+                if (dataSource.get(key).isVisible())
+                    res.add(key);
+        } else {
+            Vector<Object> raw = new Vector<>();
+            for (Object object : dataSource.Data.values()) {
+                if (((DBObject)object).isVisible())
+                    raw.add(object);
+            }
+            raw.sort(comparator);
+            for (Object object : raw)
+                res.add(((DBObject)object).getPK());
+        }
+        return res;
+    }
     @SuppressWarnings("unchecked")
     @Override
     protected void createControl() {
         CreateColumnsInfo();
-        GridAnchestor table_data_model = new GridAnchestor(getHeaders(), dataSource.getVisibleKeys()) {
+        GridAnchestor table_data_model = new GridAnchestor(getHeaders(), getVisibleKeys()) {
             @SuppressWarnings("unchecked")
             @Override
             public Object getValueAt(int rowIndex, int columnIndex) {
@@ -345,6 +365,7 @@ public class DataSetControlForm extends ControlForm<DataTable> {
     public int getRowCount() {
         return control.getRowCount();
     }
+
     public void ShowCurrentObject() throws Exception {
         if (dataSource instanceof DBTable) {
             DBTable table = (DBTable) dataSource;
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java
index 470acfc2..26ed8379 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.java
+++ b/src/_VisualDVM/Visual/Windows/FileForm.java
@@ -176,22 +176,22 @@ public class FileForm implements FileWindow, FormWithSplitters {
     @Override
     public void ShowWarningsCount() {
         boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
-        messagesTabs.setTitleAt(1, (flag ? "Предупреждения: " : "") + file.father.db.warnings.getVisibleKeys().size());
+        messagesTabs.setTitleAt(1, (flag ? "Предупреждения: " : "") + file.father.db.warnings.getUI().getRowCount());
     }
     @Override
     public void ShowErrorsCount() {
         boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
-        messagesTabs.setTitleAt(2, (flag ? "Ошибки: " : "") + file.father.db.errors.getVisibleKeys().size());
+        messagesTabs.setTitleAt(2, (flag ? "Ошибки: " : "") + file.father.db.errors.getUI().getRowCount());
     }
     @Override
     public void ShowNotesCount() {
         boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
-        messagesTabs.setTitleAt(0, (flag ? "Примечания: " : "") + file.father.db.notes.getVisibleKeys().size());
+        messagesTabs.setTitleAt(0, (flag ? "Примечания: " : "") + file.father.db.notes.getUI().getRowCount());
     }
     @Override
     public void ShowRecommendationsCount() {
         boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
-        messagesTabs.setTitleAt(3, (flag ? "Рекомендации: " : "") + file.father.db.recommendations.getVisibleKeys().size());
+        messagesTabs.setTitleAt(3, (flag ? "Рекомендации: " : "") + file.father.db.recommendations.getUI().getRowCount());
     }
     //---
     @Override