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

---
 .idea/workspace.xml                              |  6 +++---
 src/Common/UI/Tables/HiddenListRenderer.java     |  2 +-
 src/Common/UI/VisualCache/VisualCaches.java      |  7 ++++++-
 .../Common/Group/Json/GroupJson.java             | 16 +++++++++-------
 .../DVMConfigurationDBTable.java                 |  4 ++--
 .../SapforConfigurationDBTable.java              |  3 ++-
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b328ba23..0727945b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,11 @@
   </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/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Tables/HiddenListRenderer.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/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/Common/Group/Json/GroupJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Json/GroupJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.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" />
diff --git a/src/Common/UI/Tables/HiddenListRenderer.java b/src/Common/UI/Tables/HiddenListRenderer.java
index 23e185cd..449c8270 100644
--- a/src/Common/UI/Tables/HiddenListRenderer.java
+++ b/src/Common/UI/Tables/HiddenListRenderer.java
@@ -12,6 +12,6 @@ public class HiddenListRenderer extends RendererCell<Vector<String>> {
     @Override
     public void Display() {
         setText(String.join(";", value));
-        setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
     }
 }
diff --git a/src/Common/UI/VisualCache/VisualCaches.java b/src/Common/UI/VisualCache/VisualCaches.java
index 58fc18e8..b984d6a9 100644
--- a/src/Common/UI/VisualCache/VisualCaches.java
+++ b/src/Common/UI/VisualCache/VisualCaches.java
@@ -45,6 +45,11 @@ public class VisualCaches {
         LinkedHashMap<Object, VisualCache> data = getDataForClass(class_);
         if (data.containsKey(pk))
             data.remove(pk);
-
+    }
+    public static void Print(){
+        System.out.println("alldata size="+allData.size());
+        for (Class class_: allData.keySet()){
+            System.out.println("class="+class_.getSimpleName()+" size="+allData.get(class_).size());
+        }
     }
 }
diff --git a/src/TestingSystem/Common/Group/Json/GroupJson.java b/src/TestingSystem/Common/Group/Json/GroupJson.java
index 49e41512..b04d5111 100644
--- a/src/TestingSystem/Common/Group/Json/GroupJson.java
+++ b/src/TestingSystem/Common/Group/Json/GroupJson.java
@@ -1,16 +1,18 @@
 package TestingSystem.Common.Group.Json;
+import Common.Utils.Utils;
 import TestingSystem.Common.Group.Group;
 import com.google.gson.annotations.Expose;
-
-import java.io.Serializable;
-public class GroupJson implements Serializable {
+public class GroupJson {
     @Expose
     public int id;
     @Expose
     public String description;
-    public GroupJson(Group group){
-        id=group.id;
-        description= group.description;
+    @Expose
+    public String language;
+    public GroupJson(Group group) {
+        id = group.id;
+        description = group.description + Utils.RBrackets(group.language.getDescription());
+    }
+    public GroupJson() {
     }
-    public GroupJson(){}
 }
diff --git a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index 9905aaa6..8ebb04d2 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -37,8 +37,8 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                // columns.get(0).setVisible(false);
-                columns.get(5).setRenderer(TableRenderers.RendererMultiline);
+                columns.get(5).setMaxWidth(300);
+                columns.get(5).setRenderer(TableRenderers.RendererHiddenList);
                 columns.get(7).setRenderer(TableRenderers.RendererMultiline);
                 columns.get(8).setRenderer(TableRenderers.RendererMultiline);
                 columns.get(15).setRenderer(TableRenderers.RendererMultiline);
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index 75ab209b..c4689fc3 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -36,7 +36,8 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(5).setRenderer(TableRenderers.RendererMultiline);
+                columns.get(5).setMaxWidth(300);
+                columns.get(5).setRenderer(TableRenderers.RendererHiddenList);
             }
         };
     }