From df9fb2e2a2c50b4541bacf854db6c76a147e45e7 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 17 Sep 2024 01:04:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=BE=D0=BF=D1=82?=
 =?UTF-8?q?=D0=B8=D0=BC=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D1=85=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B2=D1=8F=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D1=81=20=D0=BF=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=BC=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?=
 =?UTF-8?q?=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B9=20=D0=B8=20=D0=B8=D1=85=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F.=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20json=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=20=D1=85?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BD=D1=8F=D1=89=D0=B8=D0=B9=D1=81=D1=8F=20=D0=B2?=
 =?UTF-8?q?=20=D0=B1=D0=B4=20=D0=BA=D0=B0=D0=BA=20=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  7 ++-
 .../Configuration/ConfigurationJson.java      | 13 +++++
 .../Configuration/ConfigurationsJson.java     | 17 ++++++
 .../Common/TestingPackage/TestingPackage.java | 58 ++++++++++---------
 .../DVM/DVMPackage/DVMPackageDBTable.java     | 18 +-----
 .../Passes/All/AddTasksToDVMPackage.java      |  2 +-
 .../All/StartSelectedDVMConfigurations.java   |  2 +-
 7 files changed, 68 insertions(+), 49 deletions(-)
 create mode 100644 src/TestingSystem/Common/Configuration/ConfigurationJson.java
 create mode 100644 src/TestingSystem/Common/Configuration/ConfigurationsJson.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f10af9df..60d1431d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,12 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/ConfigurationJson.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/ConfigurationsJson.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/TestingSystem/Common/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration.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/DVMConfiguration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.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/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/Common/Configuration/ConfigurationJson.java b/src/TestingSystem/Common/Configuration/ConfigurationJson.java
new file mode 100644
index 00000000..ac7b9223
--- /dev/null
+++ b/src/TestingSystem/Common/Configuration/ConfigurationJson.java
@@ -0,0 +1,13 @@
+package TestingSystem.Common.Configuration;
+import com.google.gson.annotations.Expose;
+public class ConfigurationJson {
+    @Expose
+    public int id;
+    @Expose
+    public String description;
+    public ConfigurationJson(Configuration configuration){
+        id=configuration.id;
+        description= configuration.description;
+    }
+    public ConfigurationJson(){}
+}
diff --git a/src/TestingSystem/Common/Configuration/ConfigurationsJson.java b/src/TestingSystem/Common/Configuration/ConfigurationsJson.java
new file mode 100644
index 00000000..987c9f45
--- /dev/null
+++ b/src/TestingSystem/Common/Configuration/ConfigurationsJson.java
@@ -0,0 +1,17 @@
+package TestingSystem.Common.Configuration;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Vector;
+public class ConfigurationsJson {
+    @Expose
+    public List<ConfigurationJson> array =new Vector<>();
+    public ConfigurationsJson(){
+    }
+    //при создании пакета.
+    public ConfigurationsJson(Vector<? extends Configuration> configurations){
+        array =new Vector<>();
+        for (Configuration configuration:configurations)
+            array.add(new ConfigurationJson(configuration));
+    }
+}
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index f32379aa..c17e3b6b 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -2,11 +2,11 @@ package TestingSystem.Common.TestingPackage;
 import Common.Constants;
 import Common.Database.DBObject;
 import Common.Database.riDBObject;
-import Common.Global;
 import Common.Utils.Utils;
 import TestingSystem.Common.Configuration.Configuration;
+import TestingSystem.Common.Configuration.ConfigurationJson;
+import TestingSystem.Common.Configuration.ConfigurationsJson;
 import TestingSystem.Common.TasksPackageState;
