no message

.idea/workspace.xml

@@ -7,18 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMPackageCache.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfigurationsDBTable.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/1.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.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/ServerObjectsCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" 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/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.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/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/1.txt" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/_VisualDVM/ServerObjectsCache/DVMPackageCache.java

@@ -0,0 +1,16 @@
+package _VisualDVM.ServerObjectsCache;
+import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationJson;
+import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
+
+import java.util.Vector;
+public class DVMPackageCache extends PackageCache{
+    public DVMPackageCache(DVMPackage dvmPackage){
+        Vector<String> configurationsDescriptions = new Vector<>();
+
+        
+        for (ConfigurationJson configurationJson : configurationsJson.array)
+            configurationsDescriptions.add(configurationJson.description);
+        confifurationsDescriptionsLine = String.join(";", configurationsDescriptions);
+
+    }
+}

src/_VisualDVM/ServerObjectsCache/PackageCache.java

@@ -6,24 +6,5 @@ import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
 
 import java.util.Vector;
 public class PackageCache extends VisualCache {
-    public ConfigurationsJson configurationsJson = null;
-    public Vector<String> configurationsDescriptions = null;
     public String confifurationsDescriptionsLine = 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);
-        confifurationsDescriptionsLine = String.join(";", configurationsDescriptions);
-    }
-    public Vector<String> getConfigurationsDescriptions() {
-        return configurationsDescriptions;
-    }
-    public String getConfifurationsDescriptionsLine() {
-        return confifurationsDescriptionsLine;
-    }
 }

src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java

