From 96df1c3a18e0f0ff0648c7aafb30873caeece4a3 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 17 Oct 2024 23:27:47 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D0=B9=20=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B3.=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=B8=D0=BD=D1=85=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B1=D0=B4?=
 =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B8=D0=B2=D0=B0=D0=BB=D0=B8=D1=81=D1=8C=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D0=B3=D0=B0=D0=BB=D0=BA=D0=B8=20=D0=B0=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=83=D1=89=D0=B8=D0=B9=20=D0=BE=D0=B1=D1=8A=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=20=D0=B1=D1=8B=D0=BB=20=D1=80=D0=B5=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=20=D1=81=D1=82=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BD=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 10 +++----
 src/Common/Database/Database.java             | 12 ++++++---
 src/Common/Database/Tables/DataSet.java       | 23 +---------------
 src/Common/Visual/DataSetControlForm.java     | 27 +++++++++++++++++--
 .../Passes/All/SynchronizeBugReports.java     |  8 +++---
 .../Passes/All/UpdateSelectedComponents.java  |  2 +-
 6 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e6ac0a84..9813074f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,16 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
       <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/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.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/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/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.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/WarningsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java
index a820e817..150f8db3 100644
--- a/src/Common/Database/Database.java
+++ b/src/Common/Database/Database.java
@@ -272,12 +272,16 @@ public abstract class Database {
     protected abstract void resetAI(DBTable table) throws Exception;
     //-
     public void SaveLastSelections() {
-        for (DataSet dataSet : tables.values())
-            dataSet.SaveLastSelections();
+        for (DataSet dataSet : tables.values()) {
+            if (dataSet.getUI() != null)
+                dataSet.getUI().SaveLastCurrent();
+        }
     }
     public void RestoreLastSelections() {
-        for (DataSet dataSet : tables.values())
-            dataSet.RestoreLastSelections();
+        for (DataSet dataSet : tables.values()) {
+            if (dataSet.getUI() != null)
+                dataSet.getUI().RestoreLastCurrent();
+        }
     }
     //---
     public abstract PassCode_ getSynchronizePassCode(); //если бд есть на сервере.
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index e99a87c9..4d4af5a4 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -15,9 +15,6 @@ import java.util.LinkedHashMap;
 import java.util.Vector;
 import java.util.stream.Collectors;
 public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
-    //-
-    public LinkedHashMap<Class, Object> selections = new LinkedHashMap<>();
-    //---
     public String Name;
     public Class<K> k; //класс первичного ключа.
     public Class<D> d; //класс объектов.
@@ -52,7 +49,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     public void SetCurrentObjectByUI(Object pk) {
         if (ui != null) {
             ui.ClearSelection(); //сброс текущего объекта и всего что с ним связано.
-            ui.Select(pk);
+            ui.SetCurrentByPK(pk);
         }
     }
     protected DataSetControlForm createUI(JPanel mountPanel) {
@@ -218,24 +215,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         }
         return res;
     }
-    public void SaveLastSelections() {
-        if (ui!=null) {
-            Object lastPk = null;
-            if ((CurrentName() != null) && (getCurrent() != null))
-                lastPk = getCurrent().getPK();
-            if (!selections.containsKey(getClass()))
-                selections.put(getClass(), lastPk);
-            else selections.replace(getClass(), lastPk);
-        }
-    }
-    public void RestoreLastSelections() {
-        if (ui!=null) {
-            Object lastPk = selections.get(getClass());
-            if ((CurrentName() != null) && (lastPk != null)) {
-                ui.Select(lastPk);
-            }
-        }
-    }
     //-------------------------------------------------------------------------------------
     public PassCode_ getDeletePassCode() {
         return null;
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index 30a91115..6465b891 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -35,6 +35,10 @@ public class DataSetControlForm extends ControlForm<DataTable> {
     public LinkedHashMap<Integer, HeaderTextFilter> headersTextFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
     //фильтры и подсчеты. todo слить с баром (?)
     MatchesCounter f_ui = null;
+    //--
+    Object savedCurrentKey = null;
+    Vector<Object> savedSelectedKeys = new Vector<>();
+    //--
     public DataSetControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
         super(DataTable.class, mountPanel_in);
         dataSource = dataSource_in;
@@ -316,9 +320,9 @@ public class DataSetControlForm extends ControlForm<DataTable> {
     }
     public void Show(Object pk) {
         Show();
-        Select(pk);
+        SetCurrentByPK(pk);
     }
-    public void Select(Object pk) {
+    public void SetCurrentByPK(Object pk) {
         if (isShown())
             control.SelectRowByPK(pk);
     }
@@ -372,4 +376,23 @@ public class DataSetControlForm extends ControlForm<DataTable> {
     public boolean hasMenuBar() {
         return true;
     }
+    //-
+    public void SaveLastCurrent() {
+        savedCurrentKey = null;
+        savedSelectedKeys.clear();
+        if ((dataSource.CurrentName() != null) && (dataSource.getCurrent() != null)) {
+            savedCurrentKey = dataSource.getCurrent().getPK();
+        }
+        savedSelectedKeys = dataSource.getSelectedKeys();
+    }
+    public void RestoreLastCurrent() {
+
+        for (Object key: savedSelectedKeys){
+            if (dataSource.containsKey(key))
+                dataSource.get(key).Select(true);
+        }
+        if ((savedCurrentKey!=null)&&(dataSource.containsKey(savedCurrentKey))){
+            SetCurrentByPK(savedCurrentKey);
+        }
+    }
 }
diff --git a/src/_VisualDVM/Passes/All/SynchronizeBugReports.java b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
index 8bf8a7b5..43afad55 100644
--- a/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
+++ b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
@@ -24,7 +24,7 @@ public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
     }
     @Override
     protected void showPreparation() throws Exception {
-        server.db.bugReports.SaveLastSelections();
+        server.db.bugReports.getUI().SaveLastCurrent();
         server.db.bugReports.ClearUI();
         server.db.subscribers.ClearUI();
         server.db.workspaces.ClearUI();
@@ -48,9 +48,9 @@ public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
     protected void showDone() throws Exception {
         if (Global.mainModule.getUI().hasMainWindow()) {
             Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowBugReports();
-            Global.componentsServer.db.bugReports.RestoreLastSelections();
-            server.db.subscribers.RestoreLastSelections();
-            server.db.workspaces.RestoreLastSelections();
+            server.db.bugReports.getUI().RestoreLastCurrent();
+            server.db.subscribers.getUI().RestoreLastCurrent();
+            server.db.workspaces.getUI().RestoreLastCurrent();
         }
     }
 }
diff --git a/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java b/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java
index 0b07bfa3..5a3567ee 100644
--- a/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java
+++ b/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java
@@ -41,7 +41,7 @@ public class UpdateSelectedComponents extends Pass<Vector<Component>> {
     @Override
     protected void body() throws Exception {
         for (Component component : target) {
-            Global.Components.getUI().Select(component.getPK());
+            Global.Components.getUI().SetCurrentByPK(component.getPK());
             Global.mainModule.getPass(PassCode.UpdateComponent).Do();
         }
     }