From c469a38709b15ada7f6f53fa4d906bcc25e2c364 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 18 Sep 2024 15:25:58 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  5 ++++
 src/Common/UI/VisualCache/PackageCache.java   | 25 +++++++++++++++++++
 src/Common/UI/VisualCache/VisualCaches.java   |  5 +++-
 .../Common/TestingPackage/TestingPackage.java | 25 -------------------
 .../DVM/DVMPackage/DVMPackageDBTable.java     |  8 ++++--
 .../SapforConfigurationDBTable.java           | 18 ++++++++++---
 6 files changed, 54 insertions(+), 32 deletions(-)
 create mode 100644 src/Common/UI/VisualCache/PackageCache.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4ebc9755..b328ba23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Common/UI/VisualCache/PackageCache.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/Common/UI/VisualCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/VisualCache/VisualCaches.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/VisualCache/PackageCache.java b/src/Common/UI/VisualCache/PackageCache.java
new file mode 100644
index 00000000..dc417519
--- /dev/null
+++ b/src/Common/UI/VisualCache/PackageCache.java
@@ -0,0 +1,25 @@
+package Common.UI.VisualCache;
+import Common.Utils.Utils;
+import TestingSystem.Common.Configuration.Configuration;
+import TestingSystem.Common.Configuration.Json.ConfigurationJson;
+import TestingSystem.Common.Configuration.Json.ConfigurationsJson;
+import TestingSystem.Common.TestingPackage.TestingPackage;
+
+import java.util.Vector;
+public class PackageCache extends VisualCache{
+    public ConfigurationsJson configurationsJson = null;
+    public Vector<String> configurationsDescriptions = null;
+    public PackageCache(TestingPackage testingPackage){
+        if (testingPackage.packedConfigurationsJson.isEmpty())
+            configurationsJson = new ConfigurationsJson(); //просто пустой
+        else
+            configurationsJson = Utils.gson.fromJson(testingPackage.packedConfigurationsJson, ConfigurationsJson.class);
+        //---
+        configurationsDescriptions=new Vector<>();
+        for(ConfigurationJson configurationJson: configurationsJson.array)
+            configurationsDescriptions.add(configurationJson.description);
+    }
+    public Vector<String> getConfigurationsDescriptions() {
+        return configurationsDescriptions;
+    }
+}
diff --git a/src/Common/UI/VisualCache/VisualCaches.java b/src/Common/UI/VisualCache/VisualCaches.java
index 8ce4f75b..58fc18e8 100644
--- a/src/Common/UI/VisualCache/VisualCaches.java
+++ b/src/Common/UI/VisualCache/VisualCaches.java
@@ -1,6 +1,7 @@
 package Common.UI.VisualCache;
 import Common.Database.DBObject;
 import TestingSystem.Common.Configuration.Configuration;
+import TestingSystem.Common.TestingPackage.TestingPackage;
 
 import java.util.LinkedHashMap;
 //нужен для серверных объектов, чтобы в сокет не класть лишнего.
