From f6da288ec58c8fffef23e8669dad1badf7271754 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 20 Oct 2024 17:54:09 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 17 ++++++++++++-
 src/Common/Database/Tables/DataSet.java       |  3 ---
 src/Common/Visual/DataSetControlForm.java     | 24 +++++++++++--------
 .../Messages/MessagesControlForm.java         |  5 ++++
 .../ProjectData/Messages/MessagesDBTable.java |  4 ----
 .../BugReport/BugReportsDBTable.java          |  4 ----
 .../BugReport/UI/BugReportsForm.java          |  5 ++++
 .../DVM/DVMPackage/DVMPackageDBTable.java     | 11 +--------
 .../DVM/DVMPackage/UI/DVMPackagesForm.java    | 10 ++++++++
 .../DVM/DVMTasks/DVMRunTasksSet.java          | 11 +--------
 .../DVM/DVMTasks/UI/DVMRunTasksForm.java      | 10 ++++++++
 .../SapforPackage/SapforPackageDBTable.java   | 10 --------
 .../SapforPackage/UI/SapforPackagesForm.java  | 10 ++++++++
 .../ServerSapfor/ServerSapforsDBTable.java    |  9 -------
 .../ServerSapfor/UI/ServerSapforsForm.java    | 10 ++++++++
 15 files changed, 82 insertions(+), 61 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index efc3ec10..862250d4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,22 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <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/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/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.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/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.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/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.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/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.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/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.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" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index 60a49763..c856afb5 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -127,9 +127,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         return Data.containsKey(key);
     }
     //-
-    public Comparator<D> getComparator() {
-        return null;
-    }
     public int getSelectedCount() {
         return (int) Data.values().stream().filter(d -> d.isVisible() && d.isSelected()).count();
     }
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index 0abe7a76..23a0f59a 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -32,7 +32,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
     protected boolean events_on = true;
     protected String colNamesAndSizes = "";
     protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
-    protected Vector<DataSetFiltersMenu> filtersMenus = new Vector<>();
+    protected Vector<DataSetFiltersMenu> filtersMenus = new Vector<>(); //выпадающие меню фильтрации
     protected LinkedHashMap<Integer, HeaderTextFilter> headersTextFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
     //фильтры и подсчеты. todo слить с баром (?)
     MatchesCounter f_ui = null;
@@ -112,24 +112,28 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
     protected void AdditionalInitColumns() {
         //уточнение инфы по столбцам.
     }
+    public Comparator getDefaultComparator() {
+        return null;
+    }
     Vector<Object> getVisibleKeys() {
-        Comparator comparator = dataSource.getComparator();
-        Vector<Object> res = new Vector<>();
+        Comparator comparator = getDefaultComparator();
+        Vector<Object> res_keys = new Vector<>();
         if (comparator == null) {
             for (Object key : dataSource.Data.keySet())
                 if (dataSource.get(key).isVisible())
-                    res.add(key);
+                    res_keys.add(key);
         } else {
-            Vector<Object> raw = new Vector<>();
+            Vector<D> raw = new Vector<>();
             for (Object object : dataSource.Data.values()) {
-                if (((DBObject) object).isVisible())
-                    raw.add(object);
+                D object1 = (D) object;
+                if (object1.isVisible())
+                    raw.add(object1);
             }
             raw.sort(comparator);
-            for (Object object : raw)
-                res.add(((DBObject) object).getPK());
+            for (D object : raw)
+                res_keys.add(object.getPK());
         }
-        return res;
+        return res_keys;
     }
     @SuppressWarnings("unchecked")
     @Override
diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
index c4ee11cd..f7f60825 100644
--- a/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
+++ b/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
@@ -5,6 +5,7 @@ import Common.Visual.Tables.RendererWrapText;
 import _VisualDVM.Global;
 
 import javax.swing.*;
+import java.util.Comparator;
 public class MessagesControlForm extends DataSetControlForm<Message> {
     public MessagesControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
@@ -38,6 +39,10 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
         headersTextFilters.put(3, new HeaderTextFilter(dataSource, 3));
     }
  */
+    @Override
+    public Comparator<Message> getDefaultComparator() {
+    return Comparator.comparingInt(o -> o.line);
+}
     @Override
     public boolean hasMenuBar() {
         return false;
diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
index 247a4c4c..c2345aa6 100644
--- a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
+++ b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
@@ -12,10 +12,6 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
         super(d_in);
     }
     @Override
-    public Comparator<M> getComparator() {
-        return Comparator.comparingInt(o -> o.line);
-    }
-    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new MessagesControlForm(this, mountPanel);
     }
diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
index 26414eac..1b1c5a37 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
@@ -27,10 +27,6 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
         return new BugReportsForm(this, mountPanel);
     }
     @Override
-    public Comparator<BugReport> getComparator() {
-        return (o1, o2) -> -(o1.getDate().compareTo(o2.getDate()));
-    }
-    @Override
     public Current CurrentName() {
         return Current.BugReport;
     }
