From 670324837dd8611bcaff3fbf0e2b6c7924564873 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 7 Mar 2025 00:21:43 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=B5=20=D0=B7=D0=B0=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=B2=20json=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BE=20=D1=84=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BB=D0=B0=D1=85=20=D1=82=D0=B5=D1=81=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                               |  8 ++++++--
 src/_VisualDVM/ServerObjectsCache/TestCache.java  | 13 +++++++++++++
 .../ServerObjectsCache/VisualCaches.java          |  2 ++
 .../Common/Test/Json/TestFileJson.java            | 15 +++++++++++++++
 .../Common/Test/Json/TestsFilesJson.java          |  9 +++++++++
 .../TestingSystem/Common/Test/Test.java           |  3 +++
 .../TestingSystem/Common/Test/UI/TestsForm.java   |  4 +++-
 7 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 src/_VisualDVM/ServerObjectsCache/TestCache.java
 create mode 100644 src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java
 create mode 100644 src/_VisualDVM/TestingSystem/Common/Test/Json/TestsFilesJson.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 63080fb4..3bd07344 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/TestCache.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestsFilesJson.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/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/ServerObjectsCache/TestCache.java b/src/_VisualDVM/ServerObjectsCache/TestCache.java
new file mode 100644
index 00000000..fc7ff06c
--- /dev/null
+++ b/src/_VisualDVM/ServerObjectsCache/TestCache.java
@@ -0,0 +1,13 @@
+package _VisualDVM.ServerObjectsCache;
+import Common.Utils.Utils_;
+import _VisualDVM.TestingSystem.Common.Test.Json.TestsFilesJson;
+import _VisualDVM.TestingSystem.Common.Test.Test;
+
+import java.util.Vector;
+public class TestCache extends VisualCache{
+    public String srcNames="";
+    public TestCache(Test object) {
+        Vector<String> names=new Vector<>();
+        TestsFilesJson json = Utils_.gson.fromJson(object.packedFilesJson, TestsFilesJson.class);
+    }
+}
diff --git a/src/_VisualDVM/ServerObjectsCache/VisualCaches.java b/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
index f008cc8a..05a9f3a5 100644
--- a/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
+++ b/src/_VisualDVM/ServerObjectsCache/VisualCaches.java
@@ -1,6 +1,7 @@
 package _VisualDVM.ServerObjectsCache;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
+import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
@@ -31,6 +32,7 @@ public class VisualCaches {
         if (object instanceof DVMConfiguration) return new DVMConfigurationCache((Configuration) 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);
         return new VisualCache();
     }
     public static VisualCache GetCache(DBObject object) {
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java b/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java
new file mode 100644
index 00000000..7e85e922
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java
@@ -0,0 +1,15 @@
+package _VisualDVM.TestingSystem.Common.Test.Json;
+import _VisualDVM.ProjectData.Files.FileType;
+import _VisualDVM.ProjectData.Files.LanguageStyle;
+import _VisualDVM.ProjectData.LanguageName;
+import com.google.gson.annotations.Expose;
+public class TestFileJson {
+    @Expose
+    public String name="";
+    @Expose
+    public FileType type = FileType.none;
+    @Expose
+    public LanguageName language = LanguageName.n;
+    @Expose
+    public LanguageStyle style = LanguageStyle.none;
+}
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Json/TestsFilesJson.java b/src/_VisualDVM/TestingSystem/Common/Test/Json/TestsFilesJson.java
new file mode 100644
index 00000000..254155d2
--- /dev/null
+++ b/src/_VisualDVM/TestingSystem/Common/Test/Json/TestsFilesJson.java
@@ -0,0 +1,9 @@
+package _VisualDVM.TestingSystem.Common.Test.Json;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Vector;
+public class TestsFilesJson {
+    @Expose
+    public List<TestFileJson> values = new Vector<>();
+}
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Test.java b/src/_VisualDVM/TestingSystem/Common/Test/Test.java
index bf22f442..2ee05783 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/Test.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/Test.java
@@ -31,6 +31,8 @@ public class Test extends riDBObject {
     public String files = ""; //файлы теста
     @Description("DEFAULT ''")
     public String extended_description="";
+    @Description("DEFAULT ''")
+    public String packedFilesJson = "";
     //--------------------------------------------->>>
     @Description("IGNORE")
     public String temp_project_name = "";
@@ -51,6 +53,7 @@ public class Test extends riDBObject {
         args = t.args;
         group_id = t.group_id;
         extended_description = t.extended_description;
+        packedFilesJson=t.packedFilesJson;
     }
     @Override
     public void select(boolean flag) {
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
index 72fb500a..59db2e95 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
@@ -9,6 +9,8 @@ import Common.Visual.Tables.RendererLongCell;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.ServerObjectsCache.TestCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 
@@ -45,7 +47,7 @@ public class TestsForm extends DataSetControlForm<Test> {
                 new ColumnInfo<Test>("файлы") {
                     @Override
                     public Object getFieldAt(Test object) {
-                        return object.getFilesForTable();
+                        return ((TestCache)VisualCaches.GetCache(object)).srcNames;
                     }
                 }
         );