From 54d86d6e4da407df9444c5e5e85327d6ba44223d Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 19 Sep 2024 00:24:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D1=81=20?=
 =?UTF-8?q?=D0=BA=D0=B5=D1=88=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=D0=BC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             |  5 +++++
 .../UI/VisualCache/ConfigurationCache.java      |  4 ----
 src/Common/UI/VisualCache/VisualCaches.java     | 17 ++++++++++++++---
 .../Passes/SaveCurrentConfiguration.java        |  4 +---
 .../Passes/Server/DeleteServerObject.java       |  6 +-----
 .../Passes/Server/DeleteServerObjects.java      | 10 +++-------
 .../Passes/Server/EditServerObject.java         |  7 +------
 7 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dde2bee0..87fad8fe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,12 @@
   <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/UI/VisualCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/VisualCache/ConfigurationCache.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/VisualCache/VisualCaches.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/VisualCache/ConfigurationCache.java b/src/Common/UI/VisualCache/ConfigurationCache.java
index fa23ca7a..a239265e 100644
--- a/src/Common/UI/VisualCache/ConfigurationCache.java
+++ b/src/Common/UI/VisualCache/ConfigurationCache.java
@@ -16,14 +16,10 @@ public class ConfigurationCache extends VisualCache{
     public TestsJson testsJson = null;
     //--
     public ConfigurationCache(Configuration configuration) {
-     //   System.out.println("configuration cache new instance for "+configuration.id);
-     //   System.out.println("packageGroupsJson="+Utils.Brackets(configuration.packedGroupsJson));
         if (configuration.packedGroupsJson.isEmpty()) {
-        //    System.out.println("empty");
             groupsJson = new GroupsJson(); //просто пустой
         }
         else {
-         //   System.out.println("not empty");
             groupsJson = Utils.gson.fromJson(configuration.packedGroupsJson, GroupsJson.class);
         }
         //--
diff --git a/src/Common/UI/VisualCache/VisualCaches.java b/src/Common/UI/VisualCache/VisualCaches.java
index 00dbc199..59ca77a6 100644
--- a/src/Common/UI/VisualCache/VisualCaches.java
+++ b/src/Common/UI/VisualCache/VisualCaches.java
@@ -29,8 +29,8 @@ public class VisualCaches {
         VisualCache res = null;
         LinkedHashMap<Object, VisualCache> data = getDataForClass(object.getClass());
         if (!data.containsKey(object.getPK())) {
-       //     System.out.println("get visual cache for " + object.getPK()+" "+object.getClass());
-       //     System.out.println("cache not found, creating...");
+         //   System.out.println("get visual cache for " + object.getPK()+" "+object.getClass());
+         //   System.out.println("cache not found, creating...");
             data.put(object.getPK(), res = createCache(object));
         } else {
           //  System.out.println("cache found");
@@ -38,11 +38,22 @@ public class VisualCaches {
         }
         return res;
     }
+    //Принудительно удалить старый и записать новый.
+    public static void RefreshCache(DBObject object){
+       // System.out.println("refresh cache for " + object.getPK()+" "+object.getClass().getSimpleName());
+        LinkedHashMap<Object, VisualCache> data = getDataForClass(object.getClass());
+        //--
+        if (data.containsKey(object.getPK())) {
+            data.remove(object.getPK());
+        }
+        data.put(object.getPK(), createCache(object));
+    }
+
     public static void DeleteCache(DBObject object){
         DeleteCache(object.getClass(), object.getPK());
     }
     public static void DeleteCache(Class class_, Object pk){
-      //  System.out.println("Delete for " + pk+" "+class_);
+     //   System.out.println("Delete cache for " + pk+" "+class_);
         LinkedHashMap<Object, VisualCache> data = getDataForClass(class_);
         if (data.containsKey(pk))
             data.remove(pk);
diff --git a/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java b/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java
index 5df6de71..661f0553 100644
--- a/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java
@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes;
 import Common.Current;
 import Common.Global;
+import Common.UI.UI;
 import Common.UI.VisualCache.ConfigurationCache;
 import Common.UI.VisualCache.VisualCaches;
 import Common.Utils.Utils;
@@ -45,8 +46,5 @@ public abstract class SaveCurrentConfiguration<C extends Configuration> extends
         target.saveTestsAsJson(tests);
         //--
         super.ServerAction();
-        //--
-    //    ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(target);
-    //    System.out.println(Utils.Brackets(cache.groupsDescriptions));
     }
 }
\ No newline at end of file
diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java b/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
index 2d7a5382..40c3d1f0 100644
--- a/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
@@ -12,11 +12,6 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
         target = (D) getDb().tables.get(d).getCurrent();
         return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowDeleteObjectDialog(target);
     }
-    @Override
-    protected void performPreparation() throws Exception {
-        super.performPreparation();
-        VisualCaches.DeleteCache(target);
-    }
     //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
     @Override
     protected void showPreparation() throws Exception {
@@ -38,6 +33,7 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
     @Override
     protected void ServerAction() throws Exception {
         DeleteObject(target);
+        VisualCaches.DeleteCache(target);
     }
     @Override
     protected void showDone() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java b/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
index f3414352..226a1ac9 100644
--- a/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
+++ b/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java
@@ -48,13 +48,6 @@ public class DeleteServerObjects <S extends RepositoryServer, D extends DBObject
             return false;
         }
     }
-    @Override
-    protected void performPreparation() throws Exception {
-        super.performPreparation();
-        for (Object key: target){
-            VisualCaches.DeleteCache(d, key);
-        }
-    }
     //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
     @Override
     protected void showPreparation() throws Exception {
@@ -78,5 +71,8 @@ public class DeleteServerObjects <S extends RepositoryServer, D extends DBObject
     protected void performFinish() throws Exception {
         super.performFinish();
         passes.get(getDb().getSynchronizePassCode()).Do();
+        for (Object key: target){
+            VisualCaches.DeleteCache(d, key);
+        }
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/Server/EditServerObject.java b/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
index 1309e4a3..6f02e089 100644
--- a/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
@@ -14,12 +14,6 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
         target = (D) getDb().tables.get(d).getCurrent();
         return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowEditObjectDialog(target);
     }
-    @Override
-    protected void performPreparation() throws Exception {
-        super.performPreparation();
-        //очистить кэш.
-        VisualCaches.DeleteCache(target);
-    }
     //--
     public EditServerObject(S server_in, Class<D> d_in) {
         super(server_in, d_in);
@@ -31,6 +25,7 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
     }
     @Override
     protected void showDone() throws Exception {
+        VisualCaches.RefreshCache(target);
         getDb().tables.get(d).ui_.Show(target.getPK());
     }
 }