@@ -20,10 +21,12 @@ public class VisualCaches {
     static VisualCache createCache(Object object) {
         if (object instanceof Configuration)
             return new ConfigurationCache((Configuration) object);
+        if (object instanceof TestingPackage)
+            return new PackageCache((TestingPackage) object);
         return new VisualCache();
     }
     public static VisualCache GetCache(DBObject object) {
-      //  System.out.println("get visual cache for " + object.getPK());
+     //   System.out.println("get visual cache for " + object.getPK()+" "+object.getClass());
         VisualCache res = null;
         LinkedHashMap<Object, VisualCache> data = getDataForClass(object.getClass());
         if (!data.containsKey(object.getPK())) {
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index 99d696bc..3b23429e 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -27,16 +27,9 @@ public abstract class TestingPackage<J> extends riDBObject {
     @Description("DEFAULT 0")
     public int connectionErrosCount = 0;
     public TasksPackageState state = TasksPackageState.Draft;
-
-    //---данные для отображения.
     @Description("DEFAULT ''")
     public String packedConfigurationsJson = "";
     //--
-    @Description("IGNORE")
-    public ConfigurationsJson configurationsJson = null;
-    @Description("IGNORE")
-    public Vector<String> configurationsDescriptions = null;
-    //--
     @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
@@ -91,22 +84,4 @@ public abstract class TestingPackage<J> extends riDBObject {
     public void saveConfigurationsAsJson(Vector<? extends Configuration> configurations) {
         packedConfigurationsJson = Utils.jsonToPrettyFormat(Utils.gson.toJson(new ConfigurationsJson(configurations)));
     }
-    //пакеты нередактируемые поэтому метод сработает только один раз.
-    void unpackConfigurationsAsJson() {
-        if (configurationsJson == null) {
-            if (packedConfigurationsJson.isEmpty())
-                configurationsJson = new ConfigurationsJson(); //просто пустой
-            else
-                configurationsJson = Utils.gson.fromJson(packedConfigurationsJson, ConfigurationsJson.class);
-        }
-    }
-    public Vector<String> getConfigurationsDescriptions() {
-        if (configurationsDescriptions==null) {
-            unpackConfigurationsAsJson();
-            configurationsDescriptions = new Vector<>();
-            for (ConfigurationJson configurationJson : configurationsJson.array)
-                configurationsDescriptions.add(configurationJson.description);
-        }
-        return configurationsDescriptions;
-    }
 }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 234f8cd5..556090c0 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -4,6 +4,9 @@ import Common.Database.iDBTable;
 import Common.Global;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
+import Common.UI.VisualCache.PackageCache;
+import Common.UI.VisualCache.VisualCache;
+import Common.UI.VisualCache.VisualCaches;
 
 import java.util.Comparator;
 import java.util.Date;
@@ -66,7 +69,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
                 "Машина",
                 "Пользователь",
                 "DVM",
-                "конфигурации",
+                "Конфигурации",
                 "Задач",
                 "Ядер",
                 "Прогресс",
@@ -77,6 +80,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     }
     @Override
     public Object getFieldAt(DVMPackage object, int columnIndex) {
+        PackageCache cache = (PackageCache) VisualCaches.GetCache(object);
         switch (columnIndex) {
             case 2:
                 return object.sender_name;
@@ -87,7 +91,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
             case 5:
                 return object.version;
             case 6:
-                return object.getConfigurationsDescriptions();
+                return cache.getConfigurationsDescriptions();
             case 7:
                 return object.tasksCount;
             case 8:
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index 6a9b2bbd..75ab209b 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -2,6 +2,9 @@ package TestingSystem.SAPFOR.SapforConfiguration;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
+import Common.UI.Tables.TableRenderers;
+import Common.UI.VisualCache.ConfigurationCache;
+import Common.UI.VisualCache.VisualCaches;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Utils;
 import TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
@@ -33,7 +36,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                //columns.get(0).setVisible(false);
+                columns.get(5).setRenderer(TableRenderers.RendererMultiline);
             }
         };
     }
@@ -42,21 +45,28 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
         return new String[]{
                 "имя",
                 "автор",
+                "авто",
+                "группы",
+                "тестов",
                 "флаги"
-    //            "теневые грани, %"
         };
     }
     @Override
     public Object getFieldAt(SapforConfiguration object, int columnIndex) {
+        ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(object);
         switch (columnIndex) {
             case 2:
                 return object.description;
             case 3:
                 return object.sender_name;
             case 4:
+                return object.printAuto();
+            case 5:
+                return cache.getGroupsDescriptions();
+            case 6:
+                return cache.getTestsCount();
+            case 7:
                 return object.getFlags();
-           // case 5:
-           //     return object.MAX_SHADOW_WIDTH;
             default:
                 return null;
         }