diff --git a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
index b1e238f8..8ef383e7 100644
--- a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
+++ b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
@@ -12,6 +12,7 @@ import _VisualDVM.Repository.BugReport.BugReport;
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.Comparator;
 public class BugReportsForm extends DataSetControlForm<BugReport> {
     public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
@@ -77,4 +78,8 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
                 PassCode.CloseBugReport,
                 PassCode.DeleteBugReport);
     }
+    @Override
+    public Comparator<BugReport> getDefaultComparator() {
+        return (o1, o2) -> -(o1.getDate().compareTo(o2.getDate()));
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 046ad170..5789b0d0 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -30,16 +30,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DVMPackagesForm(this, mountPanel);
     }
-    @Override
-    public Comparator<DVMPackage> getComparator() {
-        return new Comparator<DVMPackage>() {
-            @Override
-            public int compare(DVMPackage o1, DVMPackage o2) {
-                return o2.id - o1.id;
-            }
-        };
-        // return Comparator.comparingInt(o -> o.).reversed();
-    }
+
     @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteDVMPackage;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index 0d1a4bca..6b6f76db 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -14,6 +14,7 @@ import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
 
 import javax.swing.*;
+import java.util.Comparator;
 public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
     public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
@@ -109,4 +110,13 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
             }
         };
     }
+    @Override
+    public Comparator<DVMPackage> getDefaultComparator() {
+        return new Comparator<DVMPackage>() {
+            @Override
+            public int compare(DVMPackage o1, DVMPackage o2) {
+                return o2.id - o1.id;
+            }
+        };
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
index 0888fc5c..4cc600fa 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
@@ -56,14 +56,5 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
         Data.clear();
         target = null;
     }
-    @Override
-    public Comparator<DVMRunTask> getComparator() {
-        return new Comparator<DVMRunTask>() {
-            @Override
-            public int compare(DVMRunTask o1, DVMRunTask o2) {
-                return o1.state.ordinal() - o2.state.ordinal();
-            }
-        };
-        // return Comparator.comparingInt(o -> o.).reversed();
-    }
+
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
index e9d5f7ed..22208381 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
@@ -11,6 +11,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 
 import javax.swing.*;
+import java.util.Comparator;
 public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
     public DVMRunTasksForm(DataSet<?, DVMRunTask> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
@@ -79,4 +80,13 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
             }
         });
     }
+    @Override
+    public Comparator<DVMRunTask> getDefaultComparator() {
+        return new Comparator<DVMRunTask>() {
+            @Override
+            public int compare(DVMRunTask o1, DVMRunTask o2) {
+                return o1.state.ordinal() - o2.state.ordinal();
+            }
+        };
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index 5132e5b3..70bd60d4 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -31,16 +31,6 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
         return new SapforPackagesForm(this, mountPanel);
     }
     @Override
-    public Comparator<SapforPackage> getComparator() {
-        return new Comparator<SapforPackage>() {
-            @Override
-            public int compare(SapforPackage o1, SapforPackage o2) {
-                return o2.id - o1.id;
-            }
-        };
-        // return Comparator.comparingInt(o -> o.).reversed();
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteSapforPackage;
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index 6d1f20e2..3bb36750 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -14,6 +14,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
 
 import javax.swing.*;
+import java.util.Comparator;
 public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
     public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
@@ -92,4 +93,13 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
             }
         };
     }
+    @Override
+    public Comparator<SapforPackage> getDefaultComparator() {
+        return new Comparator<SapforPackage>() {
+            @Override
+            public int compare(SapforPackage o1, SapforPackage o2) {
+                return o2.id - o1.id;
+            }
+        };
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index e47ff0a9..f671e98f 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -29,15 +29,6 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
         return new ServerSapforsForm(this, mountPanel);
     }
     @Override
-    public Comparator<ServerSapfor> getComparator() {
-        return new Comparator<ServerSapfor>() {
-            @Override
-            public int compare(ServerSapfor o1, ServerSapfor o2) {
-                return o2.id - o1.id;
-            }
-        };
-    }
-    @Override
     public PassCode_ getDeletePassCode() {
         return PassCode.DeleteServerSapfor;
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
index 0f2bce4e..9045ee72 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
@@ -9,6 +9,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 
 import javax.swing.*;
+import java.util.Comparator;
 public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
     public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) {
         super(dataSource_in, mountPanel_in);
@@ -49,4 +50,13 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
                 PassCode.ShowSapforCompilationErr,
                 PassCode.DeleteServerSapfor);
     }
+    @Override
+    public Comparator<ServerSapfor> getDefaultComparator() {
+        return new Comparator<ServerSapfor>() {
+            @Override
+            public int compare(ServerSapfor o1, ServerSapfor o2) {
+                return o2.id - o1.id;
+            }
+        };
+    }
 }