-import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.File;
@@ -26,14 +26,14 @@ public abstract class TestingPackage<J> extends riDBObject {
     public long ChangeDate = 0;
     @Description("DEFAULT 0")
     public int connectionErrosCount = 0;
-    //--todo хранить их как json в текстовом формате.
+    //---данные для отображения.
     @Description("DEFAULT ''")
-    public String packedConfigurationsIds = "";
-    @Description("DEFAULT ''")
-    public String packedConfigurationsNames = "";
-    @Description("DEFAULT 0")
-    public int configurationsCount = 0;
-    //---
+    public String packedConfigurationsJson = "";
+    @Description("IGNORE")
+    public ConfigurationsJson configurationsJson = null;
+    @Description("IGNORE")
+    public Vector<String> configurationsDescriptions = null;
+    //----
     public TasksPackageState state = TasksPackageState.Draft;
     //--
     @Override
@@ -53,9 +53,7 @@ public abstract class TestingPackage<J> extends riDBObject {
         connectionErrosCount = tp.connectionErrosCount;
         state = tp.state;
         //--
-        packedConfigurationsIds = tp.packedConfigurationsIds;
-        packedConfigurationsNames = tp.packedConfigurationsNames;
-        configurationsCount = tp.configurationsCount;
+        packedConfigurationsJson= tp.packedConfigurationsJson;
     }
     public TestingPackage(TestingPackage p) {
         SynchronizeFields(p);
@@ -88,22 +86,28 @@ public abstract class TestingPackage<J> extends riDBObject {
     public void destructor() {
         package_json = null;
     }
-    public Vector<DVMConfiguration> getConfigurations() {
-        Vector<DVMConfiguration> res = new Vector<>();
-        for (int o_id : Utils.unpackIntegers(packedConfigurationsIds, "\n"))
-            if (Global.testingServer.db.dvm_configurations.containsKey(o_id))
-                res.add(Global.testingServer.db.dvm_configurations.get(o_id));
-        return res;
+
+    public void saveConfigurationsAsJson(Vector<? extends Configuration> configurations) {
+        packedConfigurationsJson = Utils.gson.toJson(new ConfigurationsJson(configurations));
+        System.out.println(Utils.Brackets(packedConfigurationsJson));
     }
-    public void saveConfigurations(Vector<? extends Configuration> new_configurations) {
-        Vector<String> res = new Vector<>();
-        Vector<String> names = new Vector<>();
-        for (Configuration configuration : new_configurations) {
-            res.add(String.valueOf(configuration.id));
-            names.add(configuration.description);
+    //пакеты нередактируемые поэтому метод сработает только один раз.
+    public void unpackConfigurationsAsJson() {
+        if (configurationsJson == null) {
+            System.out.println("package get Json");
+            if (packedConfigurationsJson.isEmpty())
+                configurationsJson = new ConfigurationsJson(); //просто пустой
+            else
+                configurationsJson = Utils.gson.fromJson(packedConfigurationsJson, ConfigurationsJson.class);
         }
-        packedConfigurationsIds = String.join("\n", res);
-        packedConfigurationsNames = String.join("\n", names);
-        configurationsCount = new_configurations.size();
+    }
+    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 ef91e438..234f8cd5 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -4,12 +4,9 @@ import Common.Database.iDBTable;
 import Common.Global;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
-import TestingSystem.Common.TestingPackage.TestingPackage;
 
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.Vector;
 
 import static Common.UI.Tables.TableRenderers.*;
 public class DVMPackageDBTable extends iDBTable<DVMPackage> {
@@ -69,11 +66,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
                 "Машина",
                 "Пользователь",
                 "DVM",
-                //-
                 "конфигурации",
-              //  "группы",
-              //  "тестов",
-                //-
                 "Задач",
                 "Ядер",
                 "Прогресс",
@@ -82,11 +75,6 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
                 "Статус"
         };
     }
-    public static Vector<String> getConfigurationsNames(TestingPackage object){
-        String[] data = object.packedConfigurationsNames.split("\n");
-        return new Vector<String>(Arrays.asList(data));
-    }
-
     @Override
     public Object getFieldAt(DVMPackage object, int columnIndex) {
         switch (columnIndex) {
@@ -99,11 +87,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
             case 5:
                 return object.version;
             case 6:
-                return getConfigurationsNames(object);
-       //     case 7:
-       //         return getGroupsNames(object);
-       //     case 8:
-       //         return object.testsCount;
+                return object.getConfigurationsDescriptions();
             case 7:
                 return object.tasksCount;
             case 8:
diff --git a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
index 496f28dd..a5b43bb4 100644
--- a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
@@ -176,7 +176,7 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
         }
         json.compilationTasks.addAll(tasks);
         //--
-        target.saveConfigurations(configurations);
+        target.saveConfigurationsAsJson(configurations);
         //--
         target.tasksCount += tasks_count;
         target.state= TasksPackageState.Inactive;
diff --git a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
index 4c733c7b..552891a3 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
@@ -157,7 +157,7 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
     @Override
     protected void ServerAction() throws Exception {
         //занесение информации об участвующих конфигурациях
-        target.saveConfigurations(configurations);
+        target.saveConfigurationsAsJson(configurations);
         target.saveTasks(tasks, tasks_count);
         super.ServerAction();
     }