From 74146fae4c23fa69756940c491da478a7b7fde57 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 21 Mar 2025 17:43:46 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 17 ++++-------
 .../ConfigurationCache.java                   |  4 ++-
 .../DVMConfigurationCache.java                | 29 +++++++++++++++++--
 .../SapforConfigurationCache.java             | 25 ++++++++++++++++
 .../ServerObjectsCache/TestCache.java         |  6 ----
 .../ServerObjectsCache/VisualCaches.java      |  2 +-
 6 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 794d4cbb..55a78d39 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,19 +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/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroup.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroupsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroup.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroupsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/TestCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/TestCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java b/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
index 14e79b06..ad52c20c 100644
--- a/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java
@@ -14,7 +14,6 @@ import _VisualDVM.TestingSystem.Common.Test.Test;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 public class ConfigurationCache extends VisualCache {
-
     public GroupsJson groupsJson = null;
     public TestsJson testsJson = null;
     public int groupsOnly = 0;
@@ -23,6 +22,7 @@ public class ConfigurationCache extends VisualCache {
     public Vector<String> groupsSummary = null;
     //--
     public ConfigurationCache(Configuration configuration) {
+        groupsSummary = new Vector<>();
         groupsOnly = configuration.groupsOnly;
         if (configuration.packedGroupsJson.isEmpty())
             groupsJson = new GroupsJson(); //просто пустой
@@ -39,6 +39,7 @@ public class ConfigurationCache extends VisualCache {
         else
             settingsJson = Utils_.gson.fromJson(configuration.packedSettingsJson, SettingsArrayJson.class);
         //-
+        /*
         LinkedHashMap<String, Vector<String>> gmap = new LinkedHashMap<>();
         for (GroupJson groupJson : groupsJson.array) {
             Vector<String> vector = null;
@@ -54,6 +55,7 @@ public class ConfigurationCache extends VisualCache {
         for (String language : gmap.keySet()) {
             groupsSummary.add(language + ": " + String.join(";", gmap.get(language)));
         }
+         */
         Vector<String> settingsDescriptionsVector = new Vector<>();
         for (SettingsJson settingsJson : settingsJson.array)
             settingsDescriptionsVector.add(settingsJson.description);
diff --git a/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java b/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java
index 3e3bde14..28468969 100644
--- a/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java
@@ -1,13 +1,38 @@
 package _VisualDVM.ServerObjectsCache;
 import _VisualDVM.Global;
-import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
+import _VisualDVM.ProjectData.LanguageName;
+import _VisualDVM.TestingSystem.Common.Group.Group;
+import _VisualDVM.TestingSystem.Common.Group.Json.GroupJson;
 import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
+import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
+import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
 
+import java.util.LinkedHashMap;
 import java.util.Vector;
 public class DVMConfigurationCache extends ConfigurationCache {
-    public DVMConfigurationCache(Configuration configuration) {
+    public DVMConfigurationCache(DVMConfiguration configuration) {
         super(configuration);
+        groupsSummary = new Vector<>();
+        Vector<DVMConfigurationGroup> configurationGroups = Global.testingServer.db.getVectorByFK(configuration, DVMConfigurationGroup.class);
+        //--
+        LinkedHashMap<LanguageName, Vector<String>> gmap = new LinkedHashMap<>();
+        for (DVMConfigurationGroup configurationGroup : configurationGroups) {
+            if (Global.testingServer.db.groups.containsKey(configurationGroup.group_id)) {
+                Group group = Global.testingServer.db.groups.get(configurationGroup.group_id);
+                Vector<String> vector = null;
+                if (gmap.containsKey(group.language)) {
+                    vector = gmap.get(group.language);
+                } else {
+                    vector = new Vector<>();
+                    gmap.put(group.language, vector);
+                }
+                vector.add(group.description);
+            }
+        }
+        for (LanguageName language : gmap.keySet()) {
+            groupsSummary.add(language + ": " + String.join(";", gmap.get(language)));
+        }
     }
     public Vector<DVMSettings> getSettings() {
         Vector<DVMSettings> res = new Vector<>();
diff --git a/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java b/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java
index 4218607a..0828d628 100644
--- a/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java
@@ -1,13 +1,38 @@
 package _VisualDVM.ServerObjectsCache;
 import _VisualDVM.Global;
+import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
+import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
+import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
+import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 
+import java.util.LinkedHashMap;
 import java.util.Vector;
 public class SapforConfigurationCache extends ConfigurationCache {
     public SapforConfigurationCache(Configuration configuration) {
         super(configuration);
+        groupsSummary = new Vector<>();
+        Vector<SapforConfigurationGroup> configurationGroups = Global.testingServer.db.getVectorByFK(configuration, SapforConfigurationGroup.class);
+        //--
+        LinkedHashMap<LanguageName, Vector<String>> gmap = new LinkedHashMap<>();
+        for (SapforConfigurationGroup configurationGroup : configurationGroups) {
+            if (Global.testingServer.db.groups.containsKey(configurationGroup.group_id)) {
+                Group group = Global.testingServer.db.groups.get(configurationGroup.group_id);
+                Vector<String> vector = null;
+                if (gmap.containsKey(group.language)) {
+                    vector = gmap.get(group.language);
+                } else {
+                    vector = new Vector<>();
+                    gmap.put(group.language, vector);
+                }
+                vector.add(group.description);
+            }
+        }
+        for (LanguageName language : gmap.keySet()) {
+            groupsSummary.add(language + ": " + String.join(";", gmap.get(language)));
+        }
     }
     public Vector<SapforSettings> getSettings() {
         Vector<SapforSettings> res = new Vector<>();
diff --git a/src/_VisualDVM/ServerObjectsCache/TestCache.java b/src/_VisualDVM/ServerObjectsCache/TestCache.java
index b563b752..77b5a287 100644
--- a/src/_VisualDVM/ServerObjectsCache/TestCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/TestCache.java
@@ -11,12 +11,6 @@ public class TestCache extends VisualCache {
         Vector<TestFile> files = Global.testingServer.db.getVectorByFK(object, TestFile.class);
         for (TestFile testFile : files)
             names.add(testFile.name);
-        /*
-        TestFilesJson json = Utils_.gson.fromJson(object.packedFilesJson, TestFilesJson.class);
-        for (TestFileJson testJson : json.values) {
-            names.add(testJson.name);
-        }
-        */
         srcNames = String.join(";", names);
     }
 }
diff --git a/src/_VisualDVM/ServerObjectsCache/VisualCaches.java b/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
index 9ddb48f3..95b3f110 100644
--- a/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
+++ b/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
@@ -29,7 +29,7 @@ public class VisualCaches {
     //чтобы не трогать сами объекты и не сбить сериализацию
     static VisualCache createCache(Object object) {
         if (object instanceof SapforConfiguration) return new SapforConfigurationCache((Configuration) object);
-        if (object instanceof DVMConfiguration) return new DVMConfigurationCache((Configuration) object);
+        if (object instanceof DVMConfiguration) return new DVMConfigurationCache((DVMConfiguration) object);
         if (object instanceof TestingPackage) return new PackageCache((TestingPackage) object);
         if (object instanceof DVMSettings) return new DVMSettingsCache((DVMSettings) object);
         if (object instanceof Test) return new TestCache((Test) object);