@@ -27,8 +27,7 @@ public abstract class TestingPackage<J> extends riDBObject {
     @Description("DEFAULT 0")
     public int connectionErrosCount = 0;
     public TasksPackageState state = TasksPackageState.Draft;
-    @Description("DEFAULT ''")
+   // public String packedConfigurationsJson = "";
-    public String packedConfigurationsJson = "";
     //json где хранятся задачи----------------------------------
     @Description("IGNORE")
     public J package_json = null;
@@ -59,7 +58,6 @@ public abstract class TestingPackage<J> extends riDBObject {
         connectionErrosCount = tp.connectionErrosCount;
         state = tp.state;
         //--
-        packedConfigurationsJson = tp.packedConfigurationsJson;
     }
     public File getLocalWorkspace() {
         return new File(getHomeDirectory(), String.valueOf(id));
@@ -85,8 +83,8 @@ public abstract class TestingPackage<J> extends riDBObject {
         package_json = null;
     }
     //----------------------------------------------------------
-    public void saveConfigurationsAsJson(Vector<? extends Configuration> configurations) {
+    public void saveConfigurations(Vector<? extends Configuration> configurations) {
-        packedConfigurationsJson = Utils_.gson.toJson(new ConfigurationsJson(configurations));
+
     }
     //определить завершен пакет с ошибками или нет.
     public void checkFinishState() throws Exception {

src/_VisualDVM/TestingSystem/Common/TestsDatabase.java

@@ -8,6 +8,8 @@ import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
+import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationJson;
+import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationsJson;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
 import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -25,6 +27,8 @@ import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
 import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTestsDBTable;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
+import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
+import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfigurationsDBTable;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettingsDBTable;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTasksSet;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
@@ -37,6 +41,8 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurati
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTestsDBTable;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfigurationsDBTable;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsDBTable;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsDBTable;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
@@ -62,6 +68,7 @@ public class TestsDatabase extends SQLiteDatabase {
     public DVMConfigurationTestsDBTable dvmConfigurationTests;
     public DVMConfigurationSettingsDBTable dvmConfigurationSettings;
     public DVMPackageDBTable dvmPackages;
+    public DVMPackageConfigurationsDBTable dvmPackageConfigurations;
     public DVMRunTasksSet dvmRunTasks = new DVMRunTasksSet();
     //--
     public ServerSapforsDBTable serverSapfors;
@@ -72,6 +79,7 @@ public class TestsDatabase extends SQLiteDatabase {
     public SapforConfigurationTestsDBTable sapforConfigurationTests;
     public SapforConfigurationSettingsDBTable sapforConfigurationSettings;
     public SapforPackageDBTable sapforPackages;
+    public SapforPackageConfigurationsDBTable sapforPackageConfigurations;
     //--
     public TestingPackagesToKillDBTable testingPackagesToKill;
     //--
@@ -90,6 +98,7 @@ public class TestsDatabase extends SQLiteDatabase {
         addTable(dvmConfigurationTests = new DVMConfigurationTestsDBTable());
         addTable(dvmConfigurationSettings = new DVMConfigurationSettingsDBTable());
         addTable(dvmPackages = new DVMPackageDBTable());
+        addTable(dvmPackageConfigurations =new DVMPackageConfigurationsDBTable());
         //-
         addTable(serverSapfors = new ServerSapforsDBTable());
         addTable(sapforSettings = new SapforSettingsDBTable());
@@ -99,6 +108,7 @@ public class TestsDatabase extends SQLiteDatabase {
         addTable(sapforConfigurationTests = new SapforConfigurationTestsDBTable());
         addTable(sapforConfigurationSettings = new SapforConfigurationSettingsDBTable());
         addTable(sapforPackages = new SapforPackageDBTable());
+        addTable(sapforPackageConfigurations = new SapforPackageConfigurationsDBTable());
         //--
         addTable(testingPackagesToKill = new TestingPackagesToKillDBTable());
     }
@@ -383,6 +393,39 @@ public class TestsDatabase extends SQLiteDatabase {
             Delete(file);
     }
     public void Patch() throws Exception {
+        Vector<DVMPackageConfiguration> dvmPackageConfigurations_ = new Vector<>();
+        for (DVMPackage dvmPackage: dvmPackages.Data.values()){
+            if (!dvmPackage.packedConfigurationsJson.isEmpty()) {
+                ConfigurationsJson configurationsJson = Utils_.gson.fromJson(dvmPackage.packedConfigurationsJson, ConfigurationsJson.class);
+                for (ConfigurationJson configurationJson : configurationsJson.array) {
+                    DVMPackageConfiguration dvmPackageConfiguration = new DVMPackageConfiguration();
+                    dvmPackageConfiguration.dvmpackage_id = dvmPackage.id;
+                    dvmPackageConfiguration.dvmconfiguration_id = configurationJson.id;
+                    dvmPackageConfigurations_.add(dvmPackageConfiguration);
+                }
+            }
+        }
+        BeginTransaction();
+        for (DVMPackageConfiguration dvmPackageConfiguration: dvmPackageConfigurations_)
+            Insert(dvmPackageConfiguration);
+        Commit();
+        //--
+        Vector<SapforPackageConfiguration> sapforPackageConfigurations_ = new Vector<>();
+        for (SapforPackage sapforPackage: sapforPackages.Data.values()){
+            if (!sapforPackage.packedConfigurationsJson.isEmpty()) {
+                ConfigurationsJson configurationsJson = Utils_.gson.fromJson(sapforPackage.packedConfigurationsJson, ConfigurationsJson.class);
+                for (ConfigurationJson configurationJson : configurationsJson.array) {
+                    SapforPackageConfiguration sapforPackageConfiguration = new SapforPackageConfiguration();
+                    sapforPackageConfiguration.sapforpackage_id = sapforPackage.id;
+                    sapforPackageConfiguration.sapforconfiguration_id = configurationJson.id;
+                    sapforPackageConfigurations_.add(sapforPackageConfiguration);
+                }
+            }
+        }
+        BeginTransaction();
+        for (SapforPackageConfiguration sapforPackageConfiguration: sapforPackageConfigurations_)
+            Insert(sapforPackageConfiguration);
+        Commit();
 /*
         Vector<DVMConfigurationGroup> DVMConfigurationGroups=new Vector<>();
         //группы dvm конфигураций

src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java

@@ -185,7 +185,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
             }
         }
         package_json = new DVMPackage_json(compilationTasks);
-        saveConfigurationsAsJson(configurations);
+        saveConfigurations(configurations);
     }
     public DVMPackage(DVMPackage p) {
         super(p);

src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java

@@ -48,11 +48,4 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
         }
         return res;
     }
-    //патч.потом удалить.
-    public SapforConfiguration getConfigurationByDescription(String description) {
-        for (SapforConfiguration sapforConfiguration : Data.values())
-            if (sapforConfiguration.description.equals(description))
-                return sapforConfiguration;
-        return null;
-    }
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java

@@ -6,16 +6,13 @@ import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Tasks.TaskState;
-import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
 import _VisualDVM.TestingSystem.SAPFOR.Json.SapforPackage_json;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
-import _VisualDVM.TestingSystem.SAPFOR.SapforTask.ComparisonState;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import com.sun.org.glassfish.gmbal.Description;
-import javafx.util.Pair;
 
 import java.io.File;
 import java.util.Vector;
@@ -66,7 +63,7 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
             //тесты в рамках конфиги уникальны значит пересечения по папкам уже не будет.
             package_json = new SapforPackage_json(serverSapfor, configurations, kernels);
             tasksCount = package_json.tasks.size();
-            saveConfigurationsAsJson(configurations);
+            saveConfigurations(configurations);
             if (configurations.size() == 1 && configurations.get(0).ethalon_id != CommonConstants.Nan) {
                 ethalon_id = configurations.get(0).ethalon_id